From c60a0f4f56f0cf5f259eb0b4520b84e43741e876 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 27 Sep 2024 05:33:02 -0700 Subject: [PATCH 001/190] 16136 remove Django Admin (#17619) * 16136 remove Django Admin * 16136 fix plugin test * 16136 fix migrations * Revert "16136 fix migrations" This reverts commit 80296fa1ecc294e4df8d11d11ea6dc10921517b0. * Remove obsolete admin module from dummy plugin * Remove obsolete admin site configuration * Remove unused import statement * Remove obsolete admin module * Misc cleanup --------- Co-authored-by: Jeremy Stretch --- docs/configuration/miscellaneous.md | 8 -------- netbox/netbox/admin.py | 14 -------------- netbox/netbox/configuration_testing.py | 2 -- netbox/netbox/plugins/urls.py | 2 -- netbox/netbox/settings.py | 5 ----- netbox/netbox/tests/dummy_plugin/admin.py | 9 --------- netbox/netbox/tests/test_plugins.py | 6 ------ netbox/netbox/urls.py | 5 ----- netbox/templates/inc/user_menu.html | 5 ----- netbox/users/admin.py | 5 ----- 10 files changed, 61 deletions(-) delete mode 100644 netbox/netbox/admin.py delete mode 100644 netbox/netbox/tests/dummy_plugin/admin.py delete mode 100644 netbox/users/admin.py diff --git a/docs/configuration/miscellaneous.md b/docs/configuration/miscellaneous.md index 124de3037..576eb8739 100644 --- a/docs/configuration/miscellaneous.md +++ b/docs/configuration/miscellaneous.md @@ -96,14 +96,6 @@ The maximum size (in bytes) of an incoming HTTP request (i.e. `GET` or `POST` da --- -## DJANGO_ADMIN_ENABLED - -Default: False - -Setting this to True installs the `django.contrib.admin` app and enables the [Django admin UI](https://docs.djangoproject.com/en/5.0/ref/contrib/admin/). This may be necessary to support older plugins which do not integrate with the native NetBox interface. - ---- - ## ENFORCE_GLOBAL_UNIQUE !!! tip "Dynamic Configuration Parameter" diff --git a/netbox/netbox/admin.py b/netbox/netbox/admin.py deleted file mode 100644 index cdfacc141..000000000 --- a/netbox/netbox/admin.py +++ /dev/null @@ -1,14 +0,0 @@ -from django.conf import settings -from django.contrib.admin import site as admin_site -from taggit.models import Tag - - -# Override default AdminSite attributes so we can avoid creating and -# registering our own class -admin_site.site_header = 'NetBox Administration' -admin_site.site_title = 'NetBox' -admin_site.site_url = '/{}'.format(settings.BASE_PATH) -admin_site.index_template = 'admin/index.html' - -# Unregister the unused stock Tag model provided by django-taggit -admin_site.unregister(Tag) diff --git a/netbox/netbox/configuration_testing.py b/netbox/netbox/configuration_testing.py index 346cd89d2..cec05cabb 100644 --- a/netbox/netbox/configuration_testing.py +++ b/netbox/netbox/configuration_testing.py @@ -39,8 +39,6 @@ REDIS = { SECRET_KEY = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' -DJANGO_ADMIN_ENABLED = True - DEFAULT_PERMISSIONS = {} LOGGING = { diff --git a/netbox/netbox/plugins/urls.py b/netbox/netbox/plugins/urls.py index 075bda811..7a9f30c7e 100644 --- a/netbox/netbox/plugins/urls.py +++ b/netbox/netbox/plugins/urls.py @@ -3,13 +3,11 @@ from importlib import import_module from django.apps import apps from django.conf import settings from django.conf.urls import include -from django.contrib.admin.views.decorators import staff_member_required from django.urls import path from django.utils.module_loading import import_string, module_has_submodule from . import views -# Initialize URL base, API, and admin URL patterns for plugins plugin_patterns = [] plugin_api_patterns = [ path('', views.PluginsAPIRootView.as_view(), name='api-root'), diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 358f41ff8..206a58cff 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -110,7 +110,6 @@ DEFAULT_PERMISSIONS = getattr(configuration, 'DEFAULT_PERMISSIONS', { 'users.delete_token': ({'user': '$user'},), }) DEVELOPER = getattr(configuration, 'DEVELOPER', False) -DJANGO_ADMIN_ENABLED = getattr(configuration, 'DJANGO_ADMIN_ENABLED', False) DOCS_ROOT = getattr(configuration, 'DOCS_ROOT', os.path.join(os.path.dirname(BASE_DIR), 'docs')) EMAIL = getattr(configuration, 'EMAIL', {}) EVENTS_PIPELINE = getattr(configuration, 'EVENTS_PIPELINE', ( @@ -373,7 +372,6 @@ SERVER_EMAIL = EMAIL.get('FROM_EMAIL') # INSTALLED_APPS = [ - 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -411,8 +409,6 @@ INSTALLED_APPS = [ ] if not DEBUG: INSTALLED_APPS.remove('debug_toolbar') -if not DJANGO_ADMIN_ENABLED: - INSTALLED_APPS.remove('django.contrib.admin') # Middleware MIDDLEWARE = [ @@ -549,7 +545,6 @@ EXEMPT_EXCLUDE_MODELS = ( # All URLs starting with a string listed here are exempt from maintenance mode enforcement MAINTENANCE_EXEMPT_PATHS = ( - f'/{BASE_PATH}admin/', f'/{BASE_PATH}extras/config-revisions/', # Allow modifying the configuration LOGIN_URL, LOGIN_REDIRECT_URL, diff --git a/netbox/netbox/tests/dummy_plugin/admin.py b/netbox/netbox/tests/dummy_plugin/admin.py deleted file mode 100644 index 83bc22ad8..000000000 --- a/netbox/netbox/tests/dummy_plugin/admin.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.contrib import admin - -from netbox.admin import admin_site -from .models import DummyModel - - -@admin.register(DummyModel, site=admin_site) -class DummyModelAdmin(admin.ModelAdmin): - list_display = ('name', 'number') diff --git a/netbox/netbox/tests/test_plugins.py b/netbox/netbox/tests/test_plugins.py index 351fef9e2..ba44378c5 100644 --- a/netbox/netbox/tests/test_plugins.py +++ b/netbox/netbox/tests/test_plugins.py @@ -36,12 +36,6 @@ class PluginTest(TestCase): instance.delete() self.assertIsNone(instance.pk) - def test_admin(self): - - # Test admin view URL resolution - url = reverse('admin:dummy_plugin_dummymodel_add') - self.assertEqual(url, '/admin/dummy_plugin/dummymodel/add/') - @override_settings(LOGIN_REQUIRED=False) def test_views(self): diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index b0175ec04..08c9a46a8 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -77,11 +77,6 @@ _patterns = [ path('api/plugins/', include((plugin_api_patterns, 'plugins-api'))), ] -# Django admin UI -if settings.DJANGO_ADMIN_ENABLED: - from .admin import admin_site - _patterns.append(path('admin/', admin_site.urls)) - # django-debug-toolbar if settings.DEBUG: import debug_toolbar diff --git a/netbox/templates/inc/user_menu.html b/netbox/templates/inc/user_menu.html index 1b6757416..e27be3323 100644 --- a/netbox/templates/inc/user_menu.html +++ b/netbox/templates/inc/user_menu.html @@ -36,11 +36,6 @@
- {% if config.DJANGO_ADMIN_ENABLED and request.user.is_staff %} - - {% trans "Django Admin" %} - - {% endif %} {% trans "Profile" %} diff --git a/netbox/users/admin.py b/netbox/users/admin.py deleted file mode 100644 index 0fa7e0ca2..000000000 --- a/netbox/users/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin -from django.contrib.auth.models import Group as DjangoGroup - -# Prevent the stock Django Group model from appearing in the admin UI (if enabled) -admin.site.unregister(DjangoGroup) From 8cd0a3215ca64ef57cfe550df23c73024feb9334 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 30 Sep 2024 15:26:14 -0700 Subject: [PATCH 002/190] 16783 Add status field to InventoryItem (#17627) * 16783 Add status field to InventoryItem * 16783 fix tests * 16783 fix tests * 16783 review changes --- docs/models/dcim/inventoryitem.md | 4 ++++ .../api/serializers_/device_components.py | 3 ++- netbox/dcim/choices.py | 24 +++++++++++++++++++ netbox/dcim/filtersets.py | 6 ++++- netbox/dcim/forms/bulk_edit.py | 8 ++++++- netbox/dcim/forms/bulk_import.py | 7 +++++- netbox/dcim/forms/filtersets.py | 6 ++++- netbox/dcim/forms/model_forms.py | 4 ++-- .../migrations/0191_inventoryitem_status.py | 18 ++++++++++++++ netbox/dcim/models/device_components.py | 11 ++++++++- netbox/dcim/tables/devices.py | 11 +++++---- netbox/dcim/tests/test_filtersets.py | 10 +++++--- netbox/dcim/tests/test_views.py | 10 ++++---- netbox/templates/dcim/inventoryitem.html | 4 ++++ 14 files changed, 107 insertions(+), 19 deletions(-) create mode 100644 netbox/dcim/migrations/0191_inventoryitem_status.py diff --git a/docs/models/dcim/inventoryitem.md b/docs/models/dcim/inventoryitem.md index b9029f75c..a6dfa32db 100644 --- a/docs/models/dcim/inventoryitem.md +++ b/docs/models/dcim/inventoryitem.md @@ -44,3 +44,7 @@ The serial number assigned by the manufacturer. ### Asset Tag A unique, locally-administered label used to identify hardware resources. + +### Status + +The inventory item's operational status. diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index 60d6561df..db029be7b 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -345,11 +345,12 @@ class InventoryItemSerializer(NetBoxModelSerializer): ) component = serializers.SerializerMethodField(read_only=True, allow_null=True) _depth = serializers.IntegerField(source='level', read_only=True) + status = ChoiceField(choices=InventoryItemStatusChoices, required=False) class Meta: model = InventoryItem fields = [ - 'id', 'url', 'display_url', 'display', 'device', 'parent', 'name', 'label', 'role', 'manufacturer', + 'id', 'url', 'display_url', 'display', 'device', 'parent', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description', 'component_type', 'component_id', 'component', 'tags', 'custom_fields', 'created', 'last_updated', '_depth', ] diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 848f57d7e..89ca76870 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1648,3 +1648,27 @@ class VirtualDeviceContextStatusChoices(ChoiceSet): (STATUS_PLANNED, _('Planned'), 'cyan'), (STATUS_OFFLINE, _('Offline'), 'red'), ] + + +# +# InventoryItem +# + +class InventoryItemStatusChoices(ChoiceSet): + key = 'InventoryItem.status' + + STATUS_OFFLINE = 'offline' + STATUS_ACTIVE = 'active' + STATUS_PLANNED = 'planned' + STATUS_STAGED = 'staged' + STATUS_FAILED = 'failed' + STATUS_DECOMMISSIONING = 'decommissioning' + + CHOICES = [ + (STATUS_OFFLINE, _('Offline'), 'gray'), + (STATUS_ACTIVE, _('Active'), 'green'), + (STATUS_PLANNED, _('Planned'), 'cyan'), + (STATUS_STAGED, _('Staged'), 'blue'), + (STATUS_FAILED, _('Failed'), 'red'), + (STATUS_DECOMMISSIONING, _('Decommissioning'), 'yellow'), + ] diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 6517aadb4..c51703c93 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1860,10 +1860,14 @@ class InventoryItemFilterSet(DeviceComponentFilterSet, NetBoxModelFilterSet): serial = MultiValueCharFilter( lookup_expr='iexact' ) + status = django_filters.MultipleChoiceFilter( + choices=InventoryItemStatusChoices, + null_value=None + ) class Meta: model = InventoryItem - fields = ('id', 'name', 'label', 'part_id', 'asset_tag', 'description', 'discovered') + fields = ('id', 'name', 'label', 'part_id', 'asset_tag', 'status', 'description', 'discovered') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 96036f4da..1224f6aea 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -1661,10 +1661,16 @@ class InventoryItemBulkEditForm( queryset=Manufacturer.objects.all(), required=False ) + status = forms.ChoiceField( + label=_('Status'), + choices=add_blank_choice(InventoryItemStatusChoices), + required=False, + initial='' + ) model = InventoryItem fieldsets = ( - FieldSet('device', 'label', 'role', 'manufacturer', 'part_id', 'description'), + FieldSet('device', 'label', 'role', 'manufacturer', 'part_id', 'status', 'description'), ) nullable_fields = ('label', 'role', 'manufacturer', 'part_id', 'description') diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index e9c8b362e..f1639099e 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -1103,11 +1103,16 @@ class InventoryItemImportForm(NetBoxModelImportForm): required=False, help_text=_('Component Name') ) + status = CSVChoiceField( + label=_('Status'), + choices=InventoryItemStatusChoices, + help_text=_('Operational status') + ) class Meta: model = InventoryItem fields = ( - 'device', 'name', 'label', 'role', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag', 'discovered', + 'device', 'name', 'label', 'status', 'role', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag', 'discovered', 'description', 'tags', 'component_type', 'component_name', ) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index e2b6fda07..e6ffe0906 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -35,7 +35,6 @@ __all__ = ( 'LocationFilterForm', 'ManufacturerFilterForm', 'ModuleFilterForm', - 'ModuleFilterForm', 'ModuleBayFilterForm', 'ModuleTypeFilterForm', 'PlatformFilterForm', @@ -1553,6 +1552,11 @@ class InventoryItemFilterForm(DeviceComponentFilterForm): choices=BOOLEAN_WITH_BLANK_CHOICES ) ) + status = forms.MultipleChoiceField( + label=_('Status'), + choices=InventoryItemStatusChoices, + required=False + ) tag = TagFilterField(model) diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 4f08ea896..df4520ad3 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -1576,7 +1576,7 @@ class InventoryItemForm(DeviceComponentForm): ) fieldsets = ( - FieldSet('device', 'parent', 'name', 'label', 'role', 'description', 'tags', name=_('Inventory Item')), + FieldSet('device', 'parent', 'name', 'label', 'status', 'role', 'description', 'tags', name=_('Inventory Item')), FieldSet('manufacturer', 'part_id', 'serial', 'asset_tag', name=_('Hardware')), FieldSet( TabbedGroups( @@ -1596,7 +1596,7 @@ class InventoryItemForm(DeviceComponentForm): model = InventoryItem fields = [ 'device', 'parent', 'name', 'label', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', - 'description', 'tags', + 'status', 'description', 'tags', ] def __init__(self, *args, **kwargs): diff --git a/netbox/dcim/migrations/0191_inventoryitem_status.py b/netbox/dcim/migrations/0191_inventoryitem_status.py new file mode 100644 index 000000000..23daf903d --- /dev/null +++ b/netbox/dcim/migrations/0191_inventoryitem_status.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.9 on 2024-09-26 20:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0190_nested_modules'), + ] + + operations = [ + migrations.AddField( + model_name='inventoryitem', + name='status', + field=models.CharField(default='active', max_length=50), + ), + ] diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index f5fbaa956..9f18032e5 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -1244,6 +1244,12 @@ class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): ct_field='component_type', fk_field='component_id' ) + status = models.CharField( + verbose_name=_('status'), + max_length=50, + choices=InventoryItemStatusChoices, + default=InventoryItemStatusChoices.STATUS_ACTIVE + ) role = models.ForeignKey( to='dcim.InventoryItemRole', on_delete=models.PROTECT, @@ -1285,7 +1291,7 @@ class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): objects = TreeManager() - clone_fields = ('device', 'parent', 'role', 'manufacturer', 'part_id',) + clone_fields = ('device', 'parent', 'role', 'manufacturer', 'status', 'part_id') class Meta: ordering = ('device__id', 'parent__id', '_name') @@ -1334,3 +1340,6 @@ class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): raise ValidationError({ "device": _("Cannot assign inventory item to component on another device") }) + + def get_status_color(self): + return InventoryItemStatusChoices.colors.get(self.status) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 2fa82dc43..efa5efddb 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -946,6 +946,9 @@ class InventoryItemTable(DeviceComponentTable): verbose_name=_('Discovered'), false_mark=None ) + status = columns.ChoiceFieldColumn( + verbose_name=_('Status'), + ) parent = tables.Column( linkify=True, verbose_name=_('Parent'), @@ -958,11 +961,11 @@ class InventoryItemTable(DeviceComponentTable): class Meta(NetBoxTable.Meta): model = models.InventoryItem fields = ( - 'pk', 'id', 'name', 'device', 'parent', 'component', 'label', 'role', 'manufacturer', 'part_id', 'serial', + 'pk', 'id', 'name', 'device', 'parent', 'component', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'discovered', 'tags', 'created', 'last_updated', ) default_columns = ( - 'pk', 'name', 'device', 'label', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', + 'pk', 'name', 'device', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', ) @@ -978,11 +981,11 @@ class DeviceInventoryItemTable(InventoryItemTable): class Meta(NetBoxTable.Meta): model = models.InventoryItem fields = ( - 'pk', 'id', 'name', 'label', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', + 'pk', 'id', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', 'description', 'discovered', 'tags', 'actions', ) default_columns = ( - 'pk', 'name', 'label', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', + 'pk', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', ) diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index afb360d76..714b1af9c 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -4751,9 +4751,9 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests): ) inventory_items = ( - InventoryItem(device=devices[0], role=roles[0], manufacturer=manufacturers[0], name='Inventory Item 1', label='A', part_id='1001', serial='ABC', asset_tag='1001', discovered=True, description='First', component=components[0]), - InventoryItem(device=devices[1], role=roles[1], manufacturer=manufacturers[1], name='Inventory Item 2', label='B', part_id='1002', serial='DEF', asset_tag='1002', discovered=True, description='Second', component=components[1]), - InventoryItem(device=devices[2], role=roles[2], manufacturer=manufacturers[2], name='Inventory Item 3', label='C', part_id='1003', serial='GHI', asset_tag='1003', discovered=False, description='Third', component=components[2]), + InventoryItem(device=devices[0], role=roles[0], manufacturer=manufacturers[0], name='Inventory Item 1', label='A', part_id='1001', serial='ABC', asset_tag='1001', discovered=True, status=ModuleStatusChoices.STATUS_ACTIVE, description='First', component=components[0]), + InventoryItem(device=devices[1], role=roles[1], manufacturer=manufacturers[1], name='Inventory Item 2', label='B', part_id='1002', serial='DEF', asset_tag='1002', discovered=True, status=ModuleStatusChoices.STATUS_PLANNED, description='Second', component=components[1]), + InventoryItem(device=devices[2], role=roles[2], manufacturer=manufacturers[2], name='Inventory Item 3', label='C', part_id='1003', serial='GHI', asset_tag='1003', discovered=False, status=ModuleStatusChoices.STATUS_FAILED, description='Third', component=components[2]), ) for i in inventory_items: i.save() @@ -4881,6 +4881,10 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'component_type': 'dcim.interface'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + def test_status(self): + params = {'status': [InventoryItemStatusChoices.STATUS_PLANNED, InventoryItemStatusChoices.STATUS_FAILED]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class InventoryItemRoleTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = InventoryItemRole.objects.all() diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 7d6c34337..a87d92642 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -2903,6 +2903,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase): 'part_id': '123456', 'serial': '123ABC', 'asset_tag': 'ABC123', + 'status': InventoryItemStatusChoices.STATUS_ACTIVE, 'description': 'An inventory item', 'tags': [t.pk for t in tags], } @@ -2916,6 +2917,7 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase): 'discovered': False, 'part_id': '123456', 'serial': '123ABC', + 'status': InventoryItemStatusChoices.STATUS_ACTIVE, 'description': 'An inventory item', 'tags': [t.pk for t in tags], } @@ -2927,10 +2929,10 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase): } cls.csv_data = ( - "device,name,parent", - "Device 1,Inventory Item 4,Inventory Item 1", - "Device 1,Inventory Item 5,Inventory Item 2", - "Device 1,Inventory Item 6,Inventory Item 3", + "device,name,parent,status", + "Device 1,Inventory Item 4,Inventory Item 1,active", + "Device 1,Inventory Item 5,Inventory Item 2,planned", + "Device 1,Inventory Item 6,Inventory Item 3,failed", ) cls.csv_update_data = ( diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index 44648d53e..f17bf2ade 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -56,6 +56,10 @@ {% trans "Asset Tag" %} {{ object.asset_tag|placeholder }} + + {% trans "Status" %} + {% badge object.get_status_display bg_color=object.get_status_color %} + {% trans "Description" %} {{ object.description|placeholder }} From 2c68aca344e64a2d6dbd8491b3c2eea759776b4c Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 2 Oct 2024 05:51:41 -0700 Subject: [PATCH 003/190] 17195 Add color to PowerOutlet (#17623) * 17195 Add color to PowerOutlet * 17195 Add color to PowerOutlet * Reorder serializer fields * Misc cleanup --------- Co-authored-by: Jeremy Stretch --- docs/models/dcim/poweroutlet.md | 4 ++++ .../api/serializers_/device_components.py | 2 +- netbox/dcim/filtersets.py | 2 +- netbox/dcim/forms/bulk_create.py | 2 +- netbox/dcim/forms/bulk_edit.py | 4 ++-- netbox/dcim/forms/bulk_import.py | 2 +- netbox/dcim/forms/filtersets.py | 6 +++++- netbox/dcim/forms/model_forms.py | 4 ++-- netbox/dcim/graphql/types.py | 1 + .../dcim/migrations/0191_poweroutlet_color.py | 19 +++++++++++++++++++ netbox/dcim/models/device_components.py | 4 ++++ netbox/dcim/tables/devices.py | 11 ++++++----- netbox/dcim/tests/test_filtersets.py | 10 +++++++--- netbox/templates/dcim/poweroutlet.html | 10 ++++++++++ 14 files changed, 64 insertions(+), 17 deletions(-) create mode 100644 netbox/dcim/migrations/0191_poweroutlet_color.py diff --git a/docs/models/dcim/poweroutlet.md b/docs/models/dcim/poweroutlet.md index 5c8bd6ff0..fe9390056 100644 --- a/docs/models/dcim/poweroutlet.md +++ b/docs/models/dcim/poweroutlet.md @@ -29,6 +29,10 @@ An alternative physical label identifying the power outlet. The type of power outlet. +### Color + +The power outlet's color (optional). + ### Power Port When modeling a device which redistributes power from an upstream supply, such as a power distribution unit (PDU), each power outlet should be mapped to the respective [power port](./powerport.md) on the device which supplies power. For example, a 24-outlet PDU may two power ports, each distributing power to 12 of its outlets. diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index db029be7b..e285ce349 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -155,7 +155,7 @@ class PowerOutletSerializer(NetBoxModelSerializer, CabledObjectSerializer, Conne class Meta: model = PowerOutlet fields = [ - 'id', 'url', 'display_url', 'display', 'device', 'module', 'name', 'label', 'type', 'power_port', + 'id', 'url', 'display_url', 'display', 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'description', 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'connected_endpoints', 'connected_endpoints_type', 'connected_endpoints_reachable', 'tags', 'custom_fields', 'created', 'last_updated', '_occupied', diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index c51703c93..d49e937cd 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1594,7 +1594,7 @@ class PowerOutletFilterSet( class Meta: model = PowerOutlet fields = ( - 'id', 'name', 'label', 'feed_leg', 'description', 'mark_connected', 'cable_end', + 'id', 'name', 'label', 'feed_leg', 'description', 'color', 'mark_connected', 'cable_end', ) diff --git a/netbox/dcim/forms/bulk_create.py b/netbox/dcim/forms/bulk_create.py index 2939b986e..0ea3aee63 100644 --- a/netbox/dcim/forms/bulk_create.py +++ b/netbox/dcim/forms/bulk_create.py @@ -69,7 +69,7 @@ class PowerPortBulkCreateForm( class PowerOutletBulkCreateForm( - form_from_model(PowerOutlet, ['type', 'feed_leg', 'mark_connected']), + form_from_model(PowerOutlet, ['type', 'color', 'feed_leg', 'mark_connected']), DeviceBulkAddComponentForm ): model = PowerOutlet diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 1224f6aea..01e5f138e 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -1361,7 +1361,7 @@ class PowerPortBulkEditForm( class PowerOutletBulkEditForm( ComponentBulkEditForm, - form_from_model(PowerOutlet, ['label', 'type', 'feed_leg', 'power_port', 'mark_connected', 'description']) + form_from_model(PowerOutlet, ['label', 'type', 'color', 'feed_leg', 'power_port', 'mark_connected', 'description']) ): mark_connected = forms.NullBooleanField( label=_('Mark connected'), @@ -1371,7 +1371,7 @@ class PowerOutletBulkEditForm( model = PowerOutlet fieldsets = ( - FieldSet('module', 'type', 'label', 'description', 'mark_connected'), + FieldSet('module', 'type', 'label', 'description', 'mark_connected', 'color'), FieldSet('feed_leg', 'power_port', name=_('Power')), ) nullable_fields = ('module', 'label', 'type', 'feed_leg', 'power_port', 'description') diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index f1639099e..521e47a50 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -798,7 +798,7 @@ class PowerOutletImportForm(NetBoxModelImportForm): class Meta: model = PowerOutlet - fields = ('device', 'name', 'label', 'type', 'mark_connected', 'power_port', 'feed_leg', 'description', 'tags') + fields = ('device', 'name', 'label', 'type', 'color', 'mark_connected', 'power_port', 'feed_leg', 'description', 'tags') def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index e6ffe0906..10770824c 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -1303,7 +1303,7 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm): model = PowerOutlet fieldsets = ( FieldSet('q', 'filter_id', 'tag'), - FieldSet('name', 'label', 'type', name=_('Attributes')), + FieldSet('name', 'label', 'type', 'color', name=_('Attributes')), FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')), FieldSet( 'device_type_id', 'device_role_id', 'device_id', 'device_status', 'virtual_chassis_id', @@ -1317,6 +1317,10 @@ class PowerOutletFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm): required=False ) tag = TagFilterField(model) + color = ColorField( + label=_('Color'), + required=False + ) class InterfaceFilterForm(PathEndpointFilterForm, DeviceComponentFilterForm): diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index df4520ad3..c22aeeea3 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -1285,7 +1285,7 @@ class PowerOutletForm(ModularDeviceComponentForm): fieldsets = ( FieldSet( - 'device', 'module', 'name', 'label', 'type', 'power_port', 'feed_leg', 'mark_connected', 'description', + 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', 'description', 'tags', ), ) @@ -1293,7 +1293,7 @@ class PowerOutletForm(ModularDeviceComponentForm): class Meta: model = PowerOutlet fields = [ - 'device', 'module', 'name', 'label', 'type', 'power_port', 'feed_leg', 'mark_connected', 'description', + 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', 'description', 'tags', ] diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 24ba5cca4..b951aead0 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -568,6 +568,7 @@ class PowerFeedType(NetBoxObjectType, CabledObjectMixin, PathEndpointMixin): ) class PowerOutletType(ModularComponentType, CabledObjectMixin, PathEndpointMixin): power_port: Annotated["PowerPortType", strawberry.lazy('dcim.graphql.types')] | None + color: str @strawberry_django.type( diff --git a/netbox/dcim/migrations/0191_poweroutlet_color.py b/netbox/dcim/migrations/0191_poweroutlet_color.py new file mode 100644 index 000000000..6d03eecdc --- /dev/null +++ b/netbox/dcim/migrations/0191_poweroutlet_color.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.9 on 2024-09-26 19:31 + +import utilities.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0190_nested_modules'), + ] + + operations = [ + migrations.AddField( + model_name='poweroutlet', + name='color', + field=utilities.fields.ColorField(blank=True, max_length=6), + ), + ] diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 9f18032e5..54628aa73 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -481,6 +481,10 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki blank=True, help_text=_('Phase (for three-phase feeds)') ) + color = ColorField( + verbose_name=_('color'), + blank=True + ) clone_fields = ('device', 'module', 'type', 'power_port', 'feed_leg') diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index efa5efddb..380702b05 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -512,6 +512,7 @@ class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable): verbose_name=_('Power Port'), linkify=True ) + color = columns.ColorColumn() tags = columns.TagColumn( url_name='dcim:poweroutlet_list' ) @@ -520,10 +521,10 @@ class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable): model = models.PowerOutlet fields = ( 'pk', 'id', 'name', 'device', 'module_bay', 'module', 'label', 'type', 'description', 'power_port', - 'feed_leg', 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', + 'color', 'feed_leg', 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', 'tags', 'created', 'last_updated', ) - default_columns = ('pk', 'name', 'device', 'label', 'type', 'power_port', 'feed_leg', 'description') + default_columns = ('pk', 'name', 'device', 'label', 'type', 'color', 'power_port', 'feed_leg', 'description') class DevicePowerOutletTable(PowerOutletTable): @@ -540,11 +541,11 @@ class DevicePowerOutletTable(PowerOutletTable): class Meta(CableTerminationTable.Meta, DeviceComponentTable.Meta): model = models.PowerOutlet fields = ( - 'pk', 'id', 'name', 'module_bay', 'module', 'label', 'type', 'power_port', 'feed_leg', 'description', - 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'tags', 'actions', + 'pk', 'id', 'name', 'module_bay', 'module', 'label', 'type', 'color', 'power_port', 'feed_leg', + 'description', 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'tags', 'actions', ) default_columns = ( - 'pk', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description', 'cable', 'connection', + 'pk', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'description', 'cable', 'connection', ) diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 714b1af9c..b1fbcdcb5 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -3421,9 +3421,9 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF PowerPort.objects.bulk_create(power_ports) power_outlets = ( - PowerOutlet(device=devices[0], module=modules[0], name='Power Outlet 1', label='A', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A, description='First'), - PowerOutlet(device=devices[1], module=modules[1], name='Power Outlet 2', label='B', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B, description='Second'), - PowerOutlet(device=devices[2], module=modules[2], name='Power Outlet 3', label='C', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_C, description='Third'), + PowerOutlet(device=devices[0], module=modules[0], name='Power Outlet 1', label='A', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A, description='First', color='ff0000'), + PowerOutlet(device=devices[1], module=modules[1], name='Power Outlet 2', label='B', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B, description='Second', color='00ff00'), + PowerOutlet(device=devices[2], module=modules[2], name='Power Outlet 3', label='C', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_C, description='Third', color='0000ff'), ) PowerOutlet.objects.bulk_create(power_outlets) @@ -3444,6 +3444,10 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF params = {'description': ['First', 'Second']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_color(self): + params = {'color': ['ff0000', '00ff00']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_feed_leg(self): params = {'feed_leg': [PowerOutletFeedLegChoices.FEED_LEG_A, PowerOutletFeedLegChoices.FEED_LEG_B]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index ef02ec52a..146f6d580 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -40,6 +40,16 @@ {% trans "Description" %} {{ object.description|placeholder }} + + {% trans "Color" %} + + {% if object.color %} +   + {% else %} + {{ ''|placeholder }} + {% endif %} + + {% trans "Power Port" %} {{ object.power_port|linkify|placeholder }} From 1969f0dc71f7c5fe75d0db54bd47b828b120fddd Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 2 Oct 2024 12:52:27 -0700 Subject: [PATCH 004/190] fix migrations --- .../{0191_poweroutlet_color.py => 0192_poweroutlet_color.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename netbox/dcim/migrations/{0191_poweroutlet_color.py => 0192_poweroutlet_color.py} (88%) diff --git a/netbox/dcim/migrations/0191_poweroutlet_color.py b/netbox/dcim/migrations/0192_poweroutlet_color.py similarity index 88% rename from netbox/dcim/migrations/0191_poweroutlet_color.py rename to netbox/dcim/migrations/0192_poweroutlet_color.py index 6d03eecdc..4fb5f4663 100644 --- a/netbox/dcim/migrations/0191_poweroutlet_color.py +++ b/netbox/dcim/migrations/0192_poweroutlet_color.py @@ -7,7 +7,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0190_nested_modules'), + ('dcim', '0191_inventoryitem_status'), ] operations = [ From 3f469b0b0a690dfc9b2a03f95d8cea5ea846e005 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 10 Oct 2024 06:08:58 -0700 Subject: [PATCH 005/190] 17476 Upgrade to Django 5.1 (#17620) * 17476 Upgrade to Django 5.1 * 16136 fix migrations * 17476 update remove GFK from fields * 17476 fix * 17476 update django to bugfix release * fix comma --- netbox/extras/forms/bulk_import.py | 2 +- netbox/extras/migrations/0002_squashed_0059.py | 4 ---- netbox/extras/migrations/0087_squashed_0098.py | 5 ++--- netbox/ipam/forms/model_forms.py | 2 +- netbox/vpn/forms/model_forms.py | 2 +- requirements.txt | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py index 55c9cd764..258df8264 100644 --- a/netbox/extras/forms/bulk_import.py +++ b/netbox/extras/forms/bulk_import.py @@ -202,7 +202,7 @@ class EventRuleImportForm(NetBoxModelImportForm): model = EventRule fields = ( 'name', 'description', 'enabled', 'conditions', 'object_types', 'event_types', 'action_type', - 'action_object', 'comments', 'tags' + 'comments', 'tags' ) def clean(self): diff --git a/netbox/extras/migrations/0002_squashed_0059.py b/netbox/extras/migrations/0002_squashed_0059.py index 98bed255a..a403a0e19 100644 --- a/netbox/extras/migrations/0002_squashed_0059.py +++ b/netbox/extras/migrations/0002_squashed_0059.py @@ -131,10 +131,6 @@ class Migration(migrations.Migration): name='webhook', unique_together={('payload_url', 'type_create', 'type_update', 'type_delete')}, ), - migrations.AlterIndexTogether( - name='taggeditem', - index_together={('content_type', 'object_id')}, - ), migrations.AlterUniqueTogether( name='exporttemplate', unique_together={('content_type', 'name')}, diff --git a/netbox/extras/migrations/0087_squashed_0098.py b/netbox/extras/migrations/0087_squashed_0098.py index 55f276ecd..bbe7f79f5 100644 --- a/netbox/extras/migrations/0087_squashed_0098.py +++ b/netbox/extras/migrations/0087_squashed_0098.py @@ -98,10 +98,9 @@ class Migration(migrations.Migration): name='object_types', field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'), ), - migrations.RenameIndex( + migrations.AddIndex( model_name='taggeditem', - new_name='extras_tagg_content_717743_idx', - old_fields=('content_type', 'object_id'), + index=models.Index(fields=['content_type', 'object_id'], name='extras_tagg_content_717743_idx'), ), migrations.CreateModel( name='Bookmark', diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index f98f8b24f..156e7c435 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -591,7 +591,7 @@ class VLANGroupForm(NetBoxModelForm): class Meta: model = VLANGroup fields = [ - 'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'scope', 'tags', + 'name', 'slug', 'description', 'vid_ranges', 'scope_type', 'tags', ] def __init__(self, *args, **kwargs): diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py index a17ca9a5e..dee98afd3 100644 --- a/netbox/vpn/forms/model_forms.py +++ b/netbox/vpn/forms/model_forms.py @@ -258,7 +258,7 @@ class TunnelTerminationForm(NetBoxModelForm): class Meta: model = TunnelTermination fields = [ - 'tunnel', 'role', 'termination', 'outside_ip', 'tags', + 'tunnel', 'role', 'outside_ip', 'tags', ] def __init__(self, *args, initial=None, **kwargs): diff --git a/requirements.txt b/requirements.txt index c3d87e52f..fca329ccc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==5.0.9 +Django==5.1.2 django-cors-headers==4.4.0 django-debug-toolbar==4.4.6 django-filter==24.3 From 5b2241aaaf8f52c3ba425233e8d8cb815197fbb8 Mon Sep 17 00:00:00 2001 From: Antoine Keranflec'h Date: Thu, 10 Oct 2024 15:38:48 +0200 Subject: [PATCH 006/190] fix(17542) add contact to tunnels --- netbox/vpn/models/tunnels.py | 6 +++--- netbox/vpn/views.py | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/netbox/vpn/models/tunnels.py b/netbox/vpn/models/tunnels.py index 6f4fa4182..6224959eb 100644 --- a/netbox/vpn/models/tunnels.py +++ b/netbox/vpn/models/tunnels.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.translation import gettext_lazy as _ from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel -from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, TagsMixin +from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, TagsMixin, ContactsMixin from vpn.choices import * __all__ = ( @@ -16,7 +16,7 @@ __all__ = ( ) -class TunnelGroup(OrganizationalModel): +class TunnelGroup(ContactsMixin, OrganizationalModel): """ An administrative grouping of Tunnels. This can be used to correlate peer-to-peer tunnels which form a mesh, for example. @@ -30,7 +30,7 @@ class TunnelGroup(OrganizationalModel): return reverse('vpn:tunnelgroup', args=[self.pk]) -class Tunnel(PrimaryModel): +class Tunnel(ContactsMixin, PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, diff --git a/netbox/vpn/views.py b/netbox/vpn/views.py index ac8ce3667..73b2b04c0 100644 --- a/netbox/vpn/views.py +++ b/netbox/vpn/views.py @@ -62,6 +62,9 @@ class TunnelGroupBulkDeleteView(generic.BulkDeleteView): filterset = filtersets.TunnelGroupFilterSet table = tables.TunnelGroupTable +@register_model_view(Tunnel, 'contacts') +class TunnelGroupContactsView(ObjectContactsView): + queryset = TunnelGroup.objects.all() # # Tunnels @@ -121,6 +124,9 @@ class TunnelBulkDeleteView(generic.BulkDeleteView): filterset = filtersets.TunnelFilterSet table = tables.TunnelTable +@register_model_view(Tunnel, 'contacts') +class TunnelContactsView(ObjectContactsView): + queryset = Tunnel.objects.all() # # Tunnel terminations From ed1327eeb729e0cf4805698aef74df64cf7534de Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 10 Oct 2024 06:59:19 -0700 Subject: [PATCH 007/190] 16546 define get_absolute_url method in NetBoxModel (#17693) * 16546 define get_absolute_url method in NetBoxModel * 16546 define get_absolute_url method in NetBoxModel * 16546 define get_absolute_url method in NetBoxModel * 16546 move get_absolute_url to NetBoxFeatureSet * 16546 fix CircuitTermination * Fix linebreaks --------- Co-authored-by: Jeremy Stretch --- netbox/circuits/models/circuits.py | 9 ----- netbox/circuits/models/providers.py | 9 ----- netbox/core/models/data.py | 3 -- netbox/dcim/models/cables.py | 3 -- netbox/dcim/models/device_components.py | 33 ------------------- netbox/dcim/models/devices.py | 27 --------------- netbox/dcim/models/power.py | 6 ---- netbox/dcim/models/racks.py | 12 ------- netbox/dcim/models/sites.py | 12 ------- netbox/ipam/models/asns.py | 6 ---- netbox/ipam/models/fhrp.py | 3 -- netbox/ipam/models/ip.py | 18 ---------- netbox/ipam/models/services.py | 6 ---- netbox/ipam/models/vlans.py | 6 ---- netbox/ipam/models/vrfs.py | 6 ---- netbox/netbox/models/__init__.py | 4 +++ netbox/tenancy/models/contacts.py | 9 ----- netbox/tenancy/models/tenants.py | 6 ---- netbox/virtualization/models/clusters.py | 9 ----- .../virtualization/models/virtualmachines.py | 9 ----- netbox/vpn/models/crypto.py | 15 --------- netbox/vpn/models/l2vpn.py | 6 ---- netbox/vpn/models/tunnels.py | 6 ---- netbox/wireless/models.py | 9 ----- 24 files changed, 4 insertions(+), 228 deletions(-) diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index 68c938aa9..f34df0d6a 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -28,9 +28,6 @@ class CircuitType(OrganizationalModel): blank=True ) - def get_absolute_url(self): - return reverse('circuits:circuittype', args=[self.pk]) - class Meta: ordering = ('name',) verbose_name = _('circuit type') @@ -140,9 +137,6 @@ class Circuit(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): def __str__(self): return self.cid - def get_absolute_url(self): - return reverse('circuits:circuit', args=[self.pk]) - def get_status_color(self): return CircuitStatusChoices.colors.get(self.status) @@ -173,9 +167,6 @@ class CircuitGroup(OrganizationalModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('circuits:circuitgroup', args=[self.pk]) - class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLoggedModel): """ diff --git a/netbox/circuits/models/providers.py b/netbox/circuits/models/providers.py index 31c8bccb2..593997527 100644 --- a/netbox/circuits/models/providers.py +++ b/netbox/circuits/models/providers.py @@ -45,9 +45,6 @@ class Provider(ContactsMixin, PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('circuits:provider', args=[self.pk]) - class ProviderAccount(ContactsMixin, PrimaryModel): """ @@ -91,9 +88,6 @@ class ProviderAccount(ContactsMixin, PrimaryModel): return f'{self.account} ({self.name})' return f'{self.account}' - def get_absolute_url(self): - return reverse('circuits:provideraccount', args=[self.pk]) - class ProviderNetwork(PrimaryModel): """ @@ -128,6 +122,3 @@ class ProviderNetwork(PrimaryModel): def __str__(self): return self.name - - def get_absolute_url(self): - return reverse('circuits:providernetwork', args=[self.pk]) diff --git a/netbox/core/models/data.py b/netbox/core/models/data.py index 97f9fdac7..a40b58bc7 100644 --- a/netbox/core/models/data.py +++ b/netbox/core/models/data.py @@ -84,9 +84,6 @@ class DataSource(JobsMixin, PrimaryModel): def __str__(self): return f'{self.name}' - def get_absolute_url(self): - return reverse('core:datasource', args=[self.pk]) - @property def docs_url(self): return f'{settings.STATIC_URL}docs/models/{self._meta.app_label}/{self._meta.model_name}/' diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index f996fe67d..f89d57627 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -116,9 +116,6 @@ class Cable(PrimaryModel): pk = self.pk or self._pk return self.label or f'#{pk}' - def get_absolute_url(self): - return reverse('dcim:cable', args=[self.pk]) - @property def a_terminations(self): if hasattr(self, '_a_terminations'): diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 54628aa73..d25ed261c 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -301,9 +301,6 @@ class ConsolePort(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki verbose_name = _('console port') verbose_name_plural = _('console ports') - def get_absolute_url(self): - return reverse('dcim:consoleport', kwargs={'pk': self.pk}) - class ConsoleServerPort(ModularComponentModel, CabledObjectModel, PathEndpoint, TrackingModelMixin): """ @@ -330,9 +327,6 @@ class ConsoleServerPort(ModularComponentModel, CabledObjectModel, PathEndpoint, verbose_name = _('console server port') verbose_name_plural = _('console server ports') - def get_absolute_url(self): - return reverse('dcim:consoleserverport', kwargs={'pk': self.pk}) - # # Power components @@ -370,9 +364,6 @@ class PowerPort(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracking verbose_name = _('power port') verbose_name_plural = _('power ports') - def get_absolute_url(self): - return reverse('dcim:powerport', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -492,9 +483,6 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki verbose_name = _('power outlet') verbose_name_plural = _('power outlets') - def get_absolute_url(self): - return reverse('dcim:poweroutlet', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -750,9 +738,6 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd verbose_name = _('interface') verbose_name_plural = _('interfaces') - def get_absolute_url(self): - return reverse('dcim:interface', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1011,9 +996,6 @@ class FrontPort(ModularComponentModel, CabledObjectModel, TrackingModelMixin): verbose_name = _('front port') verbose_name_plural = _('front ports') - def get_absolute_url(self): - return reverse('dcim:frontport', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1069,9 +1051,6 @@ class RearPort(ModularComponentModel, CabledObjectModel, TrackingModelMixin): verbose_name = _('rear port') verbose_name_plural = _('rear ports') - def get_absolute_url(self): - return reverse('dcim:rearport', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1128,9 +1107,6 @@ class ModuleBay(ModularComponentModel, TrackingModelMixin, MPTTModel): class MPTTMeta: order_insertion_by = ('module',) - def get_absolute_url(self): - return reverse('dcim:modulebay', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1169,9 +1145,6 @@ class DeviceBay(ComponentModel, TrackingModelMixin): verbose_name = _('device bay') verbose_name_plural = _('device bays') - def get_absolute_url(self): - return reverse('dcim:devicebay', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1215,9 +1188,6 @@ class InventoryItemRole(OrganizationalModel): verbose_name = _('inventory item role') verbose_name_plural = _('inventory item roles') - def get_absolute_url(self): - return reverse('dcim:inventoryitemrole', args=[self.pk]) - class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): """ @@ -1311,9 +1281,6 @@ class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): verbose_name = _('inventory item') verbose_name_plural = _('inventory items') - def get_absolute_url(self): - return reverse('dcim:inventoryitem', kwargs={'pk': self.pk}) - def clean(self): super().clean() diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index a2b78957e..3031673b0 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -54,9 +54,6 @@ class Manufacturer(ContactsMixin, OrganizationalModel): verbose_name = _('manufacturer') verbose_name_plural = _('manufacturers') - def get_absolute_url(self): - return reverse('dcim:manufacturer', args=[self.pk]) - class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): """ @@ -217,9 +214,6 @@ class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): self._original_front_image = self.__dict__.get('front_image') self._original_rear_image = self.__dict__.get('rear_image') - def get_absolute_url(self): - return reverse('dcim:devicetype', args=[self.pk]) - @property def full_name(self): return f"{self.manufacturer} {self.model}" @@ -414,9 +408,6 @@ class ModuleType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): def __str__(self): return self.model - def get_absolute_url(self): - return reverse('dcim:moduletype', args=[self.pk]) - @property def full_name(self): return f"{self.manufacturer} {self.model}" @@ -497,9 +488,6 @@ class DeviceRole(OrganizationalModel): verbose_name = _('device role') verbose_name_plural = _('device roles') - def get_absolute_url(self): - return reverse('dcim:devicerole', args=[self.pk]) - class Platform(OrganizationalModel): """ @@ -527,9 +515,6 @@ class Platform(OrganizationalModel): verbose_name = _('platform') verbose_name_plural = _('platforms') - def get_absolute_url(self): - return reverse('dcim:platform', args=[self.pk]) - def update_interface_bridges(device, interface_templates, module=None): """ @@ -823,9 +808,6 @@ class Device( return f'{self.device_type.manufacturer} {self.device_type.model} ({self.pk})' return super().__str__() - def get_absolute_url(self): - return reverse('dcim:device', args=[self.pk]) - def clean(self): super().clean() @@ -1192,9 +1174,6 @@ class Module(PrimaryModel, ConfigContextModel): def __str__(self): return f'{self.module_bay.name}: {self.module_type} ({self.pk})' - def get_absolute_url(self): - return reverse('dcim:module', args=[self.pk]) - def get_status_color(self): return ModuleStatusChoices.colors.get(self.status) @@ -1343,9 +1322,6 @@ class VirtualChassis(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('dcim:virtualchassis', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -1445,9 +1421,6 @@ class VirtualDeviceContext(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('dcim:virtualdevicecontext', kwargs={'pk': self.pk}) - def get_status_color(self): return VirtualDeviceContextStatusChoices.colors.get(self.status) diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py index 826eaae9c..168428c44 100644 --- a/netbox/dcim/models/power.py +++ b/netbox/dcim/models/power.py @@ -58,9 +58,6 @@ class PowerPanel(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('dcim:powerpanel', args=[self.pk]) - def clean(self): super().clean() @@ -167,9 +164,6 @@ class PowerFeed(PrimaryModel, PathEndpoint, CabledObjectModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('dcim:powerfeed', args=[self.pk]) - def clean(self): super().clean() diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 3aead09ca..226074444 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -165,9 +165,6 @@ class RackType(RackBase): def __str__(self): return self.model - def get_absolute_url(self): - return reverse('dcim:racktype', args=[self.pk]) - @property def full_name(self): return f"{self.manufacturer} {self.model}" @@ -230,9 +227,6 @@ class RackRole(OrganizationalModel): verbose_name = _('rack role') verbose_name_plural = _('rack roles') - def get_absolute_url(self): - return reverse('dcim:rackrole', args=[self.pk]) - class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): """ @@ -364,9 +358,6 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): return f'{self.name} ({self.facility_id})' return self.name - def get_absolute_url(self): - return reverse('dcim:rack', args=[self.pk]) - def clean(self): super().clean() @@ -699,9 +690,6 @@ class RackReservation(PrimaryModel): def __str__(self): return "Reservation for rack {}".format(self.rack) - def get_absolute_url(self): - return reverse('dcim:rackreservation', args=[self.pk]) - def clean(self): super().clean() diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index c1da807ad..7884afa54 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -62,9 +62,6 @@ class Region(ContactsMixin, NestedGroupModel): verbose_name = _('region') verbose_name_plural = _('regions') - def get_absolute_url(self): - return reverse('dcim:region', args=[self.pk]) - def get_site_count(self): return Site.objects.filter( Q(region=self) | @@ -115,9 +112,6 @@ class SiteGroup(ContactsMixin, NestedGroupModel): verbose_name = _('site group') verbose_name_plural = _('site groups') - def get_absolute_url(self): - return reverse('dcim:sitegroup', args=[self.pk]) - def get_site_count(self): return Site.objects.filter( Q(group=self) | @@ -241,9 +235,6 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('dcim:site', args=[self.pk]) - def get_status_color(self): return SiteStatusChoices.colors.get(self.status) @@ -322,9 +313,6 @@ class Location(ContactsMixin, ImageAttachmentsMixin, NestedGroupModel): verbose_name = _('location') verbose_name_plural = _('locations') - def get_absolute_url(self): - return reverse('dcim:location', args=[self.pk]) - def get_status_color(self): return LocationStatusChoices.colors.get(self.status) diff --git a/netbox/ipam/models/asns.py b/netbox/ipam/models/asns.py index d02efd91c..4b51eedbb 100644 --- a/netbox/ipam/models/asns.py +++ b/netbox/ipam/models/asns.py @@ -54,9 +54,6 @@ class ASNRange(OrganizationalModel): def __str__(self): return f'{self.name} ({self.range_as_string()})' - def get_absolute_url(self): - return reverse('ipam:asnrange', args=[self.pk]) - @property def range(self): return range(self.start, self.end + 1) @@ -128,9 +125,6 @@ class ASN(PrimaryModel): def __str__(self): return f'AS{self.asn_with_asdot}' - def get_absolute_url(self): - return reverse('ipam:asn', args=[self.pk]) - @property def asn_asdot(self): """ diff --git a/netbox/ipam/models/fhrp.py b/netbox/ipam/models/fhrp.py index c3a7084b6..bf60f188a 100644 --- a/netbox/ipam/models/fhrp.py +++ b/netbox/ipam/models/fhrp.py @@ -71,9 +71,6 @@ class FHRPGroup(PrimaryModel): return name - def get_absolute_url(self): - return reverse('ipam:fhrpgroup', args=[self.pk]) - class FHRPGroupAssignment(ChangeLoggedModel): interface_type = models.ForeignKey( diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index 0b8e3a8df..7bf97897b 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -71,9 +71,6 @@ class RIR(OrganizationalModel): verbose_name = _('RIR') verbose_name_plural = _('RIRs') - def get_absolute_url(self): - return reverse('ipam:rir', args=[self.pk]) - class Aggregate(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): """ @@ -118,9 +115,6 @@ class Aggregate(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): def __str__(self): return str(self.prefix) - def get_absolute_url(self): - return reverse('ipam:aggregate', args=[self.pk]) - def clean(self): super().clean() @@ -203,9 +197,6 @@ class Role(OrganizationalModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('ipam:role', args=[self.pk]) - class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): """ @@ -303,9 +294,6 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): def __str__(self): return str(self.prefix) - def get_absolute_url(self): - return reverse('ipam:prefix', args=[self.pk]) - def clean(self): super().clean() @@ -551,9 +539,6 @@ class IPRange(ContactsMixin, PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('ipam:iprange', args=[self.pk]) - def clean(self): super().clean() @@ -798,9 +783,6 @@ class IPAddress(ContactsMixin, PrimaryModel): self._original_assigned_object_id = self.__dict__.get('assigned_object_id') self._original_assigned_object_type_id = self.__dict__.get('assigned_object_type_id') - def get_absolute_url(self): - return reverse('ipam:ipaddress', args=[self.pk]) - def get_duplicates(self): return IPAddress.objects.filter( vrf=self.vrf, diff --git a/netbox/ipam/models/services.py b/netbox/ipam/models/services.py index 71f34c66c..e878870cb 100644 --- a/netbox/ipam/models/services.py +++ b/netbox/ipam/models/services.py @@ -59,9 +59,6 @@ class ServiceTemplate(ServiceBase, PrimaryModel): verbose_name = _('service template') verbose_name_plural = _('service templates') - def get_absolute_url(self): - return reverse('ipam:servicetemplate', args=[self.pk]) - class Service(ContactsMixin, ServiceBase, PrimaryModel): """ @@ -102,9 +99,6 @@ class Service(ContactsMixin, ServiceBase, PrimaryModel): verbose_name = _('service') verbose_name_plural = _('services') - def get_absolute_url(self): - return reverse('ipam:service', args=[self.pk]) - @property def parent(self): return self.device or self.virtual_machine diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 998bc9e2c..852dfe148 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -84,9 +84,6 @@ class VLANGroup(OrganizationalModel): verbose_name = _('VLAN group') verbose_name_plural = _('VLAN groups') - def get_absolute_url(self): - return reverse('ipam:vlangroup', args=[self.pk]) - def clean(self): super().clean() @@ -237,9 +234,6 @@ class VLAN(PrimaryModel): def __str__(self): return f'{self.name} ({self.vid})' - def get_absolute_url(self): - return reverse('ipam:vlan', args=[self.pk]) - def clean(self): super().clean() diff --git a/netbox/ipam/models/vrfs.py b/netbox/ipam/models/vrfs.py index 1f9b928f5..f0a6d815e 100644 --- a/netbox/ipam/models/vrfs.py +++ b/netbox/ipam/models/vrfs.py @@ -67,9 +67,6 @@ class VRF(PrimaryModel): return f'{self.name} ({self.rd})' return self.name - def get_absolute_url(self): - return reverse('ipam:vrf', args=[self.pk]) - class RouteTarget(PrimaryModel): """ @@ -96,6 +93,3 @@ class RouteTarget(PrimaryModel): def __str__(self): return self.name - - def get_absolute_url(self): - return reverse('ipam:routetarget', args=[self.pk]) diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py index aea5f00cc..b1f7cfd48 100644 --- a/netbox/netbox/models/__init__.py +++ b/netbox/netbox/models/__init__.py @@ -3,6 +3,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import ObjectDoesNotExist from django.core.validators import ValidationError from django.db import models +from django.urls import reverse from django.utils.translation import gettext_lazy as _ from mptt.models import MPTTModel, TreeForeignKey @@ -40,6 +41,9 @@ class NetBoxFeatureSet( def docs_url(self): return f'{settings.STATIC_URL}docs/models/{self._meta.app_label}/{self._meta.model_name}/' + def get_absolute_url(self): + return reverse(f'{self._meta.app_label}:{self._meta.model_name}', args=[self.pk]) + # # Base model classes diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py index e31330657..46ca97261 100644 --- a/netbox/tenancy/models/contacts.py +++ b/netbox/tenancy/models/contacts.py @@ -32,17 +32,11 @@ class ContactGroup(NestedGroupModel): verbose_name = _('contact group') verbose_name_plural = _('contact groups') - def get_absolute_url(self): - return reverse('tenancy:contactgroup', args=[self.pk]) - class ContactRole(OrganizationalModel): """ Functional role for a Contact assigned to an object. """ - def get_absolute_url(self): - return reverse('tenancy:contactrole', args=[self.pk]) - class Meta: ordering = ('name',) verbose_name = _('contact role') @@ -106,9 +100,6 @@ class Contact(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('tenancy:contact', args=[self.pk]) - class ContactAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLoggedModel): object_type = models.ForeignKey( diff --git a/netbox/tenancy/models/tenants.py b/netbox/tenancy/models/tenants.py index dfc144dd2..118a63d31 100644 --- a/netbox/tenancy/models/tenants.py +++ b/netbox/tenancy/models/tenants.py @@ -32,9 +32,6 @@ class TenantGroup(NestedGroupModel): verbose_name = _('tenant group') verbose_name_plural = _('tenant groups') - def get_absolute_url(self): - return reverse('tenancy:tenantgroup', args=[self.pk]) - class Tenant(ContactsMixin, PrimaryModel): """ @@ -90,6 +87,3 @@ class Tenant(ContactsMixin, PrimaryModel): def __str__(self): return self.name - - def get_absolute_url(self): - return reverse('tenancy:tenant', args=[self.pk]) diff --git a/netbox/virtualization/models/clusters.py b/netbox/virtualization/models/clusters.py index 7f00d72a7..ed1756ee8 100644 --- a/netbox/virtualization/models/clusters.py +++ b/netbox/virtualization/models/clusters.py @@ -25,9 +25,6 @@ class ClusterType(OrganizationalModel): verbose_name = _('cluster type') verbose_name_plural = _('cluster types') - def get_absolute_url(self): - return reverse('virtualization:clustertype', args=[self.pk]) - class ClusterGroup(ContactsMixin, OrganizationalModel): """ @@ -45,9 +42,6 @@ class ClusterGroup(ContactsMixin, OrganizationalModel): verbose_name = _('cluster group') verbose_name_plural = _('cluster groups') - def get_absolute_url(self): - return reverse('virtualization:clustergroup', args=[self.pk]) - class Cluster(ContactsMixin, PrimaryModel): """ @@ -124,9 +118,6 @@ class Cluster(ContactsMixin, PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('virtualization:cluster', args=[self.pk]) - def get_status_color(self): return ClusterStatusChoices.colors.get(self.status) diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index 17929f476..d2ea34bef 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -172,9 +172,6 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co def __str__(self): return self.name - def get_absolute_url(self): - return reverse('virtualization:virtualmachine', args=[self.pk]) - def clean(self): super().clean() @@ -377,9 +374,6 @@ class VMInterface(ComponentModel, BaseInterface, TrackingModelMixin): verbose_name = _('interface') verbose_name_plural = _('interfaces') - def get_absolute_url(self): - return reverse('virtualization:vminterface', kwargs={'pk': self.pk}) - def clean(self): super().clean() @@ -437,6 +431,3 @@ class VirtualDisk(ComponentModel, TrackingModelMixin): class Meta(ComponentModel.Meta): verbose_name = _('virtual disk') verbose_name_plural = _('virtual disks') - - def get_absolute_url(self): - return reverse('virtualization:virtualdisk', args=[self.pk]) diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py index 2769430fd..1d84fa814 100644 --- a/netbox/vpn/models/crypto.py +++ b/netbox/vpn/models/crypto.py @@ -62,9 +62,6 @@ class IKEProposal(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('vpn:ikeproposal', args=[self.pk]) - class IKEPolicy(PrimaryModel): name = models.CharField( @@ -107,9 +104,6 @@ class IKEPolicy(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('vpn:ikepolicy', args=[self.pk]) - def clean(self): super().clean() @@ -167,9 +161,6 @@ class IPSecProposal(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('vpn:ipsecproposal', args=[self.pk]) - def clean(self): super().clean() @@ -212,9 +203,6 @@ class IPSecPolicy(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('vpn:ipsecpolicy', args=[self.pk]) - class IPSecProfile(PrimaryModel): name = models.CharField( @@ -252,6 +240,3 @@ class IPSecProfile(PrimaryModel): def __str__(self): return self.name - - def get_absolute_url(self): - return reverse('vpn:ipsecprofile', args=[self.pk]) diff --git a/netbox/vpn/models/l2vpn.py b/netbox/vpn/models/l2vpn.py index 39956edc8..1a366206a 100644 --- a/netbox/vpn/models/l2vpn.py +++ b/netbox/vpn/models/l2vpn.py @@ -68,9 +68,6 @@ class L2VPN(ContactsMixin, PrimaryModel): return f'{self.name} ({self.identifier})' return f'{self.name}' - def get_absolute_url(self): - return reverse('vpn:l2vpn', args=[self.pk]) - @cached_property def can_add_termination(self): if self.type in L2VPNTypeChoices.P2P and self.terminations.count() >= 2: @@ -121,9 +118,6 @@ class L2VPNTermination(NetBoxModel): return f'{self.assigned_object} <> {self.l2vpn}' return super().__str__() - def get_absolute_url(self): - return reverse('vpn:l2vpntermination', args=[self.pk]) - def clean(self): # Only check is assigned_object is set. Required otherwise we have an Integrity Error thrown. if self.assigned_object: diff --git a/netbox/vpn/models/tunnels.py b/netbox/vpn/models/tunnels.py index 6f4fa4182..3a0f1dc14 100644 --- a/netbox/vpn/models/tunnels.py +++ b/netbox/vpn/models/tunnels.py @@ -26,9 +26,6 @@ class TunnelGroup(OrganizationalModel): verbose_name = _('tunnel group') verbose_name_plural = _('tunnel groups') - def get_absolute_url(self): - return reverse('vpn:tunnelgroup', args=[self.pk]) - class Tunnel(PrimaryModel): name = models.CharField( @@ -97,9 +94,6 @@ class Tunnel(PrimaryModel): def __str__(self): return self.name - def get_absolute_url(self): - return reverse('vpn:tunnel', args=[self.pk]) - def get_status_color(self): return TunnelStatusChoices.colors.get(self.status) diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index 4214ac29d..e48c87167 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -69,9 +69,6 @@ class WirelessLANGroup(NestedGroupModel): verbose_name = _('wireless LAN group') verbose_name_plural = _('wireless LAN groups') - def get_absolute_url(self): - return reverse('wireless:wirelesslangroup', args=[self.pk]) - class WirelessLAN(WirelessAuthenticationBase, PrimaryModel): """ @@ -119,9 +116,6 @@ class WirelessLAN(WirelessAuthenticationBase, PrimaryModel): def __str__(self): return self.ssid - def get_absolute_url(self): - return reverse('wireless:wirelesslan', args=[self.pk]) - def get_status_color(self): return WirelessLANStatusChoices.colors.get(self.status) @@ -222,9 +216,6 @@ class WirelessLink(WirelessAuthenticationBase, PrimaryModel): def __str__(self): return self.ssid or f'#{self.pk}' - def get_absolute_url(self): - return reverse('wireless:wirelesslink', args=[self.pk]) - def get_status_color(self): return LinkStatusChoices.colors.get(self.status) From bc597c3c5d038770f152d3c343b844e3f3996d92 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 9 Oct 2024 16:21:07 -0400 Subject: [PATCH 008/190] Closes #17472: Deprecate the staged changes API --- docs/models/extras/branch.md | 3 +++ docs/models/extras/stagedchange.md | 3 +++ docs/plugins/development/staged-changes.md | 4 ++-- netbox/extras/models/staging.py | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/docs/models/extras/branch.md b/docs/models/extras/branch.md index fd7922b7e..4599fed85 100644 --- a/docs/models/extras/branch.md +++ b/docs/models/extras/branch.md @@ -1,5 +1,8 @@ # Branches +!!! danger "Deprecated Feature" + This feature has been deprecated in NetBox v4.2 and will be removed in a future release. Please consider using the [netbox-branching plugin](https://github.com/netboxlabs/netbox-branching), which provides much more robust functionality. + A branch is a collection of related [staged changes](./stagedchange.md) that have been prepared for merging into the active database. A branch can be merged by executing its `commit()` method. Deleting a branch will delete all its related changes. ## Fields diff --git a/docs/models/extras/stagedchange.md b/docs/models/extras/stagedchange.md index feda2fee6..0693a32d3 100644 --- a/docs/models/extras/stagedchange.md +++ b/docs/models/extras/stagedchange.md @@ -1,5 +1,8 @@ # Staged Changes +!!! danger "Deprecated Feature" + This feature has been deprecated in NetBox v4.2 and will be removed in a future release. Please consider using the [netbox-branching plugin](https://github.com/netboxlabs/netbox-branching), which provides much more robust functionality. + A staged change represents the creation of a new object or the modification or deletion of an existing object to be performed at some future point. Each change must be assigned to a [branch](./branch.md). Changes can be applied individually via the `apply()` method, however it is recommended to apply changes in bulk using the parent branch's `commit()` method. diff --git a/docs/plugins/development/staged-changes.md b/docs/plugins/development/staged-changes.md index 64a1a43e0..a8fd1d232 100644 --- a/docs/plugins/development/staged-changes.md +++ b/docs/plugins/development/staged-changes.md @@ -1,7 +1,7 @@ # Staged Changes -!!! danger "Experimental Feature" - This feature is still under active development and considered experimental in nature. Its use in production is strongly discouraged at this time. +!!! danger "Deprecated Feature" + This feature has been deprecated in NetBox v4.2 and will be removed in a future release. Please consider using the [netbox-branching plugin](https://github.com/netboxlabs/netbox-branching), which provides much more robust functionality. NetBox provides a programmatic API to stage the creation, modification, and deletion of objects without actually committing those changes to the active database. This can be useful for performing a "dry run" of bulk operations, or preparing a set of changes for administrative approval, for example. diff --git a/netbox/extras/models/staging.py b/netbox/extras/models/staging.py index b944a6fb9..68d37de7f 100644 --- a/netbox/extras/models/staging.py +++ b/netbox/extras/models/staging.py @@ -1,4 +1,5 @@ import logging +import warnings from django.contrib.contenttypes.fields import GenericForeignKey from django.db import models, transaction @@ -44,6 +45,13 @@ class Branch(ChangeLoggedModel): verbose_name = _('branch') verbose_name_plural = _('branches') + def __init__(self, *args, **kwargs): + warnings.warn( + 'The staged changes functionality has been deprecated and will be removed in a future release.', + DeprecationWarning + ) + super().__init__(*args, **kwargs) + def __str__(self): return f'{self.name} ({self.pk})' @@ -97,6 +105,13 @@ class StagedChange(CustomValidationMixin, EventRulesMixin, models.Model): verbose_name = _('staged change') verbose_name_plural = _('staged changes') + def __init__(self, *args, **kwargs): + warnings.warn( + 'The staged changes functionality has been deprecated and will be removed in a future release.', + DeprecationWarning + ) + super().__init__(*args, **kwargs) + def __str__(self): action = self.get_action_display() app_label, model_name = self.object_type.natural_key() From 65687851fe093caa6382b7e9fed522b4e5316589 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 10 Oct 2024 11:37:33 -0700 Subject: [PATCH 009/190] 16547 Add distance to Circuit (#17629) * 16547 Add distance to Circuit * 16547 fix test cases * 16547 fix test cases * 16547 add distance to API, forms, tables * 16547 fixes * 16547 fixes * 16547 review changes * 16547 review changes * Clean up DistanceColumn --------- Co-authored-by: Jeremy Stretch --- docs/models/circuits/circuit.md | 6 ++ netbox/circuits/api/serializers_/circuits.py | 4 +- netbox/circuits/filtersets.py | 2 +- netbox/circuits/forms/bulk_edit.py | 13 +++ netbox/circuits/forms/bulk_import.py | 9 +- netbox/circuits/forms/filtersets.py | 13 ++- netbox/circuits/forms/model_forms.py | 16 ++- .../migrations/0045_circuit_distance.py | 28 ++++++ netbox/circuits/models/circuits.py | 3 +- netbox/circuits/tables/circuits.py | 1 + netbox/circuits/tests/test_filtersets.py | 15 ++- netbox/dcim/api/serializers_/devicetypes.py | 1 + netbox/dcim/api/serializers_/racks.py | 1 + netbox/dcim/choices.py | 18 ---- netbox/dcim/forms/bulk_edit.py | 1 + netbox/dcim/forms/bulk_import.py | 1 + netbox/dcim/forms/filtersets.py | 1 + netbox/dcim/models/devices.py | 3 +- netbox/dcim/models/mixins.py | 44 --------- netbox/dcim/models/racks.py | 2 +- netbox/dcim/tests/test_filtersets.py | 2 +- netbox/dcim/tests/test_models.py | 1 + netbox/dcim/tests/test_views.py | 2 +- netbox/netbox/choices.py | 38 ++++++++ netbox/netbox/models/mixins.py | 97 +++++++++++++++++++ netbox/netbox/tables/columns.py | 14 +++ netbox/templates/circuits/circuit.html | 10 ++ netbox/utilities/conversion.py | 3 +- .../api/serializers_/wirelesslinks.py | 3 +- netbox/wireless/choices.py | 18 ---- netbox/wireless/forms/bulk_edit.py | 3 +- netbox/wireless/forms/bulk_import.py | 3 +- netbox/wireless/forms/filtersets.py | 3 +- netbox/wireless/models.py | 37 +------ netbox/wireless/tables/template_code.py | 4 - netbox/wireless/tables/wirelesslink.py | 6 +- netbox/wireless/tests/test_filtersets.py | 9 +- netbox/wireless/tests/test_views.py | 5 +- 38 files changed, 290 insertions(+), 150 deletions(-) create mode 100644 netbox/circuits/migrations/0045_circuit_distance.py create mode 100644 netbox/netbox/models/mixins.py delete mode 100644 netbox/wireless/tables/template_code.py diff --git a/docs/models/circuits/circuit.md b/docs/models/circuits/circuit.md index 19fd8c882..c75e20322 100644 --- a/docs/models/circuits/circuit.md +++ b/docs/models/circuits/circuit.md @@ -36,6 +36,12 @@ The operational status of the circuit. By default, the following statuses are av !!! tip "Custom circuit statuses" Additional circuit statuses may be defined by setting `Circuit.status` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter. +### Distance + +!!! info "This field was introduced in NetBox v4.2." + +The distance between the circuit's two endpoints, including a unit designation (e.g. 100 meters or 25 feet). + ### Description A brief description of the circuit. diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index c605a4bd5..111fa6f87 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -4,6 +4,7 @@ from dcim.api.serializers_.cables import CabledObjectSerializer from dcim.api.serializers_.sites import SiteSerializer from netbox.api.fields import ChoiceField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer +from netbox.choices import DistanceUnitChoices from tenancy.api.serializers_.tenants import TenantSerializer from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer @@ -80,13 +81,14 @@ class CircuitSerializer(NetBoxModelSerializer): termination_a = CircuitCircuitTerminationSerializer(read_only=True, allow_null=True) termination_z = CircuitCircuitTerminationSerializer(read_only=True, allow_null=True) assignments = CircuitGroupAssignmentSerializer_(nested=True, many=True, required=False) + distance_unit = ChoiceField(choices=DistanceUnitChoices, allow_blank=True, required=False, allow_null=True) class Meta: model = Circuit fields = [ 'id', 'url', 'display_url', 'display', 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', 'install_date', 'termination_date', 'commit_rate', 'description', 'termination_a', 'termination_z', - 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'assignments', + 'distance', 'distance_unit', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'assignments', ] brief_fields = ('id', 'url', 'display', 'provider', 'cid', 'description') diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index c55807c75..ebd1fe28d 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -239,7 +239,7 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte class Meta: model = Circuit - fields = ('id', 'cid', 'description', 'install_date', 'termination_date', 'commit_rate') + fields = ('id', 'cid', 'description', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py index 3bb50a8d0..5cb7b5d30 100644 --- a/netbox/circuits/forms/bulk_edit.py +++ b/netbox/circuits/forms/bulk_edit.py @@ -5,6 +5,7 @@ from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, C from circuits.models import * from dcim.models import Site from ipam.models import ASN +from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant from utilities.forms import add_blank_choice @@ -160,6 +161,17 @@ class CircuitBulkEditForm(NetBoxModelBulkEditForm): options=CircuitCommitRateChoices ) ) + distance = forms.DecimalField( + label=_('Distance'), + min_value=0, + required=False + ) + distance_unit = forms.ChoiceField( + label=_('Distance unit'), + choices=add_blank_choice(DistanceUnitChoices), + required=False, + initial='' + ) description = forms.CharField( label=_('Description'), max_length=100, @@ -171,6 +183,7 @@ class CircuitBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( FieldSet('provider', 'type', 'status', 'description', name=_('Circuit')), FieldSet('provider_account', 'install_date', 'termination_date', 'commit_rate', name=_('Service Parameters')), + FieldSet('distance', 'distance_unit', name=_('Attributes')), FieldSet('tenant', name=_('Tenancy')), ) nullable_fields = ( diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index 1e7b6361a..851f54881 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -5,6 +5,7 @@ from django.utils.translation import gettext_lazy as _ from circuits.choices import * from circuits.models import * from dcim.models import Site +from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField @@ -95,6 +96,12 @@ class CircuitImportForm(NetBoxModelImportForm): choices=CircuitStatusChoices, help_text=_('Operational status') ) + distance_unit = CSVChoiceField( + label=_('Distance unit'), + choices=DistanceUnitChoices, + required=False, + help_text=_('Distance unit') + ) tenant = CSVModelChoiceField( label=_('Tenant'), queryset=Tenant.objects.all(), @@ -107,7 +114,7 @@ class CircuitImportForm(NetBoxModelImportForm): model = Circuit fields = [ 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', 'install_date', 'termination_date', - 'commit_rate', 'description', 'comments', 'tags' + 'commit_rate', 'distance', 'distance_unit', 'description', 'comments', 'tags' ] diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index a658dd641..2e9b358e8 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -5,8 +5,10 @@ from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, C from circuits.models import * from dcim.models import Region, Site, SiteGroup from ipam.models import ASN +from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm, ContactModelFilterForm +from utilities.forms import add_blank_choice from utilities.forms.fields import ColorField, DynamicModelMultipleChoiceField, TagFilterField from utilities.forms.rendering import FieldSet from utilities.forms.widgets import DatePicker, NumberWithOptions @@ -114,7 +116,7 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')), - FieldSet('type_id', 'status', 'install_date', 'termination_date', 'commit_rate', name=_('Attributes')), + FieldSet('type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit', name=_('Attributes')), FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')), @@ -188,6 +190,15 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi options=CircuitCommitRateChoices ) ) + distance = forms.DecimalField( + label=_('Distance'), + required=False, + ) + distance_unit = forms.ChoiceField( + label=_('Distance unit'), + choices=add_blank_choice(DistanceUnitChoices), + required=False + ) tag = TagFilterField(model) diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index 9a54fdccb..e00034a10 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -7,7 +7,7 @@ from ipam.models import ASN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField -from utilities.forms.rendering import FieldSet, TabbedGroups +from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups from utilities.forms.widgets import DatePicker, NumberWithOptions __all__ = ( @@ -108,7 +108,17 @@ class CircuitForm(TenancyForm, NetBoxModelForm): comments = CommentField() fieldsets = ( - FieldSet('provider', 'provider_account', 'cid', 'type', 'status', 'description', 'tags', name=_('Circuit')), + FieldSet( + 'provider', + 'provider_account', + 'cid', + 'type', + 'status', + InlineFields('distance', 'distance_unit', label=_('Distance')), + 'description', + 'tags', + name=_('Circuit') + ), FieldSet('install_date', 'termination_date', 'commit_rate', name=_('Service Parameters')), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), ) @@ -117,7 +127,7 @@ class CircuitForm(TenancyForm, NetBoxModelForm): model = Circuit fields = [ 'cid', 'type', 'provider', 'provider_account', 'status', 'install_date', 'termination_date', 'commit_rate', - 'description', 'tenant_group', 'tenant', 'comments', 'tags', + 'distance', 'distance_unit', 'description', 'tenant_group', 'tenant', 'comments', 'tags', ] widgets = { 'install_date': DatePicker(), diff --git a/netbox/circuits/migrations/0045_circuit_distance.py b/netbox/circuits/migrations/0045_circuit_distance.py new file mode 100644 index 000000000..6c970339d --- /dev/null +++ b/netbox/circuits/migrations/0045_circuit_distance.py @@ -0,0 +1,28 @@ +# Generated by Django 5.0.9 on 2024-09-26 22:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0044_circuit_groups'), + ] + + operations = [ + migrations.AddField( + model_name='circuit', + name='_abs_distance', + field=models.DecimalField(blank=True, decimal_places=4, max_digits=10, null=True), + ), + migrations.AddField( + model_name='circuit', + name='distance', + field=models.DecimalField(blank=True, decimal_places=2, max_digits=8, null=True), + ), + migrations.AddField( + model_name='circuit', + name='distance_unit', + field=models.CharField(blank=True, max_length=50), + ), + ] diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index f34df0d6a..2df83e97e 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _ from circuits.choices import * from dcim.models import CabledObjectModel from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel +from netbox.models.mixins import DistanceMixin from netbox.models.features import ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, ImageAttachmentsMixin, TagsMixin from utilities.fields import ColorField @@ -34,7 +35,7 @@ class CircuitType(OrganizationalModel): verbose_name_plural = _('circuit types') -class Circuit(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): +class Circuit(ContactsMixin, ImageAttachmentsMixin, DistanceMixin, PrimaryModel): """ A communications circuit connects two points. Each Circuit belongs to a Provider; Providers may have multiple circuits. Each circuit is also assigned a CircuitType and a Site, and may optionally be assigned to a particular diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py index eefe2bd22..e79212a14 100644 --- a/netbox/circuits/tables/circuits.py +++ b/netbox/circuits/tables/circuits.py @@ -76,6 +76,7 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): commit_rate = CommitRateColumn( verbose_name=_('Commit Rate') ) + distance = columns.DistanceColumn() comments = columns.MarkdownColumn( verbose_name=_('Comments') ) diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index bb350f0d1..93958298c 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -5,6 +5,7 @@ from circuits.filtersets import * from circuits.models import * from dcim.models import Cable, Region, Site, SiteGroup from ipam.models import ASN, RIR +from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant, TenantGroup from utilities.testing import ChangeLoggedFilterSetTests @@ -222,9 +223,9 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): ProviderNetwork.objects.bulk_create(provider_networks) circuits = ( - Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 1', install_date='2020-01-01', termination_date='2021-01-01', commit_rate=1000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar1'), - Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 2', install_date='2020-01-02', termination_date='2021-01-02', commit_rate=2000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar2'), - Circuit(provider=providers[0], provider_account=provider_accounts[1], tenant=tenants[1], type=circuit_types[0], cid='Test Circuit 3', install_date='2020-01-03', termination_date='2021-01-03', commit_rate=3000, status=CircuitStatusChoices.STATUS_PLANNED), + Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 1', install_date='2020-01-01', termination_date='2021-01-01', commit_rate=1000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar1', distance=10, distance_unit=DistanceUnitChoices.UNIT_FOOT), + Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 2', install_date='2020-01-02', termination_date='2021-01-02', commit_rate=2000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar2', distance=20, distance_unit=DistanceUnitChoices.UNIT_METER), + Circuit(provider=providers[0], provider_account=provider_accounts[1], tenant=tenants[1], type=circuit_types[0], cid='Test Circuit 3', install_date='2020-01-03', termination_date='2021-01-03', commit_rate=3000, status=CircuitStatusChoices.STATUS_PLANNED, distance=30, distance_unit=DistanceUnitChoices.UNIT_METER), Circuit(provider=providers[1], provider_account=provider_accounts[1], tenant=tenants[1], type=circuit_types[1], cid='Test Circuit 4', install_date='2020-01-04', termination_date='2021-01-04', commit_rate=4000, status=CircuitStatusChoices.STATUS_PLANNED), Circuit(provider=providers[1], provider_account=provider_accounts[2], tenant=tenants[2], type=circuit_types[1], cid='Test Circuit 5', install_date='2020-01-05', termination_date='2021-01-05', commit_rate=5000, status=CircuitStatusChoices.STATUS_OFFLINE), Circuit(provider=providers[1], provider_account=provider_accounts[2], tenant=tenants[2], type=circuit_types[1], cid='Test Circuit 6', install_date='2020-01-06', termination_date='2021-01-06', commit_rate=6000, status=CircuitStatusChoices.STATUS_OFFLINE), @@ -289,6 +290,14 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'status': [CircuitStatusChoices.STATUS_ACTIVE, CircuitStatusChoices.STATUS_PLANNED]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + def test_distance(self): + params = {'distance': [10, 20]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_distance_unit(self): + params = {'distance_unit': DistanceUnitChoices.UNIT_FOOT} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + def test_description(self): params = {'description': ['foobar1', 'foobar2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) diff --git a/netbox/dcim/api/serializers_/devicetypes.py b/netbox/dcim/api/serializers_/devicetypes.py index cda738862..0ce2af2f8 100644 --- a/netbox/dcim/api/serializers_/devicetypes.py +++ b/netbox/dcim/api/serializers_/devicetypes.py @@ -7,6 +7,7 @@ from dcim.choices import * from dcim.models import DeviceType, ModuleType from netbox.api.fields import ChoiceField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer +from netbox.choices import * from .manufacturers import ManufacturerSerializer from .platforms import PlatformSerializer diff --git a/netbox/dcim/api/serializers_/racks.py b/netbox/dcim/api/serializers_/racks.py index ee76b09ce..1378c265a 100644 --- a/netbox/dcim/api/serializers_/racks.py +++ b/netbox/dcim/api/serializers_/racks.py @@ -6,6 +6,7 @@ from dcim.constants import * from dcim.models import Rack, RackReservation, RackRole, RackType from netbox.api.fields import ChoiceField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer +from netbox.choices import * from netbox.config import ConfigItem from tenancy.api.serializers_.tenants import TenantSerializer from users.api.serializers_.users import UserSerializer diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index 89ca76870..8a16c3460 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1546,24 +1546,6 @@ class CableLengthUnitChoices(ChoiceSet): ) -class WeightUnitChoices(ChoiceSet): - - # Metric - UNIT_KILOGRAM = 'kg' - UNIT_GRAM = 'g' - - # Imperial - UNIT_POUND = 'lb' - UNIT_OUNCE = 'oz' - - CHOICES = ( - (UNIT_KILOGRAM, _('Kilograms')), - (UNIT_GRAM, _('Grams')), - (UNIT_POUND, _('Pounds')), - (UNIT_OUNCE, _('Ounces')), - ) - - # # CableTerminations # diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 01e5f138e..ac20173f2 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -8,6 +8,7 @@ from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate from ipam.models import ASN, VLAN, VLANGroup, VRF +from netbox.choices import * from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant from users.models import User diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index 521e47a50..c6204fffe 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -10,6 +10,7 @@ from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate from ipam.models import VRF, IPAddress +from netbox.choices import * from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant from utilities.forms.fields import ( diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 10770824c..13478263e 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -7,6 +7,7 @@ from dcim.models import * from extras.forms import LocalConfigContextFilterForm from extras.models import ConfigTemplate from ipam.models import ASN, VRF +from netbox.choices import * from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import ContactModelFilterForm, TenancyFilterForm from users.models import User diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 3031673b0..777a99ef6 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -21,11 +21,12 @@ from extras.querysets import ConfigContextModelQuerySet from netbox.choices import ColorChoices from netbox.config import ConfigItem from netbox.models import OrganizationalModel, PrimaryModel +from netbox.models.mixins import WeightMixin from netbox.models.features import ContactsMixin, ImageAttachmentsMixin from utilities.fields import ColorField, CounterCacheField, NaturalOrderingField from utilities.tracking import TrackingModelMixin from .device_components import * -from .mixins import RenderConfigMixin, WeightMixin +from .mixins import RenderConfigMixin __all__ = ( diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index d4a05699c..8dbcb35b7 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -1,56 +1,12 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import gettext_lazy as _ -from dcim.choices import * -from utilities.conversion import to_grams __all__ = ( 'RenderConfigMixin', - 'WeightMixin', ) -class WeightMixin(models.Model): - weight = models.DecimalField( - verbose_name=_('weight'), - max_digits=8, - decimal_places=2, - blank=True, - null=True - ) - weight_unit = models.CharField( - verbose_name=_('weight unit'), - max_length=50, - choices=WeightUnitChoices, - blank=True, - ) - # Stores the normalized weight (in grams) for database ordering - _abs_weight = models.PositiveBigIntegerField( - blank=True, - null=True - ) - - class Meta: - abstract = True - - def save(self, *args, **kwargs): - - # Store the given weight (if any) in grams for use in database ordering - if self.weight and self.weight_unit: - self._abs_weight = to_grams(self.weight, self.weight_unit) - else: - self._abs_weight = None - - super().save(*args, **kwargs) - - def clean(self): - super().clean() - - # Validate weight and weight_unit - if self.weight and not self.weight_unit: - raise ValidationError(_("Must specify a unit when setting a weight")) - - class RenderConfigMixin(models.Model): config_template = models.ForeignKey( to='extras.ConfigTemplate', diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 226074444..2c507ecf9 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -16,13 +16,13 @@ from dcim.constants import * from dcim.svg import RackElevationSVG from netbox.choices import ColorChoices from netbox.models import OrganizationalModel, PrimaryModel +from netbox.models.mixins import WeightMixin from netbox.models.features import ContactsMixin, ImageAttachmentsMixin from utilities.conversion import to_grams from utilities.data import array_to_string, drange from utilities.fields import ColorField, NaturalOrderingField from .device_components import PowerPort from .devices import Device, Module -from .mixins import WeightMixin from .power import PowerFeed __all__ = ( diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index b1fbcdcb5..cbc31e8d4 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -5,7 +5,7 @@ from dcim.choices import * from dcim.filtersets import * from dcim.models import * from ipam.models import ASN, IPAddress, RIR, VRF -from netbox.choices import ColorChoices +from netbox.choices import ColorChoices, WeightUnitChoices from tenancy.models import Tenant, TenantGroup from users.models import User from utilities.testing import ChangeLoggedFilterSetTests, create_test_device diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 1c3dbb90b..f183eccb3 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -6,6 +6,7 @@ from core.models import ObjectType from dcim.choices import * from dcim.models import * from extras.models import CustomField +from netbox.choices import WeightUnitChoices from tenancy.models import Tenant from utilities.data import drange from virtualization.models import Cluster, ClusterType diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index a87d92642..0f89efb65 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -10,7 +10,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from ipam.models import ASN, RIR, VLAN, VRF -from netbox.choices import CSVDelimiterChoices, ImportFormatChoices +from netbox.choices import CSVDelimiterChoices, ImportFormatChoices, WeightUnitChoices from tenancy.models import Tenant from users.models import User from utilities.testing import ViewTestCases, create_tags, create_test_device, post_data diff --git a/netbox/netbox/choices.py b/netbox/netbox/choices.py index 4fd730255..5c3110745 100644 --- a/netbox/netbox/choices.py +++ b/netbox/netbox/choices.py @@ -7,8 +7,10 @@ __all__ = ( 'ButtonColorChoices', 'ColorChoices', 'CSVDelimiterChoices', + 'DistanceUnitChoices', 'ImportFormatChoices', 'ImportMethodChoices', + 'WeightUnitChoices', ) @@ -157,3 +159,39 @@ class CSVDelimiterChoices(ChoiceSet): (SEMICOLON, _('Semicolon')), (TAB, _('Tab')), ] + + +class DistanceUnitChoices(ChoiceSet): + + # Metric + UNIT_KILOMETER = 'km' + UNIT_METER = 'm' + + # Imperial + UNIT_MILE = 'mi' + UNIT_FOOT = 'ft' + + CHOICES = ( + (UNIT_KILOMETER, _('Kilometers')), + (UNIT_METER, _('Meters')), + (UNIT_MILE, _('Miles')), + (UNIT_FOOT, _('Feet')), + ) + + +class WeightUnitChoices(ChoiceSet): + + # Metric + UNIT_KILOGRAM = 'kg' + UNIT_GRAM = 'g' + + # Imperial + UNIT_POUND = 'lb' + UNIT_OUNCE = 'oz' + + CHOICES = ( + (UNIT_KILOGRAM, _('Kilograms')), + (UNIT_GRAM, _('Grams')), + (UNIT_POUND, _('Pounds')), + (UNIT_OUNCE, _('Ounces')), + ) diff --git a/netbox/netbox/models/mixins.py b/netbox/netbox/models/mixins.py new file mode 100644 index 000000000..804e0b71a --- /dev/null +++ b/netbox/netbox/models/mixins.py @@ -0,0 +1,97 @@ +from django.core.exceptions import ValidationError +from django.db import models +from django.utils.translation import gettext_lazy as _ +from netbox.choices import * +from utilities.conversion import to_grams, to_meters + +__all__ = ( + 'DistanceMixin', + 'WeightMixin', +) + + +class WeightMixin(models.Model): + weight = models.DecimalField( + verbose_name=_('weight'), + max_digits=8, + decimal_places=2, + blank=True, + null=True + ) + weight_unit = models.CharField( + verbose_name=_('weight unit'), + max_length=50, + choices=WeightUnitChoices, + blank=True, + ) + # Stores the normalized weight (in grams) for database ordering + _abs_weight = models.PositiveBigIntegerField( + blank=True, + null=True + ) + + class Meta: + abstract = True + + def save(self, *args, **kwargs): + + # Store the given weight (if any) in grams for use in database ordering + if self.weight and self.weight_unit: + self._abs_weight = to_grams(self.weight, self.weight_unit) + else: + self._abs_weight = None + + super().save(*args, **kwargs) + + def clean(self): + super().clean() + + # Validate weight and weight_unit + if self.weight and not self.weight_unit: + raise ValidationError(_("Must specify a unit when setting a weight")) + + +class DistanceMixin(models.Model): + distance = models.DecimalField( + verbose_name=_('distance'), + max_digits=8, + decimal_places=2, + blank=True, + null=True + ) + distance_unit = models.CharField( + verbose_name=_('distance unit'), + max_length=50, + choices=DistanceUnitChoices, + blank=True, + ) + # Stores the normalized distance (in meters) for database ordering + _abs_distance = models.DecimalField( + max_digits=10, + decimal_places=4, + blank=True, + null=True + ) + + class Meta: + abstract = True + + def save(self, *args, **kwargs): + # Store the given distance (if any) in meters for use in database ordering + if self.distance is not None and self.distance_unit: + self._abs_distance = to_meters(self.distance, self.distance_unit) + else: + self._abs_distance = None + + # Clear distance_unit if no distance is defined + if self.distance is None: + self.distance_unit = '' + + super().save(*args, **kwargs) + + def clean(self): + super().clean() + + # Validate distance and distance_unit + if self.distance and not self.distance_unit: + raise ValidationError(_("Must specify a unit when setting a distance")) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 0e70a1624..ee1420396 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -35,6 +35,7 @@ __all__ = ( 'ContentTypesColumn', 'CustomFieldColumn', 'CustomLinkColumn', + 'DistanceColumn', 'DurationColumn', 'LinkedCountColumn', 'MarkdownColumn', @@ -691,3 +692,16 @@ class ChoicesColumn(tables.Column): value.append(f'({omitted_count} more)') return ', '.join(value) + + +class DistanceColumn(TemplateColumn): + """ + Distance with template code for formatting + """ + template_code = """ + {% load helpers %} + {% if record.distance %}{{ record.distance|floatformat:"-2" }} {{ record.distance_unit }}{% endif %} + """ + + def __init__(self, template_code=template_code, order_by='_abs_distance', **kwargs): + super().__init__(template_code=template_code, order_by=order_by, **kwargs) diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 5c2442b90..52c7d9894 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -34,6 +34,16 @@ {% trans "Status" %} {% badge object.get_status_display bg_color=object.get_status_color %} + + {% trans "Distance" %} + + {% if object.distance is not None %} + {{ object.distance|floatformat }} {{ object.get_distance_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} + + {% trans "Tenant" %} diff --git a/netbox/utilities/conversion.py b/netbox/utilities/conversion.py index cd75c3c17..ee0175e7c 100644 --- a/netbox/utilities/conversion.py +++ b/netbox/utilities/conversion.py @@ -2,7 +2,8 @@ from decimal import Decimal from django.utils.translation import gettext as _ -from dcim.choices import CableLengthUnitChoices, WeightUnitChoices +from dcim.choices import CableLengthUnitChoices +from netbox.choices import WeightUnitChoices __all__ = ( 'to_grams', diff --git a/netbox/wireless/api/serializers_/wirelesslinks.py b/netbox/wireless/api/serializers_/wirelesslinks.py index 1f3bcfdea..494c3514b 100644 --- a/netbox/wireless/api/serializers_/wirelesslinks.py +++ b/netbox/wireless/api/serializers_/wirelesslinks.py @@ -4,6 +4,7 @@ from dcim.api.serializers_.device_components import InterfaceSerializer from dcim.choices import LinkStatusChoices from netbox.api.fields import ChoiceField from netbox.api.serializers import NetBoxModelSerializer +from netbox.choices import * from tenancy.api.serializers_.tenants import TenantSerializer from wireless.choices import * from wireless.models import WirelessLink @@ -20,7 +21,7 @@ class WirelessLinkSerializer(NetBoxModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) auth_type = ChoiceField(choices=WirelessAuthTypeChoices, required=False, allow_blank=True) auth_cipher = ChoiceField(choices=WirelessAuthCipherChoices, required=False, allow_blank=True) - distance_unit = ChoiceField(choices=WirelessLinkDistanceUnitChoices, allow_blank=True, required=False, allow_null=True) + distance_unit = ChoiceField(choices=DistanceUnitChoices, allow_blank=True, required=False, allow_null=True) class Meta: model = WirelessLink diff --git a/netbox/wireless/choices.py b/netbox/wireless/choices.py index f17ea584d..710cd3a8d 100644 --- a/netbox/wireless/choices.py +++ b/netbox/wireless/choices.py @@ -481,21 +481,3 @@ class WirelessAuthCipherChoices(ChoiceSet): (CIPHER_TKIP, 'TKIP'), (CIPHER_AES, 'AES'), ) - - -class WirelessLinkDistanceUnitChoices(ChoiceSet): - - # Metric - UNIT_KILOMETER = 'km' - UNIT_METER = 'm' - - # Imperial - UNIT_MILE = 'mi' - UNIT_FOOT = 'ft' - - CHOICES = ( - (UNIT_KILOMETER, _('Kilometers')), - (UNIT_METER, _('Meters')), - (UNIT_MILE, _('Miles')), - (UNIT_FOOT, _('Feet')), - ) diff --git a/netbox/wireless/forms/bulk_edit.py b/netbox/wireless/forms/bulk_edit.py index 64a9bfa98..c8b378104 100644 --- a/netbox/wireless/forms/bulk_edit.py +++ b/netbox/wireless/forms/bulk_edit.py @@ -3,6 +3,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices from ipam.models import VLAN +from netbox.choices import * from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant from utilities.forms import add_blank_choice @@ -132,7 +133,7 @@ class WirelessLinkBulkEditForm(NetBoxModelBulkEditForm): ) distance_unit = forms.ChoiceField( label=_('Distance unit'), - choices=add_blank_choice(WirelessLinkDistanceUnitChoices), + choices=add_blank_choice(DistanceUnitChoices), required=False, initial='' ) diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index 878afd5c8..cff3e49af 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -3,6 +3,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices from dcim.models import Interface from ipam.models import VLAN +from netbox.choices import * from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField @@ -114,7 +115,7 @@ class WirelessLinkImportForm(NetBoxModelImportForm): ) distance_unit = CSVChoiceField( label=_('Distance unit'), - choices=WirelessLinkDistanceUnitChoices, + choices=DistanceUnitChoices, required=False, help_text=_('Distance unit') ) diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index f87cadfb9..6439a2516 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -2,6 +2,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices +from netbox.choices import * from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm from utilities.forms import add_blank_choice @@ -104,7 +105,7 @@ class WirelessLinkFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): ) distance_unit = forms.ChoiceField( label=_('Distance unit'), - choices=add_blank_choice(WirelessLinkDistanceUnitChoices), + choices=add_blank_choice(DistanceUnitChoices), required=False ) tag = TagFilterField(model) diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index e48c87167..c8ef59286 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices from dcim.constants import WIRELESS_IFACE_TYPES from netbox.models import NestedGroupModel, PrimaryModel +from netbox.models.mixins import DistanceMixin from utilities.conversion import to_meters from .choices import * from .constants import * @@ -126,7 +127,7 @@ def get_wireless_interface_types(): return {'type__in': WIRELESS_IFACE_TYPES} -class WirelessLink(WirelessAuthenticationBase, PrimaryModel): +class WirelessLink(WirelessAuthenticationBase, DistanceMixin, PrimaryModel): """ A point-to-point connection between two wireless Interfaces. """ @@ -155,26 +156,6 @@ class WirelessLink(WirelessAuthenticationBase, PrimaryModel): choices=LinkStatusChoices, default=LinkStatusChoices.STATUS_CONNECTED ) - distance = models.DecimalField( - verbose_name=_('distance'), - max_digits=8, - decimal_places=2, - blank=True, - null=True - ) - distance_unit = models.CharField( - verbose_name=_('distance unit'), - max_length=50, - choices=WirelessLinkDistanceUnitChoices, - blank=True, - ) - # Stores the normalized distance (in meters) for database ordering - _abs_distance = models.DecimalField( - max_digits=10, - decimal_places=4, - blank=True, - null=True - ) tenant = models.ForeignKey( to='tenancy.Tenant', on_delete=models.PROTECT, @@ -222,10 +203,6 @@ class WirelessLink(WirelessAuthenticationBase, PrimaryModel): def clean(self): super().clean() - # Validate distance and distance_unit - if self.distance is not None and not self.distance_unit: - raise ValidationError(_("Must specify a unit when setting a wireless distance")) - # Validate interface types if self.interface_a.type not in WIRELESS_IFACE_TYPES: raise ValidationError({ @@ -241,16 +218,6 @@ class WirelessLink(WirelessAuthenticationBase, PrimaryModel): }) def save(self, *args, **kwargs): - # Store the given distance (if any) in meters for use in database ordering - if self.distance is not None and self.distance_unit: - self._abs_distance = to_meters(self.distance, self.distance_unit) - else: - self._abs_distance = None - - # Clear distance_unit if no distance is defined - if self.distance is None: - self.distance_unit = '' - # Store the parent Device for the A and B interfaces self._interface_a_device = self.interface_a.device self._interface_b_device = self.interface_b.device diff --git a/netbox/wireless/tables/template_code.py b/netbox/wireless/tables/template_code.py deleted file mode 100644 index 03c893c1f..000000000 --- a/netbox/wireless/tables/template_code.py +++ /dev/null @@ -1,4 +0,0 @@ -WIRELESS_LINK_DISTANCE = """ -{% load helpers %} -{% if record.distance %}{{ record.distance|floatformat:"-2" }} {{ record.distance_unit }}{% endif %} -""" diff --git a/netbox/wireless/tables/wirelesslink.py b/netbox/wireless/tables/wirelesslink.py index 9d3a50848..dc8fb66db 100644 --- a/netbox/wireless/tables/wirelesslink.py +++ b/netbox/wireless/tables/wirelesslink.py @@ -4,7 +4,6 @@ import django_tables2 as tables from netbox.tables import NetBoxTable, columns from tenancy.tables import TenancyColumnsMixin from wireless.models import * -from .template_code import WIRELESS_LINK_DISTANCE __all__ = ( 'WirelessLinkTable', @@ -37,10 +36,7 @@ class WirelessLinkTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('Interface B'), linkify=True ) - distance = columns.TemplateColumn( - template_code=WIRELESS_LINK_DISTANCE, - order_by=('_abs_distance') - ) + distance = columns.DistanceColumn() tags = columns.TagColumn( url_name='wireless:wirelesslink_list' ) diff --git a/netbox/wireless/tests/test_filtersets.py b/netbox/wireless/tests/test_filtersets.py index 46eec4d7b..5c932928c 100644 --- a/netbox/wireless/tests/test_filtersets.py +++ b/netbox/wireless/tests/test_filtersets.py @@ -3,6 +3,7 @@ from django.test import TestCase from dcim.choices import InterfaceTypeChoices, LinkStatusChoices from dcim.models import Interface from ipam.models import VLAN +from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant from wireless.choices import * from wireless.filtersets import * @@ -261,7 +262,7 @@ class WirelessLinkTestCase(TestCase, ChangeLoggedFilterSetTests): auth_psk='PSK1', tenant=tenants[0], distance=10, - distance_unit=WirelessLinkDistanceUnitChoices.UNIT_FOOT, + distance_unit=DistanceUnitChoices.UNIT_FOOT, description='foobar1' ).save() WirelessLink( @@ -274,7 +275,7 @@ class WirelessLinkTestCase(TestCase, ChangeLoggedFilterSetTests): auth_psk='PSK2', tenant=tenants[1], distance=20, - distance_unit=WirelessLinkDistanceUnitChoices.UNIT_METER, + distance_unit=DistanceUnitChoices.UNIT_METER, description='foobar2' ).save() WirelessLink( @@ -286,7 +287,7 @@ class WirelessLinkTestCase(TestCase, ChangeLoggedFilterSetTests): auth_cipher=WirelessAuthCipherChoices.CIPHER_AES, auth_psk='PSK3', distance=30, - distance_unit=WirelessLinkDistanceUnitChoices.UNIT_METER, + distance_unit=DistanceUnitChoices.UNIT_METER, tenant=tenants[2], ).save() WirelessLink( @@ -324,7 +325,7 @@ class WirelessLinkTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_distance_unit(self): - params = {'distance_unit': WirelessLinkDistanceUnitChoices.UNIT_FOOT} + params = {'distance_unit': DistanceUnitChoices.UNIT_FOOT} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) def test_description(self): diff --git a/netbox/wireless/tests/test_views.py b/netbox/wireless/tests/test_views.py index 055edf73c..e8fd4340d 100644 --- a/netbox/wireless/tests/test_views.py +++ b/netbox/wireless/tests/test_views.py @@ -2,6 +2,7 @@ from wireless.choices import * from wireless.models import * from dcim.choices import InterfaceTypeChoices, LinkStatusChoices from dcim.models import Interface +from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant from utilities.testing import ViewTestCases, create_tags, create_test_device @@ -161,7 +162,7 @@ class WirelessLinkTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'interface_b': interfaces[7].pk, 'status': LinkStatusChoices.STATUS_PLANNED, 'distance': 100, - 'distance_unit': WirelessLinkDistanceUnitChoices.UNIT_FOOT, + 'distance_unit': DistanceUnitChoices.UNIT_FOOT, 'tenant': tenants[1].pk, 'tags': [t.pk for t in tags], } @@ -183,5 +184,5 @@ class WirelessLinkTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.bulk_edit_data = { 'status': LinkStatusChoices.STATUS_PLANNED, 'distance': 50, - 'distance_unit': WirelessLinkDistanceUnitChoices.UNIT_METER, + 'distance_unit': DistanceUnitChoices.UNIT_METER, } From b99c356d1d3bab9fd6c28371f26049f961bde52b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 11 Oct 2024 11:36:56 -0400 Subject: [PATCH 010/190] Fix migrations conflict --- ...191_inventoryitem_status.py => 0192_inventoryitem_status.py} | 2 +- .../{0192_poweroutlet_color.py => 0193_poweroutlet_color.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename netbox/dcim/migrations/{0191_inventoryitem_status.py => 0192_inventoryitem_status.py} (88%) rename netbox/dcim/migrations/{0192_poweroutlet_color.py => 0193_poweroutlet_color.py} (88%) diff --git a/netbox/dcim/migrations/0191_inventoryitem_status.py b/netbox/dcim/migrations/0192_inventoryitem_status.py similarity index 88% rename from netbox/dcim/migrations/0191_inventoryitem_status.py rename to netbox/dcim/migrations/0192_inventoryitem_status.py index 23daf903d..335ab2ca7 100644 --- a/netbox/dcim/migrations/0191_inventoryitem_status.py +++ b/netbox/dcim/migrations/0192_inventoryitem_status.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('dcim', '0190_nested_modules'), + ('dcim', '0191_module_bay_rebuild'), ] operations = [ diff --git a/netbox/dcim/migrations/0192_poweroutlet_color.py b/netbox/dcim/migrations/0193_poweroutlet_color.py similarity index 88% rename from netbox/dcim/migrations/0192_poweroutlet_color.py rename to netbox/dcim/migrations/0193_poweroutlet_color.py index 4fb5f4663..0a6c08b48 100644 --- a/netbox/dcim/migrations/0192_poweroutlet_color.py +++ b/netbox/dcim/migrations/0193_poweroutlet_color.py @@ -7,7 +7,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('dcim', '0191_inventoryitem_status'), + ('dcim', '0192_inventoryitem_status'), ] operations = [ From 727de0fb5901acd96ade94abed37b396887e064b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 11 Oct 2024 12:27:39 -0400 Subject: [PATCH 011/190] Remove unused imports --- netbox/circuits/models/providers.py | 1 - netbox/dcim/models/cables.py | 1 - netbox/dcim/models/device_components.py | 1 - netbox/dcim/models/mixins.py | 2 -- netbox/dcim/models/power.py | 1 - netbox/dcim/models/racks.py | 1 - netbox/dcim/models/sites.py | 1 - netbox/ipam/models/asns.py | 1 - netbox/ipam/models/fhrp.py | 1 - netbox/ipam/models/ip.py | 1 - netbox/ipam/models/services.py | 1 - netbox/ipam/models/vlans.py | 1 - netbox/ipam/models/vrfs.py | 2 -- netbox/tenancy/models/tenants.py | 1 - netbox/virtualization/models/clusters.py | 1 - netbox/virtualization/models/virtualmachines.py | 1 - netbox/vpn/models/crypto.py | 1 - netbox/vpn/models/l2vpn.py | 1 - netbox/wireless/models.py | 2 -- 19 files changed, 22 deletions(-) diff --git a/netbox/circuits/models/providers.py b/netbox/circuits/models/providers.py index 593997527..f0fe77b1a 100644 --- a/netbox/circuits/models/providers.py +++ b/netbox/circuits/models/providers.py @@ -1,6 +1,5 @@ from django.db import models from django.db.models import Q -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from netbox.models import PrimaryModel diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index f89d57627..7d243e2e0 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -6,7 +6,6 @@ from django.core.exceptions import ValidationError from django.db import models from django.db.models import Sum from django.dispatch import Signal -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from core.models import ObjectType diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index f948f5d83..1a86a250c 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -5,7 +5,6 @@ from django.core.exceptions import ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.models import Sum -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from mptt.models import MPTTModel, TreeForeignKey diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index 8dbcb35b7..c9be451a0 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -1,6 +1,4 @@ -from django.core.exceptions import ValidationError from django.db import models -from django.utils.translation import gettext_lazy as _ __all__ = ( 'RenderConfigMixin', diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py index 168428c44..d0c6b18b6 100644 --- a/netbox/dcim/models/power.py +++ b/netbox/dcim/models/power.py @@ -1,7 +1,6 @@ from django.core.exceptions import ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.choices import * diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 2c507ecf9..ae5513fea 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -8,7 +8,6 @@ from django.core.exceptions import ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.models import Count -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.choices import * diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index 7884afa54..37f59045d 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from timezone_field import TimeZoneField diff --git a/netbox/ipam/models/asns.py b/netbox/ipam/models/asns.py index 4b51eedbb..eb47426b2 100644 --- a/netbox/ipam/models/asns.py +++ b/netbox/ipam/models/asns.py @@ -1,6 +1,5 @@ from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from ipam.fields import ASNField diff --git a/netbox/ipam/models/fhrp.py b/netbox/ipam/models/fhrp.py index bf60f188a..28bb37ef3 100644 --- a/netbox/ipam/models/fhrp.py +++ b/netbox/ipam/models/fhrp.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from ipam.choices import * diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index 7bf97897b..a540b5810 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError from django.db import models from django.db.models import F from django.db.models.functions import Cast -from django.urls import reverse from django.utils.functional import cached_property from django.utils.translation import gettext_lazy as _ diff --git a/netbox/ipam/models/services.py b/netbox/ipam/models/services.py index e878870cb..bb4049781 100644 --- a/netbox/ipam/models/services.py +++ b/netbox/ipam/models/services.py @@ -2,7 +2,6 @@ from django.contrib.postgres.fields import ArrayField from django.core.exceptions import ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from ipam.choices import * diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 852dfe148..23f7c41c7 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.backends.postgresql.psycopg_any import NumericRange -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.models import Interface diff --git a/netbox/ipam/models/vrfs.py b/netbox/ipam/models/vrfs.py index f0a6d815e..26afb7927 100644 --- a/netbox/ipam/models/vrfs.py +++ b/netbox/ipam/models/vrfs.py @@ -1,11 +1,9 @@ from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from ipam.constants import * from netbox.models import PrimaryModel - __all__ = ( 'RouteTarget', 'VRF', diff --git a/netbox/tenancy/models/tenants.py b/netbox/tenancy/models/tenants.py index 118a63d31..7a2d9c2f8 100644 --- a/netbox/tenancy/models/tenants.py +++ b/netbox/tenancy/models/tenants.py @@ -1,6 +1,5 @@ from django.db import models from django.db.models import Q -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from netbox.models import NestedGroupModel, PrimaryModel diff --git a/netbox/virtualization/models/clusters.py b/netbox/virtualization/models/clusters.py index ed1756ee8..b8921c603 100644 --- a/netbox/virtualization/models/clusters.py +++ b/netbox/virtualization/models/clusters.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.models import Device diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index d2ea34bef..0767b2c13 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -6,7 +6,6 @@ from django.core.validators import MinValueValidator from django.db import models from django.db.models import Q, Sum from django.db.models.functions import Lower -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.models import BaseInterface diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py index 1d84fa814..618a1ec4a 100644 --- a/netbox/vpn/models/crypto.py +++ b/netbox/vpn/models/crypto.py @@ -1,6 +1,5 @@ from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from netbox.models import PrimaryModel diff --git a/netbox/vpn/models/l2vpn.py b/netbox/vpn/models/l2vpn.py index 1a366206a..b799ab32d 100644 --- a/netbox/vpn/models/l2vpn.py +++ b/netbox/vpn/models/l2vpn.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.functional import cached_property from django.utils.translation import gettext_lazy as _ diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index c8ef59286..685d978a7 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -1,13 +1,11 @@ from django.core.exceptions import ValidationError from django.db import models -from django.urls import reverse from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices from dcim.constants import WIRELESS_IFACE_TYPES from netbox.models import NestedGroupModel, PrimaryModel from netbox.models.mixins import DistanceMixin -from utilities.conversion import to_meters from .choices import * from .constants import * From 5b8ef2eb447b9609fa352c2c20ec8e5f0424685a Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Wed, 16 Oct 2024 11:52:35 -0700 Subject: [PATCH 012/190] 17778 update node.js --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3b4876c3..d77da90e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: python-version: ['3.10', '3.11', '3.12'] - node-version: ['18.x'] + node-version: ['20.x'] services: redis: image: redis From 6aeb5533914ad5369eccd3891c1b9c59f9ef7f8c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 17 Oct 2024 15:58:05 -0400 Subject: [PATCH 013/190] Closes #17029: Deprecate PluginTemplateExtension.model --- netbox/netbox/plugins/registration.py | 8 +++++++- netbox/netbox/plugins/templates.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/netbox/netbox/plugins/registration.py b/netbox/netbox/plugins/registration.py index c84572794..515405f1b 100644 --- a/netbox/netbox/plugins/registration.py +++ b/netbox/netbox/plugins/registration.py @@ -1,4 +1,5 @@ import inspect +import warnings from django.utils.translation import gettext_lazy as _ from netbox.registry import registry @@ -37,7 +38,12 @@ def register_template_extensions(class_list): # Registration for multiple models models = template_extension.models elif template_extension.model: - # Registration for a single model + # Registration for a single model (deprecated) + warnings.warn( + "PluginTemplateExtension.model is deprecated and will be removed in a future release. Use " + "'models' instead.", + DeprecationWarning + ) models = [template_extension.model] else: # Global registration (no specific models) diff --git a/netbox/netbox/plugins/templates.py b/netbox/netbox/plugins/templates.py index e1f4b7a47..4ea90b4db 100644 --- a/netbox/netbox/plugins/templates.py +++ b/netbox/netbox/plugins/templates.py @@ -21,7 +21,7 @@ class PluginTemplateExtension: * config - Plugin-specific configuration parameters """ models = None - model = None + model = None # Deprecated; use `models` instead def __init__(self, context): self.context = context From a8ec06687af4c19cb80c9ba4f973dbb8c7c4dcd1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 17 Oct 2024 16:19:42 -0400 Subject: [PATCH 014/190] Reomove obsolete nested serializers --- netbox/circuits/api/nested_serializers.py | 79 ---- netbox/core/api/nested_serializers.py | 47 --- netbox/dcim/api/nested_serializers.py | 389 ------------------ netbox/extras/api/nested_serializers.py | 135 ------ netbox/ipam/api/nested_serializers.py | 204 --------- netbox/tenancy/api/nested_serializers.py | 58 --- netbox/users/api/nested_serializers.py | 53 --- .../virtualization/api/nested_serializers.py | 72 ---- netbox/vpn/api/nested_serializers.py | 109 ----- netbox/wireless/api/nested_serializers.py | 24 -- 10 files changed, 1170 deletions(-) delete mode 100644 netbox/circuits/api/nested_serializers.py delete mode 100644 netbox/core/api/nested_serializers.py delete mode 100644 netbox/dcim/api/nested_serializers.py delete mode 100644 netbox/extras/api/nested_serializers.py delete mode 100644 netbox/ipam/api/nested_serializers.py delete mode 100644 netbox/tenancy/api/nested_serializers.py delete mode 100644 netbox/users/api/nested_serializers.py delete mode 100644 netbox/virtualization/api/nested_serializers.py delete mode 100644 netbox/vpn/api/nested_serializers.py delete mode 100644 netbox/wireless/api/nested_serializers.py diff --git a/netbox/circuits/api/nested_serializers.py b/netbox/circuits/api/nested_serializers.py deleted file mode 100644 index 487749872..000000000 --- a/netbox/circuits/api/nested_serializers.py +++ /dev/null @@ -1,79 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_serializer - -from circuits.models import * -from netbox.api.fields import RelatedObjectCountField -from netbox.api.serializers import WritableNestedSerializer -from .serializers_.nested import NestedProviderAccountSerializer - -__all__ = [ - 'NestedCircuitSerializer', - 'NestedCircuitTerminationSerializer', - 'NestedCircuitTypeSerializer', - 'NestedProviderNetworkSerializer', - 'NestedProviderSerializer', - 'NestedProviderAccountSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -# -# Provider networks -# - -class NestedProviderNetworkSerializer(WritableNestedSerializer): - - class Meta: - model = ProviderNetwork - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -# -# Providers -# - -@extend_schema_serializer( - exclude_fields=('circuit_count',), -) -class NestedProviderSerializer(WritableNestedSerializer): - circuit_count = RelatedObjectCountField('circuits') - - class Meta: - model = Provider - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'circuit_count'] - - -# -# Circuits -# - -@extend_schema_serializer( - exclude_fields=('circuit_count',), -) -class NestedCircuitTypeSerializer(WritableNestedSerializer): - circuit_count = RelatedObjectCountField('circuits') - - class Meta: - model = CircuitType - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'circuit_count'] - - -class NestedCircuitSerializer(WritableNestedSerializer): - - class Meta: - model = Circuit - fields = ['id', 'url', 'display_url', 'display', 'cid'] - - -class NestedCircuitTerminationSerializer(WritableNestedSerializer): - circuit = NestedCircuitSerializer() - - class Meta: - model = CircuitTermination - fields = ['id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'cable', '_occupied'] diff --git a/netbox/core/api/nested_serializers.py b/netbox/core/api/nested_serializers.py deleted file mode 100644 index df7b41ca7..000000000 --- a/netbox/core/api/nested_serializers.py +++ /dev/null @@ -1,47 +0,0 @@ -import warnings - -from rest_framework import serializers - -from core.choices import JobStatusChoices -from core.models import * -from netbox.api.fields import ChoiceField -from netbox.api.serializers import WritableNestedSerializer -from users.api.serializers import UserSerializer - -__all__ = ( - 'NestedDataFileSerializer', - 'NestedDataSourceSerializer', - 'NestedJobSerializer', -) - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -class NestedDataSourceSerializer(WritableNestedSerializer): - - class Meta: - model = DataSource - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedDataFileSerializer(WritableNestedSerializer): - - class Meta: - model = DataFile - fields = ['id', 'url', 'display_url', 'display', 'path'] - - -class NestedJobSerializer(serializers.ModelSerializer): - status = ChoiceField(choices=JobStatusChoices) - user = UserSerializer( - nested=True, - read_only=True - ) - - class Meta: - model = Job - fields = ['url', 'display_url', 'created', 'completed', 'user', 'status'] diff --git a/netbox/dcim/api/nested_serializers.py b/netbox/dcim/api/nested_serializers.py deleted file mode 100644 index 4b8f0db4a..000000000 --- a/netbox/dcim/api/nested_serializers.py +++ /dev/null @@ -1,389 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_serializer -from rest_framework import serializers - -from dcim import models -from netbox.api.fields import RelatedObjectCountField -from netbox.api.serializers import WritableNestedSerializer -from .serializers_.nested import ( - NestedDeviceBaySerializer, NestedDeviceSerializer, NestedInterfaceSerializer, NestedInterfaceTemplateSerializer, - NestedLocationSerializer, NestedModuleBaySerializer, NestedRegionSerializer, NestedSiteGroupSerializer, -) - -__all__ = [ - 'NestedCableSerializer', - 'NestedConsolePortSerializer', - 'NestedConsolePortTemplateSerializer', - 'NestedConsoleServerPortSerializer', - 'NestedConsoleServerPortTemplateSerializer', - 'NestedDeviceBaySerializer', - 'NestedDeviceBayTemplateSerializer', - 'NestedDeviceRoleSerializer', - 'NestedDeviceSerializer', - 'NestedDeviceTypeSerializer', - 'NestedFrontPortSerializer', - 'NestedFrontPortTemplateSerializer', - 'NestedInterfaceSerializer', - 'NestedInterfaceTemplateSerializer', - 'NestedInventoryItemSerializer', - 'NestedInventoryItemRoleSerializer', - 'NestedInventoryItemTemplateSerializer', - 'NestedManufacturerSerializer', - 'NestedModuleBaySerializer', - 'NestedModuleBayTemplateSerializer', - 'NestedModuleSerializer', - 'NestedModuleTypeSerializer', - 'NestedPlatformSerializer', - 'NestedPowerFeedSerializer', - 'NestedPowerOutletSerializer', - 'NestedPowerOutletTemplateSerializer', - 'NestedPowerPanelSerializer', - 'NestedPowerPortSerializer', - 'NestedPowerPortTemplateSerializer', - 'NestedLocationSerializer', - 'NestedRackReservationSerializer', - 'NestedRackRoleSerializer', - 'NestedRackSerializer', - 'NestedRearPortSerializer', - 'NestedRearPortTemplateSerializer', - 'NestedRegionSerializer', - 'NestedSiteSerializer', - 'NestedSiteGroupSerializer', - 'NestedVirtualChassisSerializer', - 'NestedVirtualDeviceContextSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -# -# Regions/sites -# - -class NestedSiteSerializer(WritableNestedSerializer): - - class Meta: - model = models.Site - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug'] - - -# -# Racks -# - -@extend_schema_serializer( - exclude_fields=('rack_count',), -) -class NestedRackRoleSerializer(WritableNestedSerializer): - rack_count = RelatedObjectCountField('racks') - - class Meta: - model = models.RackRole - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'rack_count'] - - -@extend_schema_serializer( - exclude_fields=('device_count',), -) -class NestedRackSerializer(WritableNestedSerializer): - device_count = RelatedObjectCountField('devices') - - class Meta: - model = models.Rack - fields = ['id', 'url', 'display_url', 'display', 'name', 'device_count'] - - -class NestedRackReservationSerializer(WritableNestedSerializer): - user = serializers.SerializerMethodField(read_only=True) - - class Meta: - model = models.RackReservation - fields = ['id', 'url', 'display_url', 'display', 'user', 'units'] - - def get_user(self, obj): - return obj.user.username - - -# -# Device/module types -# - -@extend_schema_serializer( - exclude_fields=('devicetype_count',), -) -class NestedManufacturerSerializer(WritableNestedSerializer): - devicetype_count = RelatedObjectCountField('device_types') - - class Meta: - model = models.Manufacturer - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'devicetype_count'] - - -@extend_schema_serializer( - exclude_fields=('device_count',), -) -class NestedDeviceTypeSerializer(WritableNestedSerializer): - manufacturer = NestedManufacturerSerializer(read_only=True) - device_count = RelatedObjectCountField('instances') - - class Meta: - model = models.DeviceType - fields = ['id', 'url', 'display_url', 'display', 'manufacturer', 'model', 'slug', 'device_count'] - - -class NestedModuleTypeSerializer(WritableNestedSerializer): - manufacturer = NestedManufacturerSerializer(read_only=True) - - class Meta: - model = models.ModuleType - fields = ['id', 'url', 'display_url', 'display', 'manufacturer', 'model'] - - -# -# Component templates -# - -class NestedConsolePortTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ConsolePortTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedConsoleServerPortTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ConsoleServerPortTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedPowerPortTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.PowerPortTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedPowerOutletTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.PowerOutletTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedRearPortTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.RearPortTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedFrontPortTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.FrontPortTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedModuleBayTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ModuleBayTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedDeviceBayTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.DeviceBayTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedInventoryItemTemplateSerializer(WritableNestedSerializer): - _depth = serializers.IntegerField(source='level', read_only=True) - - class Meta: - model = models.InventoryItemTemplate - fields = ['id', 'url', 'display_url', 'display', 'name', '_depth'] - - -# -# Devices -# - -@extend_schema_serializer( - exclude_fields=('device_count', 'virtualmachine_count'), -) -class NestedDeviceRoleSerializer(WritableNestedSerializer): - device_count = RelatedObjectCountField('devices') - virtualmachine_count = RelatedObjectCountField('virtual_machines') - - class Meta: - model = models.DeviceRole - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'device_count', 'virtualmachine_count'] - - -@extend_schema_serializer( - exclude_fields=('device_count', 'virtualmachine_count'), -) -class NestedPlatformSerializer(WritableNestedSerializer): - device_count = RelatedObjectCountField('devices') - virtualmachine_count = RelatedObjectCountField('virtual_machines') - - class Meta: - model = models.Platform - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'device_count', 'virtualmachine_count'] - - -class ModuleNestedModuleBaySerializer(WritableNestedSerializer): - - class Meta: - model = models.ModuleBay - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedModuleSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - module_bay = ModuleNestedModuleBaySerializer(read_only=True) - module_type = NestedModuleTypeSerializer(read_only=True) - - class Meta: - model = models.Module - fields = ['id', 'url', 'display_url', 'display', 'device', 'module_bay', 'module_type'] - - -class NestedConsoleServerPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.ConsoleServerPort - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedConsolePortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.ConsolePort - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedPowerOutletSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.PowerOutlet - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedPowerPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.PowerPort - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedRearPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.RearPort - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedFrontPortSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.FrontPort - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', 'cable', '_occupied'] - - -class NestedInventoryItemSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer(read_only=True) - _depth = serializers.IntegerField(source='level', read_only=True) - - class Meta: - model = models.InventoryItem - fields = ['id', 'url', 'display_url', 'display', 'device', 'name', '_depth'] - - -@extend_schema_serializer( - exclude_fields=('inventoryitem_count',), -) -class NestedInventoryItemRoleSerializer(WritableNestedSerializer): - inventoryitem_count = RelatedObjectCountField('inventory_items') - - class Meta: - model = models.InventoryItemRole - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'inventoryitem_count'] - - -# -# Cables -# - -class NestedCableSerializer(WritableNestedSerializer): - - class Meta: - model = models.Cable - fields = ['id', 'url', 'display_url', 'display', 'label'] - - -# -# Virtual chassis -# - -@extend_schema_serializer( - exclude_fields=('member_count',), -) -class NestedVirtualChassisSerializer(WritableNestedSerializer): - master = NestedDeviceSerializer() - member_count = serializers.IntegerField(read_only=True) - - class Meta: - model = models.VirtualChassis - fields = ['id', 'url', 'display_url', 'display', 'name', 'master', 'member_count'] - - -# -# Power panels/feeds -# - -@extend_schema_serializer( - exclude_fields=('powerfeed_count',), -) -class NestedPowerPanelSerializer(WritableNestedSerializer): - powerfeed_count = RelatedObjectCountField('powerfeeds') - - class Meta: - model = models.PowerPanel - fields = ['id', 'url', 'display_url', 'display', 'name', 'powerfeed_count'] - - -class NestedPowerFeedSerializer(WritableNestedSerializer): - _occupied = serializers.BooleanField(required=False, read_only=True) - - class Meta: - model = models.PowerFeed - fields = ['id', 'url', 'display_url', 'display', 'name', 'cable', '_occupied'] - - -class NestedVirtualDeviceContextSerializer(WritableNestedSerializer): - device = NestedDeviceSerializer() - - class Meta: - model = models.VirtualDeviceContext - fields = ['id', 'url', 'display_url', 'display', 'name', 'identifier', 'device'] diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py deleted file mode 100644 index 235cdd6d6..000000000 --- a/netbox/extras/api/nested_serializers.py +++ /dev/null @@ -1,135 +0,0 @@ -import warnings - -from rest_framework import serializers - -from extras import models -from netbox.api.serializers import NestedTagSerializer, WritableNestedSerializer - -__all__ = [ - 'NestedBookmarkSerializer', - 'NestedConfigContextSerializer', - 'NestedConfigTemplateSerializer', - 'NestedCustomFieldChoiceSetSerializer', - 'NestedCustomFieldSerializer', - 'NestedCustomLinkSerializer', - 'NestedEventRuleSerializer', - 'NestedExportTemplateSerializer', - 'NestedImageAttachmentSerializer', - 'NestedJournalEntrySerializer', - 'NestedSavedFilterSerializer', - 'NestedScriptSerializer', - 'NestedTagSerializer', # Defined in netbox.api.serializers - 'NestedWebhookSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -class NestedEventRuleSerializer(WritableNestedSerializer): - - class Meta: - model = models.EventRule - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedWebhookSerializer(WritableNestedSerializer): - - class Meta: - model = models.Webhook - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedCustomFieldSerializer(WritableNestedSerializer): - - class Meta: - model = models.CustomField - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedCustomFieldChoiceSetSerializer(WritableNestedSerializer): - - class Meta: - model = models.CustomFieldChoiceSet - fields = ['id', 'url', 'display_url', 'display', 'name', 'choices_count'] - - -class NestedCustomLinkSerializer(WritableNestedSerializer): - - class Meta: - model = models.CustomLink - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedConfigContextSerializer(WritableNestedSerializer): - - class Meta: - model = models.ConfigContext - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedConfigTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ConfigTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedExportTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ExportTemplate - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedSavedFilterSerializer(WritableNestedSerializer): - - class Meta: - model = models.SavedFilter - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug'] - - -class NestedBookmarkSerializer(WritableNestedSerializer): - - class Meta: - model = models.Bookmark - fields = ['id', 'url', 'display', 'object_id', 'object_type'] - - -class NestedImageAttachmentSerializer(WritableNestedSerializer): - - class Meta: - model = models.ImageAttachment - fields = ['id', 'url', 'display', 'name', 'image'] - - -class NestedJournalEntrySerializer(WritableNestedSerializer): - - class Meta: - model = models.JournalEntry - fields = ['id', 'url', 'display_url', 'display', 'created'] - - -class NestedScriptSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField( - view_name='extras-api:script-detail', - lookup_field='full_name', - lookup_url_kwarg='pk' - ) - display_url = serializers.HyperlinkedIdentityField( - view_name='extras:script', - lookup_field='full_name', - lookup_url_kwarg='pk' - ) - name = serializers.CharField(read_only=True) - display = serializers.SerializerMethodField(read_only=True) - - class Meta: - model = models.Script - fields = ['id', 'url', 'display_url', 'display', 'name'] - - def get_display(self, obj): - return f'{obj.name} ({obj.module})' diff --git a/netbox/ipam/api/nested_serializers.py b/netbox/ipam/api/nested_serializers.py deleted file mode 100644 index 8b10f29df..000000000 --- a/netbox/ipam/api/nested_serializers.py +++ /dev/null @@ -1,204 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_serializer -from rest_framework import serializers - -from ipam import models -from netbox.api.fields import RelatedObjectCountField -from netbox.api.serializers import WritableNestedSerializer -from .field_serializers import IPAddressField -from .serializers_.nested import NestedIPAddressSerializer - -__all__ = [ - 'NestedAggregateSerializer', - 'NestedASNSerializer', - 'NestedASNRangeSerializer', - 'NestedFHRPGroupSerializer', - 'NestedFHRPGroupAssignmentSerializer', - 'NestedIPAddressSerializer', - 'NestedIPRangeSerializer', - 'NestedPrefixSerializer', - 'NestedRIRSerializer', - 'NestedRoleSerializer', - 'NestedRouteTargetSerializer', - 'NestedServiceSerializer', - 'NestedServiceTemplateSerializer', - 'NestedVLANGroupSerializer', - 'NestedVLANSerializer', - 'NestedVRFSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -# -# ASN ranges -# - -class NestedASNRangeSerializer(WritableNestedSerializer): - - class Meta: - model = models.ASNRange - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -# -# ASNs -# - -class NestedASNSerializer(WritableNestedSerializer): - - class Meta: - model = models.ASN - fields = ['id', 'url', 'display_url', 'display', 'asn'] - - -# -# VRFs -# - -@extend_schema_serializer( - exclude_fields=('prefix_count',), -) -class NestedVRFSerializer(WritableNestedSerializer): - prefix_count = RelatedObjectCountField('prefixes') - - class Meta: - model = models.VRF - fields = ['id', 'url', 'display_url', 'display', 'name', 'rd', 'prefix_count'] - - -# -# Route targets -# - -class NestedRouteTargetSerializer(WritableNestedSerializer): - - class Meta: - model = models.RouteTarget - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -# -# RIRs/aggregates -# - -@extend_schema_serializer( - exclude_fields=('aggregate_count',), -) -class NestedRIRSerializer(WritableNestedSerializer): - aggregate_count = RelatedObjectCountField('aggregates') - - class Meta: - model = models.RIR - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'aggregate_count'] - - -class NestedAggregateSerializer(WritableNestedSerializer): - family = serializers.IntegerField(read_only=True) - - class Meta: - model = models.Aggregate - fields = ['id', 'url', 'display_url', 'display', 'family', 'prefix'] - - -# -# FHRP groups -# - -class NestedFHRPGroupSerializer(WritableNestedSerializer): - - class Meta: - model = models.FHRPGroup - fields = ['id', 'url', 'display_url', 'display', 'protocol', 'group_id'] - - -class NestedFHRPGroupAssignmentSerializer(WritableNestedSerializer): - group = NestedFHRPGroupSerializer() - - class Meta: - model = models.FHRPGroupAssignment - fields = ['id', 'url', 'display_url', 'display', 'group', 'interface_type', 'interface_id', 'priority'] - - -# -# VLANs -# - -@extend_schema_serializer( - exclude_fields=('prefix_count', 'vlan_count'), -) -class NestedRoleSerializer(WritableNestedSerializer): - prefix_count = RelatedObjectCountField('prefixes') - vlan_count = RelatedObjectCountField('vlans') - - class Meta: - model = models.Role - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'prefix_count', 'vlan_count'] - - -@extend_schema_serializer( - exclude_fields=('vlan_count',), -) -class NestedVLANGroupSerializer(WritableNestedSerializer): - vlan_count = RelatedObjectCountField('vlans') - - class Meta: - model = models.VLANGroup - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'vlan_count'] - - -class NestedVLANSerializer(WritableNestedSerializer): - - class Meta: - model = models.VLAN - fields = ['id', 'url', 'display_url', 'display', 'vid', 'name'] - - -# -# Prefixes -# - -class NestedPrefixSerializer(WritableNestedSerializer): - family = serializers.IntegerField(read_only=True) - _depth = serializers.IntegerField(read_only=True) - - class Meta: - model = models.Prefix - fields = ['id', 'url', 'display_url', 'display', 'family', 'prefix', '_depth'] - - -# -# IP ranges -# - -class NestedIPRangeSerializer(WritableNestedSerializer): - family = serializers.IntegerField(read_only=True) - start_address = IPAddressField() - end_address = IPAddressField() - - class Meta: - model = models.IPRange - fields = ['id', 'url', 'display_url', 'display', 'family', 'start_address', 'end_address'] - - -# -# Services -# - -class NestedServiceTemplateSerializer(WritableNestedSerializer): - - class Meta: - model = models.ServiceTemplate - fields = ['id', 'url', 'display_url', 'display', 'name', 'protocol', 'ports'] - - -class NestedServiceSerializer(WritableNestedSerializer): - - class Meta: - model = models.Service - fields = ['id', 'url', 'display_url', 'display', 'name', 'protocol', 'ports'] diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py deleted file mode 100644 index 5adb78863..000000000 --- a/netbox/tenancy/api/nested_serializers.py +++ /dev/null @@ -1,58 +0,0 @@ -import warnings - -from netbox.api.serializers import WritableNestedSerializer -from serializers_.nested import NestedContactGroupSerializer, NestedTenantGroupSerializer -from tenancy.models import * - -__all__ = [ - 'NestedContactSerializer', - 'NestedContactAssignmentSerializer', - 'NestedContactGroupSerializer', - 'NestedContactRoleSerializer', - 'NestedTenantGroupSerializer', - 'NestedTenantSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -# -# Tenants -# - -class NestedTenantSerializer(WritableNestedSerializer): - - class Meta: - model = Tenant - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug'] - - -# -# Contacts -# - -class NestedContactRoleSerializer(WritableNestedSerializer): - - class Meta: - model = ContactRole - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug'] - - -class NestedContactSerializer(WritableNestedSerializer): - - class Meta: - model = Contact - fields = ['id', 'url', 'display_url', 'display', 'name'] - - -class NestedContactAssignmentSerializer(WritableNestedSerializer): - contact = NestedContactSerializer() - role = NestedContactRoleSerializer - - class Meta: - model = ContactAssignment - fields = ['id', 'url', 'display', 'contact', 'role', 'priority'] diff --git a/netbox/users/api/nested_serializers.py b/netbox/users/api/nested_serializers.py deleted file mode 100644 index 201e38901..000000000 --- a/netbox/users/api/nested_serializers.py +++ /dev/null @@ -1,53 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_field -from rest_framework import serializers - -from core.models import ObjectType -from netbox.api.fields import ContentTypeField -from netbox.api.serializers import WritableNestedSerializer -from serializers_.nested import NestedGroupSerializer, NestedUserSerializer -from users.models import ObjectPermission, Token - -__all__ = [ - 'NestedGroupSerializer', - 'NestedObjectPermissionSerializer', - 'NestedTokenSerializer', - 'NestedUserSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -class NestedTokenSerializer(WritableNestedSerializer): - - class Meta: - model = Token - fields = ['id', 'url', 'display_url', 'display', 'key', 'write_enabled'] - - -class NestedObjectPermissionSerializer(WritableNestedSerializer): - object_types = ContentTypeField( - queryset=ObjectType.objects.all(), - many=True - ) - groups = serializers.SerializerMethodField(read_only=True) - users = serializers.SerializerMethodField(read_only=True) - - class Meta: - model = ObjectPermission - fields = [ - 'id', 'url', 'display_url', 'display', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions' - ] - - @extend_schema_field(serializers.ListField) - def get_groups(self, obj): - return [g.name for g in obj.groups.all()] - - @extend_schema_field(serializers.ListField) - def get_users(self, obj): - return [u.username for u in obj.users.all()] diff --git a/netbox/virtualization/api/nested_serializers.py b/netbox/virtualization/api/nested_serializers.py deleted file mode 100644 index 59016f74d..000000000 --- a/netbox/virtualization/api/nested_serializers.py +++ /dev/null @@ -1,72 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_serializer - -from netbox.api.fields import RelatedObjectCountField -from netbox.api.serializers import WritableNestedSerializer -from virtualization.models import * -from .serializers_.nested import NestedVirtualMachineSerializer, NestedVMInterfaceSerializer - -__all__ = [ - 'NestedClusterGroupSerializer', - 'NestedClusterSerializer', - 'NestedClusterTypeSerializer', - 'NestedVirtualDiskSerializer', - 'NestedVMInterfaceSerializer', - 'NestedVirtualMachineSerializer', -] - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -# -# Clusters -# - -@extend_schema_serializer( - exclude_fields=('cluster_count',), -) -class NestedClusterTypeSerializer(WritableNestedSerializer): - cluster_count = RelatedObjectCountField('clusters') - - class Meta: - model = ClusterType - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'cluster_count'] - - -@extend_schema_serializer( - exclude_fields=('cluster_count',), -) -class NestedClusterGroupSerializer(WritableNestedSerializer): - cluster_count = RelatedObjectCountField('clusters') - - class Meta: - model = ClusterGroup - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'cluster_count'] - - -@extend_schema_serializer( - exclude_fields=('virtualmachine_count',), -) -class NestedClusterSerializer(WritableNestedSerializer): - virtualmachine_count = RelatedObjectCountField('virtual_machines') - - class Meta: - model = Cluster - fields = ['id', 'url', 'display_url', 'display', 'name', 'virtualmachine_count'] - - -# -# Virtual machines -# - -class NestedVirtualDiskSerializer(WritableNestedSerializer): - virtual_machine = NestedVirtualMachineSerializer(read_only=True) - - class Meta: - model = VirtualDisk - fields = ['id', 'url', 'display_url', 'display', 'virtual_machine', 'name', 'size'] diff --git a/netbox/vpn/api/nested_serializers.py b/netbox/vpn/api/nested_serializers.py deleted file mode 100644 index 59e394c2e..000000000 --- a/netbox/vpn/api/nested_serializers.py +++ /dev/null @@ -1,109 +0,0 @@ -import warnings - -from drf_spectacular.utils import extend_schema_serializer - -from netbox.api.fields import RelatedObjectCountField -from netbox.api.serializers import WritableNestedSerializer -from vpn import models - -__all__ = ( - 'NestedIKEPolicySerializer', - 'NestedIKEProposalSerializer', - 'NestedIPSecPolicySerializer', - 'NestedIPSecProfileSerializer', - 'NestedIPSecProposalSerializer', - 'NestedL2VPNSerializer', - 'NestedL2VPNTerminationSerializer', - 'NestedTunnelGroupSerializer', - 'NestedTunnelSerializer', - 'NestedTunnelTerminationSerializer', -) - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -@extend_schema_serializer( - exclude_fields=('tunnel_count',), -) -class NestedTunnelGroupSerializer(WritableNestedSerializer): - tunnel_count = RelatedObjectCountField('tunnels') - - class Meta: - model = models.TunnelGroup - fields = ['id', 'url', 'display_url', 'display', 'name', 'slug', 'tunnel_count'] - - -class NestedTunnelSerializer(WritableNestedSerializer): - - class Meta: - model = models.Tunnel - fields = ('id', 'url', 'display_url', 'display', 'name') - - -class NestedTunnelTerminationSerializer(WritableNestedSerializer): - - class Meta: - model = models.TunnelTermination - fields = ('id', 'url', 'display_url', 'display') - - -class NestedIKEProposalSerializer(WritableNestedSerializer): - - class Meta: - model = models.IKEProposal - fields = ('id', 'url', 'display_url', 'display', 'name') - - -class NestedIKEPolicySerializer(WritableNestedSerializer): - - class Meta: - model = models.IKEPolicy - fields = ('id', 'url', 'display_url', 'display', 'name') - - -class NestedIPSecProposalSerializer(WritableNestedSerializer): - - class Meta: - model = models.IPSecProposal - fields = ('id', 'url', 'display_url', 'display', 'name') - - -class NestedIPSecPolicySerializer(WritableNestedSerializer): - - class Meta: - model = models.IPSecPolicy - fields = ('id', 'url', 'display_url', 'display', 'name') - - -class NestedIPSecProfileSerializer(WritableNestedSerializer): - - class Meta: - model = models.IPSecProfile - fields = ('id', 'url', 'display_url', 'display', 'name') - - -# -# L2VPN -# - -class NestedL2VPNSerializer(WritableNestedSerializer): - - class Meta: - model = models.L2VPN - fields = [ - 'id', 'url', 'display', 'display_url', 'identifier', 'name', 'slug', 'type' - ] - - -class NestedL2VPNTerminationSerializer(WritableNestedSerializer): - l2vpn = NestedL2VPNSerializer() - - class Meta: - model = models.L2VPNTermination - fields = [ - 'id', 'url', 'display_url', 'display', 'l2vpn' - ] diff --git a/netbox/wireless/api/nested_serializers.py b/netbox/wireless/api/nested_serializers.py deleted file mode 100644 index 9b8b6c3e3..000000000 --- a/netbox/wireless/api/nested_serializers.py +++ /dev/null @@ -1,24 +0,0 @@ -import warnings - -from netbox.api.serializers import WritableNestedSerializer -from wireless.models import * -from .serializers_.nested import NestedWirelessLANGroupSerializer, NestedWirelessLinkSerializer - -__all__ = ( - 'NestedWirelessLANSerializer', - 'NestedWirelessLANGroupSerializer', - 'NestedWirelessLinkSerializer', -) - -# TODO: Remove in v4.2 -warnings.warn( - "Dedicated nested serializers will be removed in NetBox v4.2. Use Serializer(nested=True) instead.", - DeprecationWarning -) - - -class NestedWirelessLANSerializer(WritableNestedSerializer): - - class Meta: - model = WirelessLAN - fields = ['id', 'url', 'display_url', 'display', 'ssid'] From b9c6def8abd95a3dfb9884ddee88730b27570ad3 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 18 Oct 2024 09:47:16 -0700 Subject: [PATCH 015/190] 15093 Allow plugins to register events pipeline (#17717) * 15093 add events_pipeline registration to plugins * 15093 use list * 15093 add documentation * Update docs/configuration/index.md Co-authored-by: Jeremy Stretch * Update docs/configuration/miscellaneous.md Co-authored-by: Jeremy Stretch * 15093 review changes * 15093 review changes * Formatting & readability * 15093 review changes * 15093 add test --------- Co-authored-by: Jeremy Stretch --- docs/configuration/miscellaneous.md | 9 +++++++++ docs/plugins/development/index.md | 1 + netbox/netbox/plugins/__init__.py | 1 + netbox/netbox/settings.py | 15 +++++++++++++-- netbox/netbox/tests/dummy_plugin/__init__.py | 3 +++ netbox/netbox/tests/dummy_plugin/events.py | 2 ++ netbox/netbox/tests/test_plugins.py | 7 +++++++ 7 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 netbox/netbox/tests/dummy_plugin/events.py diff --git a/docs/configuration/miscellaneous.md b/docs/configuration/miscellaneous.md index 576eb8739..b983acd80 100644 --- a/docs/configuration/miscellaneous.md +++ b/docs/configuration/miscellaneous.md @@ -106,6 +106,15 @@ By default, NetBox will prevent the creation of duplicate prefixes and IP addres --- +## EVENTS_PIPELINE + + +Default: `['extras.events.process_event_queue',]` + +NetBox will call dotted paths to the functions listed here for events (create, update, delete) on models as well as when custom EventRules are fired. + +--- + ## FILE_UPLOAD_MAX_MEMORY_SIZE Default: `2621440` (2.5 MB) diff --git a/docs/plugins/development/index.md b/docs/plugins/development/index.md index f3f9a3e4f..8a83ab71b 100644 --- a/docs/plugins/development/index.md +++ b/docs/plugins/development/index.md @@ -114,6 +114,7 @@ NetBox looks for the `config` variable within a plugin's `__init__.py` to load i | `max_version` | Maximum version of NetBox with which the plugin is compatible | | `middleware` | A list of middleware classes to append after NetBox's build-in middleware | | `queues` | A list of custom background task queues to create | +| `events_pipeline` | A list of handlers to add to [`EVENTS_PIPELINE`](./miscellaneous.md#events_pipeline), identified by dotted paths | | `search_extensions` | The dotted path to the list of search index classes (default: `search.indexes`) | | `data_backends` | The dotted path to the list of data source backend classes (default: `data_backends.backends`) | | `template_extensions` | The dotted path to the list of template extension classes (default: `template_content.template_extensions`) | diff --git a/netbox/netbox/plugins/__init__.py b/netbox/netbox/plugins/__init__.py index e2f0f22fc..69881a251 100644 --- a/netbox/netbox/plugins/__init__.py +++ b/netbox/netbox/plugins/__init__.py @@ -78,6 +78,7 @@ class PluginConfig(AppConfig): menu_items = None template_extensions = None user_preferences = None + events_pipeline = [] def _load_resource(self, name): # Import from the configured path, if defined. diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 2b057b9ab..0682e713d 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -110,9 +110,9 @@ DEFAULT_PERMISSIONS = getattr(configuration, 'DEFAULT_PERMISSIONS', { DEVELOPER = getattr(configuration, 'DEVELOPER', False) DOCS_ROOT = getattr(configuration, 'DOCS_ROOT', os.path.join(os.path.dirname(BASE_DIR), 'docs')) EMAIL = getattr(configuration, 'EMAIL', {}) -EVENTS_PIPELINE = getattr(configuration, 'EVENTS_PIPELINE', ( +EVENTS_PIPELINE = getattr(configuration, 'EVENTS_PIPELINE', [ 'extras.events.process_event_queue', -)) +]) EXEMPT_VIEW_PERMISSIONS = getattr(configuration, 'EXEMPT_VIEW_PERMISSIONS', []) FIELD_CHOICES = getattr(configuration, 'FIELD_CHOICES', {}) FILE_UPLOAD_MAX_MEMORY_SIZE = getattr(configuration, 'FILE_UPLOAD_MAX_MEMORY_SIZE', 2621440) @@ -787,6 +787,10 @@ STRAWBERRY_DJANGO = { PLUGIN_CATALOG_URL = 'https://api.netbox.oss.netboxlabs.com/v1/plugins' +EVENTS_PIPELINE = list(EVENTS_PIPELINE) +if 'extras.events.process_event_queue' not in EVENTS_PIPELINE: + EVENTS_PIPELINE.insert(0, 'extras.events.process_event_queue') + # Register any configured plugins for plugin_name in PLUGINS: try: @@ -857,6 +861,13 @@ for plugin_name in PLUGINS: f"{plugin_name}.{queue}": RQ_PARAMS for queue in plugin_config.queues }) + events_pipeline = plugin_config.events_pipeline + if events_pipeline: + if type(events_pipeline) in (list, tuple): + EVENTS_PIPELINE.extend(events_pipeline) + else: + raise ImproperlyConfigured(f"events_pipline in plugin: {plugin_name} must be a list or tuple") + # UNSUPPORTED FUNCTIONALITY: Import any local overrides. try: from .local_settings import * diff --git a/netbox/netbox/tests/dummy_plugin/__init__.py b/netbox/netbox/tests/dummy_plugin/__init__.py index 3ade8f9df..6ab62d638 100644 --- a/netbox/netbox/tests/dummy_plugin/__init__.py +++ b/netbox/netbox/tests/dummy_plugin/__init__.py @@ -17,6 +17,9 @@ class DummyPluginConfig(PluginConfig): 'testing-medium', 'testing-high' ] + events_pipeline = [ + 'netbox.tests.dummy_plugin.events.process_events_queue' + ] config = DummyPluginConfig diff --git a/netbox/netbox/tests/dummy_plugin/events.py b/netbox/netbox/tests/dummy_plugin/events.py new file mode 100644 index 000000000..934594643 --- /dev/null +++ b/netbox/netbox/tests/dummy_plugin/events.py @@ -0,0 +1,2 @@ +def process_events_queue(events): + pass diff --git a/netbox/netbox/tests/test_plugins.py b/netbox/netbox/tests/test_plugins.py index ba44378c5..16778667d 100644 --- a/netbox/netbox/tests/test_plugins.py +++ b/netbox/netbox/tests/test_plugins.py @@ -203,3 +203,10 @@ class PluginTest(TestCase): self.assertEqual(get_plugin_config(plugin, 'foo'), 123) self.assertEqual(get_plugin_config(plugin, 'bar'), None) self.assertEqual(get_plugin_config(plugin, 'bar', default=456), 456) + + + def test_events_pipeline(self): + """ + Check that events pipeline is registered. + """ + self.assertIn('netbox.tests.dummy_plugin.events.process_events_queue', settings.EVENTS_PIPELINE) From 538f3255a72953e138c457466bb1a26346b42dbe Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 16 Oct 2024 16:05:01 -0400 Subject: [PATCH 016/190] Closes #17789: Use a single scope field for VLANGroup bulk edit --- netbox/ipam/forms/bulk_edit.py | 97 +++++------------- netbox/netbox/views/generic/bulk_views.py | 9 +- netbox/templates/generic/bulk_edit.html | 116 +++++++++++----------- 3 files changed, 90 insertions(+), 132 deletions(-) diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index f4a7eabb7..79debd0ed 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -1,22 +1,23 @@ from django import forms from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ -from dcim.models import Location, Rack, Region, Site, SiteGroup +from dcim.models import Region, Site, SiteGroup from ipam.choices import * from ipam.constants import * from ipam.models import * from ipam.models import ASN from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import add_blank_choice +from utilities.forms import add_blank_choice, get_field_value from utilities.forms.fields import ( CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, NumericArrayField, NumericRangeArrayField, ) from utilities.forms.rendering import FieldSet -from utilities.forms.widgets import BulkEditNullBooleanSelect -from virtualization.models import Cluster, ClusterGroup +from utilities.forms.widgets import BulkEditNullBooleanSelect, HTMXSelect +from utilities.templatetags.builtins.filters import bettertitle __all__ = ( 'AggregateBulkEditForm', @@ -429,62 +430,17 @@ class VLANGroupBulkEditForm(NetBoxModelBulkEditForm): required=False ) scope_type = ContentTypeChoiceField( - label=_('Scope type'), queryset=ContentType.objects.filter(model__in=VLANGROUP_SCOPE_TYPES), - required=False - ) - scope_id = forms.IntegerField( + widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}), required=False, - widget=forms.HiddenInput() + label=_('Scope type') ) - region = DynamicModelChoiceField( - label=_('Region'), - queryset=Region.objects.all(), - required=False - ) - sitegroup = DynamicModelChoiceField( - queryset=SiteGroup.objects.all(), + scope = DynamicModelChoiceField( + label=_('Scope'), + queryset=Site.objects.none(), # Initial queryset required=False, - label=_('Site group') - ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), - required=False, - query_params={ - 'region_id': '$region', - 'group_id': '$sitegroup', - } - ) - location = DynamicModelChoiceField( - label=_('Location'), - queryset=Location.objects.all(), - required=False, - query_params={ - 'site_id': '$site', - } - ) - rack = DynamicModelChoiceField( - label=_('Rack'), - queryset=Rack.objects.all(), - required=False, - query_params={ - 'site_id': '$site', - 'location_id': '$location', - } - ) - clustergroup = DynamicModelChoiceField( - queryset=ClusterGroup.objects.all(), - required=False, - label=_('Cluster group') - ) - cluster = DynamicModelChoiceField( - label=_('Cluster'), - queryset=Cluster.objects.all(), - required=False, - query_params={ - 'group_id': '$clustergroup', - } + disabled=True, + selector=True ) vid_ranges = NumericRangeArrayField( label=_('VLAN ID ranges'), @@ -494,24 +450,23 @@ class VLANGroupBulkEditForm(NetBoxModelBulkEditForm): model = VLANGroup fieldsets = ( FieldSet('site', 'vid_ranges', 'description'), - FieldSet( - 'scope_type', 'region', 'sitegroup', 'site', 'location', 'rack', 'clustergroup', 'cluster', name=_('Scope') - ), + FieldSet('scope_type', 'scope', name=_('Scope')), ) - nullable_fields = ('description',) + nullable_fields = ('description', 'scope') - def clean(self): - super().clean() + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) - # Assign scope based on scope_type - if self.cleaned_data.get('scope_type'): - scope_field = self.cleaned_data['scope_type'].model - if scope_obj := self.cleaned_data.get(scope_field): - self.cleaned_data['scope_id'] = scope_obj.pk - self.changed_data.append('scope_id') - else: - self.cleaned_data.pop('scope_type') - self.changed_data.remove('scope_type') + if scope_type_id := get_field_value(self, 'scope_type'): + try: + scope_type = ContentType.objects.get(pk=scope_type_id) + model = scope_type.model_class() + self.fields['scope'].queryset = model.objects.all() + self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower + self.fields['scope'].disabled = False + self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass class VLANBulkEditForm(NetBoxModelBulkEditForm): diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index d7d28b95f..d8115726c 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -3,7 +3,7 @@ import re from copy import deepcopy from django.contrib import messages -from django.contrib.contenttypes.fields import GenericRel +from django.contrib.contenttypes.fields import GenericForeignKey, GenericRel from django.contrib.contenttypes.models import ContentType from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist, ValidationError from django.db import transaction, IntegrityError @@ -576,7 +576,10 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView): for name, model_field in model_fields.items(): # Handle nullification if name in form.nullable_fields and name in nullified_fields: - setattr(obj, name, None if model_field.null else '') + if type(model_field) is GenericForeignKey: + setattr(obj, name, None) + else: + setattr(obj, name, None if model_field.null else '') # Normal fields elif name in form.changed_data: setattr(obj, name, form.cleaned_data[name]) @@ -688,7 +691,7 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView): logger.debug("Form validation failed") else: - form = self.form(initial=initial_data) + form = self.form(request.POST, initial=initial_data) restrict_form_fields(form, request.user) # Retrieve objects being edited diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html index 4b4d5aece..8c4d305ec 100644 --- a/netbox/templates/generic/bulk_edit.html +++ b/netbox/templates/generic/bulk_edit.html @@ -42,71 +42,71 @@ Context: {# Edit form #}
- - {% csrf_token %} - {% if request.POST.return_url %} - - {% endif %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} - - {% if form.fieldsets %} - - {# Render grouped fields according to declared fieldsets #} - {% for fieldset in form.fieldsets %} - {% render_fieldset form fieldset %} +
+ {% csrf_token %} + {% if request.POST.return_url %} + + {% endif %} + {% for field in form.hidden_fields %} + {{ field }} {% endfor %} - {# Render tag add/remove fields #} - {% if form.add_tags and form.remove_tags %} -
-
-

{% trans "Tags" %}

+ {% if form.fieldsets %} + + {# Render grouped fields according to declared fieldsets #} + {% for fieldset in form.fieldsets %} + {% render_fieldset form fieldset %} + {% endfor %} + + {# Render tag add/remove fields #} + {% if form.add_tags and form.remove_tags %} +
+
+

{% trans "Tags" %}

+
+ {% render_field form.add_tags %} + {% render_field form.remove_tags %}
- {% render_field form.add_tags %} - {% render_field form.remove_tags %} -
- {% endif %} - - {# Render custom fields #} - {% if form.custom_fields %} -
-
-

{% trans "Custom Fields" %}

-
- {% render_custom_fields form %} -
- {% endif %} - - {# Render comments #} - {% if form.comments %} -
-
-

{% trans "Comments" %}

-
- {% render_field form.comments bulk_nullable=True %} -
- {% endif %} - - {% else %} - - {# Render all fields #} - {% for field in form.visible_fields %} - {% if field.name in form.nullable_fields %} - {% render_field field bulk_nullable=True %} - {% else %} - {% render_field field %} {% endif %} - {% endfor %} - {% endif %} + {# Render custom fields #} + {% if form.custom_fields %} +
+
+

{% trans "Custom Fields" %}

+
+ {% render_custom_fields form %} +
+ {% endif %} -
- {% trans "Cancel" %} - + {# Render comments #} + {% if form.comments %} +
+
+

{% trans "Comments" %}

+
+ {% render_field form.comments bulk_nullable=True %} +
+ {% endif %} + + {% else %} + + {# Render all fields #} + {% for field in form.visible_fields %} + {% if field.name in form.nullable_fields %} + {% render_field field bulk_nullable=True %} + {% else %} + {% render_field field %} + {% endif %} + {% endfor %} + + {% endif %} + +
+ {% trans "Cancel" %} + +
-
From 75270c1aef988d8bfbbdff494f0908fcb6d49bf9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 18 Oct 2024 15:45:22 -0400 Subject: [PATCH 017/190] Closes #6414: Enable assigning prefixes to various object types (#17692) * Replace site FK on Prefix with scope GFK * Add denormalized relations * Update prefix filters * Add generic relations for Prefix * Update GraphQL type for Prefix model * Fix tests; misc cleanup * Remove prefix_count from SiteSerializer * Remove site field from PrefixBulkEditForm * Restore scope filters for prefixes * Fix scope population on PrefixForm init * Show scope type * Assign scope during bulk import of prefixes * Correct handling of GenericForeignKey in PrefixForm * Add prefix counts to all scoped objects * Fix migration; linter fix * Add limit_choices_to on scope_type * Clean up cache_related_objects() * Enable bulk editing prefix scope --- netbox/dcim/api/serializers_/sites.py | 12 ++- netbox/dcim/models/sites.py | 24 ++++++ netbox/ipam/api/serializers_/ip.py | 28 +++++-- netbox/ipam/apps.py | 12 +++ netbox/ipam/constants.py | 5 ++ netbox/ipam/filtersets.py | 29 +++++-- netbox/ipam/forms/bulk_edit.py | 46 ++++++----- netbox/ipam/forms/bulk_import.py | 15 ++-- netbox/ipam/forms/filtersets.py | 11 +-- netbox/ipam/forms/model_forms.py | 53 +++++++++++-- netbox/ipam/graphql/types.py | 12 ++- netbox/ipam/migrations/0071_prefix_scope.py | 51 ++++++++++++ .../0072_prefix_cached_relations.py | 61 +++++++++++++++ netbox/ipam/models/ip.py | 76 ++++++++++++++++-- netbox/ipam/tables/ip.py | 14 ++-- netbox/ipam/tests/test_filtersets.py | 16 ++-- netbox/ipam/tests/test_views.py | 38 +++++---- netbox/ipam/views.py | 8 +- netbox/netbox/tests/test_authentication.py | 78 ++++++++----------- netbox/templates/ipam/prefix.html | 16 ++-- netbox/utilities/testing/base.py | 5 ++ 21 files changed, 457 insertions(+), 153 deletions(-) create mode 100644 netbox/ipam/migrations/0071_prefix_scope.py create mode 100644 netbox/ipam/migrations/0072_prefix_cached_relations.py diff --git a/netbox/dcim/api/serializers_/sites.py b/netbox/dcim/api/serializers_/sites.py index dc91f5dc7..7cd89e38c 100644 --- a/netbox/dcim/api/serializers_/sites.py +++ b/netbox/dcim/api/serializers_/sites.py @@ -21,12 +21,13 @@ __all__ = ( class RegionSerializer(NestedGroupModelSerializer): parent = NestedRegionSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) + prefix_count = RelatedObjectCountField('_prefixes') class Meta: model = Region fields = [ 'id', 'url', 'display_url', 'display', 'name', 'slug', 'parent', 'description', 'tags', 'custom_fields', - 'created', 'last_updated', 'site_count', '_depth', + 'created', 'last_updated', 'site_count', 'prefix_count', '_depth', ] brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'site_count', '_depth') @@ -34,12 +35,13 @@ class RegionSerializer(NestedGroupModelSerializer): class SiteGroupSerializer(NestedGroupModelSerializer): parent = NestedSiteGroupSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) + prefix_count = RelatedObjectCountField('_prefixes') class Meta: model = SiteGroup fields = [ 'id', 'url', 'display_url', 'display', 'name', 'slug', 'parent', 'description', 'tags', 'custom_fields', - 'created', 'last_updated', 'site_count', '_depth', + 'created', 'last_updated', 'site_count', 'prefix_count', '_depth', ] brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'site_count', '_depth') @@ -61,7 +63,7 @@ class SiteSerializer(NetBoxModelSerializer): # Related object counts circuit_count = RelatedObjectCountField('circuit_terminations') device_count = RelatedObjectCountField('devices') - prefix_count = RelatedObjectCountField('prefixes') + prefix_count = RelatedObjectCountField('_prefixes') rack_count = RelatedObjectCountField('racks') vlan_count = RelatedObjectCountField('vlans') virtualmachine_count = RelatedObjectCountField('virtual_machines') @@ -84,11 +86,13 @@ class LocationSerializer(NestedGroupModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) rack_count = serializers.IntegerField(read_only=True, default=0) device_count = serializers.IntegerField(read_only=True, default=0) + prefix_count = RelatedObjectCountField('_prefixes') class Meta: model = Location fields = [ 'id', 'url', 'display_url', 'display', 'name', 'slug', 'site', 'parent', 'status', 'tenant', 'facility', - 'description', 'tags', 'custom_fields', 'created', 'last_updated', 'rack_count', 'device_count', '_depth', + 'description', 'tags', 'custom_fields', 'created', 'last_updated', 'rack_count', 'device_count', + 'prefix_count', '_depth', ] brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'rack_count', '_depth') diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index 37f59045d..a290f4119 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -28,6 +28,12 @@ class Region(ContactsMixin, NestedGroupModel): states, and/or cities. Regions are recursively nested into a hierarchy: all sites belonging to a child region are also considered to be members of its parent and ancestor region(s). """ + prefixes = GenericRelation( + to='ipam.Prefix', + content_type_field='scope_type', + object_id_field='scope_id', + related_query_name='region' + ) vlan_groups = GenericRelation( to='ipam.VLANGroup', content_type_field='scope_type', @@ -78,6 +84,12 @@ class SiteGroup(ContactsMixin, NestedGroupModel): within corporate sites you might distinguish between offices and data centers. Like regions, site groups can be nested recursively to form a hierarchy. """ + prefixes = GenericRelation( + to='ipam.Prefix', + content_type_field='scope_type', + object_id_field='scope_id', + related_query_name='site_group' + ) vlan_groups = GenericRelation( to='ipam.VLANGroup', content_type_field='scope_type', @@ -214,6 +226,12 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): ) # Generic relations + prefixes = GenericRelation( + to='ipam.Prefix', + content_type_field='scope_type', + object_id_field='scope_id', + related_query_name='site' + ) vlan_groups = GenericRelation( to='ipam.VLANGroup', content_type_field='scope_type', @@ -273,6 +291,12 @@ class Location(ContactsMixin, ImageAttachmentsMixin, NestedGroupModel): ) # Generic relations + prefixes = GenericRelation( + to='ipam.Prefix', + content_type_field='scope_type', + object_id_field='scope_id', + related_query_name='location' + ) vlan_groups = GenericRelation( to='ipam.VLANGroup', content_type_field='scope_type', diff --git a/netbox/ipam/api/serializers_/ip.py b/netbox/ipam/api/serializers_/ip.py index 535ffcec1..0c3c141af 100644 --- a/netbox/ipam/api/serializers_/ip.py +++ b/netbox/ipam/api/serializers_/ip.py @@ -2,9 +2,8 @@ from django.contrib.contenttypes.models import ContentType from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from dcim.api.serializers_.sites import SiteSerializer from ipam.choices import * -from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS +from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS, PREFIX_SCOPE_TYPES from ipam.models import Aggregate, IPAddress, IPRange, Prefix from netbox.api.fields import ChoiceField, ContentTypeField from netbox.api.serializers import NetBoxModelSerializer @@ -45,8 +44,17 @@ class AggregateSerializer(NetBoxModelSerializer): class PrefixSerializer(NetBoxModelSerializer): family = ChoiceField(choices=IPAddressFamilyChoices, read_only=True) - site = SiteSerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) + scope_type = ContentTypeField( + queryset=ContentType.objects.filter( + model__in=PREFIX_SCOPE_TYPES + ), + allow_null=True, + required=False, + default=None + ) + scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) + scope = serializers.SerializerMethodField(read_only=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) vlan = VLANSerializer(nested=True, required=False, allow_null=True) status = ChoiceField(choices=PrefixStatusChoices, required=False) @@ -58,12 +66,20 @@ class PrefixSerializer(NetBoxModelSerializer): class Meta: model = Prefix fields = [ - 'id', 'url', 'display_url', 'display', 'family', 'prefix', 'site', 'vrf', 'tenant', 'vlan', 'status', - 'role', 'is_pool', 'mark_utilized', 'description', 'comments', 'tags', 'custom_fields', - 'created', 'last_updated', 'children', '_depth', + 'id', 'url', 'display_url', 'display', 'family', 'prefix', 'vrf', 'scope_type', 'scope_id', 'scope', + 'tenant', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'description', 'comments', 'tags', + 'custom_fields', 'created', 'last_updated', 'children', '_depth', ] brief_fields = ('id', 'url', 'display', 'family', 'prefix', 'description', '_depth') + @extend_schema_field(serializers.JSONField(allow_null=True)) + def get_scope(self, obj): + if obj.scope_id is None: + return None + serializer = get_serializer_for_model(obj.scope) + context = {'request': self.context['request']} + return serializer(obj.scope, nested=True, context=context).data + class PrefixLengthSerializer(serializers.Serializer): diff --git a/netbox/ipam/apps.py b/netbox/ipam/apps.py index c118d5464..e0463dfce 100644 --- a/netbox/ipam/apps.py +++ b/netbox/ipam/apps.py @@ -1,5 +1,7 @@ from django.apps import AppConfig +from netbox import denormalized + class IPAMConfig(AppConfig): name = "ipam" @@ -8,6 +10,16 @@ class IPAMConfig(AppConfig): def ready(self): from netbox.models.features import register_models from . import signals, search # noqa: F401 + from .models import Prefix # Register models register_models(*self.get_models()) + + # Register denormalized fields + denormalized.register(Prefix, '_site', { + '_region': 'region', + '_sitegroup': 'group', + }) + denormalized.register(Prefix, '_location', { + '_site': 'site', + }) diff --git a/netbox/ipam/constants.py b/netbox/ipam/constants.py index 6dffd3287..c07b8441f 100644 --- a/netbox/ipam/constants.py +++ b/netbox/ipam/constants.py @@ -23,6 +23,11 @@ VRF_RD_MAX_LENGTH = 21 PREFIX_LENGTH_MIN = 1 PREFIX_LENGTH_MAX = 127 # IPv6 +# models values for ContentTypes which may be Prefix scope types +PREFIX_SCOPE_TYPES = ( + 'region', 'sitegroup', 'site', 'location', +) + # # IPAddresses diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 894219c64..6fba68e8b 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -9,7 +9,7 @@ from drf_spectacular.utils import extend_schema_field from netaddr.core import AddrFormatError from circuits.models import Provider -from dcim.models import Device, Interface, Region, Site, SiteGroup +from dcim.models import Device, Interface, Location, Region, Site, SiteGroup from netbox.filtersets import ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet from tenancy.filtersets import TenancyFilterSet from utilities.filters import ( @@ -332,42 +332,57 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): to_field_name='rd', label=_('VRF (RD)'), ) + scope_type = ContentTypeFilter() region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='site__region', + field_name='_region', lookup_expr='in', label=_('Region (ID)'), ) region = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='site__region', + field_name='_region', lookup_expr='in', to_field_name='slug', label=_('Region (slug)'), ) site_group_id = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='site__group', + field_name='_sitegroup', lookup_expr='in', label=_('Site group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='site__group', + field_name='_sitegroup', lookup_expr='in', to_field_name='slug', label=_('Site group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), + field_name='_site', label=_('Site (ID)'), ) site = django_filters.ModelMultipleChoiceFilter( - field_name='site__slug', + field_name='_site__slug', queryset=Site.objects.all(), to_field_name='slug', label=_('Site (slug)'), ) + location_id = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + label=_('Location (ID)'), + ) + location = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + to_field_name='slug', + label=_('Location (slug)'), + ) vlan_id = django_filters.ModelMultipleChoiceFilter( queryset=VLAN.objects.all(), label=_('VLAN (ID)'), @@ -393,7 +408,7 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): class Meta: model = Prefix - fields = ('id', 'is_pool', 'mark_utilized', 'description') + fields = ('id', 'scope_id', 'is_pool', 'mark_utilized', 'description') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index 79debd0ed..223fad790 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -204,24 +204,18 @@ class RoleBulkEditForm(NetBoxModelBulkEditForm): class PrefixBulkEditForm(NetBoxModelBulkEditForm): - region = DynamicModelChoiceField( - label=_('Region'), - queryset=Region.objects.all(), - required=False - ) - site_group = DynamicModelChoiceField( - label=_('Site group'), - queryset=SiteGroup.objects.all(), - required=False - ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), + scope_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=VLANGROUP_SCOPE_TYPES), + widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}), required=False, - query_params={ - 'region_id': '$region', - 'group_id': '$site_group', - } + label=_('Scope type') + ) + scope = DynamicModelChoiceField( + label=_('Scope'), + queryset=Site.objects.none(), # Initial queryset + required=False, + disabled=True, + selector=True ) vlan_group = DynamicModelChoiceField( queryset=VLANGroup.objects.all(), @@ -282,14 +276,28 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): model = Prefix fieldsets = ( FieldSet('tenant', 'status', 'role', 'description'), - FieldSet('region', 'site_group', 'site', name=_('Site')), FieldSet('vrf', 'prefix_length', 'is_pool', 'mark_utilized', name=_('Addressing')), + FieldSet('scope_type', 'scope', name=_('Scope')), FieldSet('vlan_group', 'vlan', name=_('VLAN Assignment')), ) nullable_fields = ( - 'site', 'vlan', 'vrf', 'tenant', 'role', 'description', 'comments', + 'vlan', 'vrf', 'tenant', 'role', 'scope', 'description', 'comments', ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if scope_type_id := get_field_value(self, 'scope_type'): + try: + scope_type = ContentType.objects.get(pk=scope_type_id) + model = scope_type.model_class() + self.fields['scope'].queryset = model.objects.all() + self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower + self.fields['scope'].disabled = False + self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass + class IPRangeBulkEditForm(NetBoxModelBulkEditForm): vrf = DynamicModelChoiceField( diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index dea250c79..a6ef1a9fb 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -167,12 +167,10 @@ class PrefixImportForm(NetBoxModelImportForm): to_field_name='name', help_text=_('Assigned tenant') ) - site = CSVModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), + scope_type = CSVContentTypeField( + queryset=ContentType.objects.filter(model__in=PREFIX_SCOPE_TYPES), required=False, - to_field_name='name', - help_text=_('Assigned site') + label=_('Scope type (app & model)') ) vlan_group = CSVModelChoiceField( label=_('VLAN group'), @@ -204,9 +202,12 @@ class PrefixImportForm(NetBoxModelImportForm): class Meta: model = Prefix fields = ( - 'prefix', 'vrf', 'tenant', 'site', 'vlan_group', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', - 'description', 'comments', 'tags', + 'prefix', 'vrf', 'tenant', 'vlan_group', 'vlan', 'status', 'role', 'scope_type', 'scope_id', 'is_pool', + 'mark_utilized', 'description', 'comments', 'tags', ) + labels = { + 'scope_id': 'Scope ID', + } def __init__(self, data=None, *args, **kwargs): super().__init__(data, *args, **kwargs) diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index a32694321..57c0f479c 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -170,7 +170,7 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): ), FieldSet('vlan_id', name=_('VLAN Assignment')), FieldSet('vrf_id', 'present_in_vrf_id', name=_('VRF')), - FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), ) mask_length__lte = forms.IntegerField( @@ -224,12 +224,13 @@ class PrefixFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), required=False, - null_option='None', - query_params={ - 'region_id': '$region_id' - }, label=_('Site') ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) role_id = DynamicModelMultipleChoiceField( queryset=Role.objects.all(), required=False, diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 156e7c435..e9e90db57 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -201,12 +201,18 @@ class PrefixForm(TenancyForm, NetBoxModelForm): required=False, label=_('VRF') ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), + scope_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=PREFIX_SCOPE_TYPES), + widget=HTMXSelect(), required=False, - selector=True, - null_option='None' + label=_('Scope type') + ) + scope = DynamicModelChoiceField( + label=_('Scope'), + queryset=Site.objects.none(), # Initial queryset + required=False, + disabled=True, + selector=True ) vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), @@ -228,17 +234,48 @@ class PrefixForm(TenancyForm, NetBoxModelForm): FieldSet( 'prefix', 'status', 'vrf', 'role', 'is_pool', 'mark_utilized', 'description', 'tags', name=_('Prefix') ), - FieldSet('site', 'vlan', name=_('Site/VLAN Assignment')), + FieldSet('scope_type', 'scope', name=_('Scope')), + FieldSet('vlan', name=_('VLAN Assignment')), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), ) class Meta: model = Prefix fields = [ - 'prefix', 'vrf', 'site', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'tenant_group', 'tenant', - 'description', 'comments', 'tags', + 'prefix', 'vrf', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'scope_type', 'tenant_group', + 'tenant', 'description', 'comments', 'tags', ] + def __init__(self, *args, **kwargs): + instance = kwargs.get('instance') + initial = kwargs.get('initial', {}) + + if instance is not None and instance.scope: + initial['scope'] = instance.scope + kwargs['initial'] = initial + + super().__init__(*args, **kwargs) + + if scope_type_id := get_field_value(self, 'scope_type'): + try: + scope_type = ContentType.objects.get(pk=scope_type_id) + model = scope_type.model_class() + self.fields['scope'].queryset = model.objects.all() + self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower + self.fields['scope'].disabled = False + self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass + + if self.instance and scope_type_id != self.instance.scope_type_id: + self.initial['scope'] = None + + def clean(self): + super().clean() + + # Assign the selected scope (if any) + self.instance.scope = self.cleaned_data.get('scope') + class IPRangeForm(TenancyForm, NetBoxModelForm): vrf = DynamicModelChoiceField( diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index 46d45816e..9fe1fe466 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -152,17 +152,25 @@ class IPRangeType(NetBoxObjectType): @strawberry_django.type( models.Prefix, - fields='__all__', + exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_sitegroup'), filters=PrefixFilter ) class PrefixType(NetBoxObjectType, BaseIPAddressFamilyType): prefix: str - site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')] | None vrf: Annotated["VRFType", strawberry.lazy('ipam.graphql.types')] | None tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None vlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None role: Annotated["RoleType", strawberry.lazy('ipam.graphql.types')] | None + @strawberry_django.field + def scope(self) -> Annotated[Union[ + Annotated["LocationType", strawberry.lazy('dcim.graphql.types')], + Annotated["RegionType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteType", strawberry.lazy('dcim.graphql.types')], + ], strawberry.union("PrefixScopeType")] | None: + return self.scope + @strawberry_django.type( models.RIR, diff --git a/netbox/ipam/migrations/0071_prefix_scope.py b/netbox/ipam/migrations/0071_prefix_scope.py new file mode 100644 index 000000000..d016bdb93 --- /dev/null +++ b/netbox/ipam/migrations/0071_prefix_scope.py @@ -0,0 +1,51 @@ +import django.db.models.deletion +from django.db import migrations, models + + +def copy_site_assignments(apps, schema_editor): + """ + Copy site ForeignKey values to the scope GFK. + """ + ContentType = apps.get_model('contenttypes', 'ContentType') + Prefix = apps.get_model('ipam', 'Prefix') + Site = apps.get_model('dcim', 'Site') + + Prefix.objects.filter(site__isnull=False).update( + scope_type=ContentType.objects.get_for_model(Site), + scope_id=models.F('site_id') + ) + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('ipam', '0070_vlangroup_vlan_id_ranges'), + ] + + operations = [ + # Add the `scope` GenericForeignKey + migrations.AddField( + model_name='prefix', + name='scope_id', + field=models.PositiveBigIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='prefix', + name='scope_type', + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location'))), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype' + ), + ), + + # Copy over existing site assignments + migrations.RunPython( + code=copy_site_assignments, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/ipam/migrations/0072_prefix_cached_relations.py b/netbox/ipam/migrations/0072_prefix_cached_relations.py new file mode 100644 index 000000000..2b457ebda --- /dev/null +++ b/netbox/ipam/migrations/0072_prefix_cached_relations.py @@ -0,0 +1,61 @@ +import django.db.models.deletion +from django.db import migrations, models + + +def populate_denormalized_fields(apps, schema_editor): + """ + Copy site ForeignKey values to the scope GFK. + """ + Prefix = apps.get_model('ipam', 'Prefix') + + prefixes = Prefix.objects.filter(site__isnull=False).prefetch_related('site') + for prefix in prefixes: + prefix._region_id = prefix.site.region_id + prefix._sitegroup_id = prefix.site.group_id + prefix._site_id = prefix.site_id + # Note: Location cannot be set prior to migration + + Prefix.objects.bulk_update(prefixes, ['_region', '_sitegroup', '_site']) + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0193_poweroutlet_color'), + ('ipam', '0071_prefix_scope'), + ] + + operations = [ + migrations.AddField( + model_name='prefix', + name='_location', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.location'), + ), + migrations.AddField( + model_name='prefix', + name='_region', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.region'), + ), + migrations.AddField( + model_name='prefix', + name='_site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.site'), + ), + migrations.AddField( + model_name='prefix', + name='_sitegroup', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.sitegroup'), + ), + + # Populate denormalized FK values + migrations.RunPython( + code=populate_denormalized_fields, + reverse_code=migrations.RunPython.noop + ), + + # Delete the site ForeignKey + migrations.RemoveField( + model_name='prefix', + name='site', + ), + ] diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index a540b5810..69da45fc6 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -1,4 +1,5 @@ import netaddr +from django.apps import apps from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import ValidationError from django.db import models @@ -199,21 +200,30 @@ class Role(OrganizationalModel): class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): """ - A Prefix represents an IPv4 or IPv6 network, including mask length. Prefixes can optionally be assigned to Sites and - VRFs. A Prefix must be assigned a status and may optionally be assigned a used-define Role. A Prefix can also be - assigned to a VLAN where appropriate. + A Prefix represents an IPv4 or IPv6 network, including mask length. Prefixes can optionally be scoped to certain + areas and/or assigned to VRFs. A Prefix must be assigned a status and may optionally be assigned a used-define Role. + A Prefix can also be assigned to a VLAN where appropriate. """ prefix = IPNetworkField( verbose_name=_('prefix'), help_text=_('IPv4 or IPv6 network with mask') ) - site = models.ForeignKey( - to='dcim.Site', + scope_type = models.ForeignKey( + to='contenttypes.ContentType', on_delete=models.PROTECT, - related_name='prefixes', + limit_choices_to=Q(model__in=PREFIX_SCOPE_TYPES), + related_name='+', blank=True, null=True ) + scope_id = models.PositiveBigIntegerField( + blank=True, + null=True + ) + scope = GenericForeignKey( + ct_field='scope_type', + fk_field='scope_id' + ) vrf = models.ForeignKey( to='ipam.VRF', on_delete=models.PROTECT, @@ -262,6 +272,36 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): help_text=_("Treat as fully utilized") ) + # Cached associations to enable efficient filtering + _location = models.ForeignKey( + to='dcim.Location', + on_delete=models.CASCADE, + related_name='_prefixes', + blank=True, + null=True + ) + _site = models.ForeignKey( + to='dcim.Site', + on_delete=models.CASCADE, + related_name='_prefixes', + blank=True, + null=True + ) + _region = models.ForeignKey( + to='dcim.Region', + on_delete=models.CASCADE, + related_name='_prefixes', + blank=True, + null=True + ) + _sitegroup = models.ForeignKey( + to='dcim.SiteGroup', + on_delete=models.CASCADE, + related_name='_prefixes', + blank=True, + null=True + ) + # Cached depth & child counts _depth = models.PositiveSmallIntegerField( default=0, @@ -275,7 +315,7 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): objects = PrefixQuerySet.as_manager() clone_fields = ( - 'site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'description', + 'scope_type', 'scope_id', 'vrf', 'tenant', 'vlan', 'status', 'role', 'is_pool', 'mark_utilized', 'description', ) class Meta: @@ -323,8 +363,30 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): # Clear host bits from prefix self.prefix = self.prefix.cidr + # Cache objects associated with the terminating object (for filtering) + self.cache_related_objects() + super().save(*args, **kwargs) + def cache_related_objects(self): + self._region = self._sitegroup = self._site = self._location = None + if self.scope_type: + scope_type = self.scope_type.model_class() + if scope_type == apps.get_model('dcim', 'region'): + self._region = self.scope + elif scope_type == apps.get_model('dcim', 'sitegroup'): + self._sitegroup = self.scope + elif scope_type == apps.get_model('dcim', 'site'): + self._region = self.scope.region + self._sitegroup = self.scope.group + self._site = self.scope + elif scope_type == apps.get_model('dcim', 'location'): + self._region = self.scope.site.region + self._sitegroup = self.scope.site.group + self._site = self.scope.site + self._location = self.scope + cache_related_objects.alters_data = True + @property def family(self): return self.prefix.version if self.prefix else None diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 8ec7a5967..399641422 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -241,8 +241,11 @@ class PrefixTable(TenancyColumnsMixin, NetBoxTable): template_code=VRF_LINK, verbose_name=_('VRF') ) - site = tables.Column( - verbose_name=_('Site'), + scope_type = columns.ContentTypeColumn( + verbose_name=_('Scope Type'), + ) + scope = tables.Column( + verbose_name=_('Scope'), linkify=True ) vlan_group = tables.Column( @@ -285,11 +288,12 @@ class PrefixTable(TenancyColumnsMixin, NetBoxTable): model = Prefix fields = ( 'pk', 'id', 'prefix', 'prefix_flat', 'status', 'children', 'vrf', 'utilization', 'tenant', 'tenant_group', - 'site', 'vlan_group', 'vlan', 'role', 'is_pool', 'mark_utilized', 'description', 'comments', 'tags', - 'created', 'last_updated', + 'scope', 'scope_type', 'vlan_group', 'vlan', 'role', 'is_pool', 'mark_utilized', 'description', 'comments', + 'tags', 'created', 'last_updated', ) default_columns = ( - 'pk', 'prefix', 'status', 'children', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'description', + 'pk', 'prefix', 'status', 'children', 'vrf', 'utilization', 'tenant', 'scope', 'vlan', 'role', + 'description', ) row_attrs = { 'class': lambda record: 'success' if not record.pk else '', diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 4e38b1450..7bc372fbf 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -656,14 +656,14 @@ class PrefixTestCase(TestCase, ChangeLoggedFilterSetTests): Tenant.objects.bulk_create(tenants) prefixes = ( - Prefix(prefix='10.0.0.0/24', tenant=None, site=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True, description='foobar1'), - Prefix(prefix='10.0.1.0/24', tenant=tenants[0], site=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0], description='foobar2'), - Prefix(prefix='10.0.2.0/24', tenant=tenants[1], site=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), - Prefix(prefix='10.0.3.0/24', tenant=tenants[2], site=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), - Prefix(prefix='2001:db8::/64', tenant=None, site=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True), - Prefix(prefix='2001:db8:0:1::/64', tenant=tenants[0], site=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0]), - Prefix(prefix='2001:db8:0:2::/64', tenant=tenants[1], site=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), - Prefix(prefix='2001:db8:0:3::/64', tenant=tenants[2], site=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), + Prefix(prefix='10.0.0.0/24', tenant=None, scope=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True, description='foobar1'), + Prefix(prefix='10.0.1.0/24', tenant=tenants[0], scope=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0], description='foobar2'), + Prefix(prefix='10.0.2.0/24', tenant=tenants[1], scope=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), + Prefix(prefix='10.0.3.0/24', tenant=tenants[2], scope=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), + Prefix(prefix='2001:db8::/64', tenant=None, scope=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True), + Prefix(prefix='2001:db8:0:1::/64', tenant=tenants[0], scope=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0]), + Prefix(prefix='2001:db8:0:2::/64', tenant=tenants[1], scope=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), + Prefix(prefix='2001:db8:0:3::/64', tenant=tenants[2], scope=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), Prefix(prefix='10.0.0.0/16'), Prefix(prefix='2001:db8::/32'), ) diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index 95b311878..27d88767b 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -1,5 +1,6 @@ import datetime +from django.contrib.contenttypes.models import ContentType from django.test import override_settings from django.urls import reverse from netaddr import IPNetwork @@ -409,9 +410,9 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase): Role.objects.bulk_create(roles) prefixes = ( - Prefix(prefix=IPNetwork('10.1.0.0/16'), vrf=vrfs[0], site=sites[0], role=roles[0]), - Prefix(prefix=IPNetwork('10.2.0.0/16'), vrf=vrfs[0], site=sites[0], role=roles[0]), - Prefix(prefix=IPNetwork('10.3.0.0/16'), vrf=vrfs[0], site=sites[0], role=roles[0]), + Prefix(prefix=IPNetwork('10.1.0.0/16'), vrf=vrfs[0], scope=sites[0], role=roles[0]), + Prefix(prefix=IPNetwork('10.2.0.0/16'), vrf=vrfs[0], scope=sites[0], role=roles[0]), + Prefix(prefix=IPNetwork('10.3.0.0/16'), vrf=vrfs[0], scope=sites[0], role=roles[0]), ) Prefix.objects.bulk_create(prefixes) @@ -419,7 +420,8 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.form_data = { 'prefix': IPNetwork('192.0.2.0/24'), - 'site': sites[1].pk, + 'scope_type': ContentType.objects.get_for_model(Site).pk, + 'scope': sites[1].pk, 'vrf': vrfs[1].pk, 'tenant': None, 'vlan': None, @@ -430,11 +432,12 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'tags': [t.pk for t in tags], } + site = sites[0].pk cls.csv_data = ( - "vrf,prefix,status", - "VRF 1,10.4.0.0/16,active", - "VRF 1,10.5.0.0/16,active", - "VRF 1,10.6.0.0/16,active", + "vrf,prefix,status,scope_type,scope_id", + f"VRF 1,10.4.0.0/16,active,dcim.site,{site}", + f"VRF 1,10.5.0.0/16,active,dcim.site,{site}", + f"VRF 1,10.6.0.0/16,active,dcim.site,{site}", ) cls.csv_update_data = ( @@ -445,7 +448,6 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase): ) cls.bulk_edit_data = { - 'site': sites[1].pk, 'vrf': vrfs[1].pk, 'tenant': None, 'status': PrefixStatusChoices.STATUS_RESERVED, @@ -501,11 +503,13 @@ class PrefixTestCase(ViewTestCases.PrimaryObjectViewTestCase): """ Custom import test for YAML-based imports (versus CSV) """ - IMPORT_DATA = """ + site = Site.objects.get(name='Site 1') + IMPORT_DATA = f""" prefix: 10.1.1.0/24 status: active vlan: 101 -site: Site 1 +scope_type: dcim.site +scope_id: {site.pk} """ # Note, a site is not tied to the VLAN to verify the fix for #12622 VLAN.objects.create(vid=101, name='VLAN101') @@ -523,19 +527,21 @@ site: Site 1 prefix = Prefix.objects.get(prefix='10.1.1.0/24') self.assertEqual(prefix.status, PrefixStatusChoices.STATUS_ACTIVE) self.assertEqual(prefix.vlan.vid, 101) - self.assertEqual(prefix.site.name, "Site 1") + self.assertEqual(prefix.scope, site) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) def test_prefix_import_with_vlan_group(self): """ This test covers a unique import edge case where VLAN group is specified during the import. """ - IMPORT_DATA = """ + site = Site.objects.get(name='Site 1') + IMPORT_DATA = f""" prefix: 10.1.2.0/24 status: active -vlan: 102 -site: Site 1 +scope_type: dcim.site +scope_id: {site.pk} vlan_group: Group 1 +vlan: 102 """ vlan_group = VLANGroup.objects.create(name='Group 1', slug='group-1', scope=Site.objects.get(name="Site 1")) VLAN.objects.create(vid=102, name='VLAN102', group=vlan_group) @@ -553,7 +559,7 @@ vlan_group: Group 1 prefix = Prefix.objects.get(prefix='10.1.2.0/24') self.assertEqual(prefix.status, PrefixStatusChoices.STATUS_ACTIVE) self.assertEqual(prefix.vlan.vid, 102) - self.assertEqual(prefix.site.name, "Site 1") + self.assertEqual(prefix.scope, site) class IPRangeTestCase(ViewTestCases.PrimaryObjectViewTestCase): diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 67d56f15e..5381ec187 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -352,7 +352,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView): def get_children(self, request, parent): return Prefix.objects.restrict(request.user, 'view').filter( prefix__net_contained_or_equal=str(parent.prefix) - ).prefetch_related('site', 'role', 'tenant', 'tenant__group', 'vlan') + ).prefetch_related('scope', 'role', 'tenant', 'tenant__group', 'vlan') def prep_table_data(self, request, queryset, parent): # Determine whether to show assigned prefixes, available prefixes, or both @@ -492,7 +492,7 @@ class PrefixView(generic.ObjectView): ).filter( prefix__net_contains=str(instance.prefix) ).prefetch_related( - 'site', 'role', 'tenant', 'vlan', + 'scope', 'role', 'tenant', 'vlan', ) parent_prefix_table = tables.PrefixTable( list(parent_prefixes), @@ -506,7 +506,7 @@ class PrefixView(generic.ObjectView): ).exclude( pk=instance.pk ).prefetch_related( - 'site', 'role', 'tenant', 'vlan', + 'scope', 'role', 'tenant', 'vlan', ) duplicate_prefix_table = tables.PrefixTable( list(duplicate_prefixes), @@ -538,7 +538,7 @@ class PrefixPrefixesView(generic.ObjectChildrenView): def get_children(self, request, parent): return parent.get_child_prefixes().restrict(request.user, 'view').prefetch_related( - 'site', 'vrf', 'vlan', 'role', 'tenant', 'tenant__group' + 'scope', 'vrf', 'vlan', 'role', 'tenant', 'tenant__group' ) def prep_table_data(self, request, queryset, parent): diff --git a/netbox/netbox/tests/test_authentication.py b/netbox/netbox/tests/test_authentication.py index ae6d3f4c2..9eb21661d 100644 --- a/netbox/netbox/tests/test_authentication.py +++ b/netbox/netbox/tests/test_authentication.py @@ -4,12 +4,10 @@ from django.conf import settings from django.test import Client from django.test.utils import override_settings from django.urls import reverse -from netaddr import IPNetwork from rest_framework.test import APIClient from core.models import ObjectType -from dcim.models import Site -from ipam.models import Prefix +from dcim.models import Rack, Site from users.models import Group, ObjectPermission, Token, User from utilities.testing import TestCase from utilities.testing.api import APITestCase @@ -410,18 +408,18 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) Site.objects.bulk_create(cls.sites) - cls.prefixes = ( - Prefix(prefix=IPNetwork('10.0.0.0/24'), site=cls.sites[0]), - Prefix(prefix=IPNetwork('10.0.1.0/24'), site=cls.sites[0]), - Prefix(prefix=IPNetwork('10.0.2.0/24'), site=cls.sites[0]), - Prefix(prefix=IPNetwork('10.0.3.0/24'), site=cls.sites[1]), - Prefix(prefix=IPNetwork('10.0.4.0/24'), site=cls.sites[1]), - Prefix(prefix=IPNetwork('10.0.5.0/24'), site=cls.sites[1]), - Prefix(prefix=IPNetwork('10.0.6.0/24'), site=cls.sites[2]), - Prefix(prefix=IPNetwork('10.0.7.0/24'), site=cls.sites[2]), - Prefix(prefix=IPNetwork('10.0.8.0/24'), site=cls.sites[2]), + cls.racks = ( + Rack(name='Rack 1', site=cls.sites[0]), + Rack(name='Rack 2', site=cls.sites[0]), + Rack(name='Rack 3', site=cls.sites[0]), + Rack(name='Rack 4', site=cls.sites[1]), + Rack(name='Rack 5', site=cls.sites[1]), + Rack(name='Rack 6', site=cls.sites[1]), + Rack(name='Rack 7', site=cls.sites[2]), + Rack(name='Rack 8', site=cls.sites[2]), + Rack(name='Rack 9', site=cls.sites[2]), ) - Prefix.objects.bulk_create(cls.prefixes) + Rack.objects.bulk_create(cls.racks) def setUp(self): """ @@ -435,8 +433,7 @@ class ObjectPermissionAPIViewTestCase(TestCase): def test_get_object(self): # Attempt to retrieve object without permission - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.get(url, **self.header) self.assertEqual(response.status_code, 403) @@ -448,23 +445,21 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) obj_perm.save() obj_perm.users.add(self.user) - obj_perm.object_types.add(ObjectType.objects.get_for_model(Prefix)) + obj_perm.object_types.add(ObjectType.objects.get_for_model(Rack)) # Retrieve permitted object - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.get(url, **self.header) self.assertEqual(response.status_code, 200) # Attempt to retrieve non-permitted object - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[3].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[3].pk}) response = self.client.get(url, **self.header) self.assertEqual(response.status_code, 404) @override_settings(EXEMPT_VIEW_PERMISSIONS=[]) def test_list_objects(self): - url = reverse('ipam-api:prefix-list') + url = reverse('dcim-api:rack-list') # Attempt to list objects without permission response = self.client.get(url, **self.header) @@ -478,7 +473,7 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) obj_perm.save() obj_perm.users.add(self.user) - obj_perm.object_types.add(ObjectType.objects.get_for_model(Prefix)) + obj_perm.object_types.add(ObjectType.objects.get_for_model(Rack)) # Retrieve all objects. Only permitted objects should be returned. response = self.client.get(url, **self.header) @@ -487,12 +482,12 @@ class ObjectPermissionAPIViewTestCase(TestCase): @override_settings(EXEMPT_VIEW_PERMISSIONS=[]) def test_create_object(self): - url = reverse('ipam-api:prefix-list') + url = reverse('dcim-api:rack-list') data = { - 'prefix': '10.0.9.0/24', + 'name': 'Rack 10', 'site': self.sites[1].pk, } - initial_count = Prefix.objects.count() + initial_count = Rack.objects.count() # Attempt to create an object without permission response = self.client.post(url, data, format='json', **self.header) @@ -506,26 +501,25 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) obj_perm.save() obj_perm.users.add(self.user) - obj_perm.object_types.add(ObjectType.objects.get_for_model(Prefix)) + obj_perm.object_types.add(ObjectType.objects.get_for_model(Rack)) # Attempt to create a non-permitted object response = self.client.post(url, data, format='json', **self.header) self.assertEqual(response.status_code, 403) - self.assertEqual(Prefix.objects.count(), initial_count) + self.assertEqual(Rack.objects.count(), initial_count) # Create a permitted object data['site'] = self.sites[0].pk response = self.client.post(url, data, format='json', **self.header) self.assertEqual(response.status_code, 201) - self.assertEqual(Prefix.objects.count(), initial_count + 1) + self.assertEqual(Rack.objects.count(), initial_count + 1) @override_settings(EXEMPT_VIEW_PERMISSIONS=[]) def test_edit_object(self): # Attempt to edit an object without permission data = {'site': self.sites[0].pk} - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.patch(url, data, format='json', **self.header) self.assertEqual(response.status_code, 403) @@ -537,26 +531,23 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) obj_perm.save() obj_perm.users.add(self.user) - obj_perm.object_types.add(ObjectType.objects.get_for_model(Prefix)) + obj_perm.object_types.add(ObjectType.objects.get_for_model(Rack)) # Attempt to edit a non-permitted object data = {'site': self.sites[0].pk} - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[3].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[3].pk}) response = self.client.patch(url, data, format='json', **self.header) self.assertEqual(response.status_code, 404) # Edit a permitted object data['status'] = 'reserved' - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.patch(url, data, format='json', **self.header) self.assertEqual(response.status_code, 200) # Attempt to modify a permitted object to a non-permitted object data['site'] = self.sites[1].pk - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.patch(url, data, format='json', **self.header) self.assertEqual(response.status_code, 403) @@ -564,8 +555,7 @@ class ObjectPermissionAPIViewTestCase(TestCase): def test_delete_object(self): # Attempt to delete an object without permission - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.delete(url, format='json', **self.header) self.assertEqual(response.status_code, 403) @@ -577,16 +567,14 @@ class ObjectPermissionAPIViewTestCase(TestCase): ) obj_perm.save() obj_perm.users.add(self.user) - obj_perm.object_types.add(ObjectType.objects.get_for_model(Prefix)) + obj_perm.object_types.add(ObjectType.objects.get_for_model(Rack)) # Attempt to delete a non-permitted object - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[3].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[3].pk}) response = self.client.delete(url, format='json', **self.header) self.assertEqual(response.status_code, 404) # Delete a permitted object - url = reverse('ipam-api:prefix-detail', - kwargs={'pk': self.prefixes[0].pk}) + url = reverse('dcim-api:rack-detail', kwargs={'pk': self.racks[0].pk}) response = self.client.delete(url, format='json', **self.header) self.assertEqual(response.status_code, 204) diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 94307cddb..2416fc0f7 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -44,17 +44,13 @@ {% endif %} - {% if object.site.region %} - - {% trans "Region" %} - - {% nested_tree object.site.region %} - - - {% endif %} - {% trans "Site" %} - {{ object.site|linkify|placeholder }} + {% trans "Scope" %} + {% if object.scope %} + {{ object.scope|linkify }} ({% trans object.scope_type.name %}) + {% else %} + {{ ''|placeholder }} + {% endif %} {% trans "VLAN" %} diff --git a/netbox/utilities/testing/base.py b/netbox/utilities/testing/base.py index e197a3f6a..6d17fa1ec 100644 --- a/netbox/utilities/testing/base.py +++ b/netbox/utilities/testing/base.py @@ -1,5 +1,6 @@ import json +from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import ArrayField, RangeField from django.core.exceptions import FieldDoesNotExist @@ -120,6 +121,10 @@ class ModelTestCase(TestCase): else: model_dict[key] = sorted([obj.pk for obj in value]) + # Handle GenericForeignKeys + elif value and type(field) is GenericForeignKey: + model_dict[key] = value.pk + elif api: # Replace ContentType numeric IDs with . From ef1fdf0a01390750e2a0437dfaa0e03433cf0433 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 18 Oct 2024 16:55:58 -0400 Subject: [PATCH 018/190] Closes #17761: Store empty CharField choices as null --- .../migrations/0046_charfield_null_choices.py | 43 +++ netbox/circuits/models/circuits.py | 3 +- .../migrations/0194_charfield_null_choices.py | 287 ++++++++++++++++++ netbox/dcim/models/cables.py | 8 +- .../dcim/models/device_component_templates.py | 16 +- netbox/dcim/models/device_components.py | 13 +- netbox/dcim/models/devices.py | 11 +- netbox/dcim/models/racks.py | 11 +- netbox/dcim/tests/test_filtersets.py | 1 - netbox/dcim/tests/test_views.py | 2 +- .../migrations/0122_charfield_null_choices.py | 29 ++ netbox/extras/models/customfields.py | 1 + .../migrations/0073_charfield_null_choices.py | 36 +++ netbox/ipam/models/fhrp.py | 1 + netbox/ipam/models/ip.py | 1 + netbox/netbox/models/mixins.py | 4 +- .../migrations/0016_charfield_null_choices.py | 29 ++ netbox/tenancy/models/contacts.py | 3 +- .../migrations/0041_charfield_null_choices.py | 29 ++ .../migrations/0006_charfield_null_choices.py | 49 +++ netbox/vpn/models/crypto.py | 12 +- .../migrations/0010_charfield_null_choices.py | 54 ++++ netbox/wireless/models.py | 4 +- 23 files changed, 622 insertions(+), 25 deletions(-) create mode 100644 netbox/circuits/migrations/0046_charfield_null_choices.py create mode 100644 netbox/dcim/migrations/0194_charfield_null_choices.py create mode 100644 netbox/extras/migrations/0122_charfield_null_choices.py create mode 100644 netbox/ipam/migrations/0073_charfield_null_choices.py create mode 100644 netbox/tenancy/migrations/0016_charfield_null_choices.py create mode 100644 netbox/virtualization/migrations/0041_charfield_null_choices.py create mode 100644 netbox/vpn/migrations/0006_charfield_null_choices.py create mode 100644 netbox/wireless/migrations/0010_charfield_null_choices.py diff --git a/netbox/circuits/migrations/0046_charfield_null_choices.py b/netbox/circuits/migrations/0046_charfield_null_choices.py new file mode 100644 index 000000000..4ec21b750 --- /dev/null +++ b/netbox/circuits/migrations/0046_charfield_null_choices.py @@ -0,0 +1,43 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + Circuit = apps.get_model('circuits', 'Circuit') + CircuitGroupAssignment = apps.get_model('circuits', 'CircuitGroupAssignment') + CircuitTermination = apps.get_model('circuits', 'CircuitTermination') + + Circuit.objects.filter(distance_unit='').update(distance_unit=None) + CircuitGroupAssignment.objects.filter(priority='').update(priority=None) + CircuitTermination.objects.filter(cable_end='').update(cable_end=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0045_circuit_distance'), + ] + + operations = [ + migrations.AlterField( + model_name='circuit', + name='distance_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='circuitgroupassignment', + name='priority', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='circuittermination', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index 2df83e97e..5f749550c 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -187,7 +187,8 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, verbose_name=_('priority'), max_length=50, choices=CircuitPriorityChoices, - blank=True + blank=True, + null=True ) prerequisite_models = ( 'circuits.Circuit', diff --git a/netbox/dcim/migrations/0194_charfield_null_choices.py b/netbox/dcim/migrations/0194_charfield_null_choices.py new file mode 100644 index 000000000..8e507c050 --- /dev/null +++ b/netbox/dcim/migrations/0194_charfield_null_choices.py @@ -0,0 +1,287 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + Cable = apps.get_model('dcim', 'Cable') + ConsolePort = apps.get_model('dcim', 'ConsolePort') + ConsolePortTemplate = apps.get_model('dcim', 'ConsolePortTemplate') + ConsoleServerPort = apps.get_model('dcim', 'ConsoleServerPort') + ConsoleServerPortTemplate = apps.get_model('dcim', 'ConsoleServerPortTemplate') + Device = apps.get_model('dcim', 'Device') + DeviceType = apps.get_model('dcim', 'DeviceType') + FrontPort = apps.get_model('dcim', 'FrontPort') + Interface = apps.get_model('dcim', 'Interface') + InterfaceTemplate = apps.get_model('dcim', 'InterfaceTemplate') + ModuleType = apps.get_model('dcim', 'ModuleType') + PowerFeed = apps.get_model('dcim', 'PowerFeed') + PowerOutlet = apps.get_model('dcim', 'PowerOutlet') + PowerOutletTemplate = apps.get_model('dcim', 'PowerOutletTemplate') + PowerPort = apps.get_model('dcim', 'PowerPort') + PowerPortTemplate = apps.get_model('dcim', 'PowerPortTemplate') + Rack = apps.get_model('dcim', 'Rack') + RackType = apps.get_model('dcim', 'RackType') + RearPort = apps.get_model('dcim', 'RearPort') + + Cable.objects.filter(length_unit='').update(length_unit=None) + Cable.objects.filter(type='').update(type=None) + ConsolePort.objects.filter(cable_end='').update(cable_end=None) + ConsolePort.objects.filter(type='').update(type=None) + ConsolePortTemplate.objects.filter(type='').update(type=None) + ConsoleServerPort.objects.filter(cable_end='').update(cable_end=None) + ConsoleServerPort.objects.filter(type='').update(type=None) + ConsoleServerPortTemplate.objects.filter(type='').update(type=None) + Device.objects.filter(airflow='').update(airflow=None) + Device.objects.filter(face='').update(face=None) + DeviceType.objects.filter(airflow='').update(airflow=None) + DeviceType.objects.filter(subdevice_role='').update(subdevice_role=None) + DeviceType.objects.filter(weight_unit='').update(weight_unit=None) + FrontPort.objects.filter(cable_end='').update(cable_end=None) + Interface.objects.filter(cable_end='').update(cable_end=None) + Interface.objects.filter(mode='').update(mode=None) + Interface.objects.filter(poe_mode='').update(poe_mode=None) + Interface.objects.filter(poe_type='').update(poe_type=None) + Interface.objects.filter(rf_channel='').update(rf_channel=None) + Interface.objects.filter(rf_role='').update(rf_role=None) + InterfaceTemplate.objects.filter(poe_mode='').update(poe_mode=None) + InterfaceTemplate.objects.filter(poe_type='').update(poe_type=None) + InterfaceTemplate.objects.filter(rf_role='').update(rf_role=None) + ModuleType.objects.filter(airflow='').update(airflow=None) + ModuleType.objects.filter(weight_unit='').update(weight_unit=None) + PowerFeed.objects.filter(cable_end='').update(cable_end=None) + PowerOutlet.objects.filter(cable_end='').update(cable_end=None) + PowerOutlet.objects.filter(feed_leg='').update(feed_leg=None) + PowerOutlet.objects.filter(type='').update(type=None) + PowerOutletTemplate.objects.filter(feed_leg='').update(feed_leg=None) + PowerOutletTemplate.objects.filter(type='').update(type=None) + PowerPort.objects.filter(cable_end='').update(cable_end=None) + PowerPort.objects.filter(type='').update(type=None) + PowerPortTemplate.objects.filter(type='').update(type=None) + Rack.objects.filter(airflow='').update(airflow=None) + Rack.objects.filter(form_factor='').update(form_factor=None) + Rack.objects.filter(outer_unit='').update(outer_unit=None) + Rack.objects.filter(weight_unit='').update(weight_unit=None) + RackType.objects.filter(outer_unit='').update(outer_unit=None) + RackType.objects.filter(weight_unit='').update(weight_unit=None) + RearPort.objects.filter(cable_end='').update(cable_end=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0193_poweroutlet_color'), + ] + + operations = [ + migrations.AlterField( + model_name='cable', + name='length_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='cable', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='consoleport', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='consoleport', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='consoleporttemplate', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='consoleserverport', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='consoleserverport', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='consoleserverporttemplate', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='device', + name='airflow', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='device', + name='face', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='devicetype', + name='airflow', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='devicetype', + name='subdevice_role', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='devicetype', + name='weight_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='frontport', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='interface', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='interface', + name='mode', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interface', + name='poe_mode', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interface', + name='poe_type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interface', + name='rf_channel', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interface', + name='rf_role', + field=models.CharField(blank=True, max_length=30, null=True), + ), + migrations.AlterField( + model_name='interfacetemplate', + name='poe_mode', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interfacetemplate', + name='poe_type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='interfacetemplate', + name='rf_role', + field=models.CharField(blank=True, max_length=30, null=True), + ), + migrations.AlterField( + model_name='moduletype', + name='airflow', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='moduletype', + name='weight_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='powerfeed', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='poweroutlet', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='poweroutlet', + name='feed_leg', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='poweroutlet', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='poweroutlettemplate', + name='feed_leg', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='poweroutlettemplate', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='powerport', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.AlterField( + model_name='powerport', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='powerporttemplate', + name='type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='rack', + name='airflow', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='rack', + name='form_factor', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='rack', + name='outer_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='rack', + name='weight_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='racktype', + name='outer_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='racktype', + name='weight_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='rearport', + name='cable_end', + field=models.CharField(blank=True, max_length=1, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index 96861a13e..a6293875e 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -42,7 +42,8 @@ class Cable(PrimaryModel): verbose_name=_('type'), max_length=50, choices=CableTypeChoices, - blank=True + blank=True, + null=True ) status = models.CharField( verbose_name=_('status'), @@ -78,6 +79,7 @@ class Cable(PrimaryModel): max_length=50, choices=CableLengthUnitChoices, blank=True, + null=True ) # Stores the normalized length (in meters) for database ordering _abs_length = models.DecimalField( @@ -206,7 +208,7 @@ class Cable(PrimaryModel): # Clear length_unit if no length is defined if self.length is None: - self.length_unit = '' + self.length_unit = None super().save(*args, **kwargs) @@ -365,7 +367,7 @@ class CableTermination(ChangeLoggedModel): termination = self.termination._meta.model.objects.get(pk=self.termination_id) termination.snapshot() termination.cable = None - termination.cable_end = '' + termination.cable_end = None termination.save() super().delete(*args, **kwargs) diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 3a71c424d..00555d49e 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -203,7 +203,8 @@ class ConsolePortTemplate(ModularComponentTemplateModel): verbose_name=_('type'), max_length=50, choices=ConsolePortTypeChoices, - blank=True + blank=True, + null=True ) component_model = ConsolePort @@ -237,7 +238,8 @@ class ConsoleServerPortTemplate(ModularComponentTemplateModel): verbose_name=_('type'), max_length=50, choices=ConsolePortTypeChoices, - blank=True + blank=True, + null=True ) component_model = ConsoleServerPort @@ -272,7 +274,8 @@ class PowerPortTemplate(ModularComponentTemplateModel): verbose_name=_('type'), max_length=50, choices=PowerPortTypeChoices, - blank=True + blank=True, + null=True ) maximum_draw = models.PositiveIntegerField( verbose_name=_('maximum draw'), @@ -334,7 +337,8 @@ class PowerOutletTemplate(ModularComponentTemplateModel): verbose_name=_('type'), max_length=50, choices=PowerOutletTypeChoices, - blank=True + blank=True, + null=True ) power_port = models.ForeignKey( to='dcim.PowerPortTemplate', @@ -348,6 +352,7 @@ class PowerOutletTemplate(ModularComponentTemplateModel): max_length=50, choices=PowerOutletFeedLegChoices, blank=True, + null=True, help_text=_('Phase (for three-phase feeds)') ) @@ -434,18 +439,21 @@ class InterfaceTemplate(ModularComponentTemplateModel): max_length=50, choices=InterfacePoEModeChoices, blank=True, + null=True, verbose_name=_('PoE mode') ) poe_type = models.CharField( max_length=50, choices=InterfacePoETypeChoices, blank=True, + null=True, verbose_name=_('PoE type') ) rf_role = models.CharField( max_length=30, choices=WirelessRoleChoices, blank=True, + null=True, verbose_name=_('wireless role') ) diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 1a86a250c..a5bc2f604 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -142,8 +142,9 @@ class CabledObjectModel(models.Model): cable_end = models.CharField( verbose_name=_('cable end'), max_length=1, + choices=CableEndChoices, blank=True, - choices=CableEndChoices + null=True ) mark_connected = models.BooleanField( verbose_name=_('mark connected'), @@ -283,6 +284,7 @@ class ConsolePort(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki max_length=50, choices=ConsolePortTypeChoices, blank=True, + null=True, help_text=_('Physical port type') ) speed = models.PositiveIntegerField( @@ -309,6 +311,7 @@ class ConsoleServerPort(ModularComponentModel, CabledObjectModel, PathEndpoint, max_length=50, choices=ConsolePortTypeChoices, blank=True, + null=True, help_text=_('Physical port type') ) speed = models.PositiveIntegerField( @@ -339,6 +342,7 @@ class PowerPort(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracking max_length=50, choices=PowerPortTypeChoices, blank=True, + null=True, help_text=_('Physical port type') ) maximum_draw = models.PositiveIntegerField( @@ -454,6 +458,7 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki max_length=50, choices=PowerOutletTypeChoices, blank=True, + null=True, help_text=_('Physical port type') ) power_port = models.ForeignKey( @@ -468,6 +473,7 @@ class PowerOutlet(ModularComponentModel, CabledObjectModel, PathEndpoint, Tracki max_length=50, choices=PowerOutletFeedLegChoices, blank=True, + null=True, help_text=_('Phase (for three-phase feeds)') ) color = ColorField( @@ -522,6 +528,7 @@ class BaseInterface(models.Model): max_length=50, choices=InterfaceModeChoices, blank=True, + null=True, help_text=_('IEEE 802.1Q tagging strategy') ) parent = models.ForeignKey( @@ -624,12 +631,14 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd max_length=30, choices=WirelessRoleChoices, blank=True, + null=True, verbose_name=_('wireless role') ) rf_channel = models.CharField( max_length=50, choices=WirelessChannelChoices, blank=True, + null=True, verbose_name=_('wireless channel') ) rf_channel_frequency = models.DecimalField( @@ -658,12 +667,14 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd max_length=50, choices=InterfacePoEModeChoices, blank=True, + null=True, verbose_name=_('PoE mode') ) poe_type = models.CharField( max_length=50, choices=InterfacePoETypeChoices, blank=True, + null=True, verbose_name=_('PoE type') ) wireless_link = models.ForeignKey( diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index e472303a6..b9ba2bb64 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -118,6 +118,7 @@ class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): max_length=50, choices=SubdeviceRoleChoices, blank=True, + null=True, verbose_name=_('parent/child status'), help_text=_('Parent devices house child devices in device bays. Leave blank ' 'if this device type is neither a parent nor a child.') @@ -126,7 +127,8 @@ class DeviceType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): verbose_name=_('airflow'), max_length=50, choices=DeviceAirflowChoices, - blank=True + blank=True, + null=True ) front_image = models.ImageField( upload_to='devicetype-images', @@ -387,7 +389,8 @@ class ModuleType(ImageAttachmentsMixin, PrimaryModel, WeightMixin): verbose_name=_('airflow'), max_length=50, choices=ModuleAirflowChoices, - blank=True + blank=True, + null=True ) clone_fields = ('manufacturer', 'weight', 'weight_unit', 'airflow') @@ -632,6 +635,7 @@ class Device( face = models.CharField( max_length=50, blank=True, + null=True, choices=DeviceFaceChoices, verbose_name=_('rack face') ) @@ -645,7 +649,8 @@ class Device( verbose_name=_('airflow'), max_length=50, choices=DeviceAirflowChoices, - blank=True + blank=True, + null=True ) primary_ip4 = models.OneToOneField( to='ipam.IPAddress', diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index ae5513fea..013dfb619 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -83,7 +83,8 @@ class RackBase(WeightMixin, PrimaryModel): verbose_name=_('outer unit'), max_length=50, choices=RackDimensionUnitChoices, - blank=True + blank=True, + null=True ) mounting_depth = models.PositiveSmallIntegerField( verbose_name=_('mounting depth'), @@ -188,7 +189,7 @@ class RackType(RackBase): # Clear unit if outer width & depth are not set if self.outer_width is None and self.outer_depth is None: - self.outer_unit = '' + self.outer_unit = None super().save(*args, **kwargs) @@ -242,6 +243,7 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): choices=RackFormFactorChoices, max_length=50, blank=True, + null=True, verbose_name=_('form factor') ) rack_type = models.ForeignKey( @@ -317,7 +319,8 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): verbose_name=_('airflow'), max_length=50, choices=RackAirflowChoices, - blank=True + blank=True, + null=True ) # Generic relations @@ -409,7 +412,7 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): # Clear unit if outer width & depth are not set if self.outer_width is None and self.outer_depth is None: - self.outer_unit = '' + self.outer_unit = None super().save(*args, **kwargs) diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index ae738b57f..d19c51564 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -871,7 +871,6 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_outer_unit(self): - self.assertEqual(Rack.objects.filter(outer_unit__isnull=False).count(), 5) params = {'outer_unit': RackDimensionUnitChoices.UNIT_MILLIMETER} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index ca0db5588..dc3e74ae1 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -592,7 +592,7 @@ class DeviceTypeTestCase( 'part_number': '123ABC', 'u_height': 2, 'is_full_depth': True, - 'subdevice_role': '', # CharField + 'subdevice_role': None, 'comments': 'Some comments', 'tags': [t.pk for t in tags], } diff --git a/netbox/extras/migrations/0122_charfield_null_choices.py b/netbox/extras/migrations/0122_charfield_null_choices.py new file mode 100644 index 000000000..9a1c7ff3f --- /dev/null +++ b/netbox/extras/migrations/0122_charfield_null_choices.py @@ -0,0 +1,29 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + CustomFieldChoiceSet = apps.get_model('extras', 'CustomFieldChoiceSet') + + CustomFieldChoiceSet.objects.filter(base_choices='').update(base_choices=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0121_customfield_related_object_filter'), + ] + + operations = [ + migrations.AlterField( + model_name='customfieldchoiceset', + name='base_choices', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py index 8b7fc0cb6..e1ceaf7a6 100644 --- a/netbox/extras/models/customfields.py +++ b/netbox/extras/models/customfields.py @@ -760,6 +760,7 @@ class CustomFieldChoiceSet(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel max_length=50, choices=CustomFieldChoiceSetBaseChoices, blank=True, + null=True, help_text=_('Base set of predefined choices (optional)') ) extra_choices = ArrayField( diff --git a/netbox/ipam/migrations/0073_charfield_null_choices.py b/netbox/ipam/migrations/0073_charfield_null_choices.py new file mode 100644 index 000000000..9293728f5 --- /dev/null +++ b/netbox/ipam/migrations/0073_charfield_null_choices.py @@ -0,0 +1,36 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + FHRPGroup = apps.get_model('ipam', 'FHRPGroup') + IPAddress = apps.get_model('ipam', 'IPAddress') + + FHRPGroup.objects.filter(auth_type='').update(auth_type=None) + IPAddress.objects.filter(role='').update(role=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0072_prefix_cached_relations'), + ] + + operations = [ + migrations.AlterField( + model_name='fhrpgroup', + name='auth_type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='ipaddress', + name='role', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/ipam/models/fhrp.py b/netbox/ipam/models/fhrp.py index 28bb37ef3..f5982853e 100644 --- a/netbox/ipam/models/fhrp.py +++ b/netbox/ipam/models/fhrp.py @@ -34,6 +34,7 @@ class FHRPGroup(PrimaryModel): max_length=50, choices=FHRPGroupAuthTypeChoices, blank=True, + null=True, verbose_name=_('authentication type') ) auth_key = models.CharField( diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index 69da45fc6..f06b19237 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -784,6 +784,7 @@ class IPAddress(ContactsMixin, PrimaryModel): max_length=50, choices=IPAddressRoleChoices, blank=True, + null=True, help_text=_('The functional role of this IP') ) assigned_object_type = models.ForeignKey( diff --git a/netbox/netbox/models/mixins.py b/netbox/netbox/models/mixins.py index 804e0b71a..dc706c7c2 100644 --- a/netbox/netbox/models/mixins.py +++ b/netbox/netbox/models/mixins.py @@ -23,6 +23,7 @@ class WeightMixin(models.Model): max_length=50, choices=WeightUnitChoices, blank=True, + null=True, ) # Stores the normalized weight (in grams) for database ordering _abs_weight = models.PositiveBigIntegerField( @@ -64,6 +65,7 @@ class DistanceMixin(models.Model): max_length=50, choices=DistanceUnitChoices, blank=True, + null=True, ) # Stores the normalized distance (in meters) for database ordering _abs_distance = models.DecimalField( @@ -85,7 +87,7 @@ class DistanceMixin(models.Model): # Clear distance_unit if no distance is defined if self.distance is None: - self.distance_unit = '' + self.distance_unit = None super().save(*args, **kwargs) diff --git a/netbox/tenancy/migrations/0016_charfield_null_choices.py b/netbox/tenancy/migrations/0016_charfield_null_choices.py new file mode 100644 index 000000000..815a1bdf2 --- /dev/null +++ b/netbox/tenancy/migrations/0016_charfield_null_choices.py @@ -0,0 +1,29 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + ContactAssignment = apps.get_model('tenancy', 'ContactAssignment') + + ContactAssignment.objects.filter(priority='').update(priority=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('tenancy', '0015_contactassignment_rename_content_type'), + ] + + operations = [ + migrations.AlterField( + model_name='contactassignment', + name='priority', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py index 46ca97261..24ffef0cf 100644 --- a/netbox/tenancy/models/contacts.py +++ b/netbox/tenancy/models/contacts.py @@ -125,7 +125,8 @@ class ContactAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, Chan verbose_name=_('priority'), max_length=50, choices=ContactPriorityChoices, - blank=True + blank=True, + null=True ) clone_fields = ('object_type', 'object_id', 'role', 'priority') diff --git a/netbox/virtualization/migrations/0041_charfield_null_choices.py b/netbox/virtualization/migrations/0041_charfield_null_choices.py new file mode 100644 index 000000000..88b7f9b2c --- /dev/null +++ b/netbox/virtualization/migrations/0041_charfield_null_choices.py @@ -0,0 +1,29 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + VMInterface = apps.get_model('virtualization', 'VMInterface') + + VMInterface.objects.filter(mode='').update(mode=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('virtualization', '0040_convert_disk_size'), + ] + + operations = [ + migrations.AlterField( + model_name='vminterface', + name='mode', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/vpn/migrations/0006_charfield_null_choices.py b/netbox/vpn/migrations/0006_charfield_null_choices.py new file mode 100644 index 000000000..1943c466f --- /dev/null +++ b/netbox/vpn/migrations/0006_charfield_null_choices.py @@ -0,0 +1,49 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + IKEPolicy = apps.get_model('vpn', 'IKEPolicy') + IKEProposal = apps.get_model('vpn', 'IKEProposal') + IPSecProposal = apps.get_model('vpn', 'IPSecProposal') + + IKEPolicy.objects.filter(mode='').update(mode=None) + IKEProposal.objects.filter(authentication_algorithm='').update(authentication_algorithm=None) + IPSecProposal.objects.filter(authentication_algorithm='').update(authentication_algorithm=None) + IPSecProposal.objects.filter(encryption_algorithm='').update(encryption_algorithm=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('vpn', '0005_rename_indexes'), + ] + + operations = [ + migrations.AlterField( + model_name='ikepolicy', + name='mode', + field=models.CharField(blank=True, null=True), + ), + migrations.AlterField( + model_name='ikeproposal', + name='authentication_algorithm', + field=models.CharField(blank=True, null=True), + ), + migrations.AlterField( + model_name='ipsecproposal', + name='authentication_algorithm', + field=models.CharField(blank=True, null=True), + ), + migrations.AlterField( + model_name='ipsecproposal', + name='encryption_algorithm', + field=models.CharField(blank=True, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py index 618a1ec4a..2b721ec29 100644 --- a/netbox/vpn/models/crypto.py +++ b/netbox/vpn/models/crypto.py @@ -35,7 +35,8 @@ class IKEProposal(PrimaryModel): authentication_algorithm = models.CharField( verbose_name=_('authentication algorithm'), choices=AuthenticationAlgorithmChoices, - blank=True + blank=True, + null=True ) group = models.PositiveSmallIntegerField( verbose_name=_('group'), @@ -76,7 +77,8 @@ class IKEPolicy(PrimaryModel): mode = models.CharField( verbose_name=_('mode'), choices=IKEModeChoices, - blank=True + blank=True, + null=True ) proposals = models.ManyToManyField( to='vpn.IKEProposal', @@ -128,12 +130,14 @@ class IPSecProposal(PrimaryModel): encryption_algorithm = models.CharField( verbose_name=_('encryption'), choices=EncryptionAlgorithmChoices, - blank=True + blank=True, + null=True ) authentication_algorithm = models.CharField( verbose_name=_('authentication'), choices=AuthenticationAlgorithmChoices, - blank=True + blank=True, + null=True ) sa_lifetime_seconds = models.PositiveIntegerField( verbose_name=_('SA lifetime (seconds)'), diff --git a/netbox/wireless/migrations/0010_charfield_null_choices.py b/netbox/wireless/migrations/0010_charfield_null_choices.py new file mode 100644 index 000000000..9bfdc54ed --- /dev/null +++ b/netbox/wireless/migrations/0010_charfield_null_choices.py @@ -0,0 +1,54 @@ +from django.db import migrations, models + + +def set_null_values(apps, schema_editor): + """ + Replace empty strings with null values. + """ + WirelessLAN = apps.get_model('wireless', 'WirelessLAN') + WirelessLink = apps.get_model('wireless', 'WirelessLink') + + WirelessLAN.objects.filter(auth_cipher='').update(auth_cipher=None) + WirelessLAN.objects.filter(auth_type='').update(auth_type=None) + WirelessLink.objects.filter(auth_cipher='').update(auth_cipher=None) + WirelessLink.objects.filter(auth_type='').update(auth_type=None) + WirelessLink.objects.filter(distance_unit='').update(distance_unit=None) + + +class Migration(migrations.Migration): + + dependencies = [ + ('wireless', '0009_wirelesslink_distance'), + ] + + operations = [ + migrations.AlterField( + model_name='wirelesslan', + name='auth_cipher', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='wirelesslan', + name='auth_type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='wirelesslink', + name='auth_cipher', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='wirelesslink', + name='auth_type', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AlterField( + model_name='wirelesslink', + name='distance_unit', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.RunPython( + code=set_null_values, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index 685d978a7..88c60d494 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -24,13 +24,15 @@ class WirelessAuthenticationBase(models.Model): max_length=50, choices=WirelessAuthTypeChoices, blank=True, + null=True, verbose_name=_("authentication type"), ) auth_cipher = models.CharField( verbose_name=_('authentication cipher'), max_length=50, choices=WirelessAuthCipherChoices, - blank=True + blank=True, + null=True ) auth_psk = models.CharField( max_length=PSK_MAX_LENGTH, From 572aad0e20d937679fa74f4aecbe4ee11733348a Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 28 Oct 2024 15:52:11 -0400 Subject: [PATCH 019/190] Update adding-models.md to reflect changes to get_absolute_url --- docs/development/adding-models.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/development/adding-models.md b/docs/development/adding-models.md index f3aa9cfcc..0bf020662 100644 --- a/docs/development/adding-models.md +++ b/docs/development/adding-models.md @@ -8,7 +8,7 @@ Each model should define, at a minimum: * A `Meta` class specifying a deterministic ordering (if ordered by fields other than the primary ID) * A `__str__()` method returning a user-friendly string representation of the instance -* A `get_absolute_url()` method returning an instance's direct URL (using `reverse()`) +* A `get_absolute_url()` method if necessary; a standard version of the method is defined in the `NetBoxFeatureSet` base class, but you will need to provide your own (returning an instance's direct URL using `reverse()`) if not subclassing that base class ## 2. Define field choices @@ -78,6 +78,8 @@ Create the following for each model: Create a GraphQL object type for the model in `graphql/types.py` by subclassing the appropriate class from `netbox.graphql.types`. +**Note:** GraphQL unit tests may fail citing null values on a non-nullable field if related objects are prefetched. You may need to fix this by setting the type annotation to be `= strawberry_django.field(select_related=["policy"])` or similar. + Also extend the schema class defined in `graphql/schema.py` with the individual object and object list fields per the established convention. ## 14. Add tests From f74a9a1c769bb72154a1ef271e23878044b56335 Mon Sep 17 00:00:00 2001 From: bctiemann Date: Wed, 30 Oct 2024 17:09:46 -0400 Subject: [PATCH 020/190] Fixes: #7336 - VLAN Translation (#17745) * VLANTranslationPolicy and VLANTranslationRule models and all associated UI classes * Change VLANTranslationPolicy to a PrimaryModel and make name unique * Add serializer classes to InterfaceSerializer * Remake migrations * Add GraphQL typing * Skip tagged models in test * Missing migration * Remove get_absolute_url methods * Remove package-lock.json * Rebuild migration and add constraints and field options * Rebuild migrations * Use DynamicModelChoiceField for policy field * Make vlan_translation_policy fields on filtersets more consistent with existing __name convention * Add vlan_translation_table to VMInterface detail page * Add vlan_translation_policy to VMInterfaceSerializer * Move vlan_translation_policy fields to model and filterset mixins * Protect in-use policies against deletion * Add vlan_translation_policy to fields in VMInterfaceSerializer * Cleanup indentation * Remove unnecessary ordering column * Rebuild migrations * Search methods and registration * Ensure 'id' column is present by default * Add graphql types/filters/schema for VLANTranslationRule * Filterset tests * View tests * API and viewset tests (incomplete) * Add tags to VLANTranslationRuleForm * Complete viewset tests for VLANTranslationRule * Make VLANTranslationRule.policy nullable (but still required) * Revert "Make VLANTranslationRule.policy nullable (but still required)" This reverts commit 4c1bb437ef1a0a3593e5fbb87f08a0f158ea8c47. * Revert nullability * Explicitly prefetch policy in graphql * Documentation of new and affected models * Add note about select_related in graphql * Rework policy/rule documentation * Move vlan_translation_policy into 802.1Q Switching fieldset * Remove redundant InterfaceVLANTranslationTable * Conditionally include vlan_translation_table in interface.html and vminterface.html * Add description field to VLANTranslationRule * Define vlan_translation_table conditionally * Add policy (name) filter to VLANTranslationRuleFilterSet * Revert changes to adding-models.md (moved to another PR) * Dynamic table for linked rules in vlantranslationpolicy.html * Misc cleanup --------- Co-authored-by: Jeremy Stretch --- docs/models/dcim/interface.md | 4 + docs/models/ipam/vlantranslationpolicy.md | 26 ++++ docs/models/ipam/vlantranslationrule.md | 19 +++ docs/models/virtualization/vminterface.md | 4 + .../api/serializers_/device_components.py | 5 +- netbox/dcim/filtersets.py | 13 +- netbox/dcim/forms/model_forms.py | 11 +- netbox/dcim/graphql/types.py | 1 + .../0195_interface_vlan_translation_policy.py | 20 +++ netbox/dcim/models/device_components.py | 7 ++ netbox/dcim/tests/test_filtersets.py | 28 ++++- netbox/dcim/views.py | 11 +- netbox/extras/tests/test_filtersets.py | 2 + netbox/ipam/api/serializers_/vlans.py | 20 ++- netbox/ipam/api/urls.py | 2 + netbox/ipam/api/views.py | 12 ++ netbox/ipam/filtersets.py | 49 ++++++++ netbox/ipam/forms/bulk_edit.py | 32 +++++ netbox/ipam/forms/bulk_import.py | 16 +++ netbox/ipam/forms/filtersets.py | 39 ++++++ netbox/ipam/forms/model_forms.py | 33 +++++ netbox/ipam/graphql/filters.py | 14 +++ netbox/ipam/graphql/schema.py | 6 + netbox/ipam/graphql/types.py | 20 +++ ...antranslationpolicy_vlantranslationrule.py | 62 ++++++++++ netbox/ipam/models/vlans.py | 74 ++++++++++- netbox/ipam/search.py | 21 ++++ netbox/ipam/tables/vlans.py | 53 ++++++++ netbox/ipam/tests/test_api.py | 106 ++++++++++++++++ netbox/ipam/tests/test_filtersets.py | 93 ++++++++++++++ netbox/ipam/tests/test_views.py | 115 ++++++++++++++++++ netbox/ipam/urls.py | 16 +++ netbox/ipam/views.py | 105 ++++++++++++++++ netbox/netbox/navigation/menu.py | 2 + netbox/templates/dcim/interface.html | 11 ++ .../templates/ipam/vlantranslationpolicy.html | 55 +++++++++ .../templates/ipam/vlantranslationrule.html | 45 +++++++ .../templates/virtualization/vminterface.html | 11 ++ .../api/serializers_/virtualmachines.py | 4 +- netbox/virtualization/forms/model_forms.py | 11 +- netbox/virtualization/graphql/types.py | 1 + ...042_vminterface_vlan_translation_policy.py | 20 +++ .../virtualization/tests/test_filtersets.py | 22 +++- netbox/virtualization/views.py | 11 +- 44 files changed, 1210 insertions(+), 22 deletions(-) create mode 100644 docs/models/ipam/vlantranslationpolicy.md create mode 100644 docs/models/ipam/vlantranslationrule.md create mode 100644 netbox/dcim/migrations/0195_interface_vlan_translation_policy.py create mode 100644 netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py create mode 100644 netbox/templates/ipam/vlantranslationpolicy.html create mode 100644 netbox/templates/ipam/vlantranslationrule.html create mode 100644 netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py diff --git a/docs/models/dcim/interface.md b/docs/models/dcim/interface.md index 3667dabd5..869cb8510 100644 --- a/docs/models/dcim/interface.md +++ b/docs/models/dcim/interface.md @@ -142,3 +142,7 @@ The configured channel width of a wireless interface, in MHz. This is typically ### Wireless LANs The [wireless LANs](../wireless/wirelesslan.md) for which this interface carries traffic. (Valid for wireless interfaces only.) + +### VLAN Translation Policy + +The [VLAN translation policy](../ipam/vlantranslationpolicy.md) that applies to this interface (optional). diff --git a/docs/models/ipam/vlantranslationpolicy.md b/docs/models/ipam/vlantranslationpolicy.md new file mode 100644 index 000000000..59541931e --- /dev/null +++ b/docs/models/ipam/vlantranslationpolicy.md @@ -0,0 +1,26 @@ +# VLAN Translation Policies + +VLAN translation is a feature that consists of VLAN translation policies and [VLAN translation rules](./vlantranslationrule.md). Many rules can belong to a policy, and each rule defines a mapping of a local to remote VLAN ID (VID). A policy can then be assigned to an [Interface](../dcim/interface.md) or [VMInterface](../virtualization/vminterface.md), and all VLAN translation rules associated with that policy will be visible in the interface details. + +There are uniqueness constraints on `(policy, local_vid)` and on `(policy, remote_vid)` in the `VLANTranslationRule` model. Thus, you cannot have multiple rules linked to the same policy that have the same local VID or the same remote VID. A set of policies and rules might look like this: + +Policy 1: +- Rule: 100 -> 200 +- Rule: 101 -> 201 + +Policy 2: +- Rule: 100 -> 300 +- Rule: 101 -> 301 + +However this is not allowed: + +Policy 3: +- Rule: 100 -> 200 +- Rule: 100 -> 300 + + +## Fields + +### Name + +A unique human-friendly name. diff --git a/docs/models/ipam/vlantranslationrule.md b/docs/models/ipam/vlantranslationrule.md new file mode 100644 index 000000000..bffc030ed --- /dev/null +++ b/docs/models/ipam/vlantranslationrule.md @@ -0,0 +1,19 @@ +# VLAN Translation Rules + +A VLAN translation rule represents a one-to-one mapping of a local VLAN ID (VID) to a remote VID. Many rules can belong to a single policy. + +See [VLAN translation policies](./vlantranslationpolicy.md) for an overview of the VLAN Translation feature. + +## Fields + +### Policy + +The [VLAN Translation Policy](./vlantranslationpolicy.md) to which this rule belongs. + +### Local VID + +VLAN ID (1-4094) in the local network which is to be translated to a remote VID. + +### Remote VID + +VLAN ID (1-4094) in the remote network to which the local VID will be translated. diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md index d923bdd5d..1e022b091 100644 --- a/docs/models/virtualization/vminterface.md +++ b/docs/models/virtualization/vminterface.md @@ -56,3 +56,7 @@ The tagged VLANs which are configured to be carried by this interface. Valid onl ### VRF The [virtual routing and forwarding](../ipam/vrf.md) instance to which this interface is assigned. + +### VLAN Translation Policy + +The [VLAN translation policy](../ipam/vlantranslationpolicy.md) that applies to this interface (optional). diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index e285ce349..3be19bb58 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -8,7 +8,7 @@ from dcim.models import ( ConsolePort, ConsoleServerPort, DeviceBay, FrontPort, Interface, InventoryItem, ModuleBay, PowerOutlet, PowerPort, RearPort, VirtualDeviceContext, ) -from ipam.api.serializers_.vlans import VLANSerializer +from ipam.api.serializers_.vlans import VLANSerializer, VLANTranslationPolicySerializer from ipam.api.serializers_.vrfs import VRFSerializer from ipam.models import VLAN from netbox.api.fields import ChoiceField, ContentTypeField, SerializedPKRelatedField @@ -196,6 +196,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect required=False, many=True ) + vlan_translation_policy = VLANTranslationPolicySerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) wireless_link = NestedWirelessLinkSerializer(read_only=True, allow_null=True) @@ -225,7 +226,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect 'tx_power', 'untagged_vlan', 'tagged_vlans', 'mark_connected', 'cable', 'cable_end', 'wireless_link', 'link_peers', 'link_peers_type', 'wireless_lans', 'vrf', 'l2vpn_termination', 'connected_endpoints', 'connected_endpoints_type', 'connected_endpoints_reachable', 'tags', 'custom_fields', 'created', - 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', '_occupied', + 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', '_occupied', 'vlan_translation_policy' ] brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied') diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 04ac3a3d2..c11a7ef00 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -8,7 +8,7 @@ from circuits.models import CircuitTermination from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate from ipam.filtersets import PrimaryIPFilterSet -from ipam.models import ASN, IPAddress, VRF +from ipam.models import ASN, IPAddress, VLANTranslationPolicy, VRF from netbox.choices import ColorChoices from netbox.filtersets import ( BaseFilterSet, ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet, @@ -1629,6 +1629,17 @@ class CommonInterfaceFilterSet(django_filters.FilterSet): to_field_name='identifier', label=_('L2VPN'), ) + vlan_translation_policy_id = django_filters.ModelMultipleChoiceFilter( + field_name='vlan_translation_policy', + queryset=VLANTranslationPolicy.objects.all(), + label=_('VLAN Translation Policy (ID)'), + ) + vlan_translation_policy = django_filters.ModelMultipleChoiceFilter( + field_name='vlan_translation_policy__name', + queryset=VLANTranslationPolicy.objects.all(), + to_field_name='name', + label=_('VLAN Translation Policy'), + ) def filter_vlan_id(self, queryset, name, value): value = value.strip() diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 095882d13..1ab9f138b 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -7,7 +7,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate -from ipam.models import ASN, IPAddress, VLAN, VLANGroup, VRF +from ipam.models import ASN, IPAddress, VLAN, VLANGroup, VLANTranslationPolicy, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from users.models import User @@ -1382,6 +1382,11 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): required=False, label=_('WWN') ) + vlan_translation_policy = DynamicModelChoiceField( + queryset=VLANTranslationPolicy.objects.all(), + required=False, + label=_('VLAN Translation Policy') + ) fieldsets = ( FieldSet( @@ -1391,7 +1396,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): FieldSet('vdcs', 'mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected', name=_('Operation')), FieldSet('parent', 'bridge', 'lag', name=_('Related Interfaces')), FieldSet('poe_mode', 'poe_type', name=_('PoE')), - FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', name=_('802.1Q Switching')), + FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vlan_translation_policy', name=_('802.1Q Switching')), FieldSet( 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'wireless_lan_group', 'wireless_lans', name=_('Wireless') @@ -1404,7 +1409,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): 'device', 'module', 'vdcs', 'name', 'label', 'type', 'speed', 'duplex', 'enabled', 'parent', 'bridge', 'lag', 'mac_address', 'wwn', 'mtu', 'mgmt_only', 'mark_connected', 'description', 'poe_mode', 'poe_type', 'mode', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'wireless_lans', - 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', + 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', 'vlan_translation_policy', ] widgets = { 'speed': NumberWithOptions( diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index cd863837a..db9f3899d 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -385,6 +385,7 @@ class InterfaceType(IPAddressesMixin, ModularComponentType, CabledObjectMixin, P wireless_link: Annotated["WirelessLinkType", strawberry.lazy('wireless.graphql.types')] | None untagged_vlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vrf: Annotated["VRFType", strawberry.lazy('ipam.graphql.types')] | None + vlan_translation_policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None vdcs: List[Annotated["VirtualDeviceContextType", strawberry.lazy('dcim.graphql.types')]] tagged_vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] diff --git a/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py new file mode 100644 index 000000000..42ff1205a --- /dev/null +++ b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.9 on 2024-10-11 19:45 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0194_charfield_null_choices'), + ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), + ] + + operations = [ + migrations.AddField( + model_name='interface', + name='vlan_translation_policy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy'), + ), + ] diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index a5bc2f604..14f4120b5 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -547,6 +547,13 @@ class BaseInterface(models.Model): blank=True, verbose_name=_('bridge interface') ) + vlan_translation_policy = models.ForeignKey( + to='ipam.VLANTranslationPolicy', + on_delete=models.PROTECT, + null=True, + blank=True, + verbose_name=_('VLAN Translation Policy'), + ) class Meta: abstract = True diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index d19c51564..0a6417022 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -4,7 +4,7 @@ from circuits.models import Circuit, CircuitTermination, CircuitType, Provider from dcim.choices import * from dcim.filtersets import * from dcim.models import * -from ipam.models import ASN, IPAddress, RIR, VRF +from ipam.models import ASN, IPAddress, RIR, VLANTranslationPolicy, VRF from netbox.choices import ColorChoices, WeightUnitChoices from tenancy.models import Tenant, TenantGroup from users.models import User @@ -3669,6 +3669,13 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ) VirtualDeviceContext.objects.bulk_create(vdcs) + vlan_translation_policies = ( + VLANTranslationPolicy(name='Policy 1'), + VLANTranslationPolicy(name='Policy 2'), + VLANTranslationPolicy(name='Policy 3'), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + interfaces = ( Interface( device=devices[0], @@ -3686,7 +3693,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil speed=1000000, duplex='half', poe_mode=InterfacePoEModeChoices.MODE_PSE, - poe_type=InterfacePoETypeChoices.TYPE_1_8023AF + poe_type=InterfacePoETypeChoices.TYPE_1_8023AF, + vlan_translation_policy=vlan_translation_policies[0], ), Interface( device=devices[1], @@ -3711,7 +3719,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil speed=1000000, duplex='full', poe_mode=InterfacePoEModeChoices.MODE_PD, - poe_type=InterfacePoETypeChoices.TYPE_1_8023AF + poe_type=InterfacePoETypeChoices.TYPE_1_8023AF, + vlan_translation_policy=vlan_translation_policies[0], ), Interface( device=devices[3], @@ -3729,7 +3738,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil speed=100000, duplex='half', poe_mode=InterfacePoEModeChoices.MODE_PSE, - poe_type=InterfacePoETypeChoices.TYPE_2_8023AT + poe_type=InterfacePoETypeChoices.TYPE_2_8023AT, + vlan_translation_policy=vlan_translation_policies[1], ), Interface( device=devices[4], @@ -3742,7 +3752,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil speed=100000, duplex='full', poe_mode=InterfacePoEModeChoices.MODE_PD, - poe_type=InterfacePoETypeChoices.TYPE_2_8023AT + poe_type=InterfacePoETypeChoices.TYPE_2_8023AT, + vlan_translation_policy=vlan_translation_policies[1], ), Interface( device=devices[4], @@ -4016,6 +4027,13 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil params = {'vdc_identifier': vdc.values_list('identifier', flat=True)} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) + def test_vlan_translation_policy(self): + vlan_translation_policies = VLANTranslationPolicy.objects.all()[:2] + params = {'vlan_translation_policy_id': [vlan_translation_policies[0].pk, vlan_translation_policies[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + params = {'vlan_translation_policy': [vlan_translation_policies[0].name, vlan_translation_policies[1].name]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + class FrontPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests): queryset = FrontPort.objects.all() diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 3cd423426..38c3f68c3 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -18,7 +18,7 @@ from jinja2.exceptions import TemplateError from circuits.models import Circuit, CircuitTermination from extras.views import ObjectConfigContextView from ipam.models import ASN, IPAddress, VLANGroup -from ipam.tables import InterfaceVLANTable +from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable from netbox.constants import DEFAULT_ACTION_PERMISSIONS from netbox.views import generic from tenancy.views import ObjectContactsView @@ -2580,11 +2580,20 @@ class InterfaceView(generic.ObjectView): orderable=False ) + # Get VLAN translation rules + vlan_translation_table = None + if instance.vlan_translation_policy: + vlan_translation_table = VLANTranslationRuleTable( + data=instance.vlan_translation_policy.rules.all(), + orderable=False + ) + return { 'vdc_table': vdc_table, 'bridge_interfaces_table': bridge_interfaces_tables, 'child_interfaces_table': child_interfaces_tables, 'vlan_table': vlan_table, + 'vlan_translation_table': vlan_translation_table, } diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py index 9048d5fd9..c9eaa3e0e 100644 --- a/netbox/extras/tests/test_filtersets.py +++ b/netbox/extras/tests/test_filtersets.py @@ -1172,6 +1172,8 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests): 'virtualmachine', 'vlan', 'vlangroup', + 'vlantranslationpolicy', + 'vlantranslationrule', 'vminterface', 'vrf', 'webhook', diff --git a/netbox/ipam/api/serializers_/vlans.py b/netbox/ipam/api/serializers_/vlans.py index 608fcf0b4..ee06357a5 100644 --- a/netbox/ipam/api/serializers_/vlans.py +++ b/netbox/ipam/api/serializers_/vlans.py @@ -5,7 +5,7 @@ from rest_framework import serializers from dcim.api.serializers_.sites import SiteSerializer from ipam.choices import * from ipam.constants import VLANGROUP_SCOPE_TYPES -from ipam.models import VLAN, VLANGroup +from ipam.models import VLAN, VLANGroup, VLANTranslationPolicy, VLANTranslationRule from netbox.api.fields import ChoiceField, ContentTypeField, IntegerRangeSerializer, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer from tenancy.api.serializers_.tenants import TenantSerializer @@ -18,6 +18,8 @@ __all__ = ( 'CreateAvailableVLANSerializer', 'VLANGroupSerializer', 'VLANSerializer', + 'VLANTranslationPolicySerializer', + 'VLANTranslationRuleSerializer', ) @@ -110,3 +112,19 @@ class CreateAvailableVLANSerializer(NetBoxModelSerializer): def validate(self, data): # Bypass model validation since we don't have a VID yet return data + + +class VLANTranslationRuleSerializer(NetBoxModelSerializer): + + class Meta: + model = VLANTranslationRule + fields = ['id', 'policy', 'local_vid', 'remote_vid'] + + +class VLANTranslationPolicySerializer(NetBoxModelSerializer): + rules = VLANTranslationRuleSerializer(many=True, read_only=True) + + class Meta: + model = VLANTranslationPolicy + fields = ['id', 'url', 'name', 'description', 'display', 'rules'] + brief_fields = ('id', 'url', 'name', 'description', 'display') diff --git a/netbox/ipam/api/urls.py b/netbox/ipam/api/urls.py index bae9d8048..ea76025ec 100644 --- a/netbox/ipam/api/urls.py +++ b/netbox/ipam/api/urls.py @@ -21,6 +21,8 @@ router.register('fhrp-groups', views.FHRPGroupViewSet) router.register('fhrp-group-assignments', views.FHRPGroupAssignmentViewSet) router.register('vlan-groups', views.VLANGroupViewSet) router.register('vlans', views.VLANViewSet) +router.register('vlan-translation-policies', views.VLANTranslationPolicyViewSet) +router.register('vlan-translation-rules', views.VLANTranslationRuleViewSet) router.register('service-templates', views.ServiceTemplateViewSet) router.register('services', views.ServiceViewSet) diff --git a/netbox/ipam/api/views.py b/netbox/ipam/api/views.py index ffd4d5b7d..783d13523 100644 --- a/netbox/ipam/api/views.py +++ b/netbox/ipam/api/views.py @@ -143,6 +143,18 @@ class VLANViewSet(NetBoxModelViewSet): filterset_class = filtersets.VLANFilterSet +class VLANTranslationPolicyViewSet(NetBoxModelViewSet): + queryset = VLANTranslationPolicy.objects.all() + serializer_class = serializers.VLANTranslationPolicySerializer + filterset_class = filtersets.VLANTranslationPolicyFilterSet + + +class VLANTranslationRuleViewSet(NetBoxModelViewSet): + queryset = VLANTranslationRule.objects.all() + serializer_class = serializers.VLANTranslationRuleSerializer + filterset_class = filtersets.VLANTranslationRuleFilterSet + + class ServiceTemplateViewSet(NetBoxModelViewSet): queryset = ServiceTemplate.objects.all() serializer_class = serializers.ServiceTemplateSerializer diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 6fba68e8b..017a34ac4 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -37,6 +37,8 @@ __all__ = ( 'ServiceTemplateFilterSet', 'VLANFilterSet', 'VLANGroupFilterSet', + 'VLANTranslationPolicyFilterSet', + 'VLANTranslationRuleFilterSet', 'VRFFilterSet', ) @@ -1104,6 +1106,53 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): ) +class VLANTranslationPolicyFilterSet(NetBoxModelFilterSet): + + class Meta: + model = VLANTranslationPolicy + fields = ('id', 'name', 'description') + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(name__icontains=value) | + Q(description__icontains=value) + ) + return queryset.filter(qs_filter) + + +class VLANTranslationRuleFilterSet(NetBoxModelFilterSet): + policy_id = django_filters.ModelMultipleChoiceFilter( + queryset=VLANTranslationPolicy.objects.all(), + label=_('VLAN Translation Policy (ID)'), + ) + policy = django_filters.ModelMultipleChoiceFilter( + field_name='policy__name', + queryset=VLANTranslationPolicy.objects.all(), + to_field_name='name', + label=_('VLAN Translation Policy (name)'), + ) + + class Meta: + model = VLANTranslationRule + fields = ('id', 'policy_id', 'policy', 'local_vid', 'remote_vid', 'description') + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + qs_filter = ( + Q(policy__name__icontains=value) + ) + try: + int_value = int(value.strip()) + qs_filter |= Q(local_vid=int_value) + qs_filter |= Q(remote_vid=int_value) + except ValueError: + pass + return queryset.filter(qs_filter) + + class ServiceTemplateFilterSet(NetBoxModelFilterSet): port = NumericArrayFilter( field_name='ports', diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index 223fad790..49a79623c 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -34,6 +34,8 @@ __all__ = ( 'ServiceTemplateBulkEditForm', 'VLANBulkEditForm', 'VLANGroupBulkEditForm', + 'VLANTranslationPolicyBulkEditForm', + 'VLANTranslationRuleBulkEditForm', 'VRFBulkEditForm', ) @@ -537,6 +539,36 @@ class VLANBulkEditForm(NetBoxModelBulkEditForm): ) +class VLANTranslationPolicyBulkEditForm(NetBoxModelBulkEditForm): + description = forms.CharField( + label=_('Description'), + max_length=200, + required=False + ) + + model = VLANTranslationPolicy + fieldsets = ( + FieldSet('description'), + ) + nullable_fields = ('description',) + + +class VLANTranslationRuleBulkEditForm(NetBoxModelBulkEditForm): + policy = DynamicModelChoiceField( + label=_('Policy'), + queryset=VLANTranslationPolicy.objects.all(), + selector=True + ) + local_vid = forms.IntegerField(required=False) + remote_vid = forms.IntegerField(required=False) + + model = VLANTranslationRule + fieldsets = ( + FieldSet('policy', 'local_vid', 'remote_vid'), + ) + fields = ('policy', 'local_vid', 'remote_vid') + + class ServiceTemplateBulkEditForm(NetBoxModelBulkEditForm): protocol = forms.ChoiceField( label=_('Protocol'), diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index a6ef1a9fb..cd34a6d84 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -29,6 +29,8 @@ __all__ = ( 'ServiceTemplateImportForm', 'VLANImportForm', 'VLANGroupImportForm', + 'VLANTranslationPolicyImportForm', + 'VLANTranslationRuleImportForm', 'VRFImportForm', ) @@ -465,6 +467,20 @@ class VLANImportForm(NetBoxModelImportForm): fields = ('site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description', 'comments', 'tags') +class VLANTranslationPolicyImportForm(NetBoxModelImportForm): + + class Meta: + model = VLANTranslationPolicy + fields = ('name', 'description', 'tags') + + +class VLANTranslationRuleImportForm(NetBoxModelImportForm): + + class Meta: + model = VLANTranslationRule + fields = ('policy', 'local_vid', 'remote_vid') + + class ServiceTemplateImportForm(NetBoxModelImportForm): protocol = CSVChoiceField( label=_('Protocol'), diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index 57c0f479c..b9bee6d97 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -28,6 +28,8 @@ __all__ = ( 'ServiceTemplateFilterForm', 'VLANFilterForm', 'VLANGroupFilterForm', + 'VLANTranslationPolicyFilterForm', + 'VLANTranslationRuleFilterForm', 'VRFFilterForm', ) @@ -461,6 +463,43 @@ class VLANGroupFilterForm(NetBoxModelFilterSetForm): tag = TagFilterField(model) +class VLANTranslationPolicyFilterForm(NetBoxModelFilterSetForm): + model = VLANTranslationPolicy + fieldsets = ( + FieldSet('q', 'filter_id', 'tag'), + FieldSet('name', name=_('Attributes')), + ) + name = forms.CharField( + required=False, + label=_('Name') + ) + tag = TagFilterField(model) + + +class VLANTranslationRuleFilterForm(NetBoxModelFilterSetForm): + model = VLANTranslationRule + fieldsets = ( + FieldSet('q', 'filter_id', 'tag'), + FieldSet('policy_id', 'local_vid', 'remote_vid', name=_('Attributes')), + ) + tag = TagFilterField(model) + policy_id = DynamicModelMultipleChoiceField( + queryset=VLANTranslationPolicy.objects.all(), + required=False, + label=_('VLAN Translation Policy') + ) + local_vid = forms.IntegerField( + min_value=1, + required=False, + label=_('Local VLAN ID') + ) + remote_vid = forms.IntegerField( + min_value=1, + required=False, + label=_('Remote VLAN ID') + ) + + class VLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): model = VLAN fieldsets = ( diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index e9e90db57..629c1a481 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -41,6 +41,8 @@ __all__ = ( 'ServiceTemplateForm', 'VLANForm', 'VLANGroupForm', + 'VLANTranslationPolicyForm', + 'VLANTranslationRuleForm', 'VRFForm', ) @@ -691,6 +693,37 @@ class VLANForm(TenancyForm, NetBoxModelForm): ] +class VLANTranslationPolicyForm(NetBoxModelForm): + + fieldsets = ( + FieldSet('name', 'description', 'tags', name=_('VLAN Translation Policy')), + ) + + class Meta: + model = VLANTranslationPolicy + fields = [ + 'name', 'description', 'tags', + ] + + +class VLANTranslationRuleForm(NetBoxModelForm): + policy = DynamicModelChoiceField( + label=_('Policy'), + queryset=VLANTranslationPolicy.objects.all(), + selector=True + ) + + fieldsets = ( + FieldSet('policy', 'local_vid', 'remote_vid', 'description', 'tags', name=_('VLAN Translation Rule')), + ) + + class Meta: + model = VLANTranslationRule + fields = [ + 'policy', 'local_vid', 'remote_vid', 'description', 'tags', + ] + + class ServiceTemplateForm(NetBoxModelForm): ports = NumericArrayField( label=_('Ports'), diff --git a/netbox/ipam/graphql/filters.py b/netbox/ipam/graphql/filters.py index 5f6602416..1b0e0133b 100644 --- a/netbox/ipam/graphql/filters.py +++ b/netbox/ipam/graphql/filters.py @@ -19,6 +19,8 @@ __all__ = ( 'ServiceTemplateFilter', 'VLANFilter', 'VLANGroupFilter', + 'VLANTranslationPolicyFilter', + 'VLANTranslationRuleFilter', 'VRFFilter', ) @@ -113,6 +115,18 @@ class VLANGroupFilter(BaseFilterMixin): pass +@strawberry_django.filter(models.VLANTranslationPolicy, lookups=True) +@autotype_decorator(filtersets.VLANTranslationPolicyFilterSet) +class VLANTranslationPolicyFilter(BaseFilterMixin): + pass + + +@strawberry_django.filter(models.VLANTranslationRule, lookups=True) +@autotype_decorator(filtersets.VLANTranslationRuleFilterSet) +class VLANTranslationRuleFilter(BaseFilterMixin): + pass + + @strawberry_django.filter(models.VRF, lookups=True) @autotype_decorator(filtersets.VRFFilterSet) class VRFFilter(BaseFilterMixin): diff --git a/netbox/ipam/graphql/schema.py b/netbox/ipam/graphql/schema.py index 072f8cbcd..5fcf78ea9 100644 --- a/netbox/ipam/graphql/schema.py +++ b/netbox/ipam/graphql/schema.py @@ -53,5 +53,11 @@ class IPAMQuery: vlan_group: VLANGroupType = strawberry_django.field() vlan_group_list: List[VLANGroupType] = strawberry_django.field() + vlan_translation_policy: VLANTranslationPolicyType = strawberry_django.field() + vlan_translation_policy_list: List[VLANTranslationPolicyType] = strawberry_django.field() + + vlan_translation_rule: VLANTranslationRuleType = strawberry_django.field() + vlan_translation_rule_list: List[VLANTranslationRuleType] = strawberry_django.field() + vrf: VRFType = strawberry_django.field() vrf_list: List[VRFType] = strawberry_django.field() diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index 9fe1fe466..ef50138c2 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -27,6 +27,8 @@ __all__ = ( 'ServiceTemplateType', 'VLANType', 'VLANGroupType', + 'VLANTranslationPolicyType', + 'VLANTranslationRuleType', 'VRFType', ) @@ -274,6 +276,24 @@ class VLANGroupType(OrganizationalObjectType): return self.scope +@strawberry_django.type( + models.VLANTranslationPolicy, + fields='__all__', + filters=VLANTranslationPolicyFilter +) +class VLANTranslationPolicyType(NetBoxObjectType): + rules: List[Annotated["VLANTranslationRuleType", strawberry.lazy('ipam.graphql.types')]] + + +@strawberry_django.type( + models.VLANTranslationRule, + fields='__all__', + filters=VLANTranslationRuleFilter +) +class VLANTranslationRuleType(NetBoxObjectType): + policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] = strawberry_django.field(select_related=["policy"]) + + @strawberry_django.type( models.VRF, fields='__all__', diff --git a/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py new file mode 100644 index 000000000..ca3943649 --- /dev/null +++ b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py @@ -0,0 +1,62 @@ +# Generated by Django 5.0.9 on 2024-10-11 19:45 + +import django.core.validators +import django.db.models.deletion +import taggit.managers +import utilities.json +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0121_customfield_related_object_filter'), + ('ipam', '0073_charfield_null_choices'), + ] + + operations = [ + migrations.CreateModel( + name='VLANTranslationPolicy', + 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)), + ('comments', models.TextField(blank=True)), + ('name', models.CharField(max_length=100, unique=True)), + ('description', models.CharField(blank=True, max_length=200)), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ], + options={ + 'verbose_name': 'VLAN translation policy', + 'verbose_name_plural': 'VLAN translation policies', + 'ordering': ('name',), + }, + ), + migrations.CreateModel( + name='VLANTranslationRule', + 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)), + ('local_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), + ('remote_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), + ('policy', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='ipam.vlantranslationpolicy')), + ('description', models.CharField(blank=True, max_length=200)), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ], + options={ + 'verbose_name': 'VLAN translation rule', + 'ordering': ('policy', 'local_vid',), + }, + ), + migrations.AddConstraint( + model_name='vlantranslationrule', + constraint=models.UniqueConstraint(fields=('policy', 'local_vid'), name='ipam_vlantranslationrule_unique_policy_local_vid'), + ), + migrations.AddConstraint( + model_name='vlantranslationrule', + constraint=models.UniqueConstraint(fields=('policy', 'remote_vid'), name='ipam_vlantranslationrule_unique_policy_remote_vid'), + ), + ] diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 23f7c41c7..ff8394839 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -10,13 +10,15 @@ from dcim.models import Interface from ipam.choices import * from ipam.constants import * from ipam.querysets import VLANQuerySet, VLANGroupQuerySet -from netbox.models import OrganizationalModel, PrimaryModel +from netbox.models import OrganizationalModel, PrimaryModel, NetBoxModel from utilities.data import check_ranges_overlap, ranges_to_string from virtualization.models import VMInterface __all__ = ( 'VLAN', 'VLANGroup', + 'VLANTranslationPolicy', + 'VLANTranslationRule', ) @@ -273,3 +275,73 @@ class VLAN(PrimaryModel): @property def l2vpn_termination(self): return self.l2vpn_terminations.first() + + +class VLANTranslationPolicy(PrimaryModel): + name = models.CharField( + verbose_name=_('name'), + max_length=100, + unique=True, + ) + + class Meta: + verbose_name = _('VLAN translation policy') + verbose_name_plural = _('VLAN translation policies') + ordering = ('name',) + + def __str__(self): + return self.name + + +class VLANTranslationRule(NetBoxModel): + policy = models.ForeignKey( + to=VLANTranslationPolicy, + related_name='rules', + on_delete=models.CASCADE, + ) + description = models.CharField( + verbose_name=_('description'), + max_length=200, + blank=True + ) + local_vid = models.PositiveSmallIntegerField( + verbose_name=_('Local VLAN ID'), + validators=( + MinValueValidator(VLAN_VID_MIN), + MaxValueValidator(VLAN_VID_MAX) + ), + help_text=_("Numeric VLAN ID (1-4094)") + ) + remote_vid = models.PositiveSmallIntegerField( + verbose_name=_('Remote VLAN ID'), + validators=( + MinValueValidator(VLAN_VID_MIN), + MaxValueValidator(VLAN_VID_MAX) + ), + help_text=_("Numeric VLAN ID (1-4094)") + ) + prerequisite_models = ( + 'ipam.VLANTranslationPolicy', + ) + + class Meta: + verbose_name = _('VLAN translation rule') + ordering = ('policy', 'local_vid',) + constraints = ( + models.UniqueConstraint( + fields=('policy', 'local_vid'), + name='%(app_label)s_%(class)s_unique_policy_local_vid' + ), + models.UniqueConstraint( + fields=('policy', 'remote_vid'), + name='%(app_label)s_%(class)s_unique_policy_remote_vid' + ), + ) + + def __str__(self): + return f'{self.local_vid} -> {self.remote_vid} ({self.policy})' + + def to_objectchange(self, action): + objectchange = super().to_objectchange(action) + objectchange.related_object = self.policy + return objectchange diff --git a/netbox/ipam/search.py b/netbox/ipam/search.py index 16a8eba3c..d200abacf 100644 --- a/netbox/ipam/search.py +++ b/netbox/ipam/search.py @@ -160,6 +160,27 @@ class VLANGroupIndex(SearchIndex): display_attrs = ('scope_type', 'description') +@register_search +class VLANTranslationPolicyIndex(SearchIndex): + model = models.VLANTranslationPolicy + fields = ( + ('name', 100), + ('description', 500), + ) + display_attrs = ('description',) + + +@register_search +class VLANTranslationRuleIndex(SearchIndex): + model = models.VLANTranslationRule + fields = ( + ('policy', 100), + ('local_vid', 200), + ('remote_vid', 200), + ) + display_attrs = ('policy', 'local_vid', 'remote_vid') + + @register_search class VRFIndex(SearchIndex): model = models.VRF diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index 5387ce24c..1a06bb700 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -16,6 +16,8 @@ __all__ = ( 'VLANMembersTable', 'VLANTable', 'VLANVirtualMachinesTable', + 'VLANTranslationPolicyTable', + 'VLANTranslationRuleTable', ) AVAILABLE_LABEL = mark_safe('Available') @@ -244,3 +246,54 @@ class InterfaceVLANTable(NetBoxTable): def __init__(self, interface, *args, **kwargs): self.interface = interface super().__init__(*args, **kwargs) + + +# +# VLAN Translation +# + +class VLANTranslationPolicyTable(NetBoxTable): + name = tables.Column( + verbose_name=_('Name'), + linkify=True + ) + description = tables.Column( + verbose_name=_('Description'), + ) + tags = columns.TagColumn( + url_name='ipam:vlantranslationpolicy_list' + ) + + class Meta(NetBoxTable.Meta): + model = VLANTranslationPolicy + fields = ( + 'pk', 'id', 'name', 'description', 'tags', 'created', 'last_updated', + ) + default_columns = ('pk', 'name', 'description') + + +class VLANTranslationRuleTable(NetBoxTable): + policy = tables.Column( + verbose_name=_('Policy'), + linkify=True + ) + local_vid = tables.Column( + verbose_name=_('Local VID'), + linkify=True + ) + remote_vid = tables.Column( + verbose_name=_('Remote VID'), + ) + description = tables.Column( + verbose_name=_('Description'), + ) + tags = columns.TagColumn( + url_name='ipam:vlantranslationrule_list' + ) + + class Meta(NetBoxTable.Meta): + model = VLANTranslationRule + fields = ( + 'pk', 'id', 'name', 'policy', 'local_vid', 'remote_vid', 'description', 'tags', 'created', 'last_updated', + ) + default_columns = ('pk', 'policy', 'local_vid', 'remote_vid', 'description') diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 1d2cdf1b7..cd3e47342 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -1020,6 +1020,112 @@ class VLANTest(APIViewTestCases.APIViewTestCase): self.assertTrue(content['detail'].startswith('Unable to delete object.')) +class VLANTranslationPolicyTest(APIViewTestCases.APIViewTestCase): + model = VLANTranslationPolicy + brief_fields = ['description', 'display', 'id', 'name', 'url',] + bulk_update_data = { + 'description': 'New description', + } + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + VLANTranslationPolicy( + name='Policy 3', + description='foobar3', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + cls.create_data = [ + { + 'name': 'Policy 4', + 'description': 'foobar4', + }, + { + 'name': 'Policy 5', + 'description': 'foobar5', + }, + { + 'name': 'Policy 6', + 'description': 'foobar6', + }, + ] + + +class VLANTranslationRuleTest(APIViewTestCases.APIViewTestCase): + model = VLANTranslationRule + brief_fields = ['id', 'local_vid', 'policy', 'remote_vid',] + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + vlan_translation_rules = ( + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=100, + remote_vid=200, + description='foo', + ), + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=101, + remote_vid=201, + description='bar', + ), + VLANTranslationRule( + policy=vlan_translation_policies[1], + local_vid=102, + remote_vid=202, + description='baz', + ), + ) + VLANTranslationRule.objects.bulk_create(vlan_translation_rules) + + cls.create_data = [ + { + 'policy': vlan_translation_policies[0].pk, + 'local_vid': 300, + 'remote_vid': 400, + }, + { + 'policy': vlan_translation_policies[0].pk, + 'local_vid': 301, + 'remote_vid': 401, + }, + { + 'policy': vlan_translation_policies[1].pk, + 'local_vid': 302, + 'remote_vid': 402, + }, + ] + + cls.bulk_update_data = { + 'policy': vlan_translation_policies[1].pk, + } + + class ServiceTemplateTest(APIViewTestCases.APIViewTestCase): model = ServiceTemplate brief_fields = ['description', 'display', 'id', 'name', 'ports', 'protocol', 'url'] diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 7bc372fbf..b402a8426 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1898,6 +1898,99 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) +class VLANTranslationPolicyTestCase(TestCase, ChangeLoggedFilterSetTests): + queryset = VLANTranslationPolicy.objects.all() + filterset = VLANTranslationPolicyFilterSet + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + VLANTranslationPolicy( + name='Policy 3', + description='foobar3', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + def test_name(self): + params = {'name': ['Policy 1', 'Policy 2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_description(self): + params = {'description': ['foobar1', 'foobar2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + +class VLANTranslationRuleTestCase(TestCase, ChangeLoggedFilterSetTests): + queryset = VLANTranslationRule.objects.all() + filterset = VLANTranslationRuleFilterSet + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + vlan_translation_rules = ( + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=100, + remote_vid=200, + description='foo', + ), + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=101, + remote_vid=201, + description='bar', + ), + VLANTranslationRule( + policy=vlan_translation_policies[1], + local_vid=100, + remote_vid=200, + description='baz', + ), + ) + VLANTranslationRule.objects.bulk_create(vlan_translation_rules) + + def test_policy_id(self): + policies = VLANTranslationPolicy.objects.all()[:2] + params = {'policy_id': [policies[0].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'policy': [policies[0].name]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_local_vid(self): + params = {'local_vid': [100]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_remote_vid(self): + params = {'remote_vid': [200]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_description(self): + params = {'description': ['foo', 'bar']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + class ServiceTemplateTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = ServiceTemplate.objects.all() filterset = ServiceTemplateFilterSet diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index 27d88767b..c45777f08 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -863,6 +863,121 @@ class VLANTestCase(ViewTestCases.PrimaryObjectViewTestCase): } +class VLANTranslationPolicyTestCase(ViewTestCases.PrimaryObjectViewTestCase): + model = VLANTranslationPolicy + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + VLANTranslationPolicy( + name='Policy 3', + description='foobar3', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + tags = create_tags('Alpha', 'Bravo', 'Charlie') + + cls.form_data = { + 'name': 'Policy999', + 'description': 'A new VLAN Translation Policy', + 'tags': [t.pk for t in tags], + } + + cls.csv_data = ( + "name,description", + "Policy101,foobar1", + "Policy102,foobar2", + "Policy103,foobar3", + ) + + cls.csv_update_data = ( + "id,name,description", + f"{vlan_translation_policies[0].pk},Policy101,New description 1", + f"{vlan_translation_policies[1].pk},Policy102,New description 2", + f"{vlan_translation_policies[2].pk},Policy103,New description 3", + ) + + cls.bulk_edit_data = { + 'description': 'New description', + } + + +class VLANTranslationRuleTestCase(ViewTestCases.PrimaryObjectViewTestCase): + model = VLANTranslationRule + + @classmethod + def setUpTestData(cls): + + vlan_translation_policies = ( + VLANTranslationPolicy( + name='Policy 1', + description='foobar1', + ), + VLANTranslationPolicy( + name='Policy 2', + description='foobar2', + ), + VLANTranslationPolicy( + name='Policy 3', + description='foobar3', + ), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + + vlan_translation_rules = ( + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=100, + remote_vid=200, + ), + VLANTranslationRule( + policy=vlan_translation_policies[0], + local_vid=101, + remote_vid=201, + ), + VLANTranslationRule( + policy=vlan_translation_policies[1], + local_vid=102, + remote_vid=202, + ), + ) + VLANTranslationRule.objects.bulk_create(vlan_translation_rules) + + cls.form_data = { + 'policy': vlan_translation_policies[0].pk, + 'local_vid': 300, + 'remote_vid': 400, + } + + cls.csv_data = ( + "policy,local_vid,remote_vid", + f"{vlan_translation_policies[0].pk},103,203", + f"{vlan_translation_policies[0].pk},104,204", + f"{vlan_translation_policies[1].pk},105,205", + ) + + cls.csv_update_data = ( + "id,policy,local_vid,remote_vid", + f"{vlan_translation_rules[0].pk},{vlan_translation_policies[1].pk},105,205", + f"{vlan_translation_rules[1].pk},{vlan_translation_policies[1].pk},106,206", + f"{vlan_translation_rules[2].pk},{vlan_translation_policies[0].pk},107,207", + ) + + cls.bulk_edit_data = { + 'policy': vlan_translation_policies[2].pk, + } + + class ServiceTemplateTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = ServiceTemplate diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index 61deeff4b..d40f9c5dc 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -116,6 +116,22 @@ urlpatterns = [ path('vlans/delete/', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'), path('vlans//', include(get_model_urls('ipam', 'vlan'))), + # VLAN Translation Policies + path('vlan-translation-policies/', views.VLANTranslationPolicyListView.as_view(), name='vlantranslationpolicy_list'), + path('vlan-translation-policies/add/', views.VLANTranslationPolicyEditView.as_view(), name='vlantranslationpolicy_add'), + path('vlan-translation-policies/import/', views.VLANTranslationPolicyBulkImportView.as_view(), name='vlantranslationpolicy_import'), + path('vlan-translation-policies/edit/', views.VLANTranslationPolicyBulkEditView.as_view(), name='vlantranslationpolicy_bulk_edit'), + path('vlan-translation-policies/delete/', views.VLANTranslationPolicyBulkDeleteView.as_view(), name='vlantranslationpolicy_bulk_delete'), + path('vlan-translation-policies//', include(get_model_urls('ipam', 'vlantranslationpolicy'))), + + # VLAN Translation Rules + path('vlan-translation-rules/', views.VLANTranslationRuleListView.as_view(), name='vlantranslationrule_list'), + path('vlan-translation-rules/add/', views.VLANTranslationRuleEditView.as_view(), name='vlantranslationrule_add'), + path('vlan-translation-rules/import/', views.VLANTranslationRuleBulkImportView.as_view(), name='vlantranslationrule_import'), + path('vlan-translation-rules/edit/', views.VLANTranslationRuleBulkEditView.as_view(), name='vlantranslationrule_bulk_edit'), + path('vlan-translation-rules/delete/', views.VLANTranslationRuleBulkDeleteView.as_view(), name='vlantranslationrule_bulk_delete'), + path('vlan-translation-rules//', include(get_model_urls('ipam', 'vlantranslationrule'))), + # Service templates path('service-templates/', views.ServiceTemplateListView.as_view(), name='servicetemplate_list'), path('service-templates/add/', views.ServiceTemplateEditView.as_view(), name='servicetemplate_add'), diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index b712ef3b6..bbd19c433 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -9,6 +9,7 @@ from circuits.models import Provider from dcim.filtersets import InterfaceFilterSet from dcim.forms import InterfaceFilterForm from dcim.models import Interface, Site +from ipam.tables import VLANTranslationRuleTable from netbox.views import generic from tenancy.views import ObjectContactsView from utilities.query import count_related @@ -986,6 +987,110 @@ class VLANGroupVLANsView(generic.ObjectChildrenView): return queryset +# +# VLAN Translation Policies +# + +class VLANTranslationPolicyListView(generic.ObjectListView): + queryset = VLANTranslationPolicy.objects.all() + filterset = filtersets.VLANTranslationPolicyFilterSet + filterset_form = forms.VLANTranslationPolicyFilterForm + table = tables.VLANTranslationPolicyTable + + +@register_model_view(VLANTranslationPolicy) +class VLANTranslationPolicyView(GetRelatedModelsMixin, generic.ObjectView): + queryset = VLANTranslationPolicy.objects.all() + + def get_extra_context(self, request, instance): + vlan_translation_table = VLANTranslationRuleTable( + data=instance.rules.all(), + orderable=False + ) + return { + 'vlan_translation_table': vlan_translation_table, + } + + +@register_model_view(VLANTranslationPolicy, 'edit') +class VLANTranslationPolicyEditView(generic.ObjectEditView): + queryset = VLANTranslationPolicy.objects.all() + form = forms.VLANTranslationPolicyForm + + +@register_model_view(VLANTranslationPolicy, 'delete') +class VLANTranslationPolicyDeleteView(generic.ObjectDeleteView): + queryset = VLANTranslationPolicy.objects.all() + + +class VLANTranslationPolicyBulkImportView(generic.BulkImportView): + queryset = VLANTranslationPolicy.objects.all() + model_form = forms.VLANTranslationPolicyImportForm + + +class VLANTranslationPolicyBulkEditView(generic.BulkEditView): + queryset = VLANTranslationPolicy.objects.all() + filterset = filtersets.VLANTranslationPolicyFilterSet + table = tables.VLANTranslationPolicyTable + form = forms.VLANTranslationPolicyBulkEditForm + + +class VLANTranslationPolicyBulkDeleteView(generic.BulkDeleteView): + queryset = VLANTranslationPolicy.objects.all() + filterset = filtersets.VLANTranslationPolicyFilterSet + table = tables.VLANTranslationPolicyTable + + +# +# VLAN Translation Rules +# + +class VLANTranslationRuleListView(generic.ObjectListView): + queryset = VLANTranslationRule.objects.all() + filterset = filtersets.VLANTranslationRuleFilterSet + filterset_form = forms.VLANTranslationRuleFilterForm + table = tables.VLANTranslationRuleTable + + +@register_model_view(VLANTranslationRule) +class VLANTranslationRuleView(GetRelatedModelsMixin, generic.ObjectView): + queryset = VLANTranslationRule.objects.all() + + def get_extra_context(self, request, instance): + return { + 'related_models': self.get_related_models(request, instance), + } + + +@register_model_view(VLANTranslationRule, 'edit') +class VLANTranslationRuleEditView(generic.ObjectEditView): + queryset = VLANTranslationRule.objects.all() + form = forms.VLANTranslationRuleForm + + +@register_model_view(VLANTranslationRule, 'delete') +class VLANTranslationRuleDeleteView(generic.ObjectDeleteView): + queryset = VLANTranslationRule.objects.all() + + +class VLANTranslationRuleBulkImportView(generic.BulkImportView): + queryset = VLANTranslationRule.objects.all() + model_form = forms.VLANTranslationRuleImportForm + + +class VLANTranslationRuleBulkEditView(generic.BulkEditView): + queryset = VLANTranslationRule.objects.all() + filterset = filtersets.VLANTranslationRuleFilterSet + table = tables.VLANTranslationRuleTable + form = forms.VLANTranslationRuleBulkEditForm + + +class VLANTranslationRuleBulkDeleteView(generic.BulkDeleteView): + queryset = VLANTranslationRule.objects.all() + filterset = filtersets.VLANTranslationRuleFilterSet + table = tables.VLANTranslationRuleTable + + # # FHRP groups # diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index 9d8ffaaf8..737e399a5 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -194,6 +194,8 @@ IPAM_MENU = Menu( items=( get_model_item('ipam', 'vlan', _('VLANs')), get_model_item('ipam', 'vlangroup', _('VLAN Groups')), + get_model_item('ipam', 'vlantranslationpolicy', _('VLAN Translation Policies')), + get_model_item('ipam', 'vlantranslationrule', _('VLAN Translation Rules')), ), ), MenuGroup( diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 016a6c890..b18a6380b 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -133,6 +133,10 @@ {% trans "VRF" %} {{ object.vrf|linkify|placeholder }} + + {% trans "VLAN Translation" %} + {{ object.vlan_translation_policy|linkify|placeholder }} +
{% if not object.is_virtual %} @@ -355,6 +359,13 @@ {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
+ {% if object.vlan_translation_policy %} +
+
+ {% include 'inc/panel_table.html' with table=vlan_translation_table heading="VLAN Translation" %} +
+
+ {% endif %} {% if object.is_bridge %}
diff --git a/netbox/templates/ipam/vlantranslationpolicy.html b/netbox/templates/ipam/vlantranslationpolicy.html new file mode 100644 index 000000000..5217db913 --- /dev/null +++ b/netbox/templates/ipam/vlantranslationpolicy.html @@ -0,0 +1,55 @@ +{% extends 'generic/object.html' %} +{% load helpers %} +{% load plugins %} +{% load render_table from django_tables2 %} +{% load i18n %} + +{% block content %} +
+
+
+

{% trans "VLAN Translation Policy" %}

+ + + + + + + + + +
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
+
+ {% plugin_left_page object %} +
+
+ {% include 'inc/panels/tags.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% include 'inc/panels/comments.html' %} + {% plugin_right_page object %} +
+
+
+
+
+

+ {% trans "VLAN Translation Rules" %} + {% if perms.ipam.add_vlantranslationrule %} +
+ + {% trans "Add Rule" %} + +
+ {% endif %} +

+ {% htmx_table 'ipam:vlantranslationrule_list' policy_id=object.pk %} +
+
+
+
+
+ {% plugin_full_width_page object %} +
+
+{% endblock %} diff --git a/netbox/templates/ipam/vlantranslationrule.html b/netbox/templates/ipam/vlantranslationrule.html new file mode 100644 index 000000000..7f3aad2ad --- /dev/null +++ b/netbox/templates/ipam/vlantranslationrule.html @@ -0,0 +1,45 @@ +{% extends 'generic/object.html' %} +{% load helpers %} +{% load plugins %} +{% load render_table from django_tables2 %} +{% load i18n %} + +{% block content %} +
+
+
+

{% trans "VLAN Translation Rule" %}

+ + + + + + + + + + + + + + + + + +
{% trans "Policy" %}{{ object.policy|linkify }}
{% trans "Local VID" %}{{ object.local_vid }}
{% trans "Remote VID" %}{{ object.remote_vid }}
{% trans "Description" %}{{ object.description }}
+
+ {% plugin_left_page object %} +
+
+ {% include 'inc/panels/tags.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% include 'inc/panels/comments.html' %} + {% plugin_right_page object %} +
+
+
+
+ {% plugin_full_width_page object %} +
+
+{% endblock %} diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html index 0d679680d..13cc8aa2f 100644 --- a/netbox/templates/virtualization/vminterface.html +++ b/netbox/templates/virtualization/vminterface.html @@ -67,6 +67,10 @@ {% trans "Tunnel" %} {{ object.tunnel_termination.tunnel|linkify|placeholder }} + + {% trans "VLAN Translation" %} + {{ object.vlan_translation_policy|linkify|placeholder }} +
{% include 'inc/panels/tags.html' %} @@ -100,6 +104,13 @@ {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
+{% if object.vlan_translation_policy %} +
+
+ {% include 'inc/panel_table.html' with table=vlan_translation_table heading="VLAN Translation" %} +
+
+{% endif %}
{% include 'inc/panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %} diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py index 1b224c16a..2c00cac96 100644 --- a/netbox/virtualization/api/serializers_/virtualmachines.py +++ b/netbox/virtualization/api/serializers_/virtualmachines.py @@ -8,7 +8,7 @@ from dcim.api.serializers_.sites import SiteSerializer from dcim.choices import InterfaceModeChoices from extras.api.serializers_.configtemplates import ConfigTemplateSerializer from ipam.api.serializers_.ip import IPAddressSerializer -from ipam.api.serializers_.vlans import VLANSerializer +from ipam.api.serializers_.vlans import VLANSerializer, VLANTranslationPolicySerializer from ipam.api.serializers_.vrfs import VRFSerializer from ipam.models import VLAN from netbox.api.fields import ChoiceField, SerializedPKRelatedField @@ -89,6 +89,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer): required=False, many=True ) + vlan_translation_policy = VLANTranslationPolicySerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) count_ipaddresses = serializers.IntegerField(read_only=True) @@ -105,6 +106,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer): 'id', 'url', 'display_url', 'display', 'virtual_machine', 'name', 'enabled', 'parent', 'bridge', 'mtu', 'mac_address', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'vrf', 'l2vpn_termination', 'tags', 'custom_fields', 'created', 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', + 'vlan_translation_policy', ] brief_fields = ('id', 'url', 'display', 'virtual_machine', 'name', 'description') diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 9ffc914ab..5971fc894 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.forms.common import InterfaceCommonForm from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from extras.models import ConfigTemplate -from ipam.models import IPAddress, VLAN, VLANGroup, VRF +from ipam.models import IPAddress, VLAN, VLANGroup, VLANTranslationPolicy, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.forms import ConfirmationForm @@ -343,20 +343,25 @@ class VMInterfaceForm(InterfaceCommonForm, VMComponentForm): required=False, label=_('VRF') ) + vlan_translation_policy = DynamicModelChoiceField( + queryset=VLANTranslationPolicy.objects.all(), + required=False, + label=_('VLAN Translation Policy') + ) fieldsets = ( FieldSet('virtual_machine', 'name', 'description', 'tags', name=_('Interface')), FieldSet('vrf', 'mac_address', name=_('Addressing')), FieldSet('mtu', 'enabled', name=_('Operation')), FieldSet('parent', 'bridge', name=_('Related Interfaces')), - FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', name=_('802.1Q Switching')), + FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vlan_translation_policy', name=_('802.1Q Switching')), ) class Meta: model = VMInterface fields = [ 'virtual_machine', 'name', 'parent', 'bridge', 'enabled', 'mac_address', 'mtu', 'description', 'mode', - 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', + 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', 'vlan_translation_policy', ] labels = { 'mode': '802.1Q Mode', diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index 2d872322b..bed65a3b3 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -100,6 +100,7 @@ class VMInterfaceType(IPAddressesMixin, ComponentType): bridge: Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')] | None untagged_vlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vrf: Annotated["VRFType", strawberry.lazy('ipam.graphql.types')] | None + vlan_translation_policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None tagged_vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] bridge_interfaces: List[Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')]] diff --git a/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py new file mode 100644 index 000000000..e0992c9c8 --- /dev/null +++ b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py @@ -0,0 +1,20 @@ +# Generated by Django 5.0.9 on 2024-10-11 19:45 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), + ('virtualization', '0041_charfield_null_choices'), + ] + + operations = [ + migrations.AddField( + model_name='vminterface', + name='vlan_translation_policy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy'), + ), + ] diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py index d2e6cc05f..cd598274f 100644 --- a/netbox/virtualization/tests/test_filtersets.py +++ b/netbox/virtualization/tests/test_filtersets.py @@ -1,7 +1,7 @@ from django.test import TestCase from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup -from ipam.models import IPAddress, VRF +from ipam.models import IPAddress, VLANTranslationPolicy, VRF from tenancy.models import Tenant, TenantGroup from utilities.testing import ChangeLoggedFilterSetTests, create_test_device from virtualization.choices import * @@ -561,6 +561,13 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): ) VirtualMachine.objects.bulk_create(vms) + vlan_translation_policies = ( + VLANTranslationPolicy(name='Policy 1'), + VLANTranslationPolicy(name='Policy 2'), + VLANTranslationPolicy(name='Policy 3'), + ) + VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + interfaces = ( VMInterface( virtual_machine=vms[0], @@ -569,7 +576,8 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): mtu=100, mac_address='00-00-00-00-00-01', vrf=vrfs[0], - description='foobar1' + description='foobar1', + vlan_translation_policy=vlan_translation_policies[0], ), VMInterface( virtual_machine=vms[1], @@ -578,7 +586,8 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): mtu=200, mac_address='00-00-00-00-00-02', vrf=vrfs[1], - description='foobar2' + description='foobar2', + vlan_translation_policy=vlan_translation_policies[0], ), VMInterface( virtual_machine=vms[2], @@ -658,6 +667,13 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'description': ['foobar1', 'foobar2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_vlan_translation_policy(self): + vlan_translation_policies = VLANTranslationPolicy.objects.all()[:2] + params = {'vlan_translation_policy_id': [vlan_translation_policies[0].pk, vlan_translation_policies[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'vlan_translation_policy': [vlan_translation_policies[0].name, vlan_translation_policies[1].name]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class VirtualDiskTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = VirtualDisk.objects.all() diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index d1d65b1ff..35f2f8f75 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -16,7 +16,7 @@ from dcim.models import Device from dcim.tables import DeviceTable from extras.views import ObjectConfigContextView from ipam.models import IPAddress -from ipam.tables import InterfaceVLANTable +from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable from netbox.constants import DEFAULT_ACTION_PERMISSIONS from netbox.views import generic from tenancy.views import ObjectContactsView @@ -516,6 +516,14 @@ class VMInterfaceView(generic.ObjectView): orderable=False ) + # Get VLAN translation rules + vlan_translation_table = None + if instance.vlan_translation_policy: + vlan_translation_table = VLANTranslationRuleTable( + data=instance.vlan_translation_policy.rules.all(), + orderable=False + ) + # Get assigned VLANs and annotate whether each is tagged or untagged vlans = [] if instance.untagged_vlan is not None: @@ -533,6 +541,7 @@ class VMInterfaceView(generic.ObjectView): return { 'child_interfaces_table': child_interfaces_tables, 'vlan_table': vlan_table, + 'vlan_translation_table': vlan_translation_table, } From a8eb455f3e83cc79f38a51ae32266911aa4e2f16 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 31 Oct 2024 06:55:08 -0700 Subject: [PATCH 021/190] 9604 Add Termination to CircuitTermination (#17821) * 9604 add scope type to CircuitTermination * 9604 add scope type to CircuitTermination * 9604 add scope type to CircuitTermination * 9604 model_forms * 9604 form filtersets * 9604 form bulk_import * 9604 form bulk_edit * 9604 serializers * 9604 graphql * 9604 tests and detail template * 9604 fix migration merge * 9604 fix tests * 9604 fix tests * 9604 fix table * 9604 updates * fix tests * fix tests * fix tests * fix tests * fix tests * fix tests * fix tests * 9604 remove provider_network * 9604 fix tests * 9604 fix tests * 9604 fix forms * 9604 review changes * 9604 scope->termination * 9604 fix _circuit_terminations * 9604 fix _circuit_terminations * 9604 sitegroup -> site_group * 9604 update docs * 9604 fix form termination side reference * Misc cleanup * Fix terminations in circuits table * Fix missing imports * Clean up termination attrs display * Add termination & type to CircuitTerminationTable * Update cable tracing logic --------- Co-authored-by: Jeremy Stretch --- docs/models/circuits/circuittermination.md | 8 +- netbox/circuits/api/serializers_/circuits.py | 51 ++++++++-- netbox/circuits/constants.py | 4 + netbox/circuits/filtersets.py | 76 +++++++++++---- netbox/circuits/forms/bulk_edit.py | 54 +++++++---- netbox/circuits/forms/bulk_import.py | 30 +++--- netbox/circuits/forms/filtersets.py | 25 +++-- netbox/circuits/forms/model_forms.py | 63 ++++++++++--- netbox/circuits/graphql/types.py | 16 +++- .../0047_circuittermination__termination.py | 56 +++++++++++ ...48_circuitterminations_cached_relations.py | 90 ++++++++++++++++++ netbox/circuits/models/circuits.py | 94 ++++++++++++++++--- netbox/circuits/tables/circuits.py | 52 +++++++--- netbox/circuits/tests/test_api.py | 14 +-- netbox/circuits/tests/test_filtersets.py | 48 +++++----- netbox/circuits/tests/test_views.py | 46 +++++---- netbox/circuits/views.py | 11 +-- netbox/dcim/graphql/types.py | 17 +++- netbox/dcim/models/cables.py | 12 +-- netbox/dcim/tests/test_cablepaths.py | 30 +++--- netbox/dcim/tests/test_filtersets.py | 6 +- netbox/dcim/tests/test_models.py | 6 +- netbox/dcim/views.py | 26 ++++- .../inc/circuit_termination_fields.html | 25 ++--- 24 files changed, 649 insertions(+), 211 deletions(-) create mode 100644 netbox/circuits/constants.py create mode 100644 netbox/circuits/migrations/0047_circuittermination__termination.py create mode 100644 netbox/circuits/migrations/0048_circuitterminations_cached_relations.py diff --git a/docs/models/circuits/circuittermination.md b/docs/models/circuits/circuittermination.md index c6aa966d0..791863483 100644 --- a/docs/models/circuits/circuittermination.md +++ b/docs/models/circuits/circuittermination.md @@ -21,13 +21,9 @@ Designates the termination as forming either the A or Z end of the circuit. If selected, the circuit termination will be considered "connected" even if no cable has been connected to it in NetBox. -### Site +### Termination -The [site](../dcim/site.md) with which this circuit termination is associated. Once created, a cable can be connected between the circuit termination and a device interface (or similar component). - -### Provider Network - -Circuits which do not connect to a site modeled by NetBox can instead be terminated to a [provider network](./providernetwork.md) representing an unknown network operated by a [provider](./provider.md). +The [region](../dcim/region.md), [site group](../dcim/sitegroup.md), [site](../dcim/site.md), [location](../dcim/location.md) or [provider network](./providernetwork.md) with which this circuit termination is associated. Once created, a cable can be connected between the circuit termination and a device interface (or similar component). ### Port Speed diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index 111fa6f87..96a686a65 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -1,11 +1,16 @@ +from django.contrib.contenttypes.models import ContentType +from drf_spectacular.utils import extend_schema_field +from rest_framework import serializers + from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices +from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES from circuits.models import Circuit, CircuitGroup, CircuitGroupAssignment, CircuitTermination, CircuitType from dcim.api.serializers_.cables import CabledObjectSerializer -from dcim.api.serializers_.sites import SiteSerializer -from netbox.api.fields import ChoiceField, RelatedObjectCountField +from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer from netbox.choices import DistanceUnitChoices from tenancy.api.serializers_.tenants import TenantSerializer +from utilities.api import get_serializer_for_model from .providers import ProviderAccountSerializer, ProviderNetworkSerializer, ProviderSerializer @@ -33,16 +38,33 @@ class CircuitTypeSerializer(NetBoxModelSerializer): class CircuitCircuitTerminationSerializer(WritableNestedSerializer): - site = SiteSerializer(nested=True, allow_null=True) + termination_type = ContentTypeField( + queryset=ContentType.objects.filter( + model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES + ), + allow_null=True, + required=False, + default=None + ) + termination_id = serializers.IntegerField(allow_null=True, required=False, default=None) + termination = serializers.SerializerMethodField(read_only=True) provider_network = ProviderNetworkSerializer(nested=True, allow_null=True) class Meta: model = CircuitTermination fields = [ - 'id', 'url', 'display_url', 'display', 'site', 'provider_network', 'port_speed', 'upstream_speed', + 'id', 'url', 'display_url', 'display', 'termination_type', 'termination_id', 'termination', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', ] + @extend_schema_field(serializers.JSONField(allow_null=True)) + def get_termination(self, obj): + if obj.termination_id is None: + return None + serializer = get_serializer_for_model(obj.termination) + context = {'request': self.context['request']} + return serializer(obj.termination, nested=True, context=context).data + class CircuitGroupSerializer(NetBoxModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) @@ -95,18 +117,35 @@ class CircuitSerializer(NetBoxModelSerializer): class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer): circuit = CircuitSerializer(nested=True) - site = SiteSerializer(nested=True, required=False, allow_null=True) + termination_type = ContentTypeField( + queryset=ContentType.objects.filter( + model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES + ), + allow_null=True, + required=False, + default=None + ) + termination_id = serializers.IntegerField(allow_null=True, required=False, default=None) + termination = serializers.SerializerMethodField(read_only=True) provider_network = ProviderNetworkSerializer(nested=True, required=False, allow_null=True) class Meta: model = CircuitTermination fields = [ - 'id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'site', 'provider_network', 'port_speed', + 'id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'termination_type', 'termination_id', 'termination', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'tags', 'custom_fields', 'created', 'last_updated', '_occupied', ] brief_fields = ('id', 'url', 'display', 'circuit', 'term_side', 'description', 'cable', '_occupied') + @extend_schema_field(serializers.JSONField(allow_null=True)) + def get_termination(self, obj): + if obj.termination_id is None: + return None + serializer = get_serializer_for_model(obj.termination) + context = {'request': self.context['request']} + return serializer(obj.termination, nested=True, context=context).data + class CircuitGroupAssignmentSerializer(CircuitGroupAssignmentSerializer_): circuit = CircuitSerializer(nested=True) diff --git a/netbox/circuits/constants.py b/netbox/circuits/constants.py new file mode 100644 index 000000000..8119bc286 --- /dev/null +++ b/netbox/circuits/constants.py @@ -0,0 +1,4 @@ +# models values for ContentTypes which may be CircuitTermination termination types +CIRCUIT_TERMINATION_TERMINATION_TYPES = ( + 'region', 'sitegroup', 'site', 'location', 'providernetwork', +) diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index ebd1fe28d..4a2a972f3 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -3,11 +3,11 @@ from django.db.models import Q from django.utils.translation import gettext as _ from dcim.filtersets import CabledObjectFilterSet -from dcim.models import Region, Site, SiteGroup +from dcim.models import Location, Region, Site, SiteGroup from ipam.models import ASN from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet -from utilities.filters import TreeNodeMultipleChoiceFilter +from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter from .choices import * from .models import * @@ -26,37 +26,37 @@ __all__ = ( class ProviderFilterSet(NetBoxModelFilterSet, ContactModelFilterSet): region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='circuits__terminations__site__region', + field_name='circuits__terminations___region', lookup_expr='in', label=_('Region (ID)'), ) region = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='circuits__terminations__site__region', + field_name='circuits__terminations___region', lookup_expr='in', to_field_name='slug', label=_('Region (slug)'), ) site_group_id = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='circuits__terminations__site__group', + field_name='circuits__terminations___site_group', lookup_expr='in', label=_('Site group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='circuits__terminations__site__group', + field_name='circuits__terminations___site_group', lookup_expr='in', to_field_name='slug', label=_('Site group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( - field_name='circuits__terminations__site', + field_name='circuits__terminations___site', queryset=Site.objects.all(), label=_('Site'), ) site = django_filters.ModelMultipleChoiceFilter( - field_name='circuits__terminations__site__slug', + field_name='circuits__terminations___site__slug', queryset=Site.objects.all(), to_field_name='slug', label=_('Site (slug)'), @@ -173,7 +173,7 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte label=_('Provider account (account)'), ) provider_network_id = django_filters.ModelMultipleChoiceFilter( - field_name='terminations__provider_network', + field_name='terminations___provider_network', queryset=ProviderNetwork.objects.all(), label=_('Provider network (ID)'), ) @@ -193,37 +193,37 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte ) region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='terminations__site__region', + field_name='terminations___region', lookup_expr='in', label=_('Region (ID)'), ) region = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='terminations__site__region', + field_name='terminations___region', lookup_expr='in', to_field_name='slug', label=_('Region (slug)'), ) site_group_id = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='terminations__site__group', + field_name='terminations___site_group', lookup_expr='in', label=_('Site group (ID)'), ) site_group = TreeNodeMultipleChoiceFilter( queryset=SiteGroup.objects.all(), - field_name='terminations__site__group', + field_name='terminations___site_group', lookup_expr='in', to_field_name='slug', label=_('Site group (slug)'), ) site_id = django_filters.ModelMultipleChoiceFilter( - field_name='terminations__site', + field_name='terminations___site', queryset=Site.objects.all(), label=_('Site (ID)'), ) site = django_filters.ModelMultipleChoiceFilter( - field_name='terminations__site__slug', + field_name='terminations___site__slug', queryset=Site.objects.all(), to_field_name='slug', label=_('Site (slug)'), @@ -263,18 +263,60 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet): queryset=Circuit.objects.all(), label=_('Circuit'), ) + termination_type = ContentTypeFilter() + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + label=_('Region (ID)'), + ) + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + to_field_name='slug', + label=_('Region (slug)'), + ) + site_group_id = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + label=_('Site group (ID)'), + ) + site_group = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + to_field_name='slug', + label=_('Site group (slug)'), + ) site_id = django_filters.ModelMultipleChoiceFilter( queryset=Site.objects.all(), + field_name='_site', label=_('Site (ID)'), ) site = django_filters.ModelMultipleChoiceFilter( - field_name='site__slug', + field_name='_site__slug', queryset=Site.objects.all(), to_field_name='slug', label=_('Site (slug)'), ) + location_id = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + label=_('Location (ID)'), + ) + location = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + to_field_name='slug', + label=_('Location (slug)'), + ) provider_network_id = django_filters.ModelMultipleChoiceFilter( queryset=ProviderNetwork.objects.all(), + field_name='_provider_network', label=_('ProviderNetwork (ID)'), ) provider_id = django_filters.ModelMultipleChoiceFilter( @@ -292,7 +334,7 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet): class Meta: model = CircuitTermination fields = ( - 'id', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', 'mark_connected', + 'id', 'termination_id', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', 'mark_connected', 'pp_info', 'cable_end', ) diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py index 5cb7b5d30..e3f0b5d0c 100644 --- a/netbox/circuits/forms/bulk_edit.py +++ b/netbox/circuits/forms/bulk_edit.py @@ -1,17 +1,23 @@ from django import forms +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices +from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES from circuits.models import * from dcim.models import Site from ipam.models import ASN from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelBulkEditForm from tenancy.models import Tenant -from utilities.forms import add_blank_choice -from utilities.forms.fields import ColorField, CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField -from utilities.forms.rendering import FieldSet, TabbedGroups -from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, NumberWithOptions +from utilities.forms import add_blank_choice, get_field_value +from utilities.forms.fields import ( + ColorField, CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, +) +from utilities.forms.rendering import FieldSet +from utilities.forms.widgets import BulkEditNullBooleanSelect, DatePicker, HTMXSelect, NumberWithOptions +from utilities.templatetags.builtins.filters import bettertitle __all__ = ( 'CircuitBulkEditForm', @@ -197,15 +203,18 @@ class CircuitTerminationBulkEditForm(NetBoxModelBulkEditForm): max_length=200, required=False ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), - required=False + termination_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES), + widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}), + required=False, + label=_('Termination type') ) - provider_network = DynamicModelChoiceField( - label=_('Provider Network'), - queryset=ProviderNetwork.objects.all(), - required=False + termination = DynamicModelChoiceField( + label=_('Termination'), + queryset=Site.objects.none(), # Initial queryset + required=False, + disabled=True, + selector=True ) port_speed = forms.IntegerField( required=False, @@ -225,15 +234,26 @@ class CircuitTerminationBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( FieldSet( 'description', - TabbedGroups( - FieldSet('site', name=_('Site')), - FieldSet('provider_network', name=_('Provider Network')), - ), + 'termination_type', 'termination', 'mark_connected', name=_('Circuit Termination') ), FieldSet('port_speed', 'upstream_speed', name=_('Termination Details')), ) - nullable_fields = ('description') + nullable_fields = ('description', 'termination') + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if termination_type_id := get_field_value(self, 'termination_type'): + try: + termination_type = ContentType.objects.get(pk=termination_type_id) + model = termination_type.model_class() + self.fields['termination'].queryset = model.objects.all() + self.fields['termination'].widget.attrs['selector'] = model._meta.label_lower + self.fields['termination'].disabled = False + self.fields['termination'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass class CircuitGroupBulkEditForm(NetBoxModelBulkEditForm): diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index d5cdc00a7..eab87b1f5 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -1,13 +1,14 @@ from django import forms +from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ from circuits.choices import * +from circuits.constants import * from circuits.models import * -from dcim.models import Site from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVModelChoiceField, SlugField __all__ = ( 'CircuitImportForm', @@ -127,17 +128,10 @@ class BaseCircuitTerminationImportForm(forms.ModelForm): label=_('Termination'), choices=CircuitTerminationSideChoices, ) - site = CSVModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), - to_field_name='name', - required=False - ) - provider_network = CSVModelChoiceField( - label=_('Provider network'), - queryset=ProviderNetwork.objects.all(), - to_field_name='name', - required=False + termination_type = CSVContentTypeField( + queryset=ContentType.objects.filter(model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES), + required=False, + label=_('Termination type (app & model)') ) @@ -145,9 +139,12 @@ class CircuitTerminationImportRelatedForm(BaseCircuitTerminationImportForm): class Meta: model = CircuitTermination fields = [ - 'circuit', 'term_side', 'site', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', + 'circuit', 'term_side', 'termination_type', 'termination_id', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description' ] + labels = { + 'termination_id': _('Termination ID'), + } class CircuitTerminationImportForm(NetBoxModelImportForm, BaseCircuitTerminationImportForm): @@ -155,9 +152,12 @@ class CircuitTerminationImportForm(NetBoxModelImportForm, BaseCircuitTermination class Meta: model = CircuitTermination fields = [ - 'circuit', 'term_side', 'site', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', + 'circuit', 'term_side', 'termination_type', 'termination_id', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags' ] + labels = { + 'termination_id': _('Termination ID'), + } class CircuitGroupImportForm(NetBoxModelImportForm): diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index 2e9b358e8..b585ce079 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext as _ from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, CircuitTerminationSideChoices from circuits.models import * -from dcim.models import Region, Site, SiteGroup +from dcim.models import Location, Region, Site, SiteGroup from ipam.models import ASN from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelFilterSetForm @@ -207,18 +207,29 @@ class CircuitTerminationFilterForm(NetBoxModelFilterSetForm): fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('circuit_id', 'term_side', name=_('Circuit')), - FieldSet('provider_id', 'provider_network_id', name=_('Provider')), - FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), + FieldSet('provider_id', name=_('Provider')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Termination')), + ) + region_id = DynamicModelMultipleChoiceField( + queryset=Region.objects.all(), + required=False, + label=_('Region') + ) + site_group_id = DynamicModelMultipleChoiceField( + queryset=SiteGroup.objects.all(), + required=False, + label=_('Site group') ) site_id = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), required=False, - query_params={ - 'region_id': '$region_id', - 'site_group_id': '$site_group_id', - }, label=_('Site') ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) circuit_id = DynamicModelMultipleChoiceField( queryset=Circuit.objects.all(), required=False, diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index e00034a10..10cd06563 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -1,14 +1,19 @@ +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ from circuits.choices import CircuitCommitRateChoices, CircuitTerminationPortSpeedChoices +from circuits.constants import * from circuits.models import * from dcim.models import Site from ipam.models import ASN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm -from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField -from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups -from utilities.forms.widgets import DatePicker, NumberWithOptions +from utilities.forms import get_field_value +from utilities.forms.fields import CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField +from utilities.forms.rendering import FieldSet, InlineFields +from utilities.forms.widgets import DatePicker, HTMXSelect, NumberWithOptions +from utilities.templatetags.builtins.filters import bettertitle __all__ = ( 'CircuitForm', @@ -144,26 +149,24 @@ class CircuitTerminationForm(NetBoxModelForm): queryset=Circuit.objects.all(), selector=True ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), + termination_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES), + widget=HTMXSelect(), required=False, - selector=True + label=_('Termination type') ) - provider_network = DynamicModelChoiceField( - label=_('Provider network'), - queryset=ProviderNetwork.objects.all(), + termination = DynamicModelChoiceField( + label=_('Termination'), + queryset=Site.objects.none(), # Initial queryset required=False, + disabled=True, selector=True ) fieldsets = ( FieldSet( 'circuit', 'term_side', 'description', 'tags', - TabbedGroups( - FieldSet('site', name=_('Site')), - FieldSet('provider_network', name=_('Provider Network')), - ), + 'termination_type', 'termination', 'mark_connected', name=_('Circuit Termination') ), FieldSet('port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', name=_('Termination Details')), @@ -172,7 +175,7 @@ class CircuitTerminationForm(NetBoxModelForm): class Meta: model = CircuitTermination fields = [ - 'circuit', 'term_side', 'site', 'provider_network', 'mark_connected', 'port_speed', 'upstream_speed', + 'circuit', 'term_side', 'termination_type', 'mark_connected', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'tags', ] widgets = { @@ -184,6 +187,36 @@ class CircuitTerminationForm(NetBoxModelForm): ), } + def __init__(self, *args, **kwargs): + instance = kwargs.get('instance') + initial = kwargs.get('initial', {}) + + if instance is not None and instance.termination: + initial['termination'] = instance.termination + kwargs['initial'] = initial + + super().__init__(*args, **kwargs) + + if termination_type_id := get_field_value(self, 'termination_type'): + try: + termination_type = ContentType.objects.get(pk=termination_type_id) + model = termination_type.model_class() + self.fields['termination'].queryset = model.objects.all() + self.fields['termination'].widget.attrs['selector'] = model._meta.label_lower + self.fields['termination'].disabled = False + self.fields['termination'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass + + if self.instance and termination_type_id != self.instance.termination_type_id: + self.initial['termination'] = None + + def clean(self): + super().clean() + + # Assign the selected termination (if any) + self.instance.termination = self.cleaned_data.get('termination') + class CircuitGroupForm(TenancyForm, NetBoxModelForm): slug = SlugField() diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py index 45f0d065d..b52f9d18d 100644 --- a/netbox/circuits/graphql/types.py +++ b/netbox/circuits/graphql/types.py @@ -1,4 +1,4 @@ -from typing import Annotated, List +from typing import Annotated, List, Union import strawberry import strawberry_django @@ -59,13 +59,21 @@ class ProviderNetworkType(NetBoxObjectType): @strawberry_django.type( models.CircuitTermination, - fields='__all__', + exclude=('termination_type', 'termination_id', '_location', '_region', '_site', '_site_group', '_provider_network'), filters=CircuitTerminationFilter ) class CircuitTerminationType(CustomFieldsMixin, TagsMixin, CabledObjectMixin, ObjectType): circuit: Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')] - provider_network: Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')] | None - site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')] | None + + @strawberry_django.field + def termination(self) -> Annotated[Union[ + Annotated["LocationType", strawberry.lazy('dcim.graphql.types')], + Annotated["RegionType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteType", strawberry.lazy('dcim.graphql.types')], + Annotated["ProviderNetworkType", strawberry.lazy('circuits.graphql.types')], + ], strawberry.union("CircuitTerminationTerminationType")] | None: + return self.termination @strawberry_django.type( diff --git a/netbox/circuits/migrations/0047_circuittermination__termination.py b/netbox/circuits/migrations/0047_circuittermination__termination.py new file mode 100644 index 000000000..cb2c9ca07 --- /dev/null +++ b/netbox/circuits/migrations/0047_circuittermination__termination.py @@ -0,0 +1,56 @@ +import django.db.models.deletion +from django.db import migrations, models + + +def copy_site_assignments(apps, schema_editor): + """ + Copy site ForeignKey values to the Termination GFK. + """ + ContentType = apps.get_model('contenttypes', 'ContentType') + CircuitTermination = apps.get_model('circuits', 'CircuitTermination') + Site = apps.get_model('dcim', 'Site') + + CircuitTermination.objects.filter(site__isnull=False).update( + termination_type=ContentType.objects.get_for_model(Site), + termination_id=models.F('site_id') + ) + + ProviderNetwork = apps.get_model('circuits', 'ProviderNetwork') + CircuitTermination.objects.filter(provider_network__isnull=False).update( + termination_type=ContentType.objects.get_for_model(ProviderNetwork), + termination_id=models.F('provider_network_id') + ) + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0046_charfield_null_choices'), + ('contenttypes', '0002_remove_content_type_name'), + ('dcim', '0193_poweroutlet_color'), + ] + + operations = [ + migrations.AddField( + model_name='circuittermination', + name='termination_id', + field=models.PositiveBigIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='circuittermination', + name='termination_type', + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location', 'providernetwork'))), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + + # Copy over existing site assignments + migrations.RunPython( + code=copy_site_assignments, + reverse_code=migrations.RunPython.noop + ), + ] diff --git a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py new file mode 100644 index 000000000..628579228 --- /dev/null +++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py @@ -0,0 +1,90 @@ +# Generated by Django 5.0.9 on 2024-10-21 17:34 +import django.db.models.deletion +from django.db import migrations, models + + +def populate_denormalized_fields(apps, schema_editor): + """ + Copy site ForeignKey values to the Termination GFK. + """ + CircuitTermination = apps.get_model('circuits', 'CircuitTermination') + + terminations = CircuitTermination.objects.filter(site__isnull=False).prefetch_related('site') + for termination in terminations: + termination._region_id = termination.site.region_id + termination._site_group_id = termination.site.group_id + termination._site_id = termination.site_id + # Note: Location cannot be set prior to migration + + CircuitTermination.objects.bulk_update(terminations, ['_region', '_site_group', '_site']) + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0047_circuittermination__termination'), + ] + + operations = [ + migrations.AddField( + model_name='circuittermination', + name='_location', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='circuit_terminations', + to='dcim.location', + ), + ), + migrations.AddField( + model_name='circuittermination', + name='_region', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='circuit_terminations', + to='dcim.region', + ), + ), + migrations.AddField( + model_name='circuittermination', + name='_site', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='circuit_terminations', + to='dcim.site', + ), + ), + migrations.AddField( + model_name='circuittermination', + name='_site_group', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='circuit_terminations', + to='dcim.sitegroup', + ), + ), + + # Populate denormalized FK values + migrations.RunPython( + code=populate_denormalized_fields, + reverse_code=migrations.RunPython.noop + ), + + # Delete the site ForeignKey + migrations.RemoveField( + model_name='circuittermination', + name='site', + ), + migrations.RenameField( + model_name='circuittermination', + old_name='provider_network', + new_name='_provider_network', + ), + ] diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index 5f749550c..85b22eaa5 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -1,9 +1,13 @@ +from django.apps import apps +from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import ValidationError from django.db import models +from django.db.models import Q from django.urls import reverse from django.utils.translation import gettext_lazy as _ from circuits.choices import * +from circuits.constants import * from dcim.models import CabledObjectModel from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel from netbox.models.mixins import DistanceMixin @@ -230,22 +234,24 @@ class CircuitTermination( term_side = models.CharField( max_length=1, choices=CircuitTerminationSideChoices, - verbose_name=_('termination') + verbose_name=_('termination side') ) - site = models.ForeignKey( - to='dcim.Site', + termination_type = models.ForeignKey( + to='contenttypes.ContentType', on_delete=models.PROTECT, - related_name='circuit_terminations', + limit_choices_to=Q(model__in=CIRCUIT_TERMINATION_TERMINATION_TYPES), + related_name='+', blank=True, null=True ) - provider_network = models.ForeignKey( - to='circuits.ProviderNetwork', - on_delete=models.PROTECT, - related_name='circuit_terminations', + termination_id = models.PositiveBigIntegerField( blank=True, null=True ) + termination = GenericForeignKey( + ct_field='termination_type', + fk_field='termination_id' + ) port_speed = models.PositiveIntegerField( verbose_name=_('port speed (Kbps)'), blank=True, @@ -276,6 +282,43 @@ class CircuitTermination( blank=True ) + # Cached associations to enable efficient filtering + _provider_network = models.ForeignKey( + to='circuits.ProviderNetwork', + on_delete=models.PROTECT, + related_name='circuit_terminations', + blank=True, + null=True + ) + _location = models.ForeignKey( + to='dcim.Location', + on_delete=models.CASCADE, + related_name='circuit_terminations', + blank=True, + null=True + ) + _site = models.ForeignKey( + to='dcim.Site', + on_delete=models.CASCADE, + related_name='circuit_terminations', + blank=True, + null=True + ) + _region = models.ForeignKey( + to='dcim.Region', + on_delete=models.CASCADE, + related_name='circuit_terminations', + blank=True, + null=True + ) + _site_group = models.ForeignKey( + to='dcim.SiteGroup', + on_delete=models.CASCADE, + related_name='circuit_terminations', + blank=True, + null=True + ) + class Meta: ordering = ['circuit', 'term_side'] constraints = ( @@ -297,10 +340,35 @@ class CircuitTermination( super().clean() # Must define either site *or* provider network - if self.site is None and self.provider_network is None: - raise ValidationError(_("A circuit termination must attach to either a site or a provider network.")) - if self.site and self.provider_network: - raise ValidationError(_("A circuit termination cannot attach to both a site and a provider network.")) + if self.termination is None: + raise ValidationError(_("A circuit termination must attach to termination.")) + + def save(self, *args, **kwargs): + # Cache objects associated with the terminating object (for filtering) + self.cache_related_objects() + + super().save(*args, **kwargs) + + def cache_related_objects(self): + self._provider_network = self._region = self._site_group = self._site = self._location = None + if self.termination_type: + termination_type = self.termination_type.model_class() + if termination_type == apps.get_model('dcim', 'region'): + self._region = self.termination + elif termination_type == apps.get_model('dcim', 'sitegroup'): + self._site_group = self.termination + elif termination_type == apps.get_model('dcim', 'site'): + self._region = self.termination.region + self._site_group = self.termination.group + self._site = self.termination + elif termination_type == apps.get_model('dcim', 'location'): + self._region = self.termination.site.region + self._site_group = self.termination.site.group + self._site = self.termination.site + self._location = self.termination + elif termination_type == apps.get_model('circuits', 'providernetwork'): + self._provider_network = self.termination + cache_related_objects.alters_data = True def to_objectchange(self, action): objectchange = super().to_objectchange(action) @@ -314,7 +382,7 @@ class CircuitTermination( def get_peer_termination(self): peer_side = 'Z' if self.term_side == 'A' else 'A' try: - return CircuitTermination.objects.prefetch_related('site').get( + return CircuitTermination.objects.prefetch_related('termination').get( circuit=self.circuit, term_side=peer_side ) diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py index e79212a14..ab9c661e6 100644 --- a/netbox/circuits/tables/circuits.py +++ b/netbox/circuits/tables/circuits.py @@ -18,10 +18,8 @@ __all__ = ( CIRCUITTERMINATION_LINK = """ -{% if value.site %} - {{ value.site }} -{% elif value.provider_network %} - {{ value.provider_network }} +{% if value.termination %} + {{ value.termination }} {% endif %} """ @@ -63,12 +61,12 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): verbose_name=_('Account') ) status = columns.ChoiceFieldColumn() - termination_a = tables.TemplateColumn( + termination_a = columns.TemplateColumn( template_code=CIRCUITTERMINATION_LINK, orderable=False, verbose_name=_('Side A') ) - termination_z = tables.TemplateColumn( + termination_z = columns.TemplateColumn( template_code=CIRCUITTERMINATION_LINK, orderable=False, verbose_name=_('Side Z') @@ -110,22 +108,54 @@ class CircuitTerminationTable(NetBoxTable): linkify=True, accessor='circuit.provider' ) + term_side = tables.Column( + verbose_name=_('Side') + ) + termination_type = columns.ContentTypeColumn( + verbose_name=_('Termination Type'), + ) + termination = tables.Column( + verbose_name=_('Termination Point'), + linkify=True + ) + + # Termination types site = tables.Column( verbose_name=_('Site'), - linkify=True + linkify=True, + accessor='_site' + ) + site_group = tables.Column( + verbose_name=_('Site Group'), + linkify=True, + accessor='_sitegroup' + ) + region = tables.Column( + verbose_name=_('Region'), + linkify=True, + accessor='_region' + ) + location = tables.Column( + verbose_name=_('Location'), + linkify=True, + accessor='_location' ) provider_network = tables.Column( verbose_name=_('Provider Network'), - linkify=True + linkify=True, + accessor='_provider_network' ) class Meta(NetBoxTable.Meta): model = CircuitTermination fields = ( - 'pk', 'id', 'circuit', 'provider', 'term_side', 'site', 'provider_network', 'port_speed', 'upstream_speed', - 'xconnect_id', 'pp_info', 'description', 'created', 'last_updated', 'actions', + 'pk', 'id', 'circuit', 'provider', 'term_side', 'termination_type', 'termination', 'site_group', 'region', + 'site', 'location', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', + 'description', 'created', 'last_updated', 'actions', + ) + default_columns = ( + 'pk', 'id', 'circuit', 'provider', 'term_side', 'termination_type', 'termination', 'description', ) - default_columns = ('pk', 'id', 'circuit', 'provider', 'term_side', 'description') class CircuitGroupTable(NetBoxTable): diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 1edcd531b..1b2e9f3f8 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -181,10 +181,10 @@ class CircuitTerminationTest(APIViewTestCases.APIViewTestCase): Circuit.objects.bulk_create(circuits) circuit_terminations = ( - CircuitTermination(circuit=circuits[0], term_side=SIDE_A, site=sites[0]), - CircuitTermination(circuit=circuits[0], term_side=SIDE_Z, provider_network=provider_networks[0]), - CircuitTermination(circuit=circuits[1], term_side=SIDE_A, site=sites[1]), - CircuitTermination(circuit=circuits[1], term_side=SIDE_Z, provider_network=provider_networks[1]), + CircuitTermination(circuit=circuits[0], term_side=SIDE_A, termination=sites[0]), + CircuitTermination(circuit=circuits[0], term_side=SIDE_Z, termination=provider_networks[0]), + CircuitTermination(circuit=circuits[1], term_side=SIDE_A, termination=sites[1]), + CircuitTermination(circuit=circuits[1], term_side=SIDE_Z, termination=provider_networks[1]), ) CircuitTermination.objects.bulk_create(circuit_terminations) @@ -192,13 +192,15 @@ class CircuitTerminationTest(APIViewTestCases.APIViewTestCase): { 'circuit': circuits[2].pk, 'term_side': SIDE_A, - 'site': sites[0].pk, + 'termination_type': 'dcim.site', + 'termination_id': sites[0].pk, 'port_speed': 200000, }, { 'circuit': circuits[2].pk, 'term_side': SIDE_Z, - 'provider_network': provider_networks[0].pk, + 'termination_type': 'circuits.providernetwork', + 'termination_id': provider_networks[0].pk, 'port_speed': 200000, }, ] diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index 93958298c..0dbc7172b 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -70,10 +70,12 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests): ) Circuit.objects.bulk_create(circuits) - CircuitTermination.objects.bulk_create(( - CircuitTermination(circuit=circuits[0], site=sites[0], term_side='A'), - CircuitTermination(circuit=circuits[1], site=sites[0], term_side='A'), - )) + circuit_terminations = ( + CircuitTermination(circuit=circuits[0], termination=sites[0], term_side='A'), + CircuitTermination(circuit=circuits[1], termination=sites[0], term_side='A'), + ) + for ct in circuit_terminations: + ct.save() def test_q(self): params = {'q': 'foobar1'} @@ -233,14 +235,15 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): Circuit.objects.bulk_create(circuits) circuit_terminations = (( - CircuitTermination(circuit=circuits[0], site=sites[0], term_side='A'), - CircuitTermination(circuit=circuits[1], site=sites[1], term_side='A'), - CircuitTermination(circuit=circuits[2], site=sites[2], term_side='A'), - CircuitTermination(circuit=circuits[3], provider_network=provider_networks[0], term_side='A'), - CircuitTermination(circuit=circuits[4], provider_network=provider_networks[1], term_side='A'), - CircuitTermination(circuit=circuits[5], provider_network=provider_networks[2], term_side='A'), + CircuitTermination(circuit=circuits[0], termination=sites[0], term_side='A'), + CircuitTermination(circuit=circuits[1], termination=sites[1], term_side='A'), + CircuitTermination(circuit=circuits[2], termination=sites[2], term_side='A'), + CircuitTermination(circuit=circuits[3], termination=provider_networks[0], term_side='A'), + CircuitTermination(circuit=circuits[4], termination=provider_networks[1], term_side='A'), + CircuitTermination(circuit=circuits[5], termination=provider_networks[2], term_side='A'), )) - CircuitTermination.objects.bulk_create(circuit_terminations) + for ct in circuit_terminations: + ct.save() def test_q(self): params = {'q': 'foobar1'} @@ -384,18 +387,19 @@ class CircuitTerminationTestCase(TestCase, ChangeLoggedFilterSetTests): Circuit.objects.bulk_create(circuits) circuit_terminations = (( - CircuitTermination(circuit=circuits[0], site=sites[0], term_side='A', port_speed=1000, upstream_speed=1000, xconnect_id='ABC', description='foobar1'), - CircuitTermination(circuit=circuits[0], site=sites[1], term_side='Z', port_speed=1000, upstream_speed=1000, xconnect_id='DEF', description='foobar2'), - CircuitTermination(circuit=circuits[1], site=sites[1], term_side='A', port_speed=2000, upstream_speed=2000, xconnect_id='GHI'), - CircuitTermination(circuit=circuits[1], site=sites[2], term_side='Z', port_speed=2000, upstream_speed=2000, xconnect_id='JKL'), - CircuitTermination(circuit=circuits[2], site=sites[2], term_side='A', port_speed=3000, upstream_speed=3000, xconnect_id='MNO'), - CircuitTermination(circuit=circuits[2], site=sites[0], term_side='Z', port_speed=3000, upstream_speed=3000, xconnect_id='PQR'), - CircuitTermination(circuit=circuits[3], provider_network=provider_networks[0], term_side='A'), - CircuitTermination(circuit=circuits[4], provider_network=provider_networks[1], term_side='A'), - CircuitTermination(circuit=circuits[5], provider_network=provider_networks[2], term_side='A'), - CircuitTermination(circuit=circuits[6], provider_network=provider_networks[0], term_side='A', mark_connected=True), + CircuitTermination(circuit=circuits[0], termination=sites[0], term_side='A', port_speed=1000, upstream_speed=1000, xconnect_id='ABC', description='foobar1'), + CircuitTermination(circuit=circuits[0], termination=sites[1], term_side='Z', port_speed=1000, upstream_speed=1000, xconnect_id='DEF', description='foobar2'), + CircuitTermination(circuit=circuits[1], termination=sites[1], term_side='A', port_speed=2000, upstream_speed=2000, xconnect_id='GHI'), + CircuitTermination(circuit=circuits[1], termination=sites[2], term_side='Z', port_speed=2000, upstream_speed=2000, xconnect_id='JKL'), + CircuitTermination(circuit=circuits[2], termination=sites[2], term_side='A', port_speed=3000, upstream_speed=3000, xconnect_id='MNO'), + CircuitTermination(circuit=circuits[2], termination=sites[0], term_side='Z', port_speed=3000, upstream_speed=3000, xconnect_id='PQR'), + CircuitTermination(circuit=circuits[3], termination=provider_networks[0], term_side='A'), + CircuitTermination(circuit=circuits[4], termination=provider_networks[1], term_side='A'), + CircuitTermination(circuit=circuits[5], termination=provider_networks[2], term_side='A'), + CircuitTermination(circuit=circuits[6], termination=provider_networks[0], term_side='A', mark_connected=True), )) - CircuitTermination.objects.bulk_create(circuit_terminations) + for ct in circuit_terminations: + ct.save() Cable(a_terminations=[circuit_terminations[0]], b_terminations=[circuit_terminations[1]]).save() diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index b06ade30b..a87e327af 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -1,5 +1,6 @@ import datetime +from django.contrib.contenttypes.models import ContentType from django.test import override_settings from django.urls import reverse @@ -190,27 +191,31 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase): @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[]) def test_bulk_import_objects_with_terminations(self): - json_data = """ + site = Site.objects.first() + json_data = f""" [ - { + {{ "cid": "Circuit 7", "provider": "Provider 1", "type": "Circuit Type 1", "status": "active", "description": "Testing Import", "terminations": [ - { + {{ "term_side": "A", - "site": "Site 1" - }, - { + "termination_type": "dcim.site", + "termination_id": "{site.pk}" + }}, + {{ "term_side": "Z", - "site": "Site 1" - } + "termination_type": "dcim.site", + "termination_id": "{site.pk}" + }} ] - } + }} ] """ + initial_count = self._get_queryset().count() data = { 'data': json_data, @@ -336,7 +341,7 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase): } -class CircuitTerminationTestCase(ViewTestCases.PrimaryObjectViewTestCase): +class TestCase(ViewTestCases.PrimaryObjectViewTestCase): model = CircuitTermination @classmethod @@ -359,24 +364,27 @@ class CircuitTerminationTestCase(ViewTestCases.PrimaryObjectViewTestCase): Circuit.objects.bulk_create(circuits) circuit_terminations = ( - CircuitTermination(circuit=circuits[0], term_side='A', site=sites[0]), - CircuitTermination(circuit=circuits[0], term_side='Z', site=sites[1]), - CircuitTermination(circuit=circuits[1], term_side='A', site=sites[0]), - CircuitTermination(circuit=circuits[1], term_side='Z', site=sites[1]), + CircuitTermination(circuit=circuits[0], term_side='A', termination=sites[0]), + CircuitTermination(circuit=circuits[0], term_side='Z', termination=sites[1]), + CircuitTermination(circuit=circuits[1], term_side='A', termination=sites[0]), + CircuitTermination(circuit=circuits[1], term_side='Z', termination=sites[1]), ) - CircuitTermination.objects.bulk_create(circuit_terminations) + for ct in circuit_terminations: + ct.save() cls.form_data = { 'circuit': circuits[2].pk, 'term_side': 'A', - 'site': sites[2].pk, + 'termination_type': ContentType.objects.get_for_model(Site).pk, + 'termination': sites[2].pk, 'description': 'New description', } + site = sites[0].pk cls.csv_data = ( - "circuit,term_side,site,description", - "Circuit 3,A,Site 1,Foo", - "Circuit 3,Z,Site 1,Bar", + "circuit,term_side,termination_type,termination_id,description", + f"Circuit 3,A,dcim.site,{site},Foo", + f"Circuit 3,Z,dcim.site,{site},Bar", ) cls.csv_update_data = ( diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 8218960c9..4059065bf 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -158,7 +158,7 @@ class ProviderNetworkView(GetRelatedModelsMixin, generic.ObjectView): instance, extra=( ( - Circuit.objects.restrict(request.user, 'view').filter(terminations__provider_network=instance), + Circuit.objects.restrict(request.user, 'view').filter(terminations___provider_network=instance), 'provider_network_id', ), ), @@ -257,8 +257,7 @@ class CircuitTypeBulkDeleteView(generic.BulkDeleteView): class CircuitListView(generic.ObjectListView): queryset = Circuit.objects.prefetch_related( - 'tenant__group', 'termination_a__site', 'termination_z__site', - 'termination_a__provider_network', 'termination_z__provider_network', + 'tenant__group', 'termination_a__termination', 'termination_z__termination', ) filterset = filtersets.CircuitFilterSet filterset_form = forms.CircuitFilterForm @@ -298,8 +297,7 @@ class CircuitBulkImportView(generic.BulkImportView): class CircuitBulkEditView(generic.BulkEditView): queryset = Circuit.objects.prefetch_related( - 'termination_a__site', 'termination_z__site', - 'termination_a__provider_network', 'termination_z__provider_network', + 'tenant__group', 'termination_a__termination', 'termination_z__termination', ) filterset = filtersets.CircuitFilterSet table = tables.CircuitTable @@ -308,8 +306,7 @@ class CircuitBulkEditView(generic.BulkEditView): class CircuitBulkDeleteView(generic.BulkDeleteView): queryset = Circuit.objects.prefetch_related( - 'termination_a__site', 'termination_z__site', - 'termination_a__provider_network', 'termination_z__provider_network', + 'tenant__group', 'termination_a__termination', 'termination_z__termination', ) filterset = filtersets.CircuitFilterSet table = tables.CircuitTable diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index db9f3899d..da7a0af25 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -462,6 +462,10 @@ class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, Organi devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] children: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] + @strawberry_django.field + def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + return self.circuit_terminations.all() + @strawberry_django.type( models.Manufacturer, @@ -705,6 +709,10 @@ class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): def parent(self) -> Annotated["RegionType", strawberry.lazy('dcim.graphql.types')] | None: return self.parent + @strawberry_django.field + def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + return self.circuit_terminations.all() + @strawberry_django.type( models.Site, @@ -726,10 +734,13 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] locations: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]] - circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]] clusters: List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]] vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] + @strawberry_django.field + def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + return self.circuit_terminations.all() + @strawberry_django.type( models.SiteGroup, @@ -746,6 +757,10 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): def parent(self) -> Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')] | None: return self.parent + @strawberry_django.field + def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + return self.circuit_terminations.all() + @strawberry_django.type( models.VirtualChassis, diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index 9f47a63d3..744ec025c 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -344,7 +344,7 @@ class CableTermination(ChangeLoggedModel): ) # A CircuitTermination attached to a ProviderNetwork cannot have a Cable - if self.termination_type.model == 'circuittermination' and self.termination.provider_network is not None: + if self.termination_type.model == 'circuittermination' and self.termination._provider_network is not None: raise ValidationError(_("Circuit terminations attached to a provider network may not be cabled.")) def save(self, *args, **kwargs): @@ -690,19 +690,19 @@ class CablePath(models.Model): ).first() if circuit_termination is None: break - elif circuit_termination.provider_network: + elif circuit_termination._provider_network: # Circuit terminates to a ProviderNetwork path.extend([ [object_to_path_node(circuit_termination)], - [object_to_path_node(circuit_termination.provider_network)], + [object_to_path_node(circuit_termination._provider_network)], ]) is_complete = True break - elif circuit_termination.site and not circuit_termination.cable: - # Circuit terminates to a Site + elif circuit_termination.termination and not circuit_termination.cable: + # Circuit terminates to a Region/Site/etc. path.extend([ [object_to_path_node(circuit_termination)], - [object_to_path_node(circuit_termination.site)], + [object_to_path_node(circuit_termination.termination)], ]) break diff --git a/netbox/dcim/tests/test_cablepaths.py b/netbox/dcim/tests/test_cablepaths.py index f7c337bdf..b504d389a 100644 --- a/netbox/dcim/tests/test_cablepaths.py +++ b/netbox/dcim/tests/test_cablepaths.py @@ -1167,7 +1167,7 @@ class CablePathTestCase(TestCase): [IF1] --C1-- [CT1] """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') # Create cable 1 cable1 = Cable( @@ -1198,7 +1198,7 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') interface2 = Interface.objects.create(device=self.device, name='Interface 2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') # Create cable 1 cable1 = Cable( @@ -1214,7 +1214,7 @@ class CablePathTestCase(TestCase): ) # Create CT2 - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') # Check for partial path to site self.assertPathExists( @@ -1266,7 +1266,7 @@ class CablePathTestCase(TestCase): interface2 = Interface.objects.create(device=self.device, name='Interface 2') interface3 = Interface.objects.create(device=self.device, name='Interface 3') interface4 = Interface.objects.create(device=self.device, name='Interface 4') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') # Create cable 1 cable1 = Cable( @@ -1282,7 +1282,7 @@ class CablePathTestCase(TestCase): ) # Create CT2 - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') # Check for partial path to site self.assertPathExists( @@ -1335,8 +1335,8 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') site2 = Site.objects.create(name='Site 2', slug='site-2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=site2, term_side='Z') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=site2, term_side='Z') # Create cable 1 cable1 = Cable( @@ -1365,8 +1365,8 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') providernetwork = ProviderNetwork.objects.create(name='Provider Network 1', provider=self.circuit.provider) - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, provider_network=providernetwork, term_side='Z') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=providernetwork, term_side='Z') # Create cable 1 cable1 = Cable( @@ -1413,8 +1413,8 @@ class CablePathTestCase(TestCase): frontport2_2 = FrontPort.objects.create( device=self.device, name='Front Port 2:2', rear_port=rearport2, rear_port_position=2 ) - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') # Create cables cable1 = Cable( @@ -1499,10 +1499,10 @@ class CablePathTestCase(TestCase): interface1 = Interface.objects.create(device=self.device, name='Interface 1') interface2 = Interface.objects.create(device=self.device, name='Interface 2') circuit2 = Circuit.objects.create(provider=self.circuit.provider, type=self.circuit.type, cid='Circuit 2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, site=self.site, term_side='Z') - circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, site=self.site, term_side='A') - circuittermination4 = CircuitTermination.objects.create(circuit=circuit2, site=self.site, term_side='Z') + circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') + circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, termination=self.site, term_side='A') + circuittermination4 = CircuitTermination.objects.create(circuit=circuit2, termination=self.site, term_side='Z') # Create cables cable1 = Cable( diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 0a6417022..c5ca01db2 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -5135,7 +5135,7 @@ class CableTestCase(TestCase, ChangeLoggedFilterSetTests): provider = Provider.objects.create(name='Provider 1', slug='provider-1') circuit_type = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1') circuit = Circuit.objects.create(cid='Circuit 1', provider=provider, type=circuit_type) - circuit_termination = CircuitTermination.objects.create(circuit=circuit, term_side='A', site=sites[0]) + circuit_termination = CircuitTermination.objects.create(circuit=circuit, term_side='A', termination=sites[0]) # Cables cables = ( @@ -5308,9 +5308,9 @@ class CableTestCase(TestCase, ChangeLoggedFilterSetTests): def test_site(self): site = Site.objects.all()[:2] params = {'site_id': [site[0].pk, site[1].pk]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 12) + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 11) params = {'site': [site[0].slug, site[1].slug]} - self.assertEqual(self.filterset(params, self.queryset).qs.count(), 12) + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 11) def test_tenant(self): tenant = Tenant.objects.all()[:2] diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index c11badbdd..f0fe4da3b 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -762,9 +762,9 @@ class CableTestCase(TestCase): circuittype = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1') circuit1 = Circuit.objects.create(provider=provider, type=circuittype, cid='1') circuit2 = Circuit.objects.create(provider=provider, type=circuittype, cid='2') - CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='A') - CircuitTermination.objects.create(circuit=circuit1, site=site, term_side='Z') - CircuitTermination.objects.create(circuit=circuit2, provider_network=provider_network, term_side='A') + CircuitTermination.objects.create(circuit=circuit1, termination=site, term_side='A') + CircuitTermination.objects.create(circuit=circuit1, termination=site, term_side='Z') + CircuitTermination.objects.create(circuit=circuit2, termination=provider_network, term_side='A') def test_cable_creation(self): """ diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 38c3f68c3..9a821a384 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -242,6 +242,10 @@ class RegionView(GetRelatedModelsMixin, generic.ObjectView): extra=( (Location.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), (Rack.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), + ( + Circuit.objects.restrict(request.user, 'view').filter(terminations___region=instance).distinct(), + 'region_id' + ), ), ), } @@ -324,6 +328,10 @@ class SiteGroupView(GetRelatedModelsMixin, generic.ObjectView): extra=( (Location.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), (Rack.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), + ( + Circuit.objects.restrict(request.user, 'view').filter(terminations___site_group=instance).distinct(), + 'site_group_id' + ), ), ), } @@ -404,8 +412,10 @@ class SiteView(GetRelatedModelsMixin, generic.ObjectView): scope_id=instance.pk ), 'site'), (ASN.objects.restrict(request.user, 'view').filter(sites=instance), 'site_id'), - (Circuit.objects.restrict(request.user, 'view').filter(terminations__site=instance).distinct(), - 'site_id'), + ( + Circuit.objects.restrict(request.user, 'view').filter(terminations___site=instance).distinct(), + 'site_id' + ), ), ), } @@ -475,7 +485,17 @@ class LocationView(GetRelatedModelsMixin, generic.ObjectView): def get_extra_context(self, request, instance): locations = instance.get_descendants(include_self=True) return { - 'related_models': self.get_related_models(request, locations, [CableTermination]), + 'related_models': self.get_related_models( + request, + locations, + [CableTermination], + ( + ( + Circuit.objects.restrict(request.user, 'view').filter(terminations___location=instance).distinct(), + 'location_id' + ), + ), + ), } diff --git a/netbox/templates/circuits/inc/circuit_termination_fields.html b/netbox/templates/circuits/inc/circuit_termination_fields.html index 97d194f24..94c4599b0 100644 --- a/netbox/templates/circuits/inc/circuit_termination_fields.html +++ b/netbox/templates/circuits/inc/circuit_termination_fields.html @@ -1,18 +1,19 @@ {% load helpers %} {% load i18n %} -{% if termination.site %} - {% trans "Site" %} - - {% if termination.site.region %} - {{ termination.site.region|linkify }} / - {% endif %} - {{ termination.site|linkify }} - + {% trans "Termination point" %} + {% if termination.termination %} + + {{ termination.termination|linkify }} +
{% trans termination.termination_type.name|bettertitle %}
+ + {% else %} + {{ ''|placeholder }} + {% endif %} - {% trans "Termination" %} + {% trans "Connection" %} {% if termination.mark_connected %} @@ -57,12 +58,6 @@ {% endif %} -{% else %} - - {% trans "Provider Network" %} - {{ termination.provider_network.provider|linkify }} / {{ termination.provider_network|linkify }} - -{% endif %} {% trans "Speed" %} From 8767fd818610bd5efc48ada5aec0760d26eae467 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 31 Oct 2024 14:17:06 -0400 Subject: [PATCH 022/190] Closes #13428: Q-in-Q VLANs (#17822) * Initial work on #13428 (QinQ) * Misc cleanup; add tests for Q-in-Q fields * Address PR feedback --- docs/models/dcim/interface.md | 4 ++ docs/models/ipam/vlan.md | 8 ++++ docs/models/virtualization/vminterface.md | 4 ++ .../api/serializers_/device_components.py | 9 ++-- netbox/dcim/choices.py | 2 + netbox/dcim/filtersets.py | 6 ++- netbox/dcim/forms/common.py | 2 + netbox/dcim/forms/model_forms.py | 18 ++++++- netbox/dcim/graphql/types.py | 1 + netbox/dcim/migrations/0196_qinq_svlan.py | 28 +++++++++++ netbox/dcim/models/device_components.py | 47 +++++++++++++------ netbox/dcim/tables/devices.py | 16 ++++--- netbox/dcim/tests/test_api.py | 6 +++ netbox/dcim/tests/test_filtersets.py | 29 ++++++++++-- netbox/ipam/api/serializers_/nested.py | 8 ++++ netbox/ipam/api/serializers_/vlans.py | 7 ++- netbox/ipam/choices.py | 11 +++++ netbox/ipam/filtersets.py | 11 +++++ netbox/ipam/forms/bulk_edit.py | 16 ++++++- netbox/ipam/forms/bulk_import.py | 18 ++++++- netbox/ipam/forms/filtersets.py | 12 +++++ netbox/ipam/forms/model_forms.py | 12 ++++- netbox/ipam/graphql/types.py | 6 ++- netbox/ipam/migrations/0075_vlan_qinq.py | 30 ++++++++++++ netbox/ipam/models/vlans.py | 40 +++++++++++++++- netbox/ipam/tables/vlans.py | 9 +++- netbox/ipam/tests/test_api.py | 7 +++ netbox/ipam/tests/test_filtersets.py | 24 ++++++++++ netbox/ipam/tests/test_models.py | 21 +++++++++ netbox/templates/ipam/vlan.html | 31 ++++++++++++ netbox/templates/ipam/vlan_edit.html | 8 ++++ .../api/serializers_/virtualmachines.py | 7 +-- netbox/virtualization/forms/model_forms.py | 20 ++++++-- netbox/virtualization/graphql/types.py | 1 + ...042_vminterface_vlan_translation_policy.py | 2 - .../migrations/0043_qinq_svlan.py | 28 +++++++++++ .../virtualization/models/virtualmachines.py | 14 ------ .../virtualization/tables/virtualmachines.py | 7 +-- netbox/virtualization/tests/test_api.py | 8 ++++ .../virtualization/tests/test_filtersets.py | 24 ++++++++-- 40 files changed, 492 insertions(+), 70 deletions(-) create mode 100644 netbox/dcim/migrations/0196_qinq_svlan.py create mode 100644 netbox/ipam/migrations/0075_vlan_qinq.py create mode 100644 netbox/virtualization/migrations/0043_qinq_svlan.py diff --git a/docs/models/dcim/interface.md b/docs/models/dcim/interface.md index 869cb8510..fb7198682 100644 --- a/docs/models/dcim/interface.md +++ b/docs/models/dcim/interface.md @@ -120,6 +120,10 @@ The "native" (untagged) VLAN for the interface. Valid only when one of the above The tagged VLANs which are configured to be carried by this interface. Valid only for the "tagged" 802.1Q mode above. +### Q-in-Q SVLAN + +The assigned service VLAN (for Q-in-Q/802.1ad interfaces). + ### Wireless Role Indicates the configured role for wireless interfaces (access point or station). diff --git a/docs/models/ipam/vlan.md b/docs/models/ipam/vlan.md index 2dd5ec2d3..dc547ddbc 100644 --- a/docs/models/ipam/vlan.md +++ b/docs/models/ipam/vlan.md @@ -26,3 +26,11 @@ The user-defined functional [role](./role.md) assigned to the VLAN. ### VLAN Group or Site The [VLAN group](./vlangroup.md) or [site](../dcim/site.md) to which the VLAN is assigned. + +### Q-in-Q Role + +For VLANs which comprise a Q-in-Q/IEEE 802.1ad topology, this field indicates whether the VLAN is treated as a service or customer VLAN. + +### Q-in-Q Service VLAN + +The designated parent service VLAN for a Q-in-Q customer VLAN. This may be set only for Q-in-Q custom VLANs. diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md index 1e022b091..4a0c474f9 100644 --- a/docs/models/virtualization/vminterface.md +++ b/docs/models/virtualization/vminterface.md @@ -53,6 +53,10 @@ The "native" (untagged) VLAN for the interface. Valid only when one of the above The tagged VLANs which are configured to be carried by this interface. Valid only for the "tagged" 802.1Q mode above. +### Q-in-Q SVLAN + +The assigned service VLAN (for Q-in-Q/802.1ad interfaces). + ### VRF The [virtual routing and forwarding](../ipam/vrf.md) instance to which this interface is assigned. diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index 3be19bb58..57111c2af 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -196,6 +196,7 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect required=False, many=True ) + qinq_svlan = VLANSerializer(nested=True, required=False, allow_null=True) vlan_translation_policy = VLANTranslationPolicySerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) @@ -223,10 +224,10 @@ class InterfaceSerializer(NetBoxModelSerializer, CabledObjectSerializer, Connect 'id', 'url', 'display_url', 'display', 'device', 'vdcs', 'module', 'name', 'label', 'type', 'enabled', 'parent', 'bridge', 'lag', 'mtu', 'mac_address', 'speed', 'duplex', 'wwn', 'mgmt_only', 'description', 'mode', 'rf_role', 'rf_channel', 'poe_mode', 'poe_type', 'rf_channel_frequency', 'rf_channel_width', - 'tx_power', 'untagged_vlan', 'tagged_vlans', 'mark_connected', 'cable', 'cable_end', 'wireless_link', - 'link_peers', 'link_peers_type', 'wireless_lans', 'vrf', 'l2vpn_termination', 'connected_endpoints', - 'connected_endpoints_type', 'connected_endpoints_reachable', 'tags', 'custom_fields', 'created', - 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', '_occupied', 'vlan_translation_policy' + 'tx_power', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', 'mark_connected', + 'cable', 'cable_end', 'wireless_link', 'link_peers', 'link_peers_type', 'wireless_lans', 'vrf', + 'l2vpn_termination', 'connected_endpoints', 'connected_endpoints_type', 'connected_endpoints_reachable', + 'tags', 'custom_fields', 'created', 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', '_occupied', ] brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', 'cable', '_occupied') diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py index fee587e6b..e1a99e0db 100644 --- a/netbox/dcim/choices.py +++ b/netbox/dcim/choices.py @@ -1258,11 +1258,13 @@ class InterfaceModeChoices(ChoiceSet): MODE_ACCESS = 'access' MODE_TAGGED = 'tagged' MODE_TAGGED_ALL = 'tagged-all' + MODE_Q_IN_Q = 'q-in-q' CHOICES = ( (MODE_ACCESS, _('Access')), (MODE_TAGGED, _('Tagged')), (MODE_TAGGED_ALL, _('Tagged (All)')), + (MODE_Q_IN_Q, _('Q-in-Q (802.1ad)')), ) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index c11a7ef00..0371f882b 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1647,7 +1647,8 @@ class CommonInterfaceFilterSet(django_filters.FilterSet): return queryset return queryset.filter( Q(untagged_vlan_id=value) | - Q(tagged_vlans=value) + Q(tagged_vlans=value) | + Q(qinq_svlan=value) ) def filter_vlan(self, queryset, name, value): @@ -1656,7 +1657,8 @@ class CommonInterfaceFilterSet(django_filters.FilterSet): return queryset return queryset.filter( Q(untagged_vlan_id__vid=value) | - Q(tagged_vlans__vid=value) + Q(tagged_vlans__vid=value) | + Q(qinq_svlan__vid=value) ) diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index 4341ec041..bae7fd222 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -37,6 +37,8 @@ class InterfaceCommonForm(forms.Form): del self.fields['vlan_group'] del self.fields['untagged_vlan'] del self.fields['tagged_vlans'] + if interface_mode != InterfaceModeChoices.MODE_Q_IN_Q: + del self.fields['qinq_svlan'] def clean(self): super().clean() diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 1ab9f138b..2fcdbe5fd 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -7,6 +7,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate +from ipam.choices import VLANQinQRoleChoices from ipam.models import ASN, IPAddress, VLAN, VLANGroup, VLANTranslationPolicy, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm @@ -1372,6 +1373,16 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): 'available_on_device': '$device', } ) + qinq_svlan = DynamicModelMultipleChoiceField( + queryset=VLAN.objects.all(), + required=False, + label=_('Q-in-Q Service VLAN'), + query_params={ + 'group_id': '$vlan_group', + 'available_on_device': '$device', + 'qinq_role': VLANQinQRoleChoices.ROLE_SERVICE, + } + ) vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, @@ -1396,7 +1407,10 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): FieldSet('vdcs', 'mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected', name=_('Operation')), FieldSet('parent', 'bridge', 'lag', name=_('Related Interfaces')), FieldSet('poe_mode', 'poe_type', name=_('PoE')), - FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vlan_translation_policy', name=_('802.1Q Switching')), + FieldSet( + 'mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', + name=_('802.1Q Switching') + ), FieldSet( 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'wireless_lan_group', 'wireless_lans', name=_('Wireless') @@ -1409,7 +1423,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): 'device', 'module', 'vdcs', 'name', 'label', 'type', 'speed', 'duplex', 'enabled', 'parent', 'bridge', 'lag', 'mac_address', 'wwn', 'mtu', 'mgmt_only', 'mark_connected', 'description', 'poe_mode', 'poe_type', 'mode', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'wireless_lans', - 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', 'vlan_translation_policy', + 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', 'vrf', 'tags', ] widgets = { 'speed': NumberWithOptions( diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index da7a0af25..5965fdcec 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -385,6 +385,7 @@ class InterfaceType(IPAddressesMixin, ModularComponentType, CabledObjectMixin, P wireless_link: Annotated["WirelessLinkType", strawberry.lazy('wireless.graphql.types')] | None untagged_vlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vrf: Annotated["VRFType", strawberry.lazy('ipam.graphql.types')] | None + qinq_svlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vlan_translation_policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None vdcs: List[Annotated["VirtualDeviceContextType", strawberry.lazy('dcim.graphql.types')]] diff --git a/netbox/dcim/migrations/0196_qinq_svlan.py b/netbox/dcim/migrations/0196_qinq_svlan.py new file mode 100644 index 000000000..9012d74f3 --- /dev/null +++ b/netbox/dcim/migrations/0196_qinq_svlan.py @@ -0,0 +1,28 @@ +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0195_interface_vlan_translation_policy'), + ('ipam', '0075_vlan_qinq'), + ] + + operations = [ + migrations.AddField( + model_name='interface', + name='qinq_svlan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_svlan', to='ipam.vlan'), + ), + migrations.AlterField( + model_name='interface', + name='tagged_vlans', + field=models.ManyToManyField(blank=True, related_name='%(class)ss_as_tagged', to='ipam.vlan'), + ), + migrations.AlterField( + model_name='interface', + name='untagged_vlan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_as_untagged', to='ipam.vlan'), + ), + ] diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 14f4120b5..36fd02add 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -547,17 +547,48 @@ class BaseInterface(models.Model): blank=True, verbose_name=_('bridge interface') ) + untagged_vlan = models.ForeignKey( + to='ipam.VLAN', + on_delete=models.SET_NULL, + related_name='%(class)ss_as_untagged', + null=True, + blank=True, + verbose_name=_('untagged VLAN') + ) + tagged_vlans = models.ManyToManyField( + to='ipam.VLAN', + related_name='%(class)ss_as_tagged', + blank=True, + verbose_name=_('tagged VLANs') + ) + qinq_svlan = models.ForeignKey( + to='ipam.VLAN', + on_delete=models.SET_NULL, + related_name='%(class)ss_svlan', + null=True, + blank=True, + verbose_name=_('Q-in-Q SVLAN') + ) vlan_translation_policy = models.ForeignKey( to='ipam.VLANTranslationPolicy', on_delete=models.PROTECT, null=True, blank=True, - verbose_name=_('VLAN Translation Policy'), + verbose_name=_('VLAN Translation Policy') ) class Meta: abstract = True + def clean(self): + super().clean() + + # SVLAN can be defined only for Q-in-Q interfaces + if self.qinq_svlan and self.mode != InterfaceModeChoices.MODE_Q_IN_Q: + raise ValidationError({ + 'qinq_svlan': _("Only Q-in-Q interfaces may specify a service VLAN.") + }) + def save(self, *args, **kwargs): # Remove untagged VLAN assignment for non-802.1Q interfaces @@ -697,20 +728,6 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd blank=True, verbose_name=_('wireless LANs') ) - untagged_vlan = models.ForeignKey( - to='ipam.VLAN', - on_delete=models.SET_NULL, - related_name='interfaces_as_untagged', - null=True, - blank=True, - verbose_name=_('untagged VLAN') - ) - tagged_vlans = models.ManyToManyField( - to='ipam.VLAN', - related_name='interfaces_as_tagged', - blank=True, - verbose_name=_('tagged VLANs') - ) vrf = models.ForeignKey( to='ipam.VRF', on_delete=models.SET_NULL, diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index b39a2b87f..fed33401c 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -585,6 +585,10 @@ class BaseInterfaceTable(NetBoxTable): orderable=False, verbose_name=_('Tagged VLANs') ) + qinq_svlan = tables.Column( + verbose_name=_('Q-in-Q SVLAN'), + linkify=True + ) def value_ip_addresses(self, value): return ",".join([str(obj.address) for obj in value.all()]) @@ -635,11 +639,11 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi model = models.Interface fields = ( 'pk', 'id', 'name', 'device', 'module_bay', 'module', 'label', 'enabled', 'type', 'mgmt_only', 'mtu', - 'speed', 'speed_formatted', 'duplex', 'mode', 'mac_address', 'wwn', 'poe_mode', 'poe_type', 'rf_role', 'rf_channel', - 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', - 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', - 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'inventory_items', 'created', - 'last_updated', + 'speed', 'speed_formatted', 'duplex', 'mode', 'mac_address', 'wwn', 'poe_mode', 'poe_type', 'rf_role', + 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', + 'cable', 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', + 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', + 'inventory_items', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'device', 'label', 'enabled', 'type', 'description') @@ -676,7 +680,7 @@ class DeviceInterfaceTable(InterfaceTable): 'mgmt_only', 'mtu', 'mode', 'mac_address', 'wwn', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', - 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'actions', + 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', ) default_columns = ( 'pk', 'name', 'label', 'enabled', 'type', 'parent', 'lag', 'mtu', 'mode', 'description', 'ip_addresses', diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index 1b460cd59..f78722b67 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -7,6 +7,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate +from ipam.choices import VLANQinQRoleChoices from ipam.models import ASN, RIR, VLAN, VRF from netbox.api.serializers import GenericObjectSerializer from tenancy.models import Tenant @@ -1618,6 +1619,7 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase VLAN(name='VLAN 1', vid=1), VLAN(name='VLAN 2', vid=2), VLAN(name='VLAN 3', vid=3), + VLAN(name='SVLAN 1', vid=1001, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), ) VLAN.objects.bulk_create(vlans) @@ -1676,18 +1678,22 @@ class InterfaceTest(Mixins.ComponentTraceMixin, APIViewTestCases.APIViewTestCase 'vdcs': [vdcs[1].pk], 'name': 'Interface 7', 'type': InterfaceTypeChoices.TYPE_80211A, + 'mode': InterfaceModeChoices.MODE_Q_IN_Q, 'tx_power': 10, 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], 'rf_channel': WirelessChannelChoices.CHANNEL_5G_32, + 'qinq_svlan': vlans[3].pk, }, { 'device': device.pk, 'vdcs': [vdcs[1].pk], 'name': 'Interface 8', 'type': InterfaceTypeChoices.TYPE_80211A, + 'mode': InterfaceModeChoices.MODE_Q_IN_Q, 'tx_power': 10, 'wireless_lans': [wireless_lans[0].pk, wireless_lans[1].pk], 'rf_channel': "", + 'qinq_svlan': vlans[3].pk, }, ] diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index c5ca01db2..993c2fa4e 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -4,7 +4,8 @@ from circuits.models import Circuit, CircuitTermination, CircuitType, Provider from dcim.choices import * from dcim.filtersets import * from dcim.models import * -from ipam.models import ASN, IPAddress, RIR, VLANTranslationPolicy, VRF +from ipam.choices import VLANQinQRoleChoices +from ipam.models import ASN, IPAddress, RIR, VLAN, VLANTranslationPolicy, VRF from netbox.choices import ColorChoices, WeightUnitChoices from tenancy.models import Tenant, TenantGroup from users.models import User @@ -3520,7 +3521,7 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilterSetTests): queryset = Interface.objects.all() filterset = InterfaceFilterSet - ignore_fields = ('tagged_vlans', 'untagged_vlan', 'vdcs') + ignore_fields = ('tagged_vlans', 'untagged_vlan', 'qinq_svlan', 'vdcs') @classmethod def setUpTestData(cls): @@ -3669,6 +3670,13 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil ) VirtualDeviceContext.objects.bulk_create(vdcs) + vlans = ( + VLAN(name='SVLAN 1', vid=1001, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(name='SVLAN 2', vid=1002, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(name='SVLAN 3', vid=1003, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + ) + VLAN.objects.bulk_create(vlans) + vlan_translation_policies = ( VLANTranslationPolicy(name='Policy 1'), VLANTranslationPolicy(name='Policy 2'), @@ -3753,6 +3761,8 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil duplex='full', poe_mode=InterfacePoEModeChoices.MODE_PD, poe_type=InterfacePoETypeChoices.TYPE_2_8023AT, + mode=InterfaceModeChoices.MODE_Q_IN_Q, + qinq_svlan=vlans[0], vlan_translation_policy=vlan_translation_policies[1], ), Interface( @@ -3762,7 +3772,9 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil type=InterfaceTypeChoices.TYPE_OTHER, enabled=True, mgmt_only=True, - tx_power=40 + tx_power=40, + mode=InterfaceModeChoices.MODE_Q_IN_Q, + qinq_svlan=vlans[1] ), Interface( device=devices[4], @@ -3771,7 +3783,9 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil type=InterfaceTypeChoices.TYPE_OTHER, enabled=False, mgmt_only=False, - tx_power=40 + tx_power=40, + mode=InterfaceModeChoices.MODE_Q_IN_Q, + qinq_svlan=vlans[2] ), Interface( device=devices[4], @@ -4027,6 +4041,13 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil params = {'vdc_identifier': vdc.values_list('identifier', flat=True)} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) + def test_vlan(self): + vlan = VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE).first() + params = {'vlan_id': vlan.pk} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + params = {'vlan': vlan.vid} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + def test_vlan_translation_policy(self): vlan_translation_policies = VLANTranslationPolicy.objects.all()[:2] params = {'vlan_translation_policy_id': [vlan_translation_policies[0].pk, vlan_translation_policies[1].pk]} diff --git a/netbox/ipam/api/serializers_/nested.py b/netbox/ipam/api/serializers_/nested.py index 5297565bb..b56b15984 100644 --- a/netbox/ipam/api/serializers_/nested.py +++ b/netbox/ipam/api/serializers_/nested.py @@ -6,6 +6,7 @@ from ..field_serializers import IPAddressField __all__ = ( 'NestedIPAddressSerializer', + 'NestedVLANSerializer', ) @@ -16,3 +17,10 @@ class NestedIPAddressSerializer(WritableNestedSerializer): class Meta: model = models.IPAddress fields = ['id', 'url', 'display_url', 'display', 'family', 'address'] + + +class NestedVLANSerializer(WritableNestedSerializer): + + class Meta: + model = models.VLAN + fields = ['id', 'url', 'display', 'vid', 'name', 'description'] diff --git a/netbox/ipam/api/serializers_/vlans.py b/netbox/ipam/api/serializers_/vlans.py index ee06357a5..05fdd5813 100644 --- a/netbox/ipam/api/serializers_/vlans.py +++ b/netbox/ipam/api/serializers_/vlans.py @@ -11,6 +11,7 @@ from netbox.api.serializers import NetBoxModelSerializer from tenancy.api.serializers_.tenants import TenantSerializer from utilities.api import get_serializer_for_model from vpn.api.serializers_.l2vpn import L2VPNTerminationSerializer +from .nested import NestedVLANSerializer from .roles import RoleSerializer __all__ = ( @@ -64,6 +65,8 @@ class VLANSerializer(NetBoxModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) status = ChoiceField(choices=VLANStatusChoices, required=False) role = RoleSerializer(nested=True, required=False, allow_null=True) + qinq_role = ChoiceField(choices=VLANQinQRoleChoices, required=False) + qinq_svlan = NestedVLANSerializer(required=False, allow_null=True, default=None) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) # Related object counts @@ -73,8 +76,8 @@ class VLANSerializer(NetBoxModelSerializer): model = VLAN fields = [ 'id', 'url', 'display_url', 'display', 'site', 'group', 'vid', 'name', 'tenant', 'status', 'role', - 'description', 'comments', 'l2vpn_termination', 'tags', 'custom_fields', 'created', 'last_updated', - 'prefix_count', + 'description', 'qinq_role', 'qinq_svlan', 'comments', 'l2vpn_termination', 'tags', 'custom_fields', + 'created', 'last_updated', 'prefix_count', ] brief_fields = ('id', 'url', 'display', 'vid', 'name', 'description') diff --git a/netbox/ipam/choices.py b/netbox/ipam/choices.py index 017fd0430..4d9c0bdd4 100644 --- a/netbox/ipam/choices.py +++ b/netbox/ipam/choices.py @@ -157,6 +157,17 @@ class VLANStatusChoices(ChoiceSet): ] +class VLANQinQRoleChoices(ChoiceSet): + + ROLE_SERVICE = 's-vlan' + ROLE_CUSTOMER = 'c-vlan' + + CHOICES = [ + (ROLE_SERVICE, _('Service'), 'blue'), + (ROLE_CUSTOMER, _('Customer'), 'orange'), + ] + + # # Services # diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 017a34ac4..88c869a50 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -1041,6 +1041,17 @@ class VLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): queryset=VirtualMachine.objects.all(), method='get_for_virtualmachine' ) + qinq_role = django_filters.MultipleChoiceFilter( + choices=VLANQinQRoleChoices + ) + qinq_svlan_id = django_filters.ModelMultipleChoiceFilter( + queryset=VLAN.objects.all(), + label=_('Q-in-Q SVLAN (ID)'), + ) + qinq_svlan_vid = MultiValueNumberFilter( + field_name='qinq_svlan__vid', + label=_('Q-in-Q SVLAN number (1-4094)'), + ) l2vpn_id = django_filters.ModelMultipleChoiceFilter( field_name='l2vpn_terminations__l2vpn', queryset=L2VPN.objects.all(), diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index 49a79623c..c323a41c1 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -527,15 +527,29 @@ class VLANBulkEditForm(NetBoxModelBulkEditForm): max_length=200, required=False ) + qinq_role = forms.ChoiceField( + label=_('Q-in-Q role'), + choices=add_blank_choice(VLANQinQRoleChoices), + required=False + ) + qinq_svlan = DynamicModelChoiceField( + label=_('Q-in-Q SVLAN'), + queryset=VLAN.objects.all(), + required=False, + query_params={ + 'qinq_role': VLANQinQRoleChoices.ROLE_SERVICE, + } + ) comments = CommentField() model = VLAN fieldsets = ( FieldSet('status', 'role', 'tenant', 'description'), + FieldSet('qinq_role', 'qinq_svlan', name=_('Q-in-Q')), FieldSet('region', 'site_group', 'site', 'group', name=_('Site & Group')), ) nullable_fields = ( - 'site', 'group', 'tenant', 'role', 'description', 'comments', + 'site', 'group', 'tenant', 'role', 'description', 'qinq_role', 'qinq_svlan', 'comments', ) diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index cd34a6d84..3be4ccc59 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -461,10 +461,26 @@ class VLANImportForm(NetBoxModelImportForm): to_field_name='name', help_text=_('Functional role') ) + qinq_role = CSVChoiceField( + label=_('Q-in-Q role'), + choices=VLANStatusChoices, + required=False, + help_text=_('Operational status') + ) + qinq_svlan = CSVModelChoiceField( + label=_('Q-in-Q SVLAN'), + queryset=VLAN.objects.all(), + required=False, + to_field_name='vid', + help_text=_("Service VLAN (for Q-in-Q/802.1ad customer VLANs)") + ) class Meta: model = VLAN - fields = ('site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description', 'comments', 'tags') + fields = ( + 'site', 'group', 'vid', 'name', 'tenant', 'status', 'role', 'description', 'qinq_role', 'qinq_svlan', + 'comments', 'tags', + ) class VLANTranslationPolicyImportForm(NetBoxModelImportForm): diff --git a/netbox/ipam/forms/filtersets.py b/netbox/ipam/forms/filtersets.py index b9bee6d97..3f951512b 100644 --- a/netbox/ipam/forms/filtersets.py +++ b/netbox/ipam/forms/filtersets.py @@ -506,6 +506,7 @@ class VLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): FieldSet('q', 'filter_id', 'tag'), FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), FieldSet('group_id', 'status', 'role_id', 'vid', 'l2vpn_id', name=_('Attributes')), + FieldSet('qinq_role', 'qinq_svlan_id', name=_('Q-in-Q/802.1ad')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), ) selector_fields = ('filter_id', 'q', 'site_id') @@ -552,6 +553,17 @@ class VLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): required=False, label=_('VLAN ID') ) + qinq_role = forms.MultipleChoiceField( + label=_('Q-in-Q role'), + choices=VLANQinQRoleChoices, + required=False + ) + qinq_svlan_id = DynamicModelMultipleChoiceField( + queryset=VLAN.objects.all(), + required=False, + null_option='None', + label=_('Q-in-Q SVLAN') + ) l2vpn_id = DynamicModelMultipleChoiceField( queryset=L2VPN.objects.all(), required=False, diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 629c1a481..3d0cd3dd1 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -683,13 +683,21 @@ class VLANForm(TenancyForm, NetBoxModelForm): queryset=Role.objects.all(), required=False ) + qinq_svlan = DynamicModelChoiceField( + label=_('Q-in-Q SVLAN'), + queryset=VLAN.objects.all(), + required=False, + query_params={ + 'qinq_role': VLANQinQRoleChoices.ROLE_SERVICE, + } + ) comments = CommentField() class Meta: model = VLAN fields = [ - 'site', 'group', 'vid', 'name', 'status', 'role', 'tenant_group', 'tenant', 'description', 'comments', - 'tags', + 'site', 'group', 'vid', 'name', 'status', 'role', 'tenant_group', 'tenant', 'qinq_role', 'qinq_svlan', + 'description', 'comments', 'tags', ] diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index ef50138c2..2ef63cf0c 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -236,7 +236,7 @@ class ServiceTemplateType(NetBoxObjectType): @strawberry_django.type( models.VLAN, - fields='__all__', + exclude=('qinq_svlan',), filters=VLANFilter ) class VLANType(NetBoxObjectType): @@ -252,6 +252,10 @@ class VLANType(NetBoxObjectType): interfaces_as_tagged: List[Annotated["InterfaceType", strawberry.lazy('dcim.graphql.types')]] vminterfaces_as_tagged: List[Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')]] + @strawberry_django.field + def qinq_svlan(self) -> Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None: + return self.qinq_svlan + @strawberry_django.type( models.VLANGroup, diff --git a/netbox/ipam/migrations/0075_vlan_qinq.py b/netbox/ipam/migrations/0075_vlan_qinq.py new file mode 100644 index 000000000..8a3b8a39a --- /dev/null +++ b/netbox/ipam/migrations/0075_vlan_qinq.py @@ -0,0 +1,30 @@ +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), + ] + + operations = [ + migrations.AddField( + model_name='vlan', + name='qinq_role', + field=models.CharField(blank=True, max_length=50, null=True), + ), + migrations.AddField( + model_name='vlan', + name='qinq_svlan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='qinq_cvlans', to='ipam.vlan'), + ), + migrations.AddConstraint( + model_name='vlan', + constraint=models.UniqueConstraint(fields=('qinq_svlan', 'vid'), name='ipam_vlan_unique_qinq_svlan_vid'), + ), + migrations.AddConstraint( + model_name='vlan', + constraint=models.UniqueConstraint(fields=('qinq_svlan', 'name'), name='ipam_vlan_unique_qinq_svlan_name'), + ), + ] diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index ff8394839..7832cfc67 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -204,6 +204,21 @@ class VLAN(PrimaryModel): null=True, help_text=_("The primary function of this VLAN") ) + qinq_svlan = models.ForeignKey( + to='self', + on_delete=models.PROTECT, + related_name='qinq_cvlans', + blank=True, + null=True + ) + qinq_role = models.CharField( + verbose_name=_('Q-in-Q role'), + max_length=50, + choices=VLANQinQRoleChoices, + blank=True, + null=True, + help_text=_("Customer/service VLAN designation (for Q-in-Q/IEEE 802.1ad)") + ) l2vpn_terminations = GenericRelation( to='vpn.L2VPNTermination', content_type_field='assigned_object_type', @@ -214,7 +229,7 @@ class VLAN(PrimaryModel): objects = VLANQuerySet.as_manager() clone_fields = [ - 'site', 'group', 'tenant', 'status', 'role', 'description', + 'site', 'group', 'tenant', 'status', 'role', 'description', 'qinq_role', 'qinq_svlan', ] class Meta: @@ -228,6 +243,14 @@ class VLAN(PrimaryModel): fields=('group', 'name'), name='%(app_label)s_%(class)s_unique_group_name' ), + models.UniqueConstraint( + fields=('qinq_svlan', 'vid'), + name='%(app_label)s_%(class)s_unique_qinq_svlan_vid' + ), + models.UniqueConstraint( + fields=('qinq_svlan', 'name'), + name='%(app_label)s_%(class)s_unique_qinq_svlan_name' + ), ) verbose_name = _('VLAN') verbose_name_plural = _('VLANs') @@ -255,9 +278,24 @@ class VLAN(PrimaryModel): ).format(ranges=ranges_to_string(self.group.vid_ranges), group=self.group) }) + # Only Q-in-Q customer VLANs may be assigned to a service VLAN + if self.qinq_svlan and self.qinq_role != VLANQinQRoleChoices.ROLE_CUSTOMER: + raise ValidationError({ + 'qinq_svlan': _("Only Q-in-Q customer VLANs maybe assigned to a service VLAN.") + }) + + # A Q-in-Q customer VLAN must be assigned to a service VLAN + if self.qinq_role == VLANQinQRoleChoices.ROLE_CUSTOMER and not self.qinq_svlan: + raise ValidationError({ + 'qinq_role': _("A Q-in-Q customer VLAN must be assigned to a service VLAN.") + }) + def get_status_color(self): return VLANStatusChoices.colors.get(self.status) + def get_qinq_role_color(self): + return VLANQinQRoleChoices.colors.get(self.qinq_role) + def get_interfaces(self): # Return all device interfaces assigned to this VLAN return Interface.objects.filter( diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index 1a06bb700..d34ff5f45 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -132,6 +132,13 @@ class VLANTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('Role'), linkify=True ) + qinq_role = columns.ChoiceFieldColumn( + verbose_name=_('Q-in-Q role') + ) + qinq_svlan = tables.Column( + verbose_name=_('Q-in-Q SVLAN'), + linkify=True + ) l2vpn = tables.Column( accessor=tables.A('l2vpn_termination__l2vpn'), linkify=True, @@ -154,7 +161,7 @@ class VLANTable(TenancyColumnsMixin, NetBoxTable): model = VLAN fields = ( 'pk', 'id', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'tenant_group', 'status', 'role', - 'description', 'comments', 'tags', 'l2vpn', 'created', 'last_updated', + 'qinq_role', 'qinq_svlan', 'description', 'comments', 'tags', 'l2vpn', 'created', 'last_updated', ) default_columns = ('pk', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description') row_attrs = { diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index cd3e47342..4e8456e5a 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -980,6 +980,7 @@ class VLANTest(APIViewTestCases.APIViewTestCase): VLAN(name='VLAN 1', vid=1, group=vlan_groups[0]), VLAN(name='VLAN 2', vid=2, group=vlan_groups[0]), VLAN(name='VLAN 3', vid=3, group=vlan_groups[0]), + VLAN(name='SVLAN 1', vid=1001, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), ) VLAN.objects.bulk_create(vlans) @@ -999,6 +1000,12 @@ class VLANTest(APIViewTestCases.APIViewTestCase): 'name': 'VLAN 6', 'group': vlan_groups[1].pk, }, + { + 'vid': 2001, + 'name': 'CVLAN 1', + 'qinq_role': VLANQinQRoleChoices.ROLE_CUSTOMER, + 'qinq_svlan': vlans[3].pk, + }, ] def test_delete_vlan_with_prefix(self): diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index b402a8426..f651c970d 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1630,6 +1630,7 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): Site(name='Site 4', slug='site-4', region=regions[0], group=site_groups[0]), Site(name='Site 5', slug='site-5', region=regions[1], group=site_groups[1]), Site(name='Site 6', slug='site-6', region=regions[2], group=site_groups[2]), + Site(name='Site 7', slug='site-7'), ) Site.objects.bulk_create(sites) @@ -1784,9 +1785,21 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): # Create one globally available VLAN VLAN(vid=1000, name='Global VLAN'), + + # Create some Q-in-Q service VLANs + VLAN(vid=2001, name='SVLAN 1', site=sites[6], qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(vid=2002, name='SVLAN 2', site=sites[6], qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(vid=2003, name='SVLAN 3', site=sites[6], qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), ) VLAN.objects.bulk_create(vlans) + # Create Q-in-Q customer VLANs + VLAN.objects.bulk_create([ + VLAN(vid=3001, name='CVLAN 1', site=sites[6], qinq_svlan=vlans[29], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), + VLAN(vid=3002, name='CVLAN 2', site=sites[6], qinq_svlan=vlans[30], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), + VLAN(vid=3003, name='CVLAN 3', site=sites[6], qinq_svlan=vlans[31], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), + ]) + # Assign VLANs to device interfaces interfaces[0].untagged_vlan = vlans[0] interfaces[0].tagged_vlans.add(vlans[1]) @@ -1897,6 +1910,17 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'vminterface_id': vminterface_id} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + def test_qinq_role(self): + params = {'qinq_role': [VLANQinQRoleChoices.ROLE_SERVICE, VLANQinQRoleChoices.ROLE_CUSTOMER]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6) + + def test_qinq_svlan(self): + vlans = VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE)[:2] + params = {'qinq_svlan_id': [vlans[0].pk, vlans[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'qinq_svlan_vid': [vlans[0].vid, vlans[1].vid]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class VLANTranslationPolicyTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = VLANTranslationPolicy.objects.all() diff --git a/netbox/ipam/tests/test_models.py b/netbox/ipam/tests/test_models.py index d14fa0657..917b50f33 100644 --- a/netbox/ipam/tests/test_models.py +++ b/netbox/ipam/tests/test_models.py @@ -586,3 +586,24 @@ class TestVLANGroup(TestCase): vlangroup.vid_ranges = string_to_ranges('2-2') vlangroup.full_clean() vlangroup.save() + + +class TestVLAN(TestCase): + + @classmethod + def setUpTestData(cls): + VLAN.objects.bulk_create(( + VLAN(name='VLAN 1', vid=1, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + )) + + def test_qinq_role(self): + svlan = VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE).first() + + vlan = VLAN( + name='VLAN X', + vid=999, + qinq_role=VLANQinQRoleChoices.ROLE_SERVICE, + qinq_svlan=svlan + ) + with self.assertRaises(ValidationError): + vlan.full_clean() diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 95a4f7856..a10a1439a 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -62,6 +62,22 @@ {% trans "Description" %} {{ object.description|placeholder }} + + {% trans "Q-in-Q Role" %} + + {% if object.qinq_role %} + {% badge object.get_qinq_role_display bg_color=object.get_qinq_role_color %} + {% else %} + {{ ''|placeholder }} + {% endif %} + + + {% if object.qinq_role == 'c-vlan' %} + + {% trans "Q-in-Q SVLAN" %} + {{ object.qinq_svlan|linkify|placeholder }} + + {% endif %} {% trans "L2VPN" %} {{ object.l2vpn_termination.l2vpn|linkify|placeholder }} @@ -92,6 +108,21 @@ {% htmx_table 'ipam:prefix_list' vlan_id=object.pk %}
+ {% if object.qinq_role == 's-vlan' %} +
+

+ {% trans "Customer VLANs" %} + {% if perms.ipam.add_vlan %} +
+ + {% trans "Add a VLAN" %} + +
+ {% endif %} +

+ {% htmx_table 'ipam:vlan_list' qinq_svlan_id=object.pk %} +
+ {% endif %} {% plugin_full_width_page object %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html index 814fc6b78..885844580 100644 --- a/netbox/templates/ipam/vlan_edit.html +++ b/netbox/templates/ipam/vlan_edit.html @@ -17,6 +17,14 @@ {% render_field form.tags %} +
+
+

{% trans "Q-in-Q (802.1ad)" %}

+
+ {% render_field form.qinq_role %} + {% render_field form.qinq_svlan %} +
+

{% trans "Tenancy" %}

diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py index 2c00cac96..9b7000def 100644 --- a/netbox/virtualization/api/serializers_/virtualmachines.py +++ b/netbox/virtualization/api/serializers_/virtualmachines.py @@ -89,6 +89,7 @@ class VMInterfaceSerializer(NetBoxModelSerializer): required=False, many=True ) + qinq_svlan = VLANSerializer(nested=True, required=False, allow_null=True) vlan_translation_policy = VLANTranslationPolicySerializer(nested=True, required=False, allow_null=True) vrf = VRFSerializer(nested=True, required=False, allow_null=True) l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) @@ -104,9 +105,9 @@ class VMInterfaceSerializer(NetBoxModelSerializer): model = VMInterface fields = [ 'id', 'url', 'display_url', 'display', 'virtual_machine', 'name', 'enabled', 'parent', 'bridge', 'mtu', - 'mac_address', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'vrf', 'l2vpn_termination', - 'tags', 'custom_fields', 'created', 'last_updated', 'count_ipaddresses', 'count_fhrp_groups', - 'vlan_translation_policy', + 'mac_address', 'description', 'mode', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', + 'vlan_translation_policy', 'vrf', 'l2vpn_termination', 'tags', 'custom_fields', 'created', 'last_updated', + 'count_ipaddresses', 'count_fhrp_groups', ] brief_fields = ('id', 'url', 'display', 'virtual_machine', 'name', 'description') diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 5971fc894..4527e7f4c 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -6,6 +6,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.forms.common import InterfaceCommonForm from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from extras.models import ConfigTemplate +from ipam.choices import VLANQinQRoleChoices from ipam.models import IPAddress, VLAN, VLANGroup, VLANTranslationPolicy, VRF from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm @@ -338,6 +339,16 @@ class VMInterfaceForm(InterfaceCommonForm, VMComponentForm): 'available_on_virtualmachine': '$virtual_machine', } ) + qinq_svlan = DynamicModelChoiceField( + queryset=VLAN.objects.all(), + required=False, + label=_('Q-in-Q Service VLAN'), + query_params={ + 'group_id': '$vlan_group', + 'available_on_virtualmachine': '$virtual_machine', + 'qinq_role': VLANQinQRoleChoices.ROLE_SERVICE, + } + ) vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, @@ -354,17 +365,20 @@ class VMInterfaceForm(InterfaceCommonForm, VMComponentForm): FieldSet('vrf', 'mac_address', name=_('Addressing')), FieldSet('mtu', 'enabled', name=_('Operation')), FieldSet('parent', 'bridge', name=_('Related Interfaces')), - FieldSet('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vlan_translation_policy', name=_('802.1Q Switching')), + FieldSet( + 'mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', + name=_('802.1Q Switching') + ), ) class Meta: model = VMInterface fields = [ 'virtual_machine', 'name', 'parent', 'bridge', 'enabled', 'mac_address', 'mtu', 'description', 'mode', - 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'vrf', 'tags', 'vlan_translation_policy', + 'vlan_group', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vlan_translation_policy', 'vrf', 'tags', ] labels = { - 'mode': '802.1Q Mode', + 'mode': _('802.1Q Mode'), } widgets = { 'mode': HTMXSelect(), diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index bed65a3b3..79b5cb216 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -100,6 +100,7 @@ class VMInterfaceType(IPAddressesMixin, ComponentType): bridge: Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')] | None untagged_vlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vrf: Annotated["VRFType", strawberry.lazy('ipam.graphql.types')] | None + qinq_svlan: Annotated["VLANType", strawberry.lazy('ipam.graphql.types')] | None vlan_translation_policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] | None tagged_vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] diff --git a/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py index e0992c9c8..3a6d5e481 100644 --- a/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py +++ b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py @@ -1,5 +1,3 @@ -# Generated by Django 5.0.9 on 2024-10-11 19:45 - import django.db.models.deletion from django.db import migrations, models diff --git a/netbox/virtualization/migrations/0043_qinq_svlan.py b/netbox/virtualization/migrations/0043_qinq_svlan.py new file mode 100644 index 000000000..422289fb7 --- /dev/null +++ b/netbox/virtualization/migrations/0043_qinq_svlan.py @@ -0,0 +1,28 @@ +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0075_vlan_qinq'), + ('virtualization', '0042_vminterface_vlan_translation_policy'), + ] + + operations = [ + migrations.AddField( + model_name='vminterface', + name='qinq_svlan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_svlan', to='ipam.vlan'), + ), + migrations.AlterField( + model_name='vminterface', + name='tagged_vlans', + field=models.ManyToManyField(blank=True, related_name='%(class)ss_as_tagged', to='ipam.vlan'), + ), + migrations.AlterField( + model_name='vminterface', + name='untagged_vlan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_as_untagged', to='ipam.vlan'), + ), + ] diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index 0767b2c13..da8419e88 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -322,20 +322,6 @@ class VMInterface(ComponentModel, BaseInterface, TrackingModelMixin): max_length=100, blank=True ) - untagged_vlan = models.ForeignKey( - to='ipam.VLAN', - on_delete=models.SET_NULL, - related_name='vminterfaces_as_untagged', - null=True, - blank=True, - verbose_name=_('untagged VLAN') - ) - tagged_vlans = models.ManyToManyField( - to='ipam.VLAN', - related_name='vminterfaces_as_tagged', - blank=True, - verbose_name=_('tagged VLANs') - ) ip_addresses = GenericRelation( to='ipam.IPAddress', content_type_field='assigned_object_type', diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 8a2a26bb9..4a3138711 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -151,8 +151,8 @@ class VMInterfaceTable(BaseInterfaceTable): model = VMInterface fields = ( 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags', - 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'created', - 'last_updated', + 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', + 'created', 'last_updated', ) default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'description') @@ -175,7 +175,8 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): model = VMInterface fields = ( 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'mac_address', 'mtu', 'mode', 'description', 'tags', - 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'actions', + 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', + 'actions', ) default_columns = ('pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'ip_addresses') row_attrs = { diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 69728f67c..521064fc6 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -4,6 +4,7 @@ from rest_framework import status from dcim.choices import InterfaceModeChoices from dcim.models import Site from extras.models import ConfigTemplate +from ipam.choices import VLANQinQRoleChoices from ipam.models import VLAN, VRF from utilities.testing import APITestCase, APIViewTestCases, create_test_device, create_test_virtualmachine from virtualization.choices import * @@ -270,6 +271,7 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase): VLAN(name='VLAN 1', vid=1), VLAN(name='VLAN 2', vid=2), VLAN(name='VLAN 3', vid=3), + VLAN(name='SVLAN 1', vid=1001, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), ) VLAN.objects.bulk_create(vlans) @@ -307,6 +309,12 @@ class VMInterfaceTest(APIViewTestCases.APIViewTestCase): 'untagged_vlan': vlans[2].pk, 'vrf': vrfs[2].pk, }, + { + 'virtual_machine': virtualmachine.pk, + 'name': 'Interface 7', + 'mode': InterfaceModeChoices.MODE_Q_IN_Q, + 'qinq_svlan': vlans[3].pk, + }, ] def test_bulk_delete_child_interfaces(self): diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py index cd598274f..0c7079bba 100644 --- a/netbox/virtualization/tests/test_filtersets.py +++ b/netbox/virtualization/tests/test_filtersets.py @@ -1,7 +1,9 @@ from django.test import TestCase +from dcim.choices import InterfaceModeChoices from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup -from ipam.models import IPAddress, VLANTranslationPolicy, VRF +from ipam.choices import VLANQinQRoleChoices +from ipam.models import IPAddress, VLAN, VLANTranslationPolicy, VRF from tenancy.models import Tenant, TenantGroup from utilities.testing import ChangeLoggedFilterSetTests, create_test_device from virtualization.choices import * @@ -528,7 +530,7 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests): class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = VMInterface.objects.all() filterset = VMInterfaceFilterSet - ignore_fields = ('tagged_vlans', 'untagged_vlan',) + ignore_fields = ('tagged_vlans', 'untagged_vlan', 'qinq_svlan') @classmethod def setUpTestData(cls): @@ -554,6 +556,13 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): ) VRF.objects.bulk_create(vrfs) + vlans = ( + VLAN(name='SVLAN 1', vid=1001, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(name='SVLAN 2', vid=1002, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + VLAN(name='SVLAN 3', vid=1003, qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), + ) + VLAN.objects.bulk_create(vlans) + vms = ( VirtualMachine(name='Virtual Machine 1', cluster=clusters[0]), VirtualMachine(name='Virtual Machine 2', cluster=clusters[1]), @@ -596,7 +605,9 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): mtu=300, mac_address='00-00-00-00-00-03', vrf=vrfs[2], - description='foobar3' + description='foobar3', + mode=InterfaceModeChoices.MODE_Q_IN_Q, + qinq_svlan=vlans[0] ), ) VMInterface.objects.bulk_create(interfaces) @@ -667,6 +678,13 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'description': ['foobar1', 'foobar2']} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_vlan(self): + vlan = VLAN.objects.filter(qinq_role=VLANQinQRoleChoices.ROLE_SERVICE).first() + params = {'vlan_id': vlan.pk} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + params = {'vlan': vlan.vid} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + def test_vlan_translation_policy(self): vlan_translation_policies = VLANTranslationPolicy.objects.all()[:2] params = {'vlan_translation_policy_id': [vlan_translation_policies[0].pk, vlan_translation_policies[1].pk]} From 6dc75d8db1e7750f37ba5f50d65e05c430352146 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 1 Nov 2024 11:18:23 -0700 Subject: [PATCH 023/190] 7699 Add Scope to Cluster (#17848) * 7699 Add Scope to Cluster * 7699 Serializer * 7699 filterset * 7699 bulk_edit * 7699 bulk_import * 7699 model_form * 7699 graphql, tables * 7699 fixes * 7699 fixes * 7699 fixes * 7699 fixes * 7699 fix tests * 7699 fix graphql tests for clusters reference * 7699 fix dcim tests * 7699 fix ipam tests * 7699 fix tests * 7699 use mixin for model * 7699 change mixin name * 7699 scope form * 7699 scope form * 7699 scoped form, fitlerset * 7699 review changes * 7699 move ScopedFilterset * 7699 move CachedScopeMixin * 7699 review changes * 7699 review changes * 7699 refactor mixins * 7699 _sitegroup -> _site_group * 7699 update docstring * Misc cleanup * Update migrations --------- Co-authored-by: Jeremy Stretch --- docs/models/virtualization/cluster.md | 4 +- netbox/dcim/constants.py | 5 + netbox/dcim/filtersets.py | 58 ++++++++++ netbox/dcim/forms/mixins.py | 105 ++++++++++++++++++ netbox/dcim/graphql/types.py | 17 +++ netbox/dcim/models/devices.py | 11 +- netbox/dcim/models/mixins.py | 85 ++++++++++++++ netbox/dcim/tests/test_models.py | 9 +- netbox/extras/tests/test_models.py | 4 +- netbox/ipam/querysets.py | 2 +- netbox/ipam/tests/test_filtersets.py | 9 +- netbox/templates/virtualization/cluster.html | 8 +- .../api/serializers_/clusters.py | 31 +++++- netbox/virtualization/apps.py | 2 +- netbox/virtualization/filtersets.py | 42 +------ netbox/virtualization/forms/bulk_edit.py | 28 +---- netbox/virtualization/forms/bulk_import.py | 8 +- netbox/virtualization/forms/filtersets.py | 19 ++-- netbox/virtualization/forms/model_forms.py | 14 +-- netbox/virtualization/graphql/types.py | 15 ++- .../migrations/0044_cluster_scope.py | 51 +++++++++ .../0045_clusters_cached_relations.py | 94 ++++++++++++++++ netbox/virtualization/models/clusters.py | 48 +++++--- .../virtualization/models/virtualmachines.py | 4 +- netbox/virtualization/tables/clusters.py | 11 +- netbox/virtualization/tests/test_api.py | 10 +- .../virtualization/tests/test_filtersets.py | 18 +-- netbox/virtualization/tests/test_models.py | 9 +- netbox/virtualization/tests/test_views.py | 23 ++-- 29 files changed, 588 insertions(+), 156 deletions(-) create mode 100644 netbox/dcim/forms/mixins.py create mode 100644 netbox/virtualization/migrations/0044_cluster_scope.py create mode 100644 netbox/virtualization/migrations/0045_clusters_cached_relations.py diff --git a/docs/models/virtualization/cluster.md b/docs/models/virtualization/cluster.md index 50b5dbd1d..9acdb2bc4 100644 --- a/docs/models/virtualization/cluster.md +++ b/docs/models/virtualization/cluster.md @@ -23,6 +23,6 @@ The cluster's operational status. !!! tip Additional statuses may be defined by setting `Cluster.status` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter. -### Site +### Scope -The [site](../dcim/site.md) with which the cluster is associated. +The [region](../dcim/region.md), [site](../dcim/site.md), [site group](../dcim/sitegroup.md) or [location](../dcim/location.md) with which this cluster is associated. diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py index ba3e6464b..4927b0198 100644 --- a/netbox/dcim/constants.py +++ b/netbox/dcim/constants.py @@ -123,3 +123,8 @@ COMPATIBLE_TERMINATION_TYPES = { 'powerport': ['poweroutlet', 'powerfeed'], 'rearport': ['consoleport', 'consoleserverport', 'interface', 'frontport', 'rearport', 'circuittermination'], } + +# Models which can serve to scope an object by location +LOCATION_SCOPE_TYPES = ( + 'region', 'sitegroup', 'site', 'location', +) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 0371f882b..df66ad77b 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -73,6 +73,7 @@ __all__ = ( 'RearPortFilterSet', 'RearPortTemplateFilterSet', 'RegionFilterSet', + 'ScopedFilterSet', 'SiteFilterSet', 'SiteGroupFilterSet', 'VirtualChassisFilterSet', @@ -2344,3 +2345,60 @@ class InterfaceConnectionFilterSet(ConnectionFilterSet): class Meta: model = Interface fields = tuple() + + +class ScopedFilterSet(BaseFilterSet): + """ + Provides additional filtering functionality for location, site, etc.. for Scoped models. + """ + scope_type = ContentTypeFilter() + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + label=_('Region (ID)'), + ) + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + to_field_name='slug', + label=_('Region (slug)'), + ) + site_group_id = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + label=_('Site group (ID)'), + ) + site_group = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + to_field_name='slug', + label=_('Site group (slug)'), + ) + site_id = django_filters.ModelMultipleChoiceFilter( + queryset=Site.objects.all(), + field_name='_site', + label=_('Site (ID)'), + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='_site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label=_('Site (slug)'), + ) + location_id = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + label=_('Location (ID)'), + ) + location = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + to_field_name='slug', + label=_('Location (slug)'), + ) diff --git a/netbox/dcim/forms/mixins.py b/netbox/dcim/forms/mixins.py new file mode 100644 index 000000000..98862af10 --- /dev/null +++ b/netbox/dcim/forms/mixins.py @@ -0,0 +1,105 @@ +from django import forms +from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ObjectDoesNotExist +from django.utils.translation import gettext_lazy as _ + +from dcim.constants import LOCATION_SCOPE_TYPES +from dcim.models import Site +from utilities.forms import get_field_value +from utilities.forms.fields import ( + ContentTypeChoiceField, CSVContentTypeField, DynamicModelChoiceField, +) +from utilities.templatetags.builtins.filters import bettertitle +from utilities.forms.widgets import HTMXSelect + +__all__ = ( + 'ScopedBulkEditForm', + 'ScopedForm', + 'ScopedImportForm', +) + + +class ScopedForm(forms.Form): + scope_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=LOCATION_SCOPE_TYPES), + widget=HTMXSelect(), + required=False, + label=_('Scope type') + ) + scope = DynamicModelChoiceField( + label=_('Scope'), + queryset=Site.objects.none(), # Initial queryset + required=False, + disabled=True, + selector=True + ) + + def __init__(self, *args, **kwargs): + instance = kwargs.get('instance') + initial = kwargs.get('initial', {}) + + if instance is not None and instance.scope: + initial['scope'] = instance.scope + kwargs['initial'] = initial + + super().__init__(*args, **kwargs) + self._set_scoped_values() + + def clean(self): + super().clean() + + # Assign the selected scope (if any) + self.instance.scope = self.cleaned_data.get('scope') + + def _set_scoped_values(self): + if scope_type_id := get_field_value(self, 'scope_type'): + try: + scope_type = ContentType.objects.get(pk=scope_type_id) + model = scope_type.model_class() + self.fields['scope'].queryset = model.objects.all() + self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower + self.fields['scope'].disabled = False + self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass + + if self.instance and scope_type_id != self.instance.scope_type_id: + self.initial['scope'] = None + + +class ScopedBulkEditForm(forms.Form): + scope_type = ContentTypeChoiceField( + queryset=ContentType.objects.filter(model__in=LOCATION_SCOPE_TYPES), + widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}), + required=False, + label=_('Scope type') + ) + scope = DynamicModelChoiceField( + label=_('Scope'), + queryset=Site.objects.none(), # Initial queryset + required=False, + disabled=True, + selector=True + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if scope_type_id := get_field_value(self, 'scope_type'): + try: + scope_type = ContentType.objects.get(pk=scope_type_id) + model = scope_type.model_class() + self.fields['scope'].queryset = model.objects.all() + self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower + self.fields['scope'].disabled = False + self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) + except ObjectDoesNotExist: + pass + + +class ScopedImportForm(forms.Form): + scope_type = CSVContentTypeField( + queryset=ContentType.objects.filter(model__in=LOCATION_SCOPE_TYPES), + required=False, + label=_('Scope type (app & model)') + ) diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 5965fdcec..6493ec6b1 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -463,6 +463,10 @@ class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, Organi devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] children: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] + @strawberry_django.field + def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: + return self._clusters.all() + @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: return self.circuit_terminations.all() @@ -710,6 +714,10 @@ class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): def parent(self) -> Annotated["RegionType", strawberry.lazy('dcim.graphql.types')] | None: return self.parent + @strawberry_django.field + def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: + return self._clusters.all() + @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: return self.circuit_terminations.all() @@ -735,9 +743,14 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] locations: List[Annotated["LocationType", strawberry.lazy('dcim.graphql.types')]] asns: List[Annotated["ASNType", strawberry.lazy('ipam.graphql.types')]] + circuit_terminations: List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]] clusters: List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]] vlans: List[Annotated["VLANType", strawberry.lazy('ipam.graphql.types')]] + @strawberry_django.field + def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: + return self._clusters.all() + @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: return self.circuit_terminations.all() @@ -758,6 +771,10 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): def parent(self) -> Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')] | None: return self.parent + @strawberry_django.field + def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: + return self._clusters.all() + @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: return self.circuit_terminations.all() diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index b9ba2bb64..47f4ee6c9 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -958,10 +958,17 @@ class Device( }) # A Device can only be assigned to a Cluster in the same Site (or no Site) - if self.cluster and self.cluster.site is not None and self.cluster.site != self.site: + if self.cluster and self.cluster._site is not None and self.cluster._site != self.site: raise ValidationError({ 'cluster': _("The assigned cluster belongs to a different site ({site})").format( - site=self.cluster.site + site=self.cluster._site + ) + }) + + if self.cluster and self.cluster._location is not None and self.cluster._location != self.location: + raise ValidationError({ + 'cluster': _("The assigned cluster belongs to a different location ({location})").format( + site=self.cluster._location ) }) diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index c9be451a0..1df3364c4 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -1,6 +1,10 @@ +from django.apps import apps +from django.contrib.contenttypes.fields import GenericForeignKey from django.db import models +from dcim.constants import LOCATION_SCOPE_TYPES __all__ = ( + 'CachedScopeMixin', 'RenderConfigMixin', ) @@ -27,3 +31,84 @@ class RenderConfigMixin(models.Model): return self.role.config_template if self.platform and self.platform.config_template: return self.platform.config_template + + +class CachedScopeMixin(models.Model): + """ + Mixin for adding a GenericForeignKey scope to a model that can point to a Region, SiteGroup, Site, or Location. + Includes cached fields for each to allow efficient filtering. Appropriate validation must be done in the clean() + method as this does not have any as validation is generally model-specific. + """ + scope_type = models.ForeignKey( + to='contenttypes.ContentType', + on_delete=models.PROTECT, + limit_choices_to=models.Q(model__in=LOCATION_SCOPE_TYPES), + related_name='+', + blank=True, + null=True + ) + scope_id = models.PositiveBigIntegerField( + blank=True, + null=True + ) + scope = GenericForeignKey( + ct_field='scope_type', + fk_field='scope_id' + ) + + _location = models.ForeignKey( + to='dcim.Location', + on_delete=models.CASCADE, + related_name='_%(class)ss', + blank=True, + null=True + ) + _site = models.ForeignKey( + to='dcim.Site', + on_delete=models.CASCADE, + related_name='_%(class)ss', + blank=True, + null=True + ) + _region = models.ForeignKey( + to='dcim.Region', + on_delete=models.CASCADE, + related_name='_%(class)ss', + blank=True, + null=True + ) + _site_group = models.ForeignKey( + to='dcim.SiteGroup', + on_delete=models.CASCADE, + related_name='_%(class)ss', + blank=True, + null=True + ) + + class Meta: + abstract = True + + def save(self, *args, **kwargs): + # Cache objects associated with the terminating object (for filtering) + self.cache_related_objects() + + super().save(*args, **kwargs) + + def cache_related_objects(self): + self._region = self._site_group = self._site = self._location = None + if self.scope_type: + scope_type = self.scope_type.model_class() + if scope_type == apps.get_model('dcim', 'region'): + self._region = self.scope + elif scope_type == apps.get_model('dcim', 'sitegroup'): + self._site_group = self.scope + elif scope_type == apps.get_model('dcim', 'site'): + self._region = self.scope.region + self._site_group = self.scope.group + self._site = self.scope + elif scope_type == apps.get_model('dcim', 'location'): + self._region = self.scope.site.region + self._site_group = self.scope.site.group + self._site = self.scope.site + self._location = self.scope + cache_related_objects.alters_data = True diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index f0fe4da3b..8d43d67ea 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -601,11 +601,12 @@ class DeviceTestCase(TestCase): Site.objects.bulk_create(sites) clusters = ( - Cluster(name='Cluster 1', type=cluster_type, site=sites[0]), - Cluster(name='Cluster 2', type=cluster_type, site=sites[1]), - Cluster(name='Cluster 3', type=cluster_type, site=None), + Cluster(name='Cluster 1', type=cluster_type, scope=sites[0]), + Cluster(name='Cluster 2', type=cluster_type, scope=sites[1]), + Cluster(name='Cluster 3', type=cluster_type, scope=None), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() device_type = DeviceType.objects.first() device_role = DeviceRole.objects.first() diff --git a/netbox/extras/tests/test_models.py b/netbox/extras/tests/test_models.py index 188a06a3f..c90390dd1 100644 --- a/netbox/extras/tests/test_models.py +++ b/netbox/extras/tests/test_models.py @@ -274,7 +274,7 @@ class ConfigContextTest(TestCase): name="Cluster", group=cluster_group, type=cluster_type, - site=site, + scope=site, ) region_context = ConfigContext.objects.create( @@ -366,7 +366,7 @@ class ConfigContextTest(TestCase): """ site = Site.objects.first() cluster_type = ClusterType.objects.create(name="Cluster Type") - cluster = Cluster.objects.create(name="Cluster", type=cluster_type, site=site) + cluster = Cluster.objects.create(name="Cluster", type=cluster_type, scope=site) vm_role = DeviceRole.objects.first() # Create a ConfigContext associated with the site diff --git a/netbox/ipam/querysets.py b/netbox/ipam/querysets.py index 771e9b3b9..77ab8194a 100644 --- a/netbox/ipam/querysets.py +++ b/netbox/ipam/querysets.py @@ -148,7 +148,7 @@ class VLANQuerySet(RestrictedQuerySet): # Find all relevant VLANGroups q = Q() - site = vm.site or vm.cluster.site + site = vm.site or vm.cluster._site if vm.cluster: # Add VLANGroups scoped to the assigned cluster (or its group) q |= Q( diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index f651c970d..28e8cda1e 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -1675,11 +1675,12 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): cluster_type = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1') clusters = ( - Cluster(name='Cluster 1', type=cluster_type, group=cluster_groups[0], site=sites[0]), - Cluster(name='Cluster 2', type=cluster_type, group=cluster_groups[1], site=sites[1]), - Cluster(name='Cluster 3', type=cluster_type, group=cluster_groups[2], site=sites[2]), + Cluster(name='Cluster 1', type=cluster_type, group=cluster_groups[0], scope=sites[0]), + Cluster(name='Cluster 2', type=cluster_type, group=cluster_groups[1], scope=sites[1]), + Cluster(name='Cluster 3', type=cluster_type, group=cluster_groups[2], scope=sites[2]), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() virtual_machines = ( VirtualMachine(name='Virtual Machine 1', cluster=clusters[0]), diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html index d79d8075c..4155dacb2 100644 --- a/netbox/templates/virtualization/cluster.html +++ b/netbox/templates/virtualization/cluster.html @@ -39,8 +39,12 @@ - {% trans "Site" %} - {{ object.site|linkify|placeholder }} + {% trans "Scope" %} + {% if object.scope %} + {{ object.scope|linkify }} ({% trans object.scope_type.name %}) + {% else %} + {{ ''|placeholder }} + {% endif %}
diff --git a/netbox/virtualization/api/serializers_/clusters.py b/netbox/virtualization/api/serializers_/clusters.py index b64b6e7ba..101a5b5a3 100644 --- a/netbox/virtualization/api/serializers_/clusters.py +++ b/netbox/virtualization/api/serializers_/clusters.py @@ -1,9 +1,13 @@ -from dcim.api.serializers_.sites import SiteSerializer -from netbox.api.fields import ChoiceField, RelatedObjectCountField +from dcim.constants import LOCATION_SCOPE_TYPES +from django.contrib.contenttypes.models import ContentType +from drf_spectacular.utils import extend_schema_field +from rest_framework import serializers +from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer from tenancy.api.serializers_.tenants import TenantSerializer from virtualization.choices import * from virtualization.models import Cluster, ClusterGroup, ClusterType +from utilities.api import get_serializer_for_model __all__ = ( 'ClusterGroupSerializer', @@ -45,7 +49,16 @@ class ClusterSerializer(NetBoxModelSerializer): group = ClusterGroupSerializer(nested=True, required=False, allow_null=True, default=None) status = ChoiceField(choices=ClusterStatusChoices, required=False) tenant = TenantSerializer(nested=True, required=False, allow_null=True) - site = SiteSerializer(nested=True, required=False, allow_null=True, default=None) + scope_type = ContentTypeField( + queryset=ContentType.objects.filter( + model__in=LOCATION_SCOPE_TYPES + ), + allow_null=True, + required=False, + default=None + ) + scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) + scope = serializers.SerializerMethodField(read_only=True) # Related object counts device_count = RelatedObjectCountField('devices') @@ -54,8 +67,18 @@ class ClusterSerializer(NetBoxModelSerializer): class Meta: model = Cluster fields = [ - 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'site', + 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'scope_id', 'scope', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', 'virtualmachine_count', ] brief_fields = ('id', 'url', 'display', 'name', 'description', 'virtualmachine_count') + + @extend_schema_field(serializers.JSONField(allow_null=True)) + def get_scope(self, obj): + if obj.scope_id is None: + return None + serializer = get_serializer_for_model(obj.scope) + context = {'request': self.context['request']} + return serializer(obj.scope, nested=True, context=context).data + + diff --git a/netbox/virtualization/apps.py b/netbox/virtualization/apps.py index ebcc591bf..65ce0f112 100644 --- a/netbox/virtualization/apps.py +++ b/netbox/virtualization/apps.py @@ -17,7 +17,7 @@ class VirtualizationConfig(AppConfig): # Register denormalized fields denormalized.register(VirtualMachine, 'cluster', { - 'site': 'site', + 'site': '_site', }) # Register counters diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py index ec0831f9f..ac72bea12 100644 --- a/netbox/virtualization/filtersets.py +++ b/netbox/virtualization/filtersets.py @@ -2,7 +2,7 @@ import django_filters from django.db.models import Q from django.utils.translation import gettext as _ -from dcim.filtersets import CommonInterfaceFilterSet +from dcim.filtersets import CommonInterfaceFilterSet, ScopedFilterSet from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate @@ -37,43 +37,7 @@ class ClusterGroupFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet) fields = ('id', 'name', 'slug', 'description') -class ClusterFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSet): - region_id = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='site__region', - lookup_expr='in', - label=_('Region (ID)'), - ) - region = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='site__region', - lookup_expr='in', - to_field_name='slug', - label=_('Region (slug)'), - ) - site_group_id = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='site__group', - lookup_expr='in', - label=_('Site group (ID)'), - ) - site_group = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='site__group', - lookup_expr='in', - to_field_name='slug', - label=_('Site group (slug)'), - ) - site_id = django_filters.ModelMultipleChoiceFilter( - queryset=Site.objects.all(), - label=_('Site (ID)'), - ) - site = django_filters.ModelMultipleChoiceFilter( - field_name='site__slug', - queryset=Site.objects.all(), - to_field_name='slug', - label=_('Site (slug)'), - ) +class ClusterFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ScopedFilterSet, ContactModelFilterSet): group_id = django_filters.ModelMultipleChoiceFilter( queryset=ClusterGroup.objects.all(), label=_('Parent group (ID)'), @@ -101,7 +65,7 @@ class ClusterFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte class Meta: model = Cluster - fields = ('id', 'name', 'description') + fields = ('id', 'name', 'description', 'scope_id') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index 2bd3434ac..aaeb259b9 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -3,7 +3,8 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import InterfaceModeChoices from dcim.constants import INTERFACE_MTU_MAX, INTERFACE_MTU_MIN -from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup +from dcim.forms.mixins import ScopedBulkEditForm +from dcim.models import Device, DeviceRole, Platform, Site from extras.models import ConfigTemplate from ipam.models import VLAN, VLANGroup, VRF from netbox.forms import NetBoxModelBulkEditForm @@ -55,7 +56,7 @@ class ClusterGroupBulkEditForm(NetBoxModelBulkEditForm): nullable_fields = ('description',) -class ClusterBulkEditForm(NetBoxModelBulkEditForm): +class ClusterBulkEditForm(ScopedBulkEditForm, NetBoxModelBulkEditForm): type = DynamicModelChoiceField( label=_('Type'), queryset=ClusterType.objects.all(), @@ -77,25 +78,6 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm): queryset=Tenant.objects.all(), required=False ) - region = DynamicModelChoiceField( - label=_('Region'), - queryset=Region.objects.all(), - required=False, - ) - site_group = DynamicModelChoiceField( - label=_('Site group'), - queryset=SiteGroup.objects.all(), - required=False, - ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), - required=False, - query_params={ - 'region_id': '$region', - 'group_id': '$site_group', - } - ) description = forms.CharField( label=_('Description'), max_length=200, @@ -106,10 +88,10 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm): model = Cluster fieldsets = ( FieldSet('type', 'group', 'status', 'tenant', 'description'), - FieldSet('region', 'site_group', 'site', name=_('Site')), + FieldSet('scope_type', 'scope', name=_('Scope')), ) nullable_fields = ( - 'group', 'site', 'tenant', 'description', 'comments', + 'group', 'scope', 'tenant', 'description', 'comments', ) diff --git a/netbox/virtualization/forms/bulk_import.py b/netbox/virtualization/forms/bulk_import.py index 17efc567a..9ccdd68f7 100644 --- a/netbox/virtualization/forms/bulk_import.py +++ b/netbox/virtualization/forms/bulk_import.py @@ -1,6 +1,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import InterfaceModeChoices +from dcim.forms.mixins import ScopedImportForm from dcim.models import Device, DeviceRole, Platform, Site from extras.models import ConfigTemplate from ipam.models import VRF @@ -36,7 +37,7 @@ class ClusterGroupImportForm(NetBoxModelImportForm): fields = ('name', 'slug', 'description', 'tags') -class ClusterImportForm(NetBoxModelImportForm): +class ClusterImportForm(ScopedImportForm, NetBoxModelImportForm): type = CSVModelChoiceField( label=_('Type'), queryset=ClusterType.objects.all(), @@ -72,7 +73,10 @@ class ClusterImportForm(NetBoxModelImportForm): class Meta: model = Cluster - fields = ('name', 'type', 'group', 'status', 'site', 'tenant', 'description', 'comments', 'tags') + fields = ('name', 'type', 'group', 'status', 'scope_type', 'scope_id', 'tenant', 'description', 'comments', 'tags') + labels = { + 'scope_id': _('Scope ID'), + } class VirtualMachineImportForm(NetBoxModelImportForm): diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py index 7c040d948..695641e4e 100644 --- a/netbox/virtualization/forms/filtersets.py +++ b/netbox/virtualization/forms/filtersets.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup +from dcim.models import Device, DeviceRole, Location, Platform, Region, Site, SiteGroup from extras.forms import LocalConfigContextFilterForm from extras.models import ConfigTemplate from ipam.models import VRF @@ -43,7 +43,7 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('group_id', 'type_id', 'status', name=_('Attributes')), - FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')), ) @@ -58,11 +58,6 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi required=False, label=_('Region') ) - status = forms.MultipleChoiceField( - label=_('Status'), - choices=ClusterStatusChoices, - required=False - ) site_group_id = DynamicModelMultipleChoiceField( queryset=SiteGroup.objects.all(), required=False, @@ -78,6 +73,16 @@ class ClusterFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi }, label=_('Site') ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) + status = forms.MultipleChoiceField( + label=_('Status'), + choices=ClusterStatusChoices, + required=False + ) group_id = DynamicModelMultipleChoiceField( queryset=ClusterGroup.objects.all(), required=False, diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 4527e7f4c..44c67d389 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -4,6 +4,7 @@ from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ from dcim.forms.common import InterfaceCommonForm +from dcim.forms.mixins import ScopedForm from dcim.models import Device, DeviceRole, Platform, Rack, Region, Site, SiteGroup from extras.models import ConfigTemplate from ipam.choices import VLANQinQRoleChoices @@ -58,7 +59,7 @@ class ClusterGroupForm(NetBoxModelForm): ) -class ClusterForm(TenancyForm, NetBoxModelForm): +class ClusterForm(TenancyForm, ScopedForm, NetBoxModelForm): type = DynamicModelChoiceField( label=_('Type'), queryset=ClusterType.objects.all() @@ -68,23 +69,18 @@ class ClusterForm(TenancyForm, NetBoxModelForm): queryset=ClusterGroup.objects.all(), required=False ) - site = DynamicModelChoiceField( - label=_('Site'), - queryset=Site.objects.all(), - required=False, - selector=True - ) comments = CommentField() fieldsets = ( - FieldSet('name', 'type', 'group', 'site', 'status', 'description', 'tags', name=_('Cluster')), + FieldSet('name', 'type', 'group', 'status', 'description', 'tags', name=_('Cluster')), + FieldSet('scope_type', 'scope', name=_('Scope')), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), ) class Meta: model = Cluster fields = ( - 'name', 'type', 'group', 'status', 'tenant', 'site', 'description', 'comments', 'tags', + 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'description', 'comments', 'tags', ) diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index 79b5cb216..f51e0e3f5 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -1,4 +1,4 @@ -from typing import Annotated, List +from typing import Annotated, List, Union import strawberry import strawberry_django @@ -31,18 +31,25 @@ class ComponentType(NetBoxObjectType): @strawberry_django.type( models.Cluster, - fields='__all__', + exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_site_group'), filters=ClusterFilter ) class ClusterType(VLANGroupsMixin, NetBoxObjectType): type: Annotated["ClusterTypeType", strawberry.lazy('virtualization.graphql.types')] | None group: Annotated["ClusterGroupType", strawberry.lazy('virtualization.graphql.types')] | None tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None - site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')] | None - virtual_machines: List[Annotated["VirtualMachineType", strawberry.lazy('virtualization.graphql.types')]] devices: List[Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')]] + @strawberry_django.field + def scope(self) -> Annotated[Union[ + Annotated["LocationType", strawberry.lazy('dcim.graphql.types')], + Annotated["RegionType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteType", strawberry.lazy('dcim.graphql.types')], + ], strawberry.union("ClusterScopeType")] | None: + return self.scope + @strawberry_django.type( models.ClusterGroup, diff --git a/netbox/virtualization/migrations/0044_cluster_scope.py b/netbox/virtualization/migrations/0044_cluster_scope.py new file mode 100644 index 000000000..63a888ac3 --- /dev/null +++ b/netbox/virtualization/migrations/0044_cluster_scope.py @@ -0,0 +1,51 @@ +import django.db.models.deletion +from django.db import migrations, models + + +def copy_site_assignments(apps, schema_editor): + """ + Copy site ForeignKey values to the scope GFK. + """ + ContentType = apps.get_model('contenttypes', 'ContentType') + Cluster = apps.get_model('virtualization', 'Cluster') + Site = apps.get_model('dcim', 'Site') + + Cluster.objects.filter(site__isnull=False).update( + scope_type=ContentType.objects.get_for_model(Site), + scope_id=models.F('site_id') + ) + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('virtualization', '0043_qinq_svlan'), + ] + + operations = [ + migrations.AddField( + model_name='cluster', + name='scope_id', + field=models.PositiveBigIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='cluster', + name='scope_type', + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location'))), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + + # Copy over existing site assignments + migrations.RunPython( + code=copy_site_assignments, + reverse_code=migrations.RunPython.noop + ), + + ] diff --git a/netbox/virtualization/migrations/0045_clusters_cached_relations.py b/netbox/virtualization/migrations/0045_clusters_cached_relations.py new file mode 100644 index 000000000..ff851aa7c --- /dev/null +++ b/netbox/virtualization/migrations/0045_clusters_cached_relations.py @@ -0,0 +1,94 @@ +import django.db.models.deletion +from django.db import migrations, models + + +def populate_denormalized_fields(apps, schema_editor): + """ + Copy the denormalized fields for _region, _site_group and _site from existing site field. + """ + Cluster = apps.get_model('virtualization', 'Cluster') + + clusters = Cluster.objects.filter(site__isnull=False).prefetch_related('site') + for cluster in clusters: + cluster._region_id = cluster.site.region_id + cluster._site_group_id = cluster.site.group_id + cluster._site_id = cluster.site_id + # Note: Location cannot be set prior to migration + + Cluster.objects.bulk_update(clusters, ['_region', '_site_group', '_site']) + + +class Migration(migrations.Migration): + + dependencies = [ + ('virtualization', '0044_cluster_scope'), + ] + + operations = [ + migrations.AddField( + model_name='cluster', + name='_location', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.location', + ), + ), + migrations.AddField( + model_name='cluster', + name='_region', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.region', + ), + ), + migrations.AddField( + model_name='cluster', + name='_site', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.site', + ), + ), + migrations.AddField( + model_name='cluster', + name='_site_group', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.sitegroup', + ), + ), + + # Populate denormalized FK values + migrations.RunPython( + code=populate_denormalized_fields, + reverse_code=migrations.RunPython.noop + ), + + migrations.RemoveConstraint( + model_name='cluster', + name='virtualization_cluster_unique_site_name', + ), + # Delete the site ForeignKey + migrations.RemoveField( + model_name='cluster', + name='site', + ), + migrations.AddConstraint( + model_name='cluster', + constraint=models.UniqueConstraint( + fields=('_site', 'name'), name='virtualization_cluster_unique__site_name' + ), + ), + ] diff --git a/netbox/virtualization/models/clusters.py b/netbox/virtualization/models/clusters.py index b8921c603..601ee7f23 100644 --- a/netbox/virtualization/models/clusters.py +++ b/netbox/virtualization/models/clusters.py @@ -1,9 +1,11 @@ +from django.apps import apps from django.contrib.contenttypes.fields import GenericRelation from django.core.exceptions import ValidationError from django.db import models from django.utils.translation import gettext_lazy as _ from dcim.models import Device +from dcim.models.mixins import CachedScopeMixin from netbox.models import OrganizationalModel, PrimaryModel from netbox.models.features import ContactsMixin from virtualization.choices import * @@ -42,7 +44,7 @@ class ClusterGroup(ContactsMixin, OrganizationalModel): verbose_name_plural = _('cluster groups') -class Cluster(ContactsMixin, PrimaryModel): +class Cluster(ContactsMixin, CachedScopeMixin, PrimaryModel): """ A cluster of VirtualMachines. Each Cluster may optionally be associated with one or more Devices. """ @@ -76,13 +78,6 @@ class Cluster(ContactsMixin, PrimaryModel): blank=True, null=True ) - site = models.ForeignKey( - to='dcim.Site', - on_delete=models.PROTECT, - related_name='clusters', - blank=True, - null=True - ) # Generic relations vlan_groups = GenericRelation( @@ -93,7 +88,7 @@ class Cluster(ContactsMixin, PrimaryModel): ) clone_fields = ( - 'type', 'group', 'status', 'tenant', 'site', + 'scope_type', 'scope_id', 'type', 'group', 'status', 'tenant', ) prerequisite_models = ( 'virtualization.ClusterType', @@ -107,8 +102,8 @@ class Cluster(ContactsMixin, PrimaryModel): name='%(app_label)s_%(class)s_unique_group_name' ), models.UniqueConstraint( - fields=('site', 'name'), - name='%(app_label)s_%(class)s_unique_site_name' + fields=('_site', 'name'), + name='%(app_label)s_%(class)s_unique__site_name' ), ) verbose_name = _('cluster') @@ -123,11 +118,28 @@ class Cluster(ContactsMixin, PrimaryModel): def clean(self): super().clean() + site = location = None + if self.scope_type: + scope_type = self.scope_type.model_class() + if scope_type == apps.get_model('dcim', 'site'): + site = self.scope + elif scope_type == apps.get_model('dcim', 'location'): + location = self.scope + site = location.site + # If the Cluster is assigned to a Site, verify that all host Devices belong to that Site. - if not self._state.adding and self.site: - if nonsite_devices := Device.objects.filter(cluster=self).exclude(site=self.site).count(): - raise ValidationError({ - 'site': _( - "{count} devices are assigned as hosts for this cluster but are not in site {site}" - ).format(count=nonsite_devices, site=self.site) - }) + if not self._state.adding: + if site: + if nonsite_devices := Device.objects.filter(cluster=self).exclude(site=site).count(): + raise ValidationError({ + 'scope': _( + "{count} devices are assigned as hosts for this cluster but are not in site {site}" + ).format(count=nonsite_devices, site=site) + }) + if location: + if nonlocation_devices := Device.objects.filter(cluster=self).exclude(location=location).count(): + raise ValidationError({ + 'scope': _( + "{count} devices are assigned as hosts for this cluster but are not in location {location}" + ).format(count=nonlocation_devices, location=location) + }) diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index da8419e88..4ee41e403 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -181,7 +181,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co }) # Validate site for cluster & VM - if self.cluster and self.site and self.cluster.site and self.cluster.site != self.site: + if self.cluster and self.site and self.cluster._site and self.cluster._site != self.site: raise ValidationError({ 'cluster': _( 'The selected cluster ({cluster}) is not assigned to this site ({site}).' @@ -238,7 +238,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co # Assign site from cluster if not set if self.cluster and not self.site: - self.site = self.cluster.site + self.site = self.cluster._site super().save(*args, **kwargs) diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index d3c799fb9..91807e35b 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -73,8 +73,11 @@ class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): status = columns.ChoiceFieldColumn( verbose_name=_('Status'), ) - site = tables.Column( - verbose_name=_('Site'), + scope_type = columns.ContentTypeColumn( + verbose_name=_('Scope Type'), + ) + scope = tables.Column( + verbose_name=_('Scope'), linkify=True ) device_count = columns.LinkedCountColumn( @@ -97,7 +100,7 @@ class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): class Meta(NetBoxTable.Meta): model = Cluster fields = ( - 'pk', 'id', 'name', 'type', 'group', 'status', 'tenant', 'tenant_group', 'site', 'description', 'comments', - 'device_count', 'vm_count', 'contacts', 'tags', 'created', 'last_updated', + 'pk', 'id', 'name', 'type', 'group', 'status', 'tenant', 'tenant_group', 'scope', 'scope_type', 'description', + 'comments', 'device_count', 'vm_count', 'contacts', 'tags', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'type', 'group', 'status', 'tenant', 'site', 'device_count', 'vm_count') diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 521064fc6..149b64684 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -113,7 +113,8 @@ class ClusterTest(APIViewTestCases.APIViewTestCase): Cluster(name='Cluster 2', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), Cluster(name='Cluster 3', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() cls.create_data = [ { @@ -157,11 +158,12 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase): Site.objects.bulk_create(sites) clusters = ( - Cluster(name='Cluster 1', type=clustertype, site=sites[0], group=clustergroup), - Cluster(name='Cluster 2', type=clustertype, site=sites[1], group=clustergroup), + Cluster(name='Cluster 1', type=clustertype, scope=sites[0], group=clustergroup), + Cluster(name='Cluster 2', type=clustertype, scope=sites[1], group=clustergroup), Cluster(name='Cluster 3', type=clustertype), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() device1 = create_test_device('device1', site=sites[0], cluster=clusters[0]) device2 = create_test_device('device2', site=sites[1], cluster=clusters[1]) diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py index 0c7079bba..5a5bf2325 100644 --- a/netbox/virtualization/tests/test_filtersets.py +++ b/netbox/virtualization/tests/test_filtersets.py @@ -138,7 +138,7 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests): type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED, - site=sites[0], + scope=sites[0], tenant=tenants[0], description='foobar1' ), @@ -147,7 +147,7 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests): type=cluster_types[1], group=cluster_groups[1], status=ClusterStatusChoices.STATUS_STAGING, - site=sites[1], + scope=sites[1], tenant=tenants[1], description='foobar2' ), @@ -156,12 +156,13 @@ class ClusterTestCase(TestCase, ChangeLoggedFilterSetTests): type=cluster_types[2], group=cluster_groups[2], status=ClusterStatusChoices.STATUS_ACTIVE, - site=sites[2], + scope=sites[2], tenant=tenants[2], description='foobar3' ), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() def test_q(self): params = {'q': 'foobar1'} @@ -274,11 +275,12 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests): Site.objects.bulk_create(sites) clusters = ( - Cluster(name='Cluster 1', type=cluster_types[0], group=cluster_groups[0], site=sites[0]), - Cluster(name='Cluster 2', type=cluster_types[1], group=cluster_groups[1], site=sites[1]), - Cluster(name='Cluster 3', type=cluster_types[2], group=cluster_groups[2], site=sites[2]), + Cluster(name='Cluster 1', type=cluster_types[0], group=cluster_groups[0], scope=sites[0]), + Cluster(name='Cluster 2', type=cluster_types[1], group=cluster_groups[1], scope=sites[1]), + Cluster(name='Cluster 3', type=cluster_types[2], group=cluster_groups[2], scope=sites[2]), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() platforms = ( Platform(name='Platform 1', slug='platform-1'), diff --git a/netbox/virtualization/tests/test_models.py b/netbox/virtualization/tests/test_models.py index a4e8d7947..7be423bf1 100644 --- a/netbox/virtualization/tests/test_models.py +++ b/netbox/virtualization/tests/test_models.py @@ -54,11 +54,12 @@ class VirtualMachineTestCase(TestCase): Site.objects.bulk_create(sites) clusters = ( - Cluster(name='Cluster 1', type=cluster_type, site=sites[0]), - Cluster(name='Cluster 2', type=cluster_type, site=sites[1]), - Cluster(name='Cluster 3', type=cluster_type, site=None), + Cluster(name='Cluster 1', type=cluster_type, scope=sites[0]), + Cluster(name='Cluster 2', type=cluster_type, scope=sites[1]), + Cluster(name='Cluster 3', type=cluster_type, scope=None), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() # VM with site only should pass VirtualMachine(name='vm1', site=sites[0]).full_clean() diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index 3c6a058c9..b9cb7b437 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -1,3 +1,4 @@ +from django.contrib.contenttypes.models import ContentType from django.test import override_settings from django.urls import reverse from netaddr import EUI @@ -117,11 +118,12 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase): ClusterType.objects.bulk_create(clustertypes) clusters = ( - Cluster(name='Cluster 1', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), - Cluster(name='Cluster 2', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), - Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, site=sites[0]), + Cluster(name='Cluster 1', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), + Cluster(name='Cluster 2', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), + Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() tags = create_tags('Alpha', 'Bravo', 'Charlie') @@ -131,7 +133,8 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'type': clustertypes[1].pk, 'status': ClusterStatusChoices.STATUS_OFFLINE, 'tenant': None, - 'site': sites[1].pk, + 'scope_type': ContentType.objects.get_for_model(Site).pk, + 'scope': sites[1].pk, 'comments': 'Some comments', 'tags': [t.pk for t in tags], } @@ -155,7 +158,6 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'type': clustertypes[1].pk, 'status': ClusterStatusChoices.STATUS_OFFLINE, 'tenant': None, - 'site': sites[1].pk, 'comments': 'New comments', } @@ -201,10 +203,11 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase): clustertype = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1') clusters = ( - Cluster(name='Cluster 1', type=clustertype, site=sites[0]), - Cluster(name='Cluster 2', type=clustertype, site=sites[1]), + Cluster(name='Cluster 1', type=clustertype, scope=sites[0]), + Cluster(name='Cluster 2', type=clustertype, scope=sites[1]), ) - Cluster.objects.bulk_create(clusters) + for cluster in clusters: + cluster.save() devices = ( create_test_device('device1', site=sites[0], cluster=clusters[0]), @@ -292,7 +295,7 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase): site = Site.objects.create(name='Site 1', slug='site-1') role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') clustertype = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1') - cluster = Cluster.objects.create(name='Cluster 1', type=clustertype, site=site) + cluster = Cluster.objects.create(name='Cluster 1', type=clustertype, scope=site) virtualmachines = ( VirtualMachine(name='Virtual Machine 1', site=site, cluster=cluster, role=role), VirtualMachine(name='Virtual Machine 2', site=site, cluster=cluster, role=role), From 4bba92617d88f1eb63e9fc8894d54a928a34d9f2 Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Fri, 1 Nov 2024 19:56:08 +0100 Subject: [PATCH 024/190] Closes #16971: Add system jobs (#17716) * Fix check for existing jobs If a job is to be enqueued once and no specific scheduled time is specified, any scheduled time of existing jobs will be valid. Only if a specific scheduled time is specified for 'enqueue_once()' can it be evaluated. * Allow system jobs to be registered A new registry key allows background system jobs to be registered and automatically scheduled when rqworker starts. * Test scheduling of system jobs * Fix plugins scheduled job documentation The documentation reflected a non-production state of the JobRunner framework left over from development. Now a more practical example demonstrates the usage. * Allow plugins to register system jobs * Rename system job metadata To clarify which meta-attributes belong to system jobs, each of them is now prefixed with 'system_'. * Add predefined job interval choices * Remove 'system_enabled' JobRunner attribute Previously, the 'system_enabled' attribute was used to control whether a job should run or not. However, this can also be accomplished by evaluating the job's interval. * Fix test * Use a decorator to register system jobs * Specify interval when registering system job * Update documentation --------- Co-authored-by: Jeremy Stretch --- docs/plugins/development/background-jobs.md | 53 +++++++++++++++----- docs/plugins/development/data-backends.md | 2 +- netbox/core/choices.py | 14 ++++++ netbox/core/management/commands/rqworker.py | 11 ++++ netbox/netbox/jobs.py | 21 +++++++- netbox/netbox/registry.py | 1 + netbox/netbox/tests/dummy_plugin/__init__.py | 5 ++ netbox/netbox/tests/dummy_plugin/jobs.py | 9 ++++ netbox/netbox/tests/test_jobs.py | 36 +++++++++++++ netbox/netbox/tests/test_plugins.py | 9 ++++ 10 files changed, 147 insertions(+), 14 deletions(-) create mode 100644 netbox/netbox/tests/dummy_plugin/jobs.py diff --git a/docs/plugins/development/background-jobs.md b/docs/plugins/development/background-jobs.md index 873390a58..d51981b9e 100644 --- a/docs/plugins/development/background-jobs.md +++ b/docs/plugins/development/background-jobs.md @@ -29,6 +29,9 @@ class MyTestJob(JobRunner): You can schedule the background job from within your code (e.g. from a model's `save()` method or a view) by calling `MyTestJob.enqueue()`. This method passes through all arguments to `Job.enqueue()`. However, no `name` argument must be passed, as the background job name will be used instead. +!!! tip + A set of predefined intervals is available at `core.choices.JobIntervalChoices` for convenience. + ### Attributes `JobRunner` attributes are defined under a class named `Meta` within the job. These are optional, but encouraged. @@ -46,26 +49,52 @@ As described above, jobs can be scheduled for immediate execution or at any late #### Example +```python title="models.py" +from django.db import models +from core.choices import JobIntervalChoices +from netbox.models import NetBoxModel +from .jobs import MyTestJob + +class MyModel(NetBoxModel): + foo = models.CharField() + + def save(self, *args, **kwargs): + MyTestJob.enqueue_once(instance=self, interval=JobIntervalChoices.INTERVAL_HOURLY) + return super().save(*args, **kwargs) + + def sync(self): + MyTestJob.enqueue(instance=self) +``` + + +### System Jobs + +Some plugins may implement background jobs that are decoupled from the request/response cycle. Typical use cases would be housekeeping tasks or synchronization jobs. These can be registered as _system jobs_ using the `system_job()` decorator. The job interval must be passed as an integer (in minutes) when registering a system job. System jobs are scheduled automatically when the RQ worker (`manage.py rqworker`) is run. + +#### Example + ```python title="jobs.py" -from netbox.jobs import JobRunner - +from core.choices import JobIntervalChoices +from netbox.jobs import JobRunner, system_job +from .models import MyModel +# Specify a predefined choice or an integer indicating +# the number of minutes between job executions +@system_job(interval=JobIntervalChoices.INTERVAL_HOURLY) class MyHousekeepingJob(JobRunner): class Meta: - name = "Housekeeping" + name = "My Housekeeping Job" def run(self, *args, **kwargs): - # your logic goes here + MyModel.objects.filter(foo='bar').delete() + +system_jobs = ( + MyHousekeepingJob, +) ``` -```python title="__init__.py" -from netbox.plugins import PluginConfig - -class MyPluginConfig(PluginConfig): - def ready(self): - from .jobs import MyHousekeepingJob - MyHousekeepingJob.setup(interval=60) -``` +!!! note + Ensure that any system jobs are imported on initialization. Otherwise, they won't be registered. This can be achieved by extending the PluginConfig's `ready()` method. ## Task queues diff --git a/docs/plugins/development/data-backends.md b/docs/plugins/development/data-backends.md index 8b7226a41..0c6d44d95 100644 --- a/docs/plugins/development/data-backends.md +++ b/docs/plugins/development/data-backends.md @@ -18,6 +18,6 @@ backends = [MyDataBackend] ``` !!! tip - The path to the list of search indexes can be modified by setting `data_backends` in the PluginConfig instance. + The path to the list of data backends can be modified by setting `data_backends` in the PluginConfig instance. ::: netbox.data_backends.DataBackend diff --git a/netbox/core/choices.py b/netbox/core/choices.py index 01a072ce1..442acc26b 100644 --- a/netbox/core/choices.py +++ b/netbox/core/choices.py @@ -72,6 +72,20 @@ class JobStatusChoices(ChoiceSet): ) +class JobIntervalChoices(ChoiceSet): + INTERVAL_MINUTELY = 1 + INTERVAL_HOURLY = 60 + INTERVAL_DAILY = 60 * 24 + INTERVAL_WEEKLY = 60 * 24 * 7 + + CHOICES = ( + (INTERVAL_MINUTELY, _('Minutely')), + (INTERVAL_HOURLY, _('Hourly')), + (INTERVAL_DAILY, _('Daily')), + (INTERVAL_WEEKLY, _('Weekly')), + ) + + # # ObjectChanges # diff --git a/netbox/core/management/commands/rqworker.py b/netbox/core/management/commands/rqworker.py index e1fb6fd11..b2879c3d8 100644 --- a/netbox/core/management/commands/rqworker.py +++ b/netbox/core/management/commands/rqworker.py @@ -2,6 +2,8 @@ import logging from django_rq.management.commands.rqworker import Command as _Command +from netbox.registry import registry + DEFAULT_QUEUES = ('high', 'default', 'low') @@ -14,6 +16,15 @@ class Command(_Command): of only the 'default' queue). """ def handle(self, *args, **options): + # Setup system jobs. + for job, kwargs in registry['system_jobs'].items(): + try: + interval = kwargs['interval'] + except KeyError: + raise TypeError("System job must specify an interval (in minutes).") + logger.debug(f"Scheduling system job {job.name} (interval={interval})") + job.enqueue_once(**kwargs) + # Run the worker with scheduler functionality options['with_scheduler'] = True diff --git a/netbox/netbox/jobs.py b/netbox/netbox/jobs.py index ae8f2f109..965ebc9e9 100644 --- a/netbox/netbox/jobs.py +++ b/netbox/netbox/jobs.py @@ -2,6 +2,7 @@ import logging from abc import ABC, abstractmethod from datetime import timedelta +from django.core.exceptions import ImproperlyConfigured from django.utils.functional import classproperty from django_pglocks import advisory_lock from rq.timeouts import JobTimeoutException @@ -9,12 +10,30 @@ from rq.timeouts import JobTimeoutException from core.choices import JobStatusChoices from core.models import Job, ObjectType from netbox.constants import ADVISORY_LOCK_KEYS +from netbox.registry import registry __all__ = ( 'JobRunner', + 'system_job', ) +def system_job(interval): + """ + Decorator for registering a `JobRunner` class as system background job. + """ + if type(interval) is not int: + raise ImproperlyConfigured("System job interval must be an integer (minutes).") + + def _wrapper(cls): + registry['system_jobs'][cls] = { + 'interval': interval + } + return cls + + return _wrapper + + class JobRunner(ABC): """ Background Job helper class. @@ -129,7 +148,7 @@ class JobRunner(ABC): if job: # If the job parameters haven't changed, don't schedule a new job and keep the current schedule. Otherwise, # delete the existing job and schedule a new job instead. - if (schedule_at and job.scheduled == schedule_at) and (job.interval == interval): + if (not schedule_at or job.scheduled == schedule_at) and (job.interval == interval): return job job.delete() diff --git a/netbox/netbox/registry.py b/netbox/netbox/registry.py index 0920cbccf..48d7921f2 100644 --- a/netbox/netbox/registry.py +++ b/netbox/netbox/registry.py @@ -30,6 +30,7 @@ registry = Registry({ 'models': collections.defaultdict(set), 'plugins': dict(), 'search': dict(), + 'system_jobs': dict(), 'tables': collections.defaultdict(dict), 'views': collections.defaultdict(dict), 'widgets': dict(), diff --git a/netbox/netbox/tests/dummy_plugin/__init__.py b/netbox/netbox/tests/dummy_plugin/__init__.py index 6ab62d638..2ca7c290c 100644 --- a/netbox/netbox/tests/dummy_plugin/__init__.py +++ b/netbox/netbox/tests/dummy_plugin/__init__.py @@ -21,5 +21,10 @@ class DummyPluginConfig(PluginConfig): 'netbox.tests.dummy_plugin.events.process_events_queue' ] + def ready(self): + super().ready() + + from . import jobs # noqa: F401 + config = DummyPluginConfig diff --git a/netbox/netbox/tests/dummy_plugin/jobs.py b/netbox/netbox/tests/dummy_plugin/jobs.py new file mode 100644 index 000000000..3b9dc7a5f --- /dev/null +++ b/netbox/netbox/tests/dummy_plugin/jobs.py @@ -0,0 +1,9 @@ +from core.choices import JobIntervalChoices +from netbox.jobs import JobRunner, system_job + + +@system_job(interval=JobIntervalChoices.INTERVAL_HOURLY) +class DummySystemJob(JobRunner): + + def run(self, *args, **kwargs): + pass diff --git a/netbox/netbox/tests/test_jobs.py b/netbox/netbox/tests/test_jobs.py index 52a7bd97a..e3e24a235 100644 --- a/netbox/netbox/tests/test_jobs.py +++ b/netbox/netbox/tests/test_jobs.py @@ -90,6 +90,15 @@ class EnqueueTest(JobRunnerTestCase): self.assertEqual(job1, job2) self.assertEqual(TestJobRunner.get_jobs(instance).count(), 1) + def test_enqueue_once_twice_same_no_schedule_at(self): + instance = DataSource() + schedule_at = self.get_schedule_at() + job1 = TestJobRunner.enqueue_once(instance, schedule_at=schedule_at) + job2 = TestJobRunner.enqueue_once(instance) + + self.assertEqual(job1, job2) + self.assertEqual(TestJobRunner.get_jobs(instance).count(), 1) + def test_enqueue_once_twice_different_schedule_at(self): instance = DataSource() job1 = TestJobRunner.enqueue_once(instance, schedule_at=self.get_schedule_at()) @@ -127,3 +136,30 @@ class EnqueueTest(JobRunnerTestCase): self.assertNotEqual(job1, job2) self.assertRaises(Job.DoesNotExist, job1.refresh_from_db) self.assertEqual(TestJobRunner.get_jobs(instance).count(), 1) + + +class SystemJobTest(JobRunnerTestCase): + """ + Test that system jobs can be scheduled. + + General functionality already tested by `JobRunnerTest` and `EnqueueTest`. + """ + + def test_scheduling(self): + # Can job be enqueued? + job = TestJobRunner.enqueue(schedule_at=self.get_schedule_at()) + self.assertIsInstance(job, Job) + self.assertEqual(TestJobRunner.get_jobs().count(), 1) + + # Can job be deleted again? + job.delete() + self.assertRaises(Job.DoesNotExist, job.refresh_from_db) + self.assertEqual(TestJobRunner.get_jobs().count(), 0) + + def test_enqueue_once(self): + schedule_at = self.get_schedule_at() + job1 = TestJobRunner.enqueue_once(schedule_at=schedule_at) + job2 = TestJobRunner.enqueue_once(schedule_at=schedule_at) + + self.assertEqual(job1, job2) + self.assertEqual(TestJobRunner.get_jobs().count(), 1) diff --git a/netbox/netbox/tests/test_plugins.py b/netbox/netbox/tests/test_plugins.py index 16778667d..db82d0a75 100644 --- a/netbox/netbox/tests/test_plugins.py +++ b/netbox/netbox/tests/test_plugins.py @@ -5,8 +5,10 @@ from django.core.exceptions import ImproperlyConfigured from django.test import Client, TestCase, override_settings from django.urls import reverse +from core.choices import JobIntervalChoices from netbox.tests.dummy_plugin import config as dummy_config from netbox.tests.dummy_plugin.data_backends import DummyBackend +from netbox.tests.dummy_plugin.jobs import DummySystemJob from netbox.plugins.navigation import PluginMenu from netbox.plugins.utils import get_plugin_config from netbox.graphql.schema import Query @@ -130,6 +132,13 @@ class PluginTest(TestCase): self.assertIn('dummy', registry['data_backends']) self.assertIs(registry['data_backends']['dummy'], DummyBackend) + def test_system_jobs(self): + """ + Check registered system jobs. + """ + self.assertIn(DummySystemJob, registry['system_jobs']) + self.assertEqual(registry['system_jobs'][DummySystemJob]['interval'], JobIntervalChoices.INTERVAL_HOURLY) + def test_queues(self): """ Check that plugin queues are registered with the accurate name. From 812ce8471a17656a82f6599e018e5b5319febfaf Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 7 Nov 2024 07:28:02 -0800 Subject: [PATCH 025/190] 10711 Add Scope to WirelessLAN (#17877) * 7699 Add Scope to Cluster * 7699 Serializer * 7699 filterset * 7699 bulk_edit * 7699 bulk_import * 7699 model_form * 7699 graphql, tables * 7699 fixes * 7699 fixes * 7699 fixes * 7699 fixes * 7699 fix tests * 7699 fix graphql tests for clusters reference * 7699 fix dcim tests * 7699 fix ipam tests * 7699 fix tests * 7699 use mixin for model * 7699 change mixin name * 7699 scope form * 7699 scope form * 7699 scoped form, fitlerset * 7699 review changes * 7699 move ScopedFilterset * 7699 move CachedScopeMixin * 7699 review changes * 10711 Add Scope to WirelessLAN * 10711 Add Scope to WirelessLAN * 10711 Add Scope to WirelessLAN * 10711 Add Scope to WirelessLAN * 10711 Add Scope to WirelessLAN * 7699 review changes * 7699 refactor mixins * 7699 _sitegroup -> _site_group * 7699 update docstring * fix model * remove old constants, update filtersets * 10711 fix GraphQL * 10711 fix API * 10711 add tests * 10711 review changes * 10711 add tests * 10711 add scope to detail template * 10711 add api test * Extend CSV test data --------- Co-authored-by: Jeremy Stretch --- docs/models/wireless/wirelesslan.md | 4 + netbox/templates/wireless/wirelesslan.html | 8 ++ .../wireless/api/serializers_/wirelesslans.py | 28 ++++++- netbox/wireless/filtersets.py | 5 +- netbox/wireless/forms/bulk_edit.py | 6 +- netbox/wireless/forms/bulk_import.py | 12 ++- netbox/wireless/forms/filtersets.py | 27 +++++++ netbox/wireless/forms/model_forms.py | 6 +- netbox/wireless/graphql/types.py | 13 +++- ...__location_wirelesslan__region_and_more.py | 77 ++++++++++++++++++ netbox/wireless/models.py | 5 +- netbox/wireless/tables/wirelesslan.py | 9 ++- netbox/wireless/tests/test_api.py | 10 ++- netbox/wireless/tests/test_filtersets.py | 78 +++++++++++++++++-- netbox/wireless/tests/test_views.py | 19 +++-- 15 files changed, 277 insertions(+), 30 deletions(-) create mode 100644 netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py diff --git a/docs/models/wireless/wirelesslan.md b/docs/models/wireless/wirelesslan.md index 0f50fa75f..a448c42a2 100644 --- a/docs/models/wireless/wirelesslan.md +++ b/docs/models/wireless/wirelesslan.md @@ -43,3 +43,7 @@ The security cipher used to apply wireless authentication. Options include: ### Pre-Shared Key The security key configured on each client to grant access to the secured wireless LAN. This applies only to certain authentication types. + +### Scope + +The [region](../dcim/region.md), [site](../dcim/site.md), [site group](../dcim/sitegroup.md) or [location](../dcim/location.md) with which this wireless LAN is associated. diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html index 493c36132..54473ea54 100644 --- a/netbox/templates/wireless/wirelesslan.html +++ b/netbox/templates/wireless/wirelesslan.html @@ -22,6 +22,14 @@ {% trans "Status" %} {% badge object.get_status_display bg_color=object.get_status_color %} + + {% trans "Scope" %} + {% if object.scope %} + {{ object.scope|linkify }} ({% trans object.scope_type.name %}) + {% else %} + {{ ''|placeholder }} + {% endif %} + {% trans "Description" %} {{ object.description|placeholder }} diff --git a/netbox/wireless/api/serializers_/wirelesslans.py b/netbox/wireless/api/serializers_/wirelesslans.py index 6c5deeb26..637089277 100644 --- a/netbox/wireless/api/serializers_/wirelesslans.py +++ b/netbox/wireless/api/serializers_/wirelesslans.py @@ -1,9 +1,13 @@ from rest_framework import serializers +from dcim.constants import LOCATION_SCOPE_TYPES +from django.contrib.contenttypes.models import ContentType +from drf_spectacular.utils import extend_schema_field from ipam.api.serializers_.vlans import VLANSerializer -from netbox.api.fields import ChoiceField +from netbox.api.fields import ChoiceField, ContentTypeField from netbox.api.serializers import NestedGroupModelSerializer, NetBoxModelSerializer from tenancy.api.serializers_.tenants import TenantSerializer +from utilities.api import get_serializer_for_model from wireless.choices import * from wireless.models import WirelessLAN, WirelessLANGroup from .nested import NestedWirelessLANGroupSerializer @@ -34,12 +38,30 @@ class WirelessLANSerializer(NetBoxModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) auth_type = ChoiceField(choices=WirelessAuthTypeChoices, required=False, allow_blank=True) auth_cipher = ChoiceField(choices=WirelessAuthCipherChoices, required=False, allow_blank=True) + scope_type = ContentTypeField( + queryset=ContentType.objects.filter( + model__in=LOCATION_SCOPE_TYPES + ), + allow_null=True, + required=False, + default=None + ) + scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) + scope = serializers.SerializerMethodField(read_only=True) class Meta: model = WirelessLAN fields = [ - 'id', 'url', 'display_url', 'display', 'ssid', 'description', 'group', 'status', 'vlan', 'tenant', - 'auth_type', 'auth_cipher', 'auth_psk', 'description', 'comments', 'tags', 'custom_fields', + 'id', 'url', 'display_url', 'display', 'ssid', 'description', 'group', 'status', 'vlan', 'scope_type', 'scope_id', 'scope', + 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'ssid', 'description') + + @extend_schema_field(serializers.JSONField(allow_null=True)) + def get_scope(self, obj): + if obj.scope_id is None: + return None + serializer = get_serializer_for_model(obj.scope) + context = {'request': self.context['request']} + return serializer(obj.scope, nested=True, context=context).data diff --git a/netbox/wireless/filtersets.py b/netbox/wireless/filtersets.py index 537b2ec5c..5a4195e6c 100644 --- a/netbox/wireless/filtersets.py +++ b/netbox/wireless/filtersets.py @@ -2,6 +2,7 @@ import django_filters from django.db.models import Q from dcim.choices import LinkStatusChoices +from dcim.filtersets import ScopedFilterSet from dcim.models import Interface from ipam.models import VLAN from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet @@ -43,7 +44,7 @@ class WirelessLANGroupFilterSet(OrganizationalModelFilterSet): fields = ('id', 'name', 'slug', 'description') -class WirelessLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): +class WirelessLANFilterSet(NetBoxModelFilterSet, ScopedFilterSet, TenancyFilterSet): group_id = TreeNodeMultipleChoiceFilter( queryset=WirelessLANGroup.objects.all(), field_name='group', @@ -74,7 +75,7 @@ class WirelessLANFilterSet(NetBoxModelFilterSet, TenancyFilterSet): class Meta: model = WirelessLAN - fields = ('id', 'ssid', 'auth_psk', 'description') + fields = ('id', 'ssid', 'auth_psk', 'scope_id', 'description') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/wireless/forms/bulk_edit.py b/netbox/wireless/forms/bulk_edit.py index c8b378104..5cd3a157a 100644 --- a/netbox/wireless/forms/bulk_edit.py +++ b/netbox/wireless/forms/bulk_edit.py @@ -2,6 +2,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices +from dcim.forms.mixins import ScopedBulkEditForm from ipam.models import VLAN from netbox.choices import * from netbox.forms import NetBoxModelBulkEditForm @@ -39,7 +40,7 @@ class WirelessLANGroupBulkEditForm(NetBoxModelBulkEditForm): nullable_fields = ('parent', 'description') -class WirelessLANBulkEditForm(NetBoxModelBulkEditForm): +class WirelessLANBulkEditForm(ScopedBulkEditForm, NetBoxModelBulkEditForm): status = forms.ChoiceField( label=_('Status'), choices=add_blank_choice(WirelessLANStatusChoices), @@ -89,10 +90,11 @@ class WirelessLANBulkEditForm(NetBoxModelBulkEditForm): model = WirelessLAN fieldsets = ( FieldSet('group', 'ssid', 'status', 'vlan', 'tenant', 'description'), + FieldSet('scope_type', 'scope', name=_('Scope')), FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')), ) nullable_fields = ( - 'ssid', 'group', 'vlan', 'tenant', 'description', 'auth_type', 'auth_cipher', 'auth_psk', 'comments', + 'ssid', 'group', 'vlan', 'tenant', 'description', 'auth_type', 'auth_cipher', 'auth_psk', 'scope', 'comments', ) diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index cff3e49af..5bf2d7dcd 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -1,12 +1,13 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices +from dcim.forms.mixins import ScopedImportForm from dcim.models import Interface from ipam.models import VLAN from netbox.choices import * from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField from wireless.choices import * from wireless.models import * @@ -32,7 +33,7 @@ class WirelessLANGroupImportForm(NetBoxModelImportForm): fields = ('name', 'slug', 'parent', 'description', 'tags') -class WirelessLANImportForm(NetBoxModelImportForm): +class WirelessLANImportForm(ScopedImportForm, NetBoxModelImportForm): group = CSVModelChoiceField( label=_('Group'), queryset=WirelessLANGroup.objects.all(), @@ -75,9 +76,12 @@ class WirelessLANImportForm(NetBoxModelImportForm): class Meta: model = WirelessLAN fields = ( - 'ssid', 'group', 'status', 'vlan', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'description', - 'comments', 'tags', + 'ssid', 'group', 'status', 'vlan', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'scope_type', 'scope_id', + 'description', 'comments', 'tags', ) + labels = { + 'scope_id': _('Scope ID'), + } class WirelessLinkImportForm(NetBoxModelImportForm): diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py index 6439a2516..f62a3be06 100644 --- a/netbox/wireless/forms/filtersets.py +++ b/netbox/wireless/forms/filtersets.py @@ -2,6 +2,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices +from dcim.models import Location, Region, Site, SiteGroup from netbox.choices import * from netbox.forms import NetBoxModelFilterSetForm from tenancy.forms import TenancyFilterForm @@ -33,6 +34,7 @@ class WirelessLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('ssid', 'group_id', 'status', name=_('Attributes')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Scope')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')), ) @@ -65,6 +67,31 @@ class WirelessLANFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm): label=_('Pre-shared key'), required=False ) + region_id = DynamicModelMultipleChoiceField( + queryset=Region.objects.all(), + required=False, + label=_('Region') + ) + site_group_id = DynamicModelMultipleChoiceField( + queryset=SiteGroup.objects.all(), + required=False, + label=_('Site group') + ) + site_id = DynamicModelMultipleChoiceField( + queryset=Site.objects.all(), + required=False, + null_option='None', + query_params={ + 'region_id': '$region_id', + 'site_group_id': '$site_group_id', + }, + label=_('Site') + ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) tag = TagFilterField(model) diff --git a/netbox/wireless/forms/model_forms.py b/netbox/wireless/forms/model_forms.py index 7c2594271..877324b8c 100644 --- a/netbox/wireless/forms/model_forms.py +++ b/netbox/wireless/forms/model_forms.py @@ -2,6 +2,7 @@ from django.forms import PasswordInput from django.utils.translation import gettext_lazy as _ from dcim.models import Device, Interface, Location, Site +from dcim.forms.mixins import ScopedForm from ipam.models import VLAN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm @@ -35,7 +36,7 @@ class WirelessLANGroupForm(NetBoxModelForm): ] -class WirelessLANForm(TenancyForm, NetBoxModelForm): +class WirelessLANForm(ScopedForm, TenancyForm, NetBoxModelForm): group = DynamicModelChoiceField( label=_('Group'), queryset=WirelessLANGroup.objects.all(), @@ -51,6 +52,7 @@ class WirelessLANForm(TenancyForm, NetBoxModelForm): fieldsets = ( FieldSet('ssid', 'group', 'vlan', 'status', 'description', 'tags', name=_('Wireless LAN')), + FieldSet('scope_type', 'scope', name=_('Scope')), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')), ) @@ -59,7 +61,7 @@ class WirelessLANForm(TenancyForm, NetBoxModelForm): model = WirelessLAN fields = [ 'ssid', 'group', 'status', 'vlan', 'tenant_group', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', - 'description', 'comments', 'tags', + 'scope_type', 'description', 'comments', 'tags', ] widgets = { 'auth_psk': PasswordInput( diff --git a/netbox/wireless/graphql/types.py b/netbox/wireless/graphql/types.py index b24525fbe..aa44e9b9f 100644 --- a/netbox/wireless/graphql/types.py +++ b/netbox/wireless/graphql/types.py @@ -1,4 +1,4 @@ -from typing import Annotated, List +from typing import Annotated, List, Union import strawberry import strawberry_django @@ -28,7 +28,7 @@ class WirelessLANGroupType(OrganizationalObjectType): @strawberry_django.type( models.WirelessLAN, - fields='__all__', + exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_site_group'), filters=WirelessLANFilter ) class WirelessLANType(NetBoxObjectType): @@ -38,6 +38,15 @@ class WirelessLANType(NetBoxObjectType): interfaces: List[Annotated["InterfaceType", strawberry.lazy('dcim.graphql.types')]] + @strawberry_django.field + def scope(self) -> Annotated[Union[ + Annotated["LocationType", strawberry.lazy('dcim.graphql.types')], + Annotated["RegionType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')], + Annotated["SiteType", strawberry.lazy('dcim.graphql.types')], + ], strawberry.union("WirelessLANScopeType")] | None: + return self.scope + @strawberry_django.type( models.WirelessLink, diff --git a/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py b/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py new file mode 100644 index 000000000..ea4470641 --- /dev/null +++ b/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py @@ -0,0 +1,77 @@ +# Generated by Django 5.0.9 on 2024-11-04 16:00 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('dcim', '0196_qinq_svlan'), + ('wireless', '0010_charfield_null_choices'), + ] + + operations = [ + migrations.AddField( + model_name='wirelesslan', + name='_location', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.location', + ), + ), + migrations.AddField( + model_name='wirelesslan', + name='_region', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.region', + ), + ), + migrations.AddField( + model_name='wirelesslan', + name='_site', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.site', + ), + ), + migrations.AddField( + model_name='wirelesslan', + name='_site_group', + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='_%(class)ss', + to='dcim.sitegroup', + ), + ), + migrations.AddField( + model_name='wirelesslan', + name='scope_id', + field=models.PositiveBigIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='wirelesslan', + name='scope_type', + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location'))), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ] diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index 88c60d494..d78c893a6 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -4,6 +4,7 @@ from django.utils.translation import gettext_lazy as _ from dcim.choices import LinkStatusChoices from dcim.constants import WIRELESS_IFACE_TYPES +from dcim.models.mixins import CachedScopeMixin from netbox.models import NestedGroupModel, PrimaryModel from netbox.models.mixins import DistanceMixin from .choices import * @@ -71,7 +72,7 @@ class WirelessLANGroup(NestedGroupModel): verbose_name_plural = _('wireless LAN groups') -class WirelessLAN(WirelessAuthenticationBase, PrimaryModel): +class WirelessLAN(WirelessAuthenticationBase, CachedScopeMixin, PrimaryModel): """ A wireless network formed among an arbitrary number of access point and clients. """ @@ -107,7 +108,7 @@ class WirelessLAN(WirelessAuthenticationBase, PrimaryModel): null=True ) - clone_fields = ('ssid', 'group', 'tenant', 'description') + clone_fields = ('ssid', 'group', 'scope_type', 'scope_id', 'tenant', 'description') class Meta: ordering = ('ssid', 'pk') diff --git a/netbox/wireless/tables/wirelesslan.py b/netbox/wireless/tables/wirelesslan.py index 87ad4ac51..40f52f8a5 100644 --- a/netbox/wireless/tables/wirelesslan.py +++ b/netbox/wireless/tables/wirelesslan.py @@ -51,6 +51,13 @@ class WirelessLANTable(TenancyColumnsMixin, NetBoxTable): status = columns.ChoiceFieldColumn( verbose_name=_('Status'), ) + scope_type = columns.ContentTypeColumn( + verbose_name=_('Scope Type'), + ) + scope = tables.Column( + verbose_name=_('Scope'), + linkify=True + ) interface_count = tables.Column( verbose_name=_('Interfaces') ) @@ -65,7 +72,7 @@ class WirelessLANTable(TenancyColumnsMixin, NetBoxTable): model = WirelessLAN fields = ( 'pk', 'ssid', 'group', 'status', 'tenant', 'tenant_group', 'vlan', 'interface_count', 'auth_type', - 'auth_cipher', 'auth_psk', 'description', 'comments', 'tags', 'created', 'last_updated', + 'auth_cipher', 'auth_psk', 'scope', 'scope_type', 'description', 'comments', 'tags', 'created', 'last_updated', ) default_columns = ('pk', 'ssid', 'group', 'status', 'description', 'vlan', 'auth_type', 'interface_count') diff --git a/netbox/wireless/tests/test_api.py b/netbox/wireless/tests/test_api.py index 4b7545888..f768eafaf 100644 --- a/netbox/wireless/tests/test_api.py +++ b/netbox/wireless/tests/test_api.py @@ -1,7 +1,7 @@ from django.urls import reverse from dcim.choices import InterfaceTypeChoices -from dcim.models import Interface +from dcim.models import Interface, Site from tenancy.models import Tenant from utilities.testing import APITestCase, APIViewTestCases, create_test_device from wireless.choices import * @@ -53,6 +53,12 @@ class WirelessLANTest(APIViewTestCases.APIViewTestCase): @classmethod def setUpTestData(cls): + sites = ( + Site(name='Site 1', slug='site-1'), + Site(name='Site 2', slug='site-2'), + ) + Site.objects.bulk_create(sites) + tenants = ( Tenant(name='Tenant 1', slug='tenant-1'), Tenant(name='Tenant 2', slug='tenant-2'), @@ -94,6 +100,8 @@ class WirelessLANTest(APIViewTestCases.APIViewTestCase): 'status': WirelessLANStatusChoices.STATUS_DISABLED, 'tenant': tenants[0].pk, 'auth_type': WirelessAuthTypeChoices.TYPE_WPA_ENTERPRISE, + 'scope_type': 'dcim.site', + 'scope_id': sites[1].pk, }, ] diff --git a/netbox/wireless/tests/test_filtersets.py b/netbox/wireless/tests/test_filtersets.py index 5c932928c..76ef4e220 100644 --- a/netbox/wireless/tests/test_filtersets.py +++ b/netbox/wireless/tests/test_filtersets.py @@ -1,7 +1,7 @@ from django.test import TestCase from dcim.choices import InterfaceTypeChoices, LinkStatusChoices -from dcim.models import Interface +from dcim.models import Interface, Location, Region, Site, SiteGroup from ipam.models import VLAN from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant @@ -110,6 +110,36 @@ class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests): ) VLAN.objects.bulk_create(vlans) + regions = ( + Region(name='Test Region 1', slug='test-region-1'), + Region(name='Test Region 2', slug='test-region-2'), + Region(name='Test Region 3', slug='test-region-3'), + ) + for r in regions: + r.save() + + site_groups = ( + SiteGroup(name='Site Group 1', slug='site-group-1'), + SiteGroup(name='Site Group 2', slug='site-group-2'), + SiteGroup(name='Site Group 3', slug='site-group-3'), + ) + for site_group in site_groups: + site_group.save() + + sites = ( + Site(name='Test Site 1', slug='test-site-1', region=regions[0], group=site_groups[0]), + Site(name='Test Site 2', slug='test-site-2', region=regions[1], group=site_groups[1]), + Site(name='Test Site 3', slug='test-site-3', region=regions[2], group=site_groups[2]), + ) + Site.objects.bulk_create(sites) + + locations = ( + Location(name='Location 1', slug='location-1', site=sites[0]), + Location(name='Location 2', slug='location-2', site=sites[2]), + ) + for location in locations: + location.save() + tenants = ( Tenant(name='Tenant 1', slug='tenant-1'), Tenant(name='Tenant 2', slug='tenant-2'), @@ -127,7 +157,8 @@ class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests): auth_type=WirelessAuthTypeChoices.TYPE_OPEN, auth_cipher=WirelessAuthCipherChoices.CIPHER_AUTO, auth_psk='PSK1', - description='foobar1' + description='foobar1', + scope=sites[0] ), WirelessLAN( ssid='WLAN2', @@ -138,7 +169,8 @@ class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests): auth_type=WirelessAuthTypeChoices.TYPE_WEP, auth_cipher=WirelessAuthCipherChoices.CIPHER_TKIP, auth_psk='PSK2', - description='foobar2' + description='foobar2', + scope=locations[0] ), WirelessLAN( ssid='WLAN3', @@ -149,12 +181,14 @@ class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests): auth_type=WirelessAuthTypeChoices.TYPE_WPA_PERSONAL, auth_cipher=WirelessAuthCipherChoices.CIPHER_AES, auth_psk='PSK3', - description='foobar3' + description='foobar3', + scope=locations[1] ), ) - WirelessLAN.objects.bulk_create(wireless_lans) + for wireless_lan in wireless_lans: + wireless_lan.save() - device = create_test_device('Device 1') + device = create_test_device('Device 1', site=sites[0]) interfaces = ( Interface(device=device, name='Interface 1', type=InterfaceTypeChoices.TYPE_80211N), Interface(device=device, name='Interface 2', type=InterfaceTypeChoices.TYPE_80211N), @@ -217,6 +251,38 @@ class WirelessLANTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_region(self): + regions = Region.objects.all()[:2] + params = {'region_id': [regions[0].pk, regions[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'region': [regions[0].slug, regions[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_site_group(self): + site_groups = SiteGroup.objects.all()[:2] + params = {'site_group_id': [site_groups[0].pk, site_groups[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'site_group': [site_groups[0].slug, site_groups[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_site(self): + sites = Site.objects.all()[:2] + params = {'site_id': [sites[0].pk, sites[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'site': [sites[0].slug, sites[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_location(self): + locations = Location.objects.all()[:1] + params = {'location_id': [locations[0].pk,]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + params = {'location': [locations[0].slug,]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + + def test_scope_type(self): + params = {'scope_type': 'dcim.location'} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + class WirelessLinkTestCase(TestCase, ChangeLoggedFilterSetTests): queryset = WirelessLink.objects.all() diff --git a/netbox/wireless/tests/test_views.py b/netbox/wireless/tests/test_views.py index d28d9fde3..713ba81d7 100644 --- a/netbox/wireless/tests/test_views.py +++ b/netbox/wireless/tests/test_views.py @@ -1,7 +1,8 @@ +from django.contrib.contenttypes.models import ContentType from wireless.choices import * from wireless.models import * from dcim.choices import InterfaceTypeChoices, LinkStatusChoices -from dcim.models import Interface +from dcim.models import Interface, Site from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant from utilities.testing import ViewTestCases, create_tags, create_test_device @@ -56,6 +57,12 @@ class WirelessLANTestCase(ViewTestCases.PrimaryObjectViewTestCase): @classmethod def setUpTestData(cls): + sites = ( + Site(name='Site 1', slug='site-1'), + Site(name='Site 2', slug='site-2'), + ) + Site.objects.bulk_create(sites) + tenants = ( Tenant(name='Tenant 1', slug='tenant-1'), Tenant(name='Tenant 2', slug='tenant-2'), @@ -98,15 +105,17 @@ class WirelessLANTestCase(ViewTestCases.PrimaryObjectViewTestCase): 'ssid': 'WLAN2', 'group': groups[1].pk, 'status': WirelessLANStatusChoices.STATUS_DISABLED, + 'scope_type': ContentType.objects.get_for_model(Site).pk, + 'scope': sites[1].pk, 'tenant': tenants[1].pk, 'tags': [t.pk for t in tags], } cls.csv_data = ( - "group,ssid,status,tenant", - f"Wireless LAN Group 2,WLAN4,{WirelessLANStatusChoices.STATUS_ACTIVE},{tenants[0].name}", - f"Wireless LAN Group 2,WLAN5,{WirelessLANStatusChoices.STATUS_DISABLED},{tenants[1].name}", - f"Wireless LAN Group 2,WLAN6,{WirelessLANStatusChoices.STATUS_RESERVED},{tenants[2].name}", + "group,ssid,status,tenant,scope_type,scope_id", + f"Wireless LAN Group 2,WLAN4,{WirelessLANStatusChoices.STATUS_ACTIVE},{tenants[0].name},,", + f"Wireless LAN Group 2,WLAN5,{WirelessLANStatusChoices.STATUS_DISABLED},{tenants[1].name},dcim.site,{sites[0].pk}", + f"Wireless LAN Group 2,WLAN6,{WirelessLANStatusChoices.STATUS_RESERVED},{tenants[2].name},dcim.site,{sites[1].pk}", ) cls.csv_update_data = ( From a1830488910ff58c8fb05b43a7f3bccd685143ef Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 7 Nov 2024 10:24:15 -0500 Subject: [PATCH 026/190] Closes #17951: Extend Ruff ruleset --- .../0047_circuittermination__termination.py | 1 + netbox/circuits/tests/test_views.py | 2 +- netbox/extras/forms/bulk_import.py | 2 +- .../extras/management/commands/runscript.py | 2 +- netbox/extras/migrations/0109_script_model.py | 4 ++-- netbox/ipam/lookups.py | 4 ++-- netbox/ipam/tests/test_ordering.py | 6 +++--- netbox/netbox/authentication/__init__.py | 2 +- netbox/netbox/tests/test_plugins.py | 1 - netbox/netbox/views/errors.py | 2 +- netbox/utilities/error_handlers.py | 2 +- netbox/utilities/tests/test_counters.py | 2 +- .../api/serializers_/clusters.py | 2 -- netbox/virtualization/graphql/types.py | 2 +- .../migrations/0044_cluster_scope.py | 20 +++++++++---------- ruff.toml | 2 ++ 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/netbox/circuits/migrations/0047_circuittermination__termination.py b/netbox/circuits/migrations/0047_circuittermination__termination.py index cb2c9ca07..0cf2b424f 100644 --- a/netbox/circuits/migrations/0047_circuittermination__termination.py +++ b/netbox/circuits/migrations/0047_circuittermination__termination.py @@ -21,6 +21,7 @@ def copy_site_assignments(apps, schema_editor): termination_id=models.F('provider_network_id') ) + class Migration(migrations.Migration): dependencies = [ diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index a87e327af..f6c626443 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -341,7 +341,7 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase): } -class TestCase(ViewTestCases.PrimaryObjectViewTestCase): +class TestCase(ViewTestCases.PrimaryObjectViewTestCase): model = CircuitTermination @classmethod diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py index 258df8264..655a5d6ca 100644 --- a/netbox/extras/forms/bulk_import.py +++ b/netbox/extras/forms/bulk_import.py @@ -223,7 +223,7 @@ class EventRuleImportForm(NetBoxModelImportForm): from extras.scripts import get_module_and_script module_name, script_name = action_object.split('.', 1) try: - module, script = get_module_and_script(module_name, script_name) + script = get_module_and_script(module_name, script_name)[1] except ObjectDoesNotExist: raise forms.ValidationError(_("Script {name} not found").format(name=action_object)) self.instance.action_object = script diff --git a/netbox/extras/management/commands/runscript.py b/netbox/extras/management/commands/runscript.py index d5fb435ad..847d89396 100644 --- a/netbox/extras/management/commands/runscript.py +++ b/netbox/extras/management/commands/runscript.py @@ -38,7 +38,7 @@ class Command(BaseCommand): data = {} module_name, script_name = script.split('.', 1) - module, script_obj = get_module_and_script(module_name, script_name) + script_obj = get_module_and_script(module_name, script_name)[1] script = script_obj.python_class # Take user from command line if provided and exists, other diff --git a/netbox/extras/migrations/0109_script_model.py b/netbox/extras/migrations/0109_script_model.py index 6bfd2c14c..2fa0bf8aa 100644 --- a/netbox/extras/migrations/0109_script_model.py +++ b/netbox/extras/migrations/0109_script_model.py @@ -30,7 +30,7 @@ def get_python_name(scriptmodule): """ Return the Python name of a ScriptModule's file on disk. """ - path, filename = os.path.split(scriptmodule.file_path) + filename = os.path.split(scriptmodule.file_path)[0] return os.path.splitext(filename)[0] @@ -128,7 +128,7 @@ def update_event_rules(apps, schema_editor): for eventrule in EventRule.objects.filter(action_object_type=scriptmodule_ct): name = eventrule.action_parameters.get('script_name') - obj, created = Script.objects.get_or_create( + obj, __ = Script.objects.get_or_create( module_id=eventrule.action_object_id, name=name, defaults={'is_executable': False} diff --git a/netbox/ipam/lookups.py b/netbox/ipam/lookups.py index c6abb5a26..c493b7876 100644 --- a/netbox/ipam/lookups.py +++ b/netbox/ipam/lookups.py @@ -108,8 +108,8 @@ class NetIn(Lookup): return self.rhs def as_sql(self, qn, connection): - lhs, lhs_params = self.process_lhs(qn, connection) - rhs, rhs_params = self.process_rhs(qn, connection) + lhs = self.process_lhs(qn, connection)[0] + rhs_params = self.process_rhs(qn, connection)[1] with_mask, without_mask = [], [] for address in rhs_params[0]: if '/' in address: diff --git a/netbox/ipam/tests/test_ordering.py b/netbox/ipam/tests/test_ordering.py index 8d69af847..fea6b55e2 100644 --- a/netbox/ipam/tests/test_ordering.py +++ b/netbox/ipam/tests/test_ordering.py @@ -42,7 +42,7 @@ class PrefixOrderingTestCase(OrderingTestBase): """ This is a very basic test, which tests both prefixes without VRFs and prefixes with VRFs """ - vrf1, vrf2, vrf3 = list(VRF.objects.all()) + vrf1, vrf2 = VRF.objects.all()[:2] prefixes = ( Prefix(status=PrefixStatusChoices.STATUS_CONTAINER, vrf=None, prefix=netaddr.IPNetwork('192.168.0.0/16')), Prefix(status=PrefixStatusChoices.STATUS_ACTIVE, vrf=None, prefix=netaddr.IPNetwork('192.168.0.0/24')), @@ -106,7 +106,7 @@ class PrefixOrderingTestCase(OrderingTestBase): VRF A:10.1.1.0/24 None: 192.168.0.0/16 """ - vrf1, vrf2, vrf3 = list(VRF.objects.all()) + vrf1 = VRF.objects.first() prefixes = [ Prefix(status=PrefixStatusChoices.STATUS_CONTAINER, vrf=None, prefix=netaddr.IPNetwork('10.0.0.0/8')), Prefix(status=PrefixStatusChoices.STATUS_CONTAINER, vrf=None, prefix=netaddr.IPNetwork('10.0.0.0/16')), @@ -130,7 +130,7 @@ class IPAddressOrderingTestCase(OrderingTestBase): """ This function tests ordering with the inclusion of vrfs """ - vrf1, vrf2, vrf3 = list(VRF.objects.all()) + vrf1, vrf2 = VRF.objects.all()[:2] addresses = ( IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf1, address=netaddr.IPNetwork('10.0.0.1/24')), IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf1, address=netaddr.IPNetwork('10.0.1.1/24')), diff --git a/netbox/netbox/authentication/__init__.py b/netbox/netbox/authentication/__init__.py index 7c2df4200..83f699e42 100644 --- a/netbox/netbox/authentication/__init__.py +++ b/netbox/netbox/authentication/__init__.py @@ -107,7 +107,7 @@ class ObjectPermissionMixin: return perms def has_perm(self, user_obj, perm, obj=None): - app_label, action, model_name = resolve_permission(perm) + app_label, __, model_name = resolve_permission(perm) # Superusers implicitly have all permissions if user_obj.is_active and user_obj.is_superuser: diff --git a/netbox/netbox/tests/test_plugins.py b/netbox/netbox/tests/test_plugins.py index db82d0a75..264c8e6f9 100644 --- a/netbox/netbox/tests/test_plugins.py +++ b/netbox/netbox/tests/test_plugins.py @@ -213,7 +213,6 @@ class PluginTest(TestCase): self.assertEqual(get_plugin_config(plugin, 'bar'), None) self.assertEqual(get_plugin_config(plugin, 'bar', default=456), 456) - def test_events_pipeline(self): """ Check that events pipeline is registered. diff --git a/netbox/netbox/views/errors.py b/netbox/netbox/views/errors.py index 9e8ed5a3a..5872a59cd 100644 --- a/netbox/netbox/views/errors.py +++ b/netbox/netbox/views/errors.py @@ -49,7 +49,7 @@ def handler_500(request, template_name=ERROR_500_TEMPLATE_NAME): template = loader.get_template(template_name) except TemplateDoesNotExist: return HttpResponseServerError('

Server Error (500)

', content_type='text/html') - type_, error, traceback = sys.exc_info() + type_, error = sys.exc_info()[:2] return HttpResponseServerError(template.render({ 'error': error, diff --git a/netbox/utilities/error_handlers.py b/netbox/utilities/error_handlers.py index 5d2a46424..397098ded 100644 --- a/netbox/utilities/error_handlers.py +++ b/netbox/utilities/error_handlers.py @@ -49,7 +49,7 @@ def handle_rest_api_exception(request, *args, **kwargs): """ Handle exceptions and return a useful error message for REST API requests. """ - type_, error, traceback = sys.exc_info() + type_, error = sys.exc_info()[:2] data = { 'error': str(error), 'exception': type_.__name__, diff --git a/netbox/utilities/tests/test_counters.py b/netbox/utilities/tests/test_counters.py index 45823065e..668965e8a 100644 --- a/netbox/utilities/tests/test_counters.py +++ b/netbox/utilities/tests/test_counters.py @@ -83,7 +83,7 @@ class CountersTest(TestCase): @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) def test_mptt_child_delete(self): - device1, device2 = Device.objects.all() + device1 = Device.objects.first() inventory_item1 = InventoryItem.objects.create(device=device1, name='Inventory Item 1') InventoryItem.objects.create(device=device1, name='Inventory Item 2', parent=inventory_item1) device1.refresh_from_db() diff --git a/netbox/virtualization/api/serializers_/clusters.py b/netbox/virtualization/api/serializers_/clusters.py index 101a5b5a3..c0b636e33 100644 --- a/netbox/virtualization/api/serializers_/clusters.py +++ b/netbox/virtualization/api/serializers_/clusters.py @@ -80,5 +80,3 @@ class ClusterSerializer(NetBoxModelSerializer): serializer = get_serializer_for_model(obj.scope) context = {'request': self.context['request']} return serializer(obj.scope, nested=True, context=context).data - - diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index f51e0e3f5..6052c8936 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -48,7 +48,7 @@ class ClusterType(VLANGroupsMixin, NetBoxObjectType): Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')], Annotated["SiteType", strawberry.lazy('dcim.graphql.types')], ], strawberry.union("ClusterScopeType")] | None: - return self.scope + return self.scope @strawberry_django.type( diff --git a/netbox/virtualization/migrations/0044_cluster_scope.py b/netbox/virtualization/migrations/0044_cluster_scope.py index 63a888ac3..b7af25f8b 100644 --- a/netbox/virtualization/migrations/0044_cluster_scope.py +++ b/netbox/virtualization/migrations/0044_cluster_scope.py @@ -3,17 +3,17 @@ from django.db import migrations, models def copy_site_assignments(apps, schema_editor): - """ - Copy site ForeignKey values to the scope GFK. - """ - ContentType = apps.get_model('contenttypes', 'ContentType') - Cluster = apps.get_model('virtualization', 'Cluster') - Site = apps.get_model('dcim', 'Site') + """ + Copy site ForeignKey values to the scope GFK. + """ + ContentType = apps.get_model('contenttypes', 'ContentType') + Cluster = apps.get_model('virtualization', 'Cluster') + Site = apps.get_model('dcim', 'Site') - Cluster.objects.filter(site__isnull=False).update( - scope_type=ContentType.objects.get_for_model(Site), - scope_id=models.F('site_id') - ) + Cluster.objects.filter(site__isnull=False).update( + scope_type=ContentType.objects.get_for_model(Site), + scope_id=models.F('site_id') + ) class Migration(migrations.Migration): diff --git a/ruff.toml b/ruff.toml index 854404469..94a0e1c61 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,2 +1,4 @@ [lint] +extend-select = ["E1", "E2", "E3", "W"] ignore = ["E501", "F403", "F405"] +preview = true From 03d413565f289f3f410ec4e76e938a1613e3cfe0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 7 Nov 2024 14:10:15 -0500 Subject: [PATCH 027/190] Fix linter error --- netbox/wireless/forms/bulk_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index 5bf2d7dcd..f23ccf203 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -7,7 +7,7 @@ from ipam.models import VLAN from netbox.choices import * from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant -from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField +from utilities.forms.fields import CSVChoiceField, CSVModelChoiceField, SlugField from wireless.choices import * from wireless.models import * From 75aeaab8eebb3920ead490da242ec6d8a9e0009c Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 15 Nov 2024 04:55:32 -0800 Subject: [PATCH 028/190] 12596 Add Allocated Resources to Cluster API (#17956) * 12596 Add Allocated Resources to Cluster API * 12596 Add Allocated Resources to Cluster API * 12596 Add Allocated Resources to Cluster API * 12596 Add Allocated Resources to Cluster API * 12596 review changes * 12596 review changes --- netbox/virtualization/api/serializers_/clusters.py | 10 +++++++++- netbox/virtualization/api/views.py | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/netbox/virtualization/api/serializers_/clusters.py b/netbox/virtualization/api/serializers_/clusters.py index c0b636e33..450924fef 100644 --- a/netbox/virtualization/api/serializers_/clusters.py +++ b/netbox/virtualization/api/serializers_/clusters.py @@ -59,6 +59,14 @@ class ClusterSerializer(NetBoxModelSerializer): ) scope_id = serializers.IntegerField(allow_null=True, required=False, default=None) scope = serializers.SerializerMethodField(read_only=True) + allocated_vcpus = serializers.DecimalField( + read_only=True, + max_digits=8, + decimal_places=2, + + ) + allocated_memory = serializers.IntegerField(read_only=True) + allocated_disk = serializers.IntegerField(read_only=True) # Related object counts device_count = RelatedObjectCountField('devices') @@ -69,7 +77,7 @@ class ClusterSerializer(NetBoxModelSerializer): fields = [ 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'scope_id', 'scope', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', - 'virtualmachine_count', + 'virtualmachine_count', 'allocated_vcpus', 'allocated_memory', 'allocated_disk' ] brief_fields = ('id', 'url', 'display', 'name', 'description', 'virtualmachine_count') diff --git a/netbox/virtualization/api/views.py b/netbox/virtualization/api/views.py index fdf1d71be..93980ce28 100644 --- a/netbox/virtualization/api/views.py +++ b/netbox/virtualization/api/views.py @@ -1,3 +1,4 @@ +from django.db.models import Sum from rest_framework.routers import APIRootView from extras.api.mixins import ConfigContextQuerySetMixin, RenderConfigMixin @@ -33,7 +34,11 @@ class ClusterGroupViewSet(NetBoxModelViewSet): class ClusterViewSet(NetBoxModelViewSet): - queryset = Cluster.objects.all() + queryset = Cluster.objects.prefetch_related('virtual_machines').annotate( + allocated_vcpus=Sum('virtual_machines__vcpus'), + allocated_memory=Sum('virtual_machines__memory'), + allocated_disk=Sum('virtual_machines__disk'), + ) serializer_class = serializers.ClusterSerializer filterset_class = filtersets.ClusterFilterSet From 6ab0792f02495903045fbc8bb8efb0618e88f631 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 15 Nov 2024 06:32:09 -0800 Subject: [PATCH 029/190] Closes #11279: Replace `_name` natural key sorting with collation (#18009) * 11279 add collation * 11279 add collation * 11279 add collation * 11279 add collation * 11279 fix tables /tests * 11279 fix tests * 11279 refactor VirtualDisk * Clean up migrations * Misc cleanup * Correct errant file inclusion --------- Co-authored-by: Jeremy Stretch --- .../migrations/0049_natural_ordering.py | 22 ++ netbox/circuits/models/providers.py | 6 +- netbox/core/tests/test_changelog.py | 28 -- netbox/dcim/graphql/types.py | 20 +- .../migrations/0197_natural_sort_collation.py | 17 + .../dcim/migrations/0198_natural_ordering.py | 318 ++++++++++++++++++ .../dcim/models/device_component_templates.py | 14 +- netbox/dcim/models/device_components.py | 12 +- netbox/dcim/models/devices.py | 19 +- netbox/dcim/models/power.py | 6 +- netbox/dcim/models/racks.py | 10 +- netbox/dcim/models/sites.py | 11 +- netbox/dcim/tables/devices.py | 18 +- netbox/dcim/tables/devicetypes.py | 8 +- netbox/dcim/tables/racks.py | 1 - netbox/dcim/views.py | 7 +- .../ipam/migrations/0076_natural_ordering.py | 32 ++ netbox/ipam/models/asns.py | 3 +- netbox/ipam/models/vlans.py | 3 +- netbox/ipam/models/vrfs.py | 6 +- .../migrations/0017_natural_ordering.py | 27 ++ netbox/tenancy/models/contacts.py | 3 +- netbox/tenancy/models/tenants.py | 6 +- netbox/utilities/fields.py | 3 +- netbox/virtualization/graphql/types.py | 3 +- .../migrations/0046_natural_ordering.py | 43 +++ netbox/virtualization/models/clusters.py | 3 +- .../virtualization/models/virtualmachines.py | 34 +- .../virtualization/tables/virtualmachines.py | 1 - .../vpn/migrations/0007_natural_ordering.py | 47 +++ netbox/vpn/models/crypto.py | 15 +- netbox/vpn/models/l2vpn.py | 3 +- netbox/vpn/models/tunnels.py | 3 +- .../migrations/0012_natural_ordering.py | 17 + netbox/wireless/models.py | 3 +- 35 files changed, 622 insertions(+), 150 deletions(-) create mode 100644 netbox/circuits/migrations/0049_natural_ordering.py create mode 100644 netbox/dcim/migrations/0197_natural_sort_collation.py create mode 100644 netbox/dcim/migrations/0198_natural_ordering.py create mode 100644 netbox/ipam/migrations/0076_natural_ordering.py create mode 100644 netbox/tenancy/migrations/0017_natural_ordering.py create mode 100644 netbox/virtualization/migrations/0046_natural_ordering.py create mode 100644 netbox/vpn/migrations/0007_natural_ordering.py create mode 100644 netbox/wireless/migrations/0012_natural_ordering.py diff --git a/netbox/circuits/migrations/0049_natural_ordering.py b/netbox/circuits/migrations/0049_natural_ordering.py new file mode 100644 index 000000000..1b4f565e8 --- /dev/null +++ b/netbox/circuits/migrations/0049_natural_ordering.py @@ -0,0 +1,22 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0048_circuitterminations_cached_relations'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterField( + model_name='provider', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='providernetwork', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + ] diff --git a/netbox/circuits/models/providers.py b/netbox/circuits/models/providers.py index f0fe77b1a..be81caa54 100644 --- a/netbox/circuits/models/providers.py +++ b/netbox/circuits/models/providers.py @@ -21,7 +21,8 @@ class Provider(ContactsMixin, PrimaryModel): verbose_name=_('name'), max_length=100, unique=True, - help_text=_('Full name of the provider') + help_text=_('Full name of the provider'), + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), @@ -95,7 +96,8 @@ class ProviderNetwork(PrimaryModel): """ name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) provider = models.ForeignKey( to='circuits.Provider', diff --git a/netbox/core/tests/test_changelog.py b/netbox/core/tests/test_changelog.py index c58968ee8..4914dbaf3 100644 --- a/netbox/core/tests/test_changelog.py +++ b/netbox/core/tests/test_changelog.py @@ -76,10 +76,6 @@ class ChangeLogViewTest(ModelViewTestCase): self.assertEqual(oc.postchange_data['custom_fields']['cf2'], form_data['cf_cf2']) self.assertEqual(oc.postchange_data['tags'], ['Tag 1', 'Tag 2']) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.postchange_data) - self.assertNotIn('_name', oc.postchange_data_clean) - def test_update_object(self): site = Site(name='Site 1', slug='site-1') site.save() @@ -117,12 +113,6 @@ class ChangeLogViewTest(ModelViewTestCase): self.assertEqual(oc.postchange_data['custom_fields']['cf2'], form_data['cf_cf2']) self.assertEqual(oc.postchange_data['tags'], ['Tag 3']) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.prechange_data) - self.assertNotIn('_name', oc.prechange_data_clean) - self.assertIn('_name', oc.postchange_data) - self.assertNotIn('_name', oc.postchange_data_clean) - def test_delete_object(self): site = Site( name='Site 1', @@ -153,10 +143,6 @@ class ChangeLogViewTest(ModelViewTestCase): self.assertEqual(oc.prechange_data['tags'], ['Tag 1', 'Tag 2']) self.assertEqual(oc.postchange_data, None) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.prechange_data) - self.assertNotIn('_name', oc.prechange_data_clean) - def test_bulk_update_objects(self): sites = ( Site(name='Site 1', slug='site-1', status=SiteStatusChoices.STATUS_ACTIVE), @@ -353,10 +339,6 @@ class ChangeLogAPITest(APITestCase): self.assertEqual(oc.postchange_data['custom_fields'], data['custom_fields']) self.assertEqual(oc.postchange_data['tags'], ['Tag 1', 'Tag 2']) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.postchange_data) - self.assertNotIn('_name', oc.postchange_data_clean) - def test_update_object(self): site = Site(name='Site 1', slug='site-1') site.save() @@ -389,12 +371,6 @@ class ChangeLogAPITest(APITestCase): self.assertEqual(oc.postchange_data['custom_fields'], data['custom_fields']) self.assertEqual(oc.postchange_data['tags'], ['Tag 3']) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.prechange_data) - self.assertNotIn('_name', oc.prechange_data_clean) - self.assertIn('_name', oc.postchange_data) - self.assertNotIn('_name', oc.postchange_data_clean) - def test_delete_object(self): site = Site( name='Site 1', @@ -423,10 +399,6 @@ class ChangeLogAPITest(APITestCase): self.assertEqual(oc.prechange_data['tags'], ['Tag 1', 'Tag 2']) self.assertEqual(oc.postchange_data, None) - # Check that private attributes were included in raw data but not display data - self.assertIn('_name', oc.prechange_data) - self.assertNotIn('_name', oc.prechange_data_clean) - def test_bulk_create_objects(self): data = ( { diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 6493ec6b1..fc5f35780 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -76,7 +76,6 @@ class ComponentType( """ Base type for device/VM components """ - _name: str device: Annotated["DeviceType", strawberry.lazy('dcim.graphql.types')] @@ -93,7 +92,6 @@ class ComponentTemplateType( """ Base type for device/VM components """ - _name: str device_type: Annotated["DeviceTypeType", strawberry.lazy('dcim.graphql.types')] @@ -181,7 +179,7 @@ class ConsolePortType(ModularComponentType, CabledObjectMixin, PathEndpointMixin filters=ConsolePortTemplateFilter ) class ConsolePortTemplateType(ModularComponentTemplateType): - _name: str + pass @strawberry_django.type( @@ -199,7 +197,7 @@ class ConsoleServerPortType(ModularComponentType, CabledObjectMixin, PathEndpoin filters=ConsoleServerPortTemplateFilter ) class ConsoleServerPortTemplateType(ModularComponentTemplateType): - _name: str + pass @strawberry_django.type( @@ -208,7 +206,6 @@ class ConsoleServerPortTemplateType(ModularComponentTemplateType): filters=DeviceFilter ) class DeviceType(ConfigContextMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType): - _name: str console_port_count: BigInt console_server_port_count: BigInt power_port_count: BigInt @@ -273,7 +270,7 @@ class DeviceBayType(ComponentType): filters=DeviceBayTemplateFilter ) class DeviceBayTemplateType(ComponentTemplateType): - _name: str + pass @strawberry_django.type( @@ -282,7 +279,6 @@ class DeviceBayTemplateType(ComponentTemplateType): filters=InventoryItemTemplateFilter ) class InventoryItemTemplateType(ComponentTemplateType): - _name: str role: Annotated["InventoryItemRoleType", strawberry.lazy('dcim.graphql.types')] | None manufacturer: Annotated["ManufacturerType", strawberry.lazy('dcim.graphql.types')] @@ -366,7 +362,6 @@ class FrontPortType(ModularComponentType, CabledObjectMixin): filters=FrontPortTemplateFilter ) class FrontPortTemplateType(ModularComponentTemplateType): - _name: str color: str rear_port: Annotated["RearPortTemplateType", strawberry.lazy('dcim.graphql.types')] @@ -377,6 +372,7 @@ class FrontPortTemplateType(ModularComponentTemplateType): filters=InterfaceFilter ) class InterfaceType(IPAddressesMixin, ModularComponentType, CabledObjectMixin, PathEndpointMixin): + _name: str mac_address: str | None wwn: str | None parent: Annotated["InterfaceType", strawberry.lazy('dcim.graphql.types')] | None @@ -527,7 +523,7 @@ class ModuleBayType(ModularComponentType): filters=ModuleBayTemplateFilter ) class ModuleBayTemplateType(ModularComponentTemplateType): - _name: str + pass @strawberry_django.type( @@ -588,7 +584,6 @@ class PowerOutletType(ModularComponentType, CabledObjectMixin, PathEndpointMixin filters=PowerOutletTemplateFilter ) class PowerOutletTemplateType(ModularComponentTemplateType): - _name: str power_port: Annotated["PowerPortTemplateType", strawberry.lazy('dcim.graphql.types')] | None @@ -620,8 +615,6 @@ class PowerPortType(ModularComponentType, CabledObjectMixin, PathEndpointMixin): filters=PowerPortTemplateFilter ) class PowerPortTemplateType(ModularComponentTemplateType): - _name: str - poweroutlet_templates: List[Annotated["PowerOutletTemplateType", strawberry.lazy('dcim.graphql.types')]] @@ -640,7 +633,6 @@ class RackTypeType(NetBoxObjectType): filters=RackFilter ) class RackType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType): - _name: str site: Annotated["SiteType", strawberry.lazy('dcim.graphql.types')] location: Annotated["LocationType", strawberry.lazy('dcim.graphql.types')] | None tenant: Annotated["TenantType", strawberry.lazy('tenancy.graphql.types')] | None @@ -693,7 +685,6 @@ class RearPortType(ModularComponentType, CabledObjectMixin): filters=RearPortTemplateFilter ) class RearPortTemplateType(ModularComponentTemplateType): - _name: str color: str frontport_templates: List[Annotated["FrontPortTemplateType", strawberry.lazy('dcim.graphql.types')]] @@ -729,7 +720,6 @@ class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): filters=SiteFilter ) class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObjectType): - _name: str time_zone: str | None region: Annotated["RegionType", strawberry.lazy('dcim.graphql.types')] | None group: Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')] | None diff --git a/netbox/dcim/migrations/0197_natural_sort_collation.py b/netbox/dcim/migrations/0197_natural_sort_collation.py new file mode 100644 index 000000000..a77632b37 --- /dev/null +++ b/netbox/dcim/migrations/0197_natural_sort_collation.py @@ -0,0 +1,17 @@ +from django.contrib.postgres.operations import CreateCollation +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0196_qinq_svlan'), + ] + + operations = [ + CreateCollation( + "natural_sort", + provider="icu", + locale="und-u-kn-true", + ), + ] diff --git a/netbox/dcim/migrations/0198_natural_ordering.py b/netbox/dcim/migrations/0198_natural_ordering.py new file mode 100644 index 000000000..83e94a195 --- /dev/null +++ b/netbox/dcim/migrations/0198_natural_ordering.py @@ -0,0 +1,318 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterModelOptions( + name='site', + options={'ordering': ('name',)}, + ), + migrations.AlterField( + model_name='site', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterModelOptions( + name='consoleport', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='consoleporttemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='consoleserverport', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='consoleserverporttemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='device', + options={'ordering': ('name', 'pk')}, + ), + migrations.AlterModelOptions( + name='devicebay', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='devicebaytemplate', + options={'ordering': ('device_type', 'name')}, + ), + migrations.AlterModelOptions( + name='frontport', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='frontporttemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='interfacetemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='inventoryitem', + options={'ordering': ('device__id', 'parent__id', 'name')}, + ), + migrations.AlterModelOptions( + name='inventoryitemtemplate', + options={'ordering': ('device_type__id', 'parent__id', 'name')}, + ), + migrations.AlterModelOptions( + name='modulebay', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='modulebaytemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='poweroutlet', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='poweroutlettemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='powerport', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='powerporttemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.AlterModelOptions( + name='rack', + options={'ordering': ('site', 'location', 'name', 'pk')}, + ), + migrations.AlterModelOptions( + name='rearport', + options={'ordering': ('device', 'name')}, + ), + migrations.AlterModelOptions( + name='rearporttemplate', + options={'ordering': ('device_type', 'module_type', 'name')}, + ), + migrations.RemoveField( + model_name='consoleport', + name='_name', + ), + migrations.RemoveField( + model_name='consoleporttemplate', + name='_name', + ), + migrations.RemoveField( + model_name='consoleserverport', + name='_name', + ), + migrations.RemoveField( + model_name='consoleserverporttemplate', + name='_name', + ), + migrations.RemoveField( + model_name='device', + name='_name', + ), + migrations.RemoveField( + model_name='devicebay', + name='_name', + ), + migrations.RemoveField( + model_name='devicebaytemplate', + name='_name', + ), + migrations.RemoveField( + model_name='frontport', + name='_name', + ), + migrations.RemoveField( + model_name='frontporttemplate', + name='_name', + ), + migrations.RemoveField( + model_name='inventoryitem', + name='_name', + ), + migrations.RemoveField( + model_name='inventoryitemtemplate', + name='_name', + ), + migrations.RemoveField( + model_name='modulebay', + name='_name', + ), + migrations.RemoveField( + model_name='modulebaytemplate', + name='_name', + ), + migrations.RemoveField( + model_name='poweroutlet', + name='_name', + ), + migrations.RemoveField( + model_name='poweroutlettemplate', + name='_name', + ), + migrations.RemoveField( + model_name='powerport', + name='_name', + ), + migrations.RemoveField( + model_name='powerporttemplate', + name='_name', + ), + migrations.RemoveField( + model_name='rack', + name='_name', + ), + migrations.RemoveField( + model_name='rearport', + name='_name', + ), + migrations.RemoveField( + model_name='rearporttemplate', + name='_name', + ), + migrations.RemoveField( + model_name='site', + name='_name', + ), + migrations.AlterField( + model_name='consoleport', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='consoleporttemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='consoleserverport', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='consoleserverporttemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='device', + name='name', + field=models.CharField(blank=True, db_collation='natural_sort', max_length=64, null=True), + ), + migrations.AlterField( + model_name='devicebay', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='devicebaytemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='frontport', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='frontporttemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='interface', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='interfacetemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='inventoryitem', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='inventoryitemtemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='modulebay', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='modulebaytemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='poweroutlet', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='poweroutlettemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='powerport', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='powerporttemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='rack', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='rearport', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='rearporttemplate', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='powerfeed', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='powerpanel', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='virtualchassis', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='virtualdevicecontext', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + ] diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index 00555d49e..ddd4d2426 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -44,12 +44,8 @@ class ComponentTemplateModel(ChangeLoggedModel, TrackingModelMixin): max_length=64, help_text=_( "{module} is accepted as a substitution for the module bay position when attached to a module type." - ) - ) - _name = NaturalOrderingField( - target_field='name', - max_length=100, - blank=True + ), + db_collation="natural_sort" ) label = models.CharField( verbose_name=_('label'), @@ -65,7 +61,7 @@ class ComponentTemplateModel(ChangeLoggedModel, TrackingModelMixin): class Meta: abstract = True - ordering = ('device_type', '_name') + ordering = ('device_type', 'name') constraints = ( models.UniqueConstraint( fields=('device_type', 'name'), @@ -125,7 +121,7 @@ class ModularComponentTemplateModel(ComponentTemplateModel): class Meta: abstract = True - ordering = ('device_type', 'module_type', '_name') + ordering = ('device_type', 'module_type', 'name') constraints = ( models.UniqueConstraint( fields=('device_type', 'name'), @@ -782,7 +778,7 @@ class InventoryItemTemplate(MPTTModel, ComponentTemplateModel): component_model = InventoryItem class Meta: - ordering = ('device_type__id', 'parent__id', '_name') + ordering = ('device_type__id', 'parent__id', 'name') indexes = ( models.Index(fields=('component_type', 'component_id')), ) diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 36fd02add..31278a13c 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -50,12 +50,8 @@ class ComponentModel(NetBoxModel): ) name = models.CharField( verbose_name=_('name'), - max_length=64 - ) - _name = NaturalOrderingField( - target_field='name', - max_length=100, - blank=True + max_length=64, + db_collation="natural_sort" ) label = models.CharField( verbose_name=_('label'), @@ -71,7 +67,7 @@ class ComponentModel(NetBoxModel): class Meta: abstract = True - ordering = ('device', '_name') + ordering = ('device', 'name') constraints = ( models.UniqueConstraint( fields=('device', 'name'), @@ -1301,7 +1297,7 @@ class InventoryItem(MPTTModel, ComponentModel, TrackingModelMixin): clone_fields = ('device', 'parent', 'role', 'manufacturer', 'status', 'part_id') class Meta: - ordering = ('device__id', 'parent__id', '_name') + ordering = ('device__id', 'parent__id', 'name') indexes = ( models.Index(fields=('component_type', 'component_id')), ) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 47f4ee6c9..a836c5d37 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -23,7 +23,7 @@ from netbox.config import ConfigItem from netbox.models import OrganizationalModel, PrimaryModel from netbox.models.mixins import WeightMixin from netbox.models.features import ContactsMixin, ImageAttachmentsMixin -from utilities.fields import ColorField, CounterCacheField, NaturalOrderingField +from utilities.fields import ColorField, CounterCacheField from utilities.tracking import TrackingModelMixin from .device_components import * from .mixins import RenderConfigMixin @@ -582,13 +582,8 @@ class Device( verbose_name=_('name'), max_length=64, blank=True, - null=True - ) - _name = NaturalOrderingField( - target_field='name', - max_length=100, - blank=True, - null=True + null=True, + db_collation="natural_sort" ) serial = models.CharField( max_length=50, @@ -775,7 +770,7 @@ class Device( ) class Meta: - ordering = ('_name', 'pk') # Name may be null + ordering = ('name', 'pk') # Name may be null constraints = ( models.UniqueConstraint( Lower('name'), 'site', 'tenant', @@ -1320,7 +1315,8 @@ class VirtualChassis(PrimaryModel): ) name = models.CharField( verbose_name=_('name'), - max_length=64 + max_length=64, + db_collation="natural_sort" ) domain = models.CharField( verbose_name=_('domain'), @@ -1382,7 +1378,8 @@ class VirtualDeviceContext(PrimaryModel): ) name = models.CharField( verbose_name=_('name'), - max_length=64 + max_length=64, + db_collation="natural_sort" ) status = models.CharField( verbose_name=_('status'), diff --git a/netbox/dcim/models/power.py b/netbox/dcim/models/power.py index d0c6b18b6..284cfe832 100644 --- a/netbox/dcim/models/power.py +++ b/netbox/dcim/models/power.py @@ -36,7 +36,8 @@ class PowerPanel(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): ) name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) prerequisite_models = ( @@ -86,7 +87,8 @@ class PowerFeed(PrimaryModel, PathEndpoint, CabledObjectModel): ) name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) status = models.CharField( verbose_name=_('status'), diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 013dfb619..08b7f5a35 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -19,7 +19,7 @@ from netbox.models.mixins import WeightMixin from netbox.models.features import ContactsMixin, ImageAttachmentsMixin from utilities.conversion import to_grams from utilities.data import array_to_string, drange -from utilities.fields import ColorField, NaturalOrderingField +from utilities.fields import ColorField from .device_components import PowerPort from .devices import Device, Module from .power import PowerFeed @@ -255,12 +255,8 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): ) name = models.CharField( verbose_name=_('name'), - max_length=100 - ) - _name = NaturalOrderingField( - target_field='name', max_length=100, - blank=True + db_collation="natural_sort" ) facility_id = models.CharField( max_length=50, @@ -340,7 +336,7 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): ) class Meta: - ordering = ('site', 'location', '_name', 'pk') # (site, location, name) may be non-unique + ordering = ('site', 'location', 'name', 'pk') # (site, location, name) may be non-unique constraints = ( # Name and facility_id must be unique *only* within a Location models.UniqueConstraint( diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index a290f4119..0985a8d7a 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -8,7 +8,6 @@ from dcim.choices import * from dcim.constants import * from netbox.models import NestedGroupModel, PrimaryModel from netbox.models.features import ContactsMixin, ImageAttachmentsMixin -from utilities.fields import NaturalOrderingField __all__ = ( 'Location', @@ -143,12 +142,8 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): verbose_name=_('name'), max_length=100, unique=True, - help_text=_("Full name of the site") - ) - _name = NaturalOrderingField( - target_field='name', - max_length=100, - blank=True + help_text=_("Full name of the site"), + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), @@ -245,7 +240,7 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): ) class Meta: - ordering = ('_name',) + ordering = ('name',) verbose_name = _('site') verbose_name_plural = _('sites') diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index fed33401c..b7634626d 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -132,7 +132,6 @@ class PlatformTable(NetBoxTable): class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): name = tables.TemplateColumn( verbose_name=_('Name'), - order_by=('_name',), template_code=DEVICE_LINK, linkify=True ) @@ -288,7 +287,6 @@ class DeviceComponentTable(NetBoxTable): name = tables.Column( verbose_name=_('Name'), linkify=True, - order_by=('_name',) ) device_status = columns.ChoiceFieldColumn( accessor=tables.A('device__status'), @@ -391,7 +389,6 @@ class DeviceConsolePortTable(ConsolePortTable): name = tables.TemplateColumn( verbose_name=_('Name'), template_code=' {{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -433,7 +430,6 @@ class DeviceConsoleServerPortTable(ConsoleServerPortTable): verbose_name=_('Name'), template_code=' ' '{{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -482,7 +478,6 @@ class DevicePowerPortTable(PowerPortTable): verbose_name=_('Name'), template_code=' ' '{{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -531,7 +526,6 @@ class DevicePowerOutletTable(PowerOutletTable): name = tables.TemplateColumn( verbose_name=_('Name'), template_code=' {{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -550,6 +544,11 @@ class DevicePowerOutletTable(PowerOutletTable): class BaseInterfaceTable(NetBoxTable): + name = tables.Column( + verbose_name=_('Name'), + linkify=True, + order_by=('_name',) + ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), ) @@ -597,7 +596,7 @@ class BaseInterfaceTable(NetBoxTable): return ",".join([str(obj) for obj in value.all()]) -class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpointTable): +class InterfaceTable(BaseInterfaceTable, ModularDeviceComponentTable, PathEndpointTable): device = tables.Column( verbose_name=_('Device'), linkify={ @@ -736,7 +735,6 @@ class DeviceFrontPortTable(FrontPortTable): verbose_name=_('Name'), template_code=' ' '{{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -783,7 +781,6 @@ class DeviceRearPortTable(RearPortTable): verbose_name=_('Name'), template_code=' ' '{{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -846,7 +843,6 @@ class DeviceDeviceBayTable(DeviceBayTable): verbose_name=_('Name'), template_code=' {{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) actions = columns.ActionsColumn( @@ -915,7 +911,6 @@ class DeviceModuleBayTable(ModuleBayTable): name = columns.MPTTColumn( verbose_name=_('Name'), linkify=True, - order_by=Accessor('_name') ) actions = columns.ActionsColumn( extra_buttons=MODULEBAY_BUTTONS @@ -982,7 +977,6 @@ class DeviceInventoryItemTable(InventoryItemTable): verbose_name=_('Name'), template_code='' '{{ value }}', - order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index e8a4e35f1..a7f8f08e8 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -163,9 +163,7 @@ class ComponentTemplateTable(NetBoxTable): id = tables.Column( verbose_name=_('ID') ) - name = tables.Column( - order_by=('_name',) - ) + name = tables.Column() class Meta(NetBoxTable.Meta): exclude = ('id', ) @@ -220,6 +218,10 @@ class PowerOutletTemplateTable(ComponentTemplateTable): class InterfaceTemplateTable(ComponentTemplateTable): + name = tables.Column( + verbose_name=_('Name'), + order_by=('_name',) + ) enabled = columns.BooleanColumn( verbose_name=_('Enabled'), ) diff --git a/netbox/dcim/tables/racks.py b/netbox/dcim/tables/racks.py index a6b704161..dbd99ca24 100644 --- a/netbox/dcim/tables/racks.py +++ b/netbox/dcim/tables/racks.py @@ -111,7 +111,6 @@ class RackTypeTable(NetBoxTable): class RackTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): name = tables.Column( verbose_name=_('Name'), - order_by=('_name',), linkify=True ) location = tables.Column( diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9a821a384..7a5a771a9 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -688,8 +688,7 @@ class RackElevationListView(generic.ObjectListView): sort = request.GET.get('sort', 'name') if sort not in ORDERING_CHOICES: sort = 'name' - sort_field = sort.replace("name", "_name") # Use natural ordering - racks = racks.order_by(sort_field) + racks = racks.order_by(sort) # Pagination per_page = get_paginate_count(request) @@ -731,8 +730,8 @@ class RackView(GetRelatedModelsMixin, generic.ObjectView): peer_racks = peer_racks.filter(location=instance.location) else: peer_racks = peer_racks.filter(location__isnull=True) - next_rack = peer_racks.filter(_name__gt=instance._name).first() - prev_rack = peer_racks.filter(_name__lt=instance._name).reverse().first() + next_rack = peer_racks.filter(name__gt=instance.name).first() + prev_rack = peer_racks.filter(name__lt=instance.name).reverse().first() # Determine any additional parameters to pass when embedding the rack elevations svg_extra = '&'.join([ diff --git a/netbox/ipam/migrations/0076_natural_ordering.py b/netbox/ipam/migrations/0076_natural_ordering.py new file mode 100644 index 000000000..8c7bfaea1 --- /dev/null +++ b/netbox/ipam/migrations/0076_natural_ordering.py @@ -0,0 +1,32 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0075_vlan_qinq'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterField( + model_name='asnrange', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='routetarget', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=21, unique=True), + ), + migrations.AlterField( + model_name='vlangroup', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='vrf', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + ] diff --git a/netbox/ipam/models/asns.py b/netbox/ipam/models/asns.py index eb47426b2..c1d251301 100644 --- a/netbox/ipam/models/asns.py +++ b/netbox/ipam/models/asns.py @@ -16,7 +16,8 @@ class ASNRange(OrganizationalModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 7832cfc67..fa31fd608 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -35,7 +35,8 @@ class VLANGroup(OrganizationalModel): """ name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), diff --git a/netbox/ipam/models/vrfs.py b/netbox/ipam/models/vrfs.py index 26afb7927..6a8b8d649 100644 --- a/netbox/ipam/models/vrfs.py +++ b/netbox/ipam/models/vrfs.py @@ -18,7 +18,8 @@ class VRF(PrimaryModel): """ name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) rd = models.CharField( max_length=VRF_RD_MAX_LENGTH, @@ -74,7 +75,8 @@ class RouteTarget(PrimaryModel): verbose_name=_('name'), max_length=VRF_RD_MAX_LENGTH, # Same format options as VRF RD (RFC 4360 section 4) unique=True, - help_text=_('Route target value (formatted in accordance with RFC 4360)') + help_text=_('Route target value (formatted in accordance with RFC 4360)'), + db_collation="natural_sort" ) tenant = models.ForeignKey( to='tenancy.Tenant', diff --git a/netbox/tenancy/migrations/0017_natural_ordering.py b/netbox/tenancy/migrations/0017_natural_ordering.py new file mode 100644 index 000000000..de1fb49aa --- /dev/null +++ b/netbox/tenancy/migrations/0017_natural_ordering.py @@ -0,0 +1,27 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tenancy', '0016_charfield_null_choices'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterField( + model_name='contact', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='tenant', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.AlterField( + model_name='tenantgroup', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + ] diff --git a/netbox/tenancy/models/contacts.py b/netbox/tenancy/models/contacts.py index 24ffef0cf..3969c8317 100644 --- a/netbox/tenancy/models/contacts.py +++ b/netbox/tenancy/models/contacts.py @@ -56,7 +56,8 @@ class Contact(PrimaryModel): ) name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) title = models.CharField( verbose_name=_('title'), diff --git a/netbox/tenancy/models/tenants.py b/netbox/tenancy/models/tenants.py index 7a2d9c2f8..55f0c5933 100644 --- a/netbox/tenancy/models/tenants.py +++ b/netbox/tenancy/models/tenants.py @@ -18,7 +18,8 @@ class TenantGroup(NestedGroupModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), @@ -39,7 +40,8 @@ class Tenant(ContactsMixin, PrimaryModel): """ name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py index ee71223cb..1d16a1d3f 100644 --- a/netbox/utilities/fields.py +++ b/netbox/utilities/fields.py @@ -5,7 +5,6 @@ from django.db import models from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ -from utilities.ordering import naturalize from .forms.widgets import ColorSelect from .validators import ColorValidator @@ -40,7 +39,7 @@ class NaturalOrderingField(models.CharField): """ description = "Stores a representation of its target field suitable for natural ordering" - def __init__(self, target_field, naturalize_function=naturalize, *args, **kwargs): + def __init__(self, target_field, naturalize_function, *args, **kwargs): self.target_field = target_field self.naturalize_function = naturalize_function super().__init__(*args, **kwargs) diff --git a/netbox/virtualization/graphql/types.py b/netbox/virtualization/graphql/types.py index 6052c8936..8476eac7e 100644 --- a/netbox/virtualization/graphql/types.py +++ b/netbox/virtualization/graphql/types.py @@ -25,7 +25,6 @@ class ComponentType(NetBoxObjectType): """ Base type for device/VM components """ - _name: str virtual_machine: Annotated["VirtualMachineType", strawberry.lazy('virtualization.graphql.types')] @@ -77,7 +76,6 @@ class ClusterTypeType(OrganizationalObjectType): filters=VirtualMachineFilter ) class VirtualMachineType(ConfigContextMixin, ContactsMixin, NetBoxObjectType): - _name: str interface_count: BigInt virtual_disk_count: BigInt interface_count: BigInt @@ -102,6 +100,7 @@ class VirtualMachineType(ConfigContextMixin, ContactsMixin, NetBoxObjectType): filters=VMInterfaceFilter ) class VMInterfaceType(IPAddressesMixin, ComponentType): + _name: str mac_address: str | None parent: Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')] | None bridge: Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')] | None diff --git a/netbox/virtualization/migrations/0046_natural_ordering.py b/netbox/virtualization/migrations/0046_natural_ordering.py new file mode 100644 index 000000000..9284b6331 --- /dev/null +++ b/netbox/virtualization/migrations/0046_natural_ordering.py @@ -0,0 +1,43 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('virtualization', '0045_clusters_cached_relations'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterModelOptions( + name='virtualmachine', + options={'ordering': ('name', 'pk')}, + ), + migrations.AlterModelOptions( + name='virtualdisk', + options={'ordering': ('virtual_machine', 'name')}, + ), + migrations.RemoveField( + model_name='virtualmachine', + name='_name', + ), + migrations.AlterField( + model_name='virtualdisk', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='virtualmachine', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=64), + ), + migrations.AlterField( + model_name='cluster', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100), + ), + migrations.RemoveField( + model_name='virtualdisk', + name='_name', + ), + ] diff --git a/netbox/virtualization/models/clusters.py b/netbox/virtualization/models/clusters.py index 601ee7f23..9f7b97e29 100644 --- a/netbox/virtualization/models/clusters.py +++ b/netbox/virtualization/models/clusters.py @@ -50,7 +50,8 @@ class Cluster(ContactsMixin, CachedScopeMixin, PrimaryModel): """ name = models.CharField( verbose_name=_('name'), - max_length=100 + max_length=100, + db_collation="natural_sort" ) type = models.ForeignKey( verbose_name=_('type'), diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index 4ee41e403..ebfb2d6c5 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -69,12 +69,8 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co ) name = models.CharField( verbose_name=_('name'), - max_length=64 - ) - _name = NaturalOrderingField( - target_field='name', - max_length=100, - blank=True + max_length=64, + db_collation="natural_sort" ) status = models.CharField( max_length=50, @@ -152,7 +148,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co ) class Meta: - ordering = ('_name', 'pk') # Name may be non-unique + ordering = ('name', 'pk') # Name may be non-unique constraints = ( models.UniqueConstraint( Lower('name'), 'cluster', 'tenant', @@ -273,13 +269,8 @@ class ComponentModel(NetBoxModel): ) name = models.CharField( verbose_name=_('name'), - max_length=64 - ) - _name = NaturalOrderingField( - target_field='name', - naturalize_function=naturalize_interface, - max_length=100, - blank=True + max_length=64, + db_collation="natural_sort" ) description = models.CharField( verbose_name=_('description'), @@ -289,7 +280,6 @@ class ComponentModel(NetBoxModel): class Meta: abstract = True - ordering = ('virtual_machine', CollateAsChar('_name')) constraints = ( models.UniqueConstraint( fields=('virtual_machine', 'name'), @@ -311,10 +301,9 @@ class ComponentModel(NetBoxModel): class VMInterface(ComponentModel, BaseInterface, TrackingModelMixin): - virtual_machine = models.ForeignKey( - to='virtualization.VirtualMachine', - on_delete=models.CASCADE, - related_name='interfaces' # Override ComponentModel + name = models.CharField( + verbose_name=_('name'), + max_length=64, ) _name = NaturalOrderingField( target_field='name', @@ -322,6 +311,11 @@ class VMInterface(ComponentModel, BaseInterface, TrackingModelMixin): max_length=100, blank=True ) + virtual_machine = models.ForeignKey( + to='virtualization.VirtualMachine', + on_delete=models.CASCADE, + related_name='interfaces' # Override ComponentModel + ) ip_addresses = GenericRelation( to='ipam.IPAddress', content_type_field='assigned_object_type', @@ -358,6 +352,7 @@ class VMInterface(ComponentModel, BaseInterface, TrackingModelMixin): class Meta(ComponentModel.Meta): verbose_name = _('interface') verbose_name_plural = _('interfaces') + ordering = ('virtual_machine', CollateAsChar('_name')) def clean(self): super().clean() @@ -416,3 +411,4 @@ class VirtualDisk(ComponentModel, TrackingModelMixin): class Meta(ComponentModel.Meta): verbose_name = _('virtual disk') verbose_name_plural = _('virtual disks') + ordering = ('virtual_machine', 'name') diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 4a3138711..26d32f8cf 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -53,7 +53,6 @@ VMINTERFACE_BUTTONS = """ class VirtualMachineTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): name = tables.Column( verbose_name=_('Name'), - order_by=('_name',), linkify=True ) status = columns.ChoiceFieldColumn( diff --git a/netbox/vpn/migrations/0007_natural_ordering.py b/netbox/vpn/migrations/0007_natural_ordering.py new file mode 100644 index 000000000..01dd4620f --- /dev/null +++ b/netbox/vpn/migrations/0007_natural_ordering.py @@ -0,0 +1,47 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vpn', '0006_charfield_null_choices'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterField( + model_name='ikepolicy', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='ikeproposal', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='ipsecpolicy', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='ipsecprofile', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='ipsecproposal', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='l2vpn', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + migrations.AlterField( + model_name='tunnel', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + ] diff --git a/netbox/vpn/models/crypto.py b/netbox/vpn/models/crypto.py index 2b721ec29..8e991b578 100644 --- a/netbox/vpn/models/crypto.py +++ b/netbox/vpn/models/crypto.py @@ -22,7 +22,8 @@ class IKEProposal(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) authentication_method = models.CharField( verbose_name=('authentication method'), @@ -67,7 +68,8 @@ class IKEPolicy(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) version = models.PositiveSmallIntegerField( verbose_name=_('version'), @@ -125,7 +127,8 @@ class IPSecProposal(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) encryption_algorithm = models.CharField( verbose_name=_('encryption'), @@ -176,7 +179,8 @@ class IPSecPolicy(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) proposals = models.ManyToManyField( to='vpn.IPSecProposal', @@ -211,7 +215,8 @@ class IPSecProfile(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) mode = models.CharField( verbose_name=_('mode'), diff --git a/netbox/vpn/models/l2vpn.py b/netbox/vpn/models/l2vpn.py index b799ab32d..3e562531d 100644 --- a/netbox/vpn/models/l2vpn.py +++ b/netbox/vpn/models/l2vpn.py @@ -20,7 +20,8 @@ class L2VPN(ContactsMixin, PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), diff --git a/netbox/vpn/models/tunnels.py b/netbox/vpn/models/tunnels.py index 3a0f1dc14..714024a81 100644 --- a/netbox/vpn/models/tunnels.py +++ b/netbox/vpn/models/tunnels.py @@ -31,7 +31,8 @@ class Tunnel(PrimaryModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) status = models.CharField( verbose_name=_('status'), diff --git a/netbox/wireless/migrations/0012_natural_ordering.py b/netbox/wireless/migrations/0012_natural_ordering.py new file mode 100644 index 000000000..da818bdd9 --- /dev/null +++ b/netbox/wireless/migrations/0012_natural_ordering.py @@ -0,0 +1,17 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('wireless', '0011_wirelesslan__location_wirelesslan__region_and_more'), + ('dcim', '0197_natural_sort_collation'), + ] + + operations = [ + migrations.AlterField( + model_name='wirelesslangroup', + name='name', + field=models.CharField(db_collation='natural_sort', max_length=100, unique=True), + ), + ] diff --git a/netbox/wireless/models.py b/netbox/wireless/models.py index d78c893a6..61ff72bc1 100644 --- a/netbox/wireless/models.py +++ b/netbox/wireless/models.py @@ -52,7 +52,8 @@ class WirelessLANGroup(NestedGroupModel): name = models.CharField( verbose_name=_('name'), max_length=100, - unique=True + unique=True, + db_collation="natural_sort" ) slug = models.SlugField( verbose_name=_('slug'), From 9fe6685562d0b6918c7acb6a83678bc399a3fd8a Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 15 Nov 2024 11:55:46 -0800 Subject: [PATCH 030/190] 17929 Add Scope Mixins to Prefix (#17930) * 17929 Add Scope Mixins to Prefix * 17929 Add Scope Mixins to Prefix * 17929 fixes for tests * 17929 merge latest scope changes * 12596 review changes * 12596 review changes * 12596 review changes * 12596 review changes * 12596 review changes * 12596 review changes * 17929 fix migrations --- netbox/dcim/api/serializers_/sites.py | 8 +-- netbox/dcim/base_filtersets.py | 67 ++++++++++++++++++ netbox/dcim/filtersets.py | 58 ---------------- netbox/dcim/graphql/types.py | 8 +-- netbox/dcim/models/mixins.py | 4 -- netbox/ipam/api/serializers_/ip.py | 5 +- netbox/ipam/apps.py | 2 +- netbox/ipam/constants.py | 5 -- netbox/ipam/filtersets.py | 56 +-------------- netbox/ipam/forms/bulk_edit.py | 30 +------- netbox/ipam/forms/bulk_import.py | 10 +-- netbox/ipam/forms/model_forms.py | 46 +------------ netbox/ipam/graphql/types.py | 2 +- .../0072_prefix_cached_relations.py | 14 ++-- netbox/ipam/models/ip.py | 69 +------------------ netbox/utilities/api.py | 2 +- netbox/virtualization/filtersets.py | 3 +- ...location_alter_cluster__region_and_more.py | 41 +++++++++++ ...l_ordering.py => 0047_natural_ordering.py} | 2 +- netbox/wireless/filtersets.py | 2 +- ...12_alter_wirelesslan__location_and_more.py | 41 +++++++++++ ...l_ordering.py => 0013_natural_ordering.py} | 2 +- 22 files changed, 187 insertions(+), 290 deletions(-) create mode 100644 netbox/dcim/base_filtersets.py create mode 100644 netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py rename netbox/virtualization/migrations/{0046_natural_ordering.py => 0047_natural_ordering.py} (93%) create mode 100644 netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py rename netbox/wireless/migrations/{0012_natural_ordering.py => 0013_natural_ordering.py} (82%) diff --git a/netbox/dcim/api/serializers_/sites.py b/netbox/dcim/api/serializers_/sites.py index 7cd89e38c..b818cd954 100644 --- a/netbox/dcim/api/serializers_/sites.py +++ b/netbox/dcim/api/serializers_/sites.py @@ -21,7 +21,7 @@ __all__ = ( class RegionSerializer(NestedGroupModelSerializer): parent = NestedRegionSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) - prefix_count = RelatedObjectCountField('_prefixes') + prefix_count = RelatedObjectCountField('prefix_set') class Meta: model = Region @@ -35,7 +35,7 @@ class RegionSerializer(NestedGroupModelSerializer): class SiteGroupSerializer(NestedGroupModelSerializer): parent = NestedSiteGroupSerializer(required=False, allow_null=True, default=None) site_count = serializers.IntegerField(read_only=True, default=0) - prefix_count = RelatedObjectCountField('_prefixes') + prefix_count = RelatedObjectCountField('prefix_set') class Meta: model = SiteGroup @@ -63,7 +63,7 @@ class SiteSerializer(NetBoxModelSerializer): # Related object counts circuit_count = RelatedObjectCountField('circuit_terminations') device_count = RelatedObjectCountField('devices') - prefix_count = RelatedObjectCountField('_prefixes') + prefix_count = RelatedObjectCountField('prefix_set') rack_count = RelatedObjectCountField('racks') vlan_count = RelatedObjectCountField('vlans') virtualmachine_count = RelatedObjectCountField('virtual_machines') @@ -86,7 +86,7 @@ class LocationSerializer(NestedGroupModelSerializer): tenant = TenantSerializer(nested=True, required=False, allow_null=True) rack_count = serializers.IntegerField(read_only=True, default=0) device_count = serializers.IntegerField(read_only=True, default=0) - prefix_count = RelatedObjectCountField('_prefixes') + prefix_count = RelatedObjectCountField('prefix_set') class Meta: model = Location diff --git a/netbox/dcim/base_filtersets.py b/netbox/dcim/base_filtersets.py new file mode 100644 index 000000000..c007c0120 --- /dev/null +++ b/netbox/dcim/base_filtersets.py @@ -0,0 +1,67 @@ +import django_filters + +from django.utils.translation import gettext as _ +from netbox.filtersets import BaseFilterSet +from utilities.filters import ContentTypeFilter, TreeNodeMultipleChoiceFilter +from .models import * + +__all__ = ( + 'ScopedFilterSet', +) + + +class ScopedFilterSet(BaseFilterSet): + """ + Provides additional filtering functionality for location, site, etc.. for Scoped models. + """ + scope_type = ContentTypeFilter() + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + label=_('Region (ID)'), + ) + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='_region', + lookup_expr='in', + to_field_name='slug', + label=_('Region (slug)'), + ) + site_group_id = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + label=_('Site group (ID)'), + ) + site_group = TreeNodeMultipleChoiceFilter( + queryset=SiteGroup.objects.all(), + field_name='_site_group', + lookup_expr='in', + to_field_name='slug', + label=_('Site group (slug)'), + ) + site_id = django_filters.ModelMultipleChoiceFilter( + queryset=Site.objects.all(), + field_name='_site', + label=_('Site (ID)'), + ) + site = django_filters.ModelMultipleChoiceFilter( + field_name='_site__slug', + queryset=Site.objects.all(), + to_field_name='slug', + label=_('Site (slug)'), + ) + location_id = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + label=_('Location (ID)'), + ) + location = TreeNodeMultipleChoiceFilter( + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + to_field_name='slug', + label=_('Location (slug)'), + ) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index df66ad77b..0371f882b 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -73,7 +73,6 @@ __all__ = ( 'RearPortFilterSet', 'RearPortTemplateFilterSet', 'RegionFilterSet', - 'ScopedFilterSet', 'SiteFilterSet', 'SiteGroupFilterSet', 'VirtualChassisFilterSet', @@ -2345,60 +2344,3 @@ class InterfaceConnectionFilterSet(ConnectionFilterSet): class Meta: model = Interface fields = tuple() - - -class ScopedFilterSet(BaseFilterSet): - """ - Provides additional filtering functionality for location, site, etc.. for Scoped models. - """ - scope_type = ContentTypeFilter() - region_id = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='_region', - lookup_expr='in', - label=_('Region (ID)'), - ) - region = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='_region', - lookup_expr='in', - to_field_name='slug', - label=_('Region (slug)'), - ) - site_group_id = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='_site_group', - lookup_expr='in', - label=_('Site group (ID)'), - ) - site_group = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='_site_group', - lookup_expr='in', - to_field_name='slug', - label=_('Site group (slug)'), - ) - site_id = django_filters.ModelMultipleChoiceFilter( - queryset=Site.objects.all(), - field_name='_site', - label=_('Site (ID)'), - ) - site = django_filters.ModelMultipleChoiceFilter( - field_name='_site__slug', - queryset=Site.objects.all(), - to_field_name='slug', - label=_('Site (slug)'), - ) - location_id = TreeNodeMultipleChoiceFilter( - queryset=Location.objects.all(), - field_name='_location', - lookup_expr='in', - label=_('Location (ID)'), - ) - location = TreeNodeMultipleChoiceFilter( - queryset=Location.objects.all(), - field_name='_location', - lookup_expr='in', - to_field_name='slug', - label=_('Location (slug)'), - ) diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index fc5f35780..cc1bcac0f 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -461,7 +461,7 @@ class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, Organi @strawberry_django.field def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: - return self._clusters.all() + return self.cluster_set.all() @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: @@ -707,7 +707,7 @@ class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): @strawberry_django.field def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: - return self._clusters.all() + return self.cluster_set.all() @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: @@ -739,7 +739,7 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje @strawberry_django.field def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: - return self._clusters.all() + return self.cluster_set.all() @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: @@ -763,7 +763,7 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): @strawberry_django.field def clusters(self) -> List[Annotated["ClusterType", strawberry.lazy('virtualization.graphql.types')]]: - return self._clusters.all() + return self.cluster_set.all() @strawberry_django.field def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: diff --git a/netbox/dcim/models/mixins.py b/netbox/dcim/models/mixins.py index 1df3364c4..ac4d7dab9 100644 --- a/netbox/dcim/models/mixins.py +++ b/netbox/dcim/models/mixins.py @@ -59,28 +59,24 @@ class CachedScopeMixin(models.Model): _location = models.ForeignKey( to='dcim.Location', on_delete=models.CASCADE, - related_name='_%(class)ss', blank=True, null=True ) _site = models.ForeignKey( to='dcim.Site', on_delete=models.CASCADE, - related_name='_%(class)ss', blank=True, null=True ) _region = models.ForeignKey( to='dcim.Region', on_delete=models.CASCADE, - related_name='_%(class)ss', blank=True, null=True ) _site_group = models.ForeignKey( to='dcim.SiteGroup', on_delete=models.CASCADE, - related_name='_%(class)ss', blank=True, null=True ) diff --git a/netbox/ipam/api/serializers_/ip.py b/netbox/ipam/api/serializers_/ip.py index 0c3c141af..bfc7ac546 100644 --- a/netbox/ipam/api/serializers_/ip.py +++ b/netbox/ipam/api/serializers_/ip.py @@ -2,8 +2,9 @@ from django.contrib.contenttypes.models import ContentType from drf_spectacular.utils import extend_schema_field from rest_framework import serializers +from dcim.constants import LOCATION_SCOPE_TYPES from ipam.choices import * -from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS, PREFIX_SCOPE_TYPES +from ipam.constants import IPADDRESS_ASSIGNMENT_MODELS from ipam.models import Aggregate, IPAddress, IPRange, Prefix from netbox.api.fields import ChoiceField, ContentTypeField from netbox.api.serializers import NetBoxModelSerializer @@ -47,7 +48,7 @@ class PrefixSerializer(NetBoxModelSerializer): vrf = VRFSerializer(nested=True, required=False, allow_null=True) scope_type = ContentTypeField( queryset=ContentType.objects.filter( - model__in=PREFIX_SCOPE_TYPES + model__in=LOCATION_SCOPE_TYPES ), allow_null=True, required=False, diff --git a/netbox/ipam/apps.py b/netbox/ipam/apps.py index e0463dfce..ae88d69a9 100644 --- a/netbox/ipam/apps.py +++ b/netbox/ipam/apps.py @@ -18,7 +18,7 @@ class IPAMConfig(AppConfig): # Register denormalized fields denormalized.register(Prefix, '_site', { '_region': 'region', - '_sitegroup': 'group', + '_site_group': 'group', }) denormalized.register(Prefix, '_location', { '_site': 'site', diff --git a/netbox/ipam/constants.py b/netbox/ipam/constants.py index c07b8441f..6dffd3287 100644 --- a/netbox/ipam/constants.py +++ b/netbox/ipam/constants.py @@ -23,11 +23,6 @@ VRF_RD_MAX_LENGTH = 21 PREFIX_LENGTH_MIN = 1 PREFIX_LENGTH_MAX = 127 # IPv6 -# models values for ContentTypes which may be Prefix scope types -PREFIX_SCOPE_TYPES = ( - 'region', 'sitegroup', 'site', 'location', -) - # # IPAddresses diff --git a/netbox/ipam/filtersets.py b/netbox/ipam/filtersets.py index 88c869a50..c762c15fe 100644 --- a/netbox/ipam/filtersets.py +++ b/netbox/ipam/filtersets.py @@ -1,5 +1,6 @@ import django_filters import netaddr +from dcim.base_filtersets import ScopedFilterSet from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.db.models import Q @@ -9,7 +10,7 @@ from drf_spectacular.utils import extend_schema_field from netaddr.core import AddrFormatError from circuits.models import Provider -from dcim.models import Device, Interface, Location, Region, Site, SiteGroup +from dcim.models import Device, Interface, Region, Site, SiteGroup from netbox.filtersets import ChangeLoggedModelFilterSet, OrganizationalModelFilterSet, NetBoxModelFilterSet from tenancy.filtersets import TenancyFilterSet from utilities.filters import ( @@ -273,7 +274,7 @@ class RoleFilterSet(OrganizationalModelFilterSet): fields = ('id', 'name', 'slug', 'description', 'weight') -class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): +class PrefixFilterSet(NetBoxModelFilterSet, ScopedFilterSet, TenancyFilterSet): family = django_filters.NumberFilter( field_name='prefix', lookup_expr='family' @@ -334,57 +335,6 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet): to_field_name='rd', label=_('VRF (RD)'), ) - scope_type = ContentTypeFilter() - region_id = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='_region', - lookup_expr='in', - label=_('Region (ID)'), - ) - region = TreeNodeMultipleChoiceFilter( - queryset=Region.objects.all(), - field_name='_region', - lookup_expr='in', - to_field_name='slug', - label=_('Region (slug)'), - ) - site_group_id = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='_sitegroup', - lookup_expr='in', - label=_('Site group (ID)'), - ) - site_group = TreeNodeMultipleChoiceFilter( - queryset=SiteGroup.objects.all(), - field_name='_sitegroup', - lookup_expr='in', - to_field_name='slug', - label=_('Site group (slug)'), - ) - site_id = django_filters.ModelMultipleChoiceFilter( - queryset=Site.objects.all(), - field_name='_site', - label=_('Site (ID)'), - ) - site = django_filters.ModelMultipleChoiceFilter( - field_name='_site__slug', - queryset=Site.objects.all(), - to_field_name='slug', - label=_('Site (slug)'), - ) - location_id = TreeNodeMultipleChoiceFilter( - queryset=Location.objects.all(), - field_name='_location', - lookup_expr='in', - label=_('Location (ID)'), - ) - location = TreeNodeMultipleChoiceFilter( - queryset=Location.objects.all(), - field_name='_location', - lookup_expr='in', - to_field_name='slug', - label=_('Location (slug)'), - ) vlan_id = django_filters.ModelMultipleChoiceFilter( queryset=VLAN.objects.all(), label=_('VLAN (ID)'), diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index c323a41c1..7f3216cfd 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -3,6 +3,7 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ +from dcim.forms.mixins import ScopedBulkEditForm from dcim.models import Region, Site, SiteGroup from ipam.choices import * from ipam.constants import * @@ -205,20 +206,7 @@ class RoleBulkEditForm(NetBoxModelBulkEditForm): nullable_fields = ('description',) -class PrefixBulkEditForm(NetBoxModelBulkEditForm): - scope_type = ContentTypeChoiceField( - queryset=ContentType.objects.filter(model__in=VLANGROUP_SCOPE_TYPES), - widget=HTMXSelect(method='post', attrs={'hx-select': '#form_fields'}), - required=False, - label=_('Scope type') - ) - scope = DynamicModelChoiceField( - label=_('Scope'), - queryset=Site.objects.none(), # Initial queryset - required=False, - disabled=True, - selector=True - ) +class PrefixBulkEditForm(ScopedBulkEditForm, NetBoxModelBulkEditForm): vlan_group = DynamicModelChoiceField( queryset=VLANGroup.objects.all(), required=False, @@ -286,20 +274,6 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): 'vlan', 'vrf', 'tenant', 'role', 'scope', 'description', 'comments', ) - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - if scope_type_id := get_field_value(self, 'scope_type'): - try: - scope_type = ContentType.objects.get(pk=scope_type_id) - model = scope_type.model_class() - self.fields['scope'].queryset = model.objects.all() - self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower - self.fields['scope'].disabled = False - self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) - except ObjectDoesNotExist: - pass - class IPRangeBulkEditForm(NetBoxModelBulkEditForm): vrf = DynamicModelChoiceField( diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index 3be4ccc59..7e1382be9 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -3,6 +3,7 @@ from django.contrib.contenttypes.models import ContentType from django.utils.translation import gettext_lazy as _ from dcim.models import Device, Interface, Site +from dcim.forms.mixins import ScopedImportForm from ipam.choices import * from ipam.constants import * from ipam.models import * @@ -154,7 +155,7 @@ class RoleImportForm(NetBoxModelImportForm): fields = ('name', 'slug', 'weight', 'description', 'tags') -class PrefixImportForm(NetBoxModelImportForm): +class PrefixImportForm(ScopedImportForm, NetBoxModelImportForm): vrf = CSVModelChoiceField( label=_('VRF'), queryset=VRF.objects.all(), @@ -169,11 +170,6 @@ class PrefixImportForm(NetBoxModelImportForm): to_field_name='name', help_text=_('Assigned tenant') ) - scope_type = CSVContentTypeField( - queryset=ContentType.objects.filter(model__in=PREFIX_SCOPE_TYPES), - required=False, - label=_('Scope type (app & model)') - ) vlan_group = CSVModelChoiceField( label=_('VLAN group'), queryset=VLANGroup.objects.all(), @@ -208,7 +204,7 @@ class PrefixImportForm(NetBoxModelImportForm): 'mark_utilized', 'description', 'comments', 'tags', ) labels = { - 'scope_id': 'Scope ID', + 'scope_id': _('Scope ID'), } def __init__(self, data=None, *args, **kwargs): diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 3d0cd3dd1..56a6dc3d9 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -4,6 +4,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.utils.translation import gettext_lazy as _ from dcim.models import Device, Interface, Site +from dcim.forms.mixins import ScopedForm from ipam.choices import * from ipam.constants import * from ipam.formfields import IPNetworkFormField @@ -197,25 +198,12 @@ class RoleForm(NetBoxModelForm): ] -class PrefixForm(TenancyForm, NetBoxModelForm): +class PrefixForm(TenancyForm, ScopedForm, NetBoxModelForm): vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, label=_('VRF') ) - scope_type = ContentTypeChoiceField( - queryset=ContentType.objects.filter(model__in=PREFIX_SCOPE_TYPES), - widget=HTMXSelect(), - required=False, - label=_('Scope type') - ) - scope = DynamicModelChoiceField( - label=_('Scope'), - queryset=Site.objects.none(), # Initial queryset - required=False, - disabled=True, - selector=True - ) vlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, @@ -248,36 +236,6 @@ class PrefixForm(TenancyForm, NetBoxModelForm): 'tenant', 'description', 'comments', 'tags', ] - def __init__(self, *args, **kwargs): - instance = kwargs.get('instance') - initial = kwargs.get('initial', {}) - - if instance is not None and instance.scope: - initial['scope'] = instance.scope - kwargs['initial'] = initial - - super().__init__(*args, **kwargs) - - if scope_type_id := get_field_value(self, 'scope_type'): - try: - scope_type = ContentType.objects.get(pk=scope_type_id) - model = scope_type.model_class() - self.fields['scope'].queryset = model.objects.all() - self.fields['scope'].widget.attrs['selector'] = model._meta.label_lower - self.fields['scope'].disabled = False - self.fields['scope'].label = _(bettertitle(model._meta.verbose_name)) - except ObjectDoesNotExist: - pass - - if self.instance and scope_type_id != self.instance.scope_type_id: - self.initial['scope'] = None - - def clean(self): - super().clean() - - # Assign the selected scope (if any) - self.instance.scope = self.cleaned_data.get('scope') - class IPRangeForm(TenancyForm, NetBoxModelForm): vrf = DynamicModelChoiceField( diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index 2ef63cf0c..5a4813e0c 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -154,7 +154,7 @@ class IPRangeType(NetBoxObjectType): @strawberry_django.type( models.Prefix, - exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_sitegroup'), + exclude=('scope_type', 'scope_id', '_location', '_region', '_site', '_site_group'), filters=PrefixFilter ) class PrefixType(NetBoxObjectType, BaseIPAddressFamilyType): diff --git a/netbox/ipam/migrations/0072_prefix_cached_relations.py b/netbox/ipam/migrations/0072_prefix_cached_relations.py index 2b457ebda..4b438f7d5 100644 --- a/netbox/ipam/migrations/0072_prefix_cached_relations.py +++ b/netbox/ipam/migrations/0072_prefix_cached_relations.py @@ -11,11 +11,11 @@ def populate_denormalized_fields(apps, schema_editor): prefixes = Prefix.objects.filter(site__isnull=False).prefetch_related('site') for prefix in prefixes: prefix._region_id = prefix.site.region_id - prefix._sitegroup_id = prefix.site.group_id + prefix._site_group_id = prefix.site.group_id prefix._site_id = prefix.site_id # Note: Location cannot be set prior to migration - Prefix.objects.bulk_update(prefixes, ['_region', '_sitegroup', '_site']) + Prefix.objects.bulk_update(prefixes, ['_region', '_site_group', '_site']) class Migration(migrations.Migration): @@ -29,22 +29,22 @@ class Migration(migrations.Migration): migrations.AddField( model_name='prefix', name='_location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.location'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location'), ), migrations.AddField( model_name='prefix', name='_region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.region'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.region'), ), migrations.AddField( model_name='prefix', name='_site', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.site'), + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site'), ), migrations.AddField( model_name='prefix', - name='_sitegroup', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='_prefixes', to='dcim.sitegroup'), + name='_site_group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.sitegroup'), ), # Populate denormalized FK values diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index b17e26169..dcecbcdea 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -1,5 +1,4 @@ import netaddr -from django.apps import apps from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import ValidationError from django.db import models @@ -9,6 +8,7 @@ from django.utils.functional import cached_property from django.utils.translation import gettext_lazy as _ from core.models import ObjectType +from dcim.models.mixins import CachedScopeMixin from ipam.choices import * from ipam.constants import * from ipam.fields import IPNetworkField, IPAddressField @@ -198,7 +198,7 @@ class Role(OrganizationalModel): return self.name -class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): +class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, PrimaryModel): """ A Prefix represents an IPv4 or IPv6 network, including mask length. Prefixes can optionally be scoped to certain areas and/or assigned to VRFs. A Prefix must be assigned a status and may optionally be assigned a used-define Role. @@ -208,22 +208,6 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): verbose_name=_('prefix'), help_text=_('IPv4 or IPv6 network with mask') ) - scope_type = models.ForeignKey( - to='contenttypes.ContentType', - on_delete=models.PROTECT, - limit_choices_to=Q(model__in=PREFIX_SCOPE_TYPES), - related_name='+', - blank=True, - null=True - ) - scope_id = models.PositiveBigIntegerField( - blank=True, - null=True - ) - scope = GenericForeignKey( - ct_field='scope_type', - fk_field='scope_id' - ) vrf = models.ForeignKey( to='ipam.VRF', on_delete=models.PROTECT, @@ -272,36 +256,6 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): help_text=_("Treat as fully utilized") ) - # Cached associations to enable efficient filtering - _location = models.ForeignKey( - to='dcim.Location', - on_delete=models.CASCADE, - related_name='_prefixes', - blank=True, - null=True - ) - _site = models.ForeignKey( - to='dcim.Site', - on_delete=models.CASCADE, - related_name='_prefixes', - blank=True, - null=True - ) - _region = models.ForeignKey( - to='dcim.Region', - on_delete=models.CASCADE, - related_name='_prefixes', - blank=True, - null=True - ) - _sitegroup = models.ForeignKey( - to='dcim.SiteGroup', - on_delete=models.CASCADE, - related_name='_prefixes', - blank=True, - null=True - ) - # Cached depth & child counts _depth = models.PositiveSmallIntegerField( default=0, @@ -368,25 +322,6 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, PrimaryModel): super().save(*args, **kwargs) - def cache_related_objects(self): - self._region = self._sitegroup = self._site = self._location = None - if self.scope_type: - scope_type = self.scope_type.model_class() - if scope_type == apps.get_model('dcim', 'region'): - self._region = self.scope - elif scope_type == apps.get_model('dcim', 'sitegroup'): - self._sitegroup = self.scope - elif scope_type == apps.get_model('dcim', 'site'): - self._region = self.scope.region - self._sitegroup = self.scope.group - self._site = self.scope - elif scope_type == apps.get_model('dcim', 'location'): - self._region = self.scope.site.region - self._sitegroup = self.scope.site.group - self._site = self.scope.site - self._location = self.scope - cache_related_objects.alters_data = True - @property def family(self): return self.prefix.version if self.prefix else None diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index 11b914811..6793c0526 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -129,7 +129,7 @@ def get_annotations_for_serializer(serializer_class, fields_to_include=None): for field_name, field in serializer_class._declared_fields.items(): if field_name in fields_to_include and type(field) is RelatedObjectCountField: - related_field = model._meta.get_field(field.relation).field + related_field = getattr(model, field.relation).field annotations[field_name] = count_related(related_field.model, related_field.name) return annotations diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py index ac72bea12..ab25492b5 100644 --- a/netbox/virtualization/filtersets.py +++ b/netbox/virtualization/filtersets.py @@ -2,7 +2,8 @@ import django_filters from django.db.models import Q from django.utils.translation import gettext as _ -from dcim.filtersets import CommonInterfaceFilterSet, ScopedFilterSet +from dcim.filtersets import CommonInterfaceFilterSet +from dcim.base_filtersets import ScopedFilterSet from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate diff --git a/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py b/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py new file mode 100644 index 000000000..7b1168da0 --- /dev/null +++ b/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py @@ -0,0 +1,41 @@ +# Generated by Django 5.0.9 on 2024-11-14 19:04 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0196_qinq_svlan'), + ('virtualization', '0045_clusters_cached_relations'), + ] + + operations = [ + migrations.AlterField( + model_name='cluster', + name='_location', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location' + ), + ), + migrations.AlterField( + model_name='cluster', + name='_region', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.region' + ), + ), + migrations.AlterField( + model_name='cluster', + name='_site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site'), + ), + migrations.AlterField( + model_name='cluster', + name='_site_group', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.sitegroup' + ), + ), + ] diff --git a/netbox/virtualization/migrations/0046_natural_ordering.py b/netbox/virtualization/migrations/0047_natural_ordering.py similarity index 93% rename from netbox/virtualization/migrations/0046_natural_ordering.py rename to netbox/virtualization/migrations/0047_natural_ordering.py index 9284b6331..4454cfe2d 100644 --- a/netbox/virtualization/migrations/0046_natural_ordering.py +++ b/netbox/virtualization/migrations/0047_natural_ordering.py @@ -4,7 +4,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('virtualization', '0045_clusters_cached_relations'), + ('virtualization', '0046_alter_cluster__location_alter_cluster__region_and_more'), ('dcim', '0197_natural_sort_collation'), ] diff --git a/netbox/wireless/filtersets.py b/netbox/wireless/filtersets.py index 5a4195e6c..cc5aefbd8 100644 --- a/netbox/wireless/filtersets.py +++ b/netbox/wireless/filtersets.py @@ -2,7 +2,7 @@ import django_filters from django.db.models import Q from dcim.choices import LinkStatusChoices -from dcim.filtersets import ScopedFilterSet +from dcim.base_filtersets import ScopedFilterSet from dcim.models import Interface from ipam.models import VLAN from netbox.filtersets import OrganizationalModelFilterSet, NetBoxModelFilterSet diff --git a/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py b/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py new file mode 100644 index 000000000..7edaff92b --- /dev/null +++ b/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py @@ -0,0 +1,41 @@ +# Generated by Django 5.0.9 on 2024-11-14 19:04 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0196_qinq_svlan'), + ('wireless', '0011_wirelesslan__location_wirelesslan__region_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='wirelesslan', + name='_location', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location' + ), + ), + migrations.AlterField( + model_name='wirelesslan', + name='_region', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.region' + ), + ), + migrations.AlterField( + model_name='wirelesslan', + name='_site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site'), + ), + migrations.AlterField( + model_name='wirelesslan', + name='_site_group', + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.sitegroup' + ), + ), + ] diff --git a/netbox/wireless/migrations/0012_natural_ordering.py b/netbox/wireless/migrations/0013_natural_ordering.py similarity index 82% rename from netbox/wireless/migrations/0012_natural_ordering.py rename to netbox/wireless/migrations/0013_natural_ordering.py index da818bdd9..e33c87c60 100644 --- a/netbox/wireless/migrations/0012_natural_ordering.py +++ b/netbox/wireless/migrations/0013_natural_ordering.py @@ -4,7 +4,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('wireless', '0011_wirelesslan__location_wirelesslan__region_and_more'), + ('wireless', '0012_alter_wirelesslan__location_and_more'), ('dcim', '0197_natural_sort_collation'), ] From b4f15092dbb849ee85fd2dd8caf988ea4bd7eadb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 18 Nov 2024 14:44:57 -0500 Subject: [PATCH 031/190] Closes #5858: Implement a quick-add UI widget for related objects (#18016) * WIP * Misc cleanup * Add warning re: nested quick-adds --- netbox/circuits/forms/model_forms.py | 14 +++-- netbox/dcim/forms/model_forms.py | 21 +++++--- netbox/ipam/forms/model_forms.py | 14 +++-- netbox/netbox/views/generic/object_views.py | 41 +++++++++++---- netbox/project-static/dist/netbox.js | Bin 390388 -> 390918 bytes netbox/project-static/dist/netbox.js.map | Bin 527142 -> 527957 bytes netbox/project-static/src/buttons/reslug.ts | 48 +++++++++--------- netbox/project-static/src/htmx.ts | 11 ++-- netbox/project-static/src/quickAdd.ts | 39 ++++++++++++++ netbox/templates/htmx/quick_add.html | 28 ++++++++++ netbox/templates/htmx/quick_add_created.html | 22 ++++++++ netbox/tenancy/forms/forms.py | 1 + netbox/utilities/forms/fields/dynamic.py | 12 ++++- .../templates/widgets/apiselect.html | 27 +++++++--- netbox/virtualization/forms/model_forms.py | 6 ++- netbox/vpn/forms/model_forms.py | 9 ++-- netbox/wireless/forms/model_forms.py | 3 +- 17 files changed, 228 insertions(+), 68 deletions(-) create mode 100644 netbox/project-static/src/quickAdd.ts create mode 100644 netbox/templates/htmx/quick_add.html create mode 100644 netbox/templates/htmx/quick_add_created.html diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index 10cd06563..9eeb0f588 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -50,7 +50,9 @@ class ProviderForm(NetBoxModelForm): class ProviderAccountForm(NetBoxModelForm): provider = DynamicModelChoiceField( label=_('Provider'), - queryset=Provider.objects.all() + queryset=Provider.objects.all(), + selector=True, + quick_add=True ) comments = CommentField() @@ -64,7 +66,9 @@ class ProviderAccountForm(NetBoxModelForm): class ProviderNetworkForm(NetBoxModelForm): provider = DynamicModelChoiceField( label=_('Provider'), - queryset=Provider.objects.all() + queryset=Provider.objects.all(), + selector=True, + quick_add=True ) comments = CommentField() @@ -97,7 +101,8 @@ class CircuitForm(TenancyForm, NetBoxModelForm): provider = DynamicModelChoiceField( label=_('Provider'), queryset=Provider.objects.all(), - selector=True + selector=True, + quick_add=True ) provider_account = DynamicModelChoiceField( label=_('Provider account'), @@ -108,7 +113,8 @@ class CircuitForm(TenancyForm, NetBoxModelForm): } ) type = DynamicModelChoiceField( - queryset=CircuitType.objects.all() + queryset=CircuitType.objects.all(), + quick_add=True ) comments = CommentField() diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 2fcdbe5fd..b004798af 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -112,12 +112,14 @@ class SiteForm(TenancyForm, NetBoxModelForm): region = DynamicModelChoiceField( label=_('Region'), queryset=Region.objects.all(), - required=False + required=False, + quick_add=True ) group = DynamicModelChoiceField( label=_('Group'), queryset=SiteGroup.objects.all(), - required=False + required=False, + quick_add=True ) asns = DynamicModelMultipleChoiceField( queryset=ASN.objects.all(), @@ -206,7 +208,8 @@ class RackRoleForm(NetBoxModelForm): class RackTypeForm(NetBoxModelForm): manufacturer = DynamicModelChoiceField( label=_('Manufacturer'), - queryset=Manufacturer.objects.all() + queryset=Manufacturer.objects.all(), + quick_add=True ) comments = CommentField() slug = SlugField( @@ -348,7 +351,8 @@ class ManufacturerForm(NetBoxModelForm): class DeviceTypeForm(NetBoxModelForm): manufacturer = DynamicModelChoiceField( label=_('Manufacturer'), - queryset=Manufacturer.objects.all() + queryset=Manufacturer.objects.all(), + quick_add=True ) default_platform = DynamicModelChoiceField( label=_('Default platform'), @@ -436,7 +440,8 @@ class PlatformForm(NetBoxModelForm): manufacturer = DynamicModelChoiceField( label=_('Manufacturer'), queryset=Manufacturer.objects.all(), - required=False + required=False, + quick_add=True ) config_template = DynamicModelChoiceField( label=_('Config template'), @@ -508,7 +513,8 @@ class DeviceForm(TenancyForm, NetBoxModelForm): ) role = DynamicModelChoiceField( label=_('Device role'), - queryset=DeviceRole.objects.all() + queryset=DeviceRole.objects.all(), + quick_add=True ) platform = DynamicModelChoiceField( label=_('Platform'), @@ -750,7 +756,8 @@ class PowerFeedForm(TenancyForm, NetBoxModelForm): power_panel = DynamicModelChoiceField( label=_('Power panel'), queryset=PowerPanel.objects.all(), - selector=True + selector=True, + quick_add=True ) rack = DynamicModelChoiceField( label=_('Rack'), diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 56a6dc3d9..53ffe8f3f 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -109,7 +109,8 @@ class RIRForm(NetBoxModelForm): class AggregateForm(TenancyForm, NetBoxModelForm): rir = DynamicModelChoiceField( queryset=RIR.objects.all(), - label=_('RIR') + label=_('RIR'), + quick_add=True ) comments = CommentField() @@ -132,6 +133,7 @@ class ASNRangeForm(TenancyForm, NetBoxModelForm): rir = DynamicModelChoiceField( queryset=RIR.objects.all(), label=_('RIR'), + quick_add=True ) slug = SlugField() fieldsets = ( @@ -150,6 +152,7 @@ class ASNForm(TenancyForm, NetBoxModelForm): rir = DynamicModelChoiceField( queryset=RIR.objects.all(), label=_('RIR'), + quick_add=True ) sites = DynamicModelMultipleChoiceField( queryset=Site.objects.all(), @@ -216,7 +219,8 @@ class PrefixForm(TenancyForm, ScopedForm, NetBoxModelForm): role = DynamicModelChoiceField( label=_('Role'), queryset=Role.objects.all(), - required=False + required=False, + quick_add=True ) comments = CommentField() @@ -246,7 +250,8 @@ class IPRangeForm(TenancyForm, NetBoxModelForm): role = DynamicModelChoiceField( label=_('Role'), queryset=Role.objects.all(), - required=False + required=False, + quick_add=True ) comments = CommentField() @@ -639,7 +644,8 @@ class VLANForm(TenancyForm, NetBoxModelForm): role = DynamicModelChoiceField( label=_('Role'), queryset=Role.objects.all(), - required=False + required=False, + quick_add=True ) qinq_svlan = DynamicModelChoiceField( label=_('Q-in-Q SVLAN'), diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 0686e52b7..fb554ca4f 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -233,18 +233,23 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): form = self.form(instance=obj, initial=initial_data) restrict_form_fields(form, request.user) - # If this is an HTMX request, return only the rendered form HTML - if htmx_partial(request): - return render(request, self.htmx_template_name, { - 'model': model, - 'object': obj, - 'form': form, - }) - - return render(request, self.template_name, { + context = { 'model': model, 'object': obj, 'form': form, + } + + # If the form is being displayed within a "quick add" widget, + # use the appropriate template + if request.GET.get('_quickadd'): + return render(request, 'htmx/quick_add.html', context) + + # If this is an HTMX request, return only the rendered form HTML + if htmx_partial(request): + return render(request, self.htmx_template_name, context) + + return render(request, self.template_name, { + **context, 'return_url': self.get_return_url(request, obj), 'prerequisite_model': get_prerequisite_model(self.queryset), **self.get_extra_context(request, obj), @@ -259,6 +264,7 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): """ logger = logging.getLogger('netbox.views.ObjectEditView') obj = self.get_object(**kwargs) + model = self.queryset.model # Take a snapshot for change logging (if editing an existing object) if obj.pk and hasattr(obj, 'snapshot'): @@ -292,6 +298,12 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): msg = f'{msg} {obj}' messages.success(request, msg) + # Object was created via "quick add" modal + if '_quickadd' in request.POST: + return render(request, 'htmx/quick_add_created.html', { + 'object': obj, + }) + # If adding another object, redirect back to the edit form if '_addanother' in request.POST: redirect_url = request.path @@ -324,12 +336,19 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): else: logger.debug("Form validation failed") - return render(request, self.template_name, { + context = { + 'model': model, 'object': obj, 'form': form, 'return_url': self.get_return_url(request, obj), **self.get_extra_context(request, obj), - }) + } + + # Form was submitted via a "quick add" widget + if '_quickadd' in request.POST: + return render(request, 'htmx/quick_add.html', context) + + return render(request, self.template_name, context) class ObjectDeleteView(GetReturnURLMixin, BaseObjectView): diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 969d5c73a704424190120ac1a6c96af13085b025..5e24ee6250e4ad778886c374c7ca972faf2e3ce6 100644 GIT binary patch delta 9318 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 diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 0f4ac63d3d6199f281667fc18788c7e456278a22..a05e8edb51d286b535fab2371e7b9ad18b49d4b0 100644 GIT binary patch delta 1286 zcmZWpJ#W)s5LSw*jTrb+DX0ulr3}zlR2@J9!Ek=#q-ij&6@_4glsd7Sx^E9>&(c>DM!yUQGD~Q@^N4T)TA&0no<-27IfhQ_`(1v3JLPHAxZ!y z=d1!%)I=G>Ivq=#v@rmtsDKRhNwJfsin3@Tv#0`8ky0))Pf1dl%di3AUZ!w0##Mz& z6?|iyL2S+C6sHAX88oL&H#!+%p34HA>&6^48W}md`4XXBycvx=i74PS@$sIrlqtj) zhRTe(N(FW$UKlFb%xe5-sNA?*q*#>S_gO?HPRmtf+Gu)s*0l9)Lb)Iwm3f&BzHvGbaV$bal? z^3JO9!J0C=!c+Oly0Ak(WxJEM?7t4he@4Rw@#7hFae!O5pt!9Ad1NJ9=2fF?B*$Qh zXyuB)x2z&b>r=D@=wu|j8ly08FJlxclnN8ecweZL3{5<9032djV&Ma{414(G@@7hl z&2O10sJcL;E@AqTSY?4RCYex1ps`M9TqPLRWOF;bxhSaOR}Lx;olApOwwx4V?W#|w@L2vG)GX?(ktaEW(*0i}eI8x8YZ#3<`c2XLDIHz47ebuza F)E}CVZ*>3w delta 593 zcmYjNO-lk%6h)nKC>NEq5DG+a_dp_|O%ZqAjFZYVO(tTrF@4C8jN+)ZF+nF>w{bQt zBeyMrS@#2?RkZ2{v})b1_ugc>xR=ZQIOp8+ejk4v$DeA+VJ|uAB?B~qG(ui4DZHEq zTJFI>c<5&UG>lY$63PSQ5dk26r2yW=d{mwr82|>NBTHsS85!jODoCSU%t}HN?qZ~a zl1Bg7#WY(kpfW(&PZS}ARiyUW^^BO}XflQ89H7uj+3|@udQD;+8p43DCB&t$3uI#e z8#7r=nQFmlx}m^~-;}a*0*U}dw%d|($bB0Mc=OPo8h|grFDb0SZw%c{IYK;;b&nlk zV~vX`@PDV{8%Ib4ad$Lv1R4w8#992j>u*cI|5BKWD~U-?amhvgi9s9i=Pvh{_)hcO zkftr_M2Sh=QjeIf9Q*5(CQawyIs-SS;M_)2;vM%g7G4jWd4pJZ|2djANxhmt@q}IP z)TB('button#reslug')) { + const form = slugButton.form; + if (form == null) continue; + const slugField = form.querySelector('#id_slug') as HTMLInputElement; + if (slugField == null) continue; + const sourceId = slugField.getAttribute('slug-source'); + const sourceField = form.querySelector(`#id_${sourceId}`) as HTMLInputElement; - if (sourceField === null) { - console.error('Unable to find field for slug field.'); - return; - } + const slugLengthAttr = slugField.getAttribute('maxlength'); + let slugLength = 50; - const slugLengthAttr = slugField.getAttribute('maxlength'); - let slugLength = 50; - - if (slugLengthAttr) { - slugLength = Number(slugLengthAttr); - } - sourceField.addEventListener('blur', () => { - if (!slugField.value) { - slugField.value = slugify(sourceField.value, slugLength); + if (slugLengthAttr) { + slugLength = Number(slugLengthAttr); } - }); - slugButton.addEventListener('click', () => { - slugField.value = slugify(sourceField.value, slugLength); - }); + sourceField.addEventListener('blur', () => { + if (!slugField.value) { + slugField.value = slugify(sourceField.value, slugLength); + } + }); + slugButton.addEventListener('click', () => { + slugField.value = slugify(sourceField.value, slugLength); + }); + } } diff --git a/netbox/project-static/src/htmx.ts b/netbox/project-static/src/htmx.ts index f4092036b..6a772011b 100644 --- a/netbox/project-static/src/htmx.ts +++ b/netbox/project-static/src/htmx.ts @@ -4,11 +4,16 @@ import { initSelects } from './select'; import { initObjectSelector } from './objectSelector'; import { initBootstrap } from './bs'; import { initMessages } from './messages'; +import { initQuickAdd } from './quickAdd'; function initDepedencies(): void { - for (const init of [initButtons, initClipboard, initSelects, initObjectSelector, initBootstrap, initMessages]) { - init(); - } + initButtons(); + initClipboard(); + initSelects(); + initObjectSelector(); + initQuickAdd(); + initBootstrap(); + initMessages(); } /** diff --git a/netbox/project-static/src/quickAdd.ts b/netbox/project-static/src/quickAdd.ts new file mode 100644 index 000000000..e038f5d19 --- /dev/null +++ b/netbox/project-static/src/quickAdd.ts @@ -0,0 +1,39 @@ +import { Modal } from 'bootstrap'; + +function handleQuickAddObject(): void { + const quick_add = document.getElementById('quick-add-object'); + if (quick_add == null) return; + + const object_id = quick_add.getAttribute('data-object-id'); + if (object_id == null) return; + const object_repr = quick_add.getAttribute('data-object-repr'); + if (object_repr == null) return; + + const target_id = quick_add.getAttribute('data-target-id'); + if (target_id == null) return; + const target = document.getElementById(target_id); + if (target == null) return; + + //@ts-expect-error tomselect added on init + target.tomselect.addOption({ + id: object_id, + display: object_repr, + }); + //@ts-expect-error tomselect added on init + target.tomselect.addItem(object_id); + + const modal_element = document.getElementById('htmx-modal'); + if (modal_element) { + const modal = Modal.getInstance(modal_element); + if (modal) { + modal.hide(); + } + } +} + +export function initQuickAdd(): void { + const quick_add_modal = document.getElementById('htmx-modal-content'); + if (quick_add_modal) { + quick_add_modal.addEventListener('htmx:afterSwap', () => handleQuickAddObject()); + } +} diff --git a/netbox/templates/htmx/quick_add.html b/netbox/templates/htmx/quick_add.html new file mode 100644 index 000000000..9473e14a1 --- /dev/null +++ b/netbox/templates/htmx/quick_add.html @@ -0,0 +1,28 @@ +{% load form_helpers %} +{% load helpers %} +{% load i18n %} + +
+

+ {% trans "Quick Add" %} {{ model|meta:"verbose_name"|bettertitle }} +

+ +
+
+
+ {% csrf_token %} + {% include 'htmx/form.html' %} +
+ + +
+
+
diff --git a/netbox/templates/htmx/quick_add_created.html b/netbox/templates/htmx/quick_add_created.html new file mode 100644 index 000000000..3b1a24c48 --- /dev/null +++ b/netbox/templates/htmx/quick_add_created.html @@ -0,0 +1,22 @@ +{% load form_helpers %} +{% load helpers %} +{% load i18n %} + +
+

+ {{ object|meta:"verbose_name"|bettertitle }} {% trans "Created" %} +

+ +
+
+ {# This content is intended to be scraped and populated in the targeted selection field. #} +

+ {% blocktrans with object=object|linkify object_type=object|meta:"verbose_name" %} + Created {{ object_type }} {{ object }} + {% endblocktrans %} +

+
diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py index 114253e7a..0edb36348 100644 --- a/netbox/tenancy/forms/forms.py +++ b/netbox/tenancy/forms/forms.py @@ -25,6 +25,7 @@ class TenancyForm(forms.Form): label=_('Tenant'), queryset=Tenant.objects.all(), required=False, + quick_add=True, query_params={ 'group_id': '$tenant_group' } diff --git a/netbox/utilities/forms/fields/dynamic.py b/netbox/utilities/forms/fields/dynamic.py index 6666c0e4d..13d5ffc70 100644 --- a/netbox/utilities/forms/fields/dynamic.py +++ b/netbox/utilities/forms/fields/dynamic.py @@ -2,7 +2,7 @@ import django_filters from django import forms from django.conf import settings from django.forms import BoundField -from django.urls import reverse +from django.urls import reverse, reverse_lazy from utilities.forms import widgets from utilities.views import get_viewname @@ -66,6 +66,8 @@ class DynamicModelChoiceMixin: choice (DEPRECATED: pass `context={'disabled': '$fieldname'}` instead) context: A mapping of
+ {% include 'inc/panels/tags.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% plugin_left_page object %} + +
+ {% include 'inc/panels/comments.html' %} + {% plugin_right_page object %} +
+ +
+
+ {% plugin_full_width_page object %} +
+
+{% endblock %} diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html index 13cc8aa2f..88c9379cf 100644 --- a/netbox/templates/virtualization/vminterface.html +++ b/netbox/templates/virtualization/vminterface.html @@ -14,73 +14,85 @@ {% block content %}
-
-

{% trans "Interface" %}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %} - {% if object.enabled %} - - {% else %} - - {% endif %} -
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "MAC Address" %}{{ object.mac_address|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
{% trans "VLAN Translation" %}{{ object.vlan_translation_policy|linkify|placeholder }}
-
- {% include 'inc/panels/tags.html' %} - {% plugin_left_page object %} +
+

{% trans "Interface" %}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %} + {% if object.enabled %} + + {% else %} + + {% endif %} +
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
-
- {% include 'inc/panels/custom_fields.html' %} - {% include 'ipam/inc/panels/fhrp_groups.html' %} - {% plugin_right_page object %} + {% include 'inc/panels/tags.html' %} + {% plugin_left_page object %} +
+
+ {% include 'inc/panels/custom_fields.html' %} +
+

{% trans "Addressing" %}

+ + + + + + + + + + + + + +
{% trans "MAC Address" %} + {% if object.mac_address %} + {{ object.mac_address }} + {% trans "Primary" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
{% trans "VLAN Translation" %}{{ object.vlan_translation_policy|linkify|placeholder }}
+ {% include 'ipam/inc/panels/fhrp_groups.html' %} + {% plugin_right_page object %} +
@@ -99,6 +111,24 @@
+
+
+
+

+ {% trans "MAC Addresses" %} + {% if perms.ipam.add_macaddress %} +
+ + {% trans "Add MAC Address" %} + +
+ {% endif %} +

+ {% htmx_table 'dcim:macaddress_list' vminterface_id=object.pk %} +
+
+
{% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %} diff --git a/netbox/utilities/tests/test_filters.py b/netbox/utilities/tests/test_filters.py index 53e6eb985..031f31a12 100644 --- a/netbox/utilities/tests/test_filters.py +++ b/netbox/utilities/tests/test_filters.py @@ -9,7 +9,7 @@ from dcim.choices import * from dcim.fields import MACAddressField from dcim.filtersets import DeviceFilterSet, SiteFilterSet, InterfaceFilterSet from dcim.models import ( - Device, DeviceRole, DeviceType, Interface, Manufacturer, Platform, Rack, Region, Site + Device, DeviceRole, DeviceType, Interface, MACAddress, Manufacturer, Platform, Rack, Region, Site ) from extras.filters import TagFilter from extras.models import TaggedItem @@ -433,16 +433,33 @@ class DynamicFilterLookupExpressionTest(TestCase): ) Device.objects.bulk_create(devices) + mac_addresses = ( + MACAddress(mac_address='00-00-00-00-00-01'), + MACAddress(mac_address='aa-00-00-00-00-01'), + MACAddress(mac_address='00-00-00-00-00-02'), + MACAddress(mac_address='bb-00-00-00-00-02'), + MACAddress(mac_address='00-00-00-00-00-03'), + MACAddress(mac_address='cc-00-00-00-00-03'), + ) + MACAddress.objects.bulk_create(mac_addresses) + interfaces = ( - Interface(device=devices[0], name='Interface 1', mac_address='00-00-00-00-00-01'), - Interface(device=devices[0], name='Interface 2', mac_address='aa-00-00-00-00-01'), - Interface(device=devices[1], name='Interface 3', mac_address='00-00-00-00-00-02'), - Interface(device=devices[1], name='Interface 4', mac_address='bb-00-00-00-00-02'), - Interface(device=devices[2], name='Interface 5', mac_address='00-00-00-00-00-03'), - Interface(device=devices[2], name='Interface 6', mac_address='cc-00-00-00-00-03', rf_role=WirelessRoleChoices.ROLE_AP), + Interface(device=devices[0], name='Interface 1'), + Interface(device=devices[0], name='Interface 2'), + Interface(device=devices[1], name='Interface 3'), + Interface(device=devices[1], name='Interface 4'), + Interface(device=devices[2], name='Interface 5'), + Interface(device=devices[2], name='Interface 6', rf_role=WirelessRoleChoices.ROLE_AP), ) Interface.objects.bulk_create(interfaces) + interfaces[0].mac_addresses.set([mac_addresses[0]]) + interfaces[1].mac_addresses.set([mac_addresses[1]]) + interfaces[2].mac_addresses.set([mac_addresses[2]]) + interfaces[3].mac_addresses.set([mac_addresses[3]]) + interfaces[4].mac_addresses.set([mac_addresses[4]]) + interfaces[5].mac_addresses.set([mac_addresses[5]]) + def test_site_name_negation(self): params = {'name__n': ['Site 1']} self.assertEqual(SiteFilterSet(params, Site.objects.all()).qs.count(), 2) diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py index 9b7000def..dfc205b7c 100644 --- a/netbox/virtualization/api/serializers_/virtualmachines.py +++ b/netbox/virtualization/api/serializers_/virtualmachines.py @@ -2,6 +2,7 @@ from drf_spectacular.utils import extend_schema_field from rest_framework import serializers from dcim.api.serializers_.devices import DeviceSerializer +from dcim.api.serializers_.device_components import MACAddressSerializer from dcim.api.serializers_.platforms import PlatformSerializer from dcim.api.serializers_.roles import DeviceRoleSerializer from dcim.api.serializers_.sites import SiteSerializer @@ -95,19 +96,18 @@ class VMInterfaceSerializer(NetBoxModelSerializer): l2vpn_termination = L2VPNTerminationSerializer(nested=True, read_only=True, allow_null=True) count_ipaddresses = serializers.IntegerField(read_only=True) count_fhrp_groups = serializers.IntegerField(read_only=True) - mac_address = serializers.CharField( - required=False, - default=None, - allow_null=True - ) + # Maintains backward compatibility with NetBox IP Address {% endif %} + {% if perms.dcim.add_macaddress %} +
  • MAC Address
    • + {% endif %} {% if perms.vpn.add_l2vpntermination %}
  • L2VPN Termination
    • {% endif %} @@ -150,8 +153,8 @@ class VMInterfaceTable(BaseInterfaceTable): model = VMInterface fields = ( 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags', - 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', - 'created', 'last_updated', + 'vrf', 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', + 'tagged_vlans', 'qinq_svlan', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'description') diff --git a/netbox/virtualization/tests/test_filtersets.py b/netbox/virtualization/tests/test_filtersets.py index 5a5bf2325..eef5d6b52 100644 --- a/netbox/virtualization/tests/test_filtersets.py +++ b/netbox/virtualization/tests/test_filtersets.py @@ -1,7 +1,7 @@ from django.test import TestCase from dcim.choices import InterfaceModeChoices -from dcim.models import Device, DeviceRole, Platform, Region, Site, SiteGroup +from dcim.models import Device, DeviceRole, MACAddress, Platform, Region, Site, SiteGroup from ipam.choices import VLANQinQRoleChoices from ipam.models import IPAddress, VLAN, VLANTranslationPolicy, VRF from tenancy.models import Tenant, TenantGroup @@ -366,13 +366,24 @@ class VirtualMachineTestCase(TestCase, ChangeLoggedFilterSetTests): ) VirtualMachine.objects.bulk_create(vms) + mac_addresses = ( + MACAddress(mac_address='00-00-00-00-00-01'), + MACAddress(mac_address='00-00-00-00-00-02'), + MACAddress(mac_address='00-00-00-00-00-03'), + ) + MACAddress.objects.bulk_create(mac_addresses) + interfaces = ( - VMInterface(virtual_machine=vms[0], name='Interface 1', mac_address='00-00-00-00-00-01'), - VMInterface(virtual_machine=vms[1], name='Interface 2', mac_address='00-00-00-00-00-02'), - VMInterface(virtual_machine=vms[2], name='Interface 3', mac_address='00-00-00-00-00-03'), + VMInterface(virtual_machine=vms[0], name='Interface 1'), + VMInterface(virtual_machine=vms[1], name='Interface 2'), + VMInterface(virtual_machine=vms[2], name='Interface 3'), ) VMInterface.objects.bulk_create(interfaces) + interfaces[0].mac_addresses.set([mac_addresses[0]]) + interfaces[1].mac_addresses.set([mac_addresses[1]]) + interfaces[2].mac_addresses.set([mac_addresses[2]]) + # Assign primary IPs for filtering ipaddresses = ( IPAddress(address='192.0.2.1/24', assigned_object=interfaces[0]), @@ -579,13 +590,19 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): ) VLANTranslationPolicy.objects.bulk_create(vlan_translation_policies) + mac_addresses = ( + MACAddress(mac_address='00-00-00-00-00-01'), + MACAddress(mac_address='00-00-00-00-00-02'), + MACAddress(mac_address='00-00-00-00-00-03'), + ) + MACAddress.objects.bulk_create(mac_addresses) + interfaces = ( VMInterface( virtual_machine=vms[0], name='Interface 1', enabled=True, mtu=100, - mac_address='00-00-00-00-00-01', vrf=vrfs[0], description='foobar1', vlan_translation_policy=vlan_translation_policies[0], @@ -595,7 +612,6 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): name='Interface 2', enabled=True, mtu=200, - mac_address='00-00-00-00-00-02', vrf=vrfs[1], description='foobar2', vlan_translation_policy=vlan_translation_policies[0], @@ -605,7 +621,6 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): name='Interface 3', enabled=False, mtu=300, - mac_address='00-00-00-00-00-03', vrf=vrfs[2], description='foobar3', mode=InterfaceModeChoices.MODE_Q_IN_Q, @@ -614,6 +629,10 @@ class VMInterfaceTestCase(TestCase, ChangeLoggedFilterSetTests): ) VMInterface.objects.bulk_create(interfaces) + interfaces[0].mac_addresses.set([mac_addresses[0]]) + interfaces[1].mac_addresses.set([mac_addresses[1]]) + interfaces[2].mac_addresses.set([mac_addresses[2]]) + def test_q(self): params = {'q': 'foobar1'} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index b9cb7b437..dfd7e041c 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -1,7 +1,6 @@ from django.contrib.contenttypes.models import ContentType from django.test import override_settings from django.urls import reverse -from netaddr import EUI from dcim.choices import InterfaceModeChoices from dcim.models import DeviceRole, Platform, Site @@ -331,7 +330,6 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase): 'name': 'Interface X', 'enabled': False, 'bridge': interfaces[1].pk, - 'mac_address': EUI('01-02-03-04-05-06'), 'mtu': 65000, 'description': 'New description', 'mode': InterfaceModeChoices.MODE_TAGGED, @@ -346,7 +344,6 @@ class VMInterfaceTestCase(ViewTestCases.DeviceComponentViewTestCase): 'name': 'Interface [4-6]', 'enabled': False, 'bridge': interfaces[3].pk, - 'mac_address': EUI('01-02-03-04-05-06'), 'mtu': 2000, 'description': 'New description', 'mode': InterfaceModeChoices.MODE_TAGGED, From 737631482107817b715771666418bb874c303ed7 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Fri, 15 Nov 2024 12:37:10 -0500 Subject: [PATCH 033/190] Access _site of cluster instead of site --- netbox/virtualization/forms/bulk_edit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/virtualization/forms/bulk_edit.py b/netbox/virtualization/forms/bulk_edit.py index aaeb259b9..5e7593a09 100644 --- a/netbox/virtualization/forms/bulk_edit.py +++ b/netbox/virtualization/forms/bulk_edit.py @@ -279,7 +279,7 @@ class VMInterfaceBulkEditForm(NetBoxModelBulkEditForm): # Check interface sites. First interface should set site, further interfaces will either continue the # loop or reset back to no site and break the loop. for interface in interfaces: - vm_site = interface.virtual_machine.site or interface.virtual_machine.cluster.site + vm_site = interface.virtual_machine.site or interface.virtual_machine.cluster._site if site is None: site = vm_site elif vm_site is not site: From d2168b107fdee8cd88cfc9329103ff5c7a38bf48 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 19 Nov 2024 10:58:39 -0500 Subject: [PATCH 034/190] Closes #13086: Virtual circuits (#17933) * WIP * Add API tests * Add remaining tests * Add model docs * Show virtual circuit connections on interfaces * Misc cleanup per PR feedback * Renumber migration * Support nested terminations for virtual circuit bulk import --- docs/models/circuits/virtualcircuit.md | 33 ++ .../circuits/virtualcircuittermination.md | 21 ++ mkdocs.yml | 2 + netbox/circuits/api/serializers_/circuits.py | 39 ++- netbox/circuits/api/urls.py | 4 + netbox/circuits/api/views.py | 20 ++ netbox/circuits/choices.py | 16 + netbox/circuits/filtersets.py | 109 +++++- netbox/circuits/forms/bulk_edit.py | 65 +++- netbox/circuits/forms/bulk_import.py | 74 ++++ netbox/circuits/forms/filtersets.py | 78 ++++- netbox/circuits/forms/model_forms.py | 76 ++++- netbox/circuits/graphql/filters.py | 16 +- netbox/circuits/graphql/schema.py | 6 + netbox/circuits/graphql/types.py | 31 ++ .../migrations/0050_virtual_circuits.py | 67 ++++ netbox/circuits/models/__init__.py | 1 + netbox/circuits/models/virtual_circuits.py | 164 +++++++++ netbox/circuits/search.py | 20 ++ netbox/circuits/tables/__init__.py | 1 + netbox/circuits/tables/virtual_circuits.py | 95 ++++++ netbox/circuits/tests/test_api.py | 240 ++++++++++++- netbox/circuits/tests/test_filtersets.py | 293 +++++++++++++++- netbox/circuits/tests/test_views.py | 321 +++++++++++++++++- netbox/circuits/urls.py | 16 + netbox/circuits/views.py | 106 ++++++ netbox/dcim/filtersets.py | 12 +- netbox/dcim/models/device_components.py | 8 + netbox/dcim/tables/devices.py | 8 + netbox/dcim/tables/template_code.py | 14 + netbox/extras/tests/test_filtersets.py | 2 + netbox/netbox/navigation/menu.py | 7 + .../templates/circuits/providernetwork.html | 13 + netbox/templates/circuits/virtualcircuit.html | 84 +++++ .../circuits/virtualcircuittermination.html | 81 +++++ netbox/templates/dcim/interface.html | 36 +- 36 files changed, 2164 insertions(+), 15 deletions(-) create mode 100644 docs/models/circuits/virtualcircuit.md create mode 100644 docs/models/circuits/virtualcircuittermination.md create mode 100644 netbox/circuits/migrations/0050_virtual_circuits.py create mode 100644 netbox/circuits/models/virtual_circuits.py create mode 100644 netbox/circuits/tables/virtual_circuits.py create mode 100644 netbox/templates/circuits/virtualcircuit.html create mode 100644 netbox/templates/circuits/virtualcircuittermination.html diff --git a/docs/models/circuits/virtualcircuit.md b/docs/models/circuits/virtualcircuit.md new file mode 100644 index 000000000..a379b6330 --- /dev/null +++ b/docs/models/circuits/virtualcircuit.md @@ -0,0 +1,33 @@ +# Virtual Circuits + +A virtual circuit can connect two or more interfaces atop a set of decoupled physical connections. For example, it's very common to form a virtual connection between two virtual interfaces, each of which is bound to a physical interface on its respective device and physically connected to a [provider network](./providernetwork.md) via an independent [physical circuit](./circuit.md). + +## Fields + +### Provider Network + +The [provider network](./providernetwork.md) across which the virtual circuit is formed. + +### Provider Account + +The [provider account](./provideraccount.md) with which the virtual circuit is associated (if any). + +### Circuit ID + +The unique identifier assigned to the virtual circuit by its [provider](./provider.md). + +### Status + +The operational status of the virtual circuit. By default, the following statuses are available: + +| Name | +|----------------| +| Planned | +| Provisioning | +| Active | +| Offline | +| Deprovisioning | +| Decommissioned | + +!!! tip "Custom circuit statuses" + Additional circuit statuses may be defined by setting `Circuit.status` under the [`FIELD_CHOICES`](../../configuration/data-validation.md#field_choices) configuration parameter. diff --git a/docs/models/circuits/virtualcircuittermination.md b/docs/models/circuits/virtualcircuittermination.md new file mode 100644 index 000000000..82ea43eef --- /dev/null +++ b/docs/models/circuits/virtualcircuittermination.md @@ -0,0 +1,21 @@ +# Virtual Circuit Terminations + +This model represents the connection of a virtual [interface](../dcim/interface.md) to a [virtual circuit](./virtualcircuit.md). + +## Fields + +### Virtual Circuit + +The [virtual circuit](./virtualcircuit.md) to which the interface is connected. + +### Interface + +The [interface](../dcim/interface.md) connected to the virtual circuit. + +### Role + +The functional role of the termination. This depends on the virtual circuit's topology, which is typically either peer-to-peer or hub-and-spoke (multipoint). Valid choices include: + +* Peer +* Hub +* Spoke diff --git a/mkdocs.yml b/mkdocs.yml index 00e03a4ce..a66baa286 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -174,6 +174,8 @@ nav: - Provider: 'models/circuits/provider.md' - Provider Account: 'models/circuits/provideraccount.md' - Provider Network: 'models/circuits/providernetwork.md' + - Virtual Circuit: 'models/circuits/virtualcircuit.md' + - Virtual Circuit Termination: 'models/circuits/virtualcircuittermination.md' - Core: - DataFile: 'models/core/datafile.md' - DataSource: 'models/core/datasource.md' diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index 96a686a65..a68e49483 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -2,9 +2,13 @@ from django.contrib.contenttypes.models import ContentType from drf_spectacular.utils import extend_schema_field from rest_framework import serializers -from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices +from circuits.choices import CircuitPriorityChoices, CircuitStatusChoices, VirtualCircuitTerminationRoleChoices from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES -from circuits.models import Circuit, CircuitGroup, CircuitGroupAssignment, CircuitTermination, CircuitType +from circuits.models import ( + Circuit, CircuitGroup, CircuitGroupAssignment, CircuitTermination, CircuitType, VirtualCircuit, + VirtualCircuitTermination, +) +from dcim.api.serializers_.device_components import InterfaceSerializer from dcim.api.serializers_.cables import CabledObjectSerializer from netbox.api.fields import ChoiceField, ContentTypeField, RelatedObjectCountField from netbox.api.serializers import NetBoxModelSerializer, WritableNestedSerializer @@ -20,6 +24,8 @@ __all__ = ( 'CircuitGroupSerializer', 'CircuitTerminationSerializer', 'CircuitTypeSerializer', + 'VirtualCircuitSerializer', + 'VirtualCircuitTerminationSerializer', ) @@ -156,3 +162,32 @@ class CircuitGroupAssignmentSerializer(CircuitGroupAssignmentSerializer_): 'id', 'url', 'display_url', 'display', 'group', 'circuit', 'priority', 'tags', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'group', 'circuit', 'priority') + + +class VirtualCircuitSerializer(NetBoxModelSerializer): + provider_network = ProviderNetworkSerializer(nested=True) + provider_account = ProviderAccountSerializer(nested=True, required=False, allow_null=True, default=None) + status = ChoiceField(choices=CircuitStatusChoices, required=False) + tenant = TenantSerializer(nested=True, required=False, allow_null=True) + + class Meta: + model = VirtualCircuit + fields = [ + 'id', 'url', 'display_url', 'display', 'cid', 'provider_network', 'provider_account', 'status', 'tenant', + 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + ] + brief_fields = ('id', 'url', 'display', 'provider_network', 'cid', 'description') + + +class VirtualCircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer): + virtual_circuit = VirtualCircuitSerializer(nested=True) + role = ChoiceField(choices=VirtualCircuitTerminationRoleChoices, required=False) + interface = InterfaceSerializer(nested=True) + + class Meta: + model = VirtualCircuitTermination + fields = [ + 'id', 'url', 'display_url', 'display', 'virtual_circuit', 'role', 'interface', 'description', 'tags', + 'custom_fields', 'created', 'last_updated', + ] + brief_fields = ('id', 'url', 'display', 'virtual_circuit', 'role', 'interface', 'description') diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py index 00af3dec6..6f257f694 100644 --- a/netbox/circuits/api/urls.py +++ b/netbox/circuits/api/urls.py @@ -17,5 +17,9 @@ router.register('circuit-terminations', views.CircuitTerminationViewSet) router.register('circuit-groups', views.CircuitGroupViewSet) router.register('circuit-group-assignments', views.CircuitGroupAssignmentViewSet) +# Virtual circuits +router.register('virtual-circuits', views.VirtualCircuitViewSet) +router.register('virtual-circuit-terminations', views.VirtualCircuitTerminationViewSet) + app_name = 'circuits-api' urlpatterns = router.urls diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 8cce013d7..3b49075be 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -93,3 +93,23 @@ class ProviderNetworkViewSet(NetBoxModelViewSet): queryset = ProviderNetwork.objects.all() serializer_class = serializers.ProviderNetworkSerializer filterset_class = filtersets.ProviderNetworkFilterSet + + +# +# Virtual circuits +# + +class VirtualCircuitViewSet(NetBoxModelViewSet): + queryset = VirtualCircuit.objects.all() + serializer_class = serializers.VirtualCircuitSerializer + filterset_class = filtersets.VirtualCircuitFilterSet + + +# +# Virtual circuit terminations +# + +class VirtualCircuitTerminationViewSet(PassThroughPortMixin, NetBoxModelViewSet): + queryset = VirtualCircuitTermination.objects.all() + serializer_class = serializers.VirtualCircuitTerminationSerializer + filterset_class = filtersets.VirtualCircuitTerminationFilterSet diff --git a/netbox/circuits/choices.py b/netbox/circuits/choices.py index 8c25c7459..4d6132d7a 100644 --- a/netbox/circuits/choices.py +++ b/netbox/circuits/choices.py @@ -92,3 +92,19 @@ class CircuitPriorityChoices(ChoiceSet): (PRIORITY_TERTIARY, _('Tertiary')), (PRIORITY_INACTIVE, _('Inactive')), ] + + +# +# Virtual circuits +# + +class VirtualCircuitTerminationRoleChoices(ChoiceSet): + ROLE_PEER = 'peer' + ROLE_HUB = 'hub' + ROLE_SPOKE = 'spoke' + + CHOICES = [ + (ROLE_PEER, _('Peer'), 'green'), + (ROLE_HUB, _('Hub'), 'blue'), + (ROLE_SPOKE, _('Spoke'), 'orange'), + ] diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index 4a2a972f3..be36d45ac 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -3,7 +3,7 @@ from django.db.models import Q from django.utils.translation import gettext as _ from dcim.filtersets import CabledObjectFilterSet -from dcim.models import Location, Region, Site, SiteGroup +from dcim.models import Interface, Location, Region, Site, SiteGroup from ipam.models import ASN from netbox.filtersets import NetBoxModelFilterSet, OrganizationalModelFilterSet from tenancy.filtersets import ContactModelFilterSet, TenancyFilterSet @@ -20,6 +20,8 @@ __all__ = ( 'ProviderNetworkFilterSet', 'ProviderAccountFilterSet', 'ProviderFilterSet', + 'VirtualCircuitFilterSet', + 'VirtualCircuitTerminationFilterSet', ) @@ -404,3 +406,108 @@ class CircuitGroupAssignmentFilterSet(NetBoxModelFilterSet): Q(circuit__cid__icontains=value) | Q(group__name__icontains=value) ) + + +class VirtualCircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet): + provider_id = django_filters.ModelMultipleChoiceFilter( + field_name='provider_network__provider', + queryset=Provider.objects.all(), + label=_('Provider (ID)'), + ) + provider = django_filters.ModelMultipleChoiceFilter( + field_name='provider_network__provider__slug', + queryset=Provider.objects.all(), + to_field_name='slug', + label=_('Provider (slug)'), + ) + provider_account_id = django_filters.ModelMultipleChoiceFilter( + field_name='provider_account', + queryset=ProviderAccount.objects.all(), + label=_('Provider account (ID)'), + ) + provider_account = django_filters.ModelMultipleChoiceFilter( + field_name='provider_account__account', + queryset=Provider.objects.all(), + to_field_name='account', + label=_('Provider account (account)'), + ) + provider_network_id = django_filters.ModelMultipleChoiceFilter( + queryset=ProviderNetwork.objects.all(), + label=_('Provider network (ID)'), + ) + status = django_filters.MultipleChoiceFilter( + choices=CircuitStatusChoices, + null_value=None + ) + + class Meta: + model = VirtualCircuit + fields = ('id', 'cid', 'description') + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + return queryset.filter( + Q(cid__icontains=value) | + Q(description__icontains=value) | + Q(comments__icontains=value) + ).distinct() + + +class VirtualCircuitTerminationFilterSet(NetBoxModelFilterSet): + q = django_filters.CharFilter( + method='search', + label=_('Search'), + ) + virtual_circuit_id = django_filters.ModelMultipleChoiceFilter( + queryset=VirtualCircuit.objects.all(), + label=_('Virtual circuit'), + ) + role = django_filters.MultipleChoiceFilter( + choices=VirtualCircuitTerminationRoleChoices, + null_value=None + ) + provider_id = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit__provider_network__provider', + queryset=Provider.objects.all(), + label=_('Provider (ID)'), + ) + provider = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit__provider_network__provider__slug', + queryset=Provider.objects.all(), + to_field_name='slug', + label=_('Provider (slug)'), + ) + provider_account_id = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit__provider_account', + queryset=ProviderAccount.objects.all(), + label=_('Provider account (ID)'), + ) + provider_account = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit__provider_account__account', + queryset=ProviderAccount.objects.all(), + to_field_name='account', + label=_('Provider account (account)'), + ) + provider_network_id = django_filters.ModelMultipleChoiceFilter( + queryset=ProviderNetwork.objects.all(), + field_name='virtual_circuit__provider_network', + label=_('Provider network (ID)'), + ) + interface_id = django_filters.ModelMultipleChoiceFilter( + queryset=Interface.objects.all(), + field_name='interface', + label=_('Interface (ID)'), + ) + + class Meta: + model = VirtualCircuitTermination + fields = ('id', 'interface_id', 'description') + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + return queryset.filter( + Q(virtual_circuit__cid__icontains=value) | + Q(description__icontains=value) + ).distinct() diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py index e3f0b5d0c..021635a1a 100644 --- a/netbox/circuits/forms/bulk_edit.py +++ b/netbox/circuits/forms/bulk_edit.py @@ -3,7 +3,9 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ -from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices +from circuits.choices import ( + CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, VirtualCircuitTerminationRoleChoices, +) from circuits.constants import CIRCUIT_TERMINATION_TERMINATION_TYPES from circuits.models import * from dcim.models import Site @@ -28,6 +30,8 @@ __all__ = ( 'ProviderBulkEditForm', 'ProviderAccountBulkEditForm', 'ProviderNetworkBulkEditForm', + 'VirtualCircuitBulkEditForm', + 'VirtualCircuitTerminationBulkEditForm', ) @@ -291,3 +295,62 @@ class CircuitGroupAssignmentBulkEditForm(NetBoxModelBulkEditForm): FieldSet('circuit', 'priority'), ) nullable_fields = ('priority',) + + +class VirtualCircuitBulkEditForm(NetBoxModelBulkEditForm): + provider_network = DynamicModelChoiceField( + label=_('Provider network'), + queryset=ProviderNetwork.objects.all(), + required=False + ) + provider_account = DynamicModelChoiceField( + label=_('Provider account'), + queryset=ProviderAccount.objects.all(), + required=False + ) + status = forms.ChoiceField( + label=_('Status'), + choices=add_blank_choice(CircuitStatusChoices), + required=False, + initial='' + ) + tenant = DynamicModelChoiceField( + label=_('Tenant'), + queryset=Tenant.objects.all(), + required=False + ) + description = forms.CharField( + label=_('Description'), + max_length=100, + required=False + ) + comments = CommentField() + + model = VirtualCircuit + fieldsets = ( + FieldSet('provider_network', 'provider_account', 'status', 'description', name=_('Virtual circuit')), + FieldSet('tenant', name=_('Tenancy')), + ) + nullable_fields = ( + 'provider_account', 'tenant', 'description', 'comments', + ) + + +class VirtualCircuitTerminationBulkEditForm(NetBoxModelBulkEditForm): + role = forms.ChoiceField( + label=_('Role'), + choices=add_blank_choice(VirtualCircuitTerminationRoleChoices), + required=False, + initial='' + ) + description = forms.CharField( + label=_('Description'), + max_length=200, + required=False + ) + + model = VirtualCircuitTermination + fieldsets = ( + FieldSet('role', 'description'), + ) + nullable_fields = ('description',) diff --git a/netbox/circuits/forms/bulk_import.py b/netbox/circuits/forms/bulk_import.py index eab87b1f5..7f5ffde6e 100644 --- a/netbox/circuits/forms/bulk_import.py +++ b/netbox/circuits/forms/bulk_import.py @@ -5,6 +5,7 @@ from django.utils.translation import gettext_lazy as _ from circuits.choices import * from circuits.constants import * from circuits.models import * +from dcim.models import Interface from netbox.choices import DistanceUnitChoices from netbox.forms import NetBoxModelImportForm from tenancy.models import Tenant @@ -20,6 +21,9 @@ __all__ = ( 'ProviderImportForm', 'ProviderAccountImportForm', 'ProviderNetworkImportForm', + 'VirtualCircuitImportForm', + 'VirtualCircuitTerminationImportForm', + 'VirtualCircuitTerminationImportRelatedForm', ) @@ -179,3 +183,73 @@ class CircuitGroupAssignmentImportForm(NetBoxModelImportForm): class Meta: model = CircuitGroupAssignment fields = ('circuit', 'group', 'priority') + + +class VirtualCircuitImportForm(NetBoxModelImportForm): + provider_network = CSVModelChoiceField( + label=_('Provider network'), + queryset=ProviderNetwork.objects.all(), + to_field_name='name', + help_text=_('The network to which this virtual circuit belongs') + ) + provider_account = CSVModelChoiceField( + label=_('Provider account'), + queryset=ProviderAccount.objects.all(), + to_field_name='account', + help_text=_('Assigned provider account (if any)'), + required=False + ) + status = CSVChoiceField( + label=_('Status'), + choices=CircuitStatusChoices, + help_text=_('Operational status') + ) + tenant = CSVModelChoiceField( + label=_('Tenant'), + queryset=Tenant.objects.all(), + required=False, + to_field_name='name', + help_text=_('Assigned tenant') + ) + + class Meta: + model = VirtualCircuit + fields = [ + 'cid', 'provider_network', 'provider_account', 'status', 'tenant', 'description', 'comments', 'tags', + ] + + +class BaseVirtualCircuitTerminationImportForm(forms.ModelForm): + virtual_circuit = CSVModelChoiceField( + label=_('Virtual circuit'), + queryset=VirtualCircuit.objects.all(), + to_field_name='cid', + ) + role = CSVChoiceField( + label=_('Role'), + choices=VirtualCircuitTerminationRoleChoices, + help_text=_('Operational role') + ) + interface = CSVModelChoiceField( + label=_('Interface'), + queryset=Interface.objects.all(), + to_field_name='pk', + ) + + +class VirtualCircuitTerminationImportRelatedForm(BaseVirtualCircuitTerminationImportForm): + + class Meta: + model = VirtualCircuitTermination + fields = [ + 'virtual_circuit', 'role', 'interface', 'description', + ] + + +class VirtualCircuitTerminationImportForm(NetBoxModelImportForm, BaseVirtualCircuitTerminationImportForm): + + class Meta: + model = VirtualCircuitTermination + fields = [ + 'virtual_circuit', 'role', 'interface', 'description', 'tags', + ] diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index b585ce079..00dc6bc5b 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -1,7 +1,10 @@ from django import forms from django.utils.translation import gettext as _ -from circuits.choices import CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, CircuitTerminationSideChoices +from circuits.choices import ( + CircuitCommitRateChoices, CircuitPriorityChoices, CircuitStatusChoices, CircuitTerminationSideChoices, + VirtualCircuitTerminationRoleChoices, +) from circuits.models import * from dcim.models import Location, Region, Site, SiteGroup from ipam.models import ASN @@ -22,6 +25,8 @@ __all__ = ( 'ProviderFilterForm', 'ProviderAccountFilterForm', 'ProviderNetworkFilterForm', + 'VirtualCircuitFilterForm', + 'VirtualCircuitTerminationFilterForm', ) @@ -292,3 +297,74 @@ class CircuitGroupAssignmentFilterForm(NetBoxModelFilterSetForm): required=False ) tag = TagFilterField(model) + + +class VirtualCircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFilterSetForm): + model = VirtualCircuit + fieldsets = ( + FieldSet('q', 'filter_id', 'tag'), + FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')), + FieldSet('status', name=_('Attributes')), + FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), + ) + selector_fields = ('filter_id', 'q', 'provider_id', 'provider_network_id') + provider_id = DynamicModelMultipleChoiceField( + queryset=Provider.objects.all(), + required=False, + label=_('Provider') + ) + provider_account_id = DynamicModelMultipleChoiceField( + queryset=ProviderAccount.objects.all(), + required=False, + query_params={ + 'provider_id': '$provider_id' + }, + label=_('Provider account') + ) + provider_network_id = DynamicModelMultipleChoiceField( + queryset=ProviderNetwork.objects.all(), + required=False, + query_params={ + 'provider_id': '$provider_id' + }, + label=_('Provider network') + ) + status = forms.MultipleChoiceField( + label=_('Status'), + choices=CircuitStatusChoices, + required=False + ) + tag = TagFilterField(model) + + +class VirtualCircuitTerminationFilterForm(NetBoxModelFilterSetForm): + model = VirtualCircuitTermination + fieldsets = ( + FieldSet('q', 'filter_id', 'tag'), + FieldSet('virtual_circuit_id', 'role', name=_('Virtual circuit')), + FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')), + ) + virtual_circuit_id = DynamicModelMultipleChoiceField( + queryset=VirtualCircuit.objects.all(), + required=False, + label=_('Virtual circuit') + ) + role = forms.MultipleChoiceField( + label=_('Role'), + choices=VirtualCircuitTerminationRoleChoices, + required=False + ) + provider_network_id = DynamicModelMultipleChoiceField( + queryset=ProviderNetwork.objects.all(), + required=False, + query_params={ + 'provider_id': '$provider_id' + }, + label=_('Provider network') + ) + provider_id = DynamicModelMultipleChoiceField( + queryset=Provider.objects.all(), + required=False, + label=_('Provider') + ) + tag = TagFilterField(model) diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py index 9eeb0f588..e43c37525 100644 --- a/netbox/circuits/forms/model_forms.py +++ b/netbox/circuits/forms/model_forms.py @@ -1,16 +1,21 @@ +from django import forms from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import gettext_lazy as _ -from circuits.choices import CircuitCommitRateChoices, CircuitTerminationPortSpeedChoices +from circuits.choices import ( + CircuitCommitRateChoices, CircuitTerminationPortSpeedChoices, VirtualCircuitTerminationRoleChoices, +) from circuits.constants import * from circuits.models import * -from dcim.models import Site +from dcim.models import Interface, Site from ipam.models import ASN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.forms import get_field_value -from utilities.forms.fields import CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField +from utilities.forms.fields import ( + CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField, +) from utilities.forms.rendering import FieldSet, InlineFields from utilities.forms.widgets import DatePicker, HTMXSelect, NumberWithOptions from utilities.templatetags.builtins.filters import bettertitle @@ -24,6 +29,8 @@ __all__ = ( 'ProviderForm', 'ProviderAccountForm', 'ProviderNetworkForm', + 'VirtualCircuitForm', + 'VirtualCircuitTerminationForm', ) @@ -255,3 +262,66 @@ class CircuitGroupAssignmentForm(NetBoxModelForm): fields = [ 'group', 'circuit', 'priority', 'tags', ] + + +class VirtualCircuitForm(TenancyForm, NetBoxModelForm): + provider_network = DynamicModelChoiceField( + label=_('Provider network'), + queryset=ProviderNetwork.objects.all(), + selector=True + ) + provider_account = DynamicModelChoiceField( + label=_('Provider account'), + queryset=ProviderAccount.objects.all(), + required=False + ) + comments = CommentField() + + fieldsets = ( + FieldSet( + 'provider_network', 'provider_account', 'cid', 'status', 'description', 'tags', name=_('Virtual circuit'), + ), + FieldSet('tenant_group', 'tenant', name=_('Tenancy')), + ) + + class Meta: + model = VirtualCircuit + fields = [ + 'cid', 'provider_network', 'provider_account', 'status', 'description', 'tenant_group', 'tenant', + 'comments', 'tags', + ] + + +class VirtualCircuitTerminationForm(NetBoxModelForm): + virtual_circuit = DynamicModelChoiceField( + label=_('Virtual circuit'), + queryset=VirtualCircuit.objects.all(), + selector=True + ) + role = forms.ChoiceField( + choices=VirtualCircuitTerminationRoleChoices, + widget=HTMXSelect(), + label=_('Role') + ) + interface = DynamicModelChoiceField( + label=_('Interface'), + queryset=Interface.objects.all(), + selector=True, + query_params={ + 'kind': 'virtual', + 'virtual_circuit_termination_id': 'null', + }, + context={ + 'parent': 'device', + } + ) + + fieldsets = ( + FieldSet('virtual_circuit', 'role', 'interface', 'description', 'tags'), + ) + + class Meta: + model = VirtualCircuitTermination + fields = [ + 'virtual_circuit', 'role', 'interface', 'description', 'tags', + ] diff --git a/netbox/circuits/graphql/filters.py b/netbox/circuits/graphql/filters.py index b8398b2b9..36ddc25b2 100644 --- a/netbox/circuits/graphql/filters.py +++ b/netbox/circuits/graphql/filters.py @@ -4,14 +4,16 @@ from circuits import filtersets, models from netbox.graphql.filter_mixins import autotype_decorator, BaseFilterMixin __all__ = ( - 'CircuitTerminationFilter', 'CircuitFilter', 'CircuitGroupAssignmentFilter', 'CircuitGroupFilter', + 'CircuitTerminationFilter', 'CircuitTypeFilter', 'ProviderFilter', 'ProviderAccountFilter', 'ProviderNetworkFilter', + 'VirtualCircuitFilter', + 'VirtualCircuitTerminationFilter', ) @@ -61,3 +63,15 @@ class ProviderAccountFilter(BaseFilterMixin): @autotype_decorator(filtersets.ProviderNetworkFilterSet) class ProviderNetworkFilter(BaseFilterMixin): pass + + +@strawberry_django.filter(models.VirtualCircuit, lookups=True) +@autotype_decorator(filtersets.VirtualCircuitFilterSet) +class VirtualCircuitFilter(BaseFilterMixin): + pass + + +@strawberry_django.filter(models.VirtualCircuitTermination, lookups=True) +@autotype_decorator(filtersets.VirtualCircuitTerminationFilterSet) +class VirtualCircuitTerminationFilter(BaseFilterMixin): + pass diff --git a/netbox/circuits/graphql/schema.py b/netbox/circuits/graphql/schema.py index ac23421ce..9c683ce45 100644 --- a/netbox/circuits/graphql/schema.py +++ b/netbox/circuits/graphql/schema.py @@ -31,3 +31,9 @@ class CircuitsQuery: provider_network: ProviderNetworkType = strawberry_django.field() provider_network_list: List[ProviderNetworkType] = strawberry_django.field() + + virtual_circuit: VirtualCircuitType = strawberry_django.field() + virtual_circuit_list: List[VirtualCircuitType] = strawberry_django.field() + + virtual_circuit_termination: VirtualCircuitTerminationType = strawberry_django.field() + virtual_circuit_termination_list: List[VirtualCircuitTerminationType] = strawberry_django.field() diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py index b52f9d18d..f2703b207 100644 --- a/netbox/circuits/graphql/types.py +++ b/netbox/circuits/graphql/types.py @@ -19,6 +19,8 @@ __all__ = ( 'ProviderType', 'ProviderAccountType', 'ProviderNetworkType', + 'VirtualCircuitTerminationType', + 'VirtualCircuitType', ) @@ -120,3 +122,32 @@ class CircuitGroupType(OrganizationalObjectType): class CircuitGroupAssignmentType(TagsMixin, BaseObjectType): group: Annotated["CircuitGroupType", strawberry.lazy('circuits.graphql.types')] circuit: Annotated["CircuitType", strawberry.lazy('circuits.graphql.types')] + + +@strawberry_django.type( + models.VirtualCircuitTermination, + fields='__all__', + filters=VirtualCircuitTerminationFilter +) +class VirtualCircuitTerminationType(CustomFieldsMixin, TagsMixin, ObjectType): + virtual_circuit: Annotated[ + "VirtualCircuitType", + strawberry.lazy('circuits.graphql.types') + ] = strawberry_django.field(select_related=["virtual_circuit"]) + interface: Annotated[ + "InterfaceType", + strawberry.lazy('dcim.graphql.types') + ] = strawberry_django.field(select_related=["interface"]) + + +@strawberry_django.type( + models.VirtualCircuit, + fields='__all__', + filters=VirtualCircuitFilter +) +class VirtualCircuitType(NetBoxObjectType): + provider_network: ProviderNetworkType = strawberry_django.field(select_related=["provider_network"]) + provider_account: ProviderAccountType | None + tenant: TenantType | None + + terminations: List[VirtualCircuitTerminationType] diff --git a/netbox/circuits/migrations/0050_virtual_circuits.py b/netbox/circuits/migrations/0050_virtual_circuits.py new file mode 100644 index 000000000..df719b517 --- /dev/null +++ b/netbox/circuits/migrations/0050_virtual_circuits.py @@ -0,0 +1,67 @@ +import django.db.models.deletion +import taggit.managers +from django.db import migrations, models + +import utilities.json + + +class Migration(migrations.Migration): + + dependencies = [ + ('circuits', '0049_natural_ordering'), + ('dcim', '0196_qinq_svlan'), + ('extras', '0122_charfield_null_choices'), + ('tenancy', '0016_charfield_null_choices'), + ] + + operations = [ + migrations.CreateModel( + name='VirtualCircuit', + 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)), + ('description', models.CharField(blank=True, max_length=200)), + ('comments', models.TextField(blank=True)), + ('cid', models.CharField(max_length=100)), + ('status', models.CharField(default='active', max_length=50)), + ('provider_account', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='circuits.provideraccount')), + ('provider_network', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='circuits.providernetwork')), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='tenancy.tenant')), + ], + options={ + 'verbose_name': 'circuit', + 'verbose_name_plural': 'circuits', + 'ordering': ['provider_network', 'provider_account', 'cid'], + }, + ), + migrations.CreateModel( + name='VirtualCircuitTermination', + 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)), + ('role', models.CharField(default='peer', max_length=50)), + ('description', models.CharField(blank=True, max_length=200)), + ('interface', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='virtual_circuit_termination', to='dcim.interface')), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ('virtual_circuit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='circuits.virtualcircuit')), + ], + options={ + 'verbose_name': 'virtual circuit termination', + 'verbose_name_plural': 'virtual circuit terminations', + 'ordering': ['virtual_circuit', 'role', 'pk'], + }, + ), + migrations.AddConstraint( + model_name='virtualcircuit', + constraint=models.UniqueConstraint(fields=('provider_network', 'cid'), name='circuits_virtualcircuit_unique_provider_network_cid'), + ), + migrations.AddConstraint( + model_name='virtualcircuit', + constraint=models.UniqueConstraint(fields=('provider_account', 'cid'), name='circuits_virtualcircuit_unique_provideraccount_cid'), + ), + ] diff --git a/netbox/circuits/models/__init__.py b/netbox/circuits/models/__init__.py index 7bbaf75d3..77382358b 100644 --- a/netbox/circuits/models/__init__.py +++ b/netbox/circuits/models/__init__.py @@ -1,2 +1,3 @@ from .circuits import * from .providers import * +from .virtual_circuits import * diff --git a/netbox/circuits/models/virtual_circuits.py b/netbox/circuits/models/virtual_circuits.py new file mode 100644 index 000000000..ced68c105 --- /dev/null +++ b/netbox/circuits/models/virtual_circuits.py @@ -0,0 +1,164 @@ +from functools import cached_property + +from django.core.exceptions import ValidationError +from django.db import models +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ + +from circuits.choices import * +from netbox.models import ChangeLoggedModel, PrimaryModel +from netbox.models.features import CustomFieldsMixin, CustomLinksMixin, TagsMixin + +__all__ = ( + 'VirtualCircuit', + 'VirtualCircuitTermination', +) + + +class VirtualCircuit(PrimaryModel): + """ + A virtual connection between two or more endpoints, delivered across one or more physical circuits. + """ + cid = models.CharField( + max_length=100, + verbose_name=_('circuit ID'), + help_text=_('Unique circuit ID') + ) + provider_network = models.ForeignKey( + to='circuits.ProviderNetwork', + on_delete=models.PROTECT, + related_name='virtual_circuits' + ) + provider_account = models.ForeignKey( + to='circuits.ProviderAccount', + on_delete=models.PROTECT, + related_name='virtual_circuits', + blank=True, + null=True + ) + status = models.CharField( + verbose_name=_('status'), + max_length=50, + choices=CircuitStatusChoices, + default=CircuitStatusChoices.STATUS_ACTIVE + ) + tenant = models.ForeignKey( + to='tenancy.Tenant', + on_delete=models.PROTECT, + related_name='virtual_circuits', + blank=True, + null=True + ) + + clone_fields = ( + 'provider_network', 'provider_account', 'status', 'tenant', 'description', + ) + prerequisite_models = ( + 'circuits.ProviderNetwork', + ) + + class Meta: + ordering = ['provider_network', 'provider_account', 'cid'] + constraints = ( + models.UniqueConstraint( + fields=('provider_network', 'cid'), + name='%(app_label)s_%(class)s_unique_provider_network_cid' + ), + models.UniqueConstraint( + fields=('provider_account', 'cid'), + name='%(app_label)s_%(class)s_unique_provideraccount_cid' + ), + ) + verbose_name = _('virtual circuit') + verbose_name_plural = _('virtual circuits') + + def __str__(self): + return self.cid + + def get_status_color(self): + return CircuitStatusChoices.colors.get(self.status) + + def clean(self): + super().clean() + + if self.provider_account and self.provider_network.provider != self.provider_account.provider: + raise ValidationError({ + 'provider_account': "The assigned account must belong to the provider of the assigned network." + }) + + @property + def provider(self): + return self.provider_network.provider + + +class VirtualCircuitTermination( + CustomFieldsMixin, + CustomLinksMixin, + TagsMixin, + ChangeLoggedModel +): + virtual_circuit = models.ForeignKey( + to='circuits.VirtualCircuit', + on_delete=models.CASCADE, + related_name='terminations' + ) + role = models.CharField( + verbose_name=_('role'), + max_length=50, + choices=VirtualCircuitTerminationRoleChoices, + default=VirtualCircuitTerminationRoleChoices.ROLE_PEER + ) + interface = models.OneToOneField( + to='dcim.Interface', + on_delete=models.CASCADE, + related_name='virtual_circuit_termination' + ) + description = models.CharField( + verbose_name=_('description'), + max_length=200, + blank=True + ) + + class Meta: + ordering = ['virtual_circuit', 'role', 'pk'] + verbose_name = _('virtual circuit termination') + verbose_name_plural = _('virtual circuit terminations') + + def __str__(self): + return f'{self.virtual_circuit}: {self.get_role_display()} termination' + + def get_absolute_url(self): + return reverse('circuits:virtualcircuittermination', args=[self.pk]) + + def get_role_color(self): + return VirtualCircuitTerminationRoleChoices.colors.get(self.role) + + def to_objectchange(self, action): + objectchange = super().to_objectchange(action) + objectchange.related_object = self.virtual_circuit + return objectchange + + @property + def parent_object(self): + return self.virtual_circuit + + @cached_property + def peer_terminations(self): + if self.role == VirtualCircuitTerminationRoleChoices.ROLE_PEER: + return self.virtual_circuit.terminations.exclude(pk=self.pk).filter( + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER + ) + if self.role == VirtualCircuitTerminationRoleChoices.ROLE_HUB: + return self.virtual_circuit.terminations.filter( + role=VirtualCircuitTerminationRoleChoices.ROLE_SPOKE + ) + if self.role == VirtualCircuitTerminationRoleChoices.ROLE_SPOKE: + return self.virtual_circuit.terminations.filter( + role=VirtualCircuitTerminationRoleChoices.ROLE_HUB + ) + + def clean(self): + super().clean() + + if self.interface and not self.interface.is_virtual: + raise ValidationError("Virtual circuits may be terminated only to virtual interfaces.") diff --git a/netbox/circuits/search.py b/netbox/circuits/search.py index 7a5711f03..80725c1b8 100644 --- a/netbox/circuits/search.py +++ b/netbox/circuits/search.py @@ -80,3 +80,23 @@ class ProviderNetworkIndex(SearchIndex): ('comments', 5000), ) display_attrs = ('provider', 'service_id', 'description') + + +@register_search +class VirtualCircuitIndex(SearchIndex): + model = models.VirtualCircuit + fields = ( + ('cid', 100), + ('description', 500), + ('comments', 5000), + ) + display_attrs = ('provider', 'provider_network', 'provider_account', 'status', 'tenant', 'description') + + +@register_search +class VirtualCircuitTerminationIndex(SearchIndex): + model = models.VirtualCircuitTermination + fields = ( + ('description', 500), + ) + display_attrs = ('virtual_circuit', 'role', 'description') diff --git a/netbox/circuits/tables/__init__.py b/netbox/circuits/tables/__init__.py index b61c13cae..a436eb88d 100644 --- a/netbox/circuits/tables/__init__.py +++ b/netbox/circuits/tables/__init__.py @@ -1,3 +1,4 @@ from .circuits import * from .columns import * from .providers import * +from .virtual_circuits import * diff --git a/netbox/circuits/tables/virtual_circuits.py b/netbox/circuits/tables/virtual_circuits.py new file mode 100644 index 000000000..b7617f297 --- /dev/null +++ b/netbox/circuits/tables/virtual_circuits.py @@ -0,0 +1,95 @@ +import django_tables2 as tables +from django.utils.translation import gettext_lazy as _ + +from circuits.models import * +from netbox.tables import NetBoxTable, columns +from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin + +__all__ = ( + 'VirtualCircuitTable', + 'VirtualCircuitTerminationTable', +) + + +class VirtualCircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): + cid = tables.Column( + linkify=True, + verbose_name=_('Circuit ID') + ) + provider = tables.Column( + accessor=tables.A('provider_network__provider'), + verbose_name=_('Provider'), + linkify=True + ) + provider_network = tables.Column( + linkify=True, + verbose_name=_('Provider network') + ) + provider_account = tables.Column( + linkify=True, + verbose_name=_('Account') + ) + status = columns.ChoiceFieldColumn() + termination_count = columns.LinkedCountColumn( + viewname='circuits:virtualcircuittermination_list', + url_params={'virtual_circuit_id': 'pk'}, + verbose_name=_('Terminations') + ) + comments = columns.MarkdownColumn( + verbose_name=_('Comments') + ) + tags = columns.TagColumn( + url_name='circuits:virtualcircuit_list' + ) + + class Meta(NetBoxTable.Meta): + model = VirtualCircuit + fields = ( + 'pk', 'id', 'cid', 'provider', 'provider_account', 'provider_network', 'status', 'tenant', 'tenant_group', + 'description', 'comments', 'tags', 'created', 'last_updated', + ) + default_columns = ( + 'pk', 'cid', 'provider', 'provider_account', 'provider_network', 'status', 'tenant', 'termination_count', + 'description', + ) + + +class VirtualCircuitTerminationTable(NetBoxTable): + virtual_circuit = tables.Column( + verbose_name=_('Virtual circuit'), + linkify=True + ) + provider = tables.Column( + accessor=tables.A('virtual_circuit__provider_network__provider'), + verbose_name=_('Provider'), + linkify=True + ) + provider_network = tables.Column( + accessor=tables.A('virtual_circuit__provider_network'), + linkify=True, + verbose_name=_('Provider network') + ) + provider_account = tables.Column( + linkify=True, + verbose_name=_('Account') + ) + role = columns.ChoiceFieldColumn() + device = tables.Column( + accessor=tables.A('interface__device'), + linkify=True, + verbose_name=_('Device') + ) + interface = tables.Column( + verbose_name=_('Interface'), + linkify=True + ) + + class Meta(NetBoxTable.Meta): + model = VirtualCircuitTermination + fields = ( + 'pk', 'id', 'virtual_circuit', 'provider', 'provider_network', 'provider_account', 'role', 'interfaces', + 'description', 'created', 'last_updated', 'actions', + ) + default_columns = ( + 'pk', 'id', 'virtual_circuit', 'role', 'device', 'interface', 'description', + ) diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 1b2e9f3f8..12c6b2a93 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -2,7 +2,8 @@ from django.urls import reverse from circuits.choices import * from circuits.models import * -from dcim.models import Site +from dcim.choices import InterfaceTypeChoices +from dcim.models import Device, DeviceRole, DeviceType, Interface, Manufacturer, Site from ipam.models import ASN, RIR from utilities.testing import APITestCase, APIViewTestCases @@ -397,3 +398,240 @@ class ProviderNetworkTest(APIViewTestCases.APIViewTestCase): 'provider': providers[1].pk, 'description': 'New description', } + + +class VirtualCircuitTest(APIViewTestCases.APIViewTestCase): + model = VirtualCircuit + brief_fields = ['cid', 'description', 'display', 'id', 'provider_network', 'url'] + bulk_update_data = { + 'status': 'planned', + } + + @classmethod + def setUpTestData(cls): + provider = Provider.objects.create(name='Provider 1', slug='provider-1') + provider_network = ProviderNetwork.objects.create(provider=provider, name='Provider Network 1') + provider_account = ProviderAccount.objects.create(provider=provider, account='Provider Account 1') + + virtual_circuits = ( + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 1' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 2' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 3' + ), + ) + VirtualCircuit.objects.bulk_create(virtual_circuits) + + cls.create_data = [ + { + 'cid': 'Virtual Circuit 4', + 'provider_network': provider_network.pk, + 'provider_account': provider_account.pk, + 'status': CircuitStatusChoices.STATUS_PLANNED, + }, + { + 'cid': 'Virtual Circuit 5', + 'provider_network': provider_network.pk, + 'provider_account': provider_account.pk, + 'status': CircuitStatusChoices.STATUS_PLANNED, + }, + { + 'cid': 'Virtual Circuit 6', + 'provider_network': provider_network.pk, + 'provider_account': provider_account.pk, + 'status': CircuitStatusChoices.STATUS_PLANNED, + }, + ] + + +class VirtualCircuitTerminationTest(APIViewTestCases.APIViewTestCase): + model = VirtualCircuitTermination + brief_fields = ['description', 'display', 'id', 'interface', 'role', 'url', 'virtual_circuit'] + bulk_update_data = { + 'description': 'New description', + } + + @classmethod + def setUpTestData(cls): + manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') + device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1') + device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') + site = Site.objects.create(name='Site 1', slug='site-1') + + devices = ( + Device(site=site, name='hub', device_type=device_type, role=device_role), + Device(site=site, name='spoke1', device_type=device_type, role=device_role), + Device(site=site, name='spoke2', device_type=device_type, role=device_role), + Device(site=site, name='spoke3', device_type=device_type, role=device_role), + ) + Device.objects.bulk_create(devices) + + physical_interfaces = ( + Interface(device=devices[0], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[1], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[2], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[3], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + ) + Interface.objects.bulk_create(physical_interfaces) + + virtual_interfaces = ( + # Point-to-point VCs + Interface( + device=devices[0], + name='eth0.1', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[0], + name='eth0.2', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[0], + name='eth0.3', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[1], + name='eth0.1', + parent=physical_interfaces[1], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[2], + name='eth0.1', + parent=physical_interfaces[2], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[3], + name='eth0.1', + parent=physical_interfaces[3], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + + # Hub and spoke VCs + Interface( + device=devices[0], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[1], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[2], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[3], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + ) + Interface.objects.bulk_create(virtual_interfaces) + + provider = Provider.objects.create(name='Provider 1', slug='provider-1') + provider_network = ProviderNetwork.objects.create(provider=provider, name='Provider Network 1') + provider_account = ProviderAccount.objects.create(provider=provider, account='Provider Account 1') + + virtual_circuits = ( + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 1' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 2' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 3' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 4' + ), + ) + VirtualCircuit.objects.bulk_create(virtual_circuits) + + virtual_circuit_terminations = ( + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[0] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[3] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[1] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[4] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[2] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[5] + ), + ) + VirtualCircuitTermination.objects.bulk_create(virtual_circuit_terminations) + + cls.create_data = [ + { + 'virtual_circuit': virtual_circuits[3].pk, + 'role': VirtualCircuitTerminationRoleChoices.ROLE_HUB, + 'interface': virtual_interfaces[6].pk + }, + { + 'virtual_circuit': virtual_circuits[3].pk, + 'role': VirtualCircuitTerminationRoleChoices.ROLE_SPOKE, + 'interface': virtual_interfaces[7].pk + }, + { + 'virtual_circuit': virtual_circuits[3].pk, + 'role': VirtualCircuitTerminationRoleChoices.ROLE_SPOKE, + 'interface': virtual_interfaces[8].pk + }, + { + 'virtual_circuit': virtual_circuits[3].pk, + 'role': VirtualCircuitTerminationRoleChoices.ROLE_SPOKE, + 'interface': virtual_interfaces[9].pk + }, + ] diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index 0dbc7172b..01b5e3105 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -3,7 +3,8 @@ from django.test import TestCase from circuits.choices import * from circuits.filtersets import * from circuits.models import * -from dcim.models import Cable, Region, Site, SiteGroup +from dcim.choices import InterfaceTypeChoices +from dcim.models import Cable, Device, DeviceRole, DeviceType, Interface, Manufacturer, Region, Site, SiteGroup from ipam.models import ASN, RIR from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant, TenantGroup @@ -678,3 +679,293 @@ class ProviderAccountTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) params = {'provider': [providers[0].slug, providers[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + +class VirtualCircuitTestCase(TestCase, ChangeLoggedFilterSetTests): + queryset = VirtualCircuit.objects.all() + filterset = VirtualCircuitFilterSet + + @classmethod + def setUpTestData(cls): + + tenant_groups = ( + TenantGroup(name='Tenant group 1', slug='tenant-group-1'), + TenantGroup(name='Tenant group 2', slug='tenant-group-2'), + TenantGroup(name='Tenant group 3', slug='tenant-group-3'), + ) + for tenantgroup in tenant_groups: + tenantgroup.save() + + tenants = ( + Tenant(name='Tenant 1', slug='tenant-1', group=tenant_groups[0]), + Tenant(name='Tenant 2', slug='tenant-2', group=tenant_groups[1]), + Tenant(name='Tenant 3', slug='tenant-3', group=tenant_groups[2]), + ) + Tenant.objects.bulk_create(tenants) + + providers = ( + Provider(name='Provider 1', slug='provider-1'), + Provider(name='Provider 2', slug='provider-2'), + Provider(name='Provider 3', slug='provider-3'), + ) + Provider.objects.bulk_create(providers) + + provider_accounts = ( + ProviderAccount(name='Provider Account 1', provider=providers[0], account='A'), + ProviderAccount(name='Provider Account 2', provider=providers[1], account='B'), + ProviderAccount(name='Provider Account 3', provider=providers[2], account='C'), + ) + ProviderAccount.objects.bulk_create(provider_accounts) + + provider_networks = ( + ProviderNetwork(name='Provider Network 1', provider=providers[0]), + ProviderNetwork(name='Provider Network 2', provider=providers[1]), + ProviderNetwork(name='Provider Network 3', provider=providers[2]), + ) + ProviderNetwork.objects.bulk_create(provider_networks) + + virutal_circuits = ( + VirtualCircuit( + provider_network=provider_networks[0], + provider_account=provider_accounts[0], + tenant=tenants[0], + cid='Virtual Circuit 1', + status=CircuitStatusChoices.STATUS_PLANNED, + description='virtualcircuit1', + ), + VirtualCircuit( + provider_network=provider_networks[1], + provider_account=provider_accounts[1], + tenant=tenants[1], + cid='Virtual Circuit 2', + status=CircuitStatusChoices.STATUS_ACTIVE, + description='virtualcircuit2', + ), + VirtualCircuit( + provider_network=provider_networks[2], + provider_account=provider_accounts[2], + tenant=tenants[2], + cid='Virtual Circuit 3', + status=CircuitStatusChoices.STATUS_DEPROVISIONING, + description='virtualcircuit3', + ), + ) + VirtualCircuit.objects.bulk_create(virutal_circuits) + + def test_q(self): + params = {'q': 'virtualcircuit1'} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + + def test_cid(self): + params = {'cid': ['Virtual Circuit 1', 'Virtual Circuit 2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_provider(self): + providers = Provider.objects.all()[:2] + params = {'provider_id': [providers[0].pk, providers[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'provider': [providers[0].slug, providers[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_provider_account(self): + provider_accounts = ProviderAccount.objects.all()[:2] + params = {'provider_account_id': [provider_accounts[0].pk, provider_accounts[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_provider_network(self): + provider_networks = ProviderNetwork.objects.all()[:2] + params = {'provider_network_id': [provider_networks[0].pk, provider_networks[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_status(self): + params = {'status': [CircuitStatusChoices.STATUS_ACTIVE, CircuitStatusChoices.STATUS_PLANNED]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_description(self): + params = {'description': ['virtualcircuit1', 'virtualcircuit2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_tenant(self): + tenants = Tenant.objects.all()[:2] + params = {'tenant_id': [tenants[0].pk, tenants[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'tenant': [tenants[0].slug, tenants[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_tenant_group(self): + tenant_groups = TenantGroup.objects.all()[:2] + params = {'tenant_group_id': [tenant_groups[0].pk, tenant_groups[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + params = {'tenant_group': [tenant_groups[0].slug, tenant_groups[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + +class VirtualCircuitTerminationTestCase(TestCase, ChangeLoggedFilterSetTests): + queryset = VirtualCircuitTermination.objects.all() + filterset = VirtualCircuitTerminationFilterSet + + @classmethod + def setUpTestData(cls): + manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') + device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1') + device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') + site = Site.objects.create(name='Site 1', slug='site-1') + + devices = ( + Device(site=site, name='Device 1', device_type=device_type, role=device_role), + Device(site=site, name='Device 2', device_type=device_type, role=device_role), + Device(site=site, name='Device 3', device_type=device_type, role=device_role), + ) + Device.objects.bulk_create(devices) + + virtual_interfaces = ( + # Device 1 + Interface( + device=devices[0], + name='eth0.1', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[0], + name='eth0.2', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + # Device 2 + Interface( + device=devices[1], + name='eth0.1', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[1], + name='eth0.2', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + # Device 3 + Interface( + device=devices[2], + name='eth0.1', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[2], + name='eth0.2', + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + ) + Interface.objects.bulk_create(virtual_interfaces) + + providers = ( + Provider(name='Provider 1', slug='provider-1'), + Provider(name='Provider 2', slug='provider-2'), + Provider(name='Provider 3', slug='provider-3'), + ) + Provider.objects.bulk_create(providers) + provider_networks = ( + ProviderNetwork(provider=providers[0], name='Provider Network 1'), + ProviderNetwork(provider=providers[1], name='Provider Network 2'), + ProviderNetwork(provider=providers[2], name='Provider Network 3'), + ) + ProviderNetwork.objects.bulk_create(provider_networks) + provider_accounts = ( + ProviderAccount(provider=providers[0], account='Provider Account 1'), + ProviderAccount(provider=providers[1], account='Provider Account 2'), + ProviderAccount(provider=providers[2], account='Provider Account 3'), + ) + ProviderAccount.objects.bulk_create(provider_accounts) + + virtual_circuits = ( + VirtualCircuit( + provider_network=provider_networks[0], + provider_account=provider_accounts[0], + cid='Virtual Circuit 1' + ), + VirtualCircuit( + provider_network=provider_networks[1], + provider_account=provider_accounts[1], + cid='Virtual Circuit 2' + ), + VirtualCircuit( + provider_network=provider_networks[2], + provider_account=provider_accounts[2], + cid='Virtual Circuit 3' + ), + ) + VirtualCircuit.objects.bulk_create(virtual_circuits) + + virtual_circuit_terminations = ( + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_HUB, + interface=virtual_interfaces[0], + description='termination1' + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_SPOKE, + interface=virtual_interfaces[3], + description='termination2' + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[1], + description='termination3' + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[4], + description='termination4' + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[2], + description='termination5' + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[5], + description='termination6' + ), + ) + VirtualCircuitTermination.objects.bulk_create(virtual_circuit_terminations) + + def test_q(self): + params = {'q': 'termination1'} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) + + def test_description(self): + params = {'description': ['termination1', 'termination2']} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + + def test_virtual_circuit_id(self): + virtual_circuits = VirtualCircuit.objects.filter()[:2] + params = {'virtual_circuit_id': [virtual_circuits[0].pk, virtual_circuits[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + + def test_provider(self): + providers = Provider.objects.all()[:2] + params = {'provider_id': [providers[0].pk, providers[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + params = {'provider': [providers[0].slug, providers[1].slug]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + + def test_provider_network(self): + provider_networks = ProviderNetwork.objects.all()[:2] + params = {'provider_network_id': [provider_networks[0].pk, provider_networks[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + + def test_provider_account(self): + provider_accounts = ProviderAccount.objects.all()[:2] + params = {'provider_account_id': [provider_accounts[0].pk, provider_accounts[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + params = {'provider_account': [provider_accounts[0].account, provider_accounts[1].account]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) + + def test_interface(self): + interfaces = Interface.objects.all()[:2] + params = {'interface_id': [interfaces[0].pk, interfaces[1].pk]} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index f6c626443..321c2daa7 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -7,7 +7,8 @@ from django.urls import reverse from circuits.choices import * from circuits.models import * from core.models import ObjectType -from dcim.models import Cable, Interface, Site +from dcim.choices import InterfaceTypeChoices +from dcim.models import Cable, Device, DeviceRole, DeviceType, Interface, Manufacturer, Site from ipam.models import ASN, RIR from netbox.choices import ImportFormatChoices from users.models import ObjectPermission @@ -341,7 +342,7 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase): } -class TestCase(ViewTestCases.PrimaryObjectViewTestCase): +class CircuitTerminationTestCase(ViewTestCases.PrimaryObjectViewTestCase): model = CircuitTermination @classmethod @@ -518,3 +519,319 @@ class CircuitGroupAssignmentTestCase( cls.bulk_edit_data = { 'priority': CircuitPriorityChoices.PRIORITY_INACTIVE, } + + +class VirtualCircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase): + model = VirtualCircuit + + def setUp(self): + super().setUp() + + self.add_permissions( + 'circuits.add_virtualcircuittermination', + ) + + @classmethod + def setUpTestData(cls): + provider = Provider.objects.create(name='Provider 1', slug='provider-1') + provider_networks = ( + ProviderNetwork(provider=provider, name='Provider Network 1'), + ProviderNetwork(provider=provider, name='Provider Network 2'), + ) + ProviderNetwork.objects.bulk_create(provider_networks) + provider_accounts = ( + ProviderAccount(provider=provider, account='Provider Account 1'), + ProviderAccount(provider=provider, account='Provider Account 2'), + ) + ProviderAccount.objects.bulk_create(provider_accounts) + + virtual_circuits = ( + VirtualCircuit( + provider_network=provider_networks[0], + provider_account=provider_accounts[0], + cid='Virtual Circuit 1' + ), + VirtualCircuit( + provider_network=provider_networks[0], + provider_account=provider_accounts[0], + cid='Virtual Circuit 2' + ), + VirtualCircuit( + provider_network=provider_networks[0], + provider_account=provider_accounts[0], + cid='Virtual Circuit 3' + ), + ) + VirtualCircuit.objects.bulk_create(virtual_circuits) + + device = create_test_device('Device 1') + interfaces = ( + Interface(device=device, name='Interface 1', type=InterfaceTypeChoices.TYPE_VIRTUAL), + Interface(device=device, name='Interface 2', type=InterfaceTypeChoices.TYPE_VIRTUAL), + Interface(device=device, name='Interface 3', type=InterfaceTypeChoices.TYPE_VIRTUAL), + ) + Interface.objects.bulk_create(interfaces) + + tags = create_tags('Alpha', 'Bravo', 'Charlie') + + cls.form_data = { + 'cid': 'Virtual Circuit X', + 'provider_network': provider_networks[1].pk, + 'provider_account': provider_accounts[1].pk, + 'status': CircuitStatusChoices.STATUS_PLANNED, + 'description': 'A new virtual circuit', + 'comments': 'Some comments', + 'tags': [t.pk for t in tags], + } + + cls.csv_data = ( + "cid,provider_network,provider_account,status", + f"Virtual Circuit 4,Provider Network 1,Provider Account 1,{CircuitStatusChoices.STATUS_PLANNED}", + f"Virtual Circuit 5,Provider Network 1,Provider Account 1,{CircuitStatusChoices.STATUS_PLANNED}", + f"Virtual Circuit 6,Provider Network 1,Provider Account 1,{CircuitStatusChoices.STATUS_PLANNED}", + ) + + cls.csv_update_data = ( + "id,cid,description,status", + f"{virtual_circuits[0].pk},Virtual Circuit A,New description,{CircuitStatusChoices.STATUS_DECOMMISSIONED}", + f"{virtual_circuits[1].pk},Virtual Circuit B,New description,{CircuitStatusChoices.STATUS_DECOMMISSIONED}", + f"{virtual_circuits[2].pk},Virtual Circuit C,New description,{CircuitStatusChoices.STATUS_DECOMMISSIONED}", + ) + + cls.bulk_edit_data = { + 'provider_network': provider_networks[1].pk, + 'provider_account': provider_accounts[1].pk, + 'status': CircuitStatusChoices.STATUS_DECOMMISSIONED, + 'description': 'New description', + 'comments': 'New comments', + } + + @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[]) + def test_bulk_import_objects_with_terminations(self): + interfaces = Interface.objects.filter(type=InterfaceTypeChoices.TYPE_VIRTUAL) + json_data = f""" + [ + {{ + "cid": "Virtual Circuit 7", + "provider_network": "Provider Network 1", + "status": "active", + "terminations": [ + {{ + "role": "hub", + "interface": {interfaces[0].pk} + }}, + {{ + "role": "spoke", + "interface": {interfaces[1].pk} + }}, + {{ + "role": "spoke", + "interface": {interfaces[2].pk} + }} + ] + }} + ] + """ + + initial_count = self._get_queryset().count() + data = { + 'data': json_data, + 'format': ImportFormatChoices.JSON, + } + + # Assign model-level permission + obj_perm = ObjectPermission( + name='Test permission', + actions=['add'] + ) + obj_perm.save() + obj_perm.users.add(self.user) + obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) + + # Try GET with model-level permission + self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + + # Test POST with permission + self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertEqual(self._get_queryset().count(), initial_count + 1) + + +class VirtualCircuitTerminationTestCase(ViewTestCases.PrimaryObjectViewTestCase): + model = VirtualCircuitTermination + + @classmethod + def setUpTestData(cls): + manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') + device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1') + device_role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') + site = Site.objects.create(name='Site 1', slug='site-1') + + devices = ( + Device(site=site, name='hub', device_type=device_type, role=device_role), + Device(site=site, name='spoke1', device_type=device_type, role=device_role), + Device(site=site, name='spoke2', device_type=device_type, role=device_role), + Device(site=site, name='spoke3', device_type=device_type, role=device_role), + ) + Device.objects.bulk_create(devices) + + physical_interfaces = ( + Interface(device=devices[0], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[1], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[2], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface(device=devices[3], name='eth0', type=InterfaceTypeChoices.TYPE_1GE_FIXED), + ) + Interface.objects.bulk_create(physical_interfaces) + + virtual_interfaces = ( + # Point-to-point VCs + Interface( + device=devices[0], + name='eth0.1', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[0], + name='eth0.2', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[0], + name='eth0.3', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[1], + name='eth0.1', + parent=physical_interfaces[1], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[2], + name='eth0.1', + parent=physical_interfaces[2], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[3], + name='eth0.1', + parent=physical_interfaces[3], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + + # Hub and spoke VCs + Interface( + device=devices[0], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[1], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[2], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + Interface( + device=devices[3], + name='eth0.9', + parent=physical_interfaces[0], + type=InterfaceTypeChoices.TYPE_VIRTUAL + ), + ) + Interface.objects.bulk_create(virtual_interfaces) + + provider = Provider.objects.create(name='Provider 1', slug='provider-1') + provider_network = ProviderNetwork.objects.create(provider=provider, name='Provider Network 1') + provider_account = ProviderAccount.objects.create(provider=provider, account='Provider Account 1') + + virtual_circuits = ( + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 1' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 2' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 3' + ), + VirtualCircuit( + provider_network=provider_network, + provider_account=provider_account, + cid='Virtual Circuit 4' + ), + ) + VirtualCircuit.objects.bulk_create(virtual_circuits) + + virtual_circuit_terminations = ( + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[0] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[0], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[3] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[1] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[1], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[4] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[2] + ), + VirtualCircuitTermination( + virtual_circuit=virtual_circuits[2], + role=VirtualCircuitTerminationRoleChoices.ROLE_PEER, + interface=virtual_interfaces[5] + ), + ) + VirtualCircuitTermination.objects.bulk_create(virtual_circuit_terminations) + + cls.form_data = { + 'virtual_circuit': virtual_circuits[3].pk, + 'role': VirtualCircuitTerminationRoleChoices.ROLE_HUB, + 'interface': virtual_interfaces[6].pk + } + + cls.csv_data = ( + "virtual_circuit,role,interface,description", + f"Virtual Circuit 4,{VirtualCircuitTerminationRoleChoices.ROLE_HUB},{virtual_interfaces[6].pk},Hub", + f"Virtual Circuit 4,{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},{virtual_interfaces[7].pk},Spoke 1", + f"Virtual Circuit 4,{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},{virtual_interfaces[8].pk},Spoke 2", + f"Virtual Circuit 4,{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},{virtual_interfaces[9].pk},Spoke 3", + ) + + cls.csv_update_data = ( + "id,role,description", + f"{virtual_circuit_terminations[0].pk},{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},New description", + f"{virtual_circuit_terminations[1].pk},{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},New description", + f"{virtual_circuit_terminations[2].pk},{VirtualCircuitTerminationRoleChoices.ROLE_SPOKE},New description", + ) + + cls.bulk_edit_data = { + 'description': 'New description', + } diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 2171d49be..bd9ca6989 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -70,4 +70,20 @@ urlpatterns = [ path('circuit-group-assignments/edit/', views.CircuitGroupAssignmentBulkEditView.as_view(), name='circuitgroupassignment_bulk_edit'), path('circuit-group-assignments/delete/', views.CircuitGroupAssignmentBulkDeleteView.as_view(), name='circuitgroupassignment_bulk_delete'), path('circuit-group-assignments//', include(get_model_urls('circuits', 'circuitgroupassignment'))), + + # Virtual circuits + path('virtual-circuits/', views.VirtualCircuitListView.as_view(), name='virtualcircuit_list'), + path('virtual-circuits/add/', views.VirtualCircuitEditView.as_view(), name='virtualcircuit_add'), + path('virtual-circuits/import/', views.VirtualCircuitBulkImportView.as_view(), name='virtualcircuit_import'), + path('virtual-circuits/edit/', views.VirtualCircuitBulkEditView.as_view(), name='virtualcircuit_bulk_edit'), + path('virtual-circuits/delete/', views.VirtualCircuitBulkDeleteView.as_view(), name='virtualcircuit_bulk_delete'), + path('virtual-circuits//', include(get_model_urls('circuits', 'virtualcircuit'))), + + # Virtual circuit terminations + path('virtual-circuit-terminations/', views.VirtualCircuitTerminationListView.as_view(), name='virtualcircuittermination_list'), + path('virtual-circuit-terminations/add/', views.VirtualCircuitTerminationEditView.as_view(), name='virtualcircuittermination_add'), + path('virtual-circuit-terminations/import/', views.VirtualCircuitTerminationBulkImportView.as_view(), name='virtualcircuittermination_import'), + path('virtual-circuit-terminations/edit/', views.VirtualCircuitTerminationBulkEditView.as_view(), name='virtualcircuittermination_bulk_edit'), + path('virtual-circuit-terminations/delete/', views.VirtualCircuitTerminationBulkDeleteView.as_view(), name='virtualcircuittermination_bulk_delete'), + path('virtual-circuit-terminations//', include(get_model_urls('circuits', 'virtualcircuittermination'))), ] diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 4059065bf..34a1deb6a 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -537,3 +537,109 @@ class CircuitGroupAssignmentBulkDeleteView(generic.BulkDeleteView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet table = tables.CircuitGroupAssignmentTable + + +# +# Virtual circuits +# + +class VirtualCircuitListView(generic.ObjectListView): + queryset = VirtualCircuit.objects.annotate( + termination_count=count_related(VirtualCircuitTermination, 'virtual_circuit') + ) + filterset = filtersets.VirtualCircuitFilterSet + filterset_form = forms.VirtualCircuitFilterForm + table = tables.VirtualCircuitTable + + +@register_model_view(VirtualCircuit) +class VirtualCircuitView(generic.ObjectView): + queryset = VirtualCircuit.objects.all() + + +@register_model_view(VirtualCircuit, 'edit') +class VirtualCircuitEditView(generic.ObjectEditView): + queryset = VirtualCircuit.objects.all() + form = forms.VirtualCircuitForm + + +@register_model_view(VirtualCircuit, 'delete') +class VirtualCircuitDeleteView(generic.ObjectDeleteView): + queryset = VirtualCircuit.objects.all() + + +class VirtualCircuitBulkImportView(generic.BulkImportView): + queryset = VirtualCircuit.objects.all() + model_form = forms.VirtualCircuitImportForm + additional_permissions = [ + 'circuits.add_virtualcircuittermination', + ] + related_object_forms = { + 'terminations': forms.VirtualCircuitTerminationImportRelatedForm, + } + + def prep_related_object_data(self, parent, data): + data.update({'virtual_circuit': parent}) + return data + + +class VirtualCircuitBulkEditView(generic.BulkEditView): + queryset = VirtualCircuit.objects.annotate( + termination_count=count_related(VirtualCircuitTermination, 'virtual_circuit') + ) + filterset = filtersets.VirtualCircuitFilterSet + table = tables.VirtualCircuitTable + form = forms.VirtualCircuitBulkEditForm + + +class VirtualCircuitBulkDeleteView(generic.BulkDeleteView): + queryset = VirtualCircuit.objects.annotate( + termination_count=count_related(VirtualCircuitTermination, 'virtual_circuit') + ) + filterset = filtersets.VirtualCircuitFilterSet + table = tables.VirtualCircuitTable + + +# +# Virtual circuit terminations +# + +class VirtualCircuitTerminationListView(generic.ObjectListView): + queryset = VirtualCircuitTermination.objects.all() + filterset = filtersets.VirtualCircuitTerminationFilterSet + filterset_form = forms.VirtualCircuitTerminationFilterForm + table = tables.VirtualCircuitTerminationTable + + +@register_model_view(VirtualCircuitTermination) +class VirtualCircuitTerminationView(generic.ObjectView): + queryset = VirtualCircuitTermination.objects.all() + + +@register_model_view(VirtualCircuitTermination, 'edit') +class VirtualCircuitTerminationEditView(generic.ObjectEditView): + queryset = VirtualCircuitTermination.objects.all() + form = forms.VirtualCircuitTerminationForm + + +@register_model_view(VirtualCircuitTermination, 'delete') +class VirtualCircuitTerminationDeleteView(generic.ObjectDeleteView): + queryset = VirtualCircuitTermination.objects.all() + + +class VirtualCircuitTerminationBulkImportView(generic.BulkImportView): + queryset = VirtualCircuitTermination.objects.all() + model_form = forms.VirtualCircuitTerminationImportForm + + +class VirtualCircuitTerminationBulkEditView(generic.BulkEditView): + queryset = VirtualCircuitTermination.objects.all() + filterset = filtersets.VirtualCircuitTerminationFilterSet + table = tables.VirtualCircuitTerminationTable + form = forms.VirtualCircuitTerminationBulkEditForm + + +class VirtualCircuitTerminationBulkDeleteView(generic.BulkDeleteView): + queryset = VirtualCircuitTermination.objects.all() + filterset = filtersets.VirtualCircuitTerminationFilterSet + table = tables.VirtualCircuitTerminationTable diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index cb8d91c89..f4d65d4bc 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -4,7 +4,7 @@ from django.utils.translation import gettext as _ from drf_spectacular.types import OpenApiTypes from drf_spectacular.utils import extend_schema_field -from circuits.models import CircuitTermination +from circuits.models import CircuitTermination, VirtualCircuit, VirtualCircuitTermination from extras.filtersets import LocalConfigContextFilterSet from extras.models import ConfigTemplate from ipam.filtersets import PrimaryIPFilterSet @@ -1842,6 +1842,16 @@ class InterfaceFilterSet( queryset=WirelessLink.objects.all(), label=_('Wireless link') ) + virtual_circuit_id = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit_termination__virtual_circuit', + queryset=VirtualCircuit.objects.all(), + label=_('Virtual circuit (ID)'), + ) + virtual_circuit_termination_id = django_filters.ModelMultipleChoiceFilter( + field_name='virtual_circuit_termination', + queryset=VirtualCircuitTermination.objects.all(), + label=_('Virtual circuit termination (ID)'), + ) class Meta: model = Interface diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index 9b108bcca..ce9e5607f 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -998,6 +998,14 @@ class Interface(ModularComponentModel, BaseInterface, CabledObjectModel, PathEnd def l2vpn_termination(self): return self.l2vpn_terminations.first() + @cached_property + def connected_endpoints(self): + # If this is a virtual interface, return the remote endpoint of the connected + # virtual circuit, if any. + if self.is_virtual and hasattr(self, 'virtual_circuit_termination'): + return self.virtual_circuit_termination.peer_terminations + return super().connected_endpoints + # # Pass-through ports diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index d226c7335..494d83114 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -649,6 +649,14 @@ class InterfaceTable(BaseInterfaceTable, ModularDeviceComponentTable, PathEndpoi url_name='dcim:interface_list' ) + # Override PathEndpointTable.connection to accommodate virtual circuits + connection = columns.TemplateColumn( + accessor='_path__destinations', + template_code=INTERFACE_LINKTERMINATION, + verbose_name=_('Connection'), + orderable=False + ) + class Meta(DeviceComponentTable.Meta): model = models.Interface fields = ( diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index dc9724e3c..e6f2c8817 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -10,6 +10,20 @@ LINKTERMINATION = """ {% endfor %} """ +INTERFACE_LINKTERMINATION = """ +{% load i18n %} +{% if record.is_virtual and record.virtual_circuit_termination %} + {% for termination in record.connected_endpoints %} + {{ termination.interface.parent_object }} + + {{ termination.interface }} + {% trans "via" %} + {{ termination.parent_object }} + {% if not forloop.last %}
    {% endif %} + {% endfor %} +{% else %}""" + LINKTERMINATION + """{% endif %} +""" + CABLE_LENGTH = """ {% load helpers %} {% if record.length %}{{ record.length|floatformat:"-2" }} {{ record.length_unit }}{% endif %} diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py index b3d576cb9..c94e36e4b 100644 --- a/netbox/extras/tests/test_filtersets.py +++ b/netbox/extras/tests/test_filtersets.py @@ -1168,6 +1168,8 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests): 'tunnelgroup', 'tunneltermination', 'virtualchassis', + 'virtualcircuit', + 'virtualcircuittermination', 'virtualdevicecontext', 'virtualdisk', 'virtualmachine', diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index 1c4f9bf88..ba20e5f98 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -284,6 +284,13 @@ CIRCUITS_MENU = Menu( get_model_item('circuits', 'circuittermination', _('Circuit Terminations')), ), ), + MenuGroup( + label=_('Virtual Circuits'), + items=( + get_model_item('circuits', 'virtualcircuit', _('Virtual Circuits')), + get_model_item('circuits', 'virtualcircuittermination', _('Virtual Circuit Terminations')), + ), + ), MenuGroup( label=_('Providers'), items=( diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html index 000548734..5fd92615d 100644 --- a/netbox/templates/circuits/providernetwork.html +++ b/netbox/templates/circuits/providernetwork.html @@ -50,6 +50,19 @@

    {% trans "Circuits" %}

    {% htmx_table 'circuits:circuit_list' provider_network_id=object.pk %}
    +
    +

    + {% trans "Virtual Circuits" %} + {% if perms.circuits.add_virtualcircuit %} +
    + + {% trans "Add a Virtual Circuit" %} + +
    + {% endif %} +

    + {% htmx_table 'circuits:virtualcircuit_list' provider_network_id=object.pk %} +
    {% plugin_full_width_page object %}
    diff --git a/netbox/templates/circuits/virtualcircuit.html b/netbox/templates/circuits/virtualcircuit.html new file mode 100644 index 000000000..400f90524 --- /dev/null +++ b/netbox/templates/circuits/virtualcircuit.html @@ -0,0 +1,84 @@ +{% extends 'generic/object.html' %} +{% load helpers %} +{% load plugins %} +{% load i18n %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + {{ object.provider }} +
    • +
  • + {{ object.provider_network }} +
    • +{% endblock %} + +{% block content %} +
    +
    +
    +

    {% trans "Virtual circuit" %}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {% trans "Provider" %}{{ object.provider|linkify }}
    {% trans "Provider Network" %}{{ object.provider_network|linkify }}
    {% trans "Provider account" %}{{ object.provider_account|linkify|placeholder }}
    {% trans "Circuit ID" %}{{ object.cid }}
    {% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
    {% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
    {% trans "Description" %}{{ object.description|placeholder }}
    +
    + {% include 'inc/panels/tags.html' %} + {% plugin_left_page object %} +
    +
    + {% include 'inc/panels/custom_fields.html' %} + {% include 'inc/panels/comments.html' %} + {% plugin_right_page object %} +
    +
    +
    +
    +
    +

    + {% trans "Terminations" %} + {% if perms.circuits.add_virtualcircuittermination %} +
    + + {% trans "Add Termination" %} + +
    + {% endif %} +

    + {% htmx_table 'circuits:virtualcircuittermination_list' virtual_circuit_id=object.pk %} +
    + {% plugin_full_width_page object %} +
    +
    +{% endblock %} diff --git a/netbox/templates/circuits/virtualcircuittermination.html b/netbox/templates/circuits/virtualcircuittermination.html new file mode 100644 index 000000000..c08e3c604 --- /dev/null +++ b/netbox/templates/circuits/virtualcircuittermination.html @@ -0,0 +1,81 @@ +{% extends 'generic/object.html' %} +{% load helpers %} +{% load plugins %} +{% load i18n %} + +{% block breadcrumbs %} + {{ block.super }} +
  • + {{ object.virtual_circuit.provider }} +
    • +
  • + {{ object.virtual_circuit.provider_network }} +
    • +
  • + {{ object.virtual_circuit }} +
    • +{% endblock %} + +{% block content %} +
    +
    +
    +

    {% trans "Virtual Circuit Termination" %}

    + + + + + + + + + + + + + + + + + + + + + +
    {% trans "Provider" %}{{ object.virtual_circuit.provider|linkify }}
    {% trans "Provider Network" %}{{ object.virtual_circuit.provider_network|linkify }}
    {% trans "Provider account" %}{{ object.virtual_circuit.provider_account|linkify|placeholder }}
    {% trans "Virtual circuit" %}{{ object.virtual_circuit|linkify }}
    {% trans "Role" %}{% badge object.get_role_display bg_color=object.get_role_color %}
    +
    + {% include 'inc/panels/tags.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% plugin_left_page object %} +
    +
    +
    +

    {% trans "Interface" %}

    + + + + + + + + + + + + + + + + + +
    {% trans "Device" %}{{ object.interface.device|linkify }}
    {% trans "Interface" %}{{ object.interface|linkify }}
    {% trans "Type" %}{{ object.interface.get_type_display }}
    {% trans "Description" %}{{ object.interface.description|placeholder }}
    +
    + {% plugin_right_page object %} +
    +
    +
    +
    + {% plugin_full_width_page object %} +
    +
    +{% endblock %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index f364b12bc..b0d307bee 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -152,7 +152,41 @@ - {% if not object.is_virtual %} + {% if object.is_virtual and object.virtual_circuit_termination %} +
    +

    {% trans "Virtual Circuit" %}

    + + + + + + + + + + + + + + + + + + + + + +
    {% trans "Provider" %}{{ object.virtual_circuit_termination.virtual_circuit.provider|linkify }}
    {% trans "Provider Network" %}{{ object.virtual_circuit_termination.virtual_circuit.provider_network|linkify }}
    {% trans "Circuit ID" %}{{ object.virtual_circuit_termination.virtual_circuit|linkify }}
    {% trans "Role" %}{{ object.virtual_circuit_termination.get_role_display }}
    {% trans "Connections" %} + {% for termination in object.virtual_circuit_termination.peer_terminations %} + {{ termination.interface.parent_object }} + + {{ termination.interface }} + ({{ termination.get_role_display }}) + {% if not forloop.last %}
    {% endif %} + {% endfor %} +
    +
    + {% elif not object.is_virtual %}

    {% trans "Connection" %}

    {% if object.mark_connected %} From a0b4b0afe01ef2da913148208bcfaff6ede9463f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 20 Nov 2024 15:54:37 -0500 Subject: [PATCH 035/190] Closes #18023: Employ `register_model_view()` for list views (#18029) * Extend register_model_view() to enable registering list views * Register circuits list views with register_model_view() * Register core list views with register_model_view() * Fix bulk_edit & bulk_delete URL paths * Register dcim list views with register_model_view() (WIP) * Register dcim list views with register_model_view() * Register extras list views with register_model_view() * Register ipam list views with register_model_view() * Register tenancy list views with register_model_view() * Register users list views with register_model_view() * Register virtualization list views with register_model_view() * Register vpn list views with register_model_view() * Register wireless list views with register_model_view() * Add change note for register_model_view() --- docs/plugins/development/views.md | 3 + netbox/circuits/urls.py | 63 ++---- netbox/circuits/views.py | 40 ++++ netbox/core/urls.py | 29 +-- netbox/core/views.py | 16 ++ netbox/dcim/urls.py | 340 ++++++------------------------ netbox/dcim/views.py | 325 +++++++++++++++++++++++----- netbox/extras/urls.py | 112 +++------- netbox/extras/views.py | 93 ++++++-- netbox/ipam/urls.py | 126 ++--------- netbox/ipam/views.py | 88 ++++++++ netbox/tenancy/urls.py | 44 +--- netbox/tenancy/views.py | 44 +++- netbox/users/urls.py | 29 +-- netbox/users/views.py | 29 ++- netbox/utilities/urls.py | 11 +- netbox/utilities/views.py | 6 +- netbox/virtualization/urls.py | 56 ++--- netbox/virtualization/views.py | 32 +++ netbox/vpn/urls.py | 72 +------ netbox/vpn/views.py | 52 +++++ netbox/wireless/urls.py | 23 +- netbox/wireless/views.py | 15 ++ 23 files changed, 845 insertions(+), 803 deletions(-) diff --git a/docs/plugins/development/views.md b/docs/plugins/development/views.md index 1f5f164fd..3b6213917 100644 --- a/docs/plugins/development/views.md +++ b/docs/plugins/development/views.md @@ -185,6 +185,9 @@ class MyView(generic.ObjectView): ) ``` +!!! note "Changed in NetBox v4.2" + The `register_model_view()` function was extended in NetBox v4.2 to support registration of list views by passing `detail=False`. + ::: utilities.views.register_model_view ::: utilities.views.ViewTab diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index bd9ca6989..b4746038d 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -5,70 +5,33 @@ from . import views app_name = 'circuits' urlpatterns = [ - - # Providers - path('providers/', views.ProviderListView.as_view(), name='provider_list'), - path('providers/add/', views.ProviderEditView.as_view(), name='provider_add'), - path('providers/import/', views.ProviderBulkImportView.as_view(), name='provider_import'), - path('providers/edit/', views.ProviderBulkEditView.as_view(), name='provider_bulk_edit'), - path('providers/delete/', views.ProviderBulkDeleteView.as_view(), name='provider_bulk_delete'), + path('providers/', include(get_model_urls('circuits', 'provider', detail=False))), path('providers//', include(get_model_urls('circuits', 'provider'))), - # Provider accounts - path('provider-accounts/', views.ProviderAccountListView.as_view(), name='provideraccount_list'), - path('provider-accounts/add/', views.ProviderAccountEditView.as_view(), name='provideraccount_add'), - path('provider-accounts/import/', views.ProviderAccountBulkImportView.as_view(), name='provideraccount_import'), - path('provider-accounts/edit/', views.ProviderAccountBulkEditView.as_view(), name='provideraccount_bulk_edit'), - path('provider-accounts/delete/', views.ProviderAccountBulkDeleteView.as_view(), name='provideraccount_bulk_delete'), + path('provider-accounts/', include(get_model_urls('circuits', 'provideraccount', detail=False))), path('provider-accounts//', include(get_model_urls('circuits', 'provideraccount'))), - # Provider networks - path('provider-networks/', views.ProviderNetworkListView.as_view(), name='providernetwork_list'), - path('provider-networks/add/', views.ProviderNetworkEditView.as_view(), name='providernetwork_add'), - path('provider-networks/import/', views.ProviderNetworkBulkImportView.as_view(), name='providernetwork_import'), - path('provider-networks/edit/', views.ProviderNetworkBulkEditView.as_view(), name='providernetwork_bulk_edit'), - path('provider-networks/delete/', views.ProviderNetworkBulkDeleteView.as_view(), name='providernetwork_bulk_delete'), + path('provider-networks/', include(get_model_urls('circuits', 'providernetwork', detail=False))), path('provider-networks//', include(get_model_urls('circuits', 'providernetwork'))), - # Circuit types - path('circuit-types/', views.CircuitTypeListView.as_view(), name='circuittype_list'), - path('circuit-types/add/', views.CircuitTypeEditView.as_view(), name='circuittype_add'), - path('circuit-types/import/', views.CircuitTypeBulkImportView.as_view(), name='circuittype_import'), - path('circuit-types/edit/', views.CircuitTypeBulkEditView.as_view(), name='circuittype_bulk_edit'), - path('circuit-types/delete/', views.CircuitTypeBulkDeleteView.as_view(), name='circuittype_bulk_delete'), + path('circuit-types/', include(get_model_urls('circuits', 'circuittype', detail=False))), path('circuit-types//', include(get_model_urls('circuits', 'circuittype'))), - # Circuits - path('circuits/', views.CircuitListView.as_view(), name='circuit_list'), - path('circuits/add/', views.CircuitEditView.as_view(), name='circuit_add'), - path('circuits/import/', views.CircuitBulkImportView.as_view(), name='circuit_import'), - path('circuits/edit/', views.CircuitBulkEditView.as_view(), name='circuit_bulk_edit'), - path('circuits/delete/', views.CircuitBulkDeleteView.as_view(), name='circuit_bulk_delete'), - path('circuits//terminations/swap/', views.CircuitSwapTerminations.as_view(), name='circuit_terminations_swap'), + path('circuits/', include(get_model_urls('circuits', 'circuit', detail=False))), + path( + 'circuits//terminations/swap/', + views.CircuitSwapTerminations.as_view(), + name='circuit_terminations_swap' + ), path('circuits//', include(get_model_urls('circuits', 'circuit'))), - # Circuit terminations - path('circuit-terminations/', views.CircuitTerminationListView.as_view(), name='circuittermination_list'), - path('circuit-terminations/add/', views.CircuitTerminationEditView.as_view(), name='circuittermination_add'), - path('circuit-terminations/import/', views.CircuitTerminationBulkImportView.as_view(), name='circuittermination_import'), - path('circuit-terminations/edit/', views.CircuitTerminationBulkEditView.as_view(), name='circuittermination_bulk_edit'), - path('circuit-terminations/delete/', views.CircuitTerminationBulkDeleteView.as_view(), name='circuittermination_bulk_delete'), + path('circuit-terminations/', include(get_model_urls('circuits', 'circuittermination', detail=False))), path('circuit-terminations//', include(get_model_urls('circuits', 'circuittermination'))), - # Circuit Groups - path('circuit-groups/', views.CircuitGroupListView.as_view(), name='circuitgroup_list'), - path('circuit-groups/add/', views.CircuitGroupEditView.as_view(), name='circuitgroup_add'), - path('circuit-groups/import/', views.CircuitGroupBulkImportView.as_view(), name='circuitgroup_import'), - path('circuit-groups/edit/', views.CircuitGroupBulkEditView.as_view(), name='circuitgroup_bulk_edit'), - path('circuit-groups/delete/', views.CircuitGroupBulkDeleteView.as_view(), name='circuitgroup_bulk_delete'), + path('circuit-groups/', include(get_model_urls('circuits', 'circuitgroup', detail=False))), path('circuit-groups//', include(get_model_urls('circuits', 'circuitgroup'))), - # Circuit Group Assignments - path('circuit-group-assignments/', views.CircuitGroupAssignmentListView.as_view(), name='circuitgroupassignment_list'), - path('circuit-group-assignments/add/', views.CircuitGroupAssignmentEditView.as_view(), name='circuitgroupassignment_add'), - path('circuit-group-assignments/import/', views.CircuitGroupAssignmentBulkImportView.as_view(), name='circuitgroupassignment_import'), - path('circuit-group-assignments/edit/', views.CircuitGroupAssignmentBulkEditView.as_view(), name='circuitgroupassignment_bulk_edit'), - path('circuit-group-assignments/delete/', views.CircuitGroupAssignmentBulkDeleteView.as_view(), name='circuitgroupassignment_bulk_delete'), + path('circuit-group-assignments/', include(get_model_urls('circuits', 'circuitgroupassignment', detail=False))), path('circuit-group-assignments//', include(get_model_urls('circuits', 'circuitgroupassignment'))), # Virtual circuits diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 34a1deb6a..7410d0a8f 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -17,6 +17,7 @@ from .models import * # Providers # +@register_model_view(Provider, 'list', path='', detail=False) class ProviderListView(generic.ObjectListView): queryset = Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') @@ -36,6 +37,7 @@ class ProviderView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Provider, 'add', detail=False) @register_model_view(Provider, 'edit') class ProviderEditView(generic.ObjectEditView): queryset = Provider.objects.all() @@ -47,11 +49,13 @@ class ProviderDeleteView(generic.ObjectDeleteView): queryset = Provider.objects.all() +@register_model_view(Provider, 'import', detail=False) class ProviderBulkImportView(generic.BulkImportView): queryset = Provider.objects.all() model_form = forms.ProviderImportForm +@register_model_view(Provider, 'bulk_edit', path='edit', detail=False) class ProviderBulkEditView(generic.BulkEditView): queryset = Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') @@ -61,6 +65,7 @@ class ProviderBulkEditView(generic.BulkEditView): form = forms.ProviderBulkEditForm +@register_model_view(Provider, 'bulk_delete', path='delete', detail=False) class ProviderBulkDeleteView(generic.BulkDeleteView): queryset = Provider.objects.annotate( count_circuits=count_related(Circuit, 'provider') @@ -78,6 +83,7 @@ class ProviderContactsView(ObjectContactsView): # ProviderAccounts # +@register_model_view(ProviderAccount, 'list', path='', detail=False) class ProviderAccountListView(generic.ObjectListView): queryset = ProviderAccount.objects.annotate( count_circuits=count_related(Circuit, 'provider_account') @@ -97,6 +103,7 @@ class ProviderAccountView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ProviderAccount, 'add', detail=False) @register_model_view(ProviderAccount, 'edit') class ProviderAccountEditView(generic.ObjectEditView): queryset = ProviderAccount.objects.all() @@ -108,12 +115,14 @@ class ProviderAccountDeleteView(generic.ObjectDeleteView): queryset = ProviderAccount.objects.all() +@register_model_view(ProviderAccount, 'import', detail=False) class ProviderAccountBulkImportView(generic.BulkImportView): queryset = ProviderAccount.objects.all() model_form = forms.ProviderAccountImportForm table = tables.ProviderAccountTable +@register_model_view(ProviderAccount, 'bulk_edit', path='edit', detail=False) class ProviderAccountBulkEditView(generic.BulkEditView): queryset = ProviderAccount.objects.annotate( count_circuits=count_related(Circuit, 'provider_account') @@ -123,6 +132,7 @@ class ProviderAccountBulkEditView(generic.BulkEditView): form = forms.ProviderAccountBulkEditForm +@register_model_view(ProviderAccount, 'bulk_delete', path='delete', detail=False) class ProviderAccountBulkDeleteView(generic.BulkDeleteView): queryset = ProviderAccount.objects.annotate( count_circuits=count_related(Circuit, 'provider_account') @@ -140,6 +150,7 @@ class ProviderAccountContactsView(ObjectContactsView): # Provider networks # +@register_model_view(ProviderNetwork, 'list', path='', detail=False) class ProviderNetworkListView(generic.ObjectListView): queryset = ProviderNetwork.objects.all() filterset = filtersets.ProviderNetworkFilterSet @@ -166,6 +177,7 @@ class ProviderNetworkView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ProviderNetwork, 'add', detail=False) @register_model_view(ProviderNetwork, 'edit') class ProviderNetworkEditView(generic.ObjectEditView): queryset = ProviderNetwork.objects.all() @@ -177,11 +189,13 @@ class ProviderNetworkDeleteView(generic.ObjectDeleteView): queryset = ProviderNetwork.objects.all() +@register_model_view(ProviderNetwork, 'import', detail=False) class ProviderNetworkBulkImportView(generic.BulkImportView): queryset = ProviderNetwork.objects.all() model_form = forms.ProviderNetworkImportForm +@register_model_view(ProviderNetwork, 'bulk_edit', path='edit', detail=False) class ProviderNetworkBulkEditView(generic.BulkEditView): queryset = ProviderNetwork.objects.all() filterset = filtersets.ProviderNetworkFilterSet @@ -189,6 +203,7 @@ class ProviderNetworkBulkEditView(generic.BulkEditView): form = forms.ProviderNetworkBulkEditForm +@register_model_view(ProviderNetwork, 'bulk_delete', path='delete', detail=False) class ProviderNetworkBulkDeleteView(generic.BulkDeleteView): queryset = ProviderNetwork.objects.all() filterset = filtersets.ProviderNetworkFilterSet @@ -199,6 +214,7 @@ class ProviderNetworkBulkDeleteView(generic.BulkDeleteView): # Circuit Types # +@register_model_view(CircuitType, 'list', path='', detail=False) class CircuitTypeListView(generic.ObjectListView): queryset = CircuitType.objects.annotate( circuit_count=count_related(Circuit, 'type') @@ -218,6 +234,7 @@ class CircuitTypeView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(CircuitType, 'add', detail=False) @register_model_view(CircuitType, 'edit') class CircuitTypeEditView(generic.ObjectEditView): queryset = CircuitType.objects.all() @@ -229,11 +246,13 @@ class CircuitTypeDeleteView(generic.ObjectDeleteView): queryset = CircuitType.objects.all() +@register_model_view(CircuitType, 'import', detail=False) class CircuitTypeBulkImportView(generic.BulkImportView): queryset = CircuitType.objects.all() model_form = forms.CircuitTypeImportForm +@register_model_view(CircuitType, 'bulk_edit', path='edit', detail=False) class CircuitTypeBulkEditView(generic.BulkEditView): queryset = CircuitType.objects.annotate( circuit_count=count_related(Circuit, 'type') @@ -243,6 +262,7 @@ class CircuitTypeBulkEditView(generic.BulkEditView): form = forms.CircuitTypeBulkEditForm +@register_model_view(CircuitType, 'bulk_delete', path='delete', detail=False) class CircuitTypeBulkDeleteView(generic.BulkDeleteView): queryset = CircuitType.objects.annotate( circuit_count=count_related(Circuit, 'type') @@ -255,6 +275,7 @@ class CircuitTypeBulkDeleteView(generic.BulkDeleteView): # Circuits # +@register_model_view(Circuit, 'list', path='', detail=False) class CircuitListView(generic.ObjectListView): queryset = Circuit.objects.prefetch_related( 'tenant__group', 'termination_a__termination', 'termination_z__termination', @@ -269,6 +290,7 @@ class CircuitView(generic.ObjectView): queryset = Circuit.objects.all() +@register_model_view(Circuit, 'add', detail=False) @register_model_view(Circuit, 'edit') class CircuitEditView(generic.ObjectEditView): queryset = Circuit.objects.all() @@ -280,6 +302,7 @@ class CircuitDeleteView(generic.ObjectDeleteView): queryset = Circuit.objects.all() +@register_model_view(Circuit, 'import', detail=False) class CircuitBulkImportView(generic.BulkImportView): queryset = Circuit.objects.all() model_form = forms.CircuitImportForm @@ -295,6 +318,7 @@ class CircuitBulkImportView(generic.BulkImportView): return data +@register_model_view(Circuit, 'bulk_edit', path='edit', detail=False) class CircuitBulkEditView(generic.BulkEditView): queryset = Circuit.objects.prefetch_related( 'tenant__group', 'termination_a__termination', 'termination_z__termination', @@ -304,6 +328,7 @@ class CircuitBulkEditView(generic.BulkEditView): form = forms.CircuitBulkEditForm +@register_model_view(Circuit, 'bulk_delete', path='delete', detail=False) class CircuitBulkDeleteView(generic.BulkDeleteView): queryset = Circuit.objects.prefetch_related( 'tenant__group', 'termination_a__termination', 'termination_z__termination', @@ -397,6 +422,7 @@ class CircuitContactsView(ObjectContactsView): # Circuit terminations # +@register_model_view(CircuitTermination, 'list', path='', detail=False) class CircuitTerminationListView(generic.ObjectListView): queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet @@ -409,6 +435,7 @@ class CircuitTerminationView(generic.ObjectView): queryset = CircuitTermination.objects.all() +@register_model_view(CircuitTermination, 'add', detail=False) @register_model_view(CircuitTermination, 'edit') class CircuitTerminationEditView(generic.ObjectEditView): queryset = CircuitTermination.objects.all() @@ -420,11 +447,13 @@ class CircuitTerminationDeleteView(generic.ObjectDeleteView): queryset = CircuitTermination.objects.all() +@register_model_view(CircuitTermination, 'import', detail=False) class CircuitTerminationBulkImportView(generic.BulkImportView): queryset = CircuitTermination.objects.all() model_form = forms.CircuitTerminationImportForm +@register_model_view(CircuitTermination, 'bulk_edit', path='edit', detail=False) class CircuitTerminationBulkEditView(generic.BulkEditView): queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet @@ -432,6 +461,7 @@ class CircuitTerminationBulkEditView(generic.BulkEditView): form = forms.CircuitTerminationBulkEditForm +@register_model_view(CircuitTermination, 'bulk_delete', path='delete', detail=False) class CircuitTerminationBulkDeleteView(generic.BulkDeleteView): queryset = CircuitTermination.objects.all() filterset = filtersets.CircuitTerminationFilterSet @@ -446,6 +476,7 @@ register_model_view(CircuitTermination, 'trace', kwargs={'model': CircuitTermina # Circuit Groups # +@register_model_view(CircuitGroup, 'list', path='', detail=False) class CircuitGroupListView(generic.ObjectListView): queryset = CircuitGroup.objects.annotate( circuit_group_assignment_count=count_related(CircuitGroupAssignment, 'group') @@ -465,6 +496,7 @@ class CircuitGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(CircuitGroup, 'add', detail=False) @register_model_view(CircuitGroup, 'edit') class CircuitGroupEditView(generic.ObjectEditView): queryset = CircuitGroup.objects.all() @@ -476,11 +508,13 @@ class CircuitGroupDeleteView(generic.ObjectDeleteView): queryset = CircuitGroup.objects.all() +@register_model_view(CircuitGroup, 'import', detail=False) class CircuitGroupBulkImportView(generic.BulkImportView): queryset = CircuitGroup.objects.all() model_form = forms.CircuitGroupImportForm +@register_model_view(CircuitGroup, 'bulk_edit', path='edit', detail=False) class CircuitGroupBulkEditView(generic.BulkEditView): queryset = CircuitGroup.objects.all() filterset = filtersets.CircuitGroupFilterSet @@ -488,6 +522,7 @@ class CircuitGroupBulkEditView(generic.BulkEditView): form = forms.CircuitGroupBulkEditForm +@register_model_view(CircuitGroup, 'bulk_delete', path='delete', detail=False) class CircuitGroupBulkDeleteView(generic.BulkDeleteView): queryset = CircuitGroup.objects.all() filterset = filtersets.CircuitGroupFilterSet @@ -498,6 +533,7 @@ class CircuitGroupBulkDeleteView(generic.BulkDeleteView): # Circuit Groups # +@register_model_view(CircuitGroupAssignment, 'list', path='', detail=False) class CircuitGroupAssignmentListView(generic.ObjectListView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet @@ -510,6 +546,7 @@ class CircuitGroupAssignmentView(generic.ObjectView): queryset = CircuitGroupAssignment.objects.all() +@register_model_view(CircuitGroupAssignment, 'add', detail=False) @register_model_view(CircuitGroupAssignment, 'edit') class CircuitGroupAssignmentEditView(generic.ObjectEditView): queryset = CircuitGroupAssignment.objects.all() @@ -521,11 +558,13 @@ class CircuitGroupAssignmentDeleteView(generic.ObjectDeleteView): queryset = CircuitGroupAssignment.objects.all() +@register_model_view(CircuitGroupAssignment, 'import', detail=False) class CircuitGroupAssignmentBulkImportView(generic.BulkImportView): queryset = CircuitGroupAssignment.objects.all() model_form = forms.CircuitGroupAssignmentImportForm +@register_model_view(CircuitGroupAssignment, 'bulk_edit', path='edit', detail=False) class CircuitGroupAssignmentBulkEditView(generic.BulkEditView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet @@ -533,6 +572,7 @@ class CircuitGroupAssignmentBulkEditView(generic.BulkEditView): form = forms.CircuitGroupAssignmentBulkEditForm +@register_model_view(CircuitGroupAssignment, 'bulk_delete', path='delete', detail=False) class CircuitGroupAssignmentBulkDeleteView(generic.BulkDeleteView): queryset = CircuitGroupAssignment.objects.all() filterset = filtersets.CircuitGroupAssignmentFilterSet diff --git a/netbox/core/urls.py b/netbox/core/urls.py index fd6ec8996..5db165a8b 100644 --- a/netbox/core/urls.py +++ b/netbox/core/urls.py @@ -6,27 +6,16 @@ from . import views app_name = 'core' urlpatterns = ( - # Data sources - path('data-sources/', views.DataSourceListView.as_view(), name='datasource_list'), - path('data-sources/add/', views.DataSourceEditView.as_view(), name='datasource_add'), - path('data-sources/import/', views.DataSourceBulkImportView.as_view(), name='datasource_import'), - path('data-sources/edit/', views.DataSourceBulkEditView.as_view(), name='datasource_bulk_edit'), - path('data-sources/delete/', views.DataSourceBulkDeleteView.as_view(), name='datasource_bulk_delete'), + path('data-sources/', include(get_model_urls('core', 'datasource', detail=False))), path('data-sources//', include(get_model_urls('core', 'datasource'))), - # Data files - path('data-files/', views.DataFileListView.as_view(), name='datafile_list'), - path('data-files/delete/', views.DataFileBulkDeleteView.as_view(), name='datafile_bulk_delete'), + path('data-files/', include(get_model_urls('core', 'datafile', detail=False))), path('data-files//', include(get_model_urls('core', 'datafile'))), - # Job results - path('jobs/', views.JobListView.as_view(), name='job_list'), - path('jobs/delete/', views.JobBulkDeleteView.as_view(), name='job_bulk_delete'), - path('jobs//', views.JobView.as_view(), name='job'), - path('jobs//delete/', views.JobDeleteView.as_view(), name='job_delete'), + path('jobs/', include(get_model_urls('core', 'job', detail=False))), + path('jobs//', include(get_model_urls('core', 'job'))), - # Change logging - path('changelog/', views.ObjectChangeListView.as_view(), name='objectchange_list'), + path('changelog/', include(get_model_urls('core', 'objectchange', detail=False))), path('changelog//', include(get_model_urls('core', 'objectchange'))), # Background Tasks @@ -40,17 +29,11 @@ urlpatterns = ( path('background-workers//', views.WorkerListView.as_view(), name='worker_list'), path('background-workers//', views.WorkerView.as_view(), name='worker'), - # Config revisions - path('config-revisions/', views.ConfigRevisionListView.as_view(), name='configrevision_list'), - path('config-revisions/add/', views.ConfigRevisionEditView.as_view(), name='configrevision_add'), - path('config-revisions/delete/', views.ConfigRevisionBulkDeleteView.as_view(), name='configrevision_bulk_delete'), - path('config-revisions//restore/', views.ConfigRevisionRestoreView.as_view(), name='configrevision_restore'), + path('config-revisions/', include(get_model_urls('core', 'configrevision', detail=False))), path('config-revisions//', include(get_model_urls('core', 'configrevision'))), - # System path('system/', views.SystemView.as_view(), name='system'), - # Plugins path('plugins/', views.PluginListView.as_view(), name='plugin_list'), path('plugins//', views.PluginView.as_view(), name='plugin'), ) diff --git a/netbox/core/views.py b/netbox/core/views.py index 3c5319626..96e57f97f 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -46,6 +46,7 @@ from .tables import CatalogPluginTable, PluginVersionTable # Data sources # +@register_model_view(DataSource, 'list', path='', detail=False) class DataSourceListView(generic.ObjectListView): queryset = DataSource.objects.annotate( file_count=count_related(DataFile, 'source') @@ -92,6 +93,7 @@ class DataSourceSyncView(BaseObjectView): return redirect(datasource.get_absolute_url()) +@register_model_view(DataSource, 'add', detail=False) @register_model_view(DataSource, 'edit') class DataSourceEditView(generic.ObjectEditView): queryset = DataSource.objects.all() @@ -103,11 +105,13 @@ class DataSourceDeleteView(generic.ObjectDeleteView): queryset = DataSource.objects.all() +@register_model_view(DataSource, 'import', detail=False) class DataSourceBulkImportView(generic.BulkImportView): queryset = DataSource.objects.all() model_form = forms.DataSourceImportForm +@register_model_view(DataSource, 'bulk_edit', path='edit', detail=False) class DataSourceBulkEditView(generic.BulkEditView): queryset = DataSource.objects.annotate( count_files=count_related(DataFile, 'source') @@ -117,6 +121,7 @@ class DataSourceBulkEditView(generic.BulkEditView): form = forms.DataSourceBulkEditForm +@register_model_view(DataSource, 'bulk_delete', path='delete', detail=False) class DataSourceBulkDeleteView(generic.BulkDeleteView): queryset = DataSource.objects.annotate( count_files=count_related(DataFile, 'source') @@ -129,6 +134,7 @@ class DataSourceBulkDeleteView(generic.BulkDeleteView): # Data files # +@register_model_view(DataFile, 'list', path='', detail=False) class DataFileListView(generic.ObjectListView): queryset = DataFile.objects.defer('data') filterset = filtersets.DataFileFilterSet @@ -149,6 +155,7 @@ class DataFileDeleteView(generic.ObjectDeleteView): queryset = DataFile.objects.all() +@register_model_view(DataFile, 'bulk_delete', path='delete', detail=False) class DataFileBulkDeleteView(generic.BulkDeleteView): queryset = DataFile.objects.defer('data') filterset = filtersets.DataFileFilterSet @@ -159,6 +166,7 @@ class DataFileBulkDeleteView(generic.BulkDeleteView): # Jobs # +@register_model_view(Job, 'list', path='', detail=False) class JobListView(generic.ObjectListView): queryset = Job.objects.all() filterset = filtersets.JobFilterSet @@ -170,14 +178,17 @@ class JobListView(generic.ObjectListView): } +@register_model_view(Job) class JobView(generic.ObjectView): queryset = Job.objects.all() +@register_model_view(Job, 'delete') class JobDeleteView(generic.ObjectDeleteView): queryset = Job.objects.all() +@register_model_view(Job, 'bulk_delete', path='delete', detail=False) class JobBulkDeleteView(generic.BulkDeleteView): queryset = Job.objects.all() filterset = filtersets.JobFilterSet @@ -188,6 +199,7 @@ class JobBulkDeleteView(generic.BulkDeleteView): # Change logging # +@register_model_view(ObjectChange, 'list', path='', detail=False) class ObjectChangeListView(generic.ObjectListView): queryset = ObjectChange.objects.valid_models() filterset = filtersets.ObjectChangeFilterSet @@ -257,6 +269,7 @@ class ObjectChangeView(generic.ObjectView): # Config Revisions # +@register_model_view(ConfigRevision, 'list', path='', detail=False) class ConfigRevisionListView(generic.ObjectListView): queryset = ConfigRevision.objects.all() filterset = filtersets.ConfigRevisionFilterSet @@ -269,6 +282,7 @@ class ConfigRevisionView(generic.ObjectView): queryset = ConfigRevision.objects.all() +@register_model_view(ConfigRevision, 'add', detail=False) class ConfigRevisionEditView(generic.ObjectEditView): queryset = ConfigRevision.objects.all() form = forms.ConfigRevisionForm @@ -279,12 +293,14 @@ class ConfigRevisionDeleteView(generic.ObjectDeleteView): queryset = ConfigRevision.objects.all() +@register_model_view(ConfigRevision, 'bulk_delete', path='delete', detail=False) class ConfigRevisionBulkDeleteView(generic.BulkDeleteView): queryset = ConfigRevision.objects.all() filterset = filtersets.ConfigRevisionFilterSet table = tables.ConfigRevisionTable +@register_model_view(ConfigRevision, 'restore') class ConfigRevisionRestoreView(ContentTypePermissionRequiredMixin, View): def get_required_permission(self): diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 1a6a2f77d..bcfd32707 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -6,335 +6,144 @@ from . import views app_name = 'dcim' urlpatterns = [ - # Regions - path('regions/', views.RegionListView.as_view(), name='region_list'), - path('regions/add/', views.RegionEditView.as_view(), name='region_add'), - path('regions/import/', views.RegionBulkImportView.as_view(), name='region_import'), - path('regions/edit/', views.RegionBulkEditView.as_view(), name='region_bulk_edit'), - path('regions/delete/', views.RegionBulkDeleteView.as_view(), name='region_bulk_delete'), + path('regions/', include(get_model_urls('dcim', 'region', detail=False))), path('regions//', include(get_model_urls('dcim', 'region'))), - # Site groups - path('site-groups/', views.SiteGroupListView.as_view(), name='sitegroup_list'), - path('site-groups/add/', views.SiteGroupEditView.as_view(), name='sitegroup_add'), - path('site-groups/import/', views.SiteGroupBulkImportView.as_view(), name='sitegroup_import'), - path('site-groups/edit/', views.SiteGroupBulkEditView.as_view(), name='sitegroup_bulk_edit'), - path('site-groups/delete/', views.SiteGroupBulkDeleteView.as_view(), name='sitegroup_bulk_delete'), + path('site-groups/', include(get_model_urls('dcim', 'sitegroup', detail=False))), path('site-groups//', include(get_model_urls('dcim', 'sitegroup'))), - # Sites - path('sites/', views.SiteListView.as_view(), name='site_list'), - path('sites/add/', views.SiteEditView.as_view(), name='site_add'), - path('sites/import/', views.SiteBulkImportView.as_view(), name='site_import'), - path('sites/edit/', views.SiteBulkEditView.as_view(), name='site_bulk_edit'), - path('sites/delete/', views.SiteBulkDeleteView.as_view(), name='site_bulk_delete'), + path('sites/', include(get_model_urls('dcim', 'site', detail=False))), path('sites//', include(get_model_urls('dcim', 'site'))), - # Locations - path('locations/', views.LocationListView.as_view(), name='location_list'), - path('locations/add/', views.LocationEditView.as_view(), name='location_add'), - path('locations/import/', views.LocationBulkImportView.as_view(), name='location_import'), - path('locations/edit/', views.LocationBulkEditView.as_view(), name='location_bulk_edit'), - path('locations/delete/', views.LocationBulkDeleteView.as_view(), name='location_bulk_delete'), + path('locations/', include(get_model_urls('dcim', 'location', detail=False))), path('locations//', include(get_model_urls('dcim', 'location'))), - # Rack roles - path('rack-roles/', views.RackRoleListView.as_view(), name='rackrole_list'), - path('rack-roles/add/', views.RackRoleEditView.as_view(), name='rackrole_add'), - path('rack-roles/import/', views.RackRoleBulkImportView.as_view(), name='rackrole_import'), - path('rack-roles/edit/', views.RackRoleBulkEditView.as_view(), name='rackrole_bulk_edit'), - path('rack-roles/delete/', views.RackRoleBulkDeleteView.as_view(), name='rackrole_bulk_delete'), + path('rack-roles/', include(get_model_urls('dcim', 'rackrole', detail=False))), path('rack-roles//', include(get_model_urls('dcim', 'rackrole'))), - # Rack reservations - path('rack-reservations/', views.RackReservationListView.as_view(), name='rackreservation_list'), - path('rack-reservations/add/', views.RackReservationEditView.as_view(), name='rackreservation_add'), - path('rack-reservations/import/', views.RackReservationImportView.as_view(), name='rackreservation_import'), - path('rack-reservations/edit/', views.RackReservationBulkEditView.as_view(), name='rackreservation_bulk_edit'), - path('rack-reservations/delete/', views.RackReservationBulkDeleteView.as_view(), name='rackreservation_bulk_delete'), + path('rack-reservations/', include(get_model_urls('dcim', 'rackreservation', detail=False))), path('rack-reservations//', include(get_model_urls('dcim', 'rackreservation'))), - # Racks - path('racks/', views.RackListView.as_view(), name='rack_list'), - path('rack-elevations/', views.RackElevationListView.as_view(), name='rack_elevation_list'), - path('racks/add/', views.RackEditView.as_view(), name='rack_add'), - path('racks/import/', views.RackBulkImportView.as_view(), name='rack_import'), - path('racks/edit/', views.RackBulkEditView.as_view(), name='rack_bulk_edit'), - path('racks/delete/', views.RackBulkDeleteView.as_view(), name='rack_bulk_delete'), + path('racks/', include(get_model_urls('dcim', 'rack', detail=False))), path('racks//', include(get_model_urls('dcim', 'rack'))), + path('rack-elevations/', views.RackElevationListView.as_view(), name='rack_elevation_list'), - # Rack Types - path('rack-types/', views.RackTypeListView.as_view(), name='racktype_list'), - path('rack-types/add/', views.RackTypeEditView.as_view(), name='racktype_add'), - path('rack-types/import/', views.RackTypeBulkImportView.as_view(), name='racktype_import'), - path('rack-types/edit/', views.RackTypeBulkEditView.as_view(), name='racktype_bulk_edit'), - path('rack-types/delete/', views.RackTypeBulkDeleteView.as_view(), name='racktype_bulk_delete'), + path('rack-types/', include(get_model_urls('dcim', 'racktype', detail=False))), path('rack-types//', include(get_model_urls('dcim', 'racktype'))), - # Manufacturers - path('manufacturers/', views.ManufacturerListView.as_view(), name='manufacturer_list'), - path('manufacturers/add/', views.ManufacturerEditView.as_view(), name='manufacturer_add'), - path('manufacturers/import/', views.ManufacturerBulkImportView.as_view(), name='manufacturer_import'), - path('manufacturers/edit/', views.ManufacturerBulkEditView.as_view(), name='manufacturer_bulk_edit'), - path('manufacturers/delete/', views.ManufacturerBulkDeleteView.as_view(), name='manufacturer_bulk_delete'), + path('manufacturers/', include(get_model_urls('dcim', 'manufacturer', detail=False))), path('manufacturers//', include(get_model_urls('dcim', 'manufacturer'))), - # Device types - path('device-types/', views.DeviceTypeListView.as_view(), name='devicetype_list'), - path('device-types/add/', views.DeviceTypeEditView.as_view(), name='devicetype_add'), - path('device-types/import/', views.DeviceTypeImportView.as_view(), name='devicetype_import'), - path('device-types/edit/', views.DeviceTypeBulkEditView.as_view(), name='devicetype_bulk_edit'), - path('device-types/delete/', views.DeviceTypeBulkDeleteView.as_view(), name='devicetype_bulk_delete'), + path('device-types/', include(get_model_urls('dcim', 'devicetype', detail=False))), path('device-types//', include(get_model_urls('dcim', 'devicetype'))), - # Module types - path('module-types/', views.ModuleTypeListView.as_view(), name='moduletype_list'), - path('module-types/add/', views.ModuleTypeEditView.as_view(), name='moduletype_add'), - path('module-types/import/', views.ModuleTypeImportView.as_view(), name='moduletype_import'), - path('module-types/edit/', views.ModuleTypeBulkEditView.as_view(), name='moduletype_bulk_edit'), - path('module-types/delete/', views.ModuleTypeBulkDeleteView.as_view(), name='moduletype_bulk_delete'), + path('module-types/', include(get_model_urls('dcim', 'moduletype', detail=False))), path('module-types//', include(get_model_urls('dcim', 'moduletype'))), - # Console port templates - path('console-port-templates/add/', views.ConsolePortTemplateCreateView.as_view(), name='consoleporttemplate_add'), - path('console-port-templates/edit/', views.ConsolePortTemplateBulkEditView.as_view(), name='consoleporttemplate_bulk_edit'), - path('console-port-templates/rename/', views.ConsolePortTemplateBulkRenameView.as_view(), name='consoleporttemplate_bulk_rename'), - path('console-port-templates/delete/', views.ConsolePortTemplateBulkDeleteView.as_view(), name='consoleporttemplate_bulk_delete'), + path('console-port-templates/', include(get_model_urls('dcim', 'consoleporttemplate', detail=False))), path('console-port-templates//', include(get_model_urls('dcim', 'consoleporttemplate'))), - # Console server port templates - path('console-server-port-templates/add/', views.ConsoleServerPortTemplateCreateView.as_view(), name='consoleserverporttemplate_add'), - path('console-server-port-templates/edit/', views.ConsoleServerPortTemplateBulkEditView.as_view(), name='consoleserverporttemplate_bulk_edit'), - path('console-server-port-templates/rename/', views.ConsoleServerPortTemplateBulkRenameView.as_view(), name='consoleserverporttemplate_bulk_rename'), - path('console-server-port-templates/delete/', views.ConsoleServerPortTemplateBulkDeleteView.as_view(), name='consoleserverporttemplate_bulk_delete'), + path('console-server-port-templates/', include(get_model_urls('dcim', 'consoleserverporttemplate', detail=False))), path('console-server-port-templates//', include(get_model_urls('dcim', 'consoleserverporttemplate'))), - # Power port templates - path('power-port-templates/add/', views.PowerPortTemplateCreateView.as_view(), name='powerporttemplate_add'), - path('power-port-templates/edit/', views.PowerPortTemplateBulkEditView.as_view(), name='powerporttemplate_bulk_edit'), - path('power-port-templates/rename/', views.PowerPortTemplateBulkRenameView.as_view(), name='powerporttemplate_bulk_rename'), - path('power-port-templates/delete/', views.PowerPortTemplateBulkDeleteView.as_view(), name='powerporttemplate_bulk_delete'), + path('power-port-templates/', include(get_model_urls('dcim', 'powerporttemplate', detail=False))), path('power-port-templates//', include(get_model_urls('dcim', 'powerporttemplate'))), - # Power outlet templates - path('power-outlet-templates/add/', views.PowerOutletTemplateCreateView.as_view(), name='poweroutlettemplate_add'), - path('power-outlet-templates/edit/', views.PowerOutletTemplateBulkEditView.as_view(), name='poweroutlettemplate_bulk_edit'), - path('power-outlet-templates/rename/', views.PowerOutletTemplateBulkRenameView.as_view(), name='poweroutlettemplate_bulk_rename'), - path('power-outlet-templates/delete/', views.PowerOutletTemplateBulkDeleteView.as_view(), name='poweroutlettemplate_bulk_delete'), + path('power-outlet-templates/', include(get_model_urls('dcim', 'poweroutlettemplate', detail=False))), path('power-outlet-templates//', include(get_model_urls('dcim', 'poweroutlettemplate'))), - # Interface templates - path('interface-templates/add/', views.InterfaceTemplateCreateView.as_view(), name='interfacetemplate_add'), - path('interface-templates/edit/', views.InterfaceTemplateBulkEditView.as_view(), name='interfacetemplate_bulk_edit'), - path('interface-templates/rename/', views.InterfaceTemplateBulkRenameView.as_view(), name='interfacetemplate_bulk_rename'), - path('interface-templates/delete/', views.InterfaceTemplateBulkDeleteView.as_view(), name='interfacetemplate_bulk_delete'), + path('interface-templates/', include(get_model_urls('dcim', 'interfacetemplate', detail=False))), path('interface-templates//', include(get_model_urls('dcim', 'interfacetemplate'))), - # Front port templates - path('front-port-templates/add/', views.FrontPortTemplateCreateView.as_view(), name='frontporttemplate_add'), - path('front-port-templates/edit/', views.FrontPortTemplateBulkEditView.as_view(), name='frontporttemplate_bulk_edit'), - path('front-port-templates/rename/', views.FrontPortTemplateBulkRenameView.as_view(), name='frontporttemplate_bulk_rename'), - path('front-port-templates/delete/', views.FrontPortTemplateBulkDeleteView.as_view(), name='frontporttemplate_bulk_delete'), + path('front-port-templates/', include(get_model_urls('dcim', 'frontporttemplate', detail=False))), path('front-port-templates//', include(get_model_urls('dcim', 'frontporttemplate'))), - # Rear port templates - path('rear-port-templates/add/', views.RearPortTemplateCreateView.as_view(), name='rearporttemplate_add'), - path('rear-port-templates/edit/', views.RearPortTemplateBulkEditView.as_view(), name='rearporttemplate_bulk_edit'), - path('rear-port-templates/rename/', views.RearPortTemplateBulkRenameView.as_view(), name='rearporttemplate_bulk_rename'), - path('rear-port-templates/delete/', views.RearPortTemplateBulkDeleteView.as_view(), name='rearporttemplate_bulk_delete'), + path('rear-port-templates/', include(get_model_urls('dcim', 'rearporttemplate', detail=False))), path('rear-port-templates//', include(get_model_urls('dcim', 'rearporttemplate'))), - # Device bay templates - path('device-bay-templates/add/', views.DeviceBayTemplateCreateView.as_view(), name='devicebaytemplate_add'), - path('device-bay-templates/edit/', views.DeviceBayTemplateBulkEditView.as_view(), name='devicebaytemplate_bulk_edit'), - path('device-bay-templates/rename/', views.DeviceBayTemplateBulkRenameView.as_view(), name='devicebaytemplate_bulk_rename'), - path('device-bay-templates/delete/', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicebaytemplate_bulk_delete'), + path('device-bay-templates/', include(get_model_urls('dcim', 'devicebaytemplate', detail=False))), path('device-bay-templates//', include(get_model_urls('dcim', 'devicebaytemplate'))), - # Module bay templates - path('module-bay-templates/add/', views.ModuleBayTemplateCreateView.as_view(), name='modulebaytemplate_add'), - path('module-bay-templates/edit/', views.ModuleBayTemplateBulkEditView.as_view(), name='modulebaytemplate_bulk_edit'), - path('module-bay-templates/rename/', views.ModuleBayTemplateBulkRenameView.as_view(), name='modulebaytemplate_bulk_rename'), - path('module-bay-templates/delete/', views.ModuleBayTemplateBulkDeleteView.as_view(), name='modulebaytemplate_bulk_delete'), + path('module-bay-templates/', include(get_model_urls('dcim', 'modulebaytemplate', detail=False))), path('module-bay-templates//', include(get_model_urls('dcim', 'modulebaytemplate'))), - # Inventory item templates - path('inventory-item-templates/add/', views.InventoryItemTemplateCreateView.as_view(), name='inventoryitemtemplate_add'), - path('inventory-item-templates/edit/', views.InventoryItemTemplateBulkEditView.as_view(), name='inventoryitemtemplate_bulk_edit'), - path('inventory-item-templates/rename/', views.InventoryItemTemplateBulkRenameView.as_view(), name='inventoryitemtemplate_bulk_rename'), - path('inventory-item-templates/delete/', views.InventoryItemTemplateBulkDeleteView.as_view(), name='inventoryitemtemplate_bulk_delete'), + path('inventory-item-templates/', include(get_model_urls('dcim', 'inventoryitemtemplate', detail=False))), path('inventory-item-templates//', include(get_model_urls('dcim', 'inventoryitemtemplate'))), - # Device roles - path('device-roles/', views.DeviceRoleListView.as_view(), name='devicerole_list'), - path('device-roles/add/', views.DeviceRoleEditView.as_view(), name='devicerole_add'), - path('device-roles/import/', views.DeviceRoleBulkImportView.as_view(), name='devicerole_import'), - path('device-roles/edit/', views.DeviceRoleBulkEditView.as_view(), name='devicerole_bulk_edit'), - path('device-roles/delete/', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'), + path('device-roles/', include(get_model_urls('dcim', 'devicerole', detail=False))), path('device-roles//', include(get_model_urls('dcim', 'devicerole'))), - # Platforms - path('platforms/', views.PlatformListView.as_view(), name='platform_list'), - path('platforms/add/', views.PlatformEditView.as_view(), name='platform_add'), - path('platforms/import/', views.PlatformBulkImportView.as_view(), name='platform_import'), - path('platforms/edit/', views.PlatformBulkEditView.as_view(), name='platform_bulk_edit'), - path('platforms/delete/', views.PlatformBulkDeleteView.as_view(), name='platform_bulk_delete'), + path('platforms/', include(get_model_urls('dcim', 'platform', detail=False))), path('platforms//', include(get_model_urls('dcim', 'platform'))), - # Devices - path('devices/', views.DeviceListView.as_view(), name='device_list'), - path('devices/add/', views.DeviceEditView.as_view(), name='device_add'), - path('devices/import/', views.DeviceBulkImportView.as_view(), name='device_import'), - path('devices/edit/', views.DeviceBulkEditView.as_view(), name='device_bulk_edit'), - path('devices/rename/', views.DeviceBulkRenameView.as_view(), name='device_bulk_rename'), - path('devices/delete/', views.DeviceBulkDeleteView.as_view(), name='device_bulk_delete'), + path('devices/', include(get_model_urls('dcim', 'device', detail=False))), path('devices//', include(get_model_urls('dcim', 'device'))), - # Virtual Device Context - path('virtual-device-contexts/', views.VirtualDeviceContextListView.as_view(), name='virtualdevicecontext_list'), - path('virtual-device-contexts/add/', views.VirtualDeviceContextEditView.as_view(), name='virtualdevicecontext_add'), - path('virtual-device-contexts/import/', views.VirtualDeviceContextBulkImportView.as_view(), name='virtualdevicecontext_import'), - path('virtual-device-contexts/edit/', views.VirtualDeviceContextBulkEditView.as_view(), name='virtualdevicecontext_bulk_edit'), - path('virtual-device-contexts/delete/', views.VirtualDeviceContextBulkDeleteView.as_view(), name='virtualdevicecontext_bulk_delete'), + path('virtual-device-contexts/', include(get_model_urls('dcim', 'virtualdevicecontext', detail=False))), path('virtual-device-contexts//', include(get_model_urls('dcim', 'virtualdevicecontext'))), - # Modules - path('modules/', views.ModuleListView.as_view(), name='module_list'), - path('modules/add/', views.ModuleEditView.as_view(), name='module_add'), - path('modules/import/', views.ModuleBulkImportView.as_view(), name='module_import'), - path('modules/edit/', views.ModuleBulkEditView.as_view(), name='module_bulk_edit'), - path('modules/delete/', views.ModuleBulkDeleteView.as_view(), name='module_bulk_delete'), + path('modules/', include(get_model_urls('dcim', 'module', detail=False))), path('modules//', include(get_model_urls('dcim', 'module'))), - # Console ports - path('console-ports/', views.ConsolePortListView.as_view(), name='consoleport_list'), - path('console-ports/add/', views.ConsolePortCreateView.as_view(), name='consoleport_add'), - path('console-ports/import/', views.ConsolePortBulkImportView.as_view(), name='consoleport_import'), - path('console-ports/edit/', views.ConsolePortBulkEditView.as_view(), name='consoleport_bulk_edit'), - path('console-ports/rename/', views.ConsolePortBulkRenameView.as_view(), name='consoleport_bulk_rename'), - path('console-ports/disconnect/', views.ConsolePortBulkDisconnectView.as_view(), name='consoleport_bulk_disconnect'), - path('console-ports/delete/', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), + path('console-ports/', include(get_model_urls('dcim', 'consoleport', detail=False))), path('console-ports//', include(get_model_urls('dcim', 'consoleport'))), - path('devices/console-ports/add/', views.DeviceBulkAddConsolePortView.as_view(), name='device_bulk_add_consoleport'), + path( + 'devices/console-ports/add/', + views.DeviceBulkAddConsolePortView.as_view(), + name='device_bulk_add_consoleport' + ), - # Console server ports - path('console-server-ports/', views.ConsoleServerPortListView.as_view(), name='consoleserverport_list'), - path('console-server-ports/add/', views.ConsoleServerPortCreateView.as_view(), name='consoleserverport_add'), - path('console-server-ports/import/', views.ConsoleServerPortBulkImportView.as_view(), name='consoleserverport_import'), - path('console-server-ports/edit/', views.ConsoleServerPortBulkEditView.as_view(), name='consoleserverport_bulk_edit'), - path('console-server-ports/rename/', views.ConsoleServerPortBulkRenameView.as_view(), name='consoleserverport_bulk_rename'), - path('console-server-ports/disconnect/', views.ConsoleServerPortBulkDisconnectView.as_view(), name='consoleserverport_bulk_disconnect'), - path('console-server-ports/delete/', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), + path('console-server-ports/', include(get_model_urls('dcim', 'consoleserverport', detail=False))), path('console-server-ports//', include(get_model_urls('dcim', 'consoleserverport'))), - path('devices/console-server-ports/add/', views.DeviceBulkAddConsoleServerPortView.as_view(), name='device_bulk_add_consoleserverport'), + path( + 'devices/console-server-ports/add/', + views.DeviceBulkAddConsoleServerPortView.as_view(), + name='device_bulk_add_consoleserverport' + ), - # Power ports - path('power-ports/', views.PowerPortListView.as_view(), name='powerport_list'), - path('power-ports/add/', views.PowerPortCreateView.as_view(), name='powerport_add'), - path('power-ports/import/', views.PowerPortBulkImportView.as_view(), name='powerport_import'), - path('power-ports/edit/', views.PowerPortBulkEditView.as_view(), name='powerport_bulk_edit'), - path('power-ports/rename/', views.PowerPortBulkRenameView.as_view(), name='powerport_bulk_rename'), - path('power-ports/disconnect/', views.PowerPortBulkDisconnectView.as_view(), name='powerport_bulk_disconnect'), - path('power-ports/delete/', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), + path('power-ports/', include(get_model_urls('dcim', 'powerport', detail=False))), path('power-ports//', include(get_model_urls('dcim', 'powerport'))), path('devices/power-ports/add/', views.DeviceBulkAddPowerPortView.as_view(), name='device_bulk_add_powerport'), - # Power outlets - path('power-outlets/', views.PowerOutletListView.as_view(), name='poweroutlet_list'), - path('power-outlets/add/', views.PowerOutletCreateView.as_view(), name='poweroutlet_add'), - path('power-outlets/import/', views.PowerOutletBulkImportView.as_view(), name='poweroutlet_import'), - path('power-outlets/edit/', views.PowerOutletBulkEditView.as_view(), name='poweroutlet_bulk_edit'), - path('power-outlets/rename/', views.PowerOutletBulkRenameView.as_view(), name='poweroutlet_bulk_rename'), - path('power-outlets/disconnect/', views.PowerOutletBulkDisconnectView.as_view(), name='poweroutlet_bulk_disconnect'), - path('power-outlets/delete/', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), + path('power-outlets/', include(get_model_urls('dcim', 'poweroutlet', detail=False))), path('power-outlets//', include(get_model_urls('dcim', 'poweroutlet'))), - path('devices/power-outlets/add/', views.DeviceBulkAddPowerOutletView.as_view(), name='device_bulk_add_poweroutlet'), + path( + 'devices/power-outlets/add/', + views.DeviceBulkAddPowerOutletView.as_view(), + name='device_bulk_add_poweroutlet' + ), - # MAC addresses - path('mac-addresses/', views.MACAddressListView.as_view(), name='macaddress_list'), - path('mac-addresses/add/', views.MACAddressEditView.as_view(), name='macaddress_add'), - path('mac-addresses/import/', views.MACAddressBulkImportView.as_view(), name='macaddress_import'), - path('mac-addresses/edit/', views.MACAddressBulkEditView.as_view(), name='macaddress_bulk_edit'), - path('mac-addresses/delete/', views.MACAddressBulkDeleteView.as_view(), name='macaddress_bulk_delete'), - path('mac-addresses//', include(get_model_urls('dcim', 'macaddress'))), - - # Interfaces - path('interfaces/', views.InterfaceListView.as_view(), name='interface_list'), - path('interfaces/add/', views.InterfaceCreateView.as_view(), name='interface_add'), - path('interfaces/import/', views.InterfaceBulkImportView.as_view(), name='interface_import'), - path('interfaces/edit/', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), - path('interfaces/rename/', views.InterfaceBulkRenameView.as_view(), name='interface_bulk_rename'), - path('interfaces/disconnect/', views.InterfaceBulkDisconnectView.as_view(), name='interface_bulk_disconnect'), - path('interfaces/delete/', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), + path('interfaces/', include(get_model_urls('dcim', 'interface', detail=False))), path('interfaces//', include(get_model_urls('dcim', 'interface'))), path('devices/interfaces/add/', views.DeviceBulkAddInterfaceView.as_view(), name='device_bulk_add_interface'), - # Front ports - path('front-ports/', views.FrontPortListView.as_view(), name='frontport_list'), - path('front-ports/add/', views.FrontPortCreateView.as_view(), name='frontport_add'), - path('front-ports/import/', views.FrontPortBulkImportView.as_view(), name='frontport_import'), - path('front-ports/edit/', views.FrontPortBulkEditView.as_view(), name='frontport_bulk_edit'), - path('front-ports/rename/', views.FrontPortBulkRenameView.as_view(), name='frontport_bulk_rename'), - path('front-ports/disconnect/', views.FrontPortBulkDisconnectView.as_view(), name='frontport_bulk_disconnect'), - path('front-ports/delete/', views.FrontPortBulkDeleteView.as_view(), name='frontport_bulk_delete'), + path('front-ports/', include(get_model_urls('dcim', 'frontport', detail=False))), path('front-ports//', include(get_model_urls('dcim', 'frontport'))), - # path('devices/front-ports/add/', views.DeviceBulkAddFrontPortView.as_view(), name='device_bulk_add_frontport'), - # Rear ports - path('rear-ports/', views.RearPortListView.as_view(), name='rearport_list'), - path('rear-ports/add/', views.RearPortCreateView.as_view(), name='rearport_add'), - path('rear-ports/import/', views.RearPortBulkImportView.as_view(), name='rearport_import'), - path('rear-ports/edit/', views.RearPortBulkEditView.as_view(), name='rearport_bulk_edit'), - path('rear-ports/rename/', views.RearPortBulkRenameView.as_view(), name='rearport_bulk_rename'), - path('rear-ports/disconnect/', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), - path('rear-ports/delete/', views.RearPortBulkDeleteView.as_view(), name='rearport_bulk_delete'), + path('rear-ports/', include(get_model_urls('dcim', 'rearport', detail=False))), path('rear-ports//', include(get_model_urls('dcim', 'rearport'))), path('devices/rear-ports/add/', views.DeviceBulkAddRearPortView.as_view(), name='device_bulk_add_rearport'), - # Module bays - path('module-bays/', views.ModuleBayListView.as_view(), name='modulebay_list'), - path('module-bays/add/', views.ModuleBayCreateView.as_view(), name='modulebay_add'), - path('module-bays/import/', views.ModuleBayBulkImportView.as_view(), name='modulebay_import'), - path('module-bays/edit/', views.ModuleBayBulkEditView.as_view(), name='modulebay_bulk_edit'), - path('module-bays/rename/', views.ModuleBayBulkRenameView.as_view(), name='modulebay_bulk_rename'), - path('module-bays/delete/', views.ModuleBayBulkDeleteView.as_view(), name='modulebay_bulk_delete'), + path('module-bays/', include(get_model_urls('dcim', 'modulebay', detail=False))), path('module-bays//', include(get_model_urls('dcim', 'modulebay'))), path('devices/module-bays/add/', views.DeviceBulkAddModuleBayView.as_view(), name='device_bulk_add_modulebay'), - # Device bays - path('device-bays/', views.DeviceBayListView.as_view(), name='devicebay_list'), - path('device-bays/add/', views.DeviceBayCreateView.as_view(), name='devicebay_add'), - path('device-bays/import/', views.DeviceBayBulkImportView.as_view(), name='devicebay_import'), - path('device-bays/edit/', views.DeviceBayBulkEditView.as_view(), name='devicebay_bulk_edit'), - path('device-bays/rename/', views.DeviceBayBulkRenameView.as_view(), name='devicebay_bulk_rename'), - path('device-bays/delete/', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'), + path('device-bays/', include(get_model_urls('dcim', 'devicebay', detail=False))), path('device-bays//', include(get_model_urls('dcim', 'devicebay'))), path('devices/device-bays/add/', views.DeviceBulkAddDeviceBayView.as_view(), name='device_bulk_add_devicebay'), - # Inventory items - path('inventory-items/', views.InventoryItemListView.as_view(), name='inventoryitem_list'), - path('inventory-items/add/', views.InventoryItemCreateView.as_view(), name='inventoryitem_add'), - path('inventory-items/import/', views.InventoryItemBulkImportView.as_view(), name='inventoryitem_import'), - path('inventory-items/edit/', views.InventoryItemBulkEditView.as_view(), name='inventoryitem_bulk_edit'), - path('inventory-items/rename/', views.InventoryItemBulkRenameView.as_view(), name='inventoryitem_bulk_rename'), - path('inventory-items/delete/', views.InventoryItemBulkDeleteView.as_view(), name='inventoryitem_bulk_delete'), + path('inventory-items/', include(get_model_urls('dcim', 'inventoryitem', detail=False))), path('inventory-items//', include(get_model_urls('dcim', 'inventoryitem'))), - path('devices/inventory-items/add/', views.DeviceBulkAddInventoryItemView.as_view(), name='device_bulk_add_inventoryitem'), + path( + 'devices/inventory-items/add/', + views.DeviceBulkAddInventoryItemView.as_view(), + name='device_bulk_add_inventoryitem' + ), - # Inventory item roles - path('inventory-item-roles/', views.InventoryItemRoleListView.as_view(), name='inventoryitemrole_list'), - path('inventory-item-roles/add/', views.InventoryItemRoleEditView.as_view(), name='inventoryitemrole_add'), - path('inventory-item-roles/import/', views.InventoryItemRoleBulkImportView.as_view(), name='inventoryitemrole_import'), - path('inventory-item-roles/edit/', views.InventoryItemRoleBulkEditView.as_view(), name='inventoryitemrole_bulk_edit'), - path('inventory-item-roles/delete/', views.InventoryItemRoleBulkDeleteView.as_view(), name='inventoryitemrole_bulk_delete'), + path('inventory-item-roles/', include(get_model_urls('dcim', 'inventoryitemrole', detail=False))), path('inventory-item-roles//', include(get_model_urls('dcim', 'inventoryitemrole'))), - # Cables - path('cables/', views.CableListView.as_view(), name='cable_list'), - path('cables/add/', views.CableEditView.as_view(), name='cable_add'), - path('cables/import/', views.CableBulkImportView.as_view(), name='cable_import'), - path('cables/edit/', views.CableBulkEditView.as_view(), name='cable_bulk_edit'), - path('cables/delete/', views.CableBulkDeleteView.as_view(), name='cable_bulk_delete'), + path('cables/', include(get_model_urls('dcim', 'cable', detail=False))), path('cables//', include(get_model_urls('dcim', 'cable'))), # Console/power/interface connections (read-only) @@ -342,30 +151,21 @@ urlpatterns = [ path('power-connections/', views.PowerConnectionsListView.as_view(), name='power_connections_list'), path('interface-connections/', views.InterfaceConnectionsListView.as_view(), name='interface_connections_list'), - # Virtual chassis - path('virtual-chassis/', views.VirtualChassisListView.as_view(), name='virtualchassis_list'), - path('virtual-chassis/add/', views.VirtualChassisCreateView.as_view(), name='virtualchassis_add'), - path('virtual-chassis/import/', views.VirtualChassisBulkImportView.as_view(), name='virtualchassis_import'), - path('virtual-chassis/edit/', views.VirtualChassisBulkEditView.as_view(), name='virtualchassis_bulk_edit'), - path('virtual-chassis/delete/', views.VirtualChassisBulkDeleteView.as_view(), name='virtualchassis_bulk_delete'), + path('virtual-chassis/', include(get_model_urls('dcim', 'virtualchassis', detail=False))), path('virtual-chassis//', include(get_model_urls('dcim', 'virtualchassis'))), - path('virtual-chassis-members//delete/', views.VirtualChassisRemoveMemberView.as_view(), name='virtualchassis_remove_member'), + path( + 'virtual-chassis-members//delete/', + views.VirtualChassisRemoveMemberView.as_view(), + name='virtualchassis_remove_member' + ), - # Power panels - path('power-panels/', views.PowerPanelListView.as_view(), name='powerpanel_list'), - path('power-panels/add/', views.PowerPanelEditView.as_view(), name='powerpanel_add'), - path('power-panels/import/', views.PowerPanelBulkImportView.as_view(), name='powerpanel_import'), - path('power-panels/edit/', views.PowerPanelBulkEditView.as_view(), name='powerpanel_bulk_edit'), - path('power-panels/delete/', views.PowerPanelBulkDeleteView.as_view(), name='powerpanel_bulk_delete'), + path('power-panels/', include(get_model_urls('dcim', 'powerpanel', detail=False))), path('power-panels//', include(get_model_urls('dcim', 'powerpanel'))), - # Power feeds - path('power-feeds/', views.PowerFeedListView.as_view(), name='powerfeed_list'), - path('power-feeds/add/', views.PowerFeedEditView.as_view(), name='powerfeed_add'), - path('power-feeds/import/', views.PowerFeedBulkImportView.as_view(), name='powerfeed_import'), - path('power-feeds/edit/', views.PowerFeedBulkEditView.as_view(), name='powerfeed_bulk_edit'), - path('power-feeds/disconnect/', views.PowerFeedBulkDisconnectView.as_view(), name='powerfeed_bulk_disconnect'), - path('power-feeds/delete/', views.PowerFeedBulkDeleteView.as_view(), name='powerfeed_bulk_delete'), + path('power-feeds/', include(get_model_urls('dcim', 'powerfeed', detail=False))), path('power-feeds//', include(get_model_urls('dcim', 'powerfeed'))), + path('mac-addresses/', include(get_model_urls('dcim', 'macaddress', detail=False))), + path('mac-addresses//', include(get_model_urls('dcim', 'macaddress'))), + ] diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 4bd0ea877..fa9fb667f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -215,6 +215,7 @@ class PathTraceView(generic.ObjectView): # Regions # +@register_model_view(Region, 'list', path='', detail=False) class RegionListView(generic.ObjectListView): queryset = Region.objects.add_related_count( Region.objects.all(), @@ -251,6 +252,7 @@ class RegionView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Region, 'add', detail=False) @register_model_view(Region, 'edit') class RegionEditView(generic.ObjectEditView): queryset = Region.objects.all() @@ -262,11 +264,13 @@ class RegionDeleteView(generic.ObjectDeleteView): queryset = Region.objects.all() +@register_model_view(Region, 'import', detail=False) class RegionBulkImportView(generic.BulkImportView): queryset = Region.objects.all() model_form = forms.RegionImportForm +@register_model_view(Region, 'bulk_edit', path='edit', detail=False) class RegionBulkEditView(generic.BulkEditView): queryset = Region.objects.add_related_count( Region.objects.all(), @@ -280,6 +284,7 @@ class RegionBulkEditView(generic.BulkEditView): form = forms.RegionBulkEditForm +@register_model_view(Region, 'bulk_delete', path='delete', detail=False) class RegionBulkDeleteView(generic.BulkDeleteView): queryset = Region.objects.add_related_count( Region.objects.all(), @@ -301,6 +306,7 @@ class RegionContactsView(ObjectContactsView): # Site groups # +@register_model_view(SiteGroup, 'list', path='', detail=False) class SiteGroupListView(generic.ObjectListView): queryset = SiteGroup.objects.add_related_count( SiteGroup.objects.all(), @@ -337,6 +343,7 @@ class SiteGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(SiteGroup, 'add', detail=False) @register_model_view(SiteGroup, 'edit') class SiteGroupEditView(generic.ObjectEditView): queryset = SiteGroup.objects.all() @@ -348,11 +355,13 @@ class SiteGroupDeleteView(generic.ObjectDeleteView): queryset = SiteGroup.objects.all() +@register_model_view(SiteGroup, 'import', detail=False) class SiteGroupBulkImportView(generic.BulkImportView): queryset = SiteGroup.objects.all() model_form = forms.SiteGroupImportForm +@register_model_view(SiteGroup, 'bulk_edit', path='edit', detail=False) class SiteGroupBulkEditView(generic.BulkEditView): queryset = SiteGroup.objects.add_related_count( SiteGroup.objects.all(), @@ -366,6 +375,7 @@ class SiteGroupBulkEditView(generic.BulkEditView): form = forms.SiteGroupBulkEditForm +@register_model_view(SiteGroup, 'bulk_delete', path='delete', detail=False) class SiteGroupBulkDeleteView(generic.BulkDeleteView): queryset = SiteGroup.objects.add_related_count( SiteGroup.objects.all(), @@ -387,6 +397,7 @@ class SiteGroupContactsView(ObjectContactsView): # Sites # +@register_model_view(Site, 'list', path='', detail=False) class SiteListView(generic.ObjectListView): queryset = Site.objects.annotate( device_count=count_related(Device, 'site') @@ -421,6 +432,7 @@ class SiteView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Site, 'add', detail=False) @register_model_view(Site, 'edit') class SiteEditView(generic.ObjectEditView): queryset = Site.objects.all() @@ -432,11 +444,13 @@ class SiteDeleteView(generic.ObjectDeleteView): queryset = Site.objects.all() +@register_model_view(Site, 'import', detail=False) class SiteBulkImportView(generic.BulkImportView): queryset = Site.objects.all() model_form = forms.SiteImportForm +@register_model_view(Site, 'bulk_edit', path='edit', detail=False) class SiteBulkEditView(generic.BulkEditView): queryset = Site.objects.all() filterset = filtersets.SiteFilterSet @@ -444,6 +458,7 @@ class SiteBulkEditView(generic.BulkEditView): form = forms.SiteBulkEditForm +@register_model_view(Site, 'bulk_delete', path='delete', detail=False) class SiteBulkDeleteView(generic.BulkDeleteView): queryset = Site.objects.all() filterset = filtersets.SiteFilterSet @@ -459,6 +474,7 @@ class SiteContactsView(ObjectContactsView): # Locations # +@register_model_view(Location, 'list', path='', detail=False) class LocationListView(generic.ObjectListView): queryset = Location.objects.add_related_count( Location.objects.add_related_count( @@ -499,6 +515,7 @@ class LocationView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Location, 'add', detail=False) @register_model_view(Location, 'edit') class LocationEditView(generic.ObjectEditView): queryset = Location.objects.all() @@ -510,11 +527,13 @@ class LocationDeleteView(generic.ObjectDeleteView): queryset = Location.objects.all() +@register_model_view(Location, 'import', detail=False) class LocationBulkImportView(generic.BulkImportView): queryset = Location.objects.all() model_form = forms.LocationImportForm +@register_model_view(Location, 'bulk_edit', path='edit', detail=False) class LocationBulkEditView(generic.BulkEditView): queryset = Location.objects.add_related_count( Location.objects.all(), @@ -528,6 +547,7 @@ class LocationBulkEditView(generic.BulkEditView): form = forms.LocationBulkEditForm +@register_model_view(Location, 'bulk_delete', path='delete', detail=False) class LocationBulkDeleteView(generic.BulkDeleteView): queryset = Location.objects.add_related_count( Location.objects.all(), @@ -549,6 +569,7 @@ class LocationContactsView(ObjectContactsView): # Rack roles # +@register_model_view(RackRole, 'list', path='', detail=False) class RackRoleListView(generic.ObjectListView): queryset = RackRole.objects.annotate( rack_count=count_related(Rack, 'role') @@ -568,6 +589,7 @@ class RackRoleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(RackRole, 'add', detail=False) @register_model_view(RackRole, 'edit') class RackRoleEditView(generic.ObjectEditView): queryset = RackRole.objects.all() @@ -579,11 +601,13 @@ class RackRoleDeleteView(generic.ObjectDeleteView): queryset = RackRole.objects.all() +@register_model_view(RackRole, 'import', detail=False) class RackRoleBulkImportView(generic.BulkImportView): queryset = RackRole.objects.all() model_form = forms.RackRoleImportForm +@register_model_view(RackRole, 'bulk_edit', path='edit', detail=False) class RackRoleBulkEditView(generic.BulkEditView): queryset = RackRole.objects.annotate( rack_count=count_related(Rack, 'role') @@ -593,6 +617,7 @@ class RackRoleBulkEditView(generic.BulkEditView): form = forms.RackRoleBulkEditForm +@register_model_view(RackRole, 'bulk_delete', path='delete', detail=False) class RackRoleBulkDeleteView(generic.BulkDeleteView): queryset = RackRole.objects.annotate( rack_count=count_related(Rack, 'role') @@ -605,6 +630,7 @@ class RackRoleBulkDeleteView(generic.BulkDeleteView): # RackTypes # +@register_model_view(RackType, 'list', path='', detail=False) class RackTypeListView(generic.ObjectListView): queryset = RackType.objects.annotate( instance_count=count_related(Rack, 'rack_type') @@ -624,6 +650,7 @@ class RackTypeView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(RackType, 'add', detail=False) @register_model_view(RackType, 'edit') class RackTypeEditView(generic.ObjectEditView): queryset = RackType.objects.all() @@ -635,11 +662,13 @@ class RackTypeDeleteView(generic.ObjectDeleteView): queryset = RackType.objects.all() +@register_model_view(RackType, 'import', detail=False) class RackTypeBulkImportView(generic.BulkImportView): queryset = RackType.objects.all() model_form = forms.RackTypeImportForm +@register_model_view(RackType, 'bulk_edit', path='edit', detail=False) class RackTypeBulkEditView(generic.BulkEditView): queryset = RackType.objects.all() filterset = filtersets.RackTypeFilterSet @@ -647,6 +676,7 @@ class RackTypeBulkEditView(generic.BulkEditView): form = forms.RackTypeBulkEditForm +@register_model_view(RackType, 'bulk_delete', path='delete', detail=False) class RackTypeBulkDeleteView(generic.BulkDeleteView): queryset = RackType.objects.all() filterset = filtersets.RackTypeFilterSet @@ -657,6 +687,7 @@ class RackTypeBulkDeleteView(generic.BulkDeleteView): # Racks # +@register_model_view(Rack, 'list', path='', detail=False) class RackListView(generic.ObjectListView): queryset = Rack.objects.annotate( device_count=count_related(Device, 'rack') @@ -787,6 +818,7 @@ class RackNonRackedView(generic.ObjectChildrenView): ) +@register_model_view(Rack, 'add', detail=False) @register_model_view(Rack, 'edit') class RackEditView(generic.ObjectEditView): queryset = Rack.objects.all() @@ -798,11 +830,13 @@ class RackDeleteView(generic.ObjectDeleteView): queryset = Rack.objects.all() +@register_model_view(Rack, 'import', detail=False) class RackBulkImportView(generic.BulkImportView): queryset = Rack.objects.all() model_form = forms.RackImportForm +@register_model_view(Rack, 'bulk_edit', path='edit', detail=False) class RackBulkEditView(generic.BulkEditView): queryset = Rack.objects.all() filterset = filtersets.RackFilterSet @@ -810,6 +844,7 @@ class RackBulkEditView(generic.BulkEditView): form = forms.RackBulkEditForm +@register_model_view(Rack, 'bulk_delete', path='delete', detail=False) class RackBulkDeleteView(generic.BulkDeleteView): queryset = Rack.objects.all() filterset = filtersets.RackFilterSet @@ -825,6 +860,7 @@ class RackContactsView(ObjectContactsView): # Rack reservations # +@register_model_view(RackReservation, 'list', path='', detail=False) class RackReservationListView(generic.ObjectListView): queryset = RackReservation.objects.all() filterset = filtersets.RackReservationFilterSet @@ -837,6 +873,7 @@ class RackReservationView(generic.ObjectView): queryset = RackReservation.objects.all() +@register_model_view(RackReservation, 'add', detail=False) @register_model_view(RackReservation, 'edit') class RackReservationEditView(generic.ObjectEditView): queryset = RackReservation.objects.all() @@ -855,6 +892,7 @@ class RackReservationDeleteView(generic.ObjectDeleteView): queryset = RackReservation.objects.all() +@register_model_view(RackReservation, 'import', detail=False) class RackReservationImportView(generic.BulkImportView): queryset = RackReservation.objects.all() model_form = forms.RackReservationImportForm @@ -870,6 +908,7 @@ class RackReservationImportView(generic.BulkImportView): return instance +@register_model_view(RackReservation, 'bulk_edit', path='edit', detail=False) class RackReservationBulkEditView(generic.BulkEditView): queryset = RackReservation.objects.all() filterset = filtersets.RackReservationFilterSet @@ -877,6 +916,7 @@ class RackReservationBulkEditView(generic.BulkEditView): form = forms.RackReservationBulkEditForm +@register_model_view(RackReservation, 'bulk_delete', path='delete', detail=False) class RackReservationBulkDeleteView(generic.BulkDeleteView): queryset = RackReservation.objects.all() filterset = filtersets.RackReservationFilterSet @@ -887,6 +927,7 @@ class RackReservationBulkDeleteView(generic.BulkDeleteView): # Manufacturers # +@register_model_view(Manufacturer, 'list', path='', detail=False) class ManufacturerListView(generic.ObjectListView): queryset = Manufacturer.objects.annotate( devicetype_count=count_related(DeviceType, 'manufacturer'), @@ -909,6 +950,7 @@ class ManufacturerView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Manufacturer, 'add', detail=False) @register_model_view(Manufacturer, 'edit') class ManufacturerEditView(generic.ObjectEditView): queryset = Manufacturer.objects.all() @@ -920,11 +962,13 @@ class ManufacturerDeleteView(generic.ObjectDeleteView): queryset = Manufacturer.objects.all() +@register_model_view(Manufacturer, 'import', detail=False) class ManufacturerBulkImportView(generic.BulkImportView): queryset = Manufacturer.objects.all() model_form = forms.ManufacturerImportForm +@register_model_view(Manufacturer, 'bulk_edit', path='edit', detail=False) class ManufacturerBulkEditView(generic.BulkEditView): queryset = Manufacturer.objects.annotate( devicetype_count=count_related(DeviceType, 'manufacturer'), @@ -937,6 +981,7 @@ class ManufacturerBulkEditView(generic.BulkEditView): form = forms.ManufacturerBulkEditForm +@register_model_view(Manufacturer, 'bulk_delete', path='delete', detail=False) class ManufacturerBulkDeleteView(generic.BulkDeleteView): queryset = Manufacturer.objects.annotate( devicetype_count=count_related(DeviceType, 'manufacturer'), @@ -957,6 +1002,7 @@ class ManufacturerContactsView(ObjectContactsView): # Device types # +@register_model_view(DeviceType, 'list', path='', detail=False) class DeviceTypeListView(generic.ObjectListView): queryset = DeviceType.objects.annotate( instance_count=count_related(Device, 'device_type') @@ -980,6 +1026,7 @@ class DeviceTypeView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(DeviceType, 'add', detail=False) @register_model_view(DeviceType, 'edit') class DeviceTypeEditView(generic.ObjectEditView): queryset = DeviceType.objects.all() @@ -1141,6 +1188,7 @@ class DeviceTypeInventoryItemsView(DeviceTypeComponentsView): ) +@register_model_view(DeviceType, 'import', detail=False) class DeviceTypeImportView(generic.BulkImportView): additional_permissions = [ 'dcim.add_devicetype', @@ -1175,6 +1223,7 @@ class DeviceTypeImportView(generic.BulkImportView): return data +@register_model_view(DeviceType, 'bulk_edit', path='edit', detail=False) class DeviceTypeBulkEditView(generic.BulkEditView): queryset = DeviceType.objects.annotate( instance_count=count_related(Device, 'device_type') @@ -1184,6 +1233,7 @@ class DeviceTypeBulkEditView(generic.BulkEditView): form = forms.DeviceTypeBulkEditForm +@register_model_view(DeviceType, 'bulk_delete', path='delete', detail=False) class DeviceTypeBulkDeleteView(generic.BulkDeleteView): queryset = DeviceType.objects.annotate( instance_count=count_related(Device, 'device_type') @@ -1196,6 +1246,7 @@ class DeviceTypeBulkDeleteView(generic.BulkDeleteView): # Module types # +@register_model_view(ModuleType, 'list', path='', detail=False) class ModuleTypeListView(generic.ObjectListView): queryset = ModuleType.objects.annotate( instance_count=count_related(Module, 'module_type') @@ -1219,6 +1270,7 @@ class ModuleTypeView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ModuleType, 'add', detail=False) @register_model_view(ModuleType, 'edit') class ModuleTypeEditView(generic.ObjectEditView): queryset = ModuleType.objects.all() @@ -1350,6 +1402,7 @@ class ModuleTypeModuleBaysView(ModuleTypeComponentsView): ) +@register_model_view(ModuleType, 'import', detail=False) class ModuleTypeImportView(generic.BulkImportView): additional_permissions = [ 'dcim.add_moduletype', @@ -1378,6 +1431,7 @@ class ModuleTypeImportView(generic.BulkImportView): return data +@register_model_view(ModuleType, 'bulk_edit', path='edit', detail=False) class ModuleTypeBulkEditView(generic.BulkEditView): queryset = ModuleType.objects.annotate( instance_count=count_related(Module, 'module_type') @@ -1387,6 +1441,7 @@ class ModuleTypeBulkEditView(generic.BulkEditView): form = forms.ModuleTypeBulkEditForm +@register_model_view(ModuleType, 'bulk_delete', path='delete', detail=False) class ModuleTypeBulkDeleteView(generic.BulkDeleteView): queryset = ModuleType.objects.annotate( instance_count=count_related(Module, 'module_type') @@ -1399,6 +1454,7 @@ class ModuleTypeBulkDeleteView(generic.BulkDeleteView): # Console port templates # +@register_model_view(ConsolePortTemplate, 'add', detail=False) class ConsolePortTemplateCreateView(generic.ComponentCreateView): queryset = ConsolePortTemplate.objects.all() form = forms.ConsolePortTemplateCreateForm @@ -1416,16 +1472,19 @@ class ConsolePortTemplateDeleteView(generic.ObjectDeleteView): queryset = ConsolePortTemplate.objects.all() +@register_model_view(ConsolePortTemplate, 'bulk_edit', path='edit', detail=False) class ConsolePortTemplateBulkEditView(generic.BulkEditView): queryset = ConsolePortTemplate.objects.all() table = tables.ConsolePortTemplateTable form = forms.ConsolePortTemplateBulkEditForm +@register_model_view(ConsolePortTemplate, 'bulk_rename', path='rename', detail=False) class ConsolePortTemplateBulkRenameView(generic.BulkRenameView): queryset = ConsolePortTemplate.objects.all() +@register_model_view(ConsolePortTemplate, 'bulk_delete', path='delete', detail=False) class ConsolePortTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ConsolePortTemplate.objects.all() table = tables.ConsolePortTemplateTable @@ -1435,6 +1494,7 @@ class ConsolePortTemplateBulkDeleteView(generic.BulkDeleteView): # Console server port templates # +@register_model_view(ConsoleServerPortTemplate, 'add', detail=False) class ConsoleServerPortTemplateCreateView(generic.ComponentCreateView): queryset = ConsoleServerPortTemplate.objects.all() form = forms.ConsoleServerPortTemplateCreateForm @@ -1452,16 +1512,19 @@ class ConsoleServerPortTemplateDeleteView(generic.ObjectDeleteView): queryset = ConsoleServerPortTemplate.objects.all() +@register_model_view(ConsoleServerPortTemplate, 'bulk_edit', path='edit', detail=False) class ConsoleServerPortTemplateBulkEditView(generic.BulkEditView): queryset = ConsoleServerPortTemplate.objects.all() table = tables.ConsoleServerPortTemplateTable form = forms.ConsoleServerPortTemplateBulkEditForm +@register_model_view(ConsoleServerPortTemplate, 'bulk_rename', detail=False) class ConsoleServerPortTemplateBulkRenameView(generic.BulkRenameView): queryset = ConsoleServerPortTemplate.objects.all() +@register_model_view(ConsoleServerPortTemplate, 'bulk_delete', path='delete', detail=False) class ConsoleServerPortTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ConsoleServerPortTemplate.objects.all() table = tables.ConsoleServerPortTemplateTable @@ -1471,6 +1534,7 @@ class ConsoleServerPortTemplateBulkDeleteView(generic.BulkDeleteView): # Power port templates # +@register_model_view(PowerPortTemplate, 'add', detail=False) class PowerPortTemplateCreateView(generic.ComponentCreateView): queryset = PowerPortTemplate.objects.all() form = forms.PowerPortTemplateCreateForm @@ -1488,16 +1552,19 @@ class PowerPortTemplateDeleteView(generic.ObjectDeleteView): queryset = PowerPortTemplate.objects.all() +@register_model_view(PowerPortTemplate, 'bulk_edit', path='edit', detail=False) class PowerPortTemplateBulkEditView(generic.BulkEditView): queryset = PowerPortTemplate.objects.all() table = tables.PowerPortTemplateTable form = forms.PowerPortTemplateBulkEditForm +@register_model_view(PowerPortTemplate, 'bulk_rename', path='rename', detail=False) class PowerPortTemplateBulkRenameView(generic.BulkRenameView): queryset = PowerPortTemplate.objects.all() +@register_model_view(PowerPortTemplate, 'bulk_delete', path='delete', detail=False) class PowerPortTemplateBulkDeleteView(generic.BulkDeleteView): queryset = PowerPortTemplate.objects.all() table = tables.PowerPortTemplateTable @@ -1507,6 +1574,7 @@ class PowerPortTemplateBulkDeleteView(generic.BulkDeleteView): # Power outlet templates # +@register_model_view(PowerOutletTemplate, 'add', detail=False) class PowerOutletTemplateCreateView(generic.ComponentCreateView): queryset = PowerOutletTemplate.objects.all() form = forms.PowerOutletTemplateCreateForm @@ -1524,16 +1592,19 @@ class PowerOutletTemplateDeleteView(generic.ObjectDeleteView): queryset = PowerOutletTemplate.objects.all() +@register_model_view(PowerOutletTemplate, 'bulk_edit', path='edit', detail=False) class PowerOutletTemplateBulkEditView(generic.BulkEditView): queryset = PowerOutletTemplate.objects.all() table = tables.PowerOutletTemplateTable form = forms.PowerOutletTemplateBulkEditForm +@register_model_view(PowerOutletTemplate, 'bulk_rename', path='rename', detail=False) class PowerOutletTemplateBulkRenameView(generic.BulkRenameView): queryset = PowerOutletTemplate.objects.all() +@register_model_view(PowerOutletTemplate, 'bulk_delete', path='delete', detail=False) class PowerOutletTemplateBulkDeleteView(generic.BulkDeleteView): queryset = PowerOutletTemplate.objects.all() table = tables.PowerOutletTemplateTable @@ -1543,6 +1614,7 @@ class PowerOutletTemplateBulkDeleteView(generic.BulkDeleteView): # Interface templates # +@register_model_view(InterfaceTemplate, 'add', detail=False) class InterfaceTemplateCreateView(generic.ComponentCreateView): queryset = InterfaceTemplate.objects.all() form = forms.InterfaceTemplateCreateForm @@ -1560,16 +1632,19 @@ class InterfaceTemplateDeleteView(generic.ObjectDeleteView): queryset = InterfaceTemplate.objects.all() +@register_model_view(InterfaceTemplate, 'bulk_edit', path='edit', detail=False) class InterfaceTemplateBulkEditView(generic.BulkEditView): queryset = InterfaceTemplate.objects.all() table = tables.InterfaceTemplateTable form = forms.InterfaceTemplateBulkEditForm +@register_model_view(InterfaceTemplate, 'bulk_rename', path='rename', detail=False) class InterfaceTemplateBulkRenameView(generic.BulkRenameView): queryset = InterfaceTemplate.objects.all() +@register_model_view(InterfaceTemplate, 'bulk_delete', path='delete', detail=False) class InterfaceTemplateBulkDeleteView(generic.BulkDeleteView): queryset = InterfaceTemplate.objects.all() table = tables.InterfaceTemplateTable @@ -1579,6 +1654,7 @@ class InterfaceTemplateBulkDeleteView(generic.BulkDeleteView): # Front port templates # +@register_model_view(FrontPortTemplate, 'add', detail=False) class FrontPortTemplateCreateView(generic.ComponentCreateView): queryset = FrontPortTemplate.objects.all() form = forms.FrontPortTemplateCreateForm @@ -1596,16 +1672,19 @@ class FrontPortTemplateDeleteView(generic.ObjectDeleteView): queryset = FrontPortTemplate.objects.all() +@register_model_view(FrontPortTemplate, 'bulk_edit', path='edit', detail=False) class FrontPortTemplateBulkEditView(generic.BulkEditView): queryset = FrontPortTemplate.objects.all() table = tables.FrontPortTemplateTable form = forms.FrontPortTemplateBulkEditForm +@register_model_view(FrontPortTemplate, 'bulk_rename', path='rename', detail=False) class FrontPortTemplateBulkRenameView(generic.BulkRenameView): queryset = FrontPortTemplate.objects.all() +@register_model_view(FrontPortTemplate, 'bulk_delete', path='delete', detail=False) class FrontPortTemplateBulkDeleteView(generic.BulkDeleteView): queryset = FrontPortTemplate.objects.all() table = tables.FrontPortTemplateTable @@ -1615,6 +1694,7 @@ class FrontPortTemplateBulkDeleteView(generic.BulkDeleteView): # Rear port templates # +@register_model_view(RearPortTemplate, 'add', detail=False) class RearPortTemplateCreateView(generic.ComponentCreateView): queryset = RearPortTemplate.objects.all() form = forms.RearPortTemplateCreateForm @@ -1632,16 +1712,19 @@ class RearPortTemplateDeleteView(generic.ObjectDeleteView): queryset = RearPortTemplate.objects.all() +@register_model_view(RearPortTemplate, 'bulk_edit', path='edit', detail=False) class RearPortTemplateBulkEditView(generic.BulkEditView): queryset = RearPortTemplate.objects.all() table = tables.RearPortTemplateTable form = forms.RearPortTemplateBulkEditForm +@register_model_view(RearPortTemplate, 'bulk_rename', path='rename', detail=False) class RearPortTemplateBulkRenameView(generic.BulkRenameView): queryset = RearPortTemplate.objects.all() +@register_model_view(RearPortTemplate, 'bulk_delete', path='delete', detail=False) class RearPortTemplateBulkDeleteView(generic.BulkDeleteView): queryset = RearPortTemplate.objects.all() table = tables.RearPortTemplateTable @@ -1651,6 +1734,7 @@ class RearPortTemplateBulkDeleteView(generic.BulkDeleteView): # Module bay templates # +@register_model_view(ModuleBayTemplate, 'add', detail=False) class ModuleBayTemplateCreateView(generic.ComponentCreateView): queryset = ModuleBayTemplate.objects.all() form = forms.ModuleBayTemplateCreateForm @@ -1668,16 +1752,19 @@ class ModuleBayTemplateDeleteView(generic.ObjectDeleteView): queryset = ModuleBayTemplate.objects.all() +@register_model_view(ModuleBayTemplate, 'bulk_edit', path='edit', detail=False) class ModuleBayTemplateBulkEditView(generic.BulkEditView): queryset = ModuleBayTemplate.objects.all() table = tables.ModuleBayTemplateTable form = forms.ModuleBayTemplateBulkEditForm +@register_model_view(ModuleBayTemplate, 'bulk_rename', path='rename', detail=False) class ModuleBayTemplateBulkRenameView(generic.BulkRenameView): queryset = ModuleBayTemplate.objects.all() +@register_model_view(ModuleBayTemplate, 'bulk_delete', path='delete', detail=False) class ModuleBayTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ModuleBayTemplate.objects.all() table = tables.ModuleBayTemplateTable @@ -1687,6 +1774,7 @@ class ModuleBayTemplateBulkDeleteView(generic.BulkDeleteView): # Device bay templates # +@register_model_view(DeviceBayTemplate, 'add', detail=False) class DeviceBayTemplateCreateView(generic.ComponentCreateView): queryset = DeviceBayTemplate.objects.all() form = forms.DeviceBayTemplateCreateForm @@ -1704,16 +1792,19 @@ class DeviceBayTemplateDeleteView(generic.ObjectDeleteView): queryset = DeviceBayTemplate.objects.all() +@register_model_view(DeviceBayTemplate, 'bulk_edit', path='edit', detail=False) class DeviceBayTemplateBulkEditView(generic.BulkEditView): queryset = DeviceBayTemplate.objects.all() table = tables.DeviceBayTemplateTable form = forms.DeviceBayTemplateBulkEditForm +@register_model_view(DeviceBayTemplate, 'bulk_rename', path='rename', detail=False) class DeviceBayTemplateBulkRenameView(generic.BulkRenameView): queryset = DeviceBayTemplate.objects.all() +@register_model_view(DeviceBayTemplate, 'bulk_delete', path='delete', detail=False) class DeviceBayTemplateBulkDeleteView(generic.BulkDeleteView): queryset = DeviceBayTemplate.objects.all() table = tables.DeviceBayTemplateTable @@ -1723,6 +1814,7 @@ class DeviceBayTemplateBulkDeleteView(generic.BulkDeleteView): # Inventory item templates # +@register_model_view(InventoryItemTemplate, 'add', detail=False) class InventoryItemTemplateCreateView(generic.ComponentCreateView): queryset = InventoryItemTemplate.objects.all() form = forms.InventoryItemTemplateCreateForm @@ -1751,16 +1843,19 @@ class InventoryItemTemplateDeleteView(generic.ObjectDeleteView): queryset = InventoryItemTemplate.objects.all() +@register_model_view(InventoryItemTemplate, 'bulk_edit', path='edit', detail=False) class InventoryItemTemplateBulkEditView(generic.BulkEditView): queryset = InventoryItemTemplate.objects.all() table = tables.InventoryItemTemplateTable form = forms.InventoryItemTemplateBulkEditForm +@register_model_view(InventoryItemTemplate, 'bulk_rename', path='rename', detail=False) class InventoryItemTemplateBulkRenameView(generic.BulkRenameView): queryset = InventoryItemTemplate.objects.all() +@register_model_view(InventoryItemTemplate, 'bulk_delete', path='delete', detail=False) class InventoryItemTemplateBulkDeleteView(generic.BulkDeleteView): queryset = InventoryItemTemplate.objects.all() table = tables.InventoryItemTemplateTable @@ -1770,6 +1865,7 @@ class InventoryItemTemplateBulkDeleteView(generic.BulkDeleteView): # Device roles # +@register_model_view(DeviceRole, 'list', path='', detail=False) class DeviceRoleListView(generic.ObjectListView): queryset = DeviceRole.objects.annotate( device_count=count_related(Device, 'role'), @@ -1790,6 +1886,7 @@ class DeviceRoleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(DeviceRole, 'add', detail=False) @register_model_view(DeviceRole, 'edit') class DeviceRoleEditView(generic.ObjectEditView): queryset = DeviceRole.objects.all() @@ -1801,11 +1898,13 @@ class DeviceRoleDeleteView(generic.ObjectDeleteView): queryset = DeviceRole.objects.all() +@register_model_view(DeviceRole, 'import', detail=False) class DeviceRoleBulkImportView(generic.BulkImportView): queryset = DeviceRole.objects.all() model_form = forms.DeviceRoleImportForm +@register_model_view(DeviceRole, 'bulk_edit', path='edit', detail=False) class DeviceRoleBulkEditView(generic.BulkEditView): queryset = DeviceRole.objects.annotate( device_count=count_related(Device, 'role'), @@ -1816,6 +1915,7 @@ class DeviceRoleBulkEditView(generic.BulkEditView): form = forms.DeviceRoleBulkEditForm +@register_model_view(DeviceRole, 'bulk_delete', path='delete', detail=False) class DeviceRoleBulkDeleteView(generic.BulkDeleteView): queryset = DeviceRole.objects.annotate( device_count=count_related(Device, 'role'), @@ -1829,6 +1929,7 @@ class DeviceRoleBulkDeleteView(generic.BulkDeleteView): # Platforms # +@register_model_view(Platform, 'list', path='', detail=False) class PlatformListView(generic.ObjectListView): queryset = Platform.objects.annotate( device_count=count_related(Device, 'platform'), @@ -1849,6 +1950,7 @@ class PlatformView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Platform, 'add', detail=False) @register_model_view(Platform, 'edit') class PlatformEditView(generic.ObjectEditView): queryset = Platform.objects.all() @@ -1860,11 +1962,13 @@ class PlatformDeleteView(generic.ObjectDeleteView): queryset = Platform.objects.all() +@register_model_view(Platform, 'import', detail=False) class PlatformBulkImportView(generic.BulkImportView): queryset = Platform.objects.all() model_form = forms.PlatformImportForm +@register_model_view(Platform, 'bulk_edit', path='edit', detail=False) class PlatformBulkEditView(generic.BulkEditView): queryset = Platform.objects.all() filterset = filtersets.PlatformFilterSet @@ -1872,6 +1976,7 @@ class PlatformBulkEditView(generic.BulkEditView): form = forms.PlatformBulkEditForm +@register_model_view(Platform, 'bulk_delete', path='delete', detail=False) class PlatformBulkDeleteView(generic.BulkDeleteView): queryset = Platform.objects.all() filterset = filtersets.PlatformFilterSet @@ -1882,6 +1987,7 @@ class PlatformBulkDeleteView(generic.BulkDeleteView): # Devices # +@register_model_view(Device, 'list', path='', detail=False) class DeviceListView(generic.ObjectListView): queryset = Device.objects.all() filterset = filtersets.DeviceFilterSet @@ -1909,6 +2015,7 @@ class DeviceView(generic.ObjectView): } +@register_model_view(Device, 'add', detail=False) @register_model_view(Device, 'edit') class DeviceEditView(generic.ObjectEditView): queryset = Device.objects.all() @@ -2176,6 +2283,7 @@ class DeviceVirtualMachinesView(generic.ObjectChildrenView): return self.child_model.objects.restrict(request.user, 'view').filter(cluster=parent.cluster, device=parent) +@register_model_view(Device, 'import', detail=False) class DeviceBulkImportView(generic.BulkImportView): queryset = Device.objects.all() model_form = forms.DeviceImportForm @@ -2192,6 +2300,7 @@ class DeviceBulkImportView(generic.BulkImportView): return obj +@register_model_view(Device, 'bulk_edit', path='edit', detail=False) class DeviceBulkEditView(generic.BulkEditView): queryset = Device.objects.prefetch_related('device_type__manufacturer') filterset = filtersets.DeviceFilterSet @@ -2199,12 +2308,14 @@ class DeviceBulkEditView(generic.BulkEditView): form = forms.DeviceBulkEditForm +@register_model_view(Device, 'bulk_delete', path='delete', detail=False) class DeviceBulkDeleteView(generic.BulkDeleteView): queryset = Device.objects.prefetch_related('device_type__manufacturer') filterset = filtersets.DeviceFilterSet table = tables.DeviceTable +@register_model_view(Device, 'bulk_rename', path='rename', detail=False) class DeviceBulkRenameView(generic.BulkRenameView): queryset = Device.objects.all() filterset = filtersets.DeviceFilterSet @@ -2220,6 +2331,7 @@ class DeviceContactsView(ObjectContactsView): # Modules # +@register_model_view(Module, 'list', path='', detail=False) class ModuleListView(generic.ObjectListView): queryset = Module.objects.prefetch_related('module_type__manufacturer') filterset = filtersets.ModuleFilterSet @@ -2237,6 +2349,7 @@ class ModuleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Module, 'add', detail=False) @register_model_view(Module, 'edit') class ModuleEditView(generic.ObjectEditView): queryset = Module.objects.all() @@ -2248,11 +2361,13 @@ class ModuleDeleteView(generic.ObjectDeleteView): queryset = Module.objects.all() +@register_model_view(Module, 'import', detail=False) class ModuleBulkImportView(generic.BulkImportView): queryset = Module.objects.all() model_form = forms.ModuleImportForm +@register_model_view(Module, 'bulk_edit', path='edit', detail=False) class ModuleBulkEditView(generic.BulkEditView): queryset = Module.objects.prefetch_related('module_type__manufacturer') filterset = filtersets.ModuleFilterSet @@ -2260,6 +2375,7 @@ class ModuleBulkEditView(generic.BulkEditView): form = forms.ModuleBulkEditForm +@register_model_view(Module, 'bulk_delete', path='delete', detail=False) class ModuleBulkDeleteView(generic.BulkDeleteView): queryset = Module.objects.prefetch_related('module_type__manufacturer') filterset = filtersets.ModuleFilterSet @@ -2270,6 +2386,7 @@ class ModuleBulkDeleteView(generic.BulkDeleteView): # Console ports # +@register_model_view(ConsolePort, 'list', path='', detail=False) class ConsolePortListView(generic.ObjectListView): queryset = ConsolePort.objects.all() filterset = filtersets.ConsolePortFilterSet @@ -2287,6 +2404,7 @@ class ConsolePortView(generic.ObjectView): queryset = ConsolePort.objects.all() +@register_model_view(ConsolePort, 'add', detail=False) class ConsolePortCreateView(generic.ComponentCreateView): queryset = ConsolePort.objects.all() form = forms.ConsolePortCreateForm @@ -2304,11 +2422,13 @@ class ConsolePortDeleteView(generic.ObjectDeleteView): queryset = ConsolePort.objects.all() +@register_model_view(ConsolePort, 'import', detail=False) class ConsolePortBulkImportView(generic.BulkImportView): queryset = ConsolePort.objects.all() model_form = forms.ConsolePortImportForm +@register_model_view(ConsolePort, 'bulk_edit', path='edit', detail=False) class ConsolePortBulkEditView(generic.BulkEditView): queryset = ConsolePort.objects.all() filterset = filtersets.ConsolePortFilterSet @@ -2316,14 +2436,17 @@ class ConsolePortBulkEditView(generic.BulkEditView): form = forms.ConsolePortBulkEditForm +@register_model_view(ConsolePort, 'bulk_rename', path='rename', detail=False) class ConsolePortBulkRenameView(generic.BulkRenameView): queryset = ConsolePort.objects.all() +@register_model_view(ConsolePort, 'bulk_disconnect', path='disconnect', detail=False) class ConsolePortBulkDisconnectView(BulkDisconnectView): queryset = ConsolePort.objects.all() +@register_model_view(ConsolePort, 'bulk_delete', path='delete', detail=False) class ConsolePortBulkDeleteView(generic.BulkDeleteView): queryset = ConsolePort.objects.all() filterset = filtersets.ConsolePortFilterSet @@ -2338,6 +2461,7 @@ register_model_view(ConsolePort, 'trace', kwargs={'model': ConsolePort})(PathTra # Console server ports # +@register_model_view(ConsoleServerPort, 'list', path='', detail=False) class ConsoleServerPortListView(generic.ObjectListView): queryset = ConsoleServerPort.objects.all() filterset = filtersets.ConsoleServerPortFilterSet @@ -2355,6 +2479,7 @@ class ConsoleServerPortView(generic.ObjectView): queryset = ConsoleServerPort.objects.all() +@register_model_view(ConsoleServerPort, 'add', detail=False) class ConsoleServerPortCreateView(generic.ComponentCreateView): queryset = ConsoleServerPort.objects.all() form = forms.ConsoleServerPortCreateForm @@ -2372,11 +2497,13 @@ class ConsoleServerPortDeleteView(generic.ObjectDeleteView): queryset = ConsoleServerPort.objects.all() +@register_model_view(ConsoleServerPort, 'import', detail=False) class ConsoleServerPortBulkImportView(generic.BulkImportView): queryset = ConsoleServerPort.objects.all() model_form = forms.ConsoleServerPortImportForm +@register_model_view(ConsoleServerPort, 'bulk_edit', path='edit', detail=False) class ConsoleServerPortBulkEditView(generic.BulkEditView): queryset = ConsoleServerPort.objects.all() filterset = filtersets.ConsoleServerPortFilterSet @@ -2384,14 +2511,17 @@ class ConsoleServerPortBulkEditView(generic.BulkEditView): form = forms.ConsoleServerPortBulkEditForm +@register_model_view(ConsoleServerPort, 'bulk_rename', path='rename', detail=False) class ConsoleServerPortBulkRenameView(generic.BulkRenameView): queryset = ConsoleServerPort.objects.all() +@register_model_view(ConsoleServerPort, 'bulk_disconnect', path='disconnect', detail=False) class ConsoleServerPortBulkDisconnectView(BulkDisconnectView): queryset = ConsoleServerPort.objects.all() +@register_model_view(ConsoleServerPort, 'bulk_delete', path='delete', detail=False) class ConsoleServerPortBulkDeleteView(generic.BulkDeleteView): queryset = ConsoleServerPort.objects.all() filterset = filtersets.ConsoleServerPortFilterSet @@ -2406,6 +2536,7 @@ register_model_view(ConsoleServerPort, 'trace', kwargs={'model': ConsoleServerPo # Power ports # +@register_model_view(PowerPort, 'list', path='', detail=False) class PowerPortListView(generic.ObjectListView): queryset = PowerPort.objects.all() filterset = filtersets.PowerPortFilterSet @@ -2423,6 +2554,7 @@ class PowerPortView(generic.ObjectView): queryset = PowerPort.objects.all() +@register_model_view(PowerPort, 'add', detail=False) class PowerPortCreateView(generic.ComponentCreateView): queryset = PowerPort.objects.all() form = forms.PowerPortCreateForm @@ -2440,11 +2572,13 @@ class PowerPortDeleteView(generic.ObjectDeleteView): queryset = PowerPort.objects.all() +@register_model_view(PowerPort, 'import', detail=False) class PowerPortBulkImportView(generic.BulkImportView): queryset = PowerPort.objects.all() model_form = forms.PowerPortImportForm +@register_model_view(PowerPort, 'bulk_edit', path='edit', detail=False) class PowerPortBulkEditView(generic.BulkEditView): queryset = PowerPort.objects.all() filterset = filtersets.PowerPortFilterSet @@ -2452,14 +2586,17 @@ class PowerPortBulkEditView(generic.BulkEditView): form = forms.PowerPortBulkEditForm +@register_model_view(PowerPort, 'bulk_rename', path='rename', detail=False) class PowerPortBulkRenameView(generic.BulkRenameView): queryset = PowerPort.objects.all() +@register_model_view(PowerPort, 'bulk_disconnect', path='disconnect', detail=False) class PowerPortBulkDisconnectView(BulkDisconnectView): queryset = PowerPort.objects.all() +@register_model_view(PowerPort, 'bulk_delete', path='delete', detail=False) class PowerPortBulkDeleteView(generic.BulkDeleteView): queryset = PowerPort.objects.all() filterset = filtersets.PowerPortFilterSet @@ -2474,6 +2611,7 @@ register_model_view(PowerPort, 'trace', kwargs={'model': PowerPort})(PathTraceVi # Power outlets # +@register_model_view(PowerOutlet, 'list', path='', detail=False) class PowerOutletListView(generic.ObjectListView): queryset = PowerOutlet.objects.all() filterset = filtersets.PowerOutletFilterSet @@ -2491,6 +2629,7 @@ class PowerOutletView(generic.ObjectView): queryset = PowerOutlet.objects.all() +@register_model_view(PowerOutlet, 'add', detail=False) class PowerOutletCreateView(generic.ComponentCreateView): queryset = PowerOutlet.objects.all() form = forms.PowerOutletCreateForm @@ -2508,11 +2647,13 @@ class PowerOutletDeleteView(generic.ObjectDeleteView): queryset = PowerOutlet.objects.all() +@register_model_view(PowerOutlet, 'import', detail=False) class PowerOutletBulkImportView(generic.BulkImportView): queryset = PowerOutlet.objects.all() model_form = forms.PowerOutletImportForm +@register_model_view(PowerOutlet, 'bulk_edit', path='edit', detail=False) class PowerOutletBulkEditView(generic.BulkEditView): queryset = PowerOutlet.objects.all() filterset = filtersets.PowerOutletFilterSet @@ -2520,14 +2661,17 @@ class PowerOutletBulkEditView(generic.BulkEditView): form = forms.PowerOutletBulkEditForm +@register_model_view(PowerOutlet, 'bulk_rename', path='rename', detail=False) class PowerOutletBulkRenameView(generic.BulkRenameView): queryset = PowerOutlet.objects.all() +@register_model_view(PowerOutlet, 'bulk_disconnect', path='disconnect', detail=False) class PowerOutletBulkDisconnectView(BulkDisconnectView): queryset = PowerOutlet.objects.all() +@register_model_view(PowerOutlet, 'bulk_delete', path='delete', detail=False) class PowerOutletBulkDeleteView(generic.BulkDeleteView): queryset = PowerOutlet.objects.all() filterset = filtersets.PowerOutletFilterSet @@ -2538,55 +2682,11 @@ class PowerOutletBulkDeleteView(generic.BulkDeleteView): register_model_view(PowerOutlet, 'trace', kwargs={'model': PowerOutlet})(PathTraceView) -# -# MAC addresses -# - -class MACAddressListView(generic.ObjectListView): - queryset = MACAddress.objects.all() - filterset = filtersets.MACAddressFilterSet - filterset_form = forms.MACAddressFilterForm - table = tables.MACAddressTable - - -@register_model_view(MACAddress) -class MACAddressView(generic.ObjectView): - queryset = MACAddress.objects.all() - - -@register_model_view(MACAddress, 'edit') -class MACAddressEditView(generic.ObjectEditView): - queryset = MACAddress.objects.all() - form = forms.MACAddressForm - - -@register_model_view(MACAddress, 'delete') -class MACAddressDeleteView(generic.ObjectDeleteView): - queryset = MACAddress.objects.all() - - -class MACAddressBulkImportView(generic.BulkImportView): - queryset = MACAddress.objects.all() - model_form = forms.MACAddressImportForm - - -class MACAddressBulkEditView(generic.BulkEditView): - queryset = MACAddress.objects.all() - filterset = filtersets.MACAddressFilterSet - table = tables.MACAddressTable - form = forms.MACAddressBulkEditForm - - -class MACAddressBulkDeleteView(generic.BulkDeleteView): - queryset = MACAddress.objects.all() - filterset = filtersets.MACAddressFilterSet - table = tables.MACAddressTable - - # # Interfaces # +@register_model_view(Interface, 'list', path='', detail=False) class InterfaceListView(generic.ObjectListView): queryset = Interface.objects.all() filterset = filtersets.InterfaceFilterSet @@ -2661,6 +2761,7 @@ class InterfaceView(generic.ObjectView): } +@register_model_view(Interface, 'add', detail=False) class InterfaceCreateView(generic.ComponentCreateView): queryset = Interface.objects.all() form = forms.InterfaceCreateForm @@ -2678,11 +2779,13 @@ class InterfaceDeleteView(generic.ObjectDeleteView): queryset = Interface.objects.all() +@register_model_view(Interface, 'import', detail=False) class InterfaceBulkImportView(generic.BulkImportView): queryset = Interface.objects.all() model_form = forms.InterfaceImportForm +@register_model_view(Interface, 'bulk_edit', path='edit', detail=False) class InterfaceBulkEditView(generic.BulkEditView): queryset = Interface.objects.all() filterset = filtersets.InterfaceFilterSet @@ -2690,14 +2793,17 @@ class InterfaceBulkEditView(generic.BulkEditView): form = forms.InterfaceBulkEditForm +@register_model_view(Interface, 'bulk_rename', path='rename', detail=False) class InterfaceBulkRenameView(generic.BulkRenameView): queryset = Interface.objects.all() +@register_model_view(Interface, 'bulk_disconnect', path='disconnect', detail=False) class InterfaceBulkDisconnectView(BulkDisconnectView): queryset = Interface.objects.all() +@register_model_view(Interface, 'bulk_delete', path='delete', detail=False) class InterfaceBulkDeleteView(generic.BulkDeleteView): # Ensure child interfaces are deleted prior to their parents queryset = Interface.objects.order_by('device', 'parent', CollateAsChar('_name')) @@ -2713,6 +2819,7 @@ register_model_view(Interface, 'trace', kwargs={'model': Interface})(PathTraceVi # Front ports # +@register_model_view(FrontPort, 'list', path='', detail=False) class FrontPortListView(generic.ObjectListView): queryset = FrontPort.objects.all() filterset = filtersets.FrontPortFilterSet @@ -2730,6 +2837,7 @@ class FrontPortView(generic.ObjectView): queryset = FrontPort.objects.all() +@register_model_view(FrontPort, 'add', detail=False) class FrontPortCreateView(generic.ComponentCreateView): queryset = FrontPort.objects.all() form = forms.FrontPortCreateForm @@ -2747,11 +2855,13 @@ class FrontPortDeleteView(generic.ObjectDeleteView): queryset = FrontPort.objects.all() +@register_model_view(FrontPort, 'import', detail=False) class FrontPortBulkImportView(generic.BulkImportView): queryset = FrontPort.objects.all() model_form = forms.FrontPortImportForm +@register_model_view(FrontPort, 'bulk_edit', path='edit', detail=False) class FrontPortBulkEditView(generic.BulkEditView): queryset = FrontPort.objects.all() filterset = filtersets.FrontPortFilterSet @@ -2759,14 +2869,17 @@ class FrontPortBulkEditView(generic.BulkEditView): form = forms.FrontPortBulkEditForm +@register_model_view(FrontPort, 'bulk_rename', path='rename', detail=False) class FrontPortBulkRenameView(generic.BulkRenameView): queryset = FrontPort.objects.all() +@register_model_view(FrontPort, 'bulk_disconnect', path='disconnect', detail=False) class FrontPortBulkDisconnectView(BulkDisconnectView): queryset = FrontPort.objects.all() +@register_model_view(FrontPort, 'bulk_delete', path='delete', detail=False) class FrontPortBulkDeleteView(generic.BulkDeleteView): queryset = FrontPort.objects.all() filterset = filtersets.FrontPortFilterSet @@ -2781,6 +2894,7 @@ register_model_view(FrontPort, 'trace', kwargs={'model': FrontPort})(PathTraceVi # Rear ports # +@register_model_view(RearPort, 'list', path='', detail=False) class RearPortListView(generic.ObjectListView): queryset = RearPort.objects.all() filterset = filtersets.RearPortFilterSet @@ -2798,6 +2912,7 @@ class RearPortView(generic.ObjectView): queryset = RearPort.objects.all() +@register_model_view(RearPort, 'add', detail=False) class RearPortCreateView(generic.ComponentCreateView): queryset = RearPort.objects.all() form = forms.RearPortCreateForm @@ -2815,11 +2930,13 @@ class RearPortDeleteView(generic.ObjectDeleteView): queryset = RearPort.objects.all() +@register_model_view(RearPort, 'import', detail=False) class RearPortBulkImportView(generic.BulkImportView): queryset = RearPort.objects.all() model_form = forms.RearPortImportForm +@register_model_view(RearPort, 'bulk_edit', path='edit', detail=False) class RearPortBulkEditView(generic.BulkEditView): queryset = RearPort.objects.all() filterset = filtersets.RearPortFilterSet @@ -2827,14 +2944,17 @@ class RearPortBulkEditView(generic.BulkEditView): form = forms.RearPortBulkEditForm +@register_model_view(RearPort, 'bulk_rename', path='rename', detail=False) class RearPortBulkRenameView(generic.BulkRenameView): queryset = RearPort.objects.all() +@register_model_view(RearPort, 'bulk_disconnect', path='disconnect', detail=False) class RearPortBulkDisconnectView(BulkDisconnectView): queryset = RearPort.objects.all() +@register_model_view(RearPort, 'bulk_delete', path='delete', detail=False) class RearPortBulkDeleteView(generic.BulkDeleteView): queryset = RearPort.objects.all() filterset = filtersets.RearPortFilterSet @@ -2849,6 +2969,7 @@ register_model_view(RearPort, 'trace', kwargs={'model': RearPort})(PathTraceView # Module bays # +@register_model_view(ModuleBay, 'list', path='', detail=False) class ModuleBayListView(generic.ObjectListView): queryset = ModuleBay.objects.select_related('installed_module__module_type') filterset = filtersets.ModuleBayFilterSet @@ -2866,6 +2987,7 @@ class ModuleBayView(generic.ObjectView): queryset = ModuleBay.objects.all() +@register_model_view(ModuleBay, 'add', detail=False) class ModuleBayCreateView(generic.ComponentCreateView): queryset = ModuleBay.objects.all() form = forms.ModuleBayCreateForm @@ -2883,11 +3005,13 @@ class ModuleBayDeleteView(generic.ObjectDeleteView): queryset = ModuleBay.objects.all() +@register_model_view(ModuleBay, 'import', detail=False) class ModuleBayBulkImportView(generic.BulkImportView): queryset = ModuleBay.objects.all() model_form = forms.ModuleBayImportForm +@register_model_view(ModuleBay, 'bulk_edit', path='edit', detail=False) class ModuleBayBulkEditView(generic.BulkEditView): queryset = ModuleBay.objects.all() filterset = filtersets.ModuleBayFilterSet @@ -2895,10 +3019,12 @@ class ModuleBayBulkEditView(generic.BulkEditView): form = forms.ModuleBayBulkEditForm +@register_model_view(ModuleBay, 'bulk_rename', path='rename', detail=False) class ModuleBayBulkRenameView(generic.BulkRenameView): queryset = ModuleBay.objects.all() +@register_model_view(ModuleBay, 'bulk_delete', path='delete', detail=False) class ModuleBayBulkDeleteView(generic.BulkDeleteView): queryset = ModuleBay.objects.all() filterset = filtersets.ModuleBayFilterSet @@ -2909,6 +3035,7 @@ class ModuleBayBulkDeleteView(generic.BulkDeleteView): # Device bays # +@register_model_view(DeviceBay, 'list', path='', detail=False) class DeviceBayListView(generic.ObjectListView): queryset = DeviceBay.objects.all() filterset = filtersets.DeviceBayFilterSet @@ -2926,6 +3053,7 @@ class DeviceBayView(generic.ObjectView): queryset = DeviceBay.objects.all() +@register_model_view(DeviceBay, 'add', detail=False) class DeviceBayCreateView(generic.ComponentCreateView): queryset = DeviceBay.objects.all() form = forms.DeviceBayCreateForm @@ -3024,11 +3152,13 @@ class DeviceBayDepopulateView(generic.ObjectEditView): }) +@register_model_view(DeviceBay, 'import', detail=False) class DeviceBayBulkImportView(generic.BulkImportView): queryset = DeviceBay.objects.all() model_form = forms.DeviceBayImportForm +@register_model_view(DeviceBay, 'bulk_edit', path='edit', detail=False) class DeviceBayBulkEditView(generic.BulkEditView): queryset = DeviceBay.objects.all() filterset = filtersets.DeviceBayFilterSet @@ -3036,10 +3166,12 @@ class DeviceBayBulkEditView(generic.BulkEditView): form = forms.DeviceBayBulkEditForm +@register_model_view(DeviceBay, 'bulk_rename', path='rename', detail=False) class DeviceBayBulkRenameView(generic.BulkRenameView): queryset = DeviceBay.objects.all() +@register_model_view(DeviceBay, 'bulk_delete', path='delete', detail=False) class DeviceBayBulkDeleteView(generic.BulkDeleteView): queryset = DeviceBay.objects.all() filterset = filtersets.DeviceBayFilterSet @@ -3050,6 +3182,7 @@ class DeviceBayBulkDeleteView(generic.BulkDeleteView): # Inventory items # +@register_model_view(InventoryItem, 'list', path='', detail=False) class InventoryItemListView(generic.ObjectListView): queryset = InventoryItem.objects.all() filterset = filtersets.InventoryItemFilterSet @@ -3073,6 +3206,7 @@ class InventoryItemEditView(generic.ObjectEditView): form = forms.InventoryItemForm +@register_model_view(InventoryItem, 'add', detail=False) class InventoryItemCreateView(generic.ComponentCreateView): queryset = InventoryItem.objects.all() form = forms.InventoryItemCreateForm @@ -3084,11 +3218,13 @@ class InventoryItemDeleteView(generic.ObjectDeleteView): queryset = InventoryItem.objects.all() +@register_model_view(InventoryItem, 'import', detail=False) class InventoryItemBulkImportView(generic.BulkImportView): queryset = InventoryItem.objects.all() model_form = forms.InventoryItemImportForm +@register_model_view(InventoryItem, 'bulk_edit', path='edit', detail=False) class InventoryItemBulkEditView(generic.BulkEditView): queryset = InventoryItem.objects.all() filterset = filtersets.InventoryItemFilterSet @@ -3096,10 +3232,12 @@ class InventoryItemBulkEditView(generic.BulkEditView): form = forms.InventoryItemBulkEditForm +@register_model_view(InventoryItem, 'bulk_rename', path='rename', detail=False) class InventoryItemBulkRenameView(generic.BulkRenameView): queryset = InventoryItem.objects.all() +@register_model_view(InventoryItem, 'bulk_delete', path='delete', detail=False) class InventoryItemBulkDeleteView(generic.BulkDeleteView): queryset = InventoryItem.objects.all() filterset = filtersets.InventoryItemFilterSet @@ -3129,6 +3267,7 @@ class InventoryItemChildrenView(generic.ObjectChildrenView): # Inventory item roles # +@register_model_view(InventoryItemRole, 'list', path='', detail=False) class InventoryItemRoleListView(generic.ObjectListView): queryset = InventoryItemRole.objects.annotate( inventoryitem_count=count_related(InventoryItem, 'role'), @@ -3148,6 +3287,7 @@ class InventoryItemRoleView(generic.ObjectView): } +@register_model_view(InventoryItemRole, 'add', detail=False) @register_model_view(InventoryItemRole, 'edit') class InventoryItemRoleEditView(generic.ObjectEditView): queryset = InventoryItemRole.objects.all() @@ -3159,11 +3299,13 @@ class InventoryItemRoleDeleteView(generic.ObjectDeleteView): queryset = InventoryItemRole.objects.all() +@register_model_view(InventoryItemRole, 'import', detail=False) class InventoryItemRoleBulkImportView(generic.BulkImportView): queryset = InventoryItemRole.objects.all() model_form = forms.InventoryItemRoleImportForm +@register_model_view(InventoryItemRole, 'bulk_edit', path='edit', detail=False) class InventoryItemRoleBulkEditView(generic.BulkEditView): queryset = InventoryItemRole.objects.annotate( inventoryitem_count=count_related(InventoryItem, 'role'), @@ -3173,6 +3315,7 @@ class InventoryItemRoleBulkEditView(generic.BulkEditView): form = forms.InventoryItemRoleBulkEditForm +@register_model_view(InventoryItemRole, 'bulk_delete', path='delete', detail=False) class InventoryItemRoleBulkDeleteView(generic.BulkDeleteView): queryset = InventoryItemRole.objects.annotate( inventoryitem_count=count_related(InventoryItem, 'role'), @@ -3240,17 +3383,6 @@ class DeviceBulkAddInterfaceView(generic.BulkComponentCreateView): default_return_url = 'dcim:device_list' -# class DeviceBulkAddFrontPortView(generic.BulkComponentCreateView): -# parent_model = Device -# parent_field = 'device' -# form = forms.FrontPortBulkCreateForm -# queryset = FrontPort.objects.all() -# model_form = forms.FrontPortForm -# filterset = filtersets.DeviceFilterSet -# table = tables.DeviceTable -# default_return_url = 'dcim:device_list' - - class DeviceBulkAddRearPortView(generic.BulkComponentCreateView): parent_model = Device parent_field = 'device' @@ -3299,6 +3431,7 @@ class DeviceBulkAddInventoryItemView(generic.BulkComponentCreateView): # Cables # +@register_model_view(Cable, 'list', path='', detail=False) class CableListView(generic.ObjectListView): queryset = Cable.objects.prefetch_related( 'terminations__termination', 'terminations___device', 'terminations___rack', 'terminations___location', @@ -3314,6 +3447,7 @@ class CableView(generic.ObjectView): queryset = Cable.objects.all() +@register_model_view(Cable, 'add', detail=False) @register_model_view(Cable, 'edit') class CableEditView(generic.ObjectEditView): queryset = Cable.objects.all() @@ -3361,11 +3495,13 @@ class CableDeleteView(generic.ObjectDeleteView): queryset = Cable.objects.all() +@register_model_view(Cable, 'import', detail=False) class CableBulkImportView(generic.BulkImportView): queryset = Cable.objects.all() model_form = forms.CableImportForm +@register_model_view(Cable, 'bulk_edit', path='edit', detail=False) class CableBulkEditView(generic.BulkEditView): queryset = Cable.objects.prefetch_related( 'terminations__termination', 'terminations___device', 'terminations___rack', 'terminations___location', @@ -3376,6 +3512,7 @@ class CableBulkEditView(generic.BulkEditView): form = forms.CableBulkEditForm +@register_model_view(Cable, 'bulk_delete', path='delete', detail=False) class CableBulkDeleteView(generic.BulkDeleteView): queryset = Cable.objects.prefetch_related( 'terminations__termination', 'terminations___device', 'terminations___rack', 'terminations___location', @@ -3441,6 +3578,7 @@ class InterfaceConnectionsListView(generic.ObjectListView): # Virtual chassis # +@register_model_view(VirtualChassis, 'list', path='', detail=False) class VirtualChassisListView(generic.ObjectListView): queryset = VirtualChassis.objects.all() table = tables.VirtualChassisTable @@ -3460,6 +3598,7 @@ class VirtualChassisView(generic.ObjectView): } +@register_model_view(VirtualChassis, 'add', detail=False) class VirtualChassisCreateView(generic.ObjectEditView): queryset = VirtualChassis.objects.all() form = forms.VirtualChassisCreateForm @@ -3655,11 +3794,13 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL }) +@register_model_view(VirtualChassis, 'import', detail=False) class VirtualChassisBulkImportView(generic.BulkImportView): queryset = VirtualChassis.objects.all() model_form = forms.VirtualChassisImportForm +@register_model_view(VirtualChassis, 'bulk_edit', path='edit', detail=False) class VirtualChassisBulkEditView(generic.BulkEditView): queryset = VirtualChassis.objects.all() filterset = filtersets.VirtualChassisFilterSet @@ -3667,6 +3808,7 @@ class VirtualChassisBulkEditView(generic.BulkEditView): form = forms.VirtualChassisBulkEditForm +@register_model_view(VirtualChassis, 'bulk_delete', path='delete', detail=False) class VirtualChassisBulkDeleteView(generic.BulkDeleteView): queryset = VirtualChassis.objects.all() filterset = filtersets.VirtualChassisFilterSet @@ -3677,6 +3819,7 @@ class VirtualChassisBulkDeleteView(generic.BulkDeleteView): # Power panels # +@register_model_view(PowerPanel, 'list', path='', detail=False) class PowerPanelListView(generic.ObjectListView): queryset = PowerPanel.objects.annotate( powerfeed_count=count_related(PowerFeed, 'power_panel') @@ -3696,6 +3839,7 @@ class PowerPanelView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(PowerPanel, 'add', detail=False) @register_model_view(PowerPanel, 'edit') class PowerPanelEditView(generic.ObjectEditView): queryset = PowerPanel.objects.all() @@ -3707,11 +3851,13 @@ class PowerPanelDeleteView(generic.ObjectDeleteView): queryset = PowerPanel.objects.all() +@register_model_view(PowerPanel, 'import', detail=False) class PowerPanelBulkImportView(generic.BulkImportView): queryset = PowerPanel.objects.all() model_form = forms.PowerPanelImportForm +@register_model_view(PowerPanel, 'bulk_edit', path='edit', detail=False) class PowerPanelBulkEditView(generic.BulkEditView): queryset = PowerPanel.objects.all() filterset = filtersets.PowerPanelFilterSet @@ -3719,6 +3865,7 @@ class PowerPanelBulkEditView(generic.BulkEditView): form = forms.PowerPanelBulkEditForm +@register_model_view(PowerPanel, 'bulk_delete', path='delete', detail=False) class PowerPanelBulkDeleteView(generic.BulkDeleteView): queryset = PowerPanel.objects.annotate( powerfeed_count=count_related(PowerFeed, 'power_panel') @@ -3736,6 +3883,7 @@ class PowerPanelContactsView(ObjectContactsView): # Power feeds # +@register_model_view(PowerFeed, 'list', path='', detail=False) class PowerFeedListView(generic.ObjectListView): queryset = PowerFeed.objects.all() filterset = filtersets.PowerFeedFilterSet @@ -3748,6 +3896,7 @@ class PowerFeedView(generic.ObjectView): queryset = PowerFeed.objects.all() +@register_model_view(PowerFeed, 'add', detail=False) @register_model_view(PowerFeed, 'edit') class PowerFeedEditView(generic.ObjectEditView): queryset = PowerFeed.objects.all() @@ -3759,11 +3908,13 @@ class PowerFeedDeleteView(generic.ObjectDeleteView): queryset = PowerFeed.objects.all() +@register_model_view(PowerFeed, 'import', detail=False) class PowerFeedBulkImportView(generic.BulkImportView): queryset = PowerFeed.objects.all() model_form = forms.PowerFeedImportForm +@register_model_view(PowerFeed, 'bulk_edit', path='edit', detail=False) class PowerFeedBulkEditView(generic.BulkEditView): queryset = PowerFeed.objects.all() filterset = filtersets.PowerFeedFilterSet @@ -3771,10 +3922,12 @@ class PowerFeedBulkEditView(generic.BulkEditView): form = forms.PowerFeedBulkEditForm +@register_model_view(PowerFeed, 'bulk_disconnect', path='disconnect', detail=False) class PowerFeedBulkDisconnectView(BulkDisconnectView): queryset = PowerFeed.objects.all() +@register_model_view(PowerFeed, 'bulk_delete', path='delete', detail=False) class PowerFeedBulkDeleteView(generic.BulkDeleteView): queryset = PowerFeed.objects.all() filterset = filtersets.PowerFeedFilterSet @@ -3785,7 +3938,11 @@ class PowerFeedBulkDeleteView(generic.BulkDeleteView): register_model_view(PowerFeed, 'trace', kwargs={'model': PowerFeed})(PathTraceView) -# VDC +# +# Virtual device contexts +# + +@register_model_view(VirtualDeviceContext, 'list', path='', detail=False) class VirtualDeviceContextListView(generic.ObjectListView): queryset = VirtualDeviceContext.objects.annotate( interface_count=count_related(Interface, 'vdcs'), @@ -3811,6 +3968,7 @@ class VirtualDeviceContextView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(VirtualDeviceContext, 'add', detail=False) @register_model_view(VirtualDeviceContext, 'edit') class VirtualDeviceContextEditView(generic.ObjectEditView): queryset = VirtualDeviceContext.objects.all() @@ -3822,11 +3980,13 @@ class VirtualDeviceContextDeleteView(generic.ObjectDeleteView): queryset = VirtualDeviceContext.objects.all() +@register_model_view(VirtualDeviceContext, 'import', detail=False) class VirtualDeviceContextBulkImportView(generic.BulkImportView): queryset = VirtualDeviceContext.objects.all() model_form = forms.VirtualDeviceContextImportForm +@register_model_view(VirtualDeviceContext, 'bulk_edit', path='edit', detail=False) class VirtualDeviceContextBulkEditView(generic.BulkEditView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet @@ -3834,7 +3994,58 @@ class VirtualDeviceContextBulkEditView(generic.BulkEditView): form = forms.VirtualDeviceContextBulkEditForm +@register_model_view(VirtualDeviceContext, 'bulk_delete', path='delete', detail=False) class VirtualDeviceContextBulkDeleteView(generic.BulkDeleteView): queryset = VirtualDeviceContext.objects.all() filterset = filtersets.VirtualDeviceContextFilterSet table = tables.VirtualDeviceContextTable + + +# +# MAC addresses +# + +@register_model_view(MACAddress, 'list', path='', detail=False) +class MACAddressListView(generic.ObjectListView): + queryset = MACAddress.objects.all() + filterset = filtersets.MACAddressFilterSet + filterset_form = forms.MACAddressFilterForm + table = tables.MACAddressTable + + +@register_model_view(MACAddress) +class MACAddressView(generic.ObjectView): + queryset = MACAddress.objects.all() + + +@register_model_view(MACAddress, 'add', detail=False) +@register_model_view(MACAddress, 'edit') +class MACAddressEditView(generic.ObjectEditView): + queryset = MACAddress.objects.all() + form = forms.MACAddressForm + + +@register_model_view(MACAddress, 'delete') +class MACAddressDeleteView(generic.ObjectDeleteView): + queryset = MACAddress.objects.all() + + +@register_model_view(MACAddress, 'import', detail=False) +class MACAddressBulkImportView(generic.BulkImportView): + queryset = MACAddress.objects.all() + model_form = forms.MACAddressImportForm + + +@register_model_view(MACAddress, 'bulk_edit', path='edit', detail=False) +class MACAddressBulkEditView(generic.BulkEditView): + queryset = MACAddress.objects.all() + filterset = filtersets.MACAddressFilterSet + table = tables.MACAddressTable + form = forms.MACAddressBulkEditForm + + +@register_model_view(MACAddress, 'bulk_delete', path='delete', detail=False) +class MACAddressBulkDeleteView(generic.BulkDeleteView): + queryset = MACAddress.objects.all() + filterset = filtersets.MACAddressFilterSet + table = tables.MACAddressTable diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index b13af1db9..32633493f 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -7,128 +7,68 @@ from utilities.urls import get_model_urls app_name = 'extras' urlpatterns = [ - # Custom fields - path('custom-fields/', views.CustomFieldListView.as_view(), name='customfield_list'), - path('custom-fields/add/', views.CustomFieldEditView.as_view(), name='customfield_add'), - path('custom-fields/import/', views.CustomFieldBulkImportView.as_view(), name='customfield_import'), - path('custom-fields/edit/', views.CustomFieldBulkEditView.as_view(), name='customfield_bulk_edit'), - path('custom-fields/delete/', views.CustomFieldBulkDeleteView.as_view(), name='customfield_bulk_delete'), + path('custom-fields/', include(get_model_urls('extras', 'customfield', detail=False))), path('custom-fields//', include(get_model_urls('extras', 'customfield'))), - # Custom field choices - path('custom-field-choices/', views.CustomFieldChoiceSetListView.as_view(), name='customfieldchoiceset_list'), - path('custom-field-choices/add/', views.CustomFieldChoiceSetEditView.as_view(), name='customfieldchoiceset_add'), - path('custom-field-choices/import/', views.CustomFieldChoiceSetBulkImportView.as_view(), name='customfieldchoiceset_import'), - path('custom-field-choices/edit/', views.CustomFieldChoiceSetBulkEditView.as_view(), name='customfieldchoiceset_bulk_edit'), - path('custom-field-choices/delete/', views.CustomFieldChoiceSetBulkDeleteView.as_view(), name='customfieldchoiceset_bulk_delete'), + path('custom-field-choices/', include(get_model_urls('extras', 'customfieldchoiceset', detail=False))), path('custom-field-choices//', include(get_model_urls('extras', 'customfieldchoiceset'))), - # Custom links - path('custom-links/', views.CustomLinkListView.as_view(), name='customlink_list'), - path('custom-links/add/', views.CustomLinkEditView.as_view(), name='customlink_add'), - path('custom-links/import/', views.CustomLinkBulkImportView.as_view(), name='customlink_import'), - path('custom-links/edit/', views.CustomLinkBulkEditView.as_view(), name='customlink_bulk_edit'), - path('custom-links/delete/', views.CustomLinkBulkDeleteView.as_view(), name='customlink_bulk_delete'), + path('custom-links/', include(get_model_urls('extras', 'customlink', detail=False))), path('custom-links//', include(get_model_urls('extras', 'customlink'))), - # Export templates - path('export-templates/', views.ExportTemplateListView.as_view(), name='exporttemplate_list'), - path('export-templates/add/', views.ExportTemplateEditView.as_view(), name='exporttemplate_add'), - path('export-templates/import/', views.ExportTemplateBulkImportView.as_view(), name='exporttemplate_import'), - path('export-templates/edit/', views.ExportTemplateBulkEditView.as_view(), name='exporttemplate_bulk_edit'), - path('export-templates/delete/', views.ExportTemplateBulkDeleteView.as_view(), name='exporttemplate_bulk_delete'), - path('export-templates/sync/', views.ExportTemplateBulkSyncDataView.as_view(), name='exporttemplate_bulk_sync'), + path('export-templates/', include(get_model_urls('extras', 'exporttemplate', detail=False))), path('export-templates//', include(get_model_urls('extras', 'exporttemplate'))), - # Saved filters - path('saved-filters/', views.SavedFilterListView.as_view(), name='savedfilter_list'), - path('saved-filters/add/', views.SavedFilterEditView.as_view(), name='savedfilter_add'), - path('saved-filters/import/', views.SavedFilterBulkImportView.as_view(), name='savedfilter_import'), - path('saved-filters/edit/', views.SavedFilterBulkEditView.as_view(), name='savedfilter_bulk_edit'), - path('saved-filters/delete/', views.SavedFilterBulkDeleteView.as_view(), name='savedfilter_bulk_delete'), + path('saved-filters/', include(get_model_urls('extras', 'savedfilter', detail=False))), path('saved-filters//', include(get_model_urls('extras', 'savedfilter'))), - # Bookmarks - path('bookmarks/add/', views.BookmarkCreateView.as_view(), name='bookmark_add'), - path('bookmarks/delete/', views.BookmarkBulkDeleteView.as_view(), name='bookmark_bulk_delete'), + path('bookmarks/', include(get_model_urls('extras', 'bookmark', detail=False))), path('bookmarks//', include(get_model_urls('extras', 'bookmark'))), - # Notification groups - path('notification-groups/', views.NotificationGroupListView.as_view(), name='notificationgroup_list'), - path('notification-groups/add/', views.NotificationGroupEditView.as_view(), name='notificationgroup_add'), - path('notification-groups/import/', views.NotificationGroupBulkImportView.as_view(), name='notificationgroup_import'), - path('notification-groups/edit/', views.NotificationGroupBulkEditView.as_view(), name='notificationgroup_bulk_edit'), - path('notification-groups/delete/', views.NotificationGroupBulkDeleteView.as_view(), name='notificationgroup_bulk_delete'), + path('notification-groups/', include(get_model_urls('extras', 'notificationgroup', detail=False))), path('notification-groups//', include(get_model_urls('extras', 'notificationgroup'))), - # Notifications path('notifications/', views.NotificationsView.as_view(), name='notifications'), - path('notifications/delete/', views.NotificationBulkDeleteView.as_view(), name='notification_bulk_delete'), + path('notifications/', include(get_model_urls('extras', 'notification', detail=False))), path('notifications//', include(get_model_urls('extras', 'notification'))), - # Subscriptions - path('subscriptions/add/', views.SubscriptionCreateView.as_view(), name='subscription_add'), - path('subscriptions/delete/', views.SubscriptionBulkDeleteView.as_view(), name='subscription_bulk_delete'), + path('subscriptions/', include(get_model_urls('extras', 'subscription', detail=False))), path('subscriptions//', include(get_model_urls('extras', 'subscription'))), - # Webhooks - path('webhooks/', views.WebhookListView.as_view(), name='webhook_list'), - path('webhooks/add/', views.WebhookEditView.as_view(), name='webhook_add'), - path('webhooks/import/', views.WebhookBulkImportView.as_view(), name='webhook_import'), - path('webhooks/edit/', views.WebhookBulkEditView.as_view(), name='webhook_bulk_edit'), - path('webhooks/delete/', views.WebhookBulkDeleteView.as_view(), name='webhook_bulk_delete'), + path('webhooks/', include(get_model_urls('extras', 'webhook', detail=False))), path('webhooks//', include(get_model_urls('extras', 'webhook'))), - # Event rules - path('event-rules/', views.EventRuleListView.as_view(), name='eventrule_list'), - path('event-rules/add/', views.EventRuleEditView.as_view(), name='eventrule_add'), - path('event-rules/import/', views.EventRuleBulkImportView.as_view(), name='eventrule_import'), - path('event-rules/edit/', views.EventRuleBulkEditView.as_view(), name='eventrule_bulk_edit'), - path('event-rules/delete/', views.EventRuleBulkDeleteView.as_view(), name='eventrule_bulk_delete'), + path('event-rules/', include(get_model_urls('extras', 'eventrule', detail=False))), path('event-rules//', include(get_model_urls('extras', 'eventrule'))), - # Tags - path('tags/', views.TagListView.as_view(), name='tag_list'), - path('tags/add/', views.TagEditView.as_view(), name='tag_add'), - path('tags/import/', views.TagBulkImportView.as_view(), name='tag_import'), - path('tags/edit/', views.TagBulkEditView.as_view(), name='tag_bulk_edit'), - path('tags/delete/', views.TagBulkDeleteView.as_view(), name='tag_bulk_delete'), + path('tags/', include(get_model_urls('extras', 'tag', detail=False))), path('tags//', include(get_model_urls('extras', 'tag'))), - # Config contexts - path('config-contexts/', views.ConfigContextListView.as_view(), name='configcontext_list'), - path('config-contexts/add/', views.ConfigContextEditView.as_view(), name='configcontext_add'), - path('config-contexts/edit/', views.ConfigContextBulkEditView.as_view(), name='configcontext_bulk_edit'), - path('config-contexts/delete/', views.ConfigContextBulkDeleteView.as_view(), name='configcontext_bulk_delete'), - path('config-contexts/sync/', views.ConfigContextBulkSyncDataView.as_view(), name='configcontext_bulk_sync'), + path('config-contexts/', include(get_model_urls('extras', 'configcontext', detail=False))), path('config-contexts//', include(get_model_urls('extras', 'configcontext'))), - # Config templates - path('config-templates/', views.ConfigTemplateListView.as_view(), name='configtemplate_list'), - path('config-templates/add/', views.ConfigTemplateEditView.as_view(), name='configtemplate_add'), - path('config-templates/edit/', views.ConfigTemplateBulkEditView.as_view(), name='configtemplate_bulk_edit'), - path('config-templates/delete/', views.ConfigTemplateBulkDeleteView.as_view(), name='configtemplate_bulk_delete'), - path('config-templates/sync/', views.ConfigTemplateBulkSyncDataView.as_view(), name='configtemplate_bulk_sync'), + path('config-templates/', include(get_model_urls('extras', 'configtemplate', detail=False))), path('config-templates//', include(get_model_urls('extras', 'configtemplate'))), - # Image attachments - path('image-attachments/', views.ImageAttachmentListView.as_view(), name='imageattachment_list'), - path('image-attachments/add/', views.ImageAttachmentEditView.as_view(), name='imageattachment_add'), + path('image-attachments/', include(get_model_urls('extras', 'imageattachment', detail=False))), path('image-attachments//', include(get_model_urls('extras', 'imageattachment'))), - # Journal entries - path('journal-entries/', views.JournalEntryListView.as_view(), name='journalentry_list'), - path('journal-entries/add/', views.JournalEntryEditView.as_view(), name='journalentry_add'), - path('journal-entries/edit/', views.JournalEntryBulkEditView.as_view(), name='journalentry_bulk_edit'), - path('journal-entries/delete/', views.JournalEntryBulkDeleteView.as_view(), name='journalentry_bulk_delete'), - path('journal-entries/import/', views.JournalEntryBulkImportView.as_view(), name='journalentry_import'), + path('journal-entries/', include(get_model_urls('extras', 'journalentry', detail=False))), path('journal-entries//', include(get_model_urls('extras', 'journalentry'))), # User dashboard path('dashboard/reset/', views.DashboardResetView.as_view(), name='dashboard_reset'), path('dashboard/widgets/add/', views.DashboardWidgetAddView.as_view(), name='dashboardwidget_add'), - path('dashboard/widgets//configure/', views.DashboardWidgetConfigView.as_view(), name='dashboardwidget_config'), - path('dashboard/widgets//delete/', views.DashboardWidgetDeleteView.as_view(), name='dashboardwidget_delete'), + path( + 'dashboard/widgets//configure/', + views.DashboardWidgetConfigView.as_view(), + name='dashboardwidget_config' + ), + path( + 'dashboard/widgets//delete/', + views.DashboardWidgetDeleteView.as_view(), + name='dashboardwidget_delete' + ), # Scripts path('scripts/', views.ScriptListView.as_view(), name='script_list'), diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 0d98b1324..286f3bab9 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -42,6 +42,7 @@ from .tables import ReportResultsTable, ScriptResultsTable # Custom fields # +@register_model_view(CustomField, 'list', path='', detail=False) class CustomFieldListView(generic.ObjectListView): queryset = CustomField.objects.select_related('choice_set') filterset = filtersets.CustomFieldFilterSet @@ -69,6 +70,7 @@ class CustomFieldView(generic.ObjectView): } +@register_model_view(CustomField, 'add', detail=False) @register_model_view(CustomField, 'edit') class CustomFieldEditView(generic.ObjectEditView): queryset = CustomField.objects.select_related('choice_set') @@ -80,11 +82,13 @@ class CustomFieldDeleteView(generic.ObjectDeleteView): queryset = CustomField.objects.select_related('choice_set') +@register_model_view(CustomField, 'import', detail=False) class CustomFieldBulkImportView(generic.BulkImportView): queryset = CustomField.objects.select_related('choice_set') model_form = forms.CustomFieldImportForm +@register_model_view(CustomField, 'bulk_edit', path='edit', detail=False) class CustomFieldBulkEditView(generic.BulkEditView): queryset = CustomField.objects.select_related('choice_set') filterset = filtersets.CustomFieldFilterSet @@ -92,6 +96,7 @@ class CustomFieldBulkEditView(generic.BulkEditView): form = forms.CustomFieldBulkEditForm +@register_model_view(CustomField, 'bulk_delete', path='delete', detail=False) class CustomFieldBulkDeleteView(generic.BulkDeleteView): queryset = CustomField.objects.select_related('choice_set') filterset = filtersets.CustomFieldFilterSet @@ -102,6 +107,7 @@ class CustomFieldBulkDeleteView(generic.BulkDeleteView): # Custom field choices # +@register_model_view(CustomFieldChoiceSet, 'list', path='', detail=False) class CustomFieldChoiceSetListView(generic.ObjectListView): queryset = CustomFieldChoiceSet.objects.all() filterset = filtersets.CustomFieldChoiceSetFilterSet @@ -133,6 +139,7 @@ class CustomFieldChoiceSetView(generic.ObjectView): } +@register_model_view(CustomFieldChoiceSet, 'add', detail=False) @register_model_view(CustomFieldChoiceSet, 'edit') class CustomFieldChoiceSetEditView(generic.ObjectEditView): queryset = CustomFieldChoiceSet.objects.all() @@ -144,11 +151,13 @@ class CustomFieldChoiceSetDeleteView(generic.ObjectDeleteView): queryset = CustomFieldChoiceSet.objects.all() +@register_model_view(CustomFieldChoiceSet, 'import', detail=False) class CustomFieldChoiceSetBulkImportView(generic.BulkImportView): queryset = CustomFieldChoiceSet.objects.all() model_form = forms.CustomFieldChoiceSetImportForm +@register_model_view(CustomFieldChoiceSet, 'bulk_edit', path='edit', detail=False) class CustomFieldChoiceSetBulkEditView(generic.BulkEditView): queryset = CustomFieldChoiceSet.objects.all() filterset = filtersets.CustomFieldChoiceSetFilterSet @@ -156,6 +165,7 @@ class CustomFieldChoiceSetBulkEditView(generic.BulkEditView): form = forms.CustomFieldChoiceSetBulkEditForm +@register_model_view(CustomFieldChoiceSet, 'bulk_delete', path='delete', detail=False) class CustomFieldChoiceSetBulkDeleteView(generic.BulkDeleteView): queryset = CustomFieldChoiceSet.objects.all() filterset = filtersets.CustomFieldChoiceSetFilterSet @@ -166,6 +176,7 @@ class CustomFieldChoiceSetBulkDeleteView(generic.BulkDeleteView): # Custom links # +@register_model_view(CustomLink, 'list', path='', detail=False) class CustomLinkListView(generic.ObjectListView): queryset = CustomLink.objects.all() filterset = filtersets.CustomLinkFilterSet @@ -178,6 +189,7 @@ class CustomLinkView(generic.ObjectView): queryset = CustomLink.objects.all() +@register_model_view(CustomLink, 'add', detail=False) @register_model_view(CustomLink, 'edit') class CustomLinkEditView(generic.ObjectEditView): queryset = CustomLink.objects.all() @@ -189,11 +201,13 @@ class CustomLinkDeleteView(generic.ObjectDeleteView): queryset = CustomLink.objects.all() +@register_model_view(CustomLink, 'import', detail=False) class CustomLinkBulkImportView(generic.BulkImportView): queryset = CustomLink.objects.all() model_form = forms.CustomLinkImportForm +@register_model_view(CustomLink, 'bulk_edit', path='edit', detail=False) class CustomLinkBulkEditView(generic.BulkEditView): queryset = CustomLink.objects.all() filterset = filtersets.CustomLinkFilterSet @@ -201,6 +215,7 @@ class CustomLinkBulkEditView(generic.BulkEditView): form = forms.CustomLinkBulkEditForm +@register_model_view(CustomLink, 'bulk_delete', path='delete', detail=False) class CustomLinkBulkDeleteView(generic.BulkDeleteView): queryset = CustomLink.objects.all() filterset = filtersets.CustomLinkFilterSet @@ -211,6 +226,7 @@ class CustomLinkBulkDeleteView(generic.BulkDeleteView): # Export templates # +@register_model_view(ExportTemplate, 'list', path='', detail=False) class ExportTemplateListView(generic.ObjectListView): queryset = ExportTemplate.objects.all() filterset = filtersets.ExportTemplateFilterSet @@ -228,6 +244,7 @@ class ExportTemplateView(generic.ObjectView): queryset = ExportTemplate.objects.all() +@register_model_view(ExportTemplate, 'add', detail=False) @register_model_view(ExportTemplate, 'edit') class ExportTemplateEditView(generic.ObjectEditView): queryset = ExportTemplate.objects.all() @@ -239,11 +256,13 @@ class ExportTemplateDeleteView(generic.ObjectDeleteView): queryset = ExportTemplate.objects.all() +@register_model_view(ExportTemplate, 'import', detail=False) class ExportTemplateBulkImportView(generic.BulkImportView): queryset = ExportTemplate.objects.all() model_form = forms.ExportTemplateImportForm +@register_model_view(ExportTemplate, 'bulk_edit', path='edit', detail=False) class ExportTemplateBulkEditView(generic.BulkEditView): queryset = ExportTemplate.objects.all() filterset = filtersets.ExportTemplateFilterSet @@ -251,12 +270,14 @@ class ExportTemplateBulkEditView(generic.BulkEditView): form = forms.ExportTemplateBulkEditForm +@register_model_view(ExportTemplate, 'bulk_delete', path='delete', detail=False) class ExportTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ExportTemplate.objects.all() filterset = filtersets.ExportTemplateFilterSet table = tables.ExportTemplateTable +@register_model_view(ExportTemplate, 'bulk_sync', path='sync', detail=False) class ExportTemplateBulkSyncDataView(generic.BulkSyncDataView): queryset = ExportTemplate.objects.all() @@ -283,6 +304,7 @@ class SavedFilterMixin: ) +@register_model_view(SavedFilter, 'list', path='', detail=False) class SavedFilterListView(SavedFilterMixin, generic.ObjectListView): filterset = filtersets.SavedFilterFilterSet filterset_form = forms.SavedFilterFilterForm @@ -294,6 +316,7 @@ class SavedFilterView(SavedFilterMixin, generic.ObjectView): queryset = SavedFilter.objects.all() +@register_model_view(SavedFilter, 'add', detail=False) @register_model_view(SavedFilter, 'edit') class SavedFilterEditView(SavedFilterMixin, generic.ObjectEditView): queryset = SavedFilter.objects.all() @@ -310,11 +333,13 @@ class SavedFilterDeleteView(SavedFilterMixin, generic.ObjectDeleteView): queryset = SavedFilter.objects.all() +@register_model_view(SavedFilter, 'import', detail=False) class SavedFilterBulkImportView(SavedFilterMixin, generic.BulkImportView): queryset = SavedFilter.objects.all() model_form = forms.SavedFilterImportForm +@register_model_view(SavedFilter, 'bulk_edit', path='edit', detail=False) class SavedFilterBulkEditView(SavedFilterMixin, generic.BulkEditView): queryset = SavedFilter.objects.all() filterset = filtersets.SavedFilterFilterSet @@ -322,6 +347,7 @@ class SavedFilterBulkEditView(SavedFilterMixin, generic.BulkEditView): form = forms.SavedFilterBulkEditForm +@register_model_view(SavedFilter, 'bulk_delete', path='delete', detail=False) class SavedFilterBulkDeleteView(SavedFilterMixin, generic.BulkDeleteView): queryset = SavedFilter.objects.all() filterset = filtersets.SavedFilterFilterSet @@ -332,6 +358,7 @@ class SavedFilterBulkDeleteView(SavedFilterMixin, generic.BulkDeleteView): # Bookmarks # +@register_model_view(Bookmark, 'add', detail=False) class BookmarkCreateView(generic.ObjectEditView): form = forms.BookmarkForm @@ -350,6 +377,7 @@ class BookmarkDeleteView(generic.ObjectDeleteView): return Bookmark.objects.filter(user=request.user) +@register_model_view(Bookmark, 'bulk_delete', path='delete', detail=False) class BookmarkBulkDeleteView(generic.BulkDeleteView): table = tables.BookmarkTable @@ -361,6 +389,7 @@ class BookmarkBulkDeleteView(generic.BulkDeleteView): # Notification groups # +@register_model_view(NotificationGroup, 'list', path='', detail=False) class NotificationGroupListView(generic.ObjectListView): queryset = NotificationGroup.objects.all() filterset = filtersets.NotificationGroupFilterSet @@ -373,6 +402,7 @@ class NotificationGroupView(generic.ObjectView): queryset = NotificationGroup.objects.all() +@register_model_view(NotificationGroup, 'add', detail=False) @register_model_view(NotificationGroup, 'edit') class NotificationGroupEditView(generic.ObjectEditView): queryset = NotificationGroup.objects.all() @@ -384,11 +414,13 @@ class NotificationGroupDeleteView(generic.ObjectDeleteView): queryset = NotificationGroup.objects.all() +@register_model_view(NotificationGroup, 'import', detail=False) class NotificationGroupBulkImportView(generic.BulkImportView): queryset = NotificationGroup.objects.all() model_form = forms.NotificationGroupImportForm +@register_model_view(NotificationGroup, 'bulk_edit', path='edit', detail=False) class NotificationGroupBulkEditView(generic.BulkEditView): queryset = NotificationGroup.objects.all() filterset = filtersets.NotificationGroupFilterSet @@ -396,6 +428,7 @@ class NotificationGroupBulkEditView(generic.BulkEditView): form = forms.NotificationGroupBulkEditForm +@register_model_view(NotificationGroup, 'bulk_delete', path='delete', detail=False) class NotificationGroupBulkDeleteView(generic.BulkDeleteView): queryset = NotificationGroup.objects.all() filterset = filtersets.NotificationGroupFilterSet @@ -459,6 +492,7 @@ class NotificationDeleteView(generic.ObjectDeleteView): return Notification.objects.filter(user=request.user) +@register_model_view(Notification, 'bulk_delete', path='delete', detail=False) class NotificationBulkDeleteView(generic.BulkDeleteView): table = tables.NotificationTable @@ -470,6 +504,7 @@ class NotificationBulkDeleteView(generic.BulkDeleteView): # Subscriptions # +@register_model_view(Subscription, 'add', detail=False) class SubscriptionCreateView(generic.ObjectEditView): form = forms.SubscriptionForm @@ -488,6 +523,7 @@ class SubscriptionDeleteView(generic.ObjectDeleteView): return Subscription.objects.filter(user=request.user) +@register_model_view(Subscription, 'bulk_delete', path='delete', detail=False) class SubscriptionBulkDeleteView(generic.BulkDeleteView): table = tables.SubscriptionTable @@ -499,6 +535,7 @@ class SubscriptionBulkDeleteView(generic.BulkDeleteView): # Webhooks # +@register_model_view(Webhook, 'list', path='', detail=False) class WebhookListView(generic.ObjectListView): queryset = Webhook.objects.all() filterset = filtersets.WebhookFilterSet @@ -511,6 +548,7 @@ class WebhookView(generic.ObjectView): queryset = Webhook.objects.all() +@register_model_view(Webhook, 'add', detail=False) @register_model_view(Webhook, 'edit') class WebhookEditView(generic.ObjectEditView): queryset = Webhook.objects.all() @@ -522,11 +560,13 @@ class WebhookDeleteView(generic.ObjectDeleteView): queryset = Webhook.objects.all() +@register_model_view(Webhook, 'import', detail=False) class WebhookBulkImportView(generic.BulkImportView): queryset = Webhook.objects.all() model_form = forms.WebhookImportForm +@register_model_view(Webhook, 'bulk_edit', path='edit', detail=False) class WebhookBulkEditView(generic.BulkEditView): queryset = Webhook.objects.all() filterset = filtersets.WebhookFilterSet @@ -534,6 +574,7 @@ class WebhookBulkEditView(generic.BulkEditView): form = forms.WebhookBulkEditForm +@register_model_view(Webhook, 'bulk_delete', path='delete', detail=False) class WebhookBulkDeleteView(generic.BulkDeleteView): queryset = Webhook.objects.all() filterset = filtersets.WebhookFilterSet @@ -544,6 +585,7 @@ class WebhookBulkDeleteView(generic.BulkDeleteView): # Event Rules # +@register_model_view(EventRule, 'list', path='', detail=False) class EventRuleListView(generic.ObjectListView): queryset = EventRule.objects.all() filterset = filtersets.EventRuleFilterSet @@ -556,6 +598,7 @@ class EventRuleView(generic.ObjectView): queryset = EventRule.objects.all() +@register_model_view(EventRule, 'add', detail=False) @register_model_view(EventRule, 'edit') class EventRuleEditView(generic.ObjectEditView): queryset = EventRule.objects.all() @@ -567,11 +610,13 @@ class EventRuleDeleteView(generic.ObjectDeleteView): queryset = EventRule.objects.all() +@register_model_view(EventRule, 'import', detail=False) class EventRuleBulkImportView(generic.BulkImportView): queryset = EventRule.objects.all() model_form = forms.EventRuleImportForm +@register_model_view(EventRule, 'bulk_edit', path='edit', detail=False) class EventRuleBulkEditView(generic.BulkEditView): queryset = EventRule.objects.all() filterset = filtersets.EventRuleFilterSet @@ -579,6 +624,7 @@ class EventRuleBulkEditView(generic.BulkEditView): form = forms.EventRuleBulkEditForm +@register_model_view(EventRule, 'bulk_delete', path='delete', detail=False) class EventRuleBulkDeleteView(generic.BulkDeleteView): queryset = EventRule.objects.all() filterset = filtersets.EventRuleFilterSet @@ -589,6 +635,7 @@ class EventRuleBulkDeleteView(generic.BulkDeleteView): # Tags # +@register_model_view(Tag, 'list', path='', detail=False) class TagListView(generic.ObjectListView): queryset = Tag.objects.annotate( items=count_related(TaggedItem, 'tag') @@ -624,6 +671,7 @@ class TagView(generic.ObjectView): } +@register_model_view(Tag, 'add', detail=False) @register_model_view(Tag, 'edit') class TagEditView(generic.ObjectEditView): queryset = Tag.objects.all() @@ -635,11 +683,13 @@ class TagDeleteView(generic.ObjectDeleteView): queryset = Tag.objects.all() +@register_model_view(Tag, 'import', detail=False) class TagBulkImportView(generic.BulkImportView): queryset = Tag.objects.all() model_form = forms.TagImportForm +@register_model_view(Tag, 'bulk_edit', path='edit', detail=False) class TagBulkEditView(generic.BulkEditView): queryset = Tag.objects.annotate( items=count_related(TaggedItem, 'tag') @@ -648,6 +698,7 @@ class TagBulkEditView(generic.BulkEditView): form = forms.TagBulkEditForm +@register_model_view(Tag, 'bulk_delete', path='delete', detail=False) class TagBulkDeleteView(generic.BulkDeleteView): queryset = Tag.objects.annotate( items=count_related(TaggedItem, 'tag') @@ -659,6 +710,7 @@ class TagBulkDeleteView(generic.BulkDeleteView): # Config contexts # +@register_model_view(ConfigContext, 'list', path='', detail=False) class ConfigContextListView(generic.ObjectListView): queryset = ConfigContext.objects.all() filterset = filtersets.ConfigContextFilterSet @@ -711,30 +763,34 @@ class ConfigContextView(generic.ObjectView): } +@register_model_view(ConfigContext, 'add', detail=False) @register_model_view(ConfigContext, 'edit') class ConfigContextEditView(generic.ObjectEditView): queryset = ConfigContext.objects.all() form = forms.ConfigContextForm -class ConfigContextBulkEditView(generic.BulkEditView): - queryset = ConfigContext.objects.all() - filterset = filtersets.ConfigContextFilterSet - table = tables.ConfigContextTable - form = forms.ConfigContextBulkEditForm - - @register_model_view(ConfigContext, 'delete') class ConfigContextDeleteView(generic.ObjectDeleteView): queryset = ConfigContext.objects.all() +@register_model_view(ConfigContext, 'bulk_edit', path='edit', detail=False) +class ConfigContextBulkEditView(generic.BulkEditView): + queryset = ConfigContext.objects.all() + filterset = filtersets.ConfigContextFilterSet + table = tables.ConfigContextTable + form = forms.ConfigContextBulkEditForm + + +@register_model_view(ConfigContext, 'bulk_delete', path='delete', detail=False) class ConfigContextBulkDeleteView(generic.BulkDeleteView): queryset = ConfigContext.objects.all() filterset = filtersets.ConfigContextFilterSet table = tables.ConfigContextTable +@register_model_view(ConfigContext, 'bulk_sync', path='sync', detail=False) class ConfigContextBulkSyncDataView(generic.BulkSyncDataView): queryset = ConfigContext.objects.all() @@ -768,6 +824,7 @@ class ObjectConfigContextView(generic.ObjectView): # Config templates # +@register_model_view(ConfigTemplate, 'list', path='', detail=False) class ConfigTemplateListView(generic.ObjectListView): queryset = ConfigTemplate.objects.annotate( device_count=count_related(Device, 'config_template'), @@ -790,6 +847,7 @@ class ConfigTemplateView(generic.ObjectView): queryset = ConfigTemplate.objects.all() +@register_model_view(ConfigTemplate, 'add', detail=False) @register_model_view(ConfigTemplate, 'edit') class ConfigTemplateEditView(generic.ObjectEditView): queryset = ConfigTemplate.objects.all() @@ -801,11 +859,13 @@ class ConfigTemplateDeleteView(generic.ObjectDeleteView): queryset = ConfigTemplate.objects.all() +@register_model_view(ConfigTemplate, 'import', detail=False) class ConfigTemplateBulkImportView(generic.BulkImportView): queryset = ConfigTemplate.objects.all() model_form = forms.ConfigTemplateImportForm +@register_model_view(ConfigTemplate, 'bulk_edit', path='edit', detail=False) class ConfigTemplateBulkEditView(generic.BulkEditView): queryset = ConfigTemplate.objects.all() filterset = filtersets.ConfigTemplateFilterSet @@ -813,12 +873,14 @@ class ConfigTemplateBulkEditView(generic.BulkEditView): form = forms.ConfigTemplateBulkEditForm +@register_model_view(ConfigTemplate, 'bulk_delete', path='delete', detail=False) class ConfigTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ConfigTemplate.objects.all() filterset = filtersets.ConfigTemplateFilterSet table = tables.ConfigTemplateTable +@register_model_view(ConfigTemplate, 'bulk_sync', path='sync', detail=False) class ConfigTemplateBulkSyncDataView(generic.BulkSyncDataView): queryset = ConfigTemplate.objects.all() @@ -827,6 +889,7 @@ class ConfigTemplateBulkSyncDataView(generic.BulkSyncDataView): # Image attachments # +@register_model_view(ImageAttachment, 'list', path='', detail=False) class ImageAttachmentListView(generic.ObjectListView): queryset = ImageAttachment.objects.all() filterset = filtersets.ImageAttachmentFilterSet @@ -837,6 +900,7 @@ class ImageAttachmentListView(generic.ObjectListView): } +@register_model_view(ImageAttachment, 'add', detail=False) @register_model_view(ImageAttachment, 'edit') class ImageAttachmentEditView(generic.ObjectEditView): queryset = ImageAttachment.objects.all() @@ -871,6 +935,7 @@ class ImageAttachmentDeleteView(generic.ObjectDeleteView): # Journal entries # +@register_model_view(JournalEntry, 'list', path='', detail=False) class JournalEntryListView(generic.ObjectListView): queryset = JournalEntry.objects.all() filterset = filtersets.JournalEntryFilterSet @@ -889,6 +954,7 @@ class JournalEntryView(generic.ObjectView): queryset = JournalEntry.objects.all() +@register_model_view(JournalEntry, 'add', detail=False) @register_model_view(JournalEntry, 'edit') class JournalEntryEditView(generic.ObjectEditView): queryset = JournalEntry.objects.all() @@ -917,6 +983,13 @@ class JournalEntryDeleteView(generic.ObjectDeleteView): return reverse(viewname, kwargs={'pk': obj.pk}) +@register_model_view(JournalEntry, 'import', detail=False) +class JournalEntryBulkImportView(generic.BulkImportView): + queryset = JournalEntry.objects.all() + model_form = forms.JournalEntryImportForm + + +@register_model_view(JournalEntry, 'bulk_edit', path='edit', detail=False) class JournalEntryBulkEditView(generic.BulkEditView): queryset = JournalEntry.objects.all() filterset = filtersets.JournalEntryFilterSet @@ -924,17 +997,13 @@ class JournalEntryBulkEditView(generic.BulkEditView): form = forms.JournalEntryBulkEditForm +@register_model_view(JournalEntry, 'bulk_delete', path='delete', detail=False) class JournalEntryBulkDeleteView(generic.BulkDeleteView): queryset = JournalEntry.objects.all() filterset = filtersets.JournalEntryFilterSet table = tables.JournalEntryTable -class JournalEntryBulkImportView(generic.BulkImportView): - queryset = JournalEntry.objects.all() - model_form = forms.JournalEntryImportForm - - # # Dashboard & widgets # diff --git a/netbox/ipam/urls.py b/netbox/ipam/urls.py index d40f9c5dc..c55e874a1 100644 --- a/netbox/ipam/urls.py +++ b/netbox/ipam/urls.py @@ -1,150 +1,62 @@ from django.urls import include, path from utilities.urls import get_model_urls -from . import views +from . import views # noqa F401 app_name = 'ipam' urlpatterns = [ - # ASN ranges - path('asn-ranges/', views.ASNRangeListView.as_view(), name='asnrange_list'), - path('asn-ranges/add/', views.ASNRangeEditView.as_view(), name='asnrange_add'), - path('asn-ranges/import/', views.ASNRangeBulkImportView.as_view(), name='asnrange_import'), - path('asn-ranges/edit/', views.ASNRangeBulkEditView.as_view(), name='asnrange_bulk_edit'), - path('asn-ranges/delete/', views.ASNRangeBulkDeleteView.as_view(), name='asnrange_bulk_delete'), + path('asn-ranges/', include(get_model_urls('ipam', 'asnrange', detail=False))), path('asn-ranges//', include(get_model_urls('ipam', 'asnrange'))), - # ASNs - path('asns/', views.ASNListView.as_view(), name='asn_list'), - path('asns/add/', views.ASNEditView.as_view(), name='asn_add'), - path('asns/import/', views.ASNBulkImportView.as_view(), name='asn_import'), - path('asns/edit/', views.ASNBulkEditView.as_view(), name='asn_bulk_edit'), - path('asns/delete/', views.ASNBulkDeleteView.as_view(), name='asn_bulk_delete'), + path('asns/', include(get_model_urls('ipam', 'asn', detail=False))), path('asns//', include(get_model_urls('ipam', 'asn'))), - # VRFs - path('vrfs/', views.VRFListView.as_view(), name='vrf_list'), - path('vrfs/add/', views.VRFEditView.as_view(), name='vrf_add'), - path('vrfs/import/', views.VRFBulkImportView.as_view(), name='vrf_import'), - path('vrfs/edit/', views.VRFBulkEditView.as_view(), name='vrf_bulk_edit'), - path('vrfs/delete/', views.VRFBulkDeleteView.as_view(), name='vrf_bulk_delete'), + path('vrfs/', include(get_model_urls('ipam', 'vrf', detail=False))), path('vrfs//', include(get_model_urls('ipam', 'vrf'))), - # Route targets - path('route-targets/', views.RouteTargetListView.as_view(), name='routetarget_list'), - path('route-targets/add/', views.RouteTargetEditView.as_view(), name='routetarget_add'), - path('route-targets/import/', views.RouteTargetBulkImportView.as_view(), name='routetarget_import'), - path('route-targets/edit/', views.RouteTargetBulkEditView.as_view(), name='routetarget_bulk_edit'), - path('route-targets/delete/', views.RouteTargetBulkDeleteView.as_view(), name='routetarget_bulk_delete'), + path('route-targets/', include(get_model_urls('ipam', 'routetarget', detail=False))), path('route-targets//', include(get_model_urls('ipam', 'routetarget'))), - # RIRs - path('rirs/', views.RIRListView.as_view(), name='rir_list'), - path('rirs/add/', views.RIREditView.as_view(), name='rir_add'), - path('rirs/import/', views.RIRBulkImportView.as_view(), name='rir_import'), - path('rirs/edit/', views.RIRBulkEditView.as_view(), name='rir_bulk_edit'), - path('rirs/delete/', views.RIRBulkDeleteView.as_view(), name='rir_bulk_delete'), + path('rirs/', include(get_model_urls('ipam', 'rir', detail=False))), path('rirs//', include(get_model_urls('ipam', 'rir'))), - # Aggregates - path('aggregates/', views.AggregateListView.as_view(), name='aggregate_list'), - path('aggregates/add/', views.AggregateEditView.as_view(), name='aggregate_add'), - path('aggregates/import/', views.AggregateBulkImportView.as_view(), name='aggregate_import'), - path('aggregates/edit/', views.AggregateBulkEditView.as_view(), name='aggregate_bulk_edit'), - path('aggregates/delete/', views.AggregateBulkDeleteView.as_view(), name='aggregate_bulk_delete'), + path('aggregates/', include(get_model_urls('ipam', 'aggregate', detail=False))), path('aggregates//', include(get_model_urls('ipam', 'aggregate'))), - # Roles - path('roles/', views.RoleListView.as_view(), name='role_list'), - path('roles/add/', views.RoleEditView.as_view(), name='role_add'), - path('roles/import/', views.RoleBulkImportView.as_view(), name='role_import'), - path('roles/edit/', views.RoleBulkEditView.as_view(), name='role_bulk_edit'), - path('roles/delete/', views.RoleBulkDeleteView.as_view(), name='role_bulk_delete'), + path('roles/', include(get_model_urls('ipam', 'role', detail=False))), path('roles//', include(get_model_urls('ipam', 'role'))), - # Prefixes - path('prefixes/', views.PrefixListView.as_view(), name='prefix_list'), - path('prefixes/add/', views.PrefixEditView.as_view(), name='prefix_add'), - path('prefixes/import/', views.PrefixBulkImportView.as_view(), name='prefix_import'), - path('prefixes/edit/', views.PrefixBulkEditView.as_view(), name='prefix_bulk_edit'), - path('prefixes/delete/', views.PrefixBulkDeleteView.as_view(), name='prefix_bulk_delete'), + path('prefixes/', include(get_model_urls('ipam', 'prefix', detail=False))), path('prefixes//', include(get_model_urls('ipam', 'prefix'))), - # IP ranges - path('ip-ranges/', views.IPRangeListView.as_view(), name='iprange_list'), - path('ip-ranges/add/', views.IPRangeEditView.as_view(), name='iprange_add'), - path('ip-ranges/import/', views.IPRangeBulkImportView.as_view(), name='iprange_import'), - path('ip-ranges/edit/', views.IPRangeBulkEditView.as_view(), name='iprange_bulk_edit'), - path('ip-ranges/delete/', views.IPRangeBulkDeleteView.as_view(), name='iprange_bulk_delete'), + path('ip-ranges/', include(get_model_urls('ipam', 'iprange', detail=False))), path('ip-ranges//', include(get_model_urls('ipam', 'iprange'))), - # IP addresses - path('ip-addresses/', views.IPAddressListView.as_view(), name='ipaddress_list'), - path('ip-addresses/add/', views.IPAddressEditView.as_view(), name='ipaddress_add'), - path('ip-addresses/bulk-add/', views.IPAddressBulkCreateView.as_view(), name='ipaddress_bulk_add'), - path('ip-addresses/import/', views.IPAddressBulkImportView.as_view(), name='ipaddress_import'), - path('ip-addresses/edit/', views.IPAddressBulkEditView.as_view(), name='ipaddress_bulk_edit'), - path('ip-addresses/delete/', views.IPAddressBulkDeleteView.as_view(), name='ipaddress_bulk_delete'), - path('ip-addresses/assign/', views.IPAddressAssignView.as_view(), name='ipaddress_assign'), + path('ip-addresses/', include(get_model_urls('ipam', 'ipaddress', detail=False))), path('ip-addresses//', include(get_model_urls('ipam', 'ipaddress'))), - # FHRP groups - path('fhrp-groups/', views.FHRPGroupListView.as_view(), name='fhrpgroup_list'), - path('fhrp-groups/add/', views.FHRPGroupEditView.as_view(), name='fhrpgroup_add'), - path('fhrp-groups/import/', views.FHRPGroupBulkImportView.as_view(), name='fhrpgroup_import'), - path('fhrp-groups/edit/', views.FHRPGroupBulkEditView.as_view(), name='fhrpgroup_bulk_edit'), - path('fhrp-groups/delete/', views.FHRPGroupBulkDeleteView.as_view(), name='fhrpgroup_bulk_delete'), + path('fhrp-groups/', include(get_model_urls('ipam', 'fhrpgroup', detail=False))), path('fhrp-groups//', include(get_model_urls('ipam', 'fhrpgroup'))), - # FHRP group assignments - path('fhrp-group-assignments/add/', views.FHRPGroupAssignmentEditView.as_view(), name='fhrpgroupassignment_add'), + path('fhrp-group-assignments/', include(get_model_urls('ipam', 'fhrpgroupassignment', detail=False))), path('fhrp-group-assignments//', include(get_model_urls('ipam', 'fhrpgroupassignment'))), - # VLAN groups - path('vlan-groups/', views.VLANGroupListView.as_view(), name='vlangroup_list'), - path('vlan-groups/add/', views.VLANGroupEditView.as_view(), name='vlangroup_add'), - path('vlan-groups/import/', views.VLANGroupBulkImportView.as_view(), name='vlangroup_import'), - path('vlan-groups/edit/', views.VLANGroupBulkEditView.as_view(), name='vlangroup_bulk_edit'), - path('vlan-groups/delete/', views.VLANGroupBulkDeleteView.as_view(), name='vlangroup_bulk_delete'), + path('vlan-groups/', include(get_model_urls('ipam', 'vlangroup', detail=False))), path('vlan-groups//', include(get_model_urls('ipam', 'vlangroup'))), - # VLANs - path('vlans/', views.VLANListView.as_view(), name='vlan_list'), - path('vlans/add/', views.VLANEditView.as_view(), name='vlan_add'), - path('vlans/import/', views.VLANBulkImportView.as_view(), name='vlan_import'), - path('vlans/edit/', views.VLANBulkEditView.as_view(), name='vlan_bulk_edit'), - path('vlans/delete/', views.VLANBulkDeleteView.as_view(), name='vlan_bulk_delete'), + path('vlans/', include(get_model_urls('ipam', 'vlan', detail=False))), path('vlans//', include(get_model_urls('ipam', 'vlan'))), - # VLAN Translation Policies - path('vlan-translation-policies/', views.VLANTranslationPolicyListView.as_view(), name='vlantranslationpolicy_list'), - path('vlan-translation-policies/add/', views.VLANTranslationPolicyEditView.as_view(), name='vlantranslationpolicy_add'), - path('vlan-translation-policies/import/', views.VLANTranslationPolicyBulkImportView.as_view(), name='vlantranslationpolicy_import'), - path('vlan-translation-policies/edit/', views.VLANTranslationPolicyBulkEditView.as_view(), name='vlantranslationpolicy_bulk_edit'), - path('vlan-translation-policies/delete/', views.VLANTranslationPolicyBulkDeleteView.as_view(), name='vlantranslationpolicy_bulk_delete'), + path('vlan-translation-policies/', include(get_model_urls('ipam', 'vlantranslationpolicy', detail=False))), path('vlan-translation-policies//', include(get_model_urls('ipam', 'vlantranslationpolicy'))), - # VLAN Translation Rules - path('vlan-translation-rules/', views.VLANTranslationRuleListView.as_view(), name='vlantranslationrule_list'), - path('vlan-translation-rules/add/', views.VLANTranslationRuleEditView.as_view(), name='vlantranslationrule_add'), - path('vlan-translation-rules/import/', views.VLANTranslationRuleBulkImportView.as_view(), name='vlantranslationrule_import'), - path('vlan-translation-rules/edit/', views.VLANTranslationRuleBulkEditView.as_view(), name='vlantranslationrule_bulk_edit'), - path('vlan-translation-rules/delete/', views.VLANTranslationRuleBulkDeleteView.as_view(), name='vlantranslationrule_bulk_delete'), + path('vlan-translation-rules/', include(get_model_urls('ipam', 'vlantranslationrule', detail=False))), path('vlan-translation-rules//', include(get_model_urls('ipam', 'vlantranslationrule'))), - # Service templates - path('service-templates/', views.ServiceTemplateListView.as_view(), name='servicetemplate_list'), - path('service-templates/add/', views.ServiceTemplateEditView.as_view(), name='servicetemplate_add'), - path('service-templates/import/', views.ServiceTemplateBulkImportView.as_view(), name='servicetemplate_import'), - path('service-templates/edit/', views.ServiceTemplateBulkEditView.as_view(), name='servicetemplate_bulk_edit'), - path('service-templates/delete/', views.ServiceTemplateBulkDeleteView.as_view(), name='servicetemplate_bulk_delete'), + path('service-templates/', include(get_model_urls('ipam', 'servicetemplate', detail=False))), path('service-templates//', include(get_model_urls('ipam', 'servicetemplate'))), - # Services - path('services/', views.ServiceListView.as_view(), name='service_list'), - path('services/add/', views.ServiceCreateView.as_view(), name='service_add'), - path('services/import/', views.ServiceBulkImportView.as_view(), name='service_import'), - path('services/edit/', views.ServiceBulkEditView.as_view(), name='service_bulk_edit'), - path('services/delete/', views.ServiceBulkDeleteView.as_view(), name='service_bulk_delete'), + path('services/', include(get_model_urls('ipam', 'service', detail=False))), path('services//', include(get_model_urls('ipam', 'service'))), ] diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index bbd19c433..327c05f3d 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -29,6 +29,7 @@ from .utils import add_requested_prefixes, add_available_ipaddresses, add_availa # VRFs # +@register_model_view(VRF, 'list', path='', detail=False) class VRFListView(generic.ObjectListView): queryset = VRF.objects.all() filterset = filtersets.VRFFilterSet @@ -57,6 +58,7 @@ class VRFView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(VRF, 'add', detail=False) @register_model_view(VRF, 'edit') class VRFEditView(generic.ObjectEditView): queryset = VRF.objects.all() @@ -68,11 +70,13 @@ class VRFDeleteView(generic.ObjectDeleteView): queryset = VRF.objects.all() +@register_model_view(VRF, 'import', detail=False) class VRFBulkImportView(generic.BulkImportView): queryset = VRF.objects.all() model_form = forms.VRFImportForm +@register_model_view(VRF, 'bulk_edit', path='edit', detail=False) class VRFBulkEditView(generic.BulkEditView): queryset = VRF.objects.all() filterset = filtersets.VRFFilterSet @@ -80,6 +84,7 @@ class VRFBulkEditView(generic.BulkEditView): form = forms.VRFBulkEditForm +@register_model_view(VRF, 'bulk_delete', path='delete', detail=False) class VRFBulkDeleteView(generic.BulkDeleteView): queryset = VRF.objects.all() filterset = filtersets.VRFFilterSet @@ -90,6 +95,7 @@ class VRFBulkDeleteView(generic.BulkDeleteView): # Route targets # +@register_model_view(RouteTarget, 'list', path='', detail=False) class RouteTargetListView(generic.ObjectListView): queryset = RouteTarget.objects.all() filterset = filtersets.RouteTargetFilterSet @@ -102,6 +108,7 @@ class RouteTargetView(generic.ObjectView): queryset = RouteTarget.objects.all() +@register_model_view(RouteTarget, 'add', detail=False) @register_model_view(RouteTarget, 'edit') class RouteTargetEditView(generic.ObjectEditView): queryset = RouteTarget.objects.all() @@ -113,11 +120,13 @@ class RouteTargetDeleteView(generic.ObjectDeleteView): queryset = RouteTarget.objects.all() +@register_model_view(RouteTarget, 'import', detail=False) class RouteTargetBulkImportView(generic.BulkImportView): queryset = RouteTarget.objects.all() model_form = forms.RouteTargetImportForm +@register_model_view(RouteTarget, 'bulk_edit', path='edit', detail=False) class RouteTargetBulkEditView(generic.BulkEditView): queryset = RouteTarget.objects.all() filterset = filtersets.RouteTargetFilterSet @@ -125,6 +134,7 @@ class RouteTargetBulkEditView(generic.BulkEditView): form = forms.RouteTargetBulkEditForm +@register_model_view(RouteTarget, 'bulk_delete', path='delete', detail=False) class RouteTargetBulkDeleteView(generic.BulkDeleteView): queryset = RouteTarget.objects.all() filterset = filtersets.RouteTargetFilterSet @@ -135,6 +145,7 @@ class RouteTargetBulkDeleteView(generic.BulkDeleteView): # RIRs # +@register_model_view(RIR, 'list', path='', detail=False) class RIRListView(generic.ObjectListView): queryset = RIR.objects.annotate( aggregate_count=count_related(Aggregate, 'rir') @@ -154,6 +165,7 @@ class RIRView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(RIR, 'add', detail=False) @register_model_view(RIR, 'edit') class RIREditView(generic.ObjectEditView): queryset = RIR.objects.all() @@ -165,11 +177,13 @@ class RIRDeleteView(generic.ObjectDeleteView): queryset = RIR.objects.all() +@register_model_view(RIR, 'import', detail=False) class RIRBulkImportView(generic.BulkImportView): queryset = RIR.objects.all() model_form = forms.RIRImportForm +@register_model_view(RIR, 'bulk_edit', path='edit', detail=False) class RIRBulkEditView(generic.BulkEditView): queryset = RIR.objects.annotate( aggregate_count=count_related(Aggregate, 'rir') @@ -179,6 +193,7 @@ class RIRBulkEditView(generic.BulkEditView): form = forms.RIRBulkEditForm +@register_model_view(RIR, 'bulk_delete', path='delete', detail=False) class RIRBulkDeleteView(generic.BulkDeleteView): queryset = RIR.objects.annotate( aggregate_count=count_related(Aggregate, 'rir') @@ -191,6 +206,7 @@ class RIRBulkDeleteView(generic.BulkDeleteView): # ASN ranges # +@register_model_view(ASNRange, 'list', path='', detail=False) class ASNRangeListView(generic.ObjectListView): queryset = ASNRange.objects.annotate_asn_counts() filterset = filtersets.ASNRangeFilterSet @@ -224,6 +240,7 @@ class ASNRangeASNsView(generic.ObjectChildrenView): ) +@register_model_view(ASNRange, 'add', detail=False) @register_model_view(ASNRange, 'edit') class ASNRangeEditView(generic.ObjectEditView): queryset = ASNRange.objects.all() @@ -235,11 +252,13 @@ class ASNRangeDeleteView(generic.ObjectDeleteView): queryset = ASNRange.objects.all() +@register_model_view(ASNRange, 'import', detail=False) class ASNRangeBulkImportView(generic.BulkImportView): queryset = ASNRange.objects.all() model_form = forms.ASNRangeImportForm +@register_model_view(ASNRange, 'bulk_edit', path='edit', detail=False) class ASNRangeBulkEditView(generic.BulkEditView): queryset = ASNRange.objects.annotate_asn_counts() filterset = filtersets.ASNRangeFilterSet @@ -247,6 +266,7 @@ class ASNRangeBulkEditView(generic.BulkEditView): form = forms.ASNRangeBulkEditForm +@register_model_view(ASNRange, 'bulk_delete', path='delete', detail=False) class ASNRangeBulkDeleteView(generic.BulkDeleteView): queryset = ASNRange.objects.annotate_asn_counts() filterset = filtersets.ASNRangeFilterSet @@ -257,6 +277,7 @@ class ASNRangeBulkDeleteView(generic.BulkDeleteView): # ASNs # +@register_model_view(ASN, 'list', path='', detail=False) class ASNListView(generic.ObjectListView): queryset = ASN.objects.annotate( site_count=count_related(Site, 'asns'), @@ -284,6 +305,7 @@ class ASNView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ASN, 'add', detail=False) @register_model_view(ASN, 'edit') class ASNEditView(generic.ObjectEditView): queryset = ASN.objects.all() @@ -295,11 +317,13 @@ class ASNDeleteView(generic.ObjectDeleteView): queryset = ASN.objects.all() +@register_model_view(ASN, 'import', detail=False) class ASNBulkImportView(generic.BulkImportView): queryset = ASN.objects.all() model_form = forms.ASNImportForm +@register_model_view(ASN, 'bulk_edit', path='edit', detail=False) class ASNBulkEditView(generic.BulkEditView): queryset = ASN.objects.annotate( site_count=count_related(Site, 'asns') @@ -309,6 +333,7 @@ class ASNBulkEditView(generic.BulkEditView): form = forms.ASNBulkEditForm +@register_model_view(ASN, 'bulk_delete', path='delete', detail=False) class ASNBulkDeleteView(generic.BulkDeleteView): queryset = ASN.objects.annotate( site_count=count_related(Site, 'asns') @@ -321,6 +346,7 @@ class ASNBulkDeleteView(generic.BulkDeleteView): # Aggregates # +@register_model_view(Aggregate, 'list', path='', detail=False) class AggregateListView(generic.ObjectListView): queryset = Aggregate.objects.annotate( child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ()) @@ -371,6 +397,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView): } +@register_model_view(Aggregate, 'add', detail=False) @register_model_view(Aggregate, 'edit') class AggregateEditView(generic.ObjectEditView): queryset = Aggregate.objects.all() @@ -382,11 +409,13 @@ class AggregateDeleteView(generic.ObjectDeleteView): queryset = Aggregate.objects.all() +@register_model_view(Aggregate, 'import', detail=False) class AggregateBulkImportView(generic.BulkImportView): queryset = Aggregate.objects.all() model_form = forms.AggregateImportForm +@register_model_view(Aggregate, 'bulk_edit', path='edit', detail=False) class AggregateBulkEditView(generic.BulkEditView): queryset = Aggregate.objects.annotate( child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ()) @@ -396,6 +425,7 @@ class AggregateBulkEditView(generic.BulkEditView): form = forms.AggregateBulkEditForm +@register_model_view(Aggregate, 'bulk_delete', path='delete', detail=False) class AggregateBulkDeleteView(generic.BulkDeleteView): queryset = Aggregate.objects.annotate( child_count=RawSQL('SELECT COUNT(*) FROM ipam_prefix WHERE ipam_prefix.prefix <<= ipam_aggregate.prefix', ()) @@ -413,6 +443,7 @@ class AggregateContactsView(ObjectContactsView): # Prefix/VLAN roles # +@register_model_view(Role, 'list', path='', detail=False) class RoleListView(generic.ObjectListView): queryset = Role.objects.annotate( prefix_count=count_related(Prefix, 'role'), @@ -434,6 +465,7 @@ class RoleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Role, 'add', detail=False) @register_model_view(Role, 'edit') class RoleEditView(generic.ObjectEditView): queryset = Role.objects.all() @@ -445,11 +477,13 @@ class RoleDeleteView(generic.ObjectDeleteView): queryset = Role.objects.all() +@register_model_view(Role, 'import', detail=False) class RoleBulkImportView(generic.BulkImportView): queryset = Role.objects.all() model_form = forms.RoleImportForm +@register_model_view(Role, 'bulk_edit', path='edit', detail=False) class RoleBulkEditView(generic.BulkEditView): queryset = Role.objects.all() filterset = filtersets.RoleFilterSet @@ -457,6 +491,7 @@ class RoleBulkEditView(generic.BulkEditView): form = forms.RoleBulkEditForm +@register_model_view(Role, 'bulk_delete', path='delete', detail=False) class RoleBulkDeleteView(generic.BulkDeleteView): queryset = Role.objects.all() filterset = filtersets.RoleFilterSet @@ -467,6 +502,7 @@ class RoleBulkDeleteView(generic.BulkDeleteView): # Prefixes # +@register_model_view(Prefix, 'list', path='', detail=False) class PrefixListView(generic.ObjectListView): queryset = Prefix.objects.all() filterset = filtersets.PrefixFilterSet @@ -615,6 +651,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView): } +@register_model_view(Prefix, 'add', detail=False) @register_model_view(Prefix, 'edit') class PrefixEditView(generic.ObjectEditView): queryset = Prefix.objects.all() @@ -626,11 +663,13 @@ class PrefixDeleteView(generic.ObjectDeleteView): queryset = Prefix.objects.all() +@register_model_view(Prefix, 'import', detail=False) class PrefixBulkImportView(generic.BulkImportView): queryset = Prefix.objects.all() model_form = forms.PrefixImportForm +@register_model_view(Prefix, 'bulk_edit', path='edit', detail=False) class PrefixBulkEditView(generic.BulkEditView): queryset = Prefix.objects.prefetch_related('vrf__tenant') filterset = filtersets.PrefixFilterSet @@ -638,6 +677,7 @@ class PrefixBulkEditView(generic.BulkEditView): form = forms.PrefixBulkEditForm +@register_model_view(Prefix, 'bulk_delete', path='delete', detail=False) class PrefixBulkDeleteView(generic.BulkDeleteView): queryset = Prefix.objects.prefetch_related('vrf__tenant') filterset = filtersets.PrefixFilterSet @@ -653,6 +693,7 @@ class PrefixContactsView(ObjectContactsView): # IP Ranges # +@register_model_view(IPRange, 'list', path='', detail=False) class IPRangeListView(generic.ObjectListView): queryset = IPRange.objects.all() filterset = filtersets.IPRangeFilterSet @@ -704,6 +745,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView): return parent.get_child_ips().restrict(request.user, 'view') +@register_model_view(IPRange, 'add', detail=False) @register_model_view(IPRange, 'edit') class IPRangeEditView(generic.ObjectEditView): queryset = IPRange.objects.all() @@ -715,11 +757,13 @@ class IPRangeDeleteView(generic.ObjectDeleteView): queryset = IPRange.objects.all() +@register_model_view(IPRange, 'import', detail=False) class IPRangeBulkImportView(generic.BulkImportView): queryset = IPRange.objects.all() model_form = forms.IPRangeImportForm +@register_model_view(IPRange, 'bulk_edit', path='edit', detail=False) class IPRangeBulkEditView(generic.BulkEditView): queryset = IPRange.objects.all() filterset = filtersets.IPRangeFilterSet @@ -727,6 +771,7 @@ class IPRangeBulkEditView(generic.BulkEditView): form = forms.IPRangeBulkEditForm +@register_model_view(IPRange, 'bulk_delete', path='delete', detail=False) class IPRangeBulkDeleteView(generic.BulkDeleteView): queryset = IPRange.objects.all() filterset = filtersets.IPRangeFilterSet @@ -742,6 +787,7 @@ class IPRangeContactsView(ObjectContactsView): # IP addresses # +@register_model_view(IPAddress, 'list', path='', detail=False) class IPAddressListView(generic.ObjectListView): queryset = IPAddress.objects.all() filterset = filtersets.IPAddressFilterSet @@ -788,6 +834,7 @@ class IPAddressView(generic.ObjectView): } +@register_model_view(IPAddress, 'add', detail=False) @register_model_view(IPAddress, 'edit') class IPAddressEditView(generic.ObjectEditView): queryset = IPAddress.objects.all() @@ -818,6 +865,7 @@ class IPAddressEditView(generic.ObjectEditView): # TODO: Standardize or remove this view +@register_model_view(IPAddress, 'assign', path='assign', detail=False) class IPAddressAssignView(generic.ObjectView): """ Search for IPAddresses to be assigned to an Interface. @@ -862,6 +910,7 @@ class IPAddressDeleteView(generic.ObjectDeleteView): queryset = IPAddress.objects.all() +@register_model_view(IPAddress, 'bulk_add', path='bulk-add', detail=False) class IPAddressBulkCreateView(generic.BulkCreateView): queryset = IPAddress.objects.all() form = forms.IPAddressBulkCreateForm @@ -870,11 +919,13 @@ class IPAddressBulkCreateView(generic.BulkCreateView): template_name = 'ipam/ipaddress_bulk_add.html' +@register_model_view(IPAddress, 'import', detail=False) class IPAddressBulkImportView(generic.BulkImportView): queryset = IPAddress.objects.all() model_form = forms.IPAddressImportForm +@register_model_view(IPAddress, 'bulk_edit', path='edit', detail=False) class IPAddressBulkEditView(generic.BulkEditView): queryset = IPAddress.objects.prefetch_related('vrf__tenant') filterset = filtersets.IPAddressFilterSet @@ -882,6 +933,7 @@ class IPAddressBulkEditView(generic.BulkEditView): form = forms.IPAddressBulkEditForm +@register_model_view(IPAddress, 'bulk_delete', path='delete', detail=False) class IPAddressBulkDeleteView(generic.BulkDeleteView): queryset = IPAddress.objects.prefetch_related('vrf__tenant') filterset = filtersets.IPAddressFilterSet @@ -915,6 +967,7 @@ class IPAddressContactsView(ObjectContactsView): # VLAN groups # +@register_model_view(VLANGroup, 'list', path='', detail=False) class VLANGroupListView(generic.ObjectListView): queryset = VLANGroup.objects.annotate_utilization() filterset = filtersets.VLANGroupFilterSet @@ -932,6 +985,7 @@ class VLANGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(VLANGroup, 'add', detail=False) @register_model_view(VLANGroup, 'edit') class VLANGroupEditView(generic.ObjectEditView): queryset = VLANGroup.objects.all() @@ -943,11 +997,13 @@ class VLANGroupDeleteView(generic.ObjectDeleteView): queryset = VLANGroup.objects.all() +@register_model_view(VLANGroup, 'import', detail=False) class VLANGroupBulkImportView(generic.BulkImportView): queryset = VLANGroup.objects.all() model_form = forms.VLANGroupImportForm +@register_model_view(VLANGroup, 'bulk_edit', path='edit', detail=False) class VLANGroupBulkEditView(generic.BulkEditView): queryset = VLANGroup.objects.annotate_utilization().prefetch_related('tags') filterset = filtersets.VLANGroupFilterSet @@ -955,6 +1011,7 @@ class VLANGroupBulkEditView(generic.BulkEditView): form = forms.VLANGroupBulkEditForm +@register_model_view(VLANGroup, 'bulk_delete', path='delete', detail=False) class VLANGroupBulkDeleteView(generic.BulkDeleteView): queryset = VLANGroup.objects.annotate_utilization().prefetch_related('tags') filterset = filtersets.VLANGroupFilterSet @@ -991,6 +1048,7 @@ class VLANGroupVLANsView(generic.ObjectChildrenView): # VLAN Translation Policies # +@register_model_view(VLANTranslationPolicy, 'list', path='', detail=False) class VLANTranslationPolicyListView(generic.ObjectListView): queryset = VLANTranslationPolicy.objects.all() filterset = filtersets.VLANTranslationPolicyFilterSet @@ -1012,6 +1070,7 @@ class VLANTranslationPolicyView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(VLANTranslationPolicy, 'add', detail=False) @register_model_view(VLANTranslationPolicy, 'edit') class VLANTranslationPolicyEditView(generic.ObjectEditView): queryset = VLANTranslationPolicy.objects.all() @@ -1023,11 +1082,13 @@ class VLANTranslationPolicyDeleteView(generic.ObjectDeleteView): queryset = VLANTranslationPolicy.objects.all() +@register_model_view(VLANTranslationPolicy, 'import', detail=False) class VLANTranslationPolicyBulkImportView(generic.BulkImportView): queryset = VLANTranslationPolicy.objects.all() model_form = forms.VLANTranslationPolicyImportForm +@register_model_view(VLANTranslationPolicy, 'bulk_edit', path='edit', detail=False) class VLANTranslationPolicyBulkEditView(generic.BulkEditView): queryset = VLANTranslationPolicy.objects.all() filterset = filtersets.VLANTranslationPolicyFilterSet @@ -1035,6 +1096,7 @@ class VLANTranslationPolicyBulkEditView(generic.BulkEditView): form = forms.VLANTranslationPolicyBulkEditForm +@register_model_view(VLANTranslationPolicy, 'bulk_delete', path='delete', detail=False) class VLANTranslationPolicyBulkDeleteView(generic.BulkDeleteView): queryset = VLANTranslationPolicy.objects.all() filterset = filtersets.VLANTranslationPolicyFilterSet @@ -1045,6 +1107,7 @@ class VLANTranslationPolicyBulkDeleteView(generic.BulkDeleteView): # VLAN Translation Rules # +@register_model_view(VLANTranslationRule, 'list', path='', detail=False) class VLANTranslationRuleListView(generic.ObjectListView): queryset = VLANTranslationRule.objects.all() filterset = filtersets.VLANTranslationRuleFilterSet @@ -1062,6 +1125,7 @@ class VLANTranslationRuleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(VLANTranslationRule, 'add', detail=False) @register_model_view(VLANTranslationRule, 'edit') class VLANTranslationRuleEditView(generic.ObjectEditView): queryset = VLANTranslationRule.objects.all() @@ -1073,11 +1137,13 @@ class VLANTranslationRuleDeleteView(generic.ObjectDeleteView): queryset = VLANTranslationRule.objects.all() +@register_model_view(VLANTranslationRule, 'import', detail=False) class VLANTranslationRuleBulkImportView(generic.BulkImportView): queryset = VLANTranslationRule.objects.all() model_form = forms.VLANTranslationRuleImportForm +@register_model_view(VLANTranslationRule, 'bulk_edit', path='edit', detail=False) class VLANTranslationRuleBulkEditView(generic.BulkEditView): queryset = VLANTranslationRule.objects.all() filterset = filtersets.VLANTranslationRuleFilterSet @@ -1085,6 +1151,7 @@ class VLANTranslationRuleBulkEditView(generic.BulkEditView): form = forms.VLANTranslationRuleBulkEditForm +@register_model_view(VLANTranslationRule, 'bulk_delete', path='delete', detail=False) class VLANTranslationRuleBulkDeleteView(generic.BulkDeleteView): queryset = VLANTranslationRule.objects.all() filterset = filtersets.VLANTranslationRuleFilterSet @@ -1095,6 +1162,7 @@ class VLANTranslationRuleBulkDeleteView(generic.BulkDeleteView): # FHRP groups # +@register_model_view(FHRPGroup, 'list', path='', detail=False) class FHRPGroupListView(generic.ObjectListView): queryset = FHRPGroup.objects.annotate( member_count=count_related(FHRPGroupAssignment, 'group') @@ -1122,6 +1190,7 @@ class FHRPGroupView(generic.ObjectView): } +@register_model_view(FHRPGroup, 'add', detail=False) @register_model_view(FHRPGroup, 'edit') class FHRPGroupEditView(generic.ObjectEditView): queryset = FHRPGroup.objects.all() @@ -1149,11 +1218,13 @@ class FHRPGroupDeleteView(generic.ObjectDeleteView): queryset = FHRPGroup.objects.all() +@register_model_view(FHRPGroup, 'import', detail=False) class FHRPGroupBulkImportView(generic.BulkImportView): queryset = FHRPGroup.objects.all() model_form = forms.FHRPGroupImportForm +@register_model_view(FHRPGroup, 'bulk_edit', path='edit', detail=False) class FHRPGroupBulkEditView(generic.BulkEditView): queryset = FHRPGroup.objects.all() filterset = filtersets.FHRPGroupFilterSet @@ -1161,6 +1232,7 @@ class FHRPGroupBulkEditView(generic.BulkEditView): form = forms.FHRPGroupBulkEditForm +@register_model_view(FHRPGroup, 'bulk_delete', path='delete', detail=False) class FHRPGroupBulkDeleteView(generic.BulkDeleteView): queryset = FHRPGroup.objects.all() filterset = filtersets.FHRPGroupFilterSet @@ -1171,6 +1243,7 @@ class FHRPGroupBulkDeleteView(generic.BulkDeleteView): # FHRP group assignments # +@register_model_view(FHRPGroupAssignment, 'add', detail=False) @register_model_view(FHRPGroupAssignment, 'edit') class FHRPGroupAssignmentEditView(generic.ObjectEditView): queryset = FHRPGroupAssignment.objects.all() @@ -1199,6 +1272,7 @@ class FHRPGroupAssignmentDeleteView(generic.ObjectDeleteView): # VLANs # +@register_model_view(VLAN, 'list', path='', detail=False) class VLANListView(generic.ObjectListView): queryset = VLAN.objects.all() filterset = filtersets.VLANFilterSet @@ -1257,6 +1331,7 @@ class VLANVMInterfacesView(generic.ObjectChildrenView): return parent.get_vminterfaces().restrict(request.user, 'view') +@register_model_view(VLAN, 'add', detail=False) @register_model_view(VLAN, 'edit') class VLANEditView(generic.ObjectEditView): queryset = VLAN.objects.all() @@ -1269,11 +1344,13 @@ class VLANDeleteView(generic.ObjectDeleteView): queryset = VLAN.objects.all() +@register_model_view(VLAN, 'import', detail=False) class VLANBulkImportView(generic.BulkImportView): queryset = VLAN.objects.all() model_form = forms.VLANImportForm +@register_model_view(VLAN, 'bulk_edit', path='edit', detail=False) class VLANBulkEditView(generic.BulkEditView): queryset = VLAN.objects.all() filterset = filtersets.VLANFilterSet @@ -1281,6 +1358,7 @@ class VLANBulkEditView(generic.BulkEditView): form = forms.VLANBulkEditForm +@register_model_view(VLAN, 'bulk_delete', path='delete', detail=False) class VLANBulkDeleteView(generic.BulkDeleteView): queryset = VLAN.objects.all() filterset = filtersets.VLANFilterSet @@ -1291,6 +1369,7 @@ class VLANBulkDeleteView(generic.BulkDeleteView): # Service templates # +@register_model_view(ServiceTemplate, 'list', path='', detail=False) class ServiceTemplateListView(generic.ObjectListView): queryset = ServiceTemplate.objects.all() filterset = filtersets.ServiceTemplateFilterSet @@ -1303,6 +1382,7 @@ class ServiceTemplateView(generic.ObjectView): queryset = ServiceTemplate.objects.all() +@register_model_view(ServiceTemplate, 'add', detail=False) @register_model_view(ServiceTemplate, 'edit') class ServiceTemplateEditView(generic.ObjectEditView): queryset = ServiceTemplate.objects.all() @@ -1314,11 +1394,13 @@ class ServiceTemplateDeleteView(generic.ObjectDeleteView): queryset = ServiceTemplate.objects.all() +@register_model_view(ServiceTemplate, 'import', detail=False) class ServiceTemplateBulkImportView(generic.BulkImportView): queryset = ServiceTemplate.objects.all() model_form = forms.ServiceTemplateImportForm +@register_model_view(ServiceTemplate, 'bulk_edit', path='edit', detail=False) class ServiceTemplateBulkEditView(generic.BulkEditView): queryset = ServiceTemplate.objects.all() filterset = filtersets.ServiceTemplateFilterSet @@ -1326,6 +1408,7 @@ class ServiceTemplateBulkEditView(generic.BulkEditView): form = forms.ServiceTemplateBulkEditForm +@register_model_view(ServiceTemplate, 'bulk_delete', path='delete', detail=False) class ServiceTemplateBulkDeleteView(generic.BulkDeleteView): queryset = ServiceTemplate.objects.all() filterset = filtersets.ServiceTemplateFilterSet @@ -1336,6 +1419,7 @@ class ServiceTemplateBulkDeleteView(generic.BulkDeleteView): # Services # +@register_model_view(Service, 'list', path='', detail=False) class ServiceListView(generic.ObjectListView): queryset = Service.objects.prefetch_related('device', 'virtual_machine') filterset = filtersets.ServiceFilterSet @@ -1348,6 +1432,7 @@ class ServiceView(generic.ObjectView): queryset = Service.objects.all() +@register_model_view(Service, 'add', detail=False) class ServiceCreateView(generic.ObjectEditView): queryset = Service.objects.all() form = forms.ServiceCreateForm @@ -1364,11 +1449,13 @@ class ServiceDeleteView(generic.ObjectDeleteView): queryset = Service.objects.all() +@register_model_view(Service, 'import', detail=False) class ServiceBulkImportView(generic.BulkImportView): queryset = Service.objects.all() model_form = forms.ServiceImportForm +@register_model_view(Service, 'bulk_edit', path='edit', detail=False) class ServiceBulkEditView(generic.BulkEditView): queryset = Service.objects.prefetch_related('device', 'virtual_machine') filterset = filtersets.ServiceFilterSet @@ -1376,6 +1463,7 @@ class ServiceBulkEditView(generic.BulkEditView): form = forms.ServiceBulkEditForm +@register_model_view(Service, 'bulk_delete', path='delete', detail=False) class ServiceBulkDeleteView(generic.BulkDeleteView): queryset = Service.objects.prefetch_related('device', 'virtual_machine') filterset = filtersets.ServiceFilterSet diff --git a/netbox/tenancy/urls.py b/netbox/tenancy/urls.py index ad9908c62..cd0caabdc 100644 --- a/netbox/tenancy/urls.py +++ b/netbox/tenancy/urls.py @@ -1,57 +1,27 @@ from django.urls import include, path from utilities.urls import get_model_urls -from . import views +from . import views # noqa F401 app_name = 'tenancy' urlpatterns = [ - # Tenant groups - path('tenant-groups/', views.TenantGroupListView.as_view(), name='tenantgroup_list'), - path('tenant-groups/add/', views.TenantGroupEditView.as_view(), name='tenantgroup_add'), - path('tenant-groups/import/', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'), - path('tenant-groups/edit/', views.TenantGroupBulkEditView.as_view(), name='tenantgroup_bulk_edit'), - path('tenant-groups/delete/', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'), + path('tenant-groups/', include(get_model_urls('tenancy', 'tenantgroup', detail=False))), path('tenant-groups//', include(get_model_urls('tenancy', 'tenantgroup'))), - # Tenants - path('tenants/', views.TenantListView.as_view(), name='tenant_list'), - path('tenants/add/', views.TenantEditView.as_view(), name='tenant_add'), - path('tenants/import/', views.TenantBulkImportView.as_view(), name='tenant_import'), - path('tenants/edit/', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'), - path('tenants/delete/', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'), + path('tenants/', include(get_model_urls('tenancy', 'tenant', detail=False))), path('tenants//', include(get_model_urls('tenancy', 'tenant'))), - # Contact groups - path('contact-groups/', views.ContactGroupListView.as_view(), name='contactgroup_list'), - path('contact-groups/add/', views.ContactGroupEditView.as_view(), name='contactgroup_add'), - path('contact-groups/import/', views.ContactGroupBulkImportView.as_view(), name='contactgroup_import'), - path('contact-groups/edit/', views.ContactGroupBulkEditView.as_view(), name='contactgroup_bulk_edit'), - path('contact-groups/delete/', views.ContactGroupBulkDeleteView.as_view(), name='contactgroup_bulk_delete'), + path('contact-groups/', include(get_model_urls('tenancy', 'contactgroup', detail=False))), path('contact-groups//', include(get_model_urls('tenancy', 'contactgroup'))), - # Contact roles - path('contact-roles/', views.ContactRoleListView.as_view(), name='contactrole_list'), - path('contact-roles/add/', views.ContactRoleEditView.as_view(), name='contactrole_add'), - path('contact-roles/import/', views.ContactRoleBulkImportView.as_view(), name='contactrole_import'), - path('contact-roles/edit/', views.ContactRoleBulkEditView.as_view(), name='contactrole_bulk_edit'), - path('contact-roles/delete/', views.ContactRoleBulkDeleteView.as_view(), name='contactrole_bulk_delete'), + path('contact-roles/', include(get_model_urls('tenancy', 'contactrole', detail=False))), path('contact-roles//', include(get_model_urls('tenancy', 'contactrole'))), - # Contacts - path('contacts/', views.ContactListView.as_view(), name='contact_list'), - path('contacts/add/', views.ContactEditView.as_view(), name='contact_add'), - path('contacts/import/', views.ContactBulkImportView.as_view(), name='contact_import'), - path('contacts/edit/', views.ContactBulkEditView.as_view(), name='contact_bulk_edit'), - path('contacts/delete/', views.ContactBulkDeleteView.as_view(), name='contact_bulk_delete'), + path('contacts/', include(get_model_urls('tenancy', 'contact', detail=False))), path('contacts//', include(get_model_urls('tenancy', 'contact'))), - # Contact assignments - path('contact-assignments/', views.ContactAssignmentListView.as_view(), name='contactassignment_list'), - path('contact-assignments/add/', views.ContactAssignmentEditView.as_view(), name='contactassignment_add'), - path('contact-assignments/import/', views.ContactAssignmentBulkImportView.as_view(), name='contactassignment_import'), - path('contact-assignments/edit/', views.ContactAssignmentBulkEditView.as_view(), name='contactassignment_bulk_edit'), - path('contact-assignments/delete/', views.ContactAssignmentBulkDeleteView.as_view(), name='contactassignment_bulk_delete'), + path('contact-assignments/', include(get_model_urls('tenancy', 'contactassignment', detail=False))), path('contact-assignments//', include(get_model_urls('tenancy', 'contactassignment'))), ] diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 96b2cb071..6f16842f6 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -37,11 +37,12 @@ class ObjectContactsView(generic.ObjectChildrenView): return table + # # Tenant groups # - +@register_model_view(TenantGroup, 'list', path='', detail=False) class TenantGroupListView(generic.ObjectListView): queryset = TenantGroup.objects.add_related_count( TenantGroup.objects.all(), @@ -67,6 +68,7 @@ class TenantGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(TenantGroup, 'add', detail=False) @register_model_view(TenantGroup, 'edit') class TenantGroupEditView(generic.ObjectEditView): queryset = TenantGroup.objects.all() @@ -78,11 +80,13 @@ class TenantGroupDeleteView(generic.ObjectDeleteView): queryset = TenantGroup.objects.all() +@register_model_view(TenantGroup, 'import', detail=False) class TenantGroupBulkImportView(generic.BulkImportView): queryset = TenantGroup.objects.all() model_form = forms.TenantGroupImportForm +@register_model_view(TenantGroup, 'bulk_edit', path='edit', detail=False) class TenantGroupBulkEditView(generic.BulkEditView): queryset = TenantGroup.objects.add_related_count( TenantGroup.objects.all(), @@ -96,6 +100,7 @@ class TenantGroupBulkEditView(generic.BulkEditView): form = forms.TenantGroupBulkEditForm +@register_model_view(TenantGroup, 'bulk_delete', path='delete', detail=False) class TenantGroupBulkDeleteView(generic.BulkDeleteView): queryset = TenantGroup.objects.add_related_count( TenantGroup.objects.all(), @@ -112,6 +117,7 @@ class TenantGroupBulkDeleteView(generic.BulkDeleteView): # Tenants # +@register_model_view(Tenant, 'list', path='', detail=False) class TenantListView(generic.ObjectListView): queryset = Tenant.objects.all() filterset = filtersets.TenantFilterSet @@ -129,6 +135,7 @@ class TenantView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(Tenant, 'add', detail=False) @register_model_view(Tenant, 'edit') class TenantEditView(generic.ObjectEditView): queryset = Tenant.objects.all() @@ -140,11 +147,13 @@ class TenantDeleteView(generic.ObjectDeleteView): queryset = Tenant.objects.all() +@register_model_view(Tenant, 'import', detail=False) class TenantBulkImportView(generic.BulkImportView): queryset = Tenant.objects.all() model_form = forms.TenantImportForm +@register_model_view(Tenant, 'bulk_edit', path='edit', detail=False) class TenantBulkEditView(generic.BulkEditView): queryset = Tenant.objects.all() filterset = filtersets.TenantFilterSet @@ -152,6 +161,7 @@ class TenantBulkEditView(generic.BulkEditView): form = forms.TenantBulkEditForm +@register_model_view(Tenant, 'bulk_delete', path='delete', detail=False) class TenantBulkDeleteView(generic.BulkDeleteView): queryset = Tenant.objects.all() filterset = filtersets.TenantFilterSet @@ -167,6 +177,7 @@ class TenantContactsView(ObjectContactsView): # Contact groups # +@register_model_view(ContactGroup, 'list', path='', detail=False) class ContactGroupListView(generic.ObjectListView): queryset = ContactGroup.objects.add_related_count( ContactGroup.objects.all(), @@ -192,6 +203,7 @@ class ContactGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ContactGroup, 'add', detail=False) @register_model_view(ContactGroup, 'edit') class ContactGroupEditView(generic.ObjectEditView): queryset = ContactGroup.objects.all() @@ -203,11 +215,13 @@ class ContactGroupDeleteView(generic.ObjectDeleteView): queryset = ContactGroup.objects.all() +@register_model_view(ContactGroup, 'import', detail=False) class ContactGroupBulkImportView(generic.BulkImportView): queryset = ContactGroup.objects.all() model_form = forms.ContactGroupImportForm +@register_model_view(ContactGroup, 'bulk_edit', path='edit', detail=False) class ContactGroupBulkEditView(generic.BulkEditView): queryset = ContactGroup.objects.add_related_count( ContactGroup.objects.all(), @@ -221,6 +235,7 @@ class ContactGroupBulkEditView(generic.BulkEditView): form = forms.ContactGroupBulkEditForm +@register_model_view(ContactGroup, 'bulk_delete', path='delete', detail=False) class ContactGroupBulkDeleteView(generic.BulkDeleteView): queryset = ContactGroup.objects.add_related_count( ContactGroup.objects.all(), @@ -237,6 +252,7 @@ class ContactGroupBulkDeleteView(generic.BulkDeleteView): # Contact roles # +@register_model_view(ContactRole, 'list', path='', detail=False) class ContactRoleListView(generic.ObjectListView): queryset = ContactRole.objects.all() filterset = filtersets.ContactRoleFilterSet @@ -254,6 +270,7 @@ class ContactRoleView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ContactRole, 'add', detail=False) @register_model_view(ContactRole, 'edit') class ContactRoleEditView(generic.ObjectEditView): queryset = ContactRole.objects.all() @@ -265,11 +282,13 @@ class ContactRoleDeleteView(generic.ObjectDeleteView): queryset = ContactRole.objects.all() +@register_model_view(ContactRole, 'import', detail=False) class ContactRoleBulkImportView(generic.BulkImportView): queryset = ContactRole.objects.all() model_form = forms.ContactRoleImportForm +@register_model_view(ContactRole, 'bulk_edit', path='edit', detail=False) class ContactRoleBulkEditView(generic.BulkEditView): queryset = ContactRole.objects.all() filterset = filtersets.ContactRoleFilterSet @@ -277,6 +296,7 @@ class ContactRoleBulkEditView(generic.BulkEditView): form = forms.ContactRoleBulkEditForm +@register_model_view(ContactRole, 'bulk_delete', path='delete', detail=False) class ContactRoleBulkDeleteView(generic.BulkDeleteView): queryset = ContactRole.objects.all() filterset = filtersets.ContactRoleFilterSet @@ -287,6 +307,7 @@ class ContactRoleBulkDeleteView(generic.BulkDeleteView): # Contacts # +@register_model_view(Contact, 'list', path='', detail=False) class ContactListView(generic.ObjectListView): queryset = Contact.objects.annotate( assignment_count=count_related(ContactAssignment, 'contact') @@ -301,6 +322,7 @@ class ContactView(generic.ObjectView): queryset = Contact.objects.all() +@register_model_view(Contact, 'add', detail=False) @register_model_view(Contact, 'edit') class ContactEditView(generic.ObjectEditView): queryset = Contact.objects.all() @@ -312,11 +334,13 @@ class ContactDeleteView(generic.ObjectDeleteView): queryset = Contact.objects.all() +@register_model_view(Contact, 'import', detail=False) class ContactBulkImportView(generic.BulkImportView): queryset = Contact.objects.all() model_form = forms.ContactImportForm +@register_model_view(Contact, 'bulk_edit', path='edit', detail=False) class ContactBulkEditView(generic.BulkEditView): queryset = Contact.objects.annotate( assignment_count=count_related(ContactAssignment, 'contact') @@ -326,6 +350,7 @@ class ContactBulkEditView(generic.BulkEditView): form = forms.ContactBulkEditForm +@register_model_view(Contact, 'bulk_delete', path='delete', detail=False) class ContactBulkDeleteView(generic.BulkDeleteView): queryset = Contact.objects.annotate( assignment_count=count_related(ContactAssignment, 'contact') @@ -333,11 +358,12 @@ class ContactBulkDeleteView(generic.BulkDeleteView): filterset = filtersets.ContactFilterSet table = tables.ContactTable + # # Contact assignments # - +@register_model_view(ContactAssignment, 'list', path='', detail=False) class ContactAssignmentListView(generic.ObjectListView): queryset = ContactAssignment.objects.all() filterset = filtersets.ContactAssignmentFilterSet @@ -351,6 +377,7 @@ class ContactAssignmentListView(generic.ObjectListView): } +@register_model_view(ContactAssignment, 'add', detail=False) @register_model_view(ContactAssignment, 'edit') class ContactAssignmentEditView(generic.ObjectEditView): queryset = ContactAssignment.objects.all() @@ -370,6 +397,13 @@ class ContactAssignmentEditView(generic.ObjectEditView): } +@register_model_view(ContactAssignment, 'import', detail=False) +class ContactAssignmentBulkImportView(generic.BulkImportView): + queryset = ContactAssignment.objects.all() + model_form = forms.ContactAssignmentImportForm + + +@register_model_view(ContactAssignment, 'bulk_edit', path='edit', detail=False) class ContactAssignmentBulkEditView(generic.BulkEditView): queryset = ContactAssignment.objects.all() filterset = filtersets.ContactAssignmentFilterSet @@ -377,11 +411,7 @@ class ContactAssignmentBulkEditView(generic.BulkEditView): form = forms.ContactAssignmentBulkEditForm -class ContactAssignmentBulkImportView(generic.BulkImportView): - queryset = ContactAssignment.objects.all() - model_form = forms.ContactAssignmentImportForm - - +@register_model_view(ContactAssignment, 'bulk_delete', path='delete', detail=False) class ContactAssignmentBulkDeleteView(generic.BulkDeleteView): queryset = ContactAssignment.objects.all() filterset = filtersets.ContactAssignmentFilterSet diff --git a/netbox/users/urls.py b/netbox/users/urls.py index 0540eae1f..83f120702 100644 --- a/netbox/users/urls.py +++ b/netbox/users/urls.py @@ -1,40 +1,21 @@ from django.urls import include, path from utilities.urls import get_model_urls -from . import views +from . import views # noqa F401 app_name = 'users' urlpatterns = [ - # Tokens - path('tokens/', views.TokenListView.as_view(), name='token_list'), - path('tokens/add/', views.TokenEditView.as_view(), name='token_add'), - path('tokens/import/', views.TokenBulkImportView.as_view(), name='token_import'), - path('tokens/edit/', views.TokenBulkEditView.as_view(), name='token_bulk_edit'), - path('tokens/delete/', views.TokenBulkDeleteView.as_view(), name='token_bulk_delete'), + path('tokens/', include(get_model_urls('users', 'token', detail=False))), path('tokens//', include(get_model_urls('users', 'token'))), - # Users - path('users/', views.UserListView.as_view(), name='user_list'), - path('users/add/', views.UserEditView.as_view(), name='user_add'), - path('users/edit/', views.UserBulkEditView.as_view(), name='user_bulk_edit'), - path('users/import/', views.UserBulkImportView.as_view(), name='user_import'), - path('users/delete/', views.UserBulkDeleteView.as_view(), name='user_bulk_delete'), + path('users/', include(get_model_urls('users', 'user', detail=False))), path('users//', include(get_model_urls('users', 'user'))), - # Groups - path('groups/', views.GroupListView.as_view(), name='group_list'), - path('groups/add/', views.GroupEditView.as_view(), name='group_add'), - path('groups/edit/', views.GroupBulkEditView.as_view(), name='group_bulk_edit'), - path('groups/import/', views.GroupBulkImportView.as_view(), name='group_import'), - path('groups/delete/', views.GroupBulkDeleteView.as_view(), name='group_bulk_delete'), + path('groups/', include(get_model_urls('users', 'group', detail=False))), path('groups//', include(get_model_urls('users', 'group'))), - # Permissions - path('permissions/', views.ObjectPermissionListView.as_view(), name='objectpermission_list'), - path('permissions/add/', views.ObjectPermissionEditView.as_view(), name='objectpermission_add'), - path('permissions/edit/', views.ObjectPermissionBulkEditView.as_view(), name='objectpermission_bulk_edit'), - path('permissions/delete/', views.ObjectPermissionBulkDeleteView.as_view(), name='objectpermission_bulk_delete'), + path('permissions/', include(get_model_urls('users', 'objectpermission', detail=False))), path('permissions//', include(get_model_urls('users', 'objectpermission'))), ] diff --git a/netbox/users/views.py b/netbox/users/views.py index b2f9a8d04..904a44674 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -12,6 +12,7 @@ from .models import Group, User, ObjectPermission, Token # Tokens # +@register_model_view(Token, 'list', path='', detail=False) class TokenListView(generic.ObjectListView): queryset = Token.objects.all() filterset = filtersets.TokenFilterSet @@ -24,6 +25,7 @@ class TokenView(generic.ObjectView): queryset = Token.objects.all() +@register_model_view(Token, 'add', detail=False) @register_model_view(Token, 'edit') class TokenEditView(generic.ObjectEditView): queryset = Token.objects.all() @@ -36,17 +38,20 @@ class TokenDeleteView(generic.ObjectDeleteView): queryset = Token.objects.all() +@register_model_view(Token, 'import', detail=False) class TokenBulkImportView(generic.BulkImportView): queryset = Token.objects.all() model_form = forms.TokenImportForm +@register_model_view(Token, 'bulk_edit', path='edit', detail=False) class TokenBulkEditView(generic.BulkEditView): queryset = Token.objects.all() table = tables.TokenTable form = forms.TokenBulkEditForm +@register_model_view(Token, 'bulk_delete', path='delete', detail=False) class TokenBulkDeleteView(generic.BulkDeleteView): queryset = Token.objects.all() table = tables.TokenTable @@ -56,6 +61,7 @@ class TokenBulkDeleteView(generic.BulkDeleteView): # Users # +@register_model_view(User, 'list', path='', detail=False) class UserListView(generic.ObjectListView): queryset = User.objects.all() filterset = filtersets.UserFilterSet @@ -77,6 +83,7 @@ class UserView(generic.ObjectView): } +@register_model_view(User, 'add', detail=False) @register_model_view(User, 'edit') class UserEditView(generic.ObjectEditView): queryset = User.objects.all() @@ -88,6 +95,13 @@ class UserDeleteView(generic.ObjectDeleteView): queryset = User.objects.all() +@register_model_view(User, 'import', detail=False) +class UserBulkImportView(generic.BulkImportView): + queryset = User.objects.all() + model_form = forms.UserImportForm + + +@register_model_view(User, 'bulk_edit', path='edit', detail=False) class UserBulkEditView(generic.BulkEditView): queryset = User.objects.all() filterset = filtersets.UserFilterSet @@ -95,11 +109,7 @@ class UserBulkEditView(generic.BulkEditView): form = forms.UserBulkEditForm -class UserBulkImportView(generic.BulkImportView): - queryset = User.objects.all() - model_form = forms.UserImportForm - - +@register_model_view(User, 'bulk_delete', path='delete', detail=False) class UserBulkDeleteView(generic.BulkDeleteView): queryset = User.objects.all() filterset = filtersets.UserFilterSet @@ -110,6 +120,7 @@ class UserBulkDeleteView(generic.BulkDeleteView): # Groups # +@register_model_view(Group, 'list', path='', detail=False) class GroupListView(generic.ObjectListView): queryset = Group.objects.annotate(users_count=Count('user')).order_by('name') filterset = filtersets.GroupFilterSet @@ -123,6 +134,7 @@ class GroupView(generic.ObjectView): template_name = 'users/group.html' +@register_model_view(Group, 'add', detail=False) @register_model_view(Group, 'edit') class GroupEditView(generic.ObjectEditView): queryset = Group.objects.all() @@ -134,11 +146,13 @@ class GroupDeleteView(generic.ObjectDeleteView): queryset = Group.objects.all() +@register_model_view(Group, 'import', detail=False) class GroupBulkImportView(generic.BulkImportView): queryset = Group.objects.all() model_form = forms.GroupImportForm +@register_model_view(Group, 'bulk_edit', path='edit', detail=False) class GroupBulkEditView(generic.BulkEditView): queryset = Group.objects.all() filterset = filtersets.GroupFilterSet @@ -146,6 +160,7 @@ class GroupBulkEditView(generic.BulkEditView): form = forms.GroupBulkEditForm +@register_model_view(Group, 'bulk_delete', path='delete', detail=False) class GroupBulkDeleteView(generic.BulkDeleteView): queryset = Group.objects.annotate(users_count=Count('user')).order_by('name') filterset = filtersets.GroupFilterSet @@ -156,6 +171,7 @@ class GroupBulkDeleteView(generic.BulkDeleteView): # ObjectPermissions # +@register_model_view(ObjectPermission, 'list', path='', detail=False) class ObjectPermissionListView(generic.ObjectListView): queryset = ObjectPermission.objects.all() filterset = filtersets.ObjectPermissionFilterSet @@ -169,6 +185,7 @@ class ObjectPermissionView(generic.ObjectView): template_name = 'users/objectpermission.html' +@register_model_view(ObjectPermission, 'add', detail=False) @register_model_view(ObjectPermission, 'edit') class ObjectPermissionEditView(generic.ObjectEditView): queryset = ObjectPermission.objects.all() @@ -180,6 +197,7 @@ class ObjectPermissionDeleteView(generic.ObjectDeleteView): queryset = ObjectPermission.objects.all() +@register_model_view(ObjectPermission, 'bulk_edit', path='edit', detail=False) class ObjectPermissionBulkEditView(generic.BulkEditView): queryset = ObjectPermission.objects.all() filterset = filtersets.ObjectPermissionFilterSet @@ -187,6 +205,7 @@ class ObjectPermissionBulkEditView(generic.BulkEditView): form = forms.ObjectPermissionBulkEditForm +@register_model_view(ObjectPermission, 'bulk_delete', path='delete', detail=False) class ObjectPermissionBulkDeleteView(generic.BulkDeleteView): queryset = ObjectPermission.objects.all() filterset = filtersets.ObjectPermissionFilterSet diff --git a/netbox/utilities/urls.py b/netbox/utilities/urls.py index a1132d81c..77968eb87 100644 --- a/netbox/utilities/urls.py +++ b/netbox/utilities/urls.py @@ -9,22 +9,27 @@ __all__ = ( ) -def get_model_urls(app_label, model_name): +def get_model_urls(app_label, model_name, detail=True): """ Return a list of URL paths for detail views registered to the given model. Args: app_label: App/plugin name model_name: Model name + detail: If True (default), return only URL views for an individual object. + Otherwise, return only list views. """ paths = [] # Retrieve registered views for this model try: - views = registry['views'][app_label][model_name] + views = [ + view for view in registry['views'][app_label][model_name] + if view['detail'] == detail + ] except KeyError: # No views have been registered for this model - views = [] + return [] for config in views: # Import the view class or function diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index f7181ea92..b3334ca87 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -272,7 +272,7 @@ def get_viewname(model, action=None, rest_api=False): return viewname -def register_model_view(model, name='', path=None, kwargs=None): +def register_model_view(model, name='', path=None, detail=True, kwargs=None): """ This decorator can be used to "attach" a view to any model in NetBox. This is typically used to inject additional tabs within a model's detail view. For example, to add a custom tab to NetBox's dcim.Site model: @@ -289,6 +289,7 @@ def register_model_view(model, name='', path=None, kwargs=None): name: The string used to form the view's name for URL resolution (e.g. via `reverse()`). This will be appended to the name of the base view for the model using an underscore. If blank, the model name will be used. path: The URL path by which the view can be reached (optional). If not provided, `name` will be used. + detail: True if the path applied to an individual object; False if it attaches to the base (list) path. kwargs: A dictionary of keyword arguments for the view to include when registering its URL path (optional). """ def _wrapper(cls): @@ -301,7 +302,8 @@ def register_model_view(model, name='', path=None, kwargs=None): registry['views'][app_label][model_name].append({ 'name': name, 'view': cls, - 'path': path or name, + 'path': path if path is not None else name, + 'detail': detail, 'kwargs': kwargs or {}, }) diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py index 6d90645a3..2aeeead77 100644 --- a/netbox/virtualization/urls.py +++ b/netbox/virtualization/urls.py @@ -6,57 +6,33 @@ from . import views app_name = 'virtualization' urlpatterns = [ - # Cluster types - path('cluster-types/', views.ClusterTypeListView.as_view(), name='clustertype_list'), - path('cluster-types/add/', views.ClusterTypeEditView.as_view(), name='clustertype_add'), - path('cluster-types/import/', views.ClusterTypeBulkImportView.as_view(), name='clustertype_import'), - path('cluster-types/edit/', views.ClusterTypeBulkEditView.as_view(), name='clustertype_bulk_edit'), - path('cluster-types/delete/', views.ClusterTypeBulkDeleteView.as_view(), name='clustertype_bulk_delete'), + path('cluster-types/', include(get_model_urls('virtualization', 'clustertype', detail=False))), path('cluster-types//', include(get_model_urls('virtualization', 'clustertype'))), - # Cluster groups - path('cluster-groups/', views.ClusterGroupListView.as_view(), name='clustergroup_list'), - path('cluster-groups/add/', views.ClusterGroupEditView.as_view(), name='clustergroup_add'), - path('cluster-groups/import/', views.ClusterGroupBulkImportView.as_view(), name='clustergroup_import'), - path('cluster-groups/edit/', views.ClusterGroupBulkEditView.as_view(), name='clustergroup_bulk_edit'), - path('cluster-groups/delete/', views.ClusterGroupBulkDeleteView.as_view(), name='clustergroup_bulk_delete'), + path('cluster-groups/', include(get_model_urls('virtualization', 'clustergroup', detail=False))), path('cluster-groups//', include(get_model_urls('virtualization', 'clustergroup'))), - # Clusters - path('clusters/', views.ClusterListView.as_view(), name='cluster_list'), - path('clusters/add/', views.ClusterEditView.as_view(), name='cluster_add'), - path('clusters/import/', views.ClusterBulkImportView.as_view(), name='cluster_import'), - path('clusters/edit/', views.ClusterBulkEditView.as_view(), name='cluster_bulk_edit'), - path('clusters/delete/', views.ClusterBulkDeleteView.as_view(), name='cluster_bulk_delete'), + path('clusters/', include(get_model_urls('virtualization', 'cluster', detail=False))), path('clusters//', include(get_model_urls('virtualization', 'cluster'))), - # Virtual machines - path('virtual-machines/', views.VirtualMachineListView.as_view(), name='virtualmachine_list'), - path('virtual-machines/add/', views.VirtualMachineEditView.as_view(), name='virtualmachine_add'), - path('virtual-machines/import/', views.VirtualMachineBulkImportView.as_view(), name='virtualmachine_import'), - path('virtual-machines/edit/', views.VirtualMachineBulkEditView.as_view(), name='virtualmachine_bulk_edit'), - path('virtual-machines/delete/', views.VirtualMachineBulkDeleteView.as_view(), name='virtualmachine_bulk_delete'), + path('virtual-machines/', include(get_model_urls('virtualization', 'virtualmachine', detail=False))), path('virtual-machines//', include(get_model_urls('virtualization', 'virtualmachine'))), - # VM interfaces - path('interfaces/', views.VMInterfaceListView.as_view(), name='vminterface_list'), - path('interfaces/add/', views.VMInterfaceCreateView.as_view(), name='vminterface_add'), - path('interfaces/import/', views.VMInterfaceBulkImportView.as_view(), name='vminterface_import'), - path('interfaces/edit/', views.VMInterfaceBulkEditView.as_view(), name='vminterface_bulk_edit'), - path('interfaces/rename/', views.VMInterfaceBulkRenameView.as_view(), name='vminterface_bulk_rename'), - path('interfaces/delete/', views.VMInterfaceBulkDeleteView.as_view(), name='vminterface_bulk_delete'), + path('interfaces/', include(get_model_urls('virtualization', 'vminterface', detail=False))), path('interfaces//', include(get_model_urls('virtualization', 'vminterface'))), - path('virtual-machines/interfaces/add/', views.VirtualMachineBulkAddInterfaceView.as_view(), name='virtualmachine_bulk_add_vminterface'), + path( + 'virtual-machines/interfaces/add/', + views.VirtualMachineBulkAddInterfaceView.as_view(), + name='virtualmachine_bulk_add_vminterface' + ), - # Virtual disks - path('virtual-disks/', views.VirtualDiskListView.as_view(), name='virtualdisk_list'), - path('virtual-disks/add/', views.VirtualDiskCreateView.as_view(), name='virtualdisk_add'), - path('virtual-disks/import/', views.VirtualDiskBulkImportView.as_view(), name='virtualdisk_import'), - path('virtual-disks/edit/', views.VirtualDiskBulkEditView.as_view(), name='virtualdisk_bulk_edit'), - path('virtual-disks/rename/', views.VirtualDiskBulkRenameView.as_view(), name='virtualdisk_bulk_rename'), - path('virtual-disks/delete/', views.VirtualDiskBulkDeleteView.as_view(), name='virtualdisk_bulk_delete'), + path('virtual-disks/', include(get_model_urls('virtualization', 'virtualdisk', detail=False))), path('virtual-disks//', include(get_model_urls('virtualization', 'virtualdisk'))), - path('virtual-machines/disks/add/', views.VirtualMachineBulkAddVirtualDiskView.as_view(), name='virtualmachine_bulk_add_virtualdisk'), + path( + 'virtual-machines/disks/add/', + views.VirtualMachineBulkAddVirtualDiskView.as_view(), + name='virtualmachine_bulk_add_virtualdisk' + ), # TODO: Remove in v4.2 # Redirect old (pre-v4.1) URLs for VirtualDisk views diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 35f2f8f75..605de0911 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -31,6 +31,7 @@ from .models import * # Cluster types # +@register_model_view(ClusterType, 'list', path='', detail=False) class ClusterTypeListView(generic.ObjectListView): queryset = ClusterType.objects.annotate( cluster_count=count_related(Cluster, 'type') @@ -50,6 +51,7 @@ class ClusterTypeView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ClusterType, 'add', detail=False) @register_model_view(ClusterType, 'edit') class ClusterTypeEditView(generic.ObjectEditView): queryset = ClusterType.objects.all() @@ -61,11 +63,13 @@ class ClusterTypeDeleteView(generic.ObjectDeleteView): queryset = ClusterType.objects.all() +@register_model_view(ClusterType, 'import', detail=False) class ClusterTypeBulkImportView(generic.BulkImportView): queryset = ClusterType.objects.all() model_form = forms.ClusterTypeImportForm +@register_model_view(ClusterType, 'bulk_edit', path='edit', detail=False) class ClusterTypeBulkEditView(generic.BulkEditView): queryset = ClusterType.objects.annotate( cluster_count=count_related(Cluster, 'type') @@ -75,6 +79,7 @@ class ClusterTypeBulkEditView(generic.BulkEditView): form = forms.ClusterTypeBulkEditForm +@register_model_view(ClusterType, 'bulk_delete', path='delete', detail=False) class ClusterTypeBulkDeleteView(generic.BulkDeleteView): queryset = ClusterType.objects.annotate( cluster_count=count_related(Cluster, 'type') @@ -87,6 +92,7 @@ class ClusterTypeBulkDeleteView(generic.BulkDeleteView): # Cluster groups # +@register_model_view(ClusterGroup, 'list', path='', detail=False) class ClusterGroupListView(generic.ObjectListView): queryset = ClusterGroup.objects.annotate( cluster_count=count_related(Cluster, 'group') @@ -106,6 +112,7 @@ class ClusterGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(ClusterGroup, 'add', detail=False) @register_model_view(ClusterGroup, 'edit') class ClusterGroupEditView(generic.ObjectEditView): queryset = ClusterGroup.objects.all() @@ -117,6 +124,7 @@ class ClusterGroupDeleteView(generic.ObjectDeleteView): queryset = ClusterGroup.objects.all() +@register_model_view(ClusterGroup, 'import', detail=False) class ClusterGroupBulkImportView(generic.BulkImportView): queryset = ClusterGroup.objects.annotate( cluster_count=count_related(Cluster, 'group') @@ -124,6 +132,7 @@ class ClusterGroupBulkImportView(generic.BulkImportView): model_form = forms.ClusterGroupImportForm +@register_model_view(ClusterGroup, 'bulk_edit', path='edit', detail=False) class ClusterGroupBulkEditView(generic.BulkEditView): queryset = ClusterGroup.objects.annotate( cluster_count=count_related(Cluster, 'group') @@ -133,6 +142,7 @@ class ClusterGroupBulkEditView(generic.BulkEditView): form = forms.ClusterGroupBulkEditForm +@register_model_view(ClusterGroup, 'bulk_delete', path='delete', detail=False) class ClusterGroupBulkDeleteView(generic.BulkDeleteView): queryset = ClusterGroup.objects.annotate( cluster_count=count_related(Cluster, 'group') @@ -150,6 +160,7 @@ class ClusterGroupContactsView(ObjectContactsView): # Clusters # +@register_model_view(Cluster, 'list', path='', detail=False) class ClusterListView(generic.ObjectListView): permission_required = 'virtualization.view_cluster' queryset = Cluster.objects.annotate( @@ -213,6 +224,7 @@ class ClusterDevicesView(generic.ObjectChildrenView): return Device.objects.restrict(request.user, 'view').filter(cluster=parent) +@register_model_view(Cluster, 'add', detail=False) @register_model_view(Cluster, 'edit') class ClusterEditView(generic.ObjectEditView): queryset = Cluster.objects.all() @@ -224,11 +236,13 @@ class ClusterDeleteView(generic.ObjectDeleteView): queryset = Cluster.objects.all() +@register_model_view(Cluster, 'import', detail=False) class ClusterBulkImportView(generic.BulkImportView): queryset = Cluster.objects.all() model_form = forms.ClusterImportForm +@register_model_view(Cluster, 'bulk_edit', path='edit', detail=False) class ClusterBulkEditView(generic.BulkEditView): queryset = Cluster.objects.all() filterset = filtersets.ClusterFilterSet @@ -236,6 +250,7 @@ class ClusterBulkEditView(generic.BulkEditView): form = forms.ClusterBulkEditForm +@register_model_view(Cluster, 'bulk_delete', path='delete', detail=False) class ClusterBulkDeleteView(generic.BulkDeleteView): queryset = Cluster.objects.all() filterset = filtersets.ClusterFilterSet @@ -337,6 +352,7 @@ class ClusterContactsView(ObjectContactsView): # Virtual machines # +@register_model_view(VirtualMachine, 'list', path='', detail=False) class VirtualMachineListView(generic.ObjectListView): queryset = VirtualMachine.objects.prefetch_related('primary_ip4', 'primary_ip6') filterset = filtersets.VirtualMachineFilterSet @@ -457,6 +473,7 @@ class VirtualMachineRenderConfigView(generic.ObjectView): } +@register_model_view(VirtualMachine, 'add', detail=False) @register_model_view(VirtualMachine, 'edit') class VirtualMachineEditView(generic.ObjectEditView): queryset = VirtualMachine.objects.all() @@ -468,11 +485,13 @@ class VirtualMachineDeleteView(generic.ObjectDeleteView): queryset = VirtualMachine.objects.all() +@register_model_view(VirtualMachine, 'import', detail=False) class VirtualMachineBulkImportView(generic.BulkImportView): queryset = VirtualMachine.objects.all() model_form = forms.VirtualMachineImportForm +@register_model_view(VirtualMachine, 'bulk_edit', path='edit', detail=False) class VirtualMachineBulkEditView(generic.BulkEditView): queryset = VirtualMachine.objects.prefetch_related('primary_ip4', 'primary_ip6') filterset = filtersets.VirtualMachineFilterSet @@ -480,6 +499,7 @@ class VirtualMachineBulkEditView(generic.BulkEditView): form = forms.VirtualMachineBulkEditForm +@register_model_view(VirtualMachine, 'bulk_delete', path='delete', detail=False) class VirtualMachineBulkDeleteView(generic.BulkDeleteView): queryset = VirtualMachine.objects.prefetch_related('primary_ip4', 'primary_ip6') filterset = filtersets.VirtualMachineFilterSet @@ -495,6 +515,7 @@ class VirtualMachineContactsView(ObjectContactsView): # VM interfaces # +@register_model_view(VMInterface, 'list', path='', detail=False) class VMInterfaceListView(generic.ObjectListView): queryset = VMInterface.objects.all() filterset = filtersets.VMInterfaceFilterSet @@ -545,6 +566,7 @@ class VMInterfaceView(generic.ObjectView): } +@register_model_view(VMInterface, 'add', detail=False) class VMInterfaceCreateView(generic.ComponentCreateView): queryset = VMInterface.objects.all() form = forms.VMInterfaceCreateForm @@ -562,11 +584,13 @@ class VMInterfaceDeleteView(generic.ObjectDeleteView): queryset = VMInterface.objects.all() +@register_model_view(VMInterface, 'import', detail=False) class VMInterfaceBulkImportView(generic.BulkImportView): queryset = VMInterface.objects.all() model_form = forms.VMInterfaceImportForm +@register_model_view(VMInterface, 'bulk_edit', path='edit', detail=False) class VMInterfaceBulkEditView(generic.BulkEditView): queryset = VMInterface.objects.all() filterset = filtersets.VMInterfaceFilterSet @@ -574,11 +598,13 @@ class VMInterfaceBulkEditView(generic.BulkEditView): form = forms.VMInterfaceBulkEditForm +@register_model_view(VMInterface, 'bulk_rename', path='rename', detail=False) class VMInterfaceBulkRenameView(generic.BulkRenameView): queryset = VMInterface.objects.all() form = forms.VMInterfaceBulkRenameForm +@register_model_view(VMInterface, 'bulk_delete', path='delete', detail=False) class VMInterfaceBulkDeleteView(generic.BulkDeleteView): # Ensure child interfaces are deleted prior to their parents queryset = VMInterface.objects.order_by('virtual_machine', 'parent', CollateAsChar('_name')) @@ -590,6 +616,7 @@ class VMInterfaceBulkDeleteView(generic.BulkDeleteView): # Virtual disks # +@register_model_view(VirtualDisk, 'list', path='', detail=False) class VirtualDiskListView(generic.ObjectListView): queryset = VirtualDisk.objects.all() filterset = filtersets.VirtualDiskFilterSet @@ -602,6 +629,7 @@ class VirtualDiskView(generic.ObjectView): queryset = VirtualDisk.objects.all() +@register_model_view(VirtualDisk, 'add', detail=False) class VirtualDiskCreateView(generic.ComponentCreateView): queryset = VirtualDisk.objects.all() form = forms.VirtualDiskCreateForm @@ -619,11 +647,13 @@ class VirtualDiskDeleteView(generic.ObjectDeleteView): queryset = VirtualDisk.objects.all() +@register_model_view(VirtualDisk, 'import', detail=False) class VirtualDiskBulkImportView(generic.BulkImportView): queryset = VirtualDisk.objects.all() model_form = forms.VirtualDiskImportForm +@register_model_view(VirtualDisk, 'bulk_edit', path='edit', detail=False) class VirtualDiskBulkEditView(generic.BulkEditView): queryset = VirtualDisk.objects.all() filterset = filtersets.VirtualDiskFilterSet @@ -631,11 +661,13 @@ class VirtualDiskBulkEditView(generic.BulkEditView): form = forms.VirtualDiskBulkEditForm +@register_model_view(VirtualDisk, 'bulk_rename', path='rename', detail=False) class VirtualDiskBulkRenameView(generic.BulkRenameView): queryset = VirtualDisk.objects.all() form = forms.VirtualDiskBulkRenameForm +@register_model_view(VirtualDisk, 'bulk_delete', path='delete', detail=False) class VirtualDiskBulkDeleteView(generic.BulkDeleteView): queryset = VirtualDisk.objects.all() filterset = filtersets.VirtualDiskFilterSet diff --git a/netbox/vpn/urls.py b/netbox/vpn/urls.py index 552f0e185..1169dcd15 100644 --- a/netbox/vpn/urls.py +++ b/netbox/vpn/urls.py @@ -1,89 +1,39 @@ from django.urls import include, path from utilities.urls import get_model_urls -from . import views +from . import views # noqa F401 app_name = 'vpn' urlpatterns = [ - # Tunnel groups - path('tunnel-groups/', views.TunnelGroupListView.as_view(), name='tunnelgroup_list'), - path('tunnel-groups/add/', views.TunnelGroupEditView.as_view(), name='tunnelgroup_add'), - path('tunnel-groups/import/', views.TunnelGroupBulkImportView.as_view(), name='tunnelgroup_import'), - path('tunnel-groups/edit/', views.TunnelGroupBulkEditView.as_view(), name='tunnelgroup_bulk_edit'), - path('tunnel-groups/delete/', views.TunnelGroupBulkDeleteView.as_view(), name='tunnelgroup_bulk_delete'), + path('tunnel-groups/', include(get_model_urls('vpn', 'tunnelgroup', detail=False))), path('tunnel-groups//', include(get_model_urls('vpn', 'tunnelgroup'))), - # Tunnels - path('tunnels/', views.TunnelListView.as_view(), name='tunnel_list'), - path('tunnels/add/', views.TunnelEditView.as_view(), name='tunnel_add'), - path('tunnels/import/', views.TunnelBulkImportView.as_view(), name='tunnel_import'), - path('tunnels/edit/', views.TunnelBulkEditView.as_view(), name='tunnel_bulk_edit'), - path('tunnels/delete/', views.TunnelBulkDeleteView.as_view(), name='tunnel_bulk_delete'), + path('tunnels/', include(get_model_urls('vpn', 'tunnel', detail=False))), path('tunnels//', include(get_model_urls('vpn', 'tunnel'))), - # Tunnel terminations - path('tunnel-terminations/', views.TunnelTerminationListView.as_view(), name='tunneltermination_list'), - path('tunnel-terminations/add/', views.TunnelTerminationEditView.as_view(), name='tunneltermination_add'), - path('tunnel-terminations/import/', views.TunnelTerminationBulkImportView.as_view(), name='tunneltermination_import'), - path('tunnel-terminations/edit/', views.TunnelTerminationBulkEditView.as_view(), name='tunneltermination_bulk_edit'), - path('tunnel-terminations/delete/', views.TunnelTerminationBulkDeleteView.as_view(), name='tunneltermination_bulk_delete'), + path('tunnel-terminations/', include(get_model_urls('vpn', 'tunneltermination', detail=False))), path('tunnel-terminations//', include(get_model_urls('vpn', 'tunneltermination'))), - # IKE proposals - path('ike-proposals/', views.IKEProposalListView.as_view(), name='ikeproposal_list'), - path('ike-proposals/add/', views.IKEProposalEditView.as_view(), name='ikeproposal_add'), - path('ike-proposals/import/', views.IKEProposalBulkImportView.as_view(), name='ikeproposal_import'), - path('ike-proposals/edit/', views.IKEProposalBulkEditView.as_view(), name='ikeproposal_bulk_edit'), - path('ike-proposals/delete/', views.IKEProposalBulkDeleteView.as_view(), name='ikeproposal_bulk_delete'), + path('ike-proposals/', include(get_model_urls('vpn', 'ikeproposal', detail=False))), path('ike-proposals//', include(get_model_urls('vpn', 'ikeproposal'))), - # IKE policies - path('ike-policies/', views.IKEPolicyListView.as_view(), name='ikepolicy_list'), - path('ike-policies/add/', views.IKEPolicyEditView.as_view(), name='ikepolicy_add'), - path('ike-policies/import/', views.IKEPolicyBulkImportView.as_view(), name='ikepolicy_import'), - path('ike-policies/edit/', views.IKEPolicyBulkEditView.as_view(), name='ikepolicy_bulk_edit'), - path('ike-policies/delete/', views.IKEPolicyBulkDeleteView.as_view(), name='ikepolicy_bulk_delete'), + path('ike-policies/', include(get_model_urls('vpn', 'ikepolicy', detail=False))), path('ike-policies//', include(get_model_urls('vpn', 'ikepolicy'))), - # IPSec proposals - path('ipsec-proposals/', views.IPSecProposalListView.as_view(), name='ipsecproposal_list'), - path('ipsec-proposals/add/', views.IPSecProposalEditView.as_view(), name='ipsecproposal_add'), - path('ipsec-proposals/import/', views.IPSecProposalBulkImportView.as_view(), name='ipsecproposal_import'), - path('ipsec-proposals/edit/', views.IPSecProposalBulkEditView.as_view(), name='ipsecproposal_bulk_edit'), - path('ipsec-proposals/delete/', views.IPSecProposalBulkDeleteView.as_view(), name='ipsecproposal_bulk_delete'), + path('ipsec-proposals/', include(get_model_urls('vpn', 'ipsecproposal', detail=False))), path('ipsec-proposals//', include(get_model_urls('vpn', 'ipsecproposal'))), - # IPSec policies - path('ipsec-policies/', views.IPSecPolicyListView.as_view(), name='ipsecpolicy_list'), - path('ipsec-policies/add/', views.IPSecPolicyEditView.as_view(), name='ipsecpolicy_add'), - path('ipsec-policies/import/', views.IPSecPolicyBulkImportView.as_view(), name='ipsecpolicy_import'), - path('ipsec-policies/edit/', views.IPSecPolicyBulkEditView.as_view(), name='ipsecpolicy_bulk_edit'), - path('ipsec-policies/delete/', views.IPSecPolicyBulkDeleteView.as_view(), name='ipsecpolicy_bulk_delete'), + path('ipsec-policies/', include(get_model_urls('vpn', 'ipsecpolicy', detail=False))), path('ipsec-policies//', include(get_model_urls('vpn', 'ipsecpolicy'))), - # IPSec profiles - path('ipsec-profiles/', views.IPSecProfileListView.as_view(), name='ipsecprofile_list'), - path('ipsec-profiles/add/', views.IPSecProfileEditView.as_view(), name='ipsecprofile_add'), - path('ipsec-profiles/import/', views.IPSecProfileBulkImportView.as_view(), name='ipsecprofile_import'), - path('ipsec-profiles/edit/', views.IPSecProfileBulkEditView.as_view(), name='ipsecprofile_bulk_edit'), - path('ipsec-profiles/delete/', views.IPSecProfileBulkDeleteView.as_view(), name='ipsecprofile_bulk_delete'), + path('ipsec-profiles/', include(get_model_urls('vpn', 'ipsecprofile', detail=False))), path('ipsec-profiles//', include(get_model_urls('vpn', 'ipsecprofile'))), - # L2VPN - path('l2vpns/', views.L2VPNListView.as_view(), name='l2vpn_list'), - path('l2vpns/add/', views.L2VPNEditView.as_view(), name='l2vpn_add'), - path('l2vpns/import/', views.L2VPNBulkImportView.as_view(), name='l2vpn_import'), - path('l2vpns/edit/', views.L2VPNBulkEditView.as_view(), name='l2vpn_bulk_edit'), - path('l2vpns/delete/', views.L2VPNBulkDeleteView.as_view(), name='l2vpn_bulk_delete'), + path('l2vpns/', include(get_model_urls('vpn', 'l2vpn', detail=False))), path('l2vpns//', include(get_model_urls('vpn', 'l2vpn'))), - # L2VPN terminations - path('l2vpn-terminations/', views.L2VPNTerminationListView.as_view(), name='l2vpntermination_list'), - path('l2vpn-terminations/add/', views.L2VPNTerminationEditView.as_view(), name='l2vpntermination_add'), - path('l2vpn-terminations/import/', views.L2VPNTerminationBulkImportView.as_view(), name='l2vpntermination_import'), - path('l2vpn-terminations/edit/', views.L2VPNTerminationBulkEditView.as_view(), name='l2vpntermination_bulk_edit'), - path('l2vpn-terminations/delete/', views.L2VPNTerminationBulkDeleteView.as_view(), name='l2vpntermination_bulk_delete'), + path('l2vpn-terminations/', include(get_model_urls('vpn', 'l2vpntermination', detail=False))), path('l2vpn-terminations//', include(get_model_urls('vpn', 'l2vpntermination'))), ] diff --git a/netbox/vpn/views.py b/netbox/vpn/views.py index ac8ce3667..f1546bfbe 100644 --- a/netbox/vpn/views.py +++ b/netbox/vpn/views.py @@ -11,6 +11,7 @@ from .models import * # Tunnel groups # +@register_model_view(TunnelGroup, 'list', path='', detail=False) class TunnelGroupListView(generic.ObjectListView): queryset = TunnelGroup.objects.annotate( tunnel_count=count_related(Tunnel, 'group') @@ -30,6 +31,7 @@ class TunnelGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(TunnelGroup, 'add', detail=False) @register_model_view(TunnelGroup, 'edit') class TunnelGroupEditView(generic.ObjectEditView): queryset = TunnelGroup.objects.all() @@ -41,11 +43,13 @@ class TunnelGroupDeleteView(generic.ObjectDeleteView): queryset = TunnelGroup.objects.all() +@register_model_view(TunnelGroup, 'import', detail=False) class TunnelGroupBulkImportView(generic.BulkImportView): queryset = TunnelGroup.objects.all() model_form = forms.TunnelGroupImportForm +@register_model_view(TunnelGroup, 'bulk_edit', path='edit', detail=False) class TunnelGroupBulkEditView(generic.BulkEditView): queryset = TunnelGroup.objects.annotate( tunnel_count=count_related(Tunnel, 'group') @@ -55,6 +59,7 @@ class TunnelGroupBulkEditView(generic.BulkEditView): form = forms.TunnelGroupBulkEditForm +@register_model_view(TunnelGroup, 'bulk_delete', path='delete', detail=False) class TunnelGroupBulkDeleteView(generic.BulkDeleteView): queryset = TunnelGroup.objects.annotate( tunnel_count=count_related(Tunnel, 'group') @@ -67,6 +72,7 @@ class TunnelGroupBulkDeleteView(generic.BulkDeleteView): # Tunnels # +@register_model_view(Tunnel, 'list', path='', detail=False) class TunnelListView(generic.ObjectListView): queryset = Tunnel.objects.annotate( count_terminations=count_related(TunnelTermination, 'tunnel') @@ -81,6 +87,7 @@ class TunnelView(generic.ObjectView): queryset = Tunnel.objects.all() +@register_model_view(Tunnel, 'add', detail=False) @register_model_view(Tunnel, 'edit') class TunnelEditView(generic.ObjectEditView): queryset = Tunnel.objects.all() @@ -100,11 +107,13 @@ class TunnelDeleteView(generic.ObjectDeleteView): queryset = Tunnel.objects.all() +@register_model_view(Tunnel, 'import', detail=False) class TunnelBulkImportView(generic.BulkImportView): queryset = Tunnel.objects.all() model_form = forms.TunnelImportForm +@register_model_view(Tunnel, 'bulk_edit', path='edit', detail=False) class TunnelBulkEditView(generic.BulkEditView): queryset = Tunnel.objects.annotate( count_terminations=count_related(TunnelTermination, 'tunnel') @@ -114,6 +123,7 @@ class TunnelBulkEditView(generic.BulkEditView): form = forms.TunnelBulkEditForm +@register_model_view(Tunnel, 'bulk_delete', path='delete', detail=False) class TunnelBulkDeleteView(generic.BulkDeleteView): queryset = Tunnel.objects.annotate( count_terminations=count_related(TunnelTermination, 'tunnel') @@ -126,6 +136,7 @@ class TunnelBulkDeleteView(generic.BulkDeleteView): # Tunnel terminations # +@register_model_view(TunnelTermination, 'list', path='', detail=False) class TunnelTerminationListView(generic.ObjectListView): queryset = TunnelTermination.objects.all() filterset = filtersets.TunnelTerminationFilterSet @@ -138,6 +149,7 @@ class TunnelTerminationView(generic.ObjectView): queryset = TunnelTermination.objects.all() +@register_model_view(TunnelTermination, 'add', detail=False) @register_model_view(TunnelTermination, 'edit') class TunnelTerminationEditView(generic.ObjectEditView): queryset = TunnelTermination.objects.all() @@ -149,11 +161,13 @@ class TunnelTerminationDeleteView(generic.ObjectDeleteView): queryset = TunnelTermination.objects.all() +@register_model_view(TunnelTermination, 'import', detail=False) class TunnelTerminationBulkImportView(generic.BulkImportView): queryset = TunnelTermination.objects.all() model_form = forms.TunnelTerminationImportForm +@register_model_view(TunnelTermination, 'bulk_edit', path='edit', detail=False) class TunnelTerminationBulkEditView(generic.BulkEditView): queryset = TunnelTermination.objects.all() filterset = filtersets.TunnelTerminationFilterSet @@ -161,6 +175,7 @@ class TunnelTerminationBulkEditView(generic.BulkEditView): form = forms.TunnelTerminationBulkEditForm +@register_model_view(TunnelTermination, 'bulk_delete', path='delete', detail=False) class TunnelTerminationBulkDeleteView(generic.BulkDeleteView): queryset = TunnelTermination.objects.all() filterset = filtersets.TunnelTerminationFilterSet @@ -171,6 +186,7 @@ class TunnelTerminationBulkDeleteView(generic.BulkDeleteView): # IKE proposals # +@register_model_view(IKEProposal, 'list', path='', detail=False) class IKEProposalListView(generic.ObjectListView): queryset = IKEProposal.objects.all() filterset = filtersets.IKEProposalFilterSet @@ -183,6 +199,7 @@ class IKEProposalView(generic.ObjectView): queryset = IKEProposal.objects.all() +@register_model_view(IKEProposal, 'add', detail=False) @register_model_view(IKEProposal, 'edit') class IKEProposalEditView(generic.ObjectEditView): queryset = IKEProposal.objects.all() @@ -194,11 +211,13 @@ class IKEProposalDeleteView(generic.ObjectDeleteView): queryset = IKEProposal.objects.all() +@register_model_view(IKEProposal, 'import', detail=False) class IKEProposalBulkImportView(generic.BulkImportView): queryset = IKEProposal.objects.all() model_form = forms.IKEProposalImportForm +@register_model_view(IKEProposal, 'bulk_edit', path='edit', detail=False) class IKEProposalBulkEditView(generic.BulkEditView): queryset = IKEProposal.objects.all() filterset = filtersets.IKEProposalFilterSet @@ -206,6 +225,7 @@ class IKEProposalBulkEditView(generic.BulkEditView): form = forms.IKEProposalBulkEditForm +@register_model_view(IKEProposal, 'bulk_delete', path='delete', detail=False) class IKEProposalBulkDeleteView(generic.BulkDeleteView): queryset = IKEProposal.objects.all() filterset = filtersets.IKEProposalFilterSet @@ -216,6 +236,7 @@ class IKEProposalBulkDeleteView(generic.BulkDeleteView): # IKE policies # +@register_model_view(IKEPolicy, 'list', path='', detail=False) class IKEPolicyListView(generic.ObjectListView): queryset = IKEPolicy.objects.all() filterset = filtersets.IKEPolicyFilterSet @@ -228,6 +249,7 @@ class IKEPolicyView(generic.ObjectView): queryset = IKEPolicy.objects.all() +@register_model_view(IKEPolicy, 'add', detail=False) @register_model_view(IKEPolicy, 'edit') class IKEPolicyEditView(generic.ObjectEditView): queryset = IKEPolicy.objects.all() @@ -239,11 +261,13 @@ class IKEPolicyDeleteView(generic.ObjectDeleteView): queryset = IKEPolicy.objects.all() +@register_model_view(IKEPolicy, 'import', detail=False) class IKEPolicyBulkImportView(generic.BulkImportView): queryset = IKEPolicy.objects.all() model_form = forms.IKEPolicyImportForm +@register_model_view(IKEPolicy, 'bulk_edit', path='edit', detail=False) class IKEPolicyBulkEditView(generic.BulkEditView): queryset = IKEPolicy.objects.all() filterset = filtersets.IKEPolicyFilterSet @@ -251,6 +275,7 @@ class IKEPolicyBulkEditView(generic.BulkEditView): form = forms.IKEPolicyBulkEditForm +@register_model_view(IKEPolicy, 'bulk_delete', path='delete', detail=False) class IKEPolicyBulkDeleteView(generic.BulkDeleteView): queryset = IKEPolicy.objects.all() filterset = filtersets.IKEPolicyFilterSet @@ -261,6 +286,7 @@ class IKEPolicyBulkDeleteView(generic.BulkDeleteView): # IPSec proposals # +@register_model_view(IPSecProposal, 'list', path='', detail=False) class IPSecProposalListView(generic.ObjectListView): queryset = IPSecProposal.objects.all() filterset = filtersets.IPSecProposalFilterSet @@ -273,6 +299,7 @@ class IPSecProposalView(generic.ObjectView): queryset = IPSecProposal.objects.all() +@register_model_view(IPSecProposal, 'add', detail=False) @register_model_view(IPSecProposal, 'edit') class IPSecProposalEditView(generic.ObjectEditView): queryset = IPSecProposal.objects.all() @@ -284,11 +311,13 @@ class IPSecProposalDeleteView(generic.ObjectDeleteView): queryset = IPSecProposal.objects.all() +@register_model_view(IPSecProposal, 'import', detail=False) class IPSecProposalBulkImportView(generic.BulkImportView): queryset = IPSecProposal.objects.all() model_form = forms.IPSecProposalImportForm +@register_model_view(IPSecProposal, 'bulk_edit', path='edit', detail=False) class IPSecProposalBulkEditView(generic.BulkEditView): queryset = IPSecProposal.objects.all() filterset = filtersets.IPSecProposalFilterSet @@ -296,6 +325,7 @@ class IPSecProposalBulkEditView(generic.BulkEditView): form = forms.IPSecProposalBulkEditForm +@register_model_view(IPSecProposal, 'bulk_delete', path='delete', detail=False) class IPSecProposalBulkDeleteView(generic.BulkDeleteView): queryset = IPSecProposal.objects.all() filterset = filtersets.IPSecProposalFilterSet @@ -306,6 +336,7 @@ class IPSecProposalBulkDeleteView(generic.BulkDeleteView): # IPSec policies # +@register_model_view(IPSecPolicy, 'list', path='', detail=False) class IPSecPolicyListView(generic.ObjectListView): queryset = IPSecPolicy.objects.all() filterset = filtersets.IPSecPolicyFilterSet @@ -318,6 +349,7 @@ class IPSecPolicyView(generic.ObjectView): queryset = IPSecPolicy.objects.all() +@register_model_view(IPSecPolicy, 'add', detail=False) @register_model_view(IPSecPolicy, 'edit') class IPSecPolicyEditView(generic.ObjectEditView): queryset = IPSecPolicy.objects.all() @@ -329,11 +361,13 @@ class IPSecPolicyDeleteView(generic.ObjectDeleteView): queryset = IPSecPolicy.objects.all() +@register_model_view(IPSecPolicy, 'import', detail=False) class IPSecPolicyBulkImportView(generic.BulkImportView): queryset = IPSecPolicy.objects.all() model_form = forms.IPSecPolicyImportForm +@register_model_view(IPSecPolicy, 'bulk_edit', path='edit', detail=False) class IPSecPolicyBulkEditView(generic.BulkEditView): queryset = IPSecPolicy.objects.all() filterset = filtersets.IPSecPolicyFilterSet @@ -341,6 +375,7 @@ class IPSecPolicyBulkEditView(generic.BulkEditView): form = forms.IPSecPolicyBulkEditForm +@register_model_view(IPSecPolicy, 'bulk_delete', path='delete', detail=False) class IPSecPolicyBulkDeleteView(generic.BulkDeleteView): queryset = IPSecPolicy.objects.all() filterset = filtersets.IPSecPolicyFilterSet @@ -351,6 +386,7 @@ class IPSecPolicyBulkDeleteView(generic.BulkDeleteView): # IPSec profiles # +@register_model_view(IPSecProfile, 'list', path='', detail=False) class IPSecProfileListView(generic.ObjectListView): queryset = IPSecProfile.objects.all() filterset = filtersets.IPSecProfileFilterSet @@ -363,6 +399,7 @@ class IPSecProfileView(generic.ObjectView): queryset = IPSecProfile.objects.all() +@register_model_view(IPSecProfile, 'add', detail=False) @register_model_view(IPSecProfile, 'edit') class IPSecProfileEditView(generic.ObjectEditView): queryset = IPSecProfile.objects.all() @@ -374,11 +411,13 @@ class IPSecProfileDeleteView(generic.ObjectDeleteView): queryset = IPSecProfile.objects.all() +@register_model_view(IPSecProfile, 'import', detail=False) class IPSecProfileBulkImportView(generic.BulkImportView): queryset = IPSecProfile.objects.all() model_form = forms.IPSecProfileImportForm +@register_model_view(IPSecProfile, 'bulk_edit', path='edit', detail=False) class IPSecProfileBulkEditView(generic.BulkEditView): queryset = IPSecProfile.objects.all() filterset = filtersets.IPSecProfileFilterSet @@ -386,14 +425,18 @@ class IPSecProfileBulkEditView(generic.BulkEditView): form = forms.IPSecProfileBulkEditForm +@register_model_view(IPSecProfile, 'bulk_delete', path='delete', detail=False) class IPSecProfileBulkDeleteView(generic.BulkDeleteView): queryset = IPSecProfile.objects.all() filterset = filtersets.IPSecProfileFilterSet table = tables.IPSecProfileTable +# # L2VPN +# +@register_model_view(L2VPN, 'list', path='', detail=False) class L2VPNListView(generic.ObjectListView): queryset = L2VPN.objects.all() table = tables.L2VPNTable @@ -421,6 +464,7 @@ class L2VPNView(generic.ObjectView): } +@register_model_view(L2VPN, 'add', detail=False) @register_model_view(L2VPN, 'edit') class L2VPNEditView(generic.ObjectEditView): queryset = L2VPN.objects.all() @@ -432,11 +476,13 @@ class L2VPNDeleteView(generic.ObjectDeleteView): queryset = L2VPN.objects.all() +@register_model_view(L2VPN, 'import', detail=False) class L2VPNBulkImportView(generic.BulkImportView): queryset = L2VPN.objects.all() model_form = forms.L2VPNImportForm +@register_model_view(L2VPN, 'bulk_edit', path='edit', detail=False) class L2VPNBulkEditView(generic.BulkEditView): queryset = L2VPN.objects.all() filterset = filtersets.L2VPNFilterSet @@ -444,6 +490,7 @@ class L2VPNBulkEditView(generic.BulkEditView): form = forms.L2VPNBulkEditForm +@register_model_view(L2VPN, 'bulk_delete', path='delete', detail=False) class L2VPNBulkDeleteView(generic.BulkDeleteView): queryset = L2VPN.objects.all() filterset = filtersets.L2VPNFilterSet @@ -459,6 +506,7 @@ class L2VPNContactsView(ObjectContactsView): # L2VPN terminations # +@register_model_view(L2VPNTermination, 'list', path='', detail=False) class L2VPNTerminationListView(generic.ObjectListView): queryset = L2VPNTermination.objects.all() table = tables.L2VPNTerminationTable @@ -471,6 +519,7 @@ class L2VPNTerminationView(generic.ObjectView): queryset = L2VPNTermination.objects.all() +@register_model_view(L2VPNTermination, 'add', detail=False) @register_model_view(L2VPNTermination, 'edit') class L2VPNTerminationEditView(generic.ObjectEditView): queryset = L2VPNTermination.objects.all() @@ -482,11 +531,13 @@ class L2VPNTerminationDeleteView(generic.ObjectDeleteView): queryset = L2VPNTermination.objects.all() +@register_model_view(L2VPNTermination, 'import', detail=False) class L2VPNTerminationBulkImportView(generic.BulkImportView): queryset = L2VPNTermination.objects.all() model_form = forms.L2VPNTerminationImportForm +@register_model_view(L2VPNTermination, 'bulk_edit', path='edit', detail=False) class L2VPNTerminationBulkEditView(generic.BulkEditView): queryset = L2VPNTermination.objects.all() filterset = filtersets.L2VPNTerminationFilterSet @@ -494,6 +545,7 @@ class L2VPNTerminationBulkEditView(generic.BulkEditView): form = forms.L2VPNTerminationBulkEditForm +@register_model_view(L2VPNTermination, 'bulk_delete', path='delete', detail=False) class L2VPNTerminationBulkDeleteView(generic.BulkDeleteView): queryset = L2VPNTermination.objects.all() filterset = filtersets.L2VPNTerminationFilterSet diff --git a/netbox/wireless/urls.py b/netbox/wireless/urls.py index cf8ea5716..ee69c46de 100644 --- a/netbox/wireless/urls.py +++ b/netbox/wireless/urls.py @@ -1,33 +1,18 @@ from django.urls import include, path from utilities.urls import get_model_urls -from . import views +from . import views # noqa F401 app_name = 'wireless' urlpatterns = ( - # Wireless LAN groups - path('wireless-lan-groups/', views.WirelessLANGroupListView.as_view(), name='wirelesslangroup_list'), - path('wireless-lan-groups/add/', views.WirelessLANGroupEditView.as_view(), name='wirelesslangroup_add'), - path('wireless-lan-groups/import/', views.WirelessLANGroupBulkImportView.as_view(), name='wirelesslangroup_import'), - path('wireless-lan-groups/edit/', views.WirelessLANGroupBulkEditView.as_view(), name='wirelesslangroup_bulk_edit'), - path('wireless-lan-groups/delete/', views.WirelessLANGroupBulkDeleteView.as_view(), name='wirelesslangroup_bulk_delete'), + path('wireless-lan-groups/', include(get_model_urls('wireless', 'wirelesslangroup', detail=False))), path('wireless-lan-groups//', include(get_model_urls('wireless', 'wirelesslangroup'))), - # Wireless LANs - path('wireless-lans/', views.WirelessLANListView.as_view(), name='wirelesslan_list'), - path('wireless-lans/add/', views.WirelessLANEditView.as_view(), name='wirelesslan_add'), - path('wireless-lans/import/', views.WirelessLANBulkImportView.as_view(), name='wirelesslan_import'), - path('wireless-lans/edit/', views.WirelessLANBulkEditView.as_view(), name='wirelesslan_bulk_edit'), - path('wireless-lans/delete/', views.WirelessLANBulkDeleteView.as_view(), name='wirelesslan_bulk_delete'), + path('wireless-lans/', include(get_model_urls('wireless', 'wirelesslan', detail=False))), path('wireless-lans//', include(get_model_urls('wireless', 'wirelesslan'))), - # Wireless links - path('wireless-links/', views.WirelessLinkListView.as_view(), name='wirelesslink_list'), - path('wireless-links/add/', views.WirelessLinkEditView.as_view(), name='wirelesslink_add'), - path('wireless-links/import/', views.WirelessLinkBulkImportView.as_view(), name='wirelesslink_import'), - path('wireless-links/edit/', views.WirelessLinkBulkEditView.as_view(), name='wirelesslink_bulk_edit'), - path('wireless-links/delete/', views.WirelessLinkBulkDeleteView.as_view(), name='wirelesslink_bulk_delete'), + path('wireless-links/', include(get_model_urls('wireless', 'wirelesslink', detail=False))), path('wireless-links//', include(get_model_urls('wireless', 'wirelesslink'))), ) diff --git a/netbox/wireless/views.py b/netbox/wireless/views.py index 5063f0fee..6c5ae6f94 100644 --- a/netbox/wireless/views.py +++ b/netbox/wireless/views.py @@ -10,6 +10,7 @@ from .models import * # Wireless LAN groups # +@register_model_view(WirelessLANGroup, 'list', path='', detail=False) class WirelessLANGroupListView(generic.ObjectListView): queryset = WirelessLANGroup.objects.add_related_count( WirelessLANGroup.objects.all(), @@ -35,6 +36,7 @@ class WirelessLANGroupView(GetRelatedModelsMixin, generic.ObjectView): } +@register_model_view(WirelessLANGroup, 'add', detail=False) @register_model_view(WirelessLANGroup, 'edit') class WirelessLANGroupEditView(generic.ObjectEditView): queryset = WirelessLANGroup.objects.all() @@ -46,11 +48,13 @@ class WirelessLANGroupDeleteView(generic.ObjectDeleteView): queryset = WirelessLANGroup.objects.all() +@register_model_view(WirelessLANGroup, 'import', detail=False) class WirelessLANGroupBulkImportView(generic.BulkImportView): queryset = WirelessLANGroup.objects.all() model_form = forms.WirelessLANGroupImportForm +@register_model_view(WirelessLANGroup, 'bulk_edit', path='edit', detail=False) class WirelessLANGroupBulkEditView(generic.BulkEditView): queryset = WirelessLANGroup.objects.add_related_count( WirelessLANGroup.objects.all(), @@ -64,6 +68,7 @@ class WirelessLANGroupBulkEditView(generic.BulkEditView): form = forms.WirelessLANGroupBulkEditForm +@register_model_view(WirelessLANGroup, 'bulk_delete', path='delete', detail=False) class WirelessLANGroupBulkDeleteView(generic.BulkDeleteView): queryset = WirelessLANGroup.objects.add_related_count( WirelessLANGroup.objects.all(), @@ -80,6 +85,7 @@ class WirelessLANGroupBulkDeleteView(generic.BulkDeleteView): # Wireless LANs # +@register_model_view(WirelessLAN, 'list', path='', detail=False) class WirelessLANListView(generic.ObjectListView): queryset = WirelessLAN.objects.annotate( interface_count=count_related(Interface, 'wireless_lans') @@ -105,6 +111,7 @@ class WirelessLANView(generic.ObjectView): } +@register_model_view(WirelessLAN, 'add', detail=False) @register_model_view(WirelessLAN, 'edit') class WirelessLANEditView(generic.ObjectEditView): queryset = WirelessLAN.objects.all() @@ -116,11 +123,13 @@ class WirelessLANDeleteView(generic.ObjectDeleteView): queryset = WirelessLAN.objects.all() +@register_model_view(WirelessLAN, 'import', detail=False) class WirelessLANBulkImportView(generic.BulkImportView): queryset = WirelessLAN.objects.all() model_form = forms.WirelessLANImportForm +@register_model_view(WirelessLAN, 'bulk_edit', path='edit', detail=False) class WirelessLANBulkEditView(generic.BulkEditView): queryset = WirelessLAN.objects.all() filterset = filtersets.WirelessLANFilterSet @@ -128,6 +137,7 @@ class WirelessLANBulkEditView(generic.BulkEditView): form = forms.WirelessLANBulkEditForm +@register_model_view(WirelessLAN, 'bulk_delete', path='delete', detail=False) class WirelessLANBulkDeleteView(generic.BulkDeleteView): queryset = WirelessLAN.objects.all() filterset = filtersets.WirelessLANFilterSet @@ -138,6 +148,7 @@ class WirelessLANBulkDeleteView(generic.BulkDeleteView): # Wireless Links # +@register_model_view(WirelessLink, 'list', path='', detail=False) class WirelessLinkListView(generic.ObjectListView): queryset = WirelessLink.objects.all() filterset = filtersets.WirelessLinkFilterSet @@ -150,6 +161,7 @@ class WirelessLinkView(generic.ObjectView): queryset = WirelessLink.objects.all() +@register_model_view(WirelessLink, 'add', detail=False) @register_model_view(WirelessLink, 'edit') class WirelessLinkEditView(generic.ObjectEditView): queryset = WirelessLink.objects.all() @@ -161,11 +173,13 @@ class WirelessLinkDeleteView(generic.ObjectDeleteView): queryset = WirelessLink.objects.all() +@register_model_view(WirelessLink, 'import', detail=False) class WirelessLinkBulkImportView(generic.BulkImportView): queryset = WirelessLink.objects.all() model_form = forms.WirelessLinkImportForm +@register_model_view(WirelessLink, 'bulk_edit', path='edit', detail=False) class WirelessLinkBulkEditView(generic.BulkEditView): queryset = WirelessLink.objects.all() filterset = filtersets.WirelessLinkFilterSet @@ -173,6 +187,7 @@ class WirelessLinkBulkEditView(generic.BulkEditView): form = forms.WirelessLinkBulkEditForm +@register_model_view(WirelessLink, 'bulk_delete', path='delete', detail=False) class WirelessLinkBulkDeleteView(generic.BulkDeleteView): queryset = WirelessLink.objects.all() filterset = filtersets.WirelessLinkFilterSet From 343a4af59167f93cf546ffca659b115acd267e03 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Nov 2024 15:58:11 -0500 Subject: [PATCH 036/190] Closes #18022: Extend linter (ruff) to enforce line length limit (120 chars) (#18067) * Enable E501 rule * Configure ruff formatter * Reformat migration files to fix line length violations * Fix various E501 errors * Move table template code to template_code.py & ignore E501 errors * Reformat raw SQL --- netbox/circuits/api/serializers_/circuits.py | 11 +- netbox/circuits/filtersets.py | 8 +- netbox/circuits/forms/filtersets.py | 5 +- netbox/circuits/migrations/0001_squashed.py | 11 +- .../circuits/migrations/0002_squashed_0029.py | 71 +- .../circuits/migrations/0003_squashed_0037.py | 3 +- .../circuits/migrations/0038_squashed_0042.py | 45 +- .../migrations/0044_circuit_groups.py | 1 - .../migrations/0045_circuit_distance.py | 1 - .../migrations/0046_charfield_null_choices.py | 6 +- .../0047_circuittermination__termination.py | 16 +- ...48_circuitterminations_cached_relations.py | 8 +- .../migrations/0049_natural_ordering.py | 1 - .../migrations/0050_virtual_circuits.py | 68 +- netbox/circuits/models/circuits.py | 4 +- netbox/circuits/tables/circuits.py | 3 +- netbox/circuits/tests/test_api.py | 12 +- netbox/circuits/tests/test_filtersets.py | 144 +++- netbox/circuits/tests/test_views.py | 12 +- netbox/circuits/urls.py | 30 +- netbox/core/api/schema.py | 5 +- netbox/core/api/serializers_/jobs.py | 4 +- netbox/core/migrations/0001_squashed_0005.py | 96 ++- .../0006_datasource_type_remove_choices.py | 1 - .../migrations/0007_job_add_error_field.py | 1 - .../core/migrations/0008_contenttype_proxy.py | 4 +- netbox/core/migrations/0009_configrevision.py | 1 - netbox/core/migrations/0010_gfk_indexes.py | 1 - .../core/migrations/0011_move_objectchange.py | 43 +- .../0012_job_object_type_optional.py | 3 +- netbox/core/models/files.py | 9 +- netbox/core/models/jobs.py | 12 +- netbox/core/urls.py | 24 +- .../api/serializers_/device_components.py | 6 +- netbox/dcim/filtersets.py | 4 +- netbox/dcim/forms/bulk_import.py | 14 +- netbox/dcim/forms/common.py | 5 +- netbox/dcim/forms/connections.py | 10 +- netbox/dcim/forms/model_forms.py | 26 +- netbox/dcim/forms/object_create.py | 3 +- netbox/dcim/forms/object_import.py | 3 +- netbox/dcim/graphql/types.py | 16 +- netbox/dcim/migrations/0001_squashed.py | 291 ++++++- netbox/dcim/migrations/0002_squashed.py | 273 ++++-- netbox/dcim/migrations/0003_squashed_0130.py | 265 +++++- netbox/dcim/migrations/0131_squashed_0159.py | 536 ++++++++++-- netbox/dcim/migrations/0160_squashed_0166.py | 230 +++++- netbox/dcim/migrations/0167_squashed_0182.py | 159 +++- .../0184_protect_child_interfaces.py | 9 +- netbox/dcim/migrations/0185_gfk_indexes.py | 1 - .../dcim/migrations/0186_location_facility.py | 1 - .../0187_alter_device_vc_position.py | 1 - netbox/dcim/migrations/0188_racktype.py | 48 +- .../0189_moduletype_rack_airflow.py | 1 - netbox/dcim/migrations/0190_nested_modules.py | 42 +- .../migrations/0191_module_bay_rebuild.py | 6 +- .../migrations/0192_inventoryitem_status.py | 1 - .../dcim/migrations/0193_poweroutlet_color.py | 1 - .../migrations/0194_charfield_null_choices.py | 6 +- .../0195_interface_vlan_translation_policy.py | 5 +- netbox/dcim/migrations/0196_qinq_svlan.py | 17 +- .../migrations/0197_natural_sort_collation.py | 7 +- .../dcim/migrations/0198_natural_ordering.py | 1 - netbox/dcim/migrations/0199_macaddress.py | 29 +- .../migrations/0200_populate_mac_addresses.py | 12 +- .../dcim/models/device_component_templates.py | 24 +- netbox/dcim/models/devices.py | 22 +- netbox/dcim/models/racks.py | 4 +- netbox/dcim/svg/racks.py | 5 +- netbox/dcim/tables/devices.py | 14 +- netbox/dcim/tests/test_api.py | 87 +- netbox/dcim/tests/test_cablepaths.py | 262 ++++-- netbox/dcim/tests/test_filtersets.py | 782 ++++++++++++++++-- netbox/dcim/tests/test_models.py | 27 +- netbox/dcim/tests/test_views.py | 169 +++- netbox/dcim/views.py | 16 +- netbox/extras/management/commands/reindex.py | 3 +- netbox/extras/migrations/0001_squashed.py | 114 ++- .../extras/migrations/0002_squashed_0059.py | 1 - .../extras/migrations/0060_squashed_0086.py | 127 ++- .../extras/migrations/0087_squashed_0098.py | 47 +- .../migrations/0099_cachedvalue_ordering.py | 1 - .../migrations/0100_customfield_ui_attrs.py | 6 +- netbox/extras/migrations/0101_eventrule.py | 12 +- .../migrations/0102_move_configrevision.py | 6 +- netbox/extras/migrations/0103_gfk_indexes.py | 13 +- .../0105_customfield_min_max_values.py | 1 - .../0106_bookmark_user_cascade_deletion.py | 1 - ...7_cachedvalue_extras_cachedvalue_object.py | 1 - .../0108_convert_reports_to_scripts.py | 6 +- netbox/extras/migrations/0109_script_model.py | 46 +- ...0110_remove_eventrule_action_parameters.py | 1 - .../migrations/0111_rename_content_types.py | 32 +- .../0112_tag_update_object_types.py | 1 - .../0113_customfield_rename_object_type.py | 1 - .../0114_customfield_add_comments.py | 1 - .../0115_convert_dashboard_widgets.py | 6 +- .../0116_custom_link_button_color.py | 6 +- .../migrations/0117_move_objectchange.py | 80 +- .../migrations/0118_customfield_uniqueness.py | 1 - .../extras/migrations/0119_notifications.py | 42 +- .../migrations/0120_eventrule_event_types.py | 11 +- .../0121_customfield_related_object_filter.py | 1 - .../migrations/0122_charfield_null_choices.py | 6 +- netbox/extras/models/models.py | 5 +- netbox/extras/tests/test_customfields.py | 91 +- netbox/ipam/forms/model_forms.py | 7 +- netbox/ipam/graphql/types.py | 5 +- netbox/ipam/migrations/0001_squashed.py | 140 +++- netbox/ipam/migrations/0002_squashed_0046.py | 108 ++- netbox/ipam/migrations/0047_squashed_0053.py | 98 ++- netbox/ipam/migrations/0054_squashed_0067.py | 147 +++- netbox/ipam/migrations/0068_move_l2vpn.py | 6 +- netbox/ipam/migrations/0069_gfk_indexes.py | 5 +- .../0070_vlangroup_vlan_id_ranges.py | 12 +- netbox/ipam/migrations/0071_prefix_scope.py | 12 +- .../0072_prefix_cached_relations.py | 20 +- .../migrations/0073_charfield_null_choices.py | 6 +- ...antranslationpolicy_vlantranslationrule.py | 53 +- netbox/ipam/migrations/0075_vlan_qinq.py | 9 +- .../ipam/migrations/0076_natural_ordering.py | 1 - netbox/ipam/models/ip.py | 38 +- netbox/ipam/tables/ip.py | 56 +- netbox/ipam/tables/template_code.py | 88 ++ netbox/ipam/tables/vlans.py | 35 +- netbox/ipam/tests/test_api.py | 15 +- netbox/ipam/tests/test_filtersets.py | 238 +++++- netbox/ipam/tests/test_models.py | 70 +- netbox/ipam/tests/test_ordering.py | 71 +- netbox/ipam/tests/test_views.py | 20 +- netbox/netbox/filtersets.py | 4 +- netbox/netbox/tables/columns.py | 6 +- netbox/netbox/views/generic/bulk_views.py | 3 +- netbox/netbox/views/generic/feature_views.py | 7 +- .../tenancy/migrations/0001_squashed_0012.py | 23 +- .../tenancy/migrations/0002_squashed_0011.py | 90 +- .../0012_contactassignment_custom_fields.py | 1 - netbox/tenancy/migrations/0013_gfk_indexes.py | 1 - .../0014_contactassignment_ordering.py | 1 - ...5_contactassignment_rename_content_type.py | 8 +- .../migrations/0016_charfield_null_choices.py | 6 +- .../migrations/0017_natural_ordering.py | 1 - netbox/tenancy/tables/columns.py | 21 +- netbox/tenancy/tables/template_code.py | 19 + netbox/tenancy/tests/test_api.py | 21 +- netbox/users/migrations/0001_squashed_0011.py | 78 +- netbox/users/migrations/0002_squashed_0004.py | 10 +- .../users/migrations/0005_alter_user_table.py | 24 +- .../migrations/0006_custom_group_model.py | 36 +- ...07_objectpermission_update_object_types.py | 20 +- .../0008_flip_objectpermission_assignments.py | 89 +- .../migrations/0009_update_group_perms.py | 6 +- netbox/users/tests/test_filtersets.py | 12 +- netbox/users/tests/test_views.py | 13 +- netbox/utilities/socks.py | 5 +- netbox/utilities/testing/api.py | 5 +- netbox/utilities/tests/test_filters.py | 43 +- .../api/serializers_/clusters.py | 6 +- .../api/serializers_/virtualmachines.py | 8 +- netbox/virtualization/forms/bulk_import.py | 4 +- .../migrations/0001_squashed_0022.py | 160 +++- .../migrations/0023_squashed_0036.py | 82 +- .../0037_protect_child_interfaces.py | 9 +- .../migrations/0038_virtualdisk.py | 30 +- .../0039_virtualmachine_serial_number.py | 1 - .../migrations/0040_convert_disk_size.py | 6 +- .../migrations/0041_charfield_null_choices.py | 6 +- ...042_vminterface_vlan_translation_policy.py | 5 +- .../migrations/0043_qinq_svlan.py | 17 +- .../migrations/0044_cluster_scope.py | 11 +- .../0045_clusters_cached_relations.py | 8 +- ...location_alter_cluster__region_and_more.py | 1 - .../migrations/0047_natural_ordering.py | 1 - .../migrations/0048_populate_mac_addresses.py | 12 +- netbox/virtualization/tables/clusters.py | 4 +- netbox/virtualization/tables/template_code.py | 32 + .../virtualization/tables/virtualmachines.py | 34 +- netbox/virtualization/tests/test_api.py | 43 +- netbox/virtualization/tests/test_views.py | 51 +- netbox/virtualization/views.py | 6 +- netbox/vpn/api/serializers_/crypto.py | 3 +- netbox/vpn/migrations/0001_initial.py | 125 ++- netbox/vpn/migrations/0002_move_l2vpn.py | 63 +- ..._ipaddress_multiple_tunnel_terminations.py | 9 +- .../migrations/0004_alter_ikepolicy_mode.py | 1 - netbox/vpn/migrations/0005_rename_indexes.py | 65 +- .../migrations/0006_charfield_null_choices.py | 6 +- .../vpn/migrations/0007_natural_ordering.py | 1 - .../wireless/api/serializers_/wirelesslans.py | 6 +- netbox/wireless/forms/bulk_import.py | 4 +- .../wireless/migrations/0001_squashed_0008.py | 119 ++- .../migrations/0009_wirelesslink_distance.py | 1 - .../migrations/0010_charfield_null_choices.py | 6 +- ...__location_wirelesslan__region_and_more.py | 1 - ...12_alter_wirelesslan__location_and_more.py | 1 - .../migrations/0013_natural_ordering.py | 1 - netbox/wireless/tables/wirelesslan.py | 3 +- netbox/wireless/tests/test_filtersets.py | 14 +- netbox/wireless/tests/test_views.py | 29 +- ruff.toml | 15 +- 200 files changed, 5928 insertions(+), 1670 deletions(-) create mode 100644 netbox/ipam/tables/template_code.py create mode 100644 netbox/tenancy/tables/template_code.py create mode 100644 netbox/virtualization/tables/template_code.py diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index a68e49483..70644a7b7 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -59,8 +59,8 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer): class Meta: model = CircuitTermination fields = [ - 'id', 'url', 'display_url', 'display', 'termination_type', 'termination_id', 'termination', 'provider_network', 'port_speed', 'upstream_speed', - 'xconnect_id', 'description', + 'id', 'url', 'display_url', 'display', 'termination_type', 'termination_id', 'termination', + 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', ] @extend_schema_field(serializers.JSONField(allow_null=True)) @@ -138,9 +138,10 @@ class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer class Meta: model = CircuitTermination fields = [ - 'id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'termination_type', 'termination_id', 'termination', 'provider_network', 'port_speed', - 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'mark_connected', 'cable', 'cable_end', - 'link_peers', 'link_peers_type', 'tags', 'custom_fields', 'created', 'last_updated', '_occupied', + 'id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'termination_type', 'termination_id', + 'termination', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', + 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'tags', 'custom_fields', 'created', + 'last_updated', '_occupied', ] brief_fields = ('id', 'url', 'display', 'circuit', 'term_side', 'description', 'cable', '_occupied') diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index be36d45ac..825df9558 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -241,7 +241,9 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte class Meta: model = Circuit - fields = ('id', 'cid', 'description', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit') + fields = ( + 'id', 'cid', 'description', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit', + ) def search(self, queryset, name, value): if not value.strip(): @@ -336,8 +338,8 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet): class Meta: model = CircuitTermination fields = ( - 'id', 'termination_id', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', 'mark_connected', - 'pp_info', 'cable_end', + 'id', 'termination_id', 'term_side', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', + 'mark_connected', 'pp_info', 'cable_end', ) def search(self, queryset, name, value): diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index 00dc6bc5b..47ce24d97 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -121,7 +121,10 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('provider_id', 'provider_account_id', 'provider_network_id', name=_('Provider')), - FieldSet('type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit', name=_('Attributes')), + FieldSet( + 'type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit', + name=_('Attributes') + ), FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')), diff --git a/netbox/circuits/migrations/0001_squashed.py b/netbox/circuits/migrations/0001_squashed.py index 96fa3c086..0b3d729e6 100644 --- a/netbox/circuits/migrations/0001_squashed.py +++ b/netbox/circuits/migrations/0001_squashed.py @@ -5,11 +5,9 @@ import django.db.models.deletion class Migration(migrations.Migration): - initial = True - dependencies = [ - ] + dependencies = [] replaces = [ ('circuits', '0001_initial'), @@ -98,7 +96,12 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), - ('provider', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='networks', to='circuits.provider')), + ( + 'provider', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='networks', to='circuits.provider' + ), + ), ], options={ 'ordering': ('provider', 'name'), diff --git a/netbox/circuits/migrations/0002_squashed_0029.py b/netbox/circuits/migrations/0002_squashed_0029.py index 11fcbd6e6..cb61d8feb 100644 --- a/netbox/circuits/migrations/0002_squashed_0029.py +++ b/netbox/circuits/migrations/0002_squashed_0029.py @@ -4,7 +4,6 @@ import taggit.managers class Migration(migrations.Migration): - dependencies = [ ('dcim', '0001_initial'), ('contenttypes', '0002_remove_content_type_name'), @@ -58,32 +57,56 @@ class Migration(migrations.Migration): migrations.AddField( model_name='circuittermination', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='circuittermination', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='circuittermination', name='circuit', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='circuits.circuit'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='circuits.circuit' + ), ), migrations.AddField( model_name='circuittermination', name='provider_network', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='circuit_terminations', to='circuits.providernetwork'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='circuit_terminations', + to='circuits.providernetwork', + ), ), migrations.AddField( model_name='circuittermination', name='site', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='circuit_terminations', to='dcim.site'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='circuit_terminations', + to='dcim.site', + ), ), migrations.AddField( model_name='circuit', name='provider', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.provider'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.provider' + ), ), migrations.AddField( model_name='circuit', @@ -93,26 +116,50 @@ class Migration(migrations.Migration): migrations.AddField( model_name='circuit', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='circuits', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='circuit', name='termination_a', - field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='circuits.circuittermination'), + field=models.ForeignKey( + blank=True, + editable=False, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='circuits.circuittermination', + ), ), migrations.AddField( model_name='circuit', name='termination_z', - field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='circuits.circuittermination'), + field=models.ForeignKey( + blank=True, + editable=False, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='circuits.circuittermination', + ), ), migrations.AddField( model_name='circuit', name='type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.circuittype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.circuittype' + ), ), migrations.AddConstraint( model_name='providernetwork', - constraint=models.UniqueConstraint(fields=('provider', 'name'), name='circuits_providernetwork_provider_name'), + constraint=models.UniqueConstraint( + fields=('provider', 'name'), name='circuits_providernetwork_provider_name' + ), ), migrations.AlterUniqueTogether( name='providernetwork', diff --git a/netbox/circuits/migrations/0003_squashed_0037.py b/netbox/circuits/migrations/0003_squashed_0037.py index 69c3e1c68..c536e422f 100644 --- a/netbox/circuits/migrations/0003_squashed_0037.py +++ b/netbox/circuits/migrations/0003_squashed_0037.py @@ -5,7 +5,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('circuits', '0003_extend_tag_support'), ('circuits', '0004_rename_cable_peer'), @@ -14,7 +13,7 @@ class Migration(migrations.Migration): ('circuits', '0034_created_datetimefield'), ('circuits', '0035_provider_asns'), ('circuits', '0036_circuit_termination_date_tags_custom_fields'), - ('circuits', '0037_new_cabling_models') + ('circuits', '0037_new_cabling_models'), ] dependencies = [ diff --git a/netbox/circuits/migrations/0038_squashed_0042.py b/netbox/circuits/migrations/0038_squashed_0042.py index f57fde3db..fa944b763 100644 --- a/netbox/circuits/migrations/0038_squashed_0042.py +++ b/netbox/circuits/migrations/0038_squashed_0042.py @@ -6,13 +6,12 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('circuits', '0038_cabling_cleanup'), ('circuits', '0039_unique_constraints'), ('circuits', '0040_provider_remove_deprecated_fields'), ('circuits', '0041_standardize_description_comments'), - ('circuits', '0042_provideraccount') + ('circuits', '0042_provideraccount'), ] dependencies = [ @@ -51,11 +50,15 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='circuittermination', - constraint=models.UniqueConstraint(fields=('circuit', 'term_side'), name='circuits_circuittermination_unique_circuit_term_side'), + constraint=models.UniqueConstraint( + fields=('circuit', 'term_side'), name='circuits_circuittermination_unique_circuit_term_side' + ), ), migrations.AddConstraint( model_name='providernetwork', - constraint=models.UniqueConstraint(fields=('provider', 'name'), name='circuits_providernetwork_unique_provider_name'), + constraint=models.UniqueConstraint( + fields=('provider', 'name'), name='circuits_providernetwork_unique_provider_name' + ), ), migrations.RemoveField( model_name='provider', @@ -84,12 +87,20 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('account', models.CharField(max_length=100)), ('name', models.CharField(blank=True, max_length=100)), - ('provider', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='accounts', to='circuits.provider')), + ( + 'provider', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='accounts', to='circuits.provider' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -98,11 +109,17 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='provideraccount', - constraint=models.UniqueConstraint(condition=models.Q(('name', ''), _negated=True), fields=('provider', 'name'), name='circuits_provideraccount_unique_provider_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('name', ''), _negated=True), + fields=('provider', 'name'), + name='circuits_provideraccount_unique_provider_name', + ), ), migrations.AddConstraint( model_name='provideraccount', - constraint=models.UniqueConstraint(fields=('provider', 'account'), name='circuits_provideraccount_unique_provider_account'), + constraint=models.UniqueConstraint( + fields=('provider', 'account'), name='circuits_provideraccount_unique_provider_account' + ), ), migrations.RemoveField( model_name='provider', @@ -111,7 +128,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='circuit', name='provider_account', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='circuits', to='circuits.provideraccount'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='circuits', + to='circuits.provideraccount', + ), preserve_default=False, ), migrations.AlterModelOptions( @@ -120,6 +143,8 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='circuit', - constraint=models.UniqueConstraint(fields=('provider_account', 'cid'), name='circuits_circuit_unique_provideraccount_cid'), + constraint=models.UniqueConstraint( + fields=('provider_account', 'cid'), name='circuits_circuit_unique_provideraccount_cid' + ), ), ] diff --git a/netbox/circuits/migrations/0044_circuit_groups.py b/netbox/circuits/migrations/0044_circuit_groups.py index 98c3b8f3d..08f6bc158 100644 --- a/netbox/circuits/migrations/0044_circuit_groups.py +++ b/netbox/circuits/migrations/0044_circuit_groups.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('circuits', '0043_circuittype_color'), ('extras', '0119_notifications'), diff --git a/netbox/circuits/migrations/0045_circuit_distance.py b/netbox/circuits/migrations/0045_circuit_distance.py index 6c970339d..9e512e7ee 100644 --- a/netbox/circuits/migrations/0045_circuit_distance.py +++ b/netbox/circuits/migrations/0045_circuit_distance.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('circuits', '0044_circuit_groups'), ] diff --git a/netbox/circuits/migrations/0046_charfield_null_choices.py b/netbox/circuits/migrations/0046_charfield_null_choices.py index 4ec21b750..2a8bcde90 100644 --- a/netbox/circuits/migrations/0046_charfield_null_choices.py +++ b/netbox/circuits/migrations/0046_charfield_null_choices.py @@ -15,7 +15,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('circuits', '0045_circuit_distance'), ] @@ -36,8 +35,5 @@ class Migration(migrations.Migration): name='cable_end', field=models.CharField(blank=True, max_length=1, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/circuits/migrations/0047_circuittermination__termination.py b/netbox/circuits/migrations/0047_circuittermination__termination.py index 0cf2b424f..f78e17ec3 100644 --- a/netbox/circuits/migrations/0047_circuittermination__termination.py +++ b/netbox/circuits/migrations/0047_circuittermination__termination.py @@ -11,19 +11,17 @@ def copy_site_assignments(apps, schema_editor): Site = apps.get_model('dcim', 'Site') CircuitTermination.objects.filter(site__isnull=False).update( - termination_type=ContentType.objects.get_for_model(Site), - termination_id=models.F('site_id') + termination_type=ContentType.objects.get_for_model(Site), termination_id=models.F('site_id') ) ProviderNetwork = apps.get_model('circuits', 'ProviderNetwork') CircuitTermination.objects.filter(provider_network__isnull=False).update( termination_type=ContentType.objects.get_for_model(ProviderNetwork), - termination_id=models.F('provider_network_id') + termination_id=models.F('provider_network_id'), ) class Migration(migrations.Migration): - dependencies = [ ('circuits', '0046_charfield_null_choices'), ('contenttypes', '0002_remove_content_type_name'), @@ -41,17 +39,15 @@ class Migration(migrations.Migration): name='termination_type', field=models.ForeignKey( blank=True, - limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location', 'providernetwork'))), + limit_choices_to=models.Q( + ('model__in', ('region', 'sitegroup', 'site', 'location', 'providernetwork')) + ), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype', ), ), - # Copy over existing site assignments - migrations.RunPython( - code=copy_site_assignments, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=copy_site_assignments, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py index 628579228..fc1cef0e5 100644 --- a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py +++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py @@ -20,7 +20,6 @@ def populate_denormalized_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('circuits', '0047_circuittermination__termination'), ] @@ -70,13 +69,8 @@ class Migration(migrations.Migration): to='dcim.sitegroup', ), ), - # Populate denormalized FK values - migrations.RunPython( - code=populate_denormalized_fields, - reverse_code=migrations.RunPython.noop - ), - + migrations.RunPython(code=populate_denormalized_fields, reverse_code=migrations.RunPython.noop), # Delete the site ForeignKey migrations.RemoveField( model_name='circuittermination', diff --git a/netbox/circuits/migrations/0049_natural_ordering.py b/netbox/circuits/migrations/0049_natural_ordering.py index 1b4f565e8..556d6ec7c 100644 --- a/netbox/circuits/migrations/0049_natural_ordering.py +++ b/netbox/circuits/migrations/0049_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('circuits', '0048_circuitterminations_cached_relations'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/circuits/migrations/0050_virtual_circuits.py b/netbox/circuits/migrations/0050_virtual_circuits.py index df719b517..eb451b4ec 100644 --- a/netbox/circuits/migrations/0050_virtual_circuits.py +++ b/netbox/circuits/migrations/0050_virtual_circuits.py @@ -6,7 +6,6 @@ import utilities.json class Migration(migrations.Migration): - dependencies = [ ('circuits', '0049_natural_ordering'), ('dcim', '0196_qinq_svlan'), @@ -21,15 +20,43 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('cid', models.CharField(max_length=100)), ('status', models.CharField(default='active', max_length=50)), - ('provider_account', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='circuits.provideraccount')), - ('provider_network', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='circuits.providernetwork')), + ( + 'provider_account', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_circuits', + to='circuits.provideraccount', + ), + ), + ( + 'provider_network', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_circuits', + to='circuits.providernetwork', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_circuits', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_circuits', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'circuit', @@ -43,12 +70,29 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('role', models.CharField(default='peer', max_length=50)), ('description', models.CharField(blank=True, max_length=200)), - ('interface', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='virtual_circuit_termination', to='dcim.interface')), + ( + 'interface', + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name='virtual_circuit_termination', + to='dcim.interface', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('virtual_circuit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='circuits.virtualcircuit')), + ( + 'virtual_circuit', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='terminations', + to='circuits.virtualcircuit', + ), + ), ], options={ 'verbose_name': 'virtual circuit termination', @@ -58,10 +102,14 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='virtualcircuit', - constraint=models.UniqueConstraint(fields=('provider_network', 'cid'), name='circuits_virtualcircuit_unique_provider_network_cid'), + constraint=models.UniqueConstraint( + fields=('provider_network', 'cid'), name='circuits_virtualcircuit_unique_provider_network_cid' + ), ), migrations.AddConstraint( model_name='virtualcircuit', - constraint=models.UniqueConstraint(fields=('provider_account', 'cid'), name='circuits_virtualcircuit_unique_provideraccount_cid'), + constraint=models.UniqueConstraint( + fields=('provider_account', 'cid'), name='circuits_virtualcircuit_unique_provideraccount_cid' + ), ), ] diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index 85b22eaa5..5e910b5d5 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -11,7 +11,9 @@ from circuits.constants import * from dcim.models import CabledObjectModel from netbox.models import ChangeLoggedModel, OrganizationalModel, PrimaryModel from netbox.models.mixins import DistanceMixin -from netbox.models.features import ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, ImageAttachmentsMixin, TagsMixin +from netbox.models.features import ( + ContactsMixin, CustomFieldsMixin, CustomLinksMixin, ExportTemplatesMixin, ImageAttachmentsMixin, TagsMixin, +) from utilities.fields import ColorField __all__ = ( diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py index ab9c661e6..dedb1534b 100644 --- a/netbox/circuits/tables/circuits.py +++ b/netbox/circuits/tables/circuits.py @@ -42,7 +42,8 @@ class CircuitTypeTable(NetBoxTable): class Meta(NetBoxTable.Meta): model = CircuitType fields = ( - 'pk', 'id', 'name', 'circuit_count', 'color', 'description', 'slug', 'tags', 'created', 'last_updated', 'actions', + 'pk', 'id', 'name', 'circuit_count', 'color', 'description', 'slug', 'tags', 'created', 'last_updated', + 'actions', ) default_columns = ('pk', 'name', 'circuit_count', 'description', 'slug') diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py index 12c6b2a93..92fbbdedf 100644 --- a/netbox/circuits/tests/test_api.py +++ b/netbox/circuits/tests/test_api.py @@ -121,9 +121,15 @@ class CircuitTest(APIViewTestCases.APIViewTestCase): CircuitType.objects.bulk_create(circuit_types) circuits = ( - Circuit(cid='Circuit 1', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0]), - Circuit(cid='Circuit 2', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0]), - Circuit(cid='Circuit 3', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0]), + Circuit( + cid='Circuit 1', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0] + ), + Circuit( + cid='Circuit 2', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0] + ), + Circuit( + cid='Circuit 3', provider=providers[0], provider_account=provider_accounts[0], type=circuit_types[0] + ), ) Circuit.objects.bulk_create(circuits) diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index 01b5e3105..6b7866665 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -226,12 +226,80 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): ProviderNetwork.objects.bulk_create(provider_networks) circuits = ( - Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 1', install_date='2020-01-01', termination_date='2021-01-01', commit_rate=1000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar1', distance=10, distance_unit=DistanceUnitChoices.UNIT_FOOT), - Circuit(provider=providers[0], provider_account=provider_accounts[0], tenant=tenants[0], type=circuit_types[0], cid='Test Circuit 2', install_date='2020-01-02', termination_date='2021-01-02', commit_rate=2000, status=CircuitStatusChoices.STATUS_ACTIVE, description='foobar2', distance=20, distance_unit=DistanceUnitChoices.UNIT_METER), - Circuit(provider=providers[0], provider_account=provider_accounts[1], tenant=tenants[1], type=circuit_types[0], cid='Test Circuit 3', install_date='2020-01-03', termination_date='2021-01-03', commit_rate=3000, status=CircuitStatusChoices.STATUS_PLANNED, distance=30, distance_unit=DistanceUnitChoices.UNIT_METER), - Circuit(provider=providers[1], provider_account=provider_accounts[1], tenant=tenants[1], type=circuit_types[1], cid='Test Circuit 4', install_date='2020-01-04', termination_date='2021-01-04', commit_rate=4000, status=CircuitStatusChoices.STATUS_PLANNED), - Circuit(provider=providers[1], provider_account=provider_accounts[2], tenant=tenants[2], type=circuit_types[1], cid='Test Circuit 5', install_date='2020-01-05', termination_date='2021-01-05', commit_rate=5000, status=CircuitStatusChoices.STATUS_OFFLINE), - Circuit(provider=providers[1], provider_account=provider_accounts[2], tenant=tenants[2], type=circuit_types[1], cid='Test Circuit 6', install_date='2020-01-06', termination_date='2021-01-06', commit_rate=6000, status=CircuitStatusChoices.STATUS_OFFLINE), + Circuit( + provider=providers[0], + provider_account=provider_accounts[0], + tenant=tenants[0], + type=circuit_types[0], + cid='Test Circuit 1', + install_date='2020-01-01', + termination_date='2021-01-01', + commit_rate=1000, + status=CircuitStatusChoices.STATUS_ACTIVE, + description='foobar1', + distance=10, + distance_unit=DistanceUnitChoices.UNIT_FOOT, + ), + Circuit( + provider=providers[0], + provider_account=provider_accounts[0], + tenant=tenants[0], + type=circuit_types[0], + cid='Test Circuit 2', + install_date='2020-01-02', + termination_date='2021-01-02', + commit_rate=2000, + status=CircuitStatusChoices.STATUS_ACTIVE, + description='foobar2', + distance=20, + distance_unit=DistanceUnitChoices.UNIT_METER, + ), + Circuit( + provider=providers[0], + provider_account=provider_accounts[1], + tenant=tenants[1], + type=circuit_types[0], + cid='Test Circuit 3', + install_date='2020-01-03', + termination_date='2021-01-03', + commit_rate=3000, + status=CircuitStatusChoices.STATUS_PLANNED, + distance=30, + distance_unit=DistanceUnitChoices.UNIT_METER, + ), + Circuit( + provider=providers[1], + provider_account=provider_accounts[1], + tenant=tenants[1], + type=circuit_types[1], + cid='Test Circuit 4', + install_date='2020-01-04', + termination_date='2021-01-04', + commit_rate=4000, + status=CircuitStatusChoices.STATUS_PLANNED, + ), + Circuit( + provider=providers[1], + provider_account=provider_accounts[2], + tenant=tenants[2], + type=circuit_types[1], + cid='Test Circuit 5', + install_date='2020-01-05', + termination_date='2021-01-05', + commit_rate=5000, + status=CircuitStatusChoices.STATUS_OFFLINE, + ), + Circuit( + provider=providers[1], + provider_account=provider_accounts[2], + tenant=tenants[2], + type=circuit_types[1], + cid='Test Circuit 6', + install_date='2020-01-06', + termination_date='2021-01-06', + commit_rate=6000, + status=CircuitStatusChoices.STATUS_OFFLINE, + ), ) Circuit.objects.bulk_create(circuits) @@ -387,18 +455,64 @@ class CircuitTerminationTestCase(TestCase, ChangeLoggedFilterSetTests): ) Circuit.objects.bulk_create(circuits) - circuit_terminations = (( - CircuitTermination(circuit=circuits[0], termination=sites[0], term_side='A', port_speed=1000, upstream_speed=1000, xconnect_id='ABC', description='foobar1'), - CircuitTermination(circuit=circuits[0], termination=sites[1], term_side='Z', port_speed=1000, upstream_speed=1000, xconnect_id='DEF', description='foobar2'), - CircuitTermination(circuit=circuits[1], termination=sites[1], term_side='A', port_speed=2000, upstream_speed=2000, xconnect_id='GHI'), - CircuitTermination(circuit=circuits[1], termination=sites[2], term_side='Z', port_speed=2000, upstream_speed=2000, xconnect_id='JKL'), - CircuitTermination(circuit=circuits[2], termination=sites[2], term_side='A', port_speed=3000, upstream_speed=3000, xconnect_id='MNO'), - CircuitTermination(circuit=circuits[2], termination=sites[0], term_side='Z', port_speed=3000, upstream_speed=3000, xconnect_id='PQR'), + circuit_terminations = ( + CircuitTermination( + circuit=circuits[0], + termination=sites[0], + term_side='A', + port_speed=1000, + upstream_speed=1000, + xconnect_id='ABC', + description='foobar1', + ), + CircuitTermination( + circuit=circuits[0], + termination=sites[1], + term_side='Z', + port_speed=1000, + upstream_speed=1000, + xconnect_id='DEF', + description='foobar2', + ), + CircuitTermination( + circuit=circuits[1], + termination=sites[1], + term_side='A', + port_speed=2000, + upstream_speed=2000, + xconnect_id='GHI', + ), + CircuitTermination( + circuit=circuits[1], + termination=sites[2], + term_side='Z', + port_speed=2000, + upstream_speed=2000, + xconnect_id='JKL', + ), + CircuitTermination( + circuit=circuits[2], + termination=sites[2], + term_side='A', + port_speed=3000, + upstream_speed=3000, + xconnect_id='MNO', + ), + CircuitTermination( + circuit=circuits[2], + termination=sites[0], + term_side='Z', + port_speed=3000, + upstream_speed=3000, + xconnect_id='PQR', + ), CircuitTermination(circuit=circuits[3], termination=provider_networks[0], term_side='A'), CircuitTermination(circuit=circuits[4], termination=provider_networks[1], term_side='A'), CircuitTermination(circuit=circuits[5], termination=provider_networks[2], term_side='A'), - CircuitTermination(circuit=circuits[6], termination=provider_networks[0], term_side='A', mark_connected=True), - )) + CircuitTermination( + circuit=circuits[6], termination=provider_networks[0], term_side='A', mark_connected=True + ), + ) for ct in circuit_terminations: ct.save() diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index 321c2daa7..3a9bd4dff 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -141,9 +141,15 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase): CircuitType.objects.bulk_create(circuittypes) circuits = ( - Circuit(cid='Circuit 1', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0]), - Circuit(cid='Circuit 2', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0]), - Circuit(cid='Circuit 3', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0]), + Circuit( + cid='Circuit 1', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0] + ), + Circuit( + cid='Circuit 2', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0] + ), + Circuit( + cid='Circuit 3', provider=providers[0], provider_account=provider_accounts[0], type=circuittypes[0] + ), ) Circuit.objects.bulk_create(circuits) diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index b4746038d..56ba5eb8a 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -43,10 +43,30 @@ urlpatterns = [ path('virtual-circuits//', include(get_model_urls('circuits', 'virtualcircuit'))), # Virtual circuit terminations - path('virtual-circuit-terminations/', views.VirtualCircuitTerminationListView.as_view(), name='virtualcircuittermination_list'), - path('virtual-circuit-terminations/add/', views.VirtualCircuitTerminationEditView.as_view(), name='virtualcircuittermination_add'), - path('virtual-circuit-terminations/import/', views.VirtualCircuitTerminationBulkImportView.as_view(), name='virtualcircuittermination_import'), - path('virtual-circuit-terminations/edit/', views.VirtualCircuitTerminationBulkEditView.as_view(), name='virtualcircuittermination_bulk_edit'), - path('virtual-circuit-terminations/delete/', views.VirtualCircuitTerminationBulkDeleteView.as_view(), name='virtualcircuittermination_bulk_delete'), + path( + 'virtual-circuit-terminations/', + views.VirtualCircuitTerminationListView.as_view(), + name='virtualcircuittermination_list', + ), + path( + 'virtual-circuit-terminations/add/', + views.VirtualCircuitTerminationEditView.as_view(), + name='virtualcircuittermination_add', + ), + path( + 'virtual-circuit-terminations/import/', + views.VirtualCircuitTerminationBulkImportView.as_view(), + name='virtualcircuittermination_import', + ), + path( + 'virtual-circuit-terminations/edit/', + views.VirtualCircuitTerminationBulkEditView.as_view(), + name='virtualcircuittermination_bulk_edit', + ), + path( + 'virtual-circuit-terminations/delete/', + views.VirtualCircuitTerminationBulkDeleteView.as_view(), + name='virtualcircuittermination_bulk_delete', + ), path('virtual-circuit-terminations//', include(get_model_urls('circuits', 'virtualcircuittermination'))), ] diff --git a/netbox/core/api/schema.py b/netbox/core/api/schema.py index 1ac822b8c..fad907ac1 100644 --- a/netbox/core/api/schema.py +++ b/netbox/core/api/schema.py @@ -35,7 +35,10 @@ class ChoiceFieldFix(OpenApiSerializerFieldExtension): elif direction == "response": value = build_cf - label = {**build_basic_type(OpenApiTypes.STR), "enum": list(OrderedDict.fromkeys(self.target.choices.values()))} + label = { + **build_basic_type(OpenApiTypes.STR), + "enum": list(OrderedDict.fromkeys(self.target.choices.values())) + } return build_object_type( properties={ diff --git a/netbox/core/api/serializers_/jobs.py b/netbox/core/api/serializers_/jobs.py index 544dddb56..306287e88 100644 --- a/netbox/core/api/serializers_/jobs.py +++ b/netbox/core/api/serializers_/jobs.py @@ -22,7 +22,7 @@ class JobSerializer(BaseModelSerializer): class Meta: model = Job fields = [ - 'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'name', 'status', 'created', 'scheduled', 'interval', - 'started', 'completed', 'user', 'data', 'error', 'job_id', + 'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'name', 'status', 'created', 'scheduled', + 'interval', 'started', 'completed', 'user', 'data', 'error', 'job_id', ] brief_fields = ('url', 'created', 'completed', 'user', 'status') diff --git a/netbox/core/migrations/0001_squashed_0005.py b/netbox/core/migrations/0001_squashed_0005.py index 971370bf2..b89fa3b25 100644 --- a/netbox/core/migrations/0001_squashed_0005.py +++ b/netbox/core/migrations/0001_squashed_0005.py @@ -8,13 +8,12 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('core', '0001_initial'), ('core', '0002_managedfile'), ('core', '0003_job'), ('core', '0004_replicate_jobresults'), - ('core', '0005_job_created_auto_now') + ('core', '0005_job_created_auto_now'), ] dependencies = [ @@ -30,7 +29,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), @@ -55,9 +57,28 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(editable=False)), ('path', models.CharField(editable=False, max_length=1000)), ('size', models.PositiveIntegerField(editable=False)), - ('hash', models.CharField(editable=False, max_length=64, validators=[django.core.validators.RegexValidator(message='Length must be 64 hexadecimal characters.', regex='^[0-9a-f]{64}$')])), + ( + 'hash', + models.CharField( + editable=False, + max_length=64, + validators=[ + django.core.validators.RegexValidator( + message='Length must be 64 hexadecimal characters.', regex='^[0-9a-f]{64}$' + ) + ], + ), + ), ('data', models.BinaryField()), - ('source', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='datafiles', to='core.datasource')), + ( + 'source', + models.ForeignKey( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + related_name='datafiles', + to='core.datasource', + ), + ), ], options={ 'ordering': ('source', 'path'), @@ -76,8 +97,18 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('object_id', models.PositiveBigIntegerField()), - ('datafile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core.datafile')), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype')), + ( + 'datafile', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core.datafile' + ), + ), + ( + 'object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype' + ), + ), ], options={ 'indexes': [models.Index(fields=['object_type', 'object_id'], name='core_autosy_object__c17bac_idx')], @@ -97,8 +128,26 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(blank=True, editable=False, null=True)), ('file_root', models.CharField(max_length=1000)), ('file_path', models.FilePathField(editable=False)), - ('data_file', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile')), - ('data_source', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource')), + ( + 'data_file', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='core.datafile', + ), + ), + ( + 'data_source', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='core.datasource', + ), + ), ('auto_sync_enabled', models.BooleanField(default=False)), ], options={ @@ -108,7 +157,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='managedfile', - constraint=models.UniqueConstraint(fields=('file_root', 'file_path'), name='core_managedfile_unique_root_path'), + constraint=models.UniqueConstraint( + fields=('file_root', 'file_path'), name='core_managedfile_unique_root_path' + ), ), migrations.CreateModel( name='Job', @@ -118,14 +169,33 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=200)), ('created', models.DateTimeField()), ('scheduled', models.DateTimeField(blank=True, null=True)), - ('interval', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), + ( + 'interval', + models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), ('started', models.DateTimeField(blank=True, null=True)), ('completed', models.DateTimeField(blank=True, null=True)), ('status', models.CharField(default='pending', max_length=30)), ('data', models.JSONField(blank=True, null=True)), ('job_id', models.UUIDField(unique=True)), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jobs', to='contenttypes.contenttype')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), + ( + 'object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='jobs', to='contenttypes.contenttype' + ), + ), + ( + 'user', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'ordering': ['-created'], diff --git a/netbox/core/migrations/0006_datasource_type_remove_choices.py b/netbox/core/migrations/0006_datasource_type_remove_choices.py index 0ad8d8854..7c9914298 100644 --- a/netbox/core/migrations/0006_datasource_type_remove_choices.py +++ b/netbox/core/migrations/0006_datasource_type_remove_choices.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0005_job_created_auto_now'), ] diff --git a/netbox/core/migrations/0007_job_add_error_field.py b/netbox/core/migrations/0007_job_add_error_field.py index e2e173bfd..3b0e02b56 100644 --- a/netbox/core/migrations/0007_job_add_error_field.py +++ b/netbox/core/migrations/0007_job_add_error_field.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0006_datasource_type_remove_choices'), ] diff --git a/netbox/core/migrations/0008_contenttype_proxy.py b/netbox/core/migrations/0008_contenttype_proxy.py index dee82a969..9acaf3ad7 100644 --- a/netbox/core/migrations/0008_contenttype_proxy.py +++ b/netbox/core/migrations/0008_contenttype_proxy.py @@ -3,7 +3,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('core', '0007_job_add_error_field'), @@ -12,8 +11,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( name='ObjectType', - fields=[ - ], + fields=[], options={ 'proxy': True, 'indexes': [], diff --git a/netbox/core/migrations/0009_configrevision.py b/netbox/core/migrations/0009_configrevision.py index e7f817a16..6acd4531d 100644 --- a/netbox/core/migrations/0009_configrevision.py +++ b/netbox/core/migrations/0009_configrevision.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0008_contenttype_proxy'), ] diff --git a/netbox/core/migrations/0010_gfk_indexes.py b/netbox/core/migrations/0010_gfk_indexes.py index d51bc67ad..1e593a0c7 100644 --- a/netbox/core/migrations/0010_gfk_indexes.py +++ b/netbox/core/migrations/0010_gfk_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0009_configrevision'), ] diff --git a/netbox/core/migrations/0011_move_objectchange.py b/netbox/core/migrations/0011_move_objectchange.py index 2b41133ec..673763ce4 100644 --- a/netbox/core/migrations/0011_move_objectchange.py +++ b/netbox/core/migrations/0011_move_objectchange.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('core', '0010_gfk_indexes'), @@ -27,15 +26,49 @@ class Migration(migrations.Migration): ('object_repr', models.CharField(editable=False, max_length=200)), ('prechange_data', models.JSONField(blank=True, editable=False, null=True)), ('postchange_data', models.JSONField(blank=True, editable=False, null=True)), - ('changed_object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('related_object_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='changes', to=settings.AUTH_USER_MODEL)), + ( + 'changed_object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'related_object_type', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'user', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='changes', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'verbose_name': 'object change', 'verbose_name_plural': 'object changes', 'ordering': ['-time'], - 'indexes': [models.Index(fields=['changed_object_type', 'changed_object_id'], name='core_object_changed_c227ce_idx'), models.Index(fields=['related_object_type', 'related_object_id'], name='core_object_related_3375d6_idx')], + 'indexes': [ + models.Index( + fields=['changed_object_type', 'changed_object_id'], + name='core_object_changed_c227ce_idx', + ), + models.Index( + fields=['related_object_type', 'related_object_id'], + name='core_object_related_3375d6_idx', + ), + ], }, ), ], diff --git a/netbox/core/migrations/0012_job_object_type_optional.py b/netbox/core/migrations/0012_job_object_type_optional.py index 3c6664afc..3798b1285 100644 --- a/netbox/core/migrations/0012_job_object_type_optional.py +++ b/netbox/core/migrations/0012_job_object_type_optional.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('core', '0011_move_objectchange'), @@ -18,7 +17,7 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jobs', - to='contenttypes.contenttype' + to='contenttypes.contenttype', ), ), ] diff --git a/netbox/core/models/files.py b/netbox/core/models/files.py index 7b626a441..cc446bac7 100644 --- a/netbox/core/models/files.py +++ b/netbox/core/models/files.py @@ -93,9 +93,14 @@ class ManagedFile(SyncedDataMixin, models.Model): self.file_path = os.path.basename(self.data_path) # Ensure that the file root and path make a unique pair - if self._meta.model.objects.filter(file_root=self.file_root, file_path=self.file_path).exclude(pk=self.pk).exists(): + if self._meta.model.objects.filter( + file_root=self.file_root, file_path=self.file_path + ).exclude(pk=self.pk).exists(): raise ValidationError( - f"A {self._meta.verbose_name.lower()} with this file path already exists ({self.file_root}/{self.file_path}).") + _("A {model} with this file path already exists ({path}).").format( + model=self._meta.verbose_name.lower(), + path=f"{self.file_root}/{self.file_path}" + )) def delete(self, *args, **kwargs): # Delete file from disk diff --git a/netbox/core/models/jobs.py b/netbox/core/models/jobs.py index 82bfd72c8..5caa9cc2d 100644 --- a/netbox/core/models/jobs.py +++ b/netbox/core/models/jobs.py @@ -203,7 +203,17 @@ class Job(models.Model): job_end.send(self) @classmethod - def enqueue(cls, func, instance=None, name='', user=None, schedule_at=None, interval=None, immediate=False, **kwargs): + def enqueue( + cls, + func, + instance=None, + name='', + user=None, + schedule_at=None, + interval=None, + immediate=False, + **kwargs + ): """ Create a Job instance and enqueue a job using the given callable diff --git a/netbox/core/urls.py b/netbox/core/urls.py index 5db165a8b..b922c8bed 100644 --- a/netbox/core/urls.py +++ b/netbox/core/urls.py @@ -20,11 +20,27 @@ urlpatterns = ( # Background Tasks path('background-queues/', views.BackgroundQueueListView.as_view(), name='background_queue_list'), - path('background-queues///', views.BackgroundTaskListView.as_view(), name='background_task_list'), + path( + 'background-queues///', + views.BackgroundTaskListView.as_view(), + name='background_task_list' + ), path('background-tasks//', views.BackgroundTaskView.as_view(), name='background_task'), - path('background-tasks//delete/', views.BackgroundTaskDeleteView.as_view(), name='background_task_delete'), - path('background-tasks//requeue/', views.BackgroundTaskRequeueView.as_view(), name='background_task_requeue'), - path('background-tasks//enqueue/', views.BackgroundTaskEnqueueView.as_view(), name='background_task_enqueue'), + path( + 'background-tasks//delete/', + views.BackgroundTaskDeleteView.as_view(), + name='background_task_delete' + ), + path( + 'background-tasks//requeue/', + views.BackgroundTaskRequeueView.as_view(), + name='background_task_requeue' + ), + path( + 'background-tasks//enqueue/', + views.BackgroundTaskEnqueueView.as_view(), + name='background_task_enqueue' + ), path('background-tasks//stop/', views.BackgroundTaskStopView.as_view(), name='background_task_stop'), path('background-workers//', views.WorkerListView.as_view(), name='worker_list'), path('background-workers//', views.WorkerView.as_view(), name='worker'), diff --git a/netbox/dcim/api/serializers_/device_components.py b/netbox/dcim/api/serializers_/device_components.py index 12133ec65..a6767bb6f 100644 --- a/netbox/dcim/api/serializers_/device_components.py +++ b/netbox/dcim/api/serializers_/device_components.py @@ -351,9 +351,9 @@ class InventoryItemSerializer(NetBoxModelSerializer): class Meta: model = InventoryItem fields = [ - 'id', 'url', 'display_url', 'display', 'device', 'parent', 'name', 'label', 'status', 'role', 'manufacturer', - 'part_id', 'serial', 'asset_tag', 'discovered', 'description', 'component_type', 'component_id', - 'component', 'tags', 'custom_fields', 'created', 'last_updated', '_depth', + 'id', 'url', 'display_url', 'display', 'device', 'parent', 'name', 'label', 'status', 'role', + 'manufacturer', 'part_id', 'serial', 'asset_tag', 'discovered', 'description', 'component_type', + 'component_id', 'component', 'tags', 'custom_fields', 'created', 'last_updated', '_depth', ] brief_fields = ('id', 'url', 'display', 'device', 'name', 'description', '_depth') diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index f4d65d4bc..90a9993c2 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -312,8 +312,8 @@ class RackTypeFilterSet(NetBoxModelFilterSet): class Meta: model = RackType fields = ( - 'id', 'model', 'slug', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth', 'outer_unit', - 'mounting_depth', 'weight', 'max_weight', 'weight_unit', 'description', + 'id', 'model', 'slug', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth', + 'outer_unit', 'mounting_depth', 'weight', 'max_weight', 'weight_unit', 'description', ) def search(self, queryset, name, value): diff --git a/netbox/dcim/forms/bulk_import.py b/netbox/dcim/forms/bulk_import.py index b8a7a007c..a2352d806 100644 --- a/netbox/dcim/forms/bulk_import.py +++ b/netbox/dcim/forms/bulk_import.py @@ -428,7 +428,10 @@ class ModuleTypeImportForm(NetBoxModelImportForm): class Meta: model = ModuleType - fields = ['manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'comments', 'tags'] + fields = [ + 'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'comments', + 'tags', + ] class DeviceRoleImportForm(NetBoxModelImportForm): @@ -800,7 +803,10 @@ class PowerOutletImportForm(NetBoxModelImportForm): class Meta: model = PowerOutlet - fields = ('device', 'name', 'label', 'type', 'color', 'mark_connected', 'power_port', 'feed_leg', 'description', 'tags') + fields = ( + 'device', 'name', 'label', 'type', 'color', 'mark_connected', 'power_port', 'feed_leg', 'description', + 'tags', + ) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -1114,8 +1120,8 @@ class InventoryItemImportForm(NetBoxModelImportForm): class Meta: model = InventoryItem fields = ( - 'device', 'name', 'label', 'status', 'role', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag', 'discovered', - 'description', 'tags', 'component_type', 'component_name', + 'device', 'name', 'label', 'status', 'role', 'manufacturer', 'parent', 'part_id', 'serial', 'asset_tag', + 'discovered', 'description', 'tags', 'component_type', 'component_name', ) def __init__(self, *args, **kwargs): diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index d30ac0784..04c53b384 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -136,7 +136,10 @@ class ModuleCommonForm(forms.Form): if len(module_bays) != template.name.count(MODULE_TOKEN): raise forms.ValidationError( - _("Cannot install module with placeholder values in a module bay tree {level} in tree but {tokens} placeholders given.").format( + _( + "Cannot install module with placeholder values in a module bay tree {level} in tree " + "but {tokens} placeholders given." + ).format( level=len(module_bays), tokens=template.name.count(MODULE_TOKEN) ) ) diff --git a/netbox/dcim/forms/connections.py b/netbox/dcim/forms/connections.py index 324f8ecfd..5e5d83b0b 100644 --- a/netbox/dcim/forms/connections.py +++ b/netbox/dcim/forms/connections.py @@ -111,9 +111,15 @@ def get_cable_form(a_type, b_type): if self.instance and self.instance.pk: # Initialize A/B terminations when modifying an existing Cable instance - if a_type and self.instance.a_terminations and a_ct == ContentType.objects.get_for_model(self.instance.a_terminations[0]): + if ( + a_type and self.instance.a_terminations and + a_ct == ContentType.objects.get_for_model(self.instance.a_terminations[0]) + ): self.initial['a_terminations'] = self.instance.a_terminations - if b_type and self.instance.b_terminations and b_ct == ContentType.objects.get_for_model(self.instance.b_terminations[0]): + if ( + b_type and self.instance.b_terminations and + b_ct == ContentType.objects.get_for_model(self.instance.b_terminations[0]) + ): self.initial['b_terminations'] = self.instance.b_terminations else: # Need to clear terminations if swapped type - but need to do it only diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 8a19b14e7..37cce9060 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -266,7 +266,10 @@ class RackForm(TenancyForm, NetBoxModelForm): comments = CommentField() fieldsets = ( - FieldSet('site', 'location', 'name', 'status', 'role', 'rack_type', 'description', 'airflow', 'tags', name=_('Rack')), + FieldSet( + 'site', 'location', 'name', 'status', 'role', 'rack_type', 'description', 'airflow', 'tags', + name=_('Rack') + ), FieldSet('facility_id', 'serial', 'asset_tag', name=_('Inventory Control')), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), ) @@ -1007,7 +1010,8 @@ class InterfaceTemplateForm(ModularComponentTemplateForm): class Meta: model = InterfaceTemplate fields = [ - 'device_type', 'module_type', 'name', 'label', 'type', 'mgmt_only', 'enabled', 'description', 'poe_mode', 'poe_type', 'bridge', 'rf_role', + 'device_type', 'module_type', 'name', 'label', 'type', 'mgmt_only', 'enabled', 'description', 'poe_mode', + 'poe_type', 'bridge', 'rf_role', ] @@ -1189,7 +1193,10 @@ class InventoryItemTemplateForm(ComponentTemplateForm): break elif component_type and component_id: # When adding the InventoryItem from a component page - if content_type := ContentType.objects.filter(MODULAR_COMPONENT_TEMPLATE_MODELS).filter(pk=component_type).first(): + content_type = ContentType.objects.filter( + MODULAR_COMPONENT_TEMPLATE_MODELS + ).filter(pk=component_type).first() + if content_type: if component := content_type.model_class().objects.filter(pk=component_id).first(): initial[content_type.model] = component @@ -1301,16 +1308,16 @@ class PowerOutletForm(ModularDeviceComponentForm): fieldsets = ( FieldSet( - 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', 'description', - 'tags', + 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', + 'description', 'tags', ), ) class Meta: model = PowerOutlet fields = [ - 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', 'description', - 'tags', + 'device', 'module', 'name', 'label', 'type', 'color', 'power_port', 'feed_leg', 'mark_connected', + 'description', 'tags', ] @@ -1611,7 +1618,10 @@ class InventoryItemForm(DeviceComponentForm): ) fieldsets = ( - FieldSet('device', 'parent', 'name', 'label', 'status', 'role', 'description', 'tags', name=_('Inventory Item')), + FieldSet( + 'device', 'parent', 'name', 'label', 'status', 'role', 'description', 'tags', + name=_('Inventory Item') + ), FieldSet('manufacturer', 'part_id', 'serial', 'asset_tag', name=_('Hardware')), FieldSet( TabbedGroups( diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py index 85c613b8c..6f6cd8f7c 100644 --- a/netbox/dcim/forms/object_create.py +++ b/netbox/dcim/forms/object_create.py @@ -416,7 +416,8 @@ class VirtualChassisCreateForm(NetBoxModelForm): class Meta: model = VirtualChassis fields = [ - 'name', 'domain', 'description', 'region', 'site_group', 'site', 'rack', 'members', 'initial_position', 'tags', + 'name', 'domain', 'description', 'region', 'site_group', 'site', 'rack', 'members', 'initial_position', + 'tags', ] def clean(self): diff --git a/netbox/dcim/forms/object_import.py b/netbox/dcim/forms/object_import.py index d46ef83ad..821f91402 100644 --- a/netbox/dcim/forms/object_import.py +++ b/netbox/dcim/forms/object_import.py @@ -136,7 +136,8 @@ class FrontPortTemplateImportForm(forms.ModelForm): class Meta: model = FrontPortTemplate fields = [ - 'device_type', 'module_type', 'name', 'type', 'color', 'rear_port', 'rear_port_position', 'label', 'description', + 'device_type', 'module_type', 'name', 'type', 'color', 'rear_port', 'rear_port_position', 'label', + 'description', ] diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py index 7aa4ef8a0..1020861f4 100644 --- a/netbox/dcim/graphql/types.py +++ b/netbox/dcim/graphql/types.py @@ -482,7 +482,9 @@ class LocationType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, Organi return self.cluster_set.all() @strawberry_django.field - def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + def circuit_terminations(self) -> List[ + Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')] + ]: return self.circuit_terminations.all() @@ -728,7 +730,9 @@ class RegionType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): return self.cluster_set.all() @strawberry_django.field - def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + def circuit_terminations(self) -> List[ + Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')] + ]: return self.circuit_terminations.all() @@ -760,7 +764,9 @@ class SiteType(VLANGroupsMixin, ImageAttachmentsMixin, ContactsMixin, NetBoxObje return self.cluster_set.all() @strawberry_django.field - def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + def circuit_terminations(self) -> List[ + Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')] + ]: return self.circuit_terminations.all() @@ -784,7 +790,9 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType): return self.cluster_set.all() @strawberry_django.field - def circuit_terminations(self) -> List[Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')]]: + def circuit_terminations(self) -> List[ + Annotated["CircuitTerminationType", strawberry.lazy('circuits.graphql.types')] + ]: return self.circuit_terminations.all() diff --git a/netbox/dcim/migrations/0001_squashed.py b/netbox/dcim/migrations/0001_squashed.py index cf0ef4816..f08fe1d70 100644 --- a/netbox/dcim/migrations/0001_squashed.py +++ b/netbox/dcim/migrations/0001_squashed.py @@ -13,11 +13,9 @@ import utilities.validators class Migration(migrations.Migration): - initial = True - dependencies = [ - ] + dependencies = [] replaces = [ ('dcim', '0001_initial'), @@ -64,7 +62,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), @@ -83,7 +86,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(blank=True, max_length=50)), @@ -100,7 +108,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), @@ -119,7 +132,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(blank=True, max_length=50)), @@ -137,14 +155,34 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(primary_key=True, serialize=False)), ('local_context_data', models.JSONField(blank=True, null=True)), ('name', models.CharField(blank=True, max_length=64, null=True)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize, null=True + ), + ), ('serial', models.CharField(blank=True, max_length=50)), ('asset_tag', models.CharField(blank=True, max_length=50, null=True, unique=True)), - ('position', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), + ( + 'position', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), ('face', models.CharField(blank=True, max_length=50)), ('status', models.CharField(default='active', max_length=50)), - ('vc_position', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MaxValueValidator(255)])), - ('vc_priority', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MaxValueValidator(255)])), + ( + 'vc_position', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MaxValueValidator(255)] + ), + ), + ( + 'vc_priority', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MaxValueValidator(255)] + ), + ), ('comments', models.TextField(blank=True)), ], options={ @@ -159,7 +197,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ], @@ -174,7 +217,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ], @@ -228,13 +276,27 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), ('mark_connected', models.BooleanField(default=False)), ('type', models.CharField(max_length=50)), - ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)])), + ( + 'rear_port_position', + models.PositiveSmallIntegerField( + default=1, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(1024), + ], + ), + ), ], options={ 'ordering': ('device', '_name'), @@ -247,11 +309,25 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(max_length=50)), - ('rear_port_position', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)])), + ( + 'rear_port_position', + models.PositiveSmallIntegerField( + default=1, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(1024), + ], + ), + ), ], options={ 'ordering': ('device_type', '_name'), @@ -271,9 +347,24 @@ class Migration(migrations.Migration): ('mark_connected', models.BooleanField(default=False)), ('enabled', models.BooleanField(default=True)), ('mac_address', dcim.fields.MACAddressField(blank=True, null=True)), - ('mtu', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65536)])), + ( + 'mtu', + models.PositiveIntegerField( + blank=True, + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(65536), + ], + ), + ), ('mode', models.CharField(blank=True, max_length=50)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface + ), + ), ('type', models.CharField(max_length=50)), ('mgmt_only', models.BooleanField(default=False)), ], @@ -290,7 +381,12 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=64)), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface + ), + ), ('type', models.CharField(max_length=50)), ('mgmt_only', models.BooleanField(default=False)), ], @@ -306,7 +402,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('part_id', models.CharField(blank=True, max_length=50)), @@ -388,8 +489,19 @@ class Migration(migrations.Migration): ('supply', models.CharField(default='ac', max_length=50)), ('phase', models.CharField(default='single-phase', max_length=50)), ('voltage', models.SmallIntegerField(validators=[utilities.validators.ExclusionValidator([0])])), - ('amperage', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1)])), - ('max_utilization', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ( + 'amperage', + models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1)]), + ), + ( + 'max_utilization', + models.PositiveSmallIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(100), + ] + ), + ), ('available_power', models.PositiveIntegerField(default=0, editable=False)), ('comments', models.TextField(blank=True)), ], @@ -405,7 +517,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), @@ -424,7 +541,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(blank=True, max_length=50)), @@ -455,14 +577,29 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), ('mark_connected', models.BooleanField(default=False)), ('type', models.CharField(blank=True, max_length=50)), - ('maximum_draw', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), - ('allocated_draw', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), + ( + 'maximum_draw', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), + ( + 'allocated_draw', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), ], options={ 'ordering': ('device', '_name'), @@ -475,12 +612,27 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(blank=True, max_length=50)), - ('maximum_draw', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), - ('allocated_draw', models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)])), + ( + 'maximum_draw', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), + ( + 'allocated_draw', + models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), + ), ], options={ 'ordering': ('device_type', '_name'), @@ -494,14 +646,28 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=100)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('facility_id', models.CharField(blank=True, max_length=50, null=True)), ('status', models.CharField(default='active', max_length=50)), ('serial', models.CharField(blank=True, max_length=50)), ('asset_tag', models.CharField(blank=True, max_length=50, null=True, unique=True)), ('type', models.CharField(blank=True, max_length=50)), ('width', models.PositiveSmallIntegerField(default=19)), - ('u_height', models.PositiveSmallIntegerField(default=42, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)])), + ( + 'u_height', + models.PositiveSmallIntegerField( + default=42, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(100), + ], + ), + ), ('desc_units', models.BooleanField(default=False)), ('outer_width', models.PositiveSmallIntegerField(blank=True, null=True)), ('outer_depth', models.PositiveSmallIntegerField(blank=True, null=True)), @@ -519,7 +685,10 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('units', django.contrib.postgres.fields.ArrayField(base_field=models.PositiveSmallIntegerField(), size=None)), + ( + 'units', + django.contrib.postgres.fields.ArrayField(base_field=models.PositiveSmallIntegerField(), size=None), + ), ('description', models.CharField(max_length=200)), ], options={ @@ -550,13 +719,27 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('_cable_peer_id', models.PositiveIntegerField(blank=True, null=True)), ('mark_connected', models.BooleanField(default=False)), ('type', models.CharField(max_length=50)), - ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)])), + ( + 'positions', + models.PositiveSmallIntegerField( + default=1, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(1024), + ], + ), + ), ], options={ 'ordering': ('device', '_name'), @@ -569,11 +752,25 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('type', models.CharField(max_length=50)), - ('positions', models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1024)])), + ( + 'positions', + models.PositiveSmallIntegerField( + default=1, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(1024), + ], + ), + ), ], options={ 'ordering': ('device_type', '_name'), @@ -606,7 +803,12 @@ class Migration(migrations.Migration): ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=100, unique=True)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('slug', models.SlugField(max_length=100, unique=True)), ('status', models.CharField(default='active', max_length=50)), ('facility', models.CharField(blank=True, max_length=50)), @@ -654,7 +856,16 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), ('domain', models.CharField(blank=True, max_length=30)), - ('master', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vc_master_for', to='dcim.device')), + ( + 'master', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vc_master_for', + to='dcim.device', + ), + ), ], options={ 'verbose_name_plural': 'virtual chassis', diff --git a/netbox/dcim/migrations/0002_squashed.py b/netbox/dcim/migrations/0002_squashed.py index 786167680..2e830560f 100644 --- a/netbox/dcim/migrations/0002_squashed.py +++ b/netbox/dcim/migrations/0002_squashed.py @@ -6,7 +6,6 @@ import taggit.managers class Migration(migrations.Migration): - dependencies = [ ('dcim', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), @@ -28,17 +27,35 @@ class Migration(migrations.Migration): migrations.AddField( model_name='sitegroup', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='dcim.sitegroup'), + field=mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='dcim.sitegroup', + ), ), migrations.AddField( model_name='site', name='group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sites', to='dcim.sitegroup'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='sites', + to='dcim.sitegroup', + ), ), migrations.AddField( model_name='site', name='region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sites', to='dcim.region'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='sites', + to='dcim.region', + ), ), migrations.AddField( model_name='site', @@ -48,32 +65,56 @@ class Migration(migrations.Migration): migrations.AddField( model_name='site', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='sites', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='sites', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='region', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='dcim.region'), + field=mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='dcim.region', + ), ), migrations.AddField( model_name='rearporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='rearport', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='rearport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='rearport', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='rearport', @@ -83,7 +124,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rackreservation', name='rack', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='dcim.rack'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='dcim.rack' + ), ), migrations.AddField( model_name='rackreservation', @@ -93,7 +136,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rackreservation', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='rackreservations', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='rackreservations', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='rackreservation', @@ -103,12 +152,24 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rack', name='location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='racks', to='dcim.location'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='racks', + to='dcim.location', + ), ), migrations.AddField( model_name='rack', name='role', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='racks', to='dcim.rackrole'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='racks', + to='dcim.rackrole', + ), ), migrations.AddField( model_name='rack', @@ -123,32 +184,52 @@ class Migration(migrations.Migration): migrations.AddField( model_name='rack', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='racks', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='racks', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='powerporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='powerport', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='powerport', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='powerport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='powerport', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='powerport', @@ -158,7 +239,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='powerpanel', name='location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.location'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='dcim.location' + ), ), migrations.AddField( model_name='powerpanel', @@ -173,37 +256,63 @@ class Migration(migrations.Migration): migrations.AddField( model_name='poweroutlettemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='poweroutlettemplate', name='power_port', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlet_templates', to='dcim.powerporttemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='poweroutlet_templates', + to='dcim.powerporttemplate', + ), ), migrations.AddField( model_name='poweroutlet', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='poweroutlet', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='poweroutlet', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='poweroutlet', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='poweroutlet', name='power_port', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='poweroutlets', to='dcim.powerport'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='poweroutlets', + to='dcim.powerport', + ), ), migrations.AddField( model_name='poweroutlet', @@ -213,27 +322,45 @@ class Migration(migrations.Migration): migrations.AddField( model_name='powerfeed', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='powerfeed', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='powerfeed', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='powerfeed', name='power_panel', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.powerpanel'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.powerpanel' + ), ), migrations.AddField( model_name='powerfeed', name='rack', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='powerfeeds', to='dcim.rack'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='powerfeeds', + to='dcim.rack', + ), ), migrations.AddField( model_name='powerfeed', @@ -243,32 +370,60 @@ class Migration(migrations.Migration): migrations.AddField( model_name='platform', name='manufacturer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='platforms', to='dcim.manufacturer'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='platforms', + to='dcim.manufacturer', + ), ), migrations.AddField( model_name='location', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='dcim.location'), + field=mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='dcim.location', + ), ), migrations.AddField( model_name='location', name='site', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='locations', to='dcim.site'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='locations', to='dcim.site' + ), ), migrations.AddField( model_name='inventoryitem', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='inventoryitem', name='manufacturer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='inventory_items', to='dcim.manufacturer'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='inventory_items', + to='dcim.manufacturer', + ), ), migrations.AddField( model_name='inventoryitem', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='child_items', to='dcim.inventoryitem'), + field=mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='child_items', + to='dcim.inventoryitem', + ), ), migrations.AddField( model_name='inventoryitem', @@ -278,36 +433,62 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interfacetemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='interface', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='interface', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='interface', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='interface', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='interface', name='lag', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='member_interfaces', to='dcim.interface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='member_interfaces', + to='dcim.interface', + ), ), migrations.AddField( model_name='interface', name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='child_interfaces', to='dcim.interface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='child_interfaces', + to='dcim.interface', + ), ), ] diff --git a/netbox/dcim/migrations/0003_squashed_0130.py b/netbox/dcim/migrations/0003_squashed_0130.py index 592aaf9a8..0248d9ba1 100644 --- a/netbox/dcim/migrations/0003_squashed_0130.py +++ b/netbox/dcim/migrations/0003_squashed_0130.py @@ -4,7 +4,6 @@ import taggit.managers class Migration(migrations.Migration): - dependencies = [ ('dcim', '0002_auto_20160622_1821'), ('virtualization', '0001_virtualization'), @@ -160,37 +159,61 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='untagged_vlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='interfaces_as_untagged', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='interfaces_as_untagged', + to='ipam.vlan', + ), ), migrations.AddField( model_name='frontporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='frontporttemplate', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontport_templates', to='dcim.rearporttemplate'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='frontport_templates', + to='dcim.rearporttemplate', + ), ), migrations.AddField( model_name='frontport', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='frontport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='frontport', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='frontport', name='rear_port', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.rearport'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='frontports', to='dcim.rearport' + ), ), migrations.AddField( model_name='frontport', @@ -200,7 +223,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='devicetype', name='manufacturer', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='device_types', to='dcim.manufacturer'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='device_types', to='dcim.manufacturer' + ), ), migrations.AddField( model_name='devicetype', @@ -210,17 +235,27 @@ class Migration(migrations.Migration): migrations.AddField( model_name='devicebaytemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='devicebay', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='devicebay', name='installed_device', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parent_bay', to='dcim.device'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='parent_bay', + to='dcim.device', + ), ), migrations.AddField( model_name='devicebay', @@ -230,47 +265,89 @@ class Migration(migrations.Migration): migrations.AddField( model_name='device', name='cluster', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='devices', to='virtualization.cluster'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='devices', + to='virtualization.cluster', + ), ), migrations.AddField( model_name='device', name='device_role', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.devicerole'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.devicerole' + ), ), migrations.AddField( model_name='device', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='instances', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='instances', to='dcim.devicetype' + ), ), migrations.AddField( model_name='device', name='location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.location'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='devices', + to='dcim.location', + ), ), migrations.AddField( model_name='device', name='platform', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='devices', to='dcim.platform'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='devices', + to='dcim.platform', + ), ), migrations.AddField( model_name='device', name='primary_ip4', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='primary_ip4_for', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='primary_ip4_for', + to='ipam.ipaddress', + ), ), migrations.AddField( model_name='device', name='primary_ip6', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='primary_ip6_for', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='primary_ip6_for', + to='ipam.ipaddress', + ), ), migrations.AddField( model_name='device', name='rack', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.rack'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='devices', + to='dcim.rack', + ), ), migrations.AddField( model_name='device', name='site', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.site'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='dcim.site' + ), ), migrations.AddField( model_name='device', @@ -280,37 +357,63 @@ class Migration(migrations.Migration): migrations.AddField( model_name='device', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='devices', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='devices', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='device', name='virtual_chassis', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='members', to='dcim.virtualchassis'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='members', + to='dcim.virtualchassis', + ), ), migrations.AddField( model_name='consoleserverporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='consoleserverport', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='consoleserverport', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='consoleserverport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='consoleserverport', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='consoleserverport', @@ -320,27 +423,41 @@ class Migration(migrations.Migration): migrations.AddField( model_name='consoleporttemplate', name='device_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), ), migrations.AddField( model_name='consoleport', name='_cable_peer_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='consoleport', name='_path', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dcim.cablepath' + ), ), migrations.AddField( model_name='consoleport', name='cable', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.cable' + ), ), migrations.AddField( model_name='consoleport', name='device', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), ), migrations.AddField( model_name='consoleport', @@ -350,22 +467,34 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cablepath', name='destination_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='cablepath', name='origin_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype' + ), ), migrations.AddField( model_name='cable', name='_termination_a_device', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device' + ), ), migrations.AddField( model_name='cable', name='_termination_b_device', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device' + ), ), migrations.AddField( model_name='cable', @@ -375,12 +504,64 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cable', name='termination_a_type', - field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'powerfeed', 'poweroutlet', 'powerport', 'rearport'))), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), + models.Q( + ('app_label', 'dcim'), + ( + 'model__in', + ( + 'consoleport', + 'consoleserverport', + 'frontport', + 'interface', + 'powerfeed', + 'poweroutlet', + 'powerport', + 'rearport', + ), + ), + ), + _connector='OR', + ) + ), + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='cable', name='termination_b_type', - field=models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'powerfeed', 'poweroutlet', 'powerport', 'rearport'))), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), + models.Q( + ('app_label', 'dcim'), + ( + 'model__in', + ( + 'consoleport', + 'consoleserverport', + 'frontport', + 'interface', + 'powerfeed', + 'poweroutlet', + 'powerport', + 'rearport', + ), + ), + ), + _connector='OR', + ) + ), + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AlterUniqueTogether( name='rearporttemplate', @@ -456,7 +637,11 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='device', - unique_together={('rack', 'position', 'face'), ('virtual_chassis', 'vc_position'), ('site', 'tenant', 'name')}, + unique_together={ + ('rack', 'position', 'face'), + ('virtual_chassis', 'vc_position'), + ('site', 'tenant', 'name'), + }, ), migrations.AlterUniqueTogether( name='consoleserverporttemplate', diff --git a/netbox/dcim/migrations/0131_squashed_0159.py b/netbox/dcim/migrations/0131_squashed_0159.py index f7e7cfdb2..3866e8cc8 100644 --- a/netbox/dcim/migrations/0131_squashed_0159.py +++ b/netbox/dcim/migrations/0131_squashed_0159.py @@ -10,7 +10,6 @@ import utilities.ordering class Migration(migrations.Migration): - replaces = [ ('dcim', '0131_consoleport_speed'), ('dcim', '0132_cable_length'), @@ -40,7 +39,7 @@ class Migration(migrations.Migration): ('dcim', '0156_location_status'), ('dcim', '0157_new_cabling_models'), ('dcim', '0158_populate_cable_terminations'), - ('dcim', '0159_populate_cable_paths') + ('dcim', '0159_populate_cable_paths'), ] dependencies = [ @@ -96,17 +95,35 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='bridge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bridge_interfaces', to='dcim.interface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='bridge_interfaces', + to='dcim.interface', + ), ), migrations.AddField( model_name='location', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='locations', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='locations', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='cable', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='cables', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='cables', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='devicetype', @@ -148,7 +165,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='location', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('site', 'name'), name='dcim_location_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('site', 'name'), name='dcim_location_name' + ), ), migrations.AddConstraint( model_name='location', @@ -156,7 +175,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='location', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('site', 'slug'), name='dcim_location_slug'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('site', 'slug'), name='dcim_location_slug' + ), ), migrations.AddConstraint( model_name='region', @@ -164,7 +185,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='region', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('name',), name='dcim_region_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('name',), name='dcim_region_name' + ), ), migrations.AddConstraint( model_name='region', @@ -172,7 +195,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='region', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('slug',), name='dcim_region_slug'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('slug',), name='dcim_region_slug' + ), ), migrations.AddConstraint( model_name='sitegroup', @@ -180,7 +205,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='sitegroup', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('name',), name='dcim_sitegroup_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('name',), name='dcim_sitegroup_name' + ), ), migrations.AddConstraint( model_name='sitegroup', @@ -188,7 +215,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='sitegroup', - constraint=models.UniqueConstraint(condition=models.Q(('parent', None)), fields=('slug',), name='dcim_sitegroup_slug'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent', None)), fields=('slug',), name='dcim_sitegroup_slug' + ), ), migrations.AddField( model_name='devicerole', @@ -328,7 +357,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='tx_power', - field=models.PositiveSmallIntegerField(blank=True, null=True, validators=[django.core.validators.MaxValueValidator(127)]), + field=models.PositiveSmallIntegerField( + blank=True, null=True, validators=[django.core.validators.MaxValueValidator(127)] + ), ), migrations.AddField( model_name='interface', @@ -338,7 +369,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='wireless_link', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wireless.wirelesslink'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='wireless.wirelesslink', + ), ), migrations.AddField( model_name='site', @@ -348,12 +385,24 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='device', name='primary_ip4', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), ), migrations.AlterField( model_name='device', name='primary_ip6', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), ), migrations.RemoveField( model_name='site', @@ -372,7 +421,23 @@ class Migration(migrations.Migration): name='contact_phone', ), migrations.RunSQL( - sql="\n DO $$\n DECLARE\n idx record;\n BEGIN\n FOR idx IN\n SELECT indexname AS old_name,\n replace(indexname, 'module', 'inventoryitem') AS new_name\n FROM pg_indexes\n WHERE schemaname = 'public' AND\n tablename = 'dcim_inventoryitem' AND\n indexname LIKE 'dcim_module_%'\n LOOP\n EXECUTE format(\n 'ALTER INDEX %I RENAME TO %I;',\n idx.old_name,\n idx.new_name\n );\n END LOOP;\n END$$;\n ", + sql="""DO $$ + DECLARE idx record; + BEGIN + FOR idx IN + SELECT indexname AS old_name, replace(indexname, 'module', 'inventoryitem') AS new_name + FROM pg_indexes + WHERE schemaname = 'public' AND + tablename = 'dcim_inventoryitem' AND + indexname LIKE 'dcim_module_%' + LOOP + EXECUTE format( + 'ALTER INDEX %I RENAME TO %I;', + idx.old_name, + idx.new_name + ); + END LOOP; + END$$;""", ), migrations.AlterModelOptions( name='consoleporttemplate', @@ -405,49 +470,99 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='consoleporttemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='consoleserverporttemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='frontporttemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='interfacetemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='poweroutlettemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='powerporttemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AlterField( model_name='rearporttemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.CreateModel( name='ModuleType', fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('model', models.CharField(max_length=100)), ('part_number', models.CharField(blank=True, max_length=50)), ('comments', models.TextField(blank=True)), - ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='module_types', to='dcim.manufacturer')), + ( + 'manufacturer', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='module_types', to='dcim.manufacturer' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -460,14 +575,27 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('position', models.CharField(blank=True, max_length=30)), ('description', models.CharField(blank=True, max_length=200)), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device')), + ( + 'device', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.device' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -480,15 +608,35 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('local_context_data', models.JSONField(blank=True, null=True)), ('serial', models.CharField(blank=True, max_length=50)), ('asset_tag', models.CharField(blank=True, max_length=50, null=True, unique=True)), ('comments', models.TextField(blank=True)), - ('device', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='modules', to='dcim.device')), - ('module_bay', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='installed_module', to='dcim.modulebay')), - ('module_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='instances', to='dcim.moduletype')), + ( + 'device', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='modules', to='dcim.device' + ), + ), + ( + 'module_bay', + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name='installed_module', + to='dcim.modulebay', + ), + ), + ( + 'module_type', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='instances', to='dcim.moduletype' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -498,72 +646,156 @@ class Migration(migrations.Migration): migrations.AddField( model_name='consoleport', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='consoleporttemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='consoleserverport', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='consoleserverporttemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='frontport', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='frontporttemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='interface', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='interfacetemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='poweroutlet', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='poweroutlettemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='powerport', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='powerporttemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AddField( model_name='rearport', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='rearporttemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AlterUniqueTogether( name='consoleporttemplate', @@ -598,7 +830,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), @@ -613,7 +848,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='inventoryitem', name='role', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='inventory_items', to='dcim.inventoryitemrole'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='inventory_items', + to='dcim.inventoryitemrole', + ), ), migrations.AddField( model_name='inventoryitem', @@ -623,12 +864,39 @@ class Migration(migrations.Migration): migrations.AddField( model_name='inventoryitem', name='component_type', - field=models.ForeignKey(blank=True, limit_choices_to=models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'poweroutlet', 'powerport', 'rearport'))), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + ('app_label', 'dcim'), + ( + 'model__in', + ( + 'consoleport', + 'consoleserverport', + 'frontport', + 'interface', + 'poweroutlet', + 'powerport', + 'rearport', + ), + ), + ), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='interface', name='vrf', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='interfaces', to='ipam.vrf'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='interfaces', + to='ipam.vrf', + ), ), migrations.AddField( model_name='interface', @@ -952,7 +1220,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('description', models.CharField(blank=True, max_length=200)), ('component_id', models.PositiveBigIntegerField(blank=True, null=True)), @@ -961,11 +1234,67 @@ class Migration(migrations.Migration): ('rght', models.PositiveIntegerField(editable=False)), ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ('level', models.PositiveIntegerField(editable=False)), - ('component_type', models.ForeignKey(blank=True, limit_choices_to=models.Q(('app_label', 'dcim'), ('model__in', ('consoleporttemplate', 'consoleserverporttemplate', 'frontporttemplate', 'interfacetemplate', 'poweroutlettemplate', 'powerporttemplate', 'rearporttemplate'))), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('device_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype')), - ('manufacturer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='inventory_item_templates', to='dcim.manufacturer')), - ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='child_items', to='dcim.inventoryitemtemplate')), - ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='inventory_item_templates', to='dcim.inventoryitemrole')), + ( + 'component_type', + models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + ('app_label', 'dcim'), + ( + 'model__in', + ( + 'consoleporttemplate', + 'consoleserverporttemplate', + 'frontporttemplate', + 'interfacetemplate', + 'poweroutlettemplate', + 'powerporttemplate', + 'rearporttemplate', + ), + ), + ), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'device_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), + ), + ( + 'manufacturer', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='inventory_item_templates', + to='dcim.manufacturer', + ), + ), + ( + 'parent', + mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='child_items', + to='dcim.inventoryitemtemplate', + ), + ), + ( + 'role', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='inventory_item_templates', + to='dcim.inventoryitemrole', + ), + ), ], options={ 'ordering': ('device_type__id', 'parent__id', '_name'), @@ -989,11 +1318,21 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), + ), ('label', models.CharField(blank=True, max_length=64)), ('position', models.CharField(blank=True, max_length=30)), ('description', models.CharField(blank=True, max_length=200)), - ('device_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype')), + ( + 'device_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype' + ), + ), ], options={ 'ordering': ('device_type', '_name'), @@ -1088,7 +1427,16 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='device', name='position', - field=models.DecimalField(blank=True, decimal_places=1, max_digits=4, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100.5)]), + field=models.DecimalField( + blank=True, + decimal_places=1, + max_digits=4, + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(100.5), + ], + ), ), migrations.AddField( model_name='interface', @@ -1121,12 +1469,66 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('cable_end', models.CharField(max_length=1)), ('termination_id', models.PositiveBigIntegerField()), - ('cable', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='dcim.cable')), - ('termination_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'powerfeed', 'poweroutlet', 'powerport', 'rearport'))), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('_device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.device')), - ('_rack', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.rack')), - ('_location', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location')), - ('_site', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site')), + ( + 'cable', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='dcim.cable' + ), + ), + ( + 'termination_type', + models.ForeignKey( + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), + models.Q( + ('app_label', 'dcim'), + ( + 'model__in', + ( + 'consoleport', + 'consoleserverport', + 'frontport', + 'interface', + 'powerfeed', + 'poweroutlet', + 'powerport', + 'rearport', + ), + ), + ), + _connector='OR', + ) + ), + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + '_device', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.device' + ), + ), + ( + '_rack', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.rack' + ), + ), + ( + '_location', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location' + ), + ), + ( + '_site', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.site' + ), + ), ], options={ 'ordering': ('cable', 'cable_end', 'pk'), @@ -1134,7 +1536,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='cabletermination', - constraint=models.UniqueConstraint(fields=('termination_type', 'termination_id'), name='dcim_cable_termination_unique_termination'), + constraint=models.UniqueConstraint( + fields=('termination_type', 'termination_id'), name='dcim_cable_termination_unique_termination' + ), ), migrations.RenameField( model_name='cablepath', diff --git a/netbox/dcim/migrations/0160_squashed_0166.py b/netbox/dcim/migrations/0160_squashed_0166.py index 440a8115e..0deb58bab 100644 --- a/netbox/dcim/migrations/0160_squashed_0166.py +++ b/netbox/dcim/migrations/0160_squashed_0166.py @@ -6,7 +6,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('dcim', '0160_populate_cable_ends'), ('dcim', '0161_cabling_cleanup'), @@ -14,7 +13,7 @@ class Migration(migrations.Migration): ('dcim', '0163_weight_fields'), ('dcim', '0164_rack_mounting_depth'), ('dcim', '0165_standardize_description_comments'), - ('dcim', '0166_virtualdevicecontext') + ('dcim', '0166_virtualdevicecontext'), ] dependencies = [ @@ -275,7 +274,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='cabletermination', - constraint=models.UniqueConstraint(fields=('termination_type', 'termination_id'), name='dcim_cabletermination_unique_termination'), + constraint=models.UniqueConstraint( + fields=('termination_type', 'termination_id'), name='dcim_cabletermination_unique_termination' + ), ), migrations.AddConstraint( model_name='consoleport', @@ -283,39 +284,64 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='consoleporttemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_consoleporttemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_consoleporttemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='consoleporttemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_consoleporttemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_consoleporttemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='consoleserverport', - constraint=models.UniqueConstraint(fields=('device', 'name'), name='dcim_consoleserverport_unique_device_name'), + constraint=models.UniqueConstraint( + fields=('device', 'name'), name='dcim_consoleserverport_unique_device_name' + ), ), migrations.AddConstraint( model_name='consoleserverporttemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_consoleserverporttemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_consoleserverporttemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='consoleserverporttemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_consoleserverporttemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_consoleserverporttemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='device', - constraint=models.UniqueConstraint(django.db.models.functions.text.Lower('name'), models.F('site'), models.F('tenant'), name='dcim_device_unique_name_site_tenant'), + constraint=models.UniqueConstraint( + django.db.models.functions.text.Lower('name'), + models.F('site'), + models.F('tenant'), + name='dcim_device_unique_name_site_tenant', + ), ), migrations.AddConstraint( model_name='device', - constraint=models.UniqueConstraint(django.db.models.functions.text.Lower('name'), models.F('site'), condition=models.Q(('tenant__isnull', True)), name='dcim_device_unique_name_site', violation_error_message='Device name must be unique per site.'), + constraint=models.UniqueConstraint( + django.db.models.functions.text.Lower('name'), + models.F('site'), + condition=models.Q(('tenant__isnull', True)), + name='dcim_device_unique_name_site', + violation_error_message='Device name must be unique per site.', + ), ), migrations.AddConstraint( model_name='device', - constraint=models.UniqueConstraint(fields=('rack', 'position', 'face'), name='dcim_device_unique_rack_position_face'), + constraint=models.UniqueConstraint( + fields=('rack', 'position', 'face'), name='dcim_device_unique_rack_position_face' + ), ), migrations.AddConstraint( model_name='device', - constraint=models.UniqueConstraint(fields=('virtual_chassis', 'vc_position'), name='dcim_device_unique_virtual_chassis_vc_position'), + constraint=models.UniqueConstraint( + fields=('virtual_chassis', 'vc_position'), name='dcim_device_unique_virtual_chassis_vc_position' + ), ), migrations.AddConstraint( model_name='devicebay', @@ -323,15 +349,21 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='devicebaytemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_devicebaytemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_devicebaytemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='devicetype', - constraint=models.UniqueConstraint(fields=('manufacturer', 'model'), name='dcim_devicetype_unique_manufacturer_model'), + constraint=models.UniqueConstraint( + fields=('manufacturer', 'model'), name='dcim_devicetype_unique_manufacturer_model' + ), ), migrations.AddConstraint( model_name='devicetype', - constraint=models.UniqueConstraint(fields=('manufacturer', 'slug'), name='dcim_devicetype_unique_manufacturer_slug'), + constraint=models.UniqueConstraint( + fields=('manufacturer', 'slug'), name='dcim_devicetype_unique_manufacturer_slug' + ), ), migrations.AddConstraint( model_name='frontport', @@ -339,19 +371,27 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='frontport', - constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='dcim_frontport_unique_rear_port_position'), + constraint=models.UniqueConstraint( + fields=('rear_port', 'rear_port_position'), name='dcim_frontport_unique_rear_port_position' + ), ), migrations.AddConstraint( model_name='frontporttemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_frontporttemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_frontporttemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='frontporttemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_frontporttemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_frontporttemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='frontporttemplate', - constraint=models.UniqueConstraint(fields=('rear_port', 'rear_port_position'), name='dcim_frontporttemplate_unique_rear_port_position'), + constraint=models.UniqueConstraint( + fields=('rear_port', 'rear_port_position'), name='dcim_frontporttemplate_unique_rear_port_position' + ), ), migrations.AddConstraint( model_name='interface', @@ -359,27 +399,46 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='interfacetemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_interfacetemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_interfacetemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='interfacetemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_interfacetemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_interfacetemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='inventoryitem', - constraint=models.UniqueConstraint(fields=('device', 'parent', 'name'), name='dcim_inventoryitem_unique_device_parent_name'), + constraint=models.UniqueConstraint( + fields=('device', 'parent', 'name'), name='dcim_inventoryitem_unique_device_parent_name' + ), ), migrations.AddConstraint( model_name='inventoryitemtemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'parent', 'name'), name='dcim_inventoryitemtemplate_unique_device_type_parent_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'parent', 'name'), + name='dcim_inventoryitemtemplate_unique_device_type_parent_name', + ), ), migrations.AddConstraint( model_name='location', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('site', 'name'), name='dcim_location_name', violation_error_message='A location with this name already exists within the specified site.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('site', 'name'), + name='dcim_location_name', + violation_error_message='A location with this name already exists within the specified site.', + ), ), migrations.AddConstraint( model_name='location', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('site', 'slug'), name='dcim_location_slug', violation_error_message='A location with this slug already exists within the specified site.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('site', 'slug'), + name='dcim_location_slug', + violation_error_message='A location with this slug already exists within the specified site.', + ), ), migrations.AddConstraint( model_name='modulebay', @@ -387,15 +446,21 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='modulebaytemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_modulebaytemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_modulebaytemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='moduletype', - constraint=models.UniqueConstraint(fields=('manufacturer', 'model'), name='dcim_moduletype_unique_manufacturer_model'), + constraint=models.UniqueConstraint( + fields=('manufacturer', 'model'), name='dcim_moduletype_unique_manufacturer_model' + ), ), migrations.AddConstraint( model_name='powerfeed', - constraint=models.UniqueConstraint(fields=('power_panel', 'name'), name='dcim_powerfeed_unique_power_panel_name'), + constraint=models.UniqueConstraint( + fields=('power_panel', 'name'), name='dcim_powerfeed_unique_power_panel_name' + ), ), migrations.AddConstraint( model_name='poweroutlet', @@ -403,11 +468,15 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='poweroutlettemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_poweroutlettemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_poweroutlettemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='poweroutlettemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_poweroutlettemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_poweroutlettemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='powerpanel', @@ -419,11 +488,15 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='powerporttemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_powerporttemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_powerporttemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='powerporttemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_powerporttemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_powerporttemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='rack', @@ -431,7 +504,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='rack', - constraint=models.UniqueConstraint(fields=('location', 'facility_id'), name='dcim_rack_unique_location_facility_id'), + constraint=models.UniqueConstraint( + fields=('location', 'facility_id'), name='dcim_rack_unique_location_facility_id' + ), ), migrations.AddConstraint( model_name='rearport', @@ -439,27 +514,51 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='rearporttemplate', - constraint=models.UniqueConstraint(fields=('device_type', 'name'), name='dcim_rearporttemplate_unique_device_type_name'), + constraint=models.UniqueConstraint( + fields=('device_type', 'name'), name='dcim_rearporttemplate_unique_device_type_name' + ), ), migrations.AddConstraint( model_name='rearporttemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_rearporttemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_rearporttemplate_unique_module_type_name' + ), ), migrations.AddConstraint( model_name='region', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('name',), name='dcim_region_name', violation_error_message='A top-level region with this name already exists.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('name',), + name='dcim_region_name', + violation_error_message='A top-level region with this name already exists.', + ), ), migrations.AddConstraint( model_name='region', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('slug',), name='dcim_region_slug', violation_error_message='A top-level region with this slug already exists.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('slug',), + name='dcim_region_slug', + violation_error_message='A top-level region with this slug already exists.', + ), ), migrations.AddConstraint( model_name='sitegroup', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('name',), name='dcim_sitegroup_name', violation_error_message='A top-level site group with this name already exists.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('name',), + name='dcim_sitegroup_name', + violation_error_message='A top-level site group with this name already exists.', + ), ), migrations.AddConstraint( model_name='sitegroup', - constraint=models.UniqueConstraint(condition=models.Q(('parent__isnull', True)), fields=('slug',), name='dcim_sitegroup_slug', violation_error_message='A top-level site group with this slug already exists.'), + constraint=models.UniqueConstraint( + condition=models.Q(('parent__isnull', True)), + fields=('slug',), + name='dcim_sitegroup_slug', + violation_error_message='A top-level site group with this slug already exists.', + ), ), migrations.AddField( model_name='devicetype', @@ -592,17 +691,56 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('name', models.CharField(max_length=64)), ('status', models.CharField(max_length=50)), ('identifier', models.PositiveSmallIntegerField(blank=True, null=True)), ('comments', models.TextField(blank=True)), - ('device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vdcs', to='dcim.device')), - ('primary_ip4', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), - ('primary_ip6', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), + ( + 'device', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vdcs', + to='dcim.device', + ), + ), + ( + 'primary_ip4', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), + ), + ( + 'primary_ip6', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vdcs', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vdcs', + to='tenancy.tenant', + ), + ), ], options={ 'ordering': ['name'], @@ -615,7 +753,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='virtualdevicecontext', - constraint=models.UniqueConstraint(fields=('device', 'identifier'), name='dcim_virtualdevicecontext_device_identifier'), + constraint=models.UniqueConstraint( + fields=('device', 'identifier'), name='dcim_virtualdevicecontext_device_identifier' + ), ), migrations.AddConstraint( model_name='virtualdevicecontext', diff --git a/netbox/dcim/migrations/0167_squashed_0182.py b/netbox/dcim/migrations/0167_squashed_0182.py index 735cb3efa..d0ad5379f 100644 --- a/netbox/dcim/migrations/0167_squashed_0182.py +++ b/netbox/dcim/migrations/0167_squashed_0182.py @@ -6,7 +6,6 @@ import utilities.fields class Migration(migrations.Migration): - replaces = [ ('dcim', '0167_module_status'), ('dcim', '0168_interface_template_enabled'), @@ -24,7 +23,7 @@ class Migration(migrations.Migration): ('dcim', '0179_interfacetemplate_rf_role'), ('dcim', '0180_powerfeed_tenant'), ('dcim', '0181_rename_device_role_device_role'), - ('dcim', '0182_zero_length_cable_fix') + ('dcim', '0182_zero_length_cable_fix'), ] dependencies = [ @@ -48,27 +47,57 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interfacetemplate', name='bridge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bridge_interfaces', to='dcim.interfacetemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='bridge_interfaces', + to='dcim.interfacetemplate', + ), ), migrations.AddField( model_name='devicetype', name='default_platform', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='dcim.platform'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='dcim.platform', + ), ), migrations.AddField( model_name='device', name='config_template', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='%(class)ss', to='extras.configtemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='%(class)ss', + to='extras.configtemplate', + ), ), migrations.AddField( model_name='devicerole', name='config_template', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='device_roles', to='extras.configtemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='device_roles', + to='extras.configtemplate', + ), ), migrations.AddField( model_name='platform', name='config_template', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='platforms', to='extras.configtemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='platforms', + to='extras.configtemplate', + ), ), migrations.AddField( model_name='cabletermination', @@ -83,22 +112,30 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='powerport', name='allocated_draw', - field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + field=models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), ), migrations.AlterField( model_name='powerport', name='maximum_draw', - field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + field=models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), ), migrations.AlterField( model_name='powerporttemplate', name='allocated_draw', - field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + field=models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), ), migrations.AlterField( model_name='powerporttemplate', name='maximum_draw', - field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + field=models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), ), migrations.RemoveField( model_name='platform', @@ -126,112 +163,160 @@ class Migration(migrations.Migration): migrations.AddField( model_name='device', name='oob_ip', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), ), migrations.AddField( model_name='device', name='console_port_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.ConsolePort'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.ConsolePort' + ), ), migrations.AddField( model_name='device', name='console_server_port_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.ConsoleServerPort'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.ConsoleServerPort' + ), ), migrations.AddField( model_name='device', name='power_port_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.PowerPort'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.PowerPort' + ), ), migrations.AddField( model_name='device', name='power_outlet_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.PowerOutlet'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.PowerOutlet' + ), ), migrations.AddField( model_name='device', name='interface_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.Interface'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.Interface' + ), ), migrations.AddField( model_name='device', name='front_port_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.FrontPort'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.FrontPort' + ), ), migrations.AddField( model_name='device', name='rear_port_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.RearPort'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.RearPort' + ), ), migrations.AddField( model_name='device', name='device_bay_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.DeviceBay'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.DeviceBay' + ), ), migrations.AddField( model_name='device', name='module_bay_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.ModuleBay'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.ModuleBay' + ), ), migrations.AddField( model_name='device', name='inventory_item_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device', to_model='dcim.InventoryItem'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device', to_model='dcim.InventoryItem' + ), ), migrations.AddField( model_name='devicetype', name='console_port_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.ConsolePortTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.ConsolePortTemplate' + ), ), migrations.AddField( model_name='devicetype', name='console_server_port_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.ConsoleServerPortTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.ConsoleServerPortTemplate' + ), ), migrations.AddField( model_name='devicetype', name='power_port_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.PowerPortTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.PowerPortTemplate' + ), ), migrations.AddField( model_name='devicetype', name='power_outlet_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.PowerOutletTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.PowerOutletTemplate' + ), ), migrations.AddField( model_name='devicetype', name='interface_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.InterfaceTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.InterfaceTemplate' + ), ), migrations.AddField( model_name='devicetype', name='front_port_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.FrontPortTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.FrontPortTemplate' + ), ), migrations.AddField( model_name='devicetype', name='rear_port_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.RearPortTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.RearPortTemplate' + ), ), migrations.AddField( model_name='devicetype', name='device_bay_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.DeviceBayTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.DeviceBayTemplate' + ), ), migrations.AddField( model_name='devicetype', name='module_bay_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.ModuleBayTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.ModuleBayTemplate' + ), ), migrations.AddField( model_name='devicetype', name='inventory_item_template_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='device_type', to_model='dcim.InventoryItemTemplate'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='device_type', to_model='dcim.InventoryItemTemplate' + ), ), migrations.AddField( model_name='virtualchassis', name='member_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='virtual_chassis', to_model='dcim.Device'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='virtual_chassis', to_model='dcim.Device' + ), ), migrations.AddField( model_name='interfacetemplate', @@ -241,7 +326,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='powerfeed', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='power_feeds', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='power_feeds', + to='tenancy.tenant', + ), ), migrations.RenameField( model_name='device', diff --git a/netbox/dcim/migrations/0184_protect_child_interfaces.py b/netbox/dcim/migrations/0184_protect_child_interfaces.py index 3459e23fc..58eca506d 100644 --- a/netbox/dcim/migrations/0184_protect_child_interfaces.py +++ b/netbox/dcim/migrations/0184_protect_child_interfaces.py @@ -5,7 +5,6 @@ import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('dcim', '0183_devicetype_exclude_from_utilization'), ] @@ -14,6 +13,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='interface', name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT, related_name='child_interfaces', to='dcim.interface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.RESTRICT, + related_name='child_interfaces', + to='dcim.interface', + ), ), ] diff --git a/netbox/dcim/migrations/0185_gfk_indexes.py b/netbox/dcim/migrations/0185_gfk_indexes.py index 84cdc53ff..5c099b380 100644 --- a/netbox/dcim/migrations/0185_gfk_indexes.py +++ b/netbox/dcim/migrations/0185_gfk_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0184_protect_child_interfaces'), ] diff --git a/netbox/dcim/migrations/0186_location_facility.py b/netbox/dcim/migrations/0186_location_facility.py index 759ee813b..3d22503b6 100644 --- a/netbox/dcim/migrations/0186_location_facility.py +++ b/netbox/dcim/migrations/0186_location_facility.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0185_gfk_indexes'), ] diff --git a/netbox/dcim/migrations/0187_alter_device_vc_position.py b/netbox/dcim/migrations/0187_alter_device_vc_position.py index d4a42dc20..10b636959 100644 --- a/netbox/dcim/migrations/0187_alter_device_vc_position.py +++ b/netbox/dcim/migrations/0187_alter_device_vc_position.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0186_location_facility'), ] diff --git a/netbox/dcim/migrations/0188_racktype.py b/netbox/dcim/migrations/0188_racktype.py index aa45246e5..a5265d030 100644 --- a/netbox/dcim/migrations/0188_racktype.py +++ b/netbox/dcim/migrations/0188_racktype.py @@ -9,7 +9,6 @@ import utilities.ordering class Migration(migrations.Migration): - dependencies = [ ('extras', '0118_customfield_uniqueness'), ('dcim', '0187_alter_device_vc_position'), @@ -22,36 +21,41 @@ class Migration(migrations.Migration): ('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 - )), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('weight', models.DecimalField(blank=True, decimal_places=2, max_digits=8, null=True)), ('weight_unit', models.CharField(blank=True, max_length=50)), ('_abs_weight', models.PositiveBigIntegerField(blank=True, null=True)), - ('manufacturer', models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name='rack_types', - to='dcim.manufacturer' - )), + ( + 'manufacturer', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='rack_types', to='dcim.manufacturer' + ), + ), ('model', models.CharField(max_length=100)), ('slug', models.SlugField(max_length=100, unique=True)), ('form_factor', models.CharField(max_length=50)), ('width', models.PositiveSmallIntegerField(default=19)), - ('u_height', models.PositiveSmallIntegerField( - default=42, - validators=[ - django.core.validators.MinValueValidator(1), - django.core.validators.MaxValueValidator(100), - ] - )), - ('starting_unit', models.PositiveSmallIntegerField( - default=1, - validators=[django.core.validators.MinValueValidator(1)] - )), + ( + 'u_height', + models.PositiveSmallIntegerField( + default=42, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(100), + ], + ), + ), + ( + 'starting_unit', + models.PositiveSmallIntegerField( + default=1, validators=[django.core.validators.MinValueValidator(1)] + ), + ), ('desc_units', models.BooleanField(default=False)), ('outer_width', models.PositiveSmallIntegerField(blank=True, null=True)), ('outer_depth', models.PositiveSmallIntegerField(blank=True, null=True)), diff --git a/netbox/dcim/migrations/0189_moduletype_rack_airflow.py b/netbox/dcim/migrations/0189_moduletype_rack_airflow.py index 31787b67d..c356e32f7 100644 --- a/netbox/dcim/migrations/0189_moduletype_rack_airflow.py +++ b/netbox/dcim/migrations/0189_moduletype_rack_airflow.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0188_racktype'), ] diff --git a/netbox/dcim/migrations/0190_nested_modules.py b/netbox/dcim/migrations/0190_nested_modules.py index 9cef40efb..239e08639 100644 --- a/netbox/dcim/migrations/0190_nested_modules.py +++ b/netbox/dcim/migrations/0190_nested_modules.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0189_moduletype_rack_airflow'), ('extras', '0121_customfield_related_object_filter'), @@ -34,12 +33,25 @@ class Migration(migrations.Migration): migrations.AddField( model_name='modulebay', name='module', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.module'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.module', + ), ), migrations.AddField( model_name='modulebay', name='parent', - field=mptt.fields.TreeForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='dcim.modulebay'), + field=mptt.fields.TreeForeignKey( + blank=True, + editable=False, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='dcim.modulebay', + ), ), migrations.AddField( model_name='modulebay', @@ -56,19 +68,35 @@ class Migration(migrations.Migration): migrations.AddField( model_name='modulebaytemplate', name='module_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.moduletype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.moduletype', + ), ), migrations.AlterField( model_name='modulebaytemplate', name='device_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='dcim.devicetype'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='dcim.devicetype', + ), ), migrations.AddConstraint( model_name='modulebay', - constraint=models.UniqueConstraint(fields=('device', 'module', 'name'), name='dcim_modulebay_unique_device_module_name'), + constraint=models.UniqueConstraint( + fields=('device', 'module', 'name'), name='dcim_modulebay_unique_device_module_name' + ), ), migrations.AddConstraint( model_name='modulebaytemplate', - constraint=models.UniqueConstraint(fields=('module_type', 'name'), name='dcim_modulebaytemplate_unique_module_type_name'), + constraint=models.UniqueConstraint( + fields=('module_type', 'name'), name='dcim_modulebaytemplate_unique_module_type_name' + ), ), ] diff --git a/netbox/dcim/migrations/0191_module_bay_rebuild.py b/netbox/dcim/migrations/0191_module_bay_rebuild.py index 260063213..4f8a461f2 100644 --- a/netbox/dcim/migrations/0191_module_bay_rebuild.py +++ b/netbox/dcim/migrations/0191_module_bay_rebuild.py @@ -13,14 +13,10 @@ def rebuild_mptt(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('dcim', '0190_nested_modules'), ] operations = [ - migrations.RunPython( - code=rebuild_mptt, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=rebuild_mptt, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/dcim/migrations/0192_inventoryitem_status.py b/netbox/dcim/migrations/0192_inventoryitem_status.py index 335ab2ca7..027f2daef 100644 --- a/netbox/dcim/migrations/0192_inventoryitem_status.py +++ b/netbox/dcim/migrations/0192_inventoryitem_status.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0191_module_bay_rebuild'), ] diff --git a/netbox/dcim/migrations/0193_poweroutlet_color.py b/netbox/dcim/migrations/0193_poweroutlet_color.py index 0a6c08b48..f7e3c430c 100644 --- a/netbox/dcim/migrations/0193_poweroutlet_color.py +++ b/netbox/dcim/migrations/0193_poweroutlet_color.py @@ -5,7 +5,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('dcim', '0192_inventoryitem_status'), ] diff --git a/netbox/dcim/migrations/0194_charfield_null_choices.py b/netbox/dcim/migrations/0194_charfield_null_choices.py index 8e507c050..83c056386 100644 --- a/netbox/dcim/migrations/0194_charfield_null_choices.py +++ b/netbox/dcim/migrations/0194_charfield_null_choices.py @@ -69,7 +69,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('dcim', '0193_poweroutlet_color'), ] @@ -280,8 +279,5 @@ class Migration(migrations.Migration): name='cable_end', field=models.CharField(blank=True, max_length=1, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py index 42ff1205a..9ec404886 100644 --- a/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py +++ b/netbox/dcim/migrations/0195_interface_vlan_translation_policy.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0194_charfield_null_choices'), ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), @@ -15,6 +14,8 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='vlan_translation_policy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy' + ), ), ] diff --git a/netbox/dcim/migrations/0196_qinq_svlan.py b/netbox/dcim/migrations/0196_qinq_svlan.py index 9012d74f3..a03ad144a 100644 --- a/netbox/dcim/migrations/0196_qinq_svlan.py +++ b/netbox/dcim/migrations/0196_qinq_svlan.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0195_interface_vlan_translation_policy'), ('ipam', '0075_vlan_qinq'), @@ -13,7 +12,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='interface', name='qinq_svlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_svlan', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='%(class)ss_svlan', + to='ipam.vlan', + ), ), migrations.AlterField( model_name='interface', @@ -23,6 +28,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='interface', name='untagged_vlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_as_untagged', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='%(class)ss_as_untagged', + to='ipam.vlan', + ), ), ] diff --git a/netbox/dcim/migrations/0197_natural_sort_collation.py b/netbox/dcim/migrations/0197_natural_sort_collation.py index a77632b37..268bda7eb 100644 --- a/netbox/dcim/migrations/0197_natural_sort_collation.py +++ b/netbox/dcim/migrations/0197_natural_sort_collation.py @@ -3,15 +3,14 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('dcim', '0196_qinq_svlan'), ] operations = [ CreateCollation( - "natural_sort", - provider="icu", - locale="und-u-kn-true", + 'natural_sort', + provider='icu', + locale='und-u-kn-true', ), ] diff --git a/netbox/dcim/migrations/0198_natural_ordering.py b/netbox/dcim/migrations/0198_natural_ordering.py index 83e94a195..cf4361a2b 100644 --- a/netbox/dcim/migrations/0198_natural_ordering.py +++ b/netbox/dcim/migrations/0198_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0197_natural_sort_collation'), ] diff --git a/netbox/dcim/migrations/0199_macaddress.py b/netbox/dcim/migrations/0199_macaddress.py index 8068c7436..ae18d5f63 100644 --- a/netbox/dcim/migrations/0199_macaddress.py +++ b/netbox/dcim/migrations/0199_macaddress.py @@ -7,7 +7,6 @@ import utilities.json class Migration(migrations.Migration): - dependencies = [ ('dcim', '0198_natural_ordering'), ('extras', '0122_charfield_null_choices'), @@ -20,17 +19,33 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('mac_address', dcim.fields.MACAddressField()), ('assigned_object_id', models.PositiveBigIntegerField(blank=True, null=True)), - ('assigned_object_type', models.ForeignKey(blank=True, limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), + ( + 'assigned_object_type', + models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'dcim'), ('model', 'interface')), + models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), + _connector='OR', + ) + ), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], - options={ - 'abstract': False, - 'ordering': ('mac_address',) - }, + options={'abstract': False, 'ordering': ('mac_address',)}, ), ] diff --git a/netbox/dcim/migrations/0200_populate_mac_addresses.py b/netbox/dcim/migrations/0200_populate_mac_addresses.py index 1f3c5dee9..0cd18d78e 100644 --- a/netbox/dcim/migrations/0200_populate_mac_addresses.py +++ b/netbox/dcim/migrations/0200_populate_mac_addresses.py @@ -10,9 +10,7 @@ def populate_mac_addresses(apps, schema_editor): mac_addresses = [ MACAddress( - mac_address=interface.mac_address, - assigned_object_type=interface_ct, - assigned_object_id=interface.pk + mac_address=interface.mac_address, assigned_object_type=interface_ct, assigned_object_id=interface.pk ) for interface in Interface.objects.filter(mac_address__isnull=False) ] @@ -24,7 +22,6 @@ def populate_mac_addresses(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('dcim', '0199_macaddress'), ] @@ -38,13 +35,10 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', - to='dcim.macaddress' + to='dcim.macaddress', ), ), - migrations.RunPython( - code=populate_mac_addresses, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=populate_mac_addresses, reverse_code=migrations.RunPython.noop), migrations.RemoveField( model_name='interface', name='mac_address', diff --git a/netbox/dcim/models/device_component_templates.py b/netbox/dcim/models/device_component_templates.py index ddd4d2426..b4f057711 100644 --- a/netbox/dcim/models/device_component_templates.py +++ b/netbox/dcim/models/device_component_templates.py @@ -311,7 +311,9 @@ class PowerPortTemplate(ModularComponentTemplateModel): if self.maximum_draw is not None and self.allocated_draw is not None: if self.allocated_draw > self.maximum_draw: raise ValidationError({ - 'allocated_draw': _("Allocated draw cannot exceed the maximum draw ({maximum_draw}W).").format(maximum_draw=self.maximum_draw) + 'allocated_draw': _( + "Allocated draw cannot exceed the maximum draw ({maximum_draw}W)." + ).format(maximum_draw=self.maximum_draw) }) def to_yaml(self): @@ -365,11 +367,15 @@ class PowerOutletTemplate(ModularComponentTemplateModel): if self.power_port: if self.device_type and self.power_port.device_type != self.device_type: raise ValidationError( - _("Parent power port ({power_port}) must belong to the same device type").format(power_port=self.power_port) + _("Parent power port ({power_port}) must belong to the same device type").format( + power_port=self.power_port + ) ) if self.module_type and self.power_port.module_type != self.module_type: raise ValidationError( - _("Parent power port ({power_port}) must belong to the same module type").format(power_port=self.power_port) + _("Parent power port ({power_port}) must belong to the same module type").format( + power_port=self.power_port + ) ) def instantiate(self, **kwargs): @@ -467,11 +473,15 @@ class InterfaceTemplate(ModularComponentTemplateModel): raise ValidationError({'bridge': _("An interface cannot be bridged to itself.")}) if self.device_type and self.device_type != self.bridge.device_type: raise ValidationError({ - 'bridge': _("Bridge interface ({bridge}) must belong to the same device type").format(bridge=self.bridge) + 'bridge': _( + "Bridge interface ({bridge}) must belong to the same device type" + ).format(bridge=self.bridge) }) if self.module_type and self.module_type != self.bridge.module_type: raise ValidationError({ - 'bridge': _("Bridge interface ({bridge}) must belong to the same module type").format(bridge=self.bridge) + 'bridge': _( + "Bridge interface ({bridge}) must belong to the same module type" + ).format(bridge=self.bridge) }) if self.rf_role and self.type not in WIRELESS_IFACE_TYPES: @@ -714,7 +724,9 @@ class DeviceBayTemplate(ComponentTemplateModel): def clean(self): if self.device_type and self.device_type.subdevice_role != SubdeviceRoleChoices.ROLE_PARENT: raise ValidationError( - _("Subdevice role of device type ({device_type}) must be set to \"parent\" to allow device bays.").format(device_type=self.device_type) + _( + 'Subdevice role of device type ({device_type}) must be set to "parent" to allow device bays.' + ).format(device_type=self.device_type) ) def to_yaml(self): diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index b49d680a3..1fbffa54b 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -532,7 +532,10 @@ def update_interface_bridges(device, interface_templates, module=None): interface = Interface.objects.get(device=device, name=interface_template.resolve_name(module=module)) if interface_template.bridge: - interface.bridge = Interface.objects.get(device=device, name=interface_template.bridge.resolve_name(module=module)) + interface.bridge = Interface.objects.get( + device=device, + name=interface_template.bridge.resolve_name(module=module) + ) interface.full_clean() interface.save() @@ -909,7 +912,10 @@ class Device( }) if self.primary_ip4.assigned_object in vc_interfaces: pass - elif self.primary_ip4.nat_inside is not None and self.primary_ip4.nat_inside.assigned_object in vc_interfaces: + elif ( + self.primary_ip4.nat_inside is not None and + self.primary_ip4.nat_inside.assigned_object in vc_interfaces + ): pass else: raise ValidationError({ @@ -924,7 +930,10 @@ class Device( }) if self.primary_ip6.assigned_object in vc_interfaces: pass - elif self.primary_ip6.nat_inside is not None and self.primary_ip6.nat_inside.assigned_object in vc_interfaces: + elif ( + self.primary_ip6.nat_inside is not None and + self.primary_ip6.nat_inside.assigned_object in vc_interfaces + ): pass else: raise ValidationError({ @@ -978,9 +987,10 @@ class Device( if hasattr(self, 'vc_master_for') and self.vc_master_for and self.vc_master_for != self.virtual_chassis: raise ValidationError({ - 'virtual_chassis': _('Device cannot be removed from virtual chassis {virtual_chassis} because it is currently designated as its master.').format( - virtual_chassis=self.vc_master_for - ) + 'virtual_chassis': _( + 'Device cannot be removed from virtual chassis {virtual_chassis} because it is currently ' + 'designated as its master.' + ).format(virtual_chassis=self.vc_master_for) }) def _instantiate_components(self, queryset, bulk_create=True): diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 08b7f5a35..78eb0ea4a 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -379,7 +379,9 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): min_height = top_device.position + top_device.device_type.u_height - self.starting_unit if self.u_height < min_height: raise ValidationError({ - 'u_height': _("Rack must be at least {min_height}U tall to house currently installed devices.").format(min_height=min_height) + 'u_height': _( + "Rack must be at least {min_height}U tall to house currently installed devices." + ).format(min_height=min_height) }) # Validate that the Rack's starting unit is less than or equal to the position of the lowest mounted Device diff --git a/netbox/dcim/svg/racks.py b/netbox/dcim/svg/racks.py index 0f73095b5..81f8ad3a5 100644 --- a/netbox/dcim/svg/racks.py +++ b/netbox/dcim/svg/racks.py @@ -153,7 +153,10 @@ class RackElevationSVG: if self.rack.desc_units: y += int((position - self.rack.starting_unit) * self.unit_height) else: - y += int((self.rack.u_height - position + self.rack.starting_unit) * self.unit_height) - int(height * self.unit_height) + y += ( + int((self.rack.u_height - position + self.rack.starting_unit) * self.unit_height) - + int(height * self.unit_height) + ) return x, y diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 494d83114..59d0845d5 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -391,7 +391,8 @@ class ConsolePortTable(ModularDeviceComponentTable, PathEndpointTable): model = models.ConsolePort fields = ( 'pk', 'id', 'name', 'device', 'module_bay', 'module', 'label', 'type', 'speed', 'description', - 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', 'tags', 'created', 'last_updated', + 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', 'tags', 'created', + 'last_updated', ) default_columns = ('pk', 'name', 'device', 'label', 'type', 'speed', 'description') @@ -431,7 +432,8 @@ class ConsoleServerPortTable(ModularDeviceComponentTable, PathEndpointTable): model = models.ConsoleServerPort fields = ( 'pk', 'id', 'name', 'device', 'module_bay', 'module', 'label', 'type', 'speed', 'description', - 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', 'tags', 'created', 'last_updated', + 'mark_connected', 'cable', 'cable_color', 'link_peer', 'connection', 'inventory_items', 'tags', 'created', + 'last_updated', ) default_columns = ('pk', 'name', 'device', 'label', 'type', 'speed', 'description') @@ -987,8 +989,8 @@ class InventoryItemTable(DeviceComponentTable): class Meta(NetBoxTable.Meta): model = models.InventoryItem fields = ( - 'pk', 'id', 'name', 'device', 'parent', 'component', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', - 'asset_tag', 'description', 'discovered', 'tags', 'created', 'last_updated', + 'pk', 'id', 'name', 'device', 'parent', 'component', 'label', 'status', 'role', 'manufacturer', 'part_id', + 'serial', 'asset_tag', 'description', 'discovered', 'tags', 'created', 'last_updated', ) default_columns = ( 'pk', 'name', 'device', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', @@ -1006,8 +1008,8 @@ class DeviceInventoryItemTable(InventoryItemTable): class Meta(NetBoxTable.Meta): model = models.InventoryItem fields = ( - 'pk', 'id', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', - 'description', 'discovered', 'tags', 'actions', + 'pk', 'id', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', + 'component', 'description', 'discovered', 'tags', 'actions', ) default_columns = ( 'pk', 'name', 'label', 'status', 'role', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'component', diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index f78722b67..c273e02dd 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -205,13 +205,41 @@ class LocationTest(APIViewTestCases.APIViewTestCase): Site.objects.bulk_create(sites) parent_locations = ( - Location.objects.create(site=sites[0], name='Parent Location 1', slug='parent-location-1', status=LocationStatusChoices.STATUS_ACTIVE), - Location.objects.create(site=sites[1], name='Parent Location 2', slug='parent-location-2', status=LocationStatusChoices.STATUS_ACTIVE), + Location.objects.create( + site=sites[0], + name='Parent Location 1', + slug='parent-location-1', + status=LocationStatusChoices.STATUS_ACTIVE, + ), + Location.objects.create( + site=sites[1], + name='Parent Location 2', + slug='parent-location-2', + status=LocationStatusChoices.STATUS_ACTIVE, + ), ) - Location.objects.create(site=sites[0], name='Location 1', slug='location-1', parent=parent_locations[0], status=LocationStatusChoices.STATUS_ACTIVE) - Location.objects.create(site=sites[0], name='Location 2', slug='location-2', parent=parent_locations[0], status=LocationStatusChoices.STATUS_ACTIVE) - Location.objects.create(site=sites[0], name='Location 3', slug='location-3', parent=parent_locations[0], status=LocationStatusChoices.STATUS_ACTIVE) + Location.objects.create( + site=sites[0], + name='Location 1', + slug='location-1', + parent=parent_locations[0], + status=LocationStatusChoices.STATUS_ACTIVE, + ) + Location.objects.create( + site=sites[0], + name='Location 2', + slug='location-2', + parent=parent_locations[0], + status=LocationStatusChoices.STATUS_ACTIVE, + ) + Location.objects.create( + site=sites[0], + name='Location 3', + slug='location-3', + parent=parent_locations[0], + status=LocationStatusChoices.STATUS_ACTIVE, + ) cls.create_data = [ { @@ -290,9 +318,24 @@ class RackTypeTest(APIViewTestCases.APIViewTestCase): Manufacturer.objects.bulk_create(manufacturers) rack_types = ( - RackType(manufacturer=manufacturers[0], model='Rack Type 1', slug='rack-type-1', form_factor=RackFormFactorChoices.TYPE_CABINET,), - RackType(manufacturer=manufacturers[0], model='Rack Type 2', slug='rack-type-2', form_factor=RackFormFactorChoices.TYPE_CABINET,), - RackType(manufacturer=manufacturers[0], model='Rack Type 3', slug='rack-type-3', form_factor=RackFormFactorChoices.TYPE_CABINET,), + RackType( + manufacturer=manufacturers[0], + model='Rack Type 1', + slug='rack-type-1', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), + RackType( + manufacturer=manufacturers[0], + model='Rack Type 2', + slug='rack-type-2', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), + RackType( + manufacturer=manufacturers[0], + model='Rack Type 3', + slug='rack-type-3', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), ) RackType.objects.bulk_create(rack_types) @@ -1050,10 +1093,18 @@ class InventoryItemTemplateTest(APIViewTestCases.APIViewTestCase): role = InventoryItemRole.objects.create(name='Inventory Item Role 1', slug='inventory-item-role-1') inventory_item_templates = ( - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 1', manufacturer=manufacturer, role=role), - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 2', manufacturer=manufacturer, role=role), - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 3', manufacturer=manufacturer, role=role), - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 4', manufacturer=manufacturer, role=role), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 1', manufacturer=manufacturer, role=role + ), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 2', manufacturer=manufacturer, role=role + ), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 3', manufacturer=manufacturer, role=role + ), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 4', manufacturer=manufacturer, role=role + ), ) for item in inventory_item_templates: item.save() @@ -1961,9 +2012,15 @@ class InventoryItemTest(APIViewTestCases.APIViewTestCase): ) Interface.objects.bulk_create(interfaces) - InventoryItem.objects.create(device=device, name='Inventory Item 1', role=roles[0], manufacturer=manufacturer, component=interfaces[0]) - InventoryItem.objects.create(device=device, name='Inventory Item 2', role=roles[0], manufacturer=manufacturer, component=interfaces[1]) - InventoryItem.objects.create(device=device, name='Inventory Item 3', role=roles[0], manufacturer=manufacturer, component=interfaces[2]) + InventoryItem.objects.create( + device=device, name='Inventory Item 1', role=roles[0], manufacturer=manufacturer, component=interfaces[0] + ) + InventoryItem.objects.create( + device=device, name='Inventory Item 2', role=roles[0], manufacturer=manufacturer, component=interfaces[1] + ) + InventoryItem.objects.create( + device=device, name='Inventory Item 3', role=roles[0], manufacturer=manufacturer, component=interfaces[2] + ) cls.create_data = [ { diff --git a/netbox/dcim/tests/test_cablepaths.py b/netbox/dcim/tests/test_cablepaths.py index b504d389a..1acc9a8a1 100644 --- a/netbox/dcim/tests/test_cablepaths.py +++ b/netbox/dcim/tests/test_cablepaths.py @@ -661,24 +661,64 @@ class CablePathTestCase(TestCase): ) cable5.save() path1 = self.assertPathExists( - ([interface1, interface2], cable1, frontport1_1, rearport1, cable3, rearport2, frontport2_1, cable4, [interface5, interface6]), + ( + [interface1, interface2], + cable1, + frontport1_1, + rearport1, + cable3, + rearport2, + frontport2_1, + cable4, + [interface5, interface6], + ), is_complete=True, - is_active=True + is_active=True, ) path2 = self.assertPathExists( - ([interface3, interface4], cable2, frontport1_2, rearport1, cable3, rearport2, frontport2_2, cable5, [interface7, interface8]), + ( + [interface3, interface4], + cable2, + frontport1_2, + rearport1, + cable3, + rearport2, + frontport2_2, + cable5, + [interface7, interface8], + ), is_complete=True, - is_active=True + is_active=True, ) path3 = self.assertPathExists( - ([interface5, interface6], cable4, frontport2_1, rearport2, cable3, rearport1, frontport1_1, cable1, [interface1, interface2]), + ( + [interface5, interface6], + cable4, + frontport2_1, + rearport2, + cable3, + rearport1, + frontport1_1, + cable1, + [interface1, interface2], + ), is_complete=True, - is_active=True + is_active=True, ) path4 = self.assertPathExists( - ([interface7, interface8], cable5, frontport2_2, rearport2, cable3, rearport1, frontport1_2, cable2, [interface3, interface4]), + ( + [interface7, interface8], + cable5, + frontport2_2, + rearport2, + cable3, + rearport1, + frontport1_2, + cable2, + [interface3, interface4], + ), is_complete=True, - is_active=True + is_active=True, ) self.assertEqual(CablePath.objects.count(), 4) @@ -1167,7 +1207,11 @@ class CablePathTestCase(TestCase): [IF1] --C1-- [CT1] """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) # Create cable 1 cable1 = Cable( @@ -1198,7 +1242,11 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') interface2 = Interface.objects.create(device=self.device, name='Interface 2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) # Create cable 1 cable1 = Cable( @@ -1214,7 +1262,11 @@ class CablePathTestCase(TestCase): ) # Create CT2 - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='Z' + ) # Check for partial path to site self.assertPathExists( @@ -1266,7 +1318,11 @@ class CablePathTestCase(TestCase): interface2 = Interface.objects.create(device=self.device, name='Interface 2') interface3 = Interface.objects.create(device=self.device, name='Interface 3') interface4 = Interface.objects.create(device=self.device, name='Interface 4') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) # Create cable 1 cable1 = Cable( @@ -1282,7 +1338,11 @@ class CablePathTestCase(TestCase): ) # Create CT2 - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='Z' + ) # Check for partial path to site self.assertPathExists( @@ -1299,14 +1359,28 @@ class CablePathTestCase(TestCase): # Check for complete path in each direction self.assertPathExists( - ([interface1, interface2], cable1, circuittermination1, circuittermination2, cable2, [interface3, interface4]), + ( + [interface1, interface2], + cable1, + circuittermination1, + circuittermination2, + cable2, + [interface3, interface4], + ), is_complete=True, - is_active=True + is_active=True, ) self.assertPathExists( - ([interface3, interface4], cable2, circuittermination2, circuittermination1, cable1, [interface1, interface2]), + ( + [interface3, interface4], + cable2, + circuittermination2, + circuittermination1, + cable1, + [interface1, interface2], + ), is_complete=True, - is_active=True + is_active=True, ) self.assertEqual(CablePath.objects.count(), 2) @@ -1335,8 +1409,16 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') site2 = Site.objects.create(name='Site 2', slug='site-2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=site2, term_side='Z') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=site2, + term_side='Z' + ) # Create cable 1 cable1 = Cable( @@ -1365,8 +1447,16 @@ class CablePathTestCase(TestCase): """ interface1 = Interface.objects.create(device=self.device, name='Interface 1') providernetwork = ProviderNetwork.objects.create(name='Provider Network 1', provider=self.circuit.provider) - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=providernetwork, term_side='Z') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=providernetwork, + term_side='Z' + ) # Create cable 1 cable1 = Cable( @@ -1413,8 +1503,15 @@ class CablePathTestCase(TestCase): frontport2_2 = FrontPort.objects.create( device=self.device, name='Front Port 2:2', rear_port=rearport2, rear_port_position=2 ) - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, term_side='Z' + ) # Create cables cable1 = Cable( @@ -1499,10 +1596,26 @@ class CablePathTestCase(TestCase): interface1 = Interface.objects.create(device=self.device, name='Interface 1') interface2 = Interface.objects.create(device=self.device, name='Interface 2') circuit2 = Circuit.objects.create(provider=self.circuit.provider, type=self.circuit.type, cid='Circuit 2') - circuittermination1 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='A') - circuittermination2 = CircuitTermination.objects.create(circuit=self.circuit, termination=self.site, term_side='Z') - circuittermination3 = CircuitTermination.objects.create(circuit=circuit2, termination=self.site, term_side='A') - circuittermination4 = CircuitTermination.objects.create(circuit=circuit2, termination=self.site, term_side='Z') + circuittermination1 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='A' + ) + circuittermination2 = CircuitTermination.objects.create( + circuit=self.circuit, + termination=self.site, + term_side='Z' + ) + circuittermination3 = CircuitTermination.objects.create( + circuit=circuit2, + termination=self.site, + term_side='A' + ) + circuittermination4 = CircuitTermination.objects.create( + circuit=circuit2, + termination=self.site, + term_side='Z' + ) # Create cables cable1 = Cable( @@ -1706,45 +1819,95 @@ class CablePathTestCase(TestCase): ) cable3.save() self.assertPathExists( - (interface1, cable1, (frontport1_1, frontport1_2), rearport1, cable3, rearport2, (frontport2_1, frontport2_2)), - is_complete=False + ( + interface1, + cable1, + (frontport1_1, frontport1_2), + rearport1, + cable3, + rearport2, + (frontport2_1, frontport2_2), + ), + is_complete=False, ) self.assertPathExists( - (interface2, cable2, (frontport1_3, frontport1_4), rearport1, cable3, rearport2, (frontport2_3, frontport2_4)), - is_complete=False + ( + interface2, + cable2, + (frontport1_3, frontport1_4), + rearport1, + cable3, + rearport2, + (frontport2_3, frontport2_4), + ), + is_complete=False, ) self.assertEqual(CablePath.objects.count(), 2) # Create cables 4-5 - cable4 = Cable( - a_terminations=[frontport2_1, frontport2_2], - b_terminations=[interface3] - ) + cable4 = Cable(a_terminations=[frontport2_1, frontport2_2], b_terminations=[interface3]) cable4.save() - cable5 = Cable( - a_terminations=[frontport2_3, frontport2_4], - b_terminations=[interface4] - ) + cable5 = Cable(a_terminations=[frontport2_3, frontport2_4], b_terminations=[interface4]) cable5.save() path1 = self.assertPathExists( - (interface1, cable1, (frontport1_1, frontport1_2), rearport1, cable3, rearport2, (frontport2_1, frontport2_2), cable4, interface3), + ( + interface1, + cable1, + (frontport1_1, frontport1_2), + rearport1, + cable3, + rearport2, + (frontport2_1, frontport2_2), + cable4, + interface3, + ), is_complete=True, - is_active=True + is_active=True, ) path2 = self.assertPathExists( - (interface2, cable2, (frontport1_3, frontport1_4), rearport1, cable3, rearport2, (frontport2_3, frontport2_4), cable5, interface4), + ( + interface2, + cable2, + (frontport1_3, frontport1_4), + rearport1, + cable3, + rearport2, + (frontport2_3, frontport2_4), + cable5, + interface4, + ), is_complete=True, - is_active=True + is_active=True, ) path3 = self.assertPathExists( - (interface3, cable4, (frontport2_1, frontport2_2), rearport2, cable3, rearport1, (frontport1_1, frontport1_2), cable1, interface1), + ( + interface3, + cable4, + (frontport2_1, frontport2_2), + rearport2, + cable3, + rearport1, + (frontport1_1, frontport1_2), + cable1, + interface1, + ), is_complete=True, - is_active=True + is_active=True, ) path4 = self.assertPathExists( - (interface4, cable5, (frontport2_3, frontport2_4), rearport2, cable3, rearport1, (frontport1_3, frontport1_4), cable2, interface2), + ( + interface4, + cable5, + (frontport2_3, frontport2_4), + rearport2, + cable3, + rearport1, + (frontport1_3, frontport1_4), + cable2, + interface2, + ), is_complete=True, - is_active=True + is_active=True, ) self.assertEqual(CablePath.objects.count(), 4) @@ -1809,7 +1972,10 @@ class CablePathTestCase(TestCase): ) cable1.save() self.assertPathExists( - (interface1, cable1, (frontport1, frontport3), (rearport1, rearport3), (cable2, cable4), (rearport2, rearport4), (frontport2, frontport4)), + ( + interface1, cable1, (frontport1, frontport3), (rearport1, rearport3), (cable2, cable4), + (rearport2, rearport4), (frontport2, frontport4) + ), is_complete=False ) self.assertEqual(CablePath.objects.count(), 1) diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py index 897612b84..ede1e2a09 100644 --- a/netbox/dcim/tests/test_filtersets.py +++ b/netbox/dcim/tests/test_filtersets.py @@ -243,9 +243,41 @@ class SiteTestCase(TestCase, ChangeLoggedFilterSetTests): ASN.objects.bulk_create(asns) sites = ( - Site(name='Site 1', slug='site-1', region=regions[0], group=groups[0], tenant=tenants[0], status=SiteStatusChoices.STATUS_ACTIVE, facility='Facility 1', latitude=10, longitude=10, description='foobar1'), - Site(name='Site 2', slug='site-2', region=regions[1], group=groups[1], tenant=tenants[1], status=SiteStatusChoices.STATUS_PLANNED, facility='Facility 2', latitude=20, longitude=20, description='foobar2'), - Site(name='Site 3', slug='site-3', region=regions[2], group=groups[2], tenant=tenants[2], status=SiteStatusChoices.STATUS_RETIRED, facility='Facility 3', latitude=30, longitude=30), + Site( + name='Site 1', + slug='site-1', + region=regions[0], + group=groups[0], + tenant=tenants[0], + status=SiteStatusChoices.STATUS_ACTIVE, + facility='Facility 1', + latitude=10, + longitude=10, + description='foobar1', + ), + Site( + name='Site 2', + slug='site-2', + region=regions[1], + group=groups[1], + tenant=tenants[1], + status=SiteStatusChoices.STATUS_PLANNED, + facility='Facility 2', + latitude=20, + longitude=20, + description='foobar2', + ), + Site( + name='Site 3', + slug='site-3', + region=regions[2], + group=groups[2], + tenant=tenants[2], + status=SiteStatusChoices.STATUS_RETIRED, + facility='Facility 3', + latitude=30, + longitude=30, + ), ) Site.objects.bulk_create(sites) sites[0].asns.set([asns[0]]) @@ -361,9 +393,33 @@ class LocationTestCase(TestCase, ChangeLoggedFilterSetTests): location.save() locations = ( - Location(name='Location 1A', slug='location-1a', site=sites[0], parent=parent_locations[0], status=LocationStatusChoices.STATUS_PLANNED, facility='Facility 1', description='foobar1'), - Location(name='Location 2A', slug='location-2a', site=sites[1], parent=parent_locations[1], status=LocationStatusChoices.STATUS_STAGING, facility='Facility 2', description='foobar2'), - Location(name='Location 3A', slug='location-3a', site=sites[2], parent=parent_locations[2], status=LocationStatusChoices.STATUS_DECOMMISSIONING, facility='Facility 3', description='foobar3'), + Location( + name='Location 1A', + slug='location-1a', + site=sites[0], + parent=parent_locations[0], + status=LocationStatusChoices.STATUS_PLANNED, + facility='Facility 1', + description='foobar1', + ), + Location( + name='Location 2A', + slug='location-2a', + site=sites[1], + parent=parent_locations[1], + status=LocationStatusChoices.STATUS_STAGING, + facility='Facility 2', + description='foobar2', + ), + Location( + name='Location 3A', + slug='location-3a', + site=sites[2], + parent=parent_locations[2], + status=LocationStatusChoices.STATUS_DECOMMISSIONING, + facility='Facility 3', + description='foobar3', + ), ) for location in locations: location.save() @@ -1222,10 +1278,22 @@ class DeviceTypeTestCase(TestCase, ChangeLoggedFilterSetTests): RearPortTemplate(device_type=device_types[1], name='Rear Port 2', type=PortTypeChoices.TYPE_8P8C), ) RearPortTemplate.objects.bulk_create(rear_ports) - FrontPortTemplate.objects.bulk_create(( - FrontPortTemplate(device_type=device_types[0], name='Front Port 1', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[0]), - FrontPortTemplate(device_type=device_types[1], name='Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[1]), - )) + FrontPortTemplate.objects.bulk_create( + ( + FrontPortTemplate( + device_type=device_types[0], + name='Front Port 1', + type=PortTypeChoices.TYPE_8P8C, + rear_port=rear_ports[0], + ), + FrontPortTemplate( + device_type=device_types[1], + name='Front Port 2', + type=PortTypeChoices.TYPE_8P8C, + rear_port=rear_ports[1], + ), + ) + ) ModuleBayTemplate.objects.bulk_create(( ModuleBayTemplate(device_type=device_types[0], name='Module Bay 1'), ModuleBayTemplate(device_type=device_types[1], name='Module Bay 2'), @@ -1435,10 +1503,22 @@ class ModuleTypeTestCase(TestCase, ChangeLoggedFilterSetTests): RearPortTemplate(module_type=module_types[1], name='Rear Port 2', type=PortTypeChoices.TYPE_8P8C), ) RearPortTemplate.objects.bulk_create(rear_ports) - FrontPortTemplate.objects.bulk_create(( - FrontPortTemplate(module_type=module_types[0], name='Front Port 1', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[0]), - FrontPortTemplate(module_type=module_types[1], name='Front Port 2', type=PortTypeChoices.TYPE_8P8C, rear_port=rear_ports[1]), - )) + FrontPortTemplate.objects.bulk_create( + ( + FrontPortTemplate( + module_type=module_types[0], + name='Front Port 1', + type=PortTypeChoices.TYPE_8P8C, + rear_port=rear_ports[0], + ), + FrontPortTemplate( + module_type=module_types[1], + name='Front Port 2', + type=PortTypeChoices.TYPE_8P8C, + rear_port=rear_ports[1], + ), + ) + ) def test_q(self): params = {'q': 'foobar1'} @@ -1893,11 +1973,19 @@ class ModuleBayTemplateTestCase(TestCase, DeviceComponentTemplateFilterSetTests, ) ModuleType.objects.bulk_create(module_types) - ModuleBayTemplate.objects.bulk_create(( - ModuleBayTemplate(device_type=device_types[0], name='Module Bay 1', description='foobar1'), - ModuleBayTemplate(device_type=device_types[1], name='Module Bay 2', description='foobar2', module_type=module_types[0]), - ModuleBayTemplate(device_type=device_types[2], name='Module Bay 3', description='foobar3', module_type=module_types[1]), - )) + ModuleBayTemplate.objects.bulk_create( + ( + ModuleBayTemplate( + device_type=device_types[0], name='Module Bay 1', description='foobar1' + ), + ModuleBayTemplate( + device_type=device_types[1], name='Module Bay 2', description='foobar2', module_type=module_types[0] + ), + ModuleBayTemplate( + device_type=device_types[2], name='Module Bay 3', description='foobar3', module_type=module_types[1] + ), + ) + ) def test_name(self): params = {'name': ['Module Bay 1', 'Module Bay 2']} @@ -1996,9 +2084,15 @@ class InventoryItemTemplateTestCase(TestCase, DeviceComponentTemplateFilterSetTe item.save() child_inventory_item_templates = ( - InventoryItemTemplate(device_type=device_types[0], name='Inventory Item 1A', parent=inventory_item_templates[0]), - InventoryItemTemplate(device_type=device_types[1], name='Inventory Item 2A', parent=inventory_item_templates[1]), - InventoryItemTemplate(device_type=device_types[2], name='Inventory Item 3A', parent=inventory_item_templates[2]), + InventoryItemTemplate( + device_type=device_types[0], name='Inventory Item 1A', parent=inventory_item_templates[0] + ), + InventoryItemTemplate( + device_type=device_types[1], name='Inventory Item 2A', parent=inventory_item_templates[1] + ), + InventoryItemTemplate( + device_type=device_types[2], name='Inventory Item 3A', parent=inventory_item_templates[2] + ), ) for item in child_inventory_item_templates: item.save() @@ -2848,10 +2942,41 @@ class ConsolePortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[0], role=roles[0], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[0], + role=roles[0], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -3029,10 +3154,41 @@ class ConsoleServerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeL Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[2], + role=roles[2], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -3058,9 +3214,15 @@ class ConsoleServerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeL ConsolePort.objects.bulk_create(console_ports) console_server_ports = ( - ConsoleServerPort(device=devices[0], module=modules[0], name='Console Server Port 1', label='A', description='First'), - ConsoleServerPort(device=devices[1], module=modules[1], name='Console Server Port 2', label='B', description='Second'), - ConsoleServerPort(device=devices[2], module=modules[2], name='Console Server Port 3', label='C', description='Third'), + ConsoleServerPort( + device=devices[0], module=modules[0], name='Console Server Port 1', label='A', description='First' + ), + ConsoleServerPort( + device=devices[1], module=modules[1], name='Console Server Port 2', label='B', description='Second' + ), + ConsoleServerPort( + device=devices[2], module=modules[2], name='Console Server Port 3', label='C', description='Third' + ), ) ConsoleServerPort.objects.bulk_create(console_server_ports) @@ -3210,10 +3372,41 @@ class PowerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[2], + role=roles[2], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -3239,9 +3432,33 @@ class PowerPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil PowerOutlet.objects.bulk_create(power_outlets) power_ports = ( - PowerPort(device=devices[0], module=modules[0], name='Power Port 1', label='A', maximum_draw=100, allocated_draw=50, description='First'), - PowerPort(device=devices[1], module=modules[1], name='Power Port 2', label='B', maximum_draw=200, allocated_draw=100, description='Second'), - PowerPort(device=devices[2], module=modules[2], name='Power Port 3', label='C', maximum_draw=300, allocated_draw=150, description='Third'), + PowerPort( + device=devices[0], + module=modules[0], + name='Power Port 1', + label='A', + maximum_draw=100, + allocated_draw=50, + description='First', + ), + PowerPort( + device=devices[1], + module=modules[1], + name='Power Port 2', + label='B', + maximum_draw=200, + allocated_draw=100, + description='Second', + ), + PowerPort( + device=devices[2], + module=modules[2], + name='Power Port 3', + label='C', + maximum_draw=300, + allocated_draw=150, + description='Third', + ), ) PowerPort.objects.bulk_create(power_ports) @@ -3399,10 +3616,41 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[2], + role=roles[2], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -3428,9 +3676,33 @@ class PowerOutletTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedF PowerPort.objects.bulk_create(power_ports) power_outlets = ( - PowerOutlet(device=devices[0], module=modules[0], name='Power Outlet 1', label='A', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A, description='First', color='ff0000'), - PowerOutlet(device=devices[1], module=modules[1], name='Power Outlet 2', label='B', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B, description='Second', color='00ff00'), - PowerOutlet(device=devices[2], module=modules[2], name='Power Outlet 3', label='C', feed_leg=PowerOutletFeedLegChoices.FEED_LEG_C, description='Third', color='0000ff'), + PowerOutlet( + device=devices[0], + module=modules[0], + name='Power Outlet 1', + label='A', + feed_leg=PowerOutletFeedLegChoices.FEED_LEG_A, + description='First', + color='ff0000', + ), + PowerOutlet( + device=devices[1], + module=modules[1], + name='Power Outlet 2', + label='B', + feed_leg=PowerOutletFeedLegChoices.FEED_LEG_B, + description='Second', + color='00ff00', + ), + PowerOutlet( + device=devices[2], + module=modules[2], + name='Power Outlet 3', + label='C', + feed_leg=PowerOutletFeedLegChoices.FEED_LEG_C, + description='Third', + color='0000ff', + ), ) PowerOutlet.objects.bulk_create(power_outlets) @@ -3672,8 +3944,12 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil # Virtual Device Context Creation vdcs = ( - VirtualDeviceContext(device=devices[4], name='VDC 1', identifier=1, status=VirtualDeviceContextStatusChoices.STATUS_ACTIVE), - VirtualDeviceContext(device=devices[4], name='VDC 2', identifier=2, status=VirtualDeviceContextStatusChoices.STATUS_PLANNED), + VirtualDeviceContext( + device=devices[4], name='VDC 1', identifier=1, status=VirtualDeviceContextStatusChoices.STATUS_ACTIVE + ), + VirtualDeviceContext( + device=devices[4], name='VDC 2', identifier=2, status=VirtualDeviceContextStatusChoices.STATUS_PLANNED + ), ) VirtualDeviceContext.objects.bulk_create(vdcs) @@ -3886,9 +4162,24 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil # Create child interfaces parent_interface = Interface.objects.first() child_interfaces = ( - Interface(device=parent_interface.device, name='Child 1', parent=parent_interface, type=InterfaceTypeChoices.TYPE_VIRTUAL), - Interface(device=parent_interface.device, name='Child 2', parent=parent_interface, type=InterfaceTypeChoices.TYPE_VIRTUAL), - Interface(device=parent_interface.device, name='Child 3', parent=parent_interface, type=InterfaceTypeChoices.TYPE_VIRTUAL), + Interface( + device=parent_interface.device, + name='Child 1', + parent=parent_interface, + type=InterfaceTypeChoices.TYPE_VIRTUAL, + ), + Interface( + device=parent_interface.device, + name='Child 2', + parent=parent_interface, + type=InterfaceTypeChoices.TYPE_VIRTUAL, + ), + Interface( + device=parent_interface.device, + name='Child 3', + parent=parent_interface, + type=InterfaceTypeChoices.TYPE_VIRTUAL, + ), ) Interface.objects.bulk_create(child_interfaces) @@ -3899,9 +4190,24 @@ class InterfaceTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil # Create bridged interfaces bridge_interface = Interface.objects.first() bridged_interfaces = ( - Interface(device=bridge_interface.device, name='Bridged 1', bridge=bridge_interface, type=InterfaceTypeChoices.TYPE_1GE_FIXED), - Interface(device=bridge_interface.device, name='Bridged 2', bridge=bridge_interface, type=InterfaceTypeChoices.TYPE_1GE_FIXED), - Interface(device=bridge_interface.device, name='Bridged 3', bridge=bridge_interface, type=InterfaceTypeChoices.TYPE_1GE_FIXED), + Interface( + device=bridge_interface.device, + name='Bridged 1', + bridge=bridge_interface, + type=InterfaceTypeChoices.TYPE_1GE_FIXED, + ), + Interface( + device=bridge_interface.device, + name='Bridged 2', + bridge=bridge_interface, + type=InterfaceTypeChoices.TYPE_1GE_FIXED, + ), + Interface( + device=bridge_interface.device, + name='Bridged 3', + bridge=bridge_interface, + type=InterfaceTypeChoices.TYPE_1GE_FIXED, + ), ) Interface.objects.bulk_create(bridged_interfaces) @@ -4134,10 +4440,41 @@ class FrontPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[2], + role=roles[2], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -4167,12 +4504,63 @@ class FrontPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil RearPort.objects.bulk_create(rear_ports) front_ports = ( - FrontPort(device=devices[0], module=modules[0], name='Front Port 1', label='A', type=PortTypeChoices.TYPE_8P8C, color=ColorChoices.COLOR_RED, rear_port=rear_ports[0], rear_port_position=1, description='First'), - FrontPort(device=devices[1], module=modules[1], name='Front Port 2', label='B', type=PortTypeChoices.TYPE_110_PUNCH, color=ColorChoices.COLOR_GREEN, rear_port=rear_ports[1], rear_port_position=2, description='Second'), - FrontPort(device=devices[2], module=modules[2], name='Front Port 3', label='C', type=PortTypeChoices.TYPE_BNC, color=ColorChoices.COLOR_BLUE, rear_port=rear_ports[2], rear_port_position=3, description='Third'), - FrontPort(device=devices[3], name='Front Port 4', label='D', type=PortTypeChoices.TYPE_FC, rear_port=rear_ports[3], rear_port_position=1), - FrontPort(device=devices[3], name='Front Port 5', label='E', type=PortTypeChoices.TYPE_FC, rear_port=rear_ports[4], rear_port_position=1), - FrontPort(device=devices[3], name='Front Port 6', label='F', type=PortTypeChoices.TYPE_FC, rear_port=rear_ports[5], rear_port_position=1), + FrontPort( + device=devices[0], + module=modules[0], + name='Front Port 1', + label='A', + type=PortTypeChoices.TYPE_8P8C, + color=ColorChoices.COLOR_RED, + rear_port=rear_ports[0], + rear_port_position=1, + description='First', + ), + FrontPort( + device=devices[1], + module=modules[1], + name='Front Port 2', + label='B', + type=PortTypeChoices.TYPE_110_PUNCH, + color=ColorChoices.COLOR_GREEN, + rear_port=rear_ports[1], + rear_port_position=2, + description='Second', + ), + FrontPort( + device=devices[2], + module=modules[2], + name='Front Port 3', + label='C', + type=PortTypeChoices.TYPE_BNC, + color=ColorChoices.COLOR_BLUE, + rear_port=rear_ports[2], + rear_port_position=3, + description='Third', + ), + FrontPort( + device=devices[3], + name='Front Port 4', + label='D', + type=PortTypeChoices.TYPE_FC, + rear_port=rear_ports[3], + rear_port_position=1, + ), + FrontPort( + device=devices[3], + name='Front Port 5', + label='E', + type=PortTypeChoices.TYPE_FC, + rear_port=rear_ports[4], + rear_port_position=1, + ), + FrontPort( + device=devices[3], + name='Front Port 6', + label='F', + type=PortTypeChoices.TYPE_FC, + rear_port=rear_ports[5], + rear_port_position=1, + ), ) FrontPort.objects.bulk_create(front_ports) @@ -4324,10 +4712,41 @@ class RearPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilt Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), - Device(name=None, device_type=device_types[2], role=roles[2], site=sites[3], status='offline'), # For cable connections + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), + # For cable connections + Device( + name=None, + device_type=device_types[2], + role=roles[2], + site=sites[3], + status='offline' + ), ) Device.objects.bulk_create(devices) @@ -4347,9 +4766,36 @@ class RearPortTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFilt Module.objects.bulk_create(modules) rear_ports = ( - RearPort(device=devices[0], module=modules[0], name='Rear Port 1', label='A', type=PortTypeChoices.TYPE_8P8C, color=ColorChoices.COLOR_RED, positions=1, description='First'), - RearPort(device=devices[1], module=modules[1], name='Rear Port 2', label='B', type=PortTypeChoices.TYPE_110_PUNCH, color=ColorChoices.COLOR_GREEN, positions=2, description='Second'), - RearPort(device=devices[2], module=modules[2], name='Rear Port 3', label='C', type=PortTypeChoices.TYPE_BNC, color=ColorChoices.COLOR_BLUE, positions=3, description='Third'), + RearPort( + device=devices[0], + module=modules[0], + name='Rear Port 1', + label='A', + type=PortTypeChoices.TYPE_8P8C, + color=ColorChoices.COLOR_RED, + positions=1, + description='First', + ), + RearPort( + device=devices[1], + module=modules[1], + name='Rear Port 2', + label='B', + type=PortTypeChoices.TYPE_110_PUNCH, + color=ColorChoices.COLOR_GREEN, + positions=2, + description='Second', + ), + RearPort( + device=devices[2], + module=modules[2], + name='Rear Port 3', + label='C', + type=PortTypeChoices.TYPE_BNC, + color=ColorChoices.COLOR_BLUE, + positions=3, + description='Third', + ), RearPort(device=devices[3], name='Rear Port 4', label='D', type=PortTypeChoices.TYPE_FC, positions=4), RearPort(device=devices[3], name='Rear Port 5', label='E', type=PortTypeChoices.TYPE_FC, positions=5), RearPort(device=devices[3], name='Rear Port 6', label='F', type=PortTypeChoices.TYPE_FC, positions=6), @@ -4506,9 +4952,33 @@ class ModuleBayTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), ) Device.objects.bulk_create(devices) @@ -4654,9 +5124,33 @@ class DeviceBayTestCase(TestCase, DeviceComponentFilterSetTests, ChangeLoggedFil Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0], status='active'), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1], status='planned'), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2], status='offline'), + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + status='active', + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + status='planned', + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + status='offline', + ), ) Device.objects.bulk_create(devices) @@ -4788,9 +5282,30 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests): Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], site=sites[0], location=locations[0], rack=racks[0]), - Device(name='Device 2', device_type=device_types[1], role=roles[1], site=sites[1], location=locations[1], rack=racks[1]), - Device(name='Device 3', device_type=device_types[2], role=roles[2], site=sites[2], location=locations[2], rack=racks[2]), + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + site=sites[0], + location=locations[0], + rack=racks[0], + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + site=sites[1], + location=locations[1], + rack=racks[1], + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + site=sites[2], + location=locations[2], + rack=racks[2], + ), ) Device.objects.bulk_create(devices) @@ -4808,9 +5323,48 @@ class InventoryItemTestCase(TestCase, ChangeLoggedFilterSetTests): ) inventory_items = ( - InventoryItem(device=devices[0], role=roles[0], manufacturer=manufacturers[0], name='Inventory Item 1', label='A', part_id='1001', serial='ABC', asset_tag='1001', discovered=True, status=ModuleStatusChoices.STATUS_ACTIVE, description='First', component=components[0]), - InventoryItem(device=devices[1], role=roles[1], manufacturer=manufacturers[1], name='Inventory Item 2', label='B', part_id='1002', serial='DEF', asset_tag='1002', discovered=True, status=ModuleStatusChoices.STATUS_PLANNED, description='Second', component=components[1]), - InventoryItem(device=devices[2], role=roles[2], manufacturer=manufacturers[2], name='Inventory Item 3', label='C', part_id='1003', serial='GHI', asset_tag='1003', discovered=False, status=ModuleStatusChoices.STATUS_FAILED, description='Third', component=components[2]), + InventoryItem( + device=devices[0], + role=roles[0], + manufacturer=manufacturers[0], + name='Inventory Item 1', + label='A', + part_id='1001', + serial='ABC', + asset_tag='1001', + discovered=True, + status=ModuleStatusChoices.STATUS_ACTIVE, + description='First', + component=components[0], + ), + InventoryItem( + device=devices[1], + role=roles[1], + manufacturer=manufacturers[1], + name='Inventory Item 2', + label='B', + part_id='1002', + serial='DEF', + asset_tag='1002', + discovered=True, + status=ModuleStatusChoices.STATUS_PLANNED, + description='Second', + component=components[1], + ), + InventoryItem( + device=devices[2], + role=roles[2], + manufacturer=manufacturers[2], + name='Inventory Item 3', + label='C', + part_id='1003', + serial='GHI', + asset_tag='1003', + discovered=False, + status=ModuleStatusChoices.STATUS_FAILED, + description='Third', + component=components[2], + ), ) for i in inventory_items: i.save() @@ -5127,12 +5681,60 @@ class CableTestCase(TestCase, ChangeLoggedFilterSetTests): role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') devices = ( - Device(name='Device 1', device_type=device_type, role=role, site=sites[0], rack=racks[0], location=locations[0], position=1), - Device(name='Device 2', device_type=device_type, role=role, site=sites[0], rack=racks[0], location=locations[0], position=2), - Device(name='Device 3', device_type=device_type, role=role, site=sites[1], rack=racks[1], location=locations[1], position=1), - Device(name='Device 4', device_type=device_type, role=role, site=sites[1], rack=racks[1], location=locations[1], position=2), - Device(name='Device 5', device_type=device_type, role=role, site=sites[2], rack=racks[2], location=locations[2], position=1), - Device(name='Device 6', device_type=device_type, role=role, site=sites[2], rack=racks[2], location=locations[2], position=2), + Device( + name='Device 1', + device_type=device_type, + role=role, + site=sites[0], + rack=racks[0], + location=locations[0], + position=1, + ), + Device( + name='Device 2', + device_type=device_type, + role=role, + site=sites[0], + rack=racks[0], + location=locations[0], + position=2, + ), + Device( + name='Device 3', + device_type=device_type, + role=role, + site=sites[1], + rack=racks[1], + location=locations[1], + position=1, + ), + Device( + name='Device 4', + device_type=device_type, + role=role, + site=sites[1], + rack=racks[1], + location=locations[1], + position=2, + ), + Device( + name='Device 5', + device_type=device_type, + role=role, + site=sites[2], + rack=racks[2], + location=locations[2], + position=1, + ), + Device( + name='Device 6', + device_type=device_type, + role=role, + site=sites[2], + rack=racks[2], + location=locations[2], + position=2, + ), ) Device.objects.bulk_create(devices) diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index 8d43d67ea..ff1eddd56 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -612,14 +612,31 @@ class DeviceTestCase(TestCase): device_role = DeviceRole.objects.first() # Device with site only should pass - Device(name='device1', site=sites[0], device_type=device_type, role=device_role).full_clean() + Device( + name='device1', + site=sites[0], + device_type=device_type, + role=device_role + ).full_clean() # Device with site, cluster non-site should pass - Device(name='device1', site=sites[0], device_type=device_type, role=device_role, cluster=clusters[2]).full_clean() + Device( + name='device1', + site=sites[0], + device_type=device_type, + role=device_role, + cluster=clusters[2] + ).full_clean() # Device with mismatched site & cluster should fail with self.assertRaises(ValidationError): - Device(name='device1', site=sites[0], device_type=device_type, role=device_role, cluster=clusters[1]).full_clean() + Device( + name='device1', + site=sites[0], + device_type=device_type, + role=device_role, + cluster=clusters[1] + ).full_clean() class ModuleBayTestCase(TestCase): @@ -636,7 +653,9 @@ class ModuleBayTestCase(TestCase): # Create a CustomField with a default value & assign it to all component models location = Location.objects.create(name='Location 1', slug='location-1', site=site) rack = Rack.objects.create(name='Rack 1', site=site) - device = Device.objects.create(name='Device 1', device_type=device_type, role=device_role, site=site, location=location, rack=rack) + device = Device.objects.create( + name='Device 1', device_type=device_type, role=device_role, site=site, location=location, rack=rack + ) module_bays = ( ModuleBay(device=device, name='Module Bay 1', label='A', description='First'), diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index 9850081d1..c2c5b6a01 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -196,9 +196,27 @@ class LocationTestCase(ViewTestCases.OrganizationalObjectViewTestCase): tenant = Tenant.objects.create(name='Tenant 1', slug='tenant-1') locations = ( - Location(name='Location 1', slug='location-1', site=site, status=LocationStatusChoices.STATUS_ACTIVE, tenant=tenant), - Location(name='Location 2', slug='location-2', site=site, status=LocationStatusChoices.STATUS_ACTIVE, tenant=tenant), - Location(name='Location 3', slug='location-3', site=site, status=LocationStatusChoices.STATUS_ACTIVE, tenant=tenant), + Location( + name='Location 1', + slug='location-1', + site=site, + status=LocationStatusChoices.STATUS_ACTIVE, + tenant=tenant, + ), + Location( + name='Location 2', + slug='location-2', + site=site, + status=LocationStatusChoices.STATUS_ACTIVE, + tenant=tenant, + ), + Location( + name='Location 3', + slug='location-3', + site=site, + status=LocationStatusChoices.STATUS_ACTIVE, + tenant=tenant, + ), ) for location in locations: location.save() @@ -346,9 +364,24 @@ class RackTypeTestCase(ViewTestCases.PrimaryObjectViewTestCase): Manufacturer.objects.bulk_create(manufacturers) rack_types = ( - RackType(manufacturer=manufacturers[0], model='RackType 1', slug='rack-type-1', form_factor=RackFormFactorChoices.TYPE_CABINET,), - RackType(manufacturer=manufacturers[0], model='RackType 2', slug='rack-type-2', form_factor=RackFormFactorChoices.TYPE_CABINET,), - RackType(manufacturer=manufacturers[0], model='RackType 3', slug='rack-type-3', form_factor=RackFormFactorChoices.TYPE_CABINET,), + RackType( + manufacturer=manufacturers[0], + model='RackType 1', + slug='rack-type-1', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), + RackType( + manufacturer=manufacturers[0], + model='RackType 2', + slug='rack-type-2', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), + RackType( + manufacturer=manufacturers[0], + model='RackType 3', + slug='rack-type-3', + form_factor=RackFormFactorChoices.TYPE_CABINET, + ), ) RackType.objects.bulk_create(rack_types) @@ -692,9 +725,15 @@ class DeviceTypeTestCase( ) RearPortTemplate.objects.bulk_create(rear_ports) front_ports = ( - FrontPortTemplate(device_type=devicetype, name='Front Port 1', rear_port=rear_ports[0], rear_port_position=1), - FrontPortTemplate(device_type=devicetype, name='Front Port 2', rear_port=rear_ports[1], rear_port_position=1), - FrontPortTemplate(device_type=devicetype, name='Front Port 3', rear_port=rear_ports[2], rear_port_position=1), + FrontPortTemplate( + device_type=devicetype, name='Front Port 1', rear_port=rear_ports[0], rear_port_position=1 + ), + FrontPortTemplate( + device_type=devicetype, name='Front Port 2', rear_port=rear_ports[1], rear_port_position=1 + ), + FrontPortTemplate( + device_type=devicetype, name='Front Port 3', rear_port=rear_ports[2], rear_port_position=1 + ), ) FrontPortTemplate.objects.bulk_create(front_ports) @@ -1081,9 +1120,15 @@ class ModuleTypeTestCase( ) RearPortTemplate.objects.bulk_create(rear_ports) front_ports = ( - FrontPortTemplate(module_type=moduletype, name='Front Port 1', rear_port=rear_ports[0], rear_port_position=1), - FrontPortTemplate(module_type=moduletype, name='Front Port 2', rear_port=rear_ports[1], rear_port_position=1), - FrontPortTemplate(module_type=moduletype, name='Front Port 3', rear_port=rear_ports[2], rear_port_position=1), + FrontPortTemplate( + module_type=moduletype, name='Front Port 1', rear_port=rear_ports[0], rear_port_position=1 + ), + FrontPortTemplate( + module_type=moduletype, name='Front Port 2', rear_port=rear_ports[1], rear_port_position=1 + ), + FrontPortTemplate( + module_type=moduletype, name='Front Port 3', rear_port=rear_ports[2], rear_port_position=1 + ), ) FrontPortTemplate.objects.bulk_create(front_ports) @@ -1453,11 +1498,19 @@ class FrontPortTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas ) RearPortTemplate.objects.bulk_create(rearports) - FrontPortTemplate.objects.bulk_create(( - FrontPortTemplate(device_type=devicetype, name='Front Port Template 1', rear_port=rearports[0], rear_port_position=1), - FrontPortTemplate(device_type=devicetype, name='Front Port Template 2', rear_port=rearports[1], rear_port_position=1), - FrontPortTemplate(device_type=devicetype, name='Front Port Template 3', rear_port=rearports[2], rear_port_position=1), - )) + FrontPortTemplate.objects.bulk_create( + ( + FrontPortTemplate( + device_type=devicetype, name='Front Port Template 1', rear_port=rearports[0], rear_port_position=1 + ), + FrontPortTemplate( + device_type=devicetype, name='Front Port Template 2', rear_port=rearports[1], rear_port_position=1 + ), + FrontPortTemplate( + device_type=devicetype, name='Front Port Template 3', rear_port=rearports[2], rear_port_position=1 + ), + ) + ) cls.form_data = { 'device_type': devicetype.pk, @@ -1550,7 +1603,12 @@ class DeviceBayTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTestCas @classmethod def setUpTestData(cls): manufacturer = Manufacturer.objects.create(name='Manufacturer 1', slug='manufacturer-1') - devicetype = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1', slug='device-type-1', subdevice_role=SubdeviceRoleChoices.ROLE_PARENT) + devicetype = DeviceType.objects.create( + manufacturer=manufacturer, + model='Device Type 1', + slug='device-type-1', + subdevice_role=SubdeviceRoleChoices.ROLE_PARENT + ) DeviceBayTemplate.objects.bulk_create(( DeviceBayTemplate(device_type=devicetype, name='Device Bay Template 1'), @@ -1584,12 +1642,20 @@ class InventoryItemTemplateTestCase(ViewTestCases.DeviceComponentTemplateViewTes Manufacturer(name='Manufacturer 2', slug='manufacturer-2'), ) Manufacturer.objects.bulk_create(manufacturers) - devicetype = DeviceType.objects.create(manufacturer=manufacturers[0], model='Device Type 1', slug='device-type-1') + devicetype = DeviceType.objects.create( + manufacturer=manufacturers[0], model='Device Type 1', slug='device-type-1' + ) inventory_item_templates = ( - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 1', manufacturer=manufacturers[0]), - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 2', manufacturer=manufacturers[0]), - InventoryItemTemplate(device_type=devicetype, name='Inventory Item Template 3', manufacturer=manufacturers[0]), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 1', manufacturer=manufacturers[0] + ), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 2', manufacturer=manufacturers[0] + ), + InventoryItemTemplate( + device_type=devicetype, name='Inventory Item Template 3', manufacturer=manufacturers[0] + ), ) for item in inventory_item_templates: item.save() @@ -1741,9 +1807,30 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase): Platform.objects.bulk_create(platforms) devices = ( - Device(name='Device 1', site=sites[0], rack=racks[0], device_type=devicetypes[0], role=roles[0], platform=platforms[0]), - Device(name='Device 2', site=sites[0], rack=racks[0], device_type=devicetypes[0], role=roles[0], platform=platforms[0]), - Device(name='Device 3', site=sites[0], rack=racks[0], device_type=devicetypes[0], role=roles[0], platform=platforms[0]), + Device( + name='Device 1', + site=sites[0], + rack=racks[0], + device_type=devicetypes[0], + role=roles[0], + platform=platforms[0], + ), + Device( + name='Device 2', + site=sites[0], + rack=racks[0], + device_type=devicetypes[0], + role=roles[0], + platform=platforms[0], + ), + Device( + name='Device 3', + site=sites[0], + rack=racks[0], + device_type=devicetypes[0], + role=roles[0], + platform=platforms[0], + ), ) Device.objects.bulk_create(devices) @@ -1778,10 +1865,22 @@ class DeviceTestCase(ViewTestCases.PrimaryObjectViewTestCase): } cls.csv_data = ( - "role,manufacturer,device_type,status,name,site,location,rack,position,face,virtual_chassis,vc_position,vc_priority", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 4,Site 1,Location 1,Rack 1,10,front,Virtual Chassis 1,1,10", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 5,Site 1,Location 1,Rack 1,20,front,Virtual Chassis 1,2,20", - "Device Role 1,Manufacturer 1,Device Type 1,active,Device 6,Site 1,Location 1,Rack 1,30,front,Virtual Chassis 1,3,30", + ( + "role,manufacturer,device_type,status,name,site,location,rack,position,face,virtual_chassis," + "vc_position,vc_priority" + ), + ( + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 4,Site 1,Location 1,Rack 1,10,front," + "Virtual Chassis 1,1,10" + ), + ( + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 5,Site 1,Location 1,Rack 1,20,front," + "Virtual Chassis 1,2,20" + ), + ( + "Device Role 1,Manufacturer 1,Device Type 1,active,Device 6,Site 1,Location 1,Rack 1,30,front," + "Virtual Chassis 1,3,30" + ), ) cls.csv_update_data = ( @@ -2884,9 +2983,15 @@ class InventoryItemTestCase(ViewTestCases.DeviceComponentViewTestCase): ) InventoryItemRole.objects.bulk_create(roles) - inventory_item1 = InventoryItem.objects.create(device=device, name='Inventory Item 1', role=roles[0], manufacturer=manufacturer) - inventory_item2 = InventoryItem.objects.create(device=device, name='Inventory Item 2', role=roles[0], manufacturer=manufacturer) - inventory_item3 = InventoryItem.objects.create(device=device, name='Inventory Item 3', role=roles[0], manufacturer=manufacturer) + inventory_item1 = InventoryItem.objects.create( + device=device, name='Inventory Item 1', role=roles[0], manufacturer=manufacturer + ) + inventory_item2 = InventoryItem.objects.create( + device=device, name='Inventory Item 2', role=roles[0], manufacturer=manufacturer + ) + inventory_item3 = InventoryItem.objects.create( + device=device, name='Inventory Item 3', role=roles[0], manufacturer=manufacturer + ) tags = create_tags('Alpha', 'Bravo', 'Charlie') diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index f6e7b90be..731034dc1 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -244,7 +244,9 @@ class RegionView(GetRelatedModelsMixin, generic.ObjectView): (Location.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), (Rack.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), ( - Circuit.objects.restrict(request.user, 'view').filter(terminations___region=instance).distinct(), + Circuit.objects.restrict(request.user, 'view').filter( + terminations___region=instance + ).distinct(), 'region_id' ), ), @@ -335,7 +337,9 @@ class SiteGroupView(GetRelatedModelsMixin, generic.ObjectView): (Location.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), (Rack.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), ( - Circuit.objects.restrict(request.user, 'view').filter(terminations___site_group=instance).distinct(), + Circuit.objects.restrict(request.user, 'view').filter( + terminations___site_group=instance + ).distinct(), 'site_group_id' ), ), @@ -507,7 +511,9 @@ class LocationView(GetRelatedModelsMixin, generic.ObjectView): [CableTermination], ( ( - Circuit.objects.restrict(request.user, 'view').filter(terminations___location=instance).distinct(), + Circuit.objects.restrict(request.user, 'view').filter( + terminations___location=instance + ).distinct(), 'location_id' ), ), @@ -3729,7 +3735,9 @@ class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMix membership_form.save() messages.success(request, mark_safe( - _('Added member {device}').format(url=device.get_absolute_url(), device=escape(device)) + _('Added member {device}').format( + url=device.get_absolute_url(), device=escape(device) + ) )) if '_addanother' in request.POST: diff --git a/netbox/extras/management/commands/reindex.py b/netbox/extras/management/commands/reindex.py index 21442be93..5495bbf5f 100644 --- a/netbox/extras/management/commands/reindex.py +++ b/netbox/extras/management/commands/reindex.py @@ -53,7 +53,8 @@ class Command(BaseCommand): else: raise CommandError( - f"Invalid model: {label}. Model names must be in the format or .." + f"Invalid model: {label}. Model names must be in the format or " + f".." ) return indexers diff --git a/netbox/extras/migrations/0001_squashed.py b/netbox/extras/migrations/0001_squashed.py index 6f1f77e53..a2514fa5e 100644 --- a/netbox/extras/migrations/0001_squashed.py +++ b/netbox/extras/migrations/0001_squashed.py @@ -9,7 +9,6 @@ import utilities.validators class Migration(migrations.Migration): - initial = True dependencies = [ @@ -99,8 +98,22 @@ class Migration(migrations.Migration): fields=[ ('object_id', models.IntegerField(db_index=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s_tagged_items', to='contenttypes.contenttype')), - ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s_items', to='extras.tag')), + ( + 'content_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='%(app_label)s_%(class)s_tagged_items', + to='contenttypes.contenttype', + ), + ), + ( + 'tag', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='%(app_label)s_%(class)s_items', + to='extras.tag', + ), + ), ], ), migrations.CreateModel( @@ -116,9 +129,32 @@ class Migration(migrations.Migration): ('object_repr', models.CharField(editable=False, max_length=200)), ('prechange_data', models.JSONField(blank=True, editable=False, null=True)), ('postchange_data', models.JSONField(blank=True, editable=False, null=True)), - ('changed_object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('related_object_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='changes', to=settings.AUTH_USER_MODEL)), + ( + 'changed_object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype' + ), + ), + ( + 'related_object_type', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'user', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='changes', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'ordering': ['-time'], @@ -133,8 +169,16 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('kind', models.CharField(default='info', max_length=30)), ('comments', models.TextField()), - ('assigned_object_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), - ('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ( + 'assigned_object_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), + ( + 'created_by', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL + ), + ), ], options={ 'verbose_name_plural': 'journal entries', @@ -151,8 +195,24 @@ class Migration(migrations.Migration): ('status', models.CharField(default='pending', max_length=30)), ('data', models.JSONField(blank=True, null=True)), ('job_id', models.UUIDField(unique=True)), - ('obj_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='job_results', to='contenttypes.contenttype')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL)), + ( + 'obj_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='job_results', + to='contenttypes.contenttype', + ), + ), + ( + 'user', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'ordering': ['obj_type', 'name', '-created'], @@ -163,12 +223,20 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(primary_key=True, serialize=False)), ('object_id', models.PositiveIntegerField()), - ('image', models.ImageField(height_field='image_height', upload_to=extras.utils.image_upload, width_field='image_width')), + ( + 'image', + models.ImageField( + height_field='image_height', upload_to=extras.utils.image_upload, width_field='image_width' + ), + ), ('image_height', models.PositiveSmallIntegerField()), ('image_width', models.PositiveSmallIntegerField()), ('name', models.CharField(blank=True, max_length=50)), ('created', models.DateTimeField(auto_now_add=True)), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ( + 'content_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), ], options={ 'ordering': ('name', 'pk'), @@ -184,7 +252,10 @@ class Migration(migrations.Migration): ('mime_type', models.CharField(blank=True, max_length=50)), ('file_extension', models.CharField(blank=True, max_length=15)), ('as_attachment', models.BooleanField(default=True)), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ( + 'content_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), ], options={ 'ordering': ['content_type', 'name'], @@ -201,7 +272,10 @@ class Migration(migrations.Migration): ('group_name', models.CharField(blank=True, max_length=50)), ('button_class', models.CharField(default='default', max_length=30)), ('new_window', models.BooleanField(default=False)), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ( + 'content_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), ], options={ 'ordering': ['group_name', 'weight', 'name'], @@ -221,8 +295,16 @@ class Migration(migrations.Migration): ('weight', models.PositiveSmallIntegerField(default=100)), ('validation_minimum', models.PositiveIntegerField(blank=True, null=True)), ('validation_maximum', models.PositiveIntegerField(blank=True, null=True)), - ('validation_regex', models.CharField(blank=True, max_length=500, validators=[utilities.validators.validate_regex])), - ('choices', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)), + ( + 'validation_regex', + models.CharField(blank=True, max_length=500, validators=[utilities.validators.validate_regex]), + ), + ( + 'choices', + django.contrib.postgres.fields.ArrayField( + base_field=models.CharField(max_length=100), blank=True, null=True, size=None + ), + ), ('content_types', models.ManyToManyField(related_name='custom_fields', to='contenttypes.ContentType')), ], options={ diff --git a/netbox/extras/migrations/0002_squashed_0059.py b/netbox/extras/migrations/0002_squashed_0059.py index a403a0e19..b664b286e 100644 --- a/netbox/extras/migrations/0002_squashed_0059.py +++ b/netbox/extras/migrations/0002_squashed_0059.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0002_auto_20160622_1821'), ('extras', '0001_initial'), diff --git a/netbox/extras/migrations/0060_squashed_0086.py b/netbox/extras/migrations/0060_squashed_0086.py index 0d5d03008..3bde7480f 100644 --- a/netbox/extras/migrations/0060_squashed_0086.py +++ b/netbox/extras/migrations/0060_squashed_0086.py @@ -12,7 +12,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('extras', '0060_customlink_button_class'), ('extras', '0061_extras_change_logging'), @@ -40,7 +39,7 @@ class Migration(migrations.Migration): ('extras', '0083_search'), ('extras', '0084_staging'), ('extras', '0085_synced_data'), - ('extras', '0086_configtemplate') + ('extras', '0086_configtemplate'), ] dependencies = [ @@ -114,7 +113,23 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='customfield', name='name', - field=models.CharField(max_length=50, unique=True, validators=[django.core.validators.RegexValidator(flags=re.RegexFlag['IGNORECASE'], message='Only alphanumeric characters and underscores are allowed.', regex='^[a-z0-9_]+$'), django.core.validators.RegexValidator(flags=re.RegexFlag['IGNORECASE'], inverse_match=True, message='Double underscores are not permitted in custom field names.', regex='__')]), + field=models.CharField( + max_length=50, + unique=True, + validators=[ + django.core.validators.RegexValidator( + flags=re.RegexFlag['IGNORECASE'], + message='Only alphanumeric characters and underscores are allowed.', + regex='^[a-z0-9_]+$', + ), + django.core.validators.RegexValidator( + flags=re.RegexFlag['IGNORECASE'], + inverse_match=True, + message='Double underscores are not permitted in custom field names.', + regex='__', + ), + ], + ), ), migrations.AlterField( model_name='customfield', @@ -134,7 +149,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='customfield', name='object_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype' + ), ), migrations.AddField( model_name='customlink', @@ -314,11 +331,16 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='exporttemplate', - constraint=models.UniqueConstraint(fields=('content_type', 'name'), name='extras_exporttemplate_unique_content_type_name'), + constraint=models.UniqueConstraint( + fields=('content_type', 'name'), name='extras_exporttemplate_unique_content_type_name' + ), ), migrations.AddConstraint( model_name='webhook', - constraint=models.UniqueConstraint(fields=('payload_url', 'type_create', 'type_update', 'type_delete'), name='extras_webhook_unique_payload_url_types'), + constraint=models.UniqueConstraint( + fields=('payload_url', 'type_create', 'type_update', 'type_delete'), + name='extras_webhook_unique_payload_url_types', + ), ), migrations.AddField( model_name='jobresult', @@ -328,7 +350,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='jobresult', name='interval', - field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)]), + field=models.PositiveIntegerField( + blank=True, null=True, validators=[django.core.validators.MinValueValidator(1)] + ), ), migrations.AddField( model_name='jobresult', @@ -379,7 +403,12 @@ class Migration(migrations.Migration): ('shared', models.BooleanField(default=True)), ('parameters', models.JSONField()), ('content_types', models.ManyToManyField(related_name='saved_filters', to='contenttypes.contenttype')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL + ), + ), ], options={ 'ordering': ('weight', 'name'), @@ -400,7 +429,12 @@ class Migration(migrations.Migration): ('type', models.CharField(max_length=30)), ('value', extras.fields.CachedValueField()), ('weight', models.PositiveSmallIntegerField(default=1000)), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype')), + ( + 'object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype' + ), + ), ], options={ 'ordering': ('weight', 'object_type', 'object_id'), @@ -414,7 +448,12 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('name', models.CharField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL + ), + ), ], options={ 'ordering': ('name',), @@ -429,8 +468,18 @@ class Migration(migrations.Migration): ('action', models.CharField(max_length=20)), ('object_id', models.PositiveBigIntegerField(blank=True, null=True)), ('data', models.JSONField(blank=True, null=True)), - ('branch', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='staged_changes', to='extras.branch')), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype')), + ( + 'branch', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='staged_changes', to='extras.branch' + ), + ), + ( + 'object_type', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.contenttype' + ), + ), ], options={ 'ordering': ('pk',), @@ -439,7 +488,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='configcontext', name='data_file', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='core.datafile', + ), ), migrations.AddField( model_name='configcontext', @@ -449,7 +504,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='configcontext', name='data_source', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='core.datasource', + ), ), migrations.AddField( model_name='configcontext', @@ -464,7 +525,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='exporttemplate', name='data_file', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='core.datafile', + ), ), migrations.AddField( model_name='exporttemplate', @@ -474,7 +541,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='exporttemplate', name='data_source', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='core.datasource', + ), ), migrations.AddField( model_name='exporttemplate', @@ -498,8 +571,26 @@ class Migration(migrations.Migration): ('description', models.CharField(blank=True, max_length=200)), ('template_code', models.TextField()), ('environment_params', models.JSONField(blank=True, default=dict, null=True)), - ('data_file', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.datafile')), - ('data_source', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='core.datasource')), + ( + 'data_file', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='core.datafile', + ), + ), + ( + 'data_source', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='core.datasource', + ), + ), ('auto_sync_enabled', models.BooleanField(default=False)), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], diff --git a/netbox/extras/migrations/0087_squashed_0098.py b/netbox/extras/migrations/0087_squashed_0098.py index bbe7f79f5..839f4cbe4 100644 --- a/netbox/extras/migrations/0087_squashed_0098.py +++ b/netbox/extras/migrations/0087_squashed_0098.py @@ -9,7 +9,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('extras', '0087_dashboard'), ('extras', '0088_jobresult_webhooks'), @@ -22,7 +21,7 @@ class Migration(migrations.Migration): ('extras', '0095_bookmarks'), ('extras', '0096_customfieldchoiceset'), ('extras', '0097_customfield_remove_choices'), - ('extras', '0098_webhook_custom_field_data_webhook_tags') + ('extras', '0098_webhook_custom_field_data_webhook_tags'), ] dependencies = [ @@ -39,7 +38,14 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('layout', models.JSONField(default=list)), ('config', models.JSONField(default=dict)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='dashboard', to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name='dashboard', + to=settings.AUTH_USER_MODEL, + ), + ), ], ), migrations.AddField( @@ -64,8 +70,7 @@ class Migration(migrations.Migration): ), migrations.CreateModel( name='ReportModule', - fields=[ - ], + fields=[], options={ 'proxy': True, 'ordering': ('file_root', 'file_path'), @@ -76,8 +81,7 @@ class Migration(migrations.Migration): ), migrations.CreateModel( name='ScriptModule', - fields=[ - ], + fields=[], options={ 'proxy': True, 'ordering': ('file_root', 'file_path'), @@ -108,7 +112,10 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('created', models.DateTimeField(auto_now_add=True)), ('object_id', models.PositiveBigIntegerField()), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), + ( + 'object_type', + models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'), + ), ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ], options={ @@ -117,7 +124,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='bookmark', - constraint=models.UniqueConstraint(fields=('object_type', 'object_id', 'user'), name='extras_bookmark_unique_per_object_and_user'), + constraint=models.UniqueConstraint( + fields=('object_type', 'object_id', 'user'), name='extras_bookmark_unique_per_object_and_user' + ), ), migrations.CreateModel( name='CustomFieldChoiceSet', @@ -128,7 +137,17 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), ('base_choices', models.CharField(blank=True, max_length=50)), - ('extra_choices', django.contrib.postgres.fields.ArrayField(base_field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), size=2), blank=True, null=True, size=None)), + ( + 'extra_choices', + django.contrib.postgres.fields.ArrayField( + base_field=django.contrib.postgres.fields.ArrayField( + base_field=models.CharField(max_length=100), size=2 + ), + blank=True, + null=True, + size=None, + ), + ), ('order_alphabetically', models.BooleanField(default=False)), ], options={ @@ -138,7 +157,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='customfield', name='choice_set', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='choices_for', to='extras.customfieldchoiceset'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='choices_for', + to='extras.customfieldchoiceset', + ), ), migrations.RemoveField( model_name='customfield', diff --git a/netbox/extras/migrations/0099_cachedvalue_ordering.py b/netbox/extras/migrations/0099_cachedvalue_ordering.py index 242ffd983..36b91d59b 100644 --- a/netbox/extras/migrations/0099_cachedvalue_ordering.py +++ b/netbox/extras/migrations/0099_cachedvalue_ordering.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('extras', '0098_webhook_custom_field_data_webhook_tags'), ] diff --git a/netbox/extras/migrations/0100_customfield_ui_attrs.py b/netbox/extras/migrations/0100_customfield_ui_attrs.py index a4a713a86..b1a404d16 100644 --- a/netbox/extras/migrations/0100_customfield_ui_attrs.py +++ b/netbox/extras/migrations/0100_customfield_ui_attrs.py @@ -14,7 +14,6 @@ def update_ui_attrs(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0099_cachedvalue_ordering'), ] @@ -30,10 +29,7 @@ class Migration(migrations.Migration): name='ui_visible', field=models.CharField(default='always', max_length=50), ), - migrations.RunPython( - code=update_ui_attrs, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_ui_attrs, reverse_code=migrations.RunPython.noop), migrations.RemoveField( model_name='customfield', name='ui_visibility', diff --git a/netbox/extras/migrations/0101_eventrule.py b/netbox/extras/migrations/0101_eventrule.py index 3d236c847..605307c27 100644 --- a/netbox/extras/migrations/0101_eventrule.py +++ b/netbox/extras/migrations/0101_eventrule.py @@ -8,8 +8,8 @@ from extras.choices import * def move_webhooks(apps, schema_editor): - Webhook = apps.get_model("extras", "Webhook") - EventRule = apps.get_model("extras", "EventRule") + Webhook = apps.get_model('extras', 'Webhook') + EventRule = apps.get_model('extras', 'EventRule') webhook_ct = ContentType.objects.get_for_model(Webhook).pk for webhook in Webhook.objects.all(): @@ -39,7 +39,6 @@ class Migration(migrations.Migration): ] operations = [ - # Create the EventRule model migrations.CreateModel( name='EventRule', @@ -93,12 +92,12 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='eventrule', - index=models.Index(fields=['action_object_type', 'action_object_id'], name='extras_even_action__d9e2af_idx'), + index=models.Index( + fields=['action_object_type', 'action_object_id'], name='extras_even_action__d9e2af_idx' + ), ), - # Replicate Webhook data migrations.RunPython(move_webhooks), - # Remove obsolete fields from Webhook migrations.RemoveConstraint( model_name='webhook', @@ -136,7 +135,6 @@ class Migration(migrations.Migration): model_name='webhook', name='type_update', ), - # Add description field to Webhook migrations.AddField( model_name='webhook', diff --git a/netbox/extras/migrations/0102_move_configrevision.py b/netbox/extras/migrations/0102_move_configrevision.py index 36eef1205..64ff8c9ad 100644 --- a/netbox/extras/migrations/0102_move_configrevision.py +++ b/netbox/extras/migrations/0102_move_configrevision.py @@ -13,7 +13,6 @@ def update_content_type(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0101_eventrule'), ] @@ -32,8 +31,5 @@ class Migration(migrations.Migration): ), ], ), - migrations.RunPython( - code=update_content_type, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_content_type, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/migrations/0103_gfk_indexes.py b/netbox/extras/migrations/0103_gfk_indexes.py index 2ccbdb2ff..f32b2e116 100644 --- a/netbox/extras/migrations/0103_gfk_indexes.py +++ b/netbox/extras/migrations/0103_gfk_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0102_move_configrevision'), ] @@ -20,15 +19,21 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='journalentry', - index=models.Index(fields=['assigned_object_type', 'assigned_object_id'], name='extras_jour_assigne_76510f_idx'), + index=models.Index( + fields=['assigned_object_type', 'assigned_object_id'], name='extras_jour_assigne_76510f_idx' + ), ), migrations.AddIndex( model_name='objectchange', - index=models.Index(fields=['changed_object_type', 'changed_object_id'], name='extras_obje_changed_927fe5_idx'), + index=models.Index( + fields=['changed_object_type', 'changed_object_id'], name='extras_obje_changed_927fe5_idx' + ), ), migrations.AddIndex( model_name='objectchange', - index=models.Index(fields=['related_object_type', 'related_object_id'], name='extras_obje_related_bfcdef_idx'), + index=models.Index( + fields=['related_object_type', 'related_object_id'], name='extras_obje_related_bfcdef_idx' + ), ), migrations.AddIndex( model_name='stagedchange', diff --git a/netbox/extras/migrations/0105_customfield_min_max_values.py b/netbox/extras/migrations/0105_customfield_min_max_values.py index bcf3f97bd..71a0dcc68 100644 --- a/netbox/extras/migrations/0105_customfield_min_max_values.py +++ b/netbox/extras/migrations/0105_customfield_min_max_values.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0104_stagedchange_remove_change_logging'), ] diff --git a/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py b/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py index d7bef2f0b..bc0e1bbd0 100644 --- a/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py +++ b/netbox/extras/migrations/0106_bookmark_user_cascade_deletion.py @@ -6,7 +6,6 @@ import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('extras', '0105_customfield_min_max_values'), diff --git a/netbox/extras/migrations/0107_cachedvalue_extras_cachedvalue_object.py b/netbox/extras/migrations/0107_cachedvalue_extras_cachedvalue_object.py index 15ce375a2..3f2907192 100644 --- a/netbox/extras/migrations/0107_cachedvalue_extras_cachedvalue_object.py +++ b/netbox/extras/migrations/0107_cachedvalue_extras_cachedvalue_object.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0106_bookmark_user_cascade_deletion'), ] diff --git a/netbox/extras/migrations/0108_convert_reports_to_scripts.py b/netbox/extras/migrations/0108_convert_reports_to_scripts.py index b547c41c3..948bac754 100644 --- a/netbox/extras/migrations/0108_convert_reports_to_scripts.py +++ b/netbox/extras/migrations/0108_convert_reports_to_scripts.py @@ -12,16 +12,12 @@ def convert_reportmodule_jobs(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0107_cachedvalue_extras_cachedvalue_object'), ] operations = [ - migrations.RunPython( - code=convert_reportmodule_jobs, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=convert_reportmodule_jobs, reverse_code=migrations.RunPython.noop), migrations.DeleteModel( name='Report', ), diff --git a/netbox/extras/migrations/0109_script_model.py b/netbox/extras/migrations/0109_script_model.py index 2fa0bf8aa..706a776af 100644 --- a/netbox/extras/migrations/0109_script_model.py +++ b/netbox/extras/migrations/0109_script_model.py @@ -55,9 +55,10 @@ def get_module_scripts(scriptmodule): """ Return a dictionary mapping of name and script class inside the passed ScriptModule. """ + def get_name(cls): # For child objects in submodules use the full import path w/o the root module as the name - return cls.full_name.split(".", maxsplit=1)[1] + return cls.full_name.split('.', maxsplit=1)[1] loader = SourceFileLoader(get_python_name(scriptmodule), get_full_path(scriptmodule)) try: @@ -100,17 +101,13 @@ def update_scripts(apps, schema_editor): ) # Update all Jobs associated with this ScriptModule & script name to point to the new Script object - Job.objects.filter( - object_type_id=scriptmodule_ct.id, - object_id=module.pk, - name=script_name - ).update(object_type_id=script_ct.id, object_id=script.pk) + Job.objects.filter(object_type_id=scriptmodule_ct.id, object_id=module.pk, name=script_name).update( + object_type_id=script_ct.id, object_id=script.pk + ) # Update all Jobs associated with this ScriptModule & script name to point to the new Script object - Job.objects.filter( - object_type_id=reportmodule_ct.id, - object_id=module.pk, - name=script_name - ).update(object_type_id=script_ct.id, object_id=script.pk) + Job.objects.filter(object_type_id=reportmodule_ct.id, object_id=module.pk, name=script_name).update( + object_type_id=script_ct.id, object_id=script.pk + ) def update_event_rules(apps, schema_editor): @@ -129,15 +126,12 @@ def update_event_rules(apps, schema_editor): for eventrule in EventRule.objects.filter(action_object_type=scriptmodule_ct): name = eventrule.action_parameters.get('script_name') obj, __ = Script.objects.get_or_create( - module_id=eventrule.action_object_id, - name=name, - defaults={'is_executable': False} + module_id=eventrule.action_object_id, name=name, defaults={'is_executable': False} ) EventRule.objects.filter(pk=eventrule.pk).update(action_object_type=script_ct, action_object_id=obj.id) class Migration(migrations.Migration): - dependencies = [ ('extras', '0108_convert_reports_to_scripts'), ] @@ -148,8 +142,16 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(editable=False, max_length=79)), - ('module', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='scripts', to='extras.scriptmodule')), - ('is_executable', models.BooleanField(editable=False, default=True)) + ( + 'module', + models.ForeignKey( + editable=False, + on_delete=django.db.models.deletion.CASCADE, + related_name='scripts', + to='extras.scriptmodule', + ), + ), + ('is_executable', models.BooleanField(editable=False, default=True)), ], options={ 'ordering': ('module', 'name'), @@ -159,12 +161,6 @@ class Migration(migrations.Migration): model_name='script', constraint=models.UniqueConstraint(fields=('name', 'module'), name='extras_script_unique_name_module'), ), - migrations.RunPython( - code=update_scripts, - reverse_code=migrations.RunPython.noop - ), - migrations.RunPython( - code=update_event_rules, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_scripts, reverse_code=migrations.RunPython.noop), + migrations.RunPython(code=update_event_rules, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/migrations/0110_remove_eventrule_action_parameters.py b/netbox/extras/migrations/0110_remove_eventrule_action_parameters.py index b7373bdce..494107643 100644 --- a/netbox/extras/migrations/0110_remove_eventrule_action_parameters.py +++ b/netbox/extras/migrations/0110_remove_eventrule_action_parameters.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('extras', '0109_script_model'), ] diff --git a/netbox/extras/migrations/0111_rename_content_types.py b/netbox/extras/migrations/0111_rename_content_types.py index acd6aef0f..a9f80b146 100644 --- a/netbox/extras/migrations/0111_rename_content_types.py +++ b/netbox/extras/migrations/0111_rename_content_types.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0010_gfk_indexes'), ('extras', '0110_remove_eventrule_action_parameters'), @@ -24,16 +23,19 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='customfield', name='object_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.objecttype'), - ), - migrations.RunSQL( - "ALTER TABLE IF EXISTS extras_customfield_content_types_id_seq RENAME TO extras_customfield_object_types_id_seq" + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='core.objecttype' + ), ), + migrations.RunSQL(( + 'ALTER TABLE IF EXISTS extras_customfield_content_types_id_seq ' + 'RENAME TO extras_customfield_object_types_id_seq' + )), # Pre-v2.10 sequence name (see #15605) - migrations.RunSQL( - "ALTER TABLE IF EXISTS extras_customfield_obj_type_id_seq RENAME TO extras_customfield_object_types_id_seq" - ), - + migrations.RunSQL(( + 'ALTER TABLE IF EXISTS extras_customfield_obj_type_id_seq ' + 'RENAME TO extras_customfield_object_types_id_seq' + )), # Custom links migrations.RenameField( model_name='customlink', @@ -46,9 +48,8 @@ class Migration(migrations.Migration): field=models.ManyToManyField(related_name='custom_links', to='core.objecttype'), ), migrations.RunSQL( - "ALTER TABLE extras_customlink_content_types_id_seq RENAME TO extras_customlink_object_types_id_seq" + 'ALTER TABLE extras_customlink_content_types_id_seq RENAME TO extras_customlink_object_types_id_seq' ), - # Event rules migrations.RenameField( model_name='eventrule', @@ -61,9 +62,8 @@ class Migration(migrations.Migration): field=models.ManyToManyField(related_name='event_rules', to='core.objecttype'), ), migrations.RunSQL( - "ALTER TABLE extras_eventrule_content_types_id_seq RENAME TO extras_eventrule_object_types_id_seq" + 'ALTER TABLE extras_eventrule_content_types_id_seq RENAME TO extras_eventrule_object_types_id_seq' ), - # Export templates migrations.RenameField( model_name='exporttemplate', @@ -76,9 +76,8 @@ class Migration(migrations.Migration): field=models.ManyToManyField(related_name='export_templates', to='core.objecttype'), ), migrations.RunSQL( - "ALTER TABLE extras_exporttemplate_content_types_id_seq RENAME TO extras_exporttemplate_object_types_id_seq" + 'ALTER TABLE extras_exporttemplate_content_types_id_seq RENAME TO extras_exporttemplate_object_types_id_seq' ), - # Saved filters migrations.RenameField( model_name='savedfilter', @@ -91,9 +90,8 @@ class Migration(migrations.Migration): field=models.ManyToManyField(related_name='saved_filters', to='core.objecttype'), ), migrations.RunSQL( - "ALTER TABLE extras_savedfilter_content_types_id_seq RENAME TO extras_savedfilter_object_types_id_seq" + 'ALTER TABLE extras_savedfilter_content_types_id_seq RENAME TO extras_savedfilter_object_types_id_seq' ), - # Image attachments migrations.RemoveIndex( model_name='imageattachment', diff --git a/netbox/extras/migrations/0112_tag_update_object_types.py b/netbox/extras/migrations/0112_tag_update_object_types.py index 87ec117a4..e863ba8c3 100644 --- a/netbox/extras/migrations/0112_tag_update_object_types.py +++ b/netbox/extras/migrations/0112_tag_update_object_types.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0010_gfk_indexes'), ('extras', '0111_rename_content_types'), diff --git a/netbox/extras/migrations/0113_customfield_rename_object_type.py b/netbox/extras/migrations/0113_customfield_rename_object_type.py index 73c4a2a61..9ad9fbbc4 100644 --- a/netbox/extras/migrations/0113_customfield_rename_object_type.py +++ b/netbox/extras/migrations/0113_customfield_rename_object_type.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('extras', '0112_tag_update_object_types'), ] diff --git a/netbox/extras/migrations/0114_customfield_add_comments.py b/netbox/extras/migrations/0114_customfield_add_comments.py index cd85db1ba..ad9e3d46f 100644 --- a/netbox/extras/migrations/0114_customfield_add_comments.py +++ b/netbox/extras/migrations/0114_customfield_add_comments.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0113_customfield_rename_object_type'), ] diff --git a/netbox/extras/migrations/0115_convert_dashboard_widgets.py b/netbox/extras/migrations/0115_convert_dashboard_widgets.py index c85c83ecf..28f6eade9 100644 --- a/netbox/extras/migrations/0115_convert_dashboard_widgets.py +++ b/netbox/extras/migrations/0115_convert_dashboard_widgets.py @@ -16,14 +16,10 @@ def update_dashboard_widgets(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0114_customfield_add_comments'), ] operations = [ - migrations.RunPython( - code=update_dashboard_widgets, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_dashboard_widgets, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/migrations/0116_custom_link_button_color.py b/netbox/extras/migrations/0116_custom_link_button_color.py index 665d73017..ff47eab11 100644 --- a/netbox/extras/migrations/0116_custom_link_button_color.py +++ b/netbox/extras/migrations/0116_custom_link_button_color.py @@ -7,7 +7,6 @@ def update_link_buttons(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0115_convert_dashboard_widgets'), ] @@ -18,8 +17,5 @@ class Migration(migrations.Migration): name='button_class', field=models.CharField(default='default', max_length=30), ), - migrations.RunPython( - code=update_link_buttons, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_link_buttons, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/migrations/0117_move_objectchange.py b/netbox/extras/migrations/0117_move_objectchange.py index a69b5a711..62c7255e7 100644 --- a/netbox/extras/migrations/0117_move_objectchange.py +++ b/netbox/extras/migrations/0117_move_objectchange.py @@ -26,7 +26,6 @@ def update_dashboard_widgets(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0116_custom_link_button_color'), ('core', '0011_move_objectchange'), @@ -44,81 +43,64 @@ class Migration(migrations.Migration): name='ObjectChange', table='core_objectchange', ), - # Rename PK sequence - migrations.RunSQL( - "ALTER TABLE extras_objectchange_id_seq" - " RENAME TO core_objectchange_id_seq" - ), - + migrations.RunSQL('ALTER TABLE extras_objectchange_id_seq' ' RENAME TO core_objectchange_id_seq'), # Rename indexes. Hashes generated by schema_editor._create_index_name() + migrations.RunSQL('ALTER INDEX extras_objectchange_pkey' ' RENAME TO core_objectchange_pkey'), migrations.RunSQL( - "ALTER INDEX extras_objectchange_pkey" - " RENAME TO core_objectchange_pkey" + 'ALTER INDEX extras_obje_changed_927fe5_idx' + ' RENAME TO core_objectchange_changed_object_type_id_cha_79a9ed1e' ), migrations.RunSQL( - "ALTER INDEX extras_obje_changed_927fe5_idx" - " RENAME TO core_objectchange_changed_object_type_id_cha_79a9ed1e" + 'ALTER INDEX extras_obje_related_bfcdef_idx' + ' RENAME TO core_objectchange_related_object_type_id_rel_a71d604a' ), migrations.RunSQL( - "ALTER INDEX extras_obje_related_bfcdef_idx" - " RENAME TO core_objectchange_related_object_type_id_rel_a71d604a" + 'ALTER INDEX extras_objectchange_changed_object_type_id_b755bb60' + ' RENAME TO core_objectchange_changed_object_type_id_2070ade6' ), migrations.RunSQL( - "ALTER INDEX extras_objectchange_changed_object_type_id_b755bb60" - " RENAME TO core_objectchange_changed_object_type_id_2070ade6" + 'ALTER INDEX extras_objectchange_related_object_type_id_fe6e521f' + ' RENAME TO core_objectchange_related_object_type_id_b80958af' ), migrations.RunSQL( - "ALTER INDEX extras_objectchange_related_object_type_id_fe6e521f" - " RENAME TO core_objectchange_related_object_type_id_b80958af" + 'ALTER INDEX extras_objectchange_request_id_4ae21e90' + ' RENAME TO core_objectchange_request_id_d9d160ac' ), migrations.RunSQL( - "ALTER INDEX extras_objectchange_request_id_4ae21e90" - " RENAME TO core_objectchange_request_id_d9d160ac" + 'ALTER INDEX extras_objectchange_time_224380ea' ' RENAME TO core_objectchange_time_800f60a5' ), migrations.RunSQL( - "ALTER INDEX extras_objectchange_time_224380ea" - " RENAME TO core_objectchange_time_800f60a5" + 'ALTER INDEX extras_objectchange_user_id_7fdf8186' ' RENAME TO core_objectchange_user_id_2b2142be' ), - migrations.RunSQL( - "ALTER INDEX extras_objectchange_user_id_7fdf8186" - " RENAME TO core_objectchange_user_id_2b2142be" - ), - # Rename constraints migrations.RunSQL( - "ALTER TABLE core_objectchange RENAME CONSTRAINT " - "extras_objectchange_changed_object_id_check TO " - "core_objectchange_changed_object_id_check" + 'ALTER TABLE core_objectchange RENAME CONSTRAINT ' + 'extras_objectchange_changed_object_id_check TO ' + 'core_objectchange_changed_object_id_check' ), migrations.RunSQL( - "ALTER TABLE core_objectchange RENAME CONSTRAINT " - "extras_objectchange_related_object_id_check TO " - "core_objectchange_related_object_id_check" + 'ALTER TABLE core_objectchange RENAME CONSTRAINT ' + 'extras_objectchange_related_object_id_check TO ' + 'core_objectchange_related_object_id_check' ), migrations.RunSQL( - "ALTER TABLE core_objectchange RENAME CONSTRAINT " - "extras_objectchange_changed_object_type__b755bb60_fk_django_co TO " - "core_objectchange_changed_object_type_id_2070ade6" + 'ALTER TABLE core_objectchange RENAME CONSTRAINT ' + 'extras_objectchange_changed_object_type__b755bb60_fk_django_co TO ' + 'core_objectchange_changed_object_type_id_2070ade6' ), migrations.RunSQL( - "ALTER TABLE core_objectchange RENAME CONSTRAINT " - "extras_objectchange_related_object_type__fe6e521f_fk_django_co TO " - "core_objectchange_related_object_type_id_b80958af" + 'ALTER TABLE core_objectchange RENAME CONSTRAINT ' + 'extras_objectchange_related_object_type__fe6e521f_fk_django_co TO ' + 'core_objectchange_related_object_type_id_b80958af' ), migrations.RunSQL( - "ALTER TABLE core_objectchange RENAME CONSTRAINT " - "extras_objectchange_user_id_7fdf8186_fk_auth_user_id TO " - "core_objectchange_user_id_2b2142be" + 'ALTER TABLE core_objectchange RENAME CONSTRAINT ' + 'extras_objectchange_user_id_7fdf8186_fk_auth_user_id TO ' + 'core_objectchange_user_id_2b2142be' ), ], ), - migrations.RunPython( - code=update_content_types, - reverse_code=migrations.RunPython.noop - ), - migrations.RunPython( - code=update_dashboard_widgets, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_content_types, reverse_code=migrations.RunPython.noop), + migrations.RunPython(code=update_dashboard_widgets, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/migrations/0118_customfield_uniqueness.py b/netbox/extras/migrations/0118_customfield_uniqueness.py index b7693aa24..7571e975a 100644 --- a/netbox/extras/migrations/0118_customfield_uniqueness.py +++ b/netbox/extras/migrations/0118_customfield_uniqueness.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0117_move_objectchange'), ] diff --git a/netbox/extras/migrations/0119_notifications.py b/netbox/extras/migrations/0119_notifications.py index c266f3b6c..2e6aefd20 100644 --- a/netbox/extras/migrations/0119_notifications.py +++ b/netbox/extras/migrations/0119_notifications.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('extras', '0118_customfield_uniqueness'), @@ -22,7 +21,10 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), ('groups', models.ManyToManyField(blank=True, related_name='notification_groups', to='users.group')), - ('users', models.ManyToManyField(blank=True, related_name='notification_groups', to=settings.AUTH_USER_MODEL)), + ( + 'users', + models.ManyToManyField(blank=True, related_name='notification_groups', to=settings.AUTH_USER_MODEL), + ), ], options={ 'verbose_name': 'notification group', @@ -36,8 +38,18 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('created', models.DateTimeField(auto_now_add=True)), ('object_id', models.PositiveBigIntegerField()), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subscriptions', to=settings.AUTH_USER_MODEL)), + ( + 'object_type', + models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'), + ), + ( + 'user', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='subscriptions', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'verbose_name': 'subscription', @@ -53,9 +65,19 @@ class Migration(migrations.Migration): ('read', models.DateTimeField(blank=True, null=True)), ('object_id', models.PositiveBigIntegerField()), ('event_type', models.CharField(max_length=50)), - ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), + ( + 'object_type', + models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype'), + ), ('object_repr', models.CharField(editable=False, max_length=200)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='notifications', + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ 'verbose_name': 'notification', @@ -66,7 +88,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='notification', - constraint=models.UniqueConstraint(fields=('object_type', 'object_id', 'user'), name='extras_notification_unique_per_object_and_user'), + constraint=models.UniqueConstraint( + fields=('object_type', 'object_id', 'user'), name='extras_notification_unique_per_object_and_user' + ), ), migrations.AddIndex( model_name='subscription', @@ -74,6 +98,8 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='subscription', - constraint=models.UniqueConstraint(fields=('object_type', 'object_id', 'user'), name='extras_subscription_unique_per_object_and_user'), + constraint=models.UniqueConstraint( + fields=('object_type', 'object_id', 'user'), name='extras_subscription_unique_per_object_and_user' + ), ), ] diff --git a/netbox/extras/migrations/0120_eventrule_event_types.py b/netbox/extras/migrations/0120_eventrule_event_types.py index f62c83e4c..2bcc0a4e6 100644 --- a/netbox/extras/migrations/0120_eventrule_event_types.py +++ b/netbox/extras/migrations/0120_eventrule_event_types.py @@ -26,7 +26,6 @@ def set_event_types(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0119_notifications'), ] @@ -36,16 +35,10 @@ class Migration(migrations.Migration): model_name='eventrule', name='event_types', field=django.contrib.postgres.fields.ArrayField( - base_field=models.CharField(max_length=50), - blank=True, - null=True, - size=None + base_field=models.CharField(max_length=50), blank=True, null=True, size=None ), ), - migrations.RunPython( - code=set_event_types, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_event_types, reverse_code=migrations.RunPython.noop), migrations.AlterField( model_name='eventrule', name='event_types', diff --git a/netbox/extras/migrations/0121_customfield_related_object_filter.py b/netbox/extras/migrations/0121_customfield_related_object_filter.py index d6e41fd7d..10eecd6cc 100644 --- a/netbox/extras/migrations/0121_customfield_related_object_filter.py +++ b/netbox/extras/migrations/0121_customfield_related_object_filter.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0120_eventrule_event_types'), ] diff --git a/netbox/extras/migrations/0122_charfield_null_choices.py b/netbox/extras/migrations/0122_charfield_null_choices.py index 9a1c7ff3f..a32051cb1 100644 --- a/netbox/extras/migrations/0122_charfield_null_choices.py +++ b/netbox/extras/migrations/0122_charfield_null_choices.py @@ -11,7 +11,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('extras', '0121_customfield_related_object_filter'), ] @@ -22,8 +21,5 @@ class Migration(migrations.Migration): name='base_choices', field=models.CharField(blank=True, max_length=50, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index d8a274c89..d3e443b14 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -704,7 +704,10 @@ class JournalEntry(CustomFieldsMixin, CustomLinksMixin, TagsMixin, ExportTemplat def __str__(self): created = timezone.localtime(self.created) - return f"{created.date().isoformat()} {created.time().isoformat(timespec='minutes')} ({self.get_kind_display()})" + return ( + f"{created.date().isoformat()} {created.time().isoformat(timespec='minutes')} " + f"({self.get_kind_display()})" + ) def get_absolute_url(self): return reverse('extras:journalentry', args=[self.pk]) diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index 2bc9b5acc..ce26cb889 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -637,15 +637,51 @@ class CustomFieldAPITest(APITestCase): ) custom_fields = ( - CustomField(type=CustomFieldTypeChoices.TYPE_TEXT, name='text_field', default='foo'), - CustomField(type=CustomFieldTypeChoices.TYPE_LONGTEXT, name='longtext_field', default='ABC'), - CustomField(type=CustomFieldTypeChoices.TYPE_INTEGER, name='integer_field', default=123), - CustomField(type=CustomFieldTypeChoices.TYPE_DECIMAL, name='decimal_field', default=123.45), - CustomField(type=CustomFieldTypeChoices.TYPE_BOOLEAN, name='boolean_field', default=False), - CustomField(type=CustomFieldTypeChoices.TYPE_DATE, name='date_field', default='2020-01-01'), - CustomField(type=CustomFieldTypeChoices.TYPE_DATETIME, name='datetime_field', default='2020-01-01T01:23:45'), - CustomField(type=CustomFieldTypeChoices.TYPE_URL, name='url_field', default='http://example.com/1'), - CustomField(type=CustomFieldTypeChoices.TYPE_JSON, name='json_field', default='{"x": "y"}'), + CustomField( + type=CustomFieldTypeChoices.TYPE_TEXT, + name='text_field', + default='foo' + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_LONGTEXT, + name='longtext_field', + default='ABC' + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_INTEGER, + name='integer_field', + default=123 + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_DECIMAL, + name='decimal_field', + default=123.45 + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_BOOLEAN, + name='boolean_field', + default=False) + , + CustomField( + type=CustomFieldTypeChoices.TYPE_DATE, + name='date_field', + default='2020-01-01' + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_DATETIME, + name='datetime_field', + default='2020-01-01T01:23:45' + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_URL, + name='url_field', + default='http://example.com/1' + ), + CustomField( + type=CustomFieldTypeChoices.TYPE_JSON, + name='json_field', + default='{"x": "y"}' + ), CustomField( type=CustomFieldTypeChoices.TYPE_SELECT, name='select_field', @@ -656,7 +692,7 @@ class CustomFieldAPITest(APITestCase): type=CustomFieldTypeChoices.TYPE_MULTISELECT, name='multiselect_field', default=['foo'], - choice_set=choice_set + choice_set=choice_set, ), CustomField( type=CustomFieldTypeChoices.TYPE_OBJECT, @@ -1273,9 +1309,18 @@ class CustomFieldImportTest(TestCase): Import a Site in CSV format, including a value for each CustomField. """ data = ( - ('name', 'slug', 'status', 'cf_text', 'cf_longtext', 'cf_integer', 'cf_decimal', 'cf_boolean', 'cf_date', 'cf_datetime', 'cf_url', 'cf_json', 'cf_select', 'cf_multiselect'), - ('Site 1', 'site-1', 'active', 'ABC', 'Foo', '123', '123.45', 'True', '2020-01-01', '2020-01-01 12:00:00', 'http://example.com/1', '{"foo": 123}', 'a', '"a,b"'), - ('Site 2', 'site-2', 'active', 'DEF', 'Bar', '456', '456.78', 'False', '2020-01-02', '2020-01-02 12:00:00', 'http://example.com/2', '{"bar": 456}', 'b', '"b,c"'), + ( + 'name', 'slug', 'status', 'cf_text', 'cf_longtext', 'cf_integer', 'cf_decimal', 'cf_boolean', 'cf_date', + 'cf_datetime', 'cf_url', 'cf_json', 'cf_select', 'cf_multiselect', + ), + ( + 'Site 1', 'site-1', 'active', 'ABC', 'Foo', '123', '123.45', 'True', '2020-01-01', + '2020-01-01 12:00:00', 'http://example.com/1', '{"foo": 123}', 'a', '"a,b"', + ), + ( + 'Site 2', 'site-2', 'active', 'DEF', 'Bar', '456', '456.78', 'False', '2020-01-02', + '2020-01-02 12:00:00', 'http://example.com/2', '{"bar": 456}', 'b', '"b,c"', + ), ('Site 3', 'site-3', 'active', '', '', '', '', '', '', '', '', '', '', ''), ) csv_data = '\n'.join(','.join(row) for row in data) @@ -1616,7 +1661,10 @@ class CustomFieldModelFilterTest(TestCase): self.assertEqual(self.filterset({'cf_cf6__lte': ['2016-06-27']}, self.queryset).qs.count(), 2) def test_filter_url_strict(self): - self.assertEqual(self.filterset({'cf_cf7': ['http://a.example.com', 'http://b.example.com']}, self.queryset).qs.count(), 2) + self.assertEqual( + self.filterset({'cf_cf7': ['http://a.example.com', 'http://b.example.com']}, self.queryset).qs.count(), + 2 + ) self.assertEqual(self.filterset({'cf_cf7__n': ['http://b.example.com']}, self.queryset).qs.count(), 2) self.assertEqual(self.filterset({'cf_cf7__ic': ['b']}, self.queryset).qs.count(), 1) self.assertEqual(self.filterset({'cf_cf7__nic': ['b']}, self.queryset).qs.count(), 2) @@ -1640,9 +1688,18 @@ class CustomFieldModelFilterTest(TestCase): def test_filter_object(self): manufacturer_ids = Manufacturer.objects.values_list('id', flat=True) - self.assertEqual(self.filterset({'cf_cf11': [manufacturer_ids[0], manufacturer_ids[1]]}, self.queryset).qs.count(), 2) + self.assertEqual( + self.filterset({'cf_cf11': [manufacturer_ids[0], manufacturer_ids[1]]}, self.queryset).qs.count(), + 2 + ) def test_filter_multiobject(self): manufacturer_ids = Manufacturer.objects.values_list('id', flat=True) - self.assertEqual(self.filterset({'cf_cf12': [manufacturer_ids[0], manufacturer_ids[1]]}, self.queryset).qs.count(), 2) - self.assertEqual(self.filterset({'cf_cf12': [manufacturer_ids[3]]}, self.queryset).qs.count(), 3) + self.assertEqual( + self.filterset({'cf_cf12': [manufacturer_ids[0], manufacturer_ids[1]]}, self.queryset).qs.count(), + 2 + ) + self.assertEqual( + self.filterset({'cf_cf12': [manufacturer_ids[3]]}, self.queryset).qs.count(), + 3 + ) diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py index 53ffe8f3f..094da3007 100644 --- a/netbox/ipam/forms/model_forms.py +++ b/netbox/ipam/forms/model_forms.py @@ -387,7 +387,12 @@ class IPAddressForm(TenancyForm, NetBoxModelForm): }) elif selected_objects: assigned_object = self.cleaned_data[selected_objects[0]] - if self.instance.pk and self.instance.assigned_object and self.cleaned_data['primary_for_parent'] and assigned_object != self.instance.assigned_object: + if ( + self.instance.pk and + self.instance.assigned_object and + self.cleaned_data['primary_for_parent'] and + assigned_object != self.instance.assigned_object + ): raise ValidationError( _("Cannot reassign IP address while it is designated as the primary IP for the parent object") ) diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py index 5a4813e0c..e6ecca984 100644 --- a/netbox/ipam/graphql/types.py +++ b/netbox/ipam/graphql/types.py @@ -295,7 +295,10 @@ class VLANTranslationPolicyType(NetBoxObjectType): filters=VLANTranslationRuleFilter ) class VLANTranslationRuleType(NetBoxObjectType): - policy: Annotated["VLANTranslationPolicyType", strawberry.lazy('ipam.graphql.types')] = strawberry_django.field(select_related=["policy"]) + policy: Annotated[ + "VLANTranslationPolicyType", + strawberry.lazy('ipam.graphql.types') + ] = strawberry_django.field(select_related=["policy"]) @strawberry_django.type( diff --git a/netbox/ipam/migrations/0001_squashed.py b/netbox/ipam/migrations/0001_squashed.py index bef36e698..896d7c4c9 100644 --- a/netbox/ipam/migrations/0001_squashed.py +++ b/netbox/ipam/migrations/0001_squashed.py @@ -9,7 +9,6 @@ import taggit.managers class Migration(migrations.Migration): - initial = True dependencies = [ @@ -50,7 +49,23 @@ class Migration(migrations.Migration): ('status', models.CharField(default='active', max_length=50)), ('role', models.CharField(blank=True, max_length=50)), ('assigned_object_id', models.PositiveIntegerField(blank=True, null=True)), - ('dns_name', models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names', regex='^([0-9A-Za-z_-]+|\\*)(\\.[0-9A-Za-z_-]+)*\\.?$')])), + ( + 'dns_name', + models.CharField( + blank=True, + max_length=255, + validators=[ + django.core.validators.RegexValidator( + code='invalid', + message=( + 'Only alphanumeric characters, asterisks, hyphens, periods, and underscores are ' + 'allowed in DNS names' + ), + regex='^([0-9A-Za-z_-]+|\\*)(\\.[0-9A-Za-z_-]+)*\\.?$', + ) + ], + ), + ), ('description', models.CharField(blank=True, max_length=200)), ], options={ @@ -73,7 +88,11 @@ class Migration(migrations.Migration): ], options={ 'verbose_name_plural': 'prefixes', - 'ordering': (django.db.models.expressions.OrderBy(django.db.models.expressions.F('vrf'), nulls_first=True), 'prefix', 'pk'), + 'ordering': ( + django.db.models.expressions.OrderBy(django.db.models.expressions.F('vrf'), nulls_first=True), + 'prefix', + 'pk', + ), }, ), migrations.CreateModel( @@ -135,10 +154,25 @@ class Migration(migrations.Migration): ('rd', models.CharField(blank=True, max_length=21, null=True, unique=True)), ('enforce_unique', models.BooleanField(default=True)), ('description', models.CharField(blank=True, max_length=200)), - ('export_targets', models.ManyToManyField(blank=True, related_name='exporting_vrfs', to='ipam.RouteTarget')), - ('import_targets', models.ManyToManyField(blank=True, related_name='importing_vrfs', to='ipam.RouteTarget')), + ( + 'export_targets', + models.ManyToManyField(blank=True, related_name='exporting_vrfs', to='ipam.RouteTarget'), + ), + ( + 'import_targets', + models.ManyToManyField(blank=True, related_name='importing_vrfs', to='ipam.RouteTarget'), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vrfs', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vrfs', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'VRF', @@ -157,7 +191,21 @@ class Migration(migrations.Migration): ('slug', models.SlugField(max_length=100)), ('scope_id', models.PositiveBigIntegerField(blank=True, null=True)), ('description', models.CharField(blank=True, max_length=200)), - ('scope_type', models.ForeignKey(blank=True, limit_choices_to=models.Q(('model__in', ('region', 'sitegroup', 'site', 'location', 'rack', 'clustergroup', 'cluster'))), null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ( + 'scope_type', + models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + ( + 'model__in', + ('region', 'sitegroup', 'site', 'location', 'rack', 'clustergroup', 'cluster'), + ) + ), + null=True, + on_delete=django.db.models.deletion.CASCADE, + to='contenttypes.contenttype', + ), + ), ], options={ 'verbose_name': 'VLAN group', @@ -172,15 +220,59 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('custom_field_data', models.JSONField(blank=True, default=dict, encoder=CustomFieldJSONEncoder)), ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), + ( + 'vid', + models.PositiveSmallIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4094), + ] + ), + ), ('name', models.CharField(max_length=64)), ('status', models.CharField(default='active', max_length=50)), ('description', models.CharField(blank=True, max_length=200)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vlans', to='ipam.vlangroup')), - ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vlans', to='ipam.role')), - ('site', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vlans', to='dcim.site')), + ( + 'group', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vlans', + to='ipam.vlangroup', + ), + ), + ( + 'role', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='vlans', + to='ipam.role', + ), + ), + ( + 'site', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vlans', + to='dcim.site', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='vlans', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='vlans', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'VLAN', @@ -197,9 +289,29 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=100)), ('protocol', models.CharField(max_length=50)), - ('ports', django.contrib.postgres.fields.ArrayField(base_field=models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65535)]), size=None)), + ( + 'ports', + django.contrib.postgres.fields.ArrayField( + base_field=models.PositiveIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(65535), + ] + ), + size=None, + ), + ), ('description', models.CharField(blank=True, max_length=200)), - ('device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='services', to='dcim.device')), + ( + 'device', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='services', + to='dcim.device', + ), + ), ('ipaddresses', models.ManyToManyField(blank=True, related_name='services', to='ipam.IPAddress')), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], diff --git a/netbox/ipam/migrations/0002_squashed_0046.py b/netbox/ipam/migrations/0002_squashed_0046.py index 06bcd8741..6c03753d8 100644 --- a/netbox/ipam/migrations/0002_squashed_0046.py +++ b/netbox/ipam/migrations/0002_squashed_0046.py @@ -4,7 +4,6 @@ import taggit.managers class Migration(migrations.Migration): - dependencies = [ ('dcim', '0003_auto_20160628_1721'), ('virtualization', '0001_virtualization'), @@ -66,7 +65,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='service', name='virtual_machine', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='services', to='virtualization.virtualmachine'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='services', + to='virtualization.virtualmachine', + ), ), migrations.AddField( model_name='routetarget', @@ -76,17 +81,35 @@ class Migration(migrations.Migration): migrations.AddField( model_name='routetarget', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='route_targets', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='route_targets', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='prefix', name='role', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='prefixes', to='ipam.role'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='prefixes', + to='ipam.role', + ), ), migrations.AddField( model_name='prefix', name='site', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='dcim.site'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='prefixes', + to='dcim.site', + ), ), migrations.AddField( model_name='prefix', @@ -96,27 +119,64 @@ class Migration(migrations.Migration): migrations.AddField( model_name='prefix', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='prefixes', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='prefix', name='vlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='prefixes', + to='ipam.vlan', + ), ), migrations.AddField( model_name='prefix', name='vrf', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='prefixes', to='ipam.vrf'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='prefixes', + to='ipam.vrf', + ), ), migrations.AddField( model_name='ipaddress', name='assigned_object_type', - field=models.ForeignKey(blank=True, limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'dcim'), ('model', 'interface')), + models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), + _connector='OR', + ) + ), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.AddField( model_name='ipaddress', name='nat_inside', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='nat_outside', to='ipam.ipaddress'), + field=models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='nat_outside', + to='ipam.ipaddress', + ), ), migrations.AddField( model_name='ipaddress', @@ -126,17 +186,31 @@ class Migration(migrations.Migration): migrations.AddField( model_name='ipaddress', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='ip_addresses', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='ip_addresses', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='ipaddress', name='vrf', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='ip_addresses', to='ipam.vrf'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='ip_addresses', + to='ipam.vrf', + ), ), migrations.AddField( model_name='aggregate', name='rir', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='aggregates', to='ipam.rir'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='aggregates', to='ipam.rir' + ), ), migrations.AddField( model_name='aggregate', @@ -146,7 +220,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='aggregate', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='aggregates', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='aggregates', + to='tenancy.tenant', + ), ), migrations.AlterUniqueTogether( name='vlangroup', diff --git a/netbox/ipam/migrations/0047_squashed_0053.py b/netbox/ipam/migrations/0047_squashed_0053.py index 470261316..a05d0cb81 100644 --- a/netbox/ipam/migrations/0047_squashed_0053.py +++ b/netbox/ipam/migrations/0047_squashed_0053.py @@ -8,7 +8,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('ipam', '0047_prefix_depth_children'), ('ipam', '0048_prefix_populate_depth_children'), @@ -16,7 +15,7 @@ class Migration(migrations.Migration): ('ipam', '0050_iprange'), ('ipam', '0051_extend_tag_support'), ('ipam', '0052_fhrpgroup'), - ('ipam', '0053_asn_model') + ('ipam', '0053_asn_model'), ] dependencies = [ @@ -47,17 +46,47 @@ class Migration(migrations.Migration): fields=[ ('created', models.DateField(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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('start_address', ipam.fields.IPAddressField()), ('end_address', ipam.fields.IPAddressField()), ('size', models.PositiveIntegerField(editable=False)), ('status', models.CharField(default='active', max_length=50)), ('description', models.CharField(blank=True, max_length=200)), - ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='ip_ranges', to='ipam.role')), + ( + 'role', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='ip_ranges', + to='ipam.role', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='ip_ranges', to='tenancy.tenant')), - ('vrf', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='ip_ranges', to='ipam.vrf')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='ip_ranges', + to='tenancy.tenant', + ), + ), + ( + 'vrf', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='ip_ranges', + to='ipam.vrf', + ), + ), ], options={ 'verbose_name': 'IP range', @@ -85,7 +114,10 @@ class Migration(migrations.Migration): fields=[ ('created', models.DateField(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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('group_id', models.PositiveSmallIntegerField()), ('protocol', models.CharField(max_length=50)), @@ -102,7 +134,21 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='ipaddress', name='assigned_object_type', - field=models.ForeignKey(blank=True, limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'ipam'), ('model', 'fhrpgroup')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype'), + field=models.ForeignKey( + blank=True, + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'dcim'), ('model', 'interface')), + models.Q(('app_label', 'ipam'), ('model', 'fhrpgroup')), + models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), + _connector='OR', + ) + ), + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), ), migrations.CreateModel( name='FHRPGroupAssignment', @@ -111,9 +157,20 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('interface_id', models.PositiveIntegerField()), - ('priority', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(255)])), + ( + 'priority', + models.PositiveSmallIntegerField( + validators=[ + django.core.validators.MinValueValidator(0), + django.core.validators.MaxValueValidator(255), + ] + ), + ), ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ipam.fhrpgroup')), - ('interface_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), + ( + 'interface_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), ], options={ 'verbose_name': 'FHRP group assignment', @@ -126,13 +183,28 @@ class Migration(migrations.Migration): fields=[ ('created', models.DateField(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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(primary_key=True, serialize=False)), ('asn', ipam.fields.ASNField(unique=True)), ('description', models.CharField(blank=True, max_length=200)), - ('rir', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='asns', to='ipam.rir')), + ( + 'rir', + models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='asns', to='ipam.rir'), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='asns', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='asns', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'ASN', diff --git a/netbox/ipam/migrations/0054_squashed_0067.py b/netbox/ipam/migrations/0054_squashed_0067.py index 40073ca29..929a27fda 100644 --- a/netbox/ipam/migrations/0054_squashed_0067.py +++ b/netbox/ipam/migrations/0054_squashed_0067.py @@ -10,7 +10,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('ipam', '0054_vlangroup_min_max_vids'), ('ipam', '0055_servicetemplate'), @@ -25,7 +24,7 @@ class Migration(migrations.Migration): ('ipam', '0064_clear_search_cache'), ('ipam', '0065_asnrange'), ('ipam', '0066_iprange_mark_utilized'), - ('ipam', '0067_ipaddress_index_host') + ('ipam', '0067_ipaddress_index_host'), ] dependencies = [ @@ -40,12 +39,24 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vlangroup', name='max_vid', - field=models.PositiveSmallIntegerField(default=4094, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)]), + field=models.PositiveSmallIntegerField( + default=4094, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4094), + ], + ), ), migrations.AddField( model_name='vlangroup', name='min_vid', - field=models.PositiveSmallIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)]), + field=models.PositiveSmallIntegerField( + default=1, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4094), + ], + ), ), migrations.AlterField( model_name='aggregate', @@ -187,10 +198,24 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('protocol', models.CharField(max_length=50)), - ('ports', django.contrib.postgres.fields.ArrayField(base_field=models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65535)]), size=None)), + ( + 'ports', + django.contrib.postgres.fields.ArrayField( + base_field=models.PositiveIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(65535), + ] + ), + size=None, + ), + ), ('description', models.CharField(blank=True, max_length=200)), ('name', models.CharField(max_length=100, unique=True)), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), @@ -217,7 +242,13 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='ipaddress', name='nat_inside', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='nat_outside', to='ipam.ipaddress'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='nat_outside', + to='ipam.ipaddress', + ), ), migrations.CreateModel( name='L2VPN', @@ -225,16 +256,34 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), ('type', models.CharField(max_length=50)), ('identifier', models.BigIntegerField(blank=True, null=True)), ('description', models.CharField(blank=True, max_length=200)), - ('export_targets', models.ManyToManyField(blank=True, related_name='exporting_l2vpns', to='ipam.routetarget')), - ('import_targets', models.ManyToManyField(blank=True, related_name='importing_l2vpns', to='ipam.routetarget')), + ( + 'export_targets', + models.ManyToManyField(blank=True, related_name='exporting_l2vpns', to='ipam.routetarget'), + ), + ( + 'import_targets', + models.ManyToManyField(blank=True, related_name='importing_l2vpns', to='ipam.routetarget'), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='l2vpns', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='l2vpns', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'L2VPN', @@ -247,10 +296,33 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('assigned_object_id', models.PositiveBigIntegerField()), - ('assigned_object_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'ipam'), ('model', 'vlan')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('l2vpn', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='ipam.l2vpn')), + ( + 'assigned_object_type', + models.ForeignKey( + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'dcim'), ('model', 'interface')), + models.Q(('app_label', 'ipam'), ('model', 'vlan')), + models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), + _connector='OR', + ) + ), + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'l2vpn', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='ipam.l2vpn' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -260,7 +332,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='l2vpntermination', - constraint=models.UniqueConstraint(fields=('assigned_object_type', 'assigned_object_id'), name='ipam_l2vpntermination_assigned_object'), + constraint=models.UniqueConstraint( + fields=('assigned_object_type', 'assigned_object_id'), name='ipam_l2vpntermination_assigned_object' + ), ), migrations.AddField( model_name='fhrpgroup', @@ -281,7 +355,10 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='fhrpgroupassignment', - constraint=models.UniqueConstraint(fields=('interface_type', 'interface_id', 'group'), name='ipam_fhrpgroupassignment_unique_interface_group'), + constraint=models.UniqueConstraint( + fields=('interface_type', 'interface_id', 'group'), + name='ipam_fhrpgroupassignment_unique_interface_group', + ), ), migrations.AddConstraint( model_name='vlan', @@ -293,11 +370,15 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='vlangroup', - constraint=models.UniqueConstraint(fields=('scope_type', 'scope_id', 'name'), name='ipam_vlangroup_unique_scope_name'), + constraint=models.UniqueConstraint( + fields=('scope_type', 'scope_id', 'name'), name='ipam_vlangroup_unique_scope_name' + ), ), migrations.AddConstraint( model_name='vlangroup', - constraint=models.UniqueConstraint(fields=('scope_type', 'scope_id', 'slug'), name='ipam_vlangroup_unique_scope_slug'), + constraint=models.UniqueConstraint( + fields=('scope_type', 'scope_id', 'slug'), name='ipam_vlangroup_unique_scope_slug' + ), ), migrations.AddField( model_name='aggregate', @@ -365,15 +446,32 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), ('start', ipam.fields.ASNField()), ('end', ipam.fields.ASNField()), - ('rir', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='asn_ranges', to='ipam.rir')), + ( + 'rir', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='asn_ranges', to='ipam.rir' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='asn_ranges', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='asn_ranges', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'ASN range', @@ -388,6 +486,11 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='ipaddress', - index=models.Index(django.db.models.functions.comparison.Cast(ipam.lookups.Host('address'), output_field=ipam.fields.IPAddressField()), name='ipam_ipaddress_host'), + index=models.Index( + django.db.models.functions.comparison.Cast( + ipam.lookups.Host('address'), output_field=ipam.fields.IPAddressField() + ), + name='ipam_ipaddress_host', + ), ), ] diff --git a/netbox/ipam/migrations/0068_move_l2vpn.py b/netbox/ipam/migrations/0068_move_l2vpn.py index b1a059de1..9240240bc 100644 --- a/netbox/ipam/migrations/0068_move_l2vpn.py +++ b/netbox/ipam/migrations/0068_move_l2vpn.py @@ -15,7 +15,6 @@ def update_content_types(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('ipam', '0067_ipaddress_index_host'), ] @@ -57,8 +56,5 @@ class Migration(migrations.Migration): ), ], ), - migrations.RunPython( - code=update_content_types, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_content_types, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/ipam/migrations/0069_gfk_indexes.py b/netbox/ipam/migrations/0069_gfk_indexes.py index 75c016102..d7ce48e35 100644 --- a/netbox/ipam/migrations/0069_gfk_indexes.py +++ b/netbox/ipam/migrations/0069_gfk_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('ipam', '0068_move_l2vpn'), ] @@ -16,7 +15,9 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='ipaddress', - index=models.Index(fields=['assigned_object_type', 'assigned_object_id'], name='ipam_ipaddr_assigne_890ab8_idx'), + index=models.Index( + fields=['assigned_object_type', 'assigned_object_id'], name='ipam_ipaddr_assigne_890ab8_idx' + ), ), migrations.AddIndex( model_name='vlangroup', diff --git a/netbox/ipam/migrations/0070_vlangroup_vlan_id_ranges.py b/netbox/ipam/migrations/0070_vlangroup_vlan_id_ranges.py index b01941401..133173234 100644 --- a/netbox/ipam/migrations/0070_vlangroup_vlan_id_ranges.py +++ b/netbox/ipam/migrations/0070_vlangroup_vlan_id_ranges.py @@ -12,15 +12,12 @@ def set_vid_ranges(apps, schema_editor): """ VLANGroup = apps.get_model('ipam', 'VLANGroup') for group in VLANGroup.objects.all(): - group.vid_ranges = [ - NumericRange(group.min_vid, group.max_vid, bounds='[]') - ] + group.vid_ranges = [NumericRange(group.min_vid, group.max_vid, bounds='[]')] group._total_vlan_ids = group.max_vid - group.min_vid + 1 group.save() class Migration(migrations.Migration): - dependencies = [ ('ipam', '0069_gfk_indexes'), ] @@ -32,7 +29,7 @@ class Migration(migrations.Migration): field=django.contrib.postgres.fields.ArrayField( base_field=django.contrib.postgres.fields.ranges.IntegerRangeField(), default=ipam.models.vlans.default_vid_ranges, - size=None + size=None, ), ), migrations.AddField( @@ -40,10 +37,7 @@ class Migration(migrations.Migration): name='_total_vlan_ids', field=models.PositiveBigIntegerField(default=4094), ), - migrations.RunPython( - code=set_vid_ranges, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_vid_ranges, reverse_code=migrations.RunPython.noop), migrations.RemoveField( model_name='vlangroup', name='max_vid', diff --git a/netbox/ipam/migrations/0071_prefix_scope.py b/netbox/ipam/migrations/0071_prefix_scope.py index d016bdb93..2ab54d023 100644 --- a/netbox/ipam/migrations/0071_prefix_scope.py +++ b/netbox/ipam/migrations/0071_prefix_scope.py @@ -11,13 +11,11 @@ def copy_site_assignments(apps, schema_editor): Site = apps.get_model('dcim', 'Site') Prefix.objects.filter(site__isnull=False).update( - scope_type=ContentType.objects.get_for_model(Site), - scope_id=models.F('site_id') + scope_type=ContentType.objects.get_for_model(Site), scope_id=models.F('site_id') ) class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('ipam', '0070_vlangroup_vlan_id_ranges'), @@ -39,13 +37,9 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', - to='contenttypes.contenttype' + to='contenttypes.contenttype', ), ), - # Copy over existing site assignments - migrations.RunPython( - code=copy_site_assignments, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=copy_site_assignments, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/ipam/migrations/0072_prefix_cached_relations.py b/netbox/ipam/migrations/0072_prefix_cached_relations.py index 4b438f7d5..e4a789704 100644 --- a/netbox/ipam/migrations/0072_prefix_cached_relations.py +++ b/netbox/ipam/migrations/0072_prefix_cached_relations.py @@ -19,7 +19,6 @@ def populate_denormalized_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('dcim', '0193_poweroutlet_color'), ('ipam', '0071_prefix_scope'), @@ -29,12 +28,16 @@ class Migration(migrations.Migration): migrations.AddField( model_name='prefix', name='_location', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.location' + ), ), migrations.AddField( model_name='prefix', name='_region', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.region'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.region' + ), ), migrations.AddField( model_name='prefix', @@ -44,15 +47,12 @@ class Migration(migrations.Migration): migrations.AddField( model_name='prefix', name='_site_group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.sitegroup'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='dcim.sitegroup' + ), ), - # Populate denormalized FK values - migrations.RunPython( - code=populate_denormalized_fields, - reverse_code=migrations.RunPython.noop - ), - + migrations.RunPython(code=populate_denormalized_fields, reverse_code=migrations.RunPython.noop), # Delete the site ForeignKey migrations.RemoveField( model_name='prefix', diff --git a/netbox/ipam/migrations/0073_charfield_null_choices.py b/netbox/ipam/migrations/0073_charfield_null_choices.py index 9293728f5..cfb764b46 100644 --- a/netbox/ipam/migrations/0073_charfield_null_choices.py +++ b/netbox/ipam/migrations/0073_charfield_null_choices.py @@ -13,7 +13,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('ipam', '0072_prefix_cached_relations'), ] @@ -29,8 +28,5 @@ class Migration(migrations.Migration): name='role', field=models.CharField(blank=True, max_length=50, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py index ca3943649..5a13f18e6 100644 --- a/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py +++ b/netbox/ipam/migrations/0074_vlantranslationpolicy_vlantranslationrule.py @@ -8,7 +8,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('extras', '0121_customfield_related_object_filter'), ('ipam', '0073_charfield_null_choices'), @@ -21,7 +20,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), @@ -39,24 +41,57 @@ class Migration(migrations.Migration): ('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)), - ('local_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), - ('remote_vid', models.PositiveSmallIntegerField(validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(4094)])), - ('policy', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='ipam.vlantranslationpolicy')), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), + ( + 'local_vid', + models.PositiveSmallIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4094), + ] + ), + ), + ( + 'remote_vid', + models.PositiveSmallIntegerField( + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(4094), + ] + ), + ), + ( + 'policy', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='rules', + to='ipam.vlantranslationpolicy', + ), + ), ('description', models.CharField(blank=True, max_length=200)), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ 'verbose_name': 'VLAN translation rule', - 'ordering': ('policy', 'local_vid',), + 'ordering': ( + 'policy', + 'local_vid', + ), }, ), migrations.AddConstraint( model_name='vlantranslationrule', - constraint=models.UniqueConstraint(fields=('policy', 'local_vid'), name='ipam_vlantranslationrule_unique_policy_local_vid'), + constraint=models.UniqueConstraint( + fields=('policy', 'local_vid'), name='ipam_vlantranslationrule_unique_policy_local_vid' + ), ), migrations.AddConstraint( model_name='vlantranslationrule', - constraint=models.UniqueConstraint(fields=('policy', 'remote_vid'), name='ipam_vlantranslationrule_unique_policy_remote_vid'), + constraint=models.UniqueConstraint( + fields=('policy', 'remote_vid'), name='ipam_vlantranslationrule_unique_policy_remote_vid' + ), ), ] diff --git a/netbox/ipam/migrations/0075_vlan_qinq.py b/netbox/ipam/migrations/0075_vlan_qinq.py index 8a3b8a39a..1e8f86c36 100644 --- a/netbox/ipam/migrations/0075_vlan_qinq.py +++ b/netbox/ipam/migrations/0075_vlan_qinq.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), ] @@ -17,7 +16,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vlan', name='qinq_svlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='qinq_cvlans', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='qinq_cvlans', + to='ipam.vlan', + ), ), migrations.AddConstraint( model_name='vlan', diff --git a/netbox/ipam/migrations/0076_natural_ordering.py b/netbox/ipam/migrations/0076_natural_ordering.py index 8c7bfaea1..f6c9e5ccb 100644 --- a/netbox/ipam/migrations/0076_natural_ordering.py +++ b/netbox/ipam/migrations/0076_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('ipam', '0075_vlan_qinq'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index dcecbcdea..e1a8d91e3 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -418,7 +418,9 @@ class Prefix(ContactsMixin, GetAvailablePrefixesMixin, CachedScopeMixin, Primary available_ips = prefix - child_ips - netaddr.IPSet(child_ranges) # IPv6 /127's, pool, or IPv4 /31-/32 sets are fully usable - if (self.family == 6 and self.prefix.prefixlen >= 127) or self.is_pool or (self.family == 4 and self.prefix.prefixlen >= 31): + if (self.family == 6 and self.prefix.prefixlen >= 127) or self.is_pool or ( + self.family == 4 and self.prefix.prefixlen >= 31 + ): return available_ips if self.family == 4: @@ -561,10 +563,26 @@ class IPRange(ContactsMixin, PrimaryModel): }) # Check for overlapping ranges - overlapping_ranges = IPRange.objects.exclude(pk=self.pk).filter(vrf=self.vrf).filter( - Q(start_address__host__inet__gte=self.start_address.ip, start_address__host__inet__lte=self.end_address.ip) | # Starts inside - Q(end_address__host__inet__gte=self.start_address.ip, end_address__host__inet__lte=self.end_address.ip) | # Ends inside - Q(start_address__host__inet__lte=self.start_address.ip, end_address__host__inet__gte=self.end_address.ip) # Starts & ends outside + overlapping_ranges = ( + IPRange.objects.exclude(pk=self.pk) + .filter(vrf=self.vrf) + .filter( + # Starts inside + Q( + start_address__host__inet__gte=self.start_address.ip, + start_address__host__inet__lte=self.end_address.ip, + ) | + # Ends inside + Q( + end_address__host__inet__gte=self.start_address.ip, + end_address__host__inet__lte=self.end_address.ip, + ) | + # Starts & ends outside + Q( + start_address__host__inet__lte=self.start_address.ip, + end_address__host__inet__gte=self.end_address.ip, + ) + ) ) if overlapping_ranges.exists(): raise ValidationError( @@ -866,10 +884,12 @@ class IPAddress(ContactsMixin, PrimaryModel): # can't use is_primary_ip as self.assigned_object might be changed is_primary = False - if self.family == 4 and hasattr(original_parent, 'primary_ip4') and original_parent.primary_ip4_id == self.pk: - is_primary = True - if self.family == 6 and hasattr(original_parent, 'primary_ip6') and original_parent.primary_ip6_id == self.pk: - is_primary = True + if self.family == 4 and hasattr(original_parent, 'primary_ip4'): + if original_parent.primary_ip4_id == self.pk: + is_primary = True + if self.family == 6 and hasattr(original_parent, 'primary_ip6'): + if original_parent.primary_ip6_id == self.pk: + is_primary = True if is_primary and (parent != original_parent): raise ValidationError( diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 399641422..dbbeb3454 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -6,6 +6,7 @@ from django_tables2.utils import Accessor from ipam.models import * from netbox.tables import NetBoxTable, columns from tenancy.tables import TenancyColumnsMixin, TenantColumn +from .template_code import * __all__ = ( 'AggregateTable', @@ -20,61 +21,6 @@ __all__ = ( AVAILABLE_LABEL = mark_safe('Available') -AGGREGATE_COPY_BUTTON = """ -{% copy_content record.pk prefix="aggregate_" %} -""" - -PREFIX_LINK = """ -{% if record.pk %} - {{ record.prefix }} -{% else %} - {{ record.prefix }} -{% endif %} -""" - -PREFIX_COPY_BUTTON = """ -{% copy_content record.pk prefix="prefix_" %} -""" - -PREFIX_LINK_WITH_DEPTH = """ -{% load helpers %} -{% if record.depth %} -
    - {% for i in record.depth|as_range %} - • - {% endfor %} -
    -{% endif %} -""" + PREFIX_LINK - -IPADDRESS_LINK = """ -{% if record.pk %} - {{ record.address }} -{% elif perms.ipam.add_ipaddress %} - {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available -{% else %} - {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available -{% endif %} -""" - -IPADDRESS_COPY_BUTTON = """ -{% copy_content record.pk prefix="ipaddress_" %} -""" - -IPADDRESS_ASSIGN_LINK = """ -{{ record }} -""" - -VRF_LINK = """ -{% if value %} - {{ record.vrf }} -{% elif object.vrf %} - {{ object.vrf }} -{% else %} - Global -{% endif %} -""" - # # RIRs diff --git a/netbox/ipam/tables/template_code.py b/netbox/ipam/tables/template_code.py new file mode 100644 index 000000000..fb969345e --- /dev/null +++ b/netbox/ipam/tables/template_code.py @@ -0,0 +1,88 @@ +AGGREGATE_COPY_BUTTON = """ +{% copy_content record.pk prefix="aggregate_" %} +""" + +PREFIX_LINK = """ +{% if record.pk %} + {{ record.prefix }} +{% else %} + {{ record.prefix }} +{% endif %} +""" + +PREFIX_COPY_BUTTON = """ +{% copy_content record.pk prefix="prefix_" %} +""" + +PREFIX_LINK_WITH_DEPTH = """ +{% load helpers %} +{% if record.depth %} +
    + {% for i in record.depth|as_range %} + • + {% endfor %} +
    +{% endif %} +""" + PREFIX_LINK + +IPADDRESS_LINK = """ +{% if record.pk %} + {{ record.address }} +{% elif perms.ipam.add_ipaddress %} + {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available +{% else %} + {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available +{% endif %} +""" + +IPADDRESS_COPY_BUTTON = """ +{% copy_content record.pk prefix="ipaddress_" %} +""" + +IPADDRESS_ASSIGN_LINK = """ +{{ record }} +""" + +VRF_LINK = """ +{% if value %} + {{ record.vrf }} +{% elif object.vrf %} + {{ object.vrf }} +{% else %} + Global +{% endif %} +""" + +VLAN_LINK = """ +{% if record.pk %} + {{ record.vid }} +{% elif perms.ipam.add_vlan %} + {{ record.available }} VLAN{{ record.available|pluralize }} available +{% else %} + {{ record.available }} VLAN{{ record.available|pluralize }} available +{% endif %} +""" + +VLAN_PREFIXES = """ +{% for prefix in value.all %} + {{ prefix }}{% if not forloop.last %}
    {% endif %} +{% endfor %} +""" + +VLANGROUP_BUTTONS = """ +{% with next_vid=record.get_next_available_vid %} + {% if next_vid and perms.ipam.add_vlan %} + + + + {% endif %} +{% endwith %} +""" + +VLAN_MEMBER_TAGGED = """ +{% if record.untagged_vlan_id == object.pk %} + +{% else %} + +{% endif %} +""" diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index d34ff5f45..e3d7c7e63 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -8,6 +8,7 @@ from ipam.models import * from netbox.tables import NetBoxTable, columns from tenancy.tables import TenancyColumnsMixin, TenantColumn from virtualization.models import VMInterface +from .template_code import * __all__ = ( 'InterfaceVLANTable', @@ -22,40 +23,6 @@ __all__ = ( AVAILABLE_LABEL = mark_safe('Available') -VLAN_LINK = """ -{% if record.pk %} - {{ record.vid }} -{% elif perms.ipam.add_vlan %} - {{ record.available }} VLAN{{ record.available|pluralize }} available -{% else %} - {{ record.available }} VLAN{{ record.available|pluralize }} available -{% endif %} -""" - -VLAN_PREFIXES = """ -{% for prefix in value.all %} - {{ prefix }}{% if not forloop.last %}
    {% endif %} -{% endfor %} -""" - -VLANGROUP_BUTTONS = """ -{% with next_vid=record.get_next_available_vid %} - {% if next_vid and perms.ipam.add_vlan %} - - - - {% endif %} -{% endwith %} -""" - -VLAN_MEMBER_TAGGED = """ -{% if record.untagged_vlan_id == object.pk %} - -{% else %} - -{% endif %} -""" - # # VLAN groups diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index 4e8456e5a..cbcb2e7c8 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -732,10 +732,19 @@ class FHRPGroupTest(APIViewTestCases.APIViewTestCase): @classmethod def setUpTestData(cls): - fhrp_groups = ( - FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP2, group_id=10, auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, auth_key='foobar123'), - FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP3, group_id=20, auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5, auth_key='foobar123'), + FHRPGroup( + protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP2, + group_id=10, + auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, + auth_key='foobar123', + ), + FHRPGroup( + protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP3, + group_id=20, + auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5, + auth_key='foobar123', + ), FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_HSRP, group_id=30), ) FHRPGroup.objects.bulk_create(fhrp_groups) diff --git a/netbox/ipam/tests/test_filtersets.py b/netbox/ipam/tests/test_filtersets.py index 28e8cda1e..5455beb9c 100644 --- a/netbox/ipam/tests/test_filtersets.py +++ b/netbox/ipam/tests/test_filtersets.py @@ -496,8 +496,12 @@ class AggregateTestCase(TestCase, ChangeLoggedFilterSetTests): Tenant.objects.bulk_create(tenants) aggregates = ( - Aggregate(prefix='10.1.0.0/16', rir=rirs[0], tenant=tenants[0], date_added='2020-01-01', description='foobar1'), - Aggregate(prefix='10.2.0.0/16', rir=rirs[0], tenant=tenants[1], date_added='2020-01-02', description='foobar2'), + Aggregate( + prefix='10.1.0.0/16', rir=rirs[0], tenant=tenants[0], date_added='2020-01-01', description='foobar1' + ), + Aggregate( + prefix='10.2.0.0/16', rir=rirs[0], tenant=tenants[1], date_added='2020-01-02', description='foobar2' + ), Aggregate(prefix='10.3.0.0/16', rir=rirs[1], tenant=tenants[2], date_added='2020-01-03'), Aggregate(prefix='2001:db8:1::/48', rir=rirs[1], tenant=tenants[0], date_added='2020-01-04'), Aggregate(prefix='2001:db8:2::/48', rir=rirs[2], tenant=tenants[1], date_added='2020-01-05'), @@ -656,14 +660,80 @@ class PrefixTestCase(TestCase, ChangeLoggedFilterSetTests): Tenant.objects.bulk_create(tenants) prefixes = ( - Prefix(prefix='10.0.0.0/24', tenant=None, scope=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True, description='foobar1'), - Prefix(prefix='10.0.1.0/24', tenant=tenants[0], scope=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0], description='foobar2'), - Prefix(prefix='10.0.2.0/24', tenant=tenants[1], scope=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), - Prefix(prefix='10.0.3.0/24', tenant=tenants[2], scope=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), - Prefix(prefix='2001:db8::/64', tenant=None, scope=None, vrf=None, vlan=None, role=None, is_pool=True, mark_utilized=True), - Prefix(prefix='2001:db8:0:1::/64', tenant=tenants[0], scope=sites[0], vrf=vrfs[0], vlan=vlans[0], role=roles[0]), - Prefix(prefix='2001:db8:0:2::/64', tenant=tenants[1], scope=sites[1], vrf=vrfs[1], vlan=vlans[1], role=roles[1], status=PrefixStatusChoices.STATUS_DEPRECATED), - Prefix(prefix='2001:db8:0:3::/64', tenant=tenants[2], scope=sites[2], vrf=vrfs[2], vlan=vlans[2], role=roles[2], status=PrefixStatusChoices.STATUS_RESERVED), + Prefix( + prefix='10.0.0.0/24', + tenant=None, + scope=None, + vrf=None, + vlan=None, + role=None, + is_pool=True, + mark_utilized=True, + description='foobar1', + ), + Prefix( + prefix='10.0.1.0/24', + tenant=tenants[0], + scope=sites[0], + vrf=vrfs[0], + vlan=vlans[0], + role=roles[0], + description='foobar2', + ), + Prefix( + prefix='10.0.2.0/24', + tenant=tenants[1], + scope=sites[1], + vrf=vrfs[1], + vlan=vlans[1], + role=roles[1], + status=PrefixStatusChoices.STATUS_DEPRECATED, + ), + Prefix( + prefix='10.0.3.0/24', + tenant=tenants[2], + scope=sites[2], + vrf=vrfs[2], + vlan=vlans[2], + role=roles[2], + status=PrefixStatusChoices.STATUS_RESERVED, + ), + Prefix( + prefix='2001:db8::/64', + tenant=None, + scope=None, + vrf=None, + vlan=None, + role=None, + is_pool=True, + mark_utilized=True, + ), + Prefix( + prefix='2001:db8:0:1::/64', + tenant=tenants[0], + scope=sites[0], + vrf=vrfs[0], + vlan=vlans[0], + role=roles[0] + ), + Prefix( + prefix='2001:db8:0:2::/64', + tenant=tenants[1], + scope=sites[1], + vrf=vrfs[1], + vlan=vlans[1], + role=roles[1], + status=PrefixStatusChoices.STATUS_DEPRECATED, + ), + Prefix( + prefix='2001:db8:0:3::/64', + tenant=tenants[2], + scope=sites[2], + vrf=vrfs[2], + vlan=vlans[2], + role=roles[2], + status=PrefixStatusChoices.STATUS_RESERVED, + ), Prefix(prefix='10.0.0.0/16'), Prefix(prefix='2001:db8::/32'), ) @@ -1365,7 +1435,10 @@ class FHRPGroupTestCase(TestCase, ChangeLoggedFilterSetTests): self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_auth_type(self): - params = {'auth_type': [FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5]} + params = {'auth_type': [ + FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, + FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5, + ]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) def test_auth_key(self): @@ -1653,9 +1726,15 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): device_type = DeviceType.objects.create(manufacturer=manufacturer, model='Device Type 1') role = DeviceRole.objects.create(name='Device Role 1', slug='device-role-1') devices = ( - Device(name='Device 1', site=sites[0], location=locations[0], rack=racks[0], device_type=device_type, role=role), - Device(name='Device 2', site=sites[1], location=locations[1], rack=racks[1], device_type=device_type, role=role), - Device(name='Device 3', site=sites[2], location=locations[2], rack=racks[2], device_type=device_type, role=role), + Device( + name='Device 1', site=sites[0], location=locations[0], rack=racks[0], device_type=device_type, role=role + ), + Device( + name='Device 2', site=sites[1], location=locations[1], rack=racks[1], device_type=device_type, role=role + ), + Device( + name='Device 3', site=sites[2], location=locations[2], rack=racks[2], device_type=device_type, role=role + ), ) Device.objects.bulk_create(devices) @@ -1773,20 +1852,64 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): VLAN(vid=19, name='Cluster 1', group=groups[18]), VLAN(vid=20, name='Cluster 2', group=groups[19]), VLAN(vid=21, name='Cluster 3', group=groups[20]), - - VLAN(vid=101, name='VLAN 101', site=sites[3], group=groups[21], role=roles[0], tenant=tenants[0], status=VLANStatusChoices.STATUS_ACTIVE), - VLAN(vid=102, name='VLAN 102', site=sites[3], group=groups[21], role=roles[0], tenant=tenants[0], status=VLANStatusChoices.STATUS_ACTIVE), - VLAN(vid=201, name='VLAN 201', site=sites[4], group=groups[22], role=roles[1], tenant=tenants[1], status=VLANStatusChoices.STATUS_DEPRECATED), - VLAN(vid=202, name='VLAN 202', site=sites[4], group=groups[22], role=roles[1], tenant=tenants[1], status=VLANStatusChoices.STATUS_DEPRECATED), - VLAN(vid=301, name='VLAN 301', site=sites[5], group=groups[23], role=roles[2], tenant=tenants[2], status=VLANStatusChoices.STATUS_RESERVED), - VLAN(vid=302, name='VLAN 302', site=sites[5], group=groups[23], role=roles[2], tenant=tenants[2], status=VLANStatusChoices.STATUS_RESERVED), - + VLAN( + vid=101, + name='VLAN 101', + site=sites[3], + group=groups[21], + role=roles[0], + tenant=tenants[0], + status=VLANStatusChoices.STATUS_ACTIVE, + ), + VLAN( + vid=102, + name='VLAN 102', + site=sites[3], + group=groups[21], + role=roles[0], + tenant=tenants[0], + status=VLANStatusChoices.STATUS_ACTIVE, + ), + VLAN( + vid=201, + name='VLAN 201', + site=sites[4], + group=groups[22], + role=roles[1], + tenant=tenants[1], + status=VLANStatusChoices.STATUS_DEPRECATED, + ), + VLAN( + vid=202, + name='VLAN 202', + site=sites[4], + group=groups[22], + role=roles[1], + tenant=tenants[1], + status=VLANStatusChoices.STATUS_DEPRECATED, + ), + VLAN( + vid=301, + name='VLAN 301', + site=sites[5], + group=groups[23], + role=roles[2], + tenant=tenants[2], + status=VLANStatusChoices.STATUS_RESERVED, + ), + VLAN( + vid=302, + name='VLAN 302', + site=sites[5], + group=groups[23], + role=roles[2], + tenant=tenants[2], + status=VLANStatusChoices.STATUS_RESERVED, + ), # Create one globally available VLAN on a VLAN group VLAN(vid=500, name='VLAN Group 1', group=groups[24]), - # Create one globally available VLAN VLAN(vid=1000, name='Global VLAN'), - # Create some Q-in-Q service VLANs VLAN(vid=2001, name='SVLAN 1', site=sites[6], qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), VLAN(vid=2002, name='SVLAN 2', site=sites[6], qinq_role=VLANQinQRoleChoices.ROLE_SERVICE), @@ -1795,11 +1918,31 @@ class VLANTestCase(TestCase, ChangeLoggedFilterSetTests): VLAN.objects.bulk_create(vlans) # Create Q-in-Q customer VLANs - VLAN.objects.bulk_create([ - VLAN(vid=3001, name='CVLAN 1', site=sites[6], qinq_svlan=vlans[29], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), - VLAN(vid=3002, name='CVLAN 2', site=sites[6], qinq_svlan=vlans[30], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), - VLAN(vid=3003, name='CVLAN 3', site=sites[6], qinq_svlan=vlans[31], qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER), - ]) + VLAN.objects.bulk_create( + [ + VLAN( + vid=3001, + name='CVLAN 1', + site=sites[6], + qinq_svlan=vlans[29], + qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER, + ), + VLAN( + vid=3002, + name='CVLAN 2', + site=sites[6], + qinq_svlan=vlans[30], + qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER, + ), + VLAN( + vid=3003, + name='CVLAN 3', + site=sites[6], + qinq_svlan=vlans[31], + qinq_role=VLANQinQRoleChoices.ROLE_CUSTOMER, + ), + ] + ) # Assign VLANs to device interfaces interfaces[0].untagged_vlan = vlans[0] @@ -2125,12 +2268,39 @@ class ServiceTestCase(TestCase, ChangeLoggedFilterSetTests): VirtualMachine.objects.bulk_create(virtual_machines) services = ( - Service(device=devices[0], name='Service 1', protocol=ServiceProtocolChoices.PROTOCOL_TCP, ports=[1001], description='foobar1'), - Service(device=devices[1], name='Service 2', protocol=ServiceProtocolChoices.PROTOCOL_TCP, ports=[1002], description='foobar2'), + Service( + device=devices[0], + name='Service 1', + protocol=ServiceProtocolChoices.PROTOCOL_TCP, + ports=[1001], + description='foobar1', + ), + Service( + device=devices[1], + name='Service 2', + protocol=ServiceProtocolChoices.PROTOCOL_TCP, + ports=[1002], + description='foobar2', + ), Service(device=devices[2], name='Service 3', protocol=ServiceProtocolChoices.PROTOCOL_UDP, ports=[1003]), - Service(virtual_machine=virtual_machines[0], name='Service 4', protocol=ServiceProtocolChoices.PROTOCOL_TCP, ports=[2001]), - Service(virtual_machine=virtual_machines[1], name='Service 5', protocol=ServiceProtocolChoices.PROTOCOL_TCP, ports=[2002]), - Service(virtual_machine=virtual_machines[2], name='Service 6', protocol=ServiceProtocolChoices.PROTOCOL_UDP, ports=[2003]), + Service( + virtual_machine=virtual_machines[0], + name='Service 4', + protocol=ServiceProtocolChoices.PROTOCOL_TCP, + ports=[2001], + ), + Service( + virtual_machine=virtual_machines[1], + name='Service 5', + protocol=ServiceProtocolChoices.PROTOCOL_TCP, + ports=[2002], + ), + Service( + virtual_machine=virtual_machines[2], + name='Service 6', + protocol=ServiceProtocolChoices.PROTOCOL_UDP, + ports=[2003], + ), ) Service.objects.bulk_create(services) services[0].ipaddresses.add(ip_addresses[0]) diff --git a/netbox/ipam/tests/test_models.py b/netbox/ipam/tests/test_models.py index 917b50f33..62eb74123 100644 --- a/netbox/ipam/tests/test_models.py +++ b/netbox/ipam/tests/test_models.py @@ -39,29 +39,50 @@ class TestAggregate(TestCase): class TestIPRange(TestCase): def test_overlapping_range(self): - iprange_192_168 = IPRange.objects.create(start_address=IPNetwork('192.168.0.1/22'), end_address=IPNetwork('192.168.0.49/22')) + iprange_192_168 = IPRange.objects.create( + start_address=IPNetwork('192.168.0.1/22'), end_address=IPNetwork('192.168.0.49/22') + ) iprange_192_168.clean() - iprange_3_1_99 = IPRange.objects.create(start_address=IPNetwork('1.2.3.1/24'), end_address=IPNetwork('1.2.3.99/24')) + iprange_3_1_99 = IPRange.objects.create( + start_address=IPNetwork('1.2.3.1/24'), end_address=IPNetwork('1.2.3.99/24') + ) iprange_3_1_99.clean() - iprange_3_100_199 = IPRange.objects.create(start_address=IPNetwork('1.2.3.100/24'), end_address=IPNetwork('1.2.3.199/24')) + iprange_3_100_199 = IPRange.objects.create( + start_address=IPNetwork('1.2.3.100/24'), end_address=IPNetwork('1.2.3.199/24') + ) iprange_3_100_199.clean() - iprange_3_200_255 = IPRange.objects.create(start_address=IPNetwork('1.2.3.200/24'), end_address=IPNetwork('1.2.3.255/24')) + iprange_3_200_255 = IPRange.objects.create( + start_address=IPNetwork('1.2.3.200/24'), end_address=IPNetwork('1.2.3.255/24') + ) iprange_3_200_255.clean() - iprange_4_1_99 = IPRange.objects.create(start_address=IPNetwork('1.2.4.1/24'), end_address=IPNetwork('1.2.4.99/24')) + iprange_4_1_99 = IPRange.objects.create( + start_address=IPNetwork('1.2.4.1/24'), end_address=IPNetwork('1.2.4.99/24') + ) iprange_4_1_99.clean() - iprange_4_200 = IPRange.objects.create(start_address=IPNetwork('1.2.4.200/24'), end_address=IPNetwork('1.2.4.255/24')) + iprange_4_200 = IPRange.objects.create( + start_address=IPNetwork('1.2.4.200/24'), end_address=IPNetwork('1.2.4.255/24') + ) iprange_4_200.clean() + # Overlapping range entirely within existing with self.assertRaises(ValidationError): - iprange_3_123_124 = IPRange.objects.create(start_address=IPNetwork('1.2.3.123/26'), end_address=IPNetwork('1.2.3.124/26')) + iprange_3_123_124 = IPRange.objects.create( + start_address=IPNetwork('1.2.3.123/26'), end_address=IPNetwork('1.2.3.124/26') + ) iprange_3_123_124.clean() + # Overlapping range starting within existing with self.assertRaises(ValidationError): - iprange_4_98_101 = IPRange.objects.create(start_address=IPNetwork('1.2.4.98/24'), end_address=IPNetwork('1.2.4.101/24')) + iprange_4_98_101 = IPRange.objects.create( + start_address=IPNetwork('1.2.4.98/24'), end_address=IPNetwork('1.2.4.101/24') + ) iprange_4_98_101.clean() + # Overlapping range ending within existing with self.assertRaises(ValidationError): - iprange_4_198_201 = IPRange.objects.create(start_address=IPNetwork('1.2.4.198/24'), end_address=IPNetwork('1.2.4.201/24')) + iprange_4_198_201 = IPRange.objects.create( + start_address=IPNetwork('1.2.4.198/24'), end_address=IPNetwork('1.2.4.201/24') + ) iprange_4_198_201.clean() @@ -105,13 +126,30 @@ class TestPrefix(TestCase): def test_get_child_ranges(self): prefix = Prefix(prefix='192.168.0.16/28') prefix.save() - ranges = IPRange.objects.bulk_create(( - IPRange(start_address=IPNetwork('192.168.0.1/24'), end_address=IPNetwork('192.168.0.10/24'), size=10), # No overlap - IPRange(start_address=IPNetwork('192.168.0.11/24'), end_address=IPNetwork('192.168.0.17/24'), size=7), # Partial overlap - IPRange(start_address=IPNetwork('192.168.0.18/24'), end_address=IPNetwork('192.168.0.23/24'), size=6), # Full overlap - IPRange(start_address=IPNetwork('192.168.0.24/24'), end_address=IPNetwork('192.168.0.30/24'), size=7), # Full overlap - IPRange(start_address=IPNetwork('192.168.0.31/24'), end_address=IPNetwork('192.168.0.40/24'), size=10), # Partial overlap - )) + ranges = IPRange.objects.bulk_create( + ( + # No overlap + IPRange( + start_address=IPNetwork('192.168.0.1/24'), end_address=IPNetwork('192.168.0.10/24'), size=10 + ), + # Partial overlap + IPRange( + start_address=IPNetwork('192.168.0.11/24'), end_address=IPNetwork('192.168.0.17/24'), size=7 + ), + # Full overlap + IPRange( + start_address=IPNetwork('192.168.0.18/24'), end_address=IPNetwork('192.168.0.23/24'), size=6 + ), + # Full overlap + IPRange( + start_address=IPNetwork('192.168.0.24/24'), end_address=IPNetwork('192.168.0.30/24'), size=7 + ), + # Partial overlap + IPRange( + start_address=IPNetwork('192.168.0.31/24'), end_address=IPNetwork('192.168.0.40/24'), size=10 + ), + ) + ) child_ranges = prefix.get_child_ranges() diff --git a/netbox/ipam/tests/test_ordering.py b/netbox/ipam/tests/test_ordering.py index fea6b55e2..2f7a5342d 100644 --- a/netbox/ipam/tests/test_ordering.py +++ b/netbox/ipam/tests/test_ordering.py @@ -92,8 +92,8 @@ class PrefixOrderingTestCase(OrderingTestBase): def test_prefix_complex_ordering(self): """ - This function tests a complex ordering of interwoven prefixes and vrfs. This is the current expected ordering of VRFs - This includes the testing of the Container status. + This function tests a complex ordering of interwoven prefixes and vrfs. This is the current expected ordering + of VRFs. This includes the testing of the Container status. The proper ordering, to get proper containerization should be: None:10.0.0.0/8 @@ -125,7 +125,6 @@ class PrefixOrderingTestCase(OrderingTestBase): class IPAddressOrderingTestCase(OrderingTestBase): - def test_address_vrf_ordering(self): """ This function tests ordering with the inclusion of vrfs @@ -147,24 +146,54 @@ class IPAddressOrderingTestCase(OrderingTestBase): IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf1, address=netaddr.IPNetwork('10.2.2.1/24')), IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf1, address=netaddr.IPNetwork('10.2.3.1/24')), IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf1, address=netaddr.IPNetwork('10.2.4.1/24')), - - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.0.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.1.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.2.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.3.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.4.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.0.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.1.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.2.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.3.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.4.1/24')), - - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.0.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.1.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.2.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.3.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.4.1/24')), - IPAddress(status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.5.1/24')), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.0.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.1.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.2.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.3.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.16.4.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.0.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.1.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.2.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.3.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=vrf2, address=netaddr.IPNetwork('172.17.4.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.0.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.1.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.2.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.3.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.4.1/24') + ), + IPAddress( + status=IPAddressStatusChoices.STATUS_ACTIVE, vrf=None, address=netaddr.IPNetwork('192.168.5.1/24') + ), ) IPAddress.objects.bulk_create(addresses) diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index c45777f08..d26a82414 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -707,11 +707,23 @@ class FHRPGroupTestCase(ViewTestCases.PrimaryObjectViewTestCase): @classmethod def setUpTestData(cls): - fhrp_groups = ( - FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP2, group_id=10, auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, auth_key='foobar123'), - FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP3, group_id=20, auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5, auth_key='foobar123'), - FHRPGroup(protocol=FHRPGroupProtocolChoices.PROTOCOL_HSRP, group_id=30), + FHRPGroup( + protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP2, + group_id=10, + auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_PLAINTEXT, + auth_key='foobar123', + ), + FHRPGroup( + protocol=FHRPGroupProtocolChoices.PROTOCOL_VRRP3, + group_id=20, + auth_type=FHRPGroupAuthTypeChoices.AUTHENTICATION_MD5, + auth_key='foobar123', + ), + FHRPGroup( + protocol=FHRPGroupProtocolChoices.PROTOCOL_HSRP, + group_id=30 + ), ) FHRPGroup.objects.bulk_create(fhrp_groups) diff --git a/netbox/netbox/filtersets.py b/netbox/netbox/filtersets.py index 657f2f71a..b8fbe7ad5 100644 --- a/netbox/netbox/filtersets.py +++ b/netbox/netbox/filtersets.py @@ -264,7 +264,9 @@ class ChangeLoggedModelFilterSet(BaseFilterSet): action = { 'created_by_request': Q(action=ObjectChangeActionChoices.ACTION_CREATE), 'updated_by_request': Q(action=ObjectChangeActionChoices.ACTION_UPDATE), - 'modified_by_request': Q(action__in=[ObjectChangeActionChoices.ACTION_CREATE, ObjectChangeActionChoices.ACTION_UPDATE]), + 'modified_by_request': Q( + action__in=[ObjectChangeActionChoices.ACTION_CREATE, ObjectChangeActionChoices.ACTION_UPDATE] + ), }.get(name) request_id = value pks = ObjectChange.objects.filter( diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index ee1420396..cf6e1f133 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -286,7 +286,8 @@ class ActionsColumn(tables.Column): if len(self.actions) == 1 or (self.split_actions and idx == 0): dropdown_class = attrs.css_class button = ( - f'' + f'' f'' ) @@ -303,7 +304,8 @@ class ActionsColumn(tables.Column): html += ( f'' f' {button}' - f' ' + f' ' f' ' f'
      {"".join(dropdown_links)}
    ' f'    ' diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 7158f056a..456dd67d2 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -995,7 +995,8 @@ class BulkComponentCreateView(GetReturnURLMixin, BaseMultiObjectView): form.add_error(field, '{}: {}'.format(obj, ', '.join(e))) # Enforce object-level permissions - if self.queryset.filter(pk__in=[obj.pk for obj in new_components]).count() != len(new_components): + component_ids = [obj.pk for obj in new_components] + if self.queryset.filter(pk__in=component_ids).count() != len(new_components): raise PermissionsViolation except IntegrityError: diff --git a/netbox/netbox/views/generic/feature_views.py b/netbox/netbox/views/generic/feature_views.py index 49862e83f..1e17d5354 100644 --- a/netbox/netbox/views/generic/feature_views.py +++ b/netbox/netbox/views/generic/feature_views.py @@ -143,7 +143,12 @@ class ObjectJobsView(ConditionalLoginRequiredMixin, View): """ Render a list of all Job assigned to an object. For example: - path('data-sources//jobs/', ObjectJobsView.as_view(), name='datasource_jobs', kwargs={'model': DataSource}), + path( + 'data-sources//jobs/', + ObjectJobsView.as_view(), + name='datasource_jobs', + kwargs={'model': DataSource} + ) Attributes: base_template: The name of the template to extend. If not provided, "{app}/{model}.html" will be used. diff --git a/netbox/tenancy/migrations/0001_squashed_0012.py b/netbox/tenancy/migrations/0001_squashed_0012.py index e8a028a92..8f3f74d9f 100644 --- a/netbox/tenancy/migrations/0001_squashed_0012.py +++ b/netbox/tenancy/migrations/0001_squashed_0012.py @@ -6,7 +6,6 @@ import taggit.managers class Migration(migrations.Migration): - initial = True dependencies = [ @@ -43,7 +42,16 @@ class Migration(migrations.Migration): ('rght', models.PositiveIntegerField(editable=False)), ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ('level', models.PositiveIntegerField(editable=False)), - ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='tenancy.tenantgroup')), + ( + 'parent', + mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='tenancy.tenantgroup', + ), + ), ], options={ 'ordering': ['name'], @@ -60,7 +68,16 @@ class Migration(migrations.Migration): ('slug', models.SlugField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tenants', to='tenancy.tenantgroup')), + ( + 'group', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='tenants', + to='tenancy.tenantgroup', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ diff --git a/netbox/tenancy/migrations/0002_squashed_0011.py b/netbox/tenancy/migrations/0002_squashed_0011.py index 8accd1da9..cfdcb58dd 100644 --- a/netbox/tenancy/migrations/0002_squashed_0011.py +++ b/netbox/tenancy/migrations/0002_squashed_0011.py @@ -7,7 +7,6 @@ import utilities.json class Migration(migrations.Migration): - replaces = [ ('tenancy', '0002_tenant_ordering'), ('tenancy', '0003_contacts'), @@ -18,7 +17,7 @@ class Migration(migrations.Migration): ('tenancy', '0008_unique_constraints'), ('tenancy', '0009_standardize_description_comments'), ('tenancy', '0010_tenant_relax_uniqueness'), - ('tenancy', '0011_contactassignment_tags') + ('tenancy', '0011_contactassignment_tags'), ] dependencies = [ @@ -37,7 +36,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), @@ -53,7 +55,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=100)), ('slug', models.SlugField(max_length=100)), @@ -62,7 +67,16 @@ class Migration(migrations.Migration): ('rght', models.PositiveIntegerField(editable=False)), ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ('level', models.PositiveIntegerField(editable=False)), - ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='tenancy.contactgroup')), + ( + 'parent', + mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='tenancy.contactgroup', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -75,7 +89,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=100)), ('title', models.CharField(blank=True, max_length=100)), @@ -83,7 +100,16 @@ class Migration(migrations.Migration): ('email', models.EmailField(blank=True, max_length=254)), ('address', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contacts', to='tenancy.contactgroup')), + ( + 'group', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='contacts', + to='tenancy.contactgroup', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ('link', models.URLField(blank=True)), ], @@ -125,9 +151,24 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('object_id', models.PositiveBigIntegerField()), ('priority', models.CharField(blank=True, max_length=50)), - ('contact', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='assignments', to='tenancy.contact')), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), - ('role', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='assignments', to='tenancy.contactrole')), + ( + 'contact', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='assignments', to='tenancy.contact' + ), + ), + ( + 'content_type', + models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype'), + ), + ( + 'role', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name='assignments', + to='tenancy.contactrole', + ), + ), ], options={ 'ordering': ('priority', 'contact'), @@ -140,11 +181,16 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='contactassignment', - constraint=models.UniqueConstraint(fields=('content_type', 'object_id', 'contact', 'role'), name='tenancy_contactassignment_unique_object_contact_role'), + constraint=models.UniqueConstraint( + fields=('content_type', 'object_id', 'contact', 'role'), + name='tenancy_contactassignment_unique_object_contact_role', + ), ), migrations.AddConstraint( model_name='contactgroup', - constraint=models.UniqueConstraint(fields=('parent', 'name'), name='tenancy_contactgroup_unique_parent_name'), + constraint=models.UniqueConstraint( + fields=('parent', 'name'), name='tenancy_contactgroup_unique_parent_name' + ), ), migrations.AddField( model_name='contact', @@ -163,19 +209,31 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='tenant', - constraint=models.UniqueConstraint(fields=('group', 'name'), name='tenancy_tenant_unique_group_name', violation_error_message='Tenant name must be unique per group.'), + constraint=models.UniqueConstraint( + fields=('group', 'name'), + name='tenancy_tenant_unique_group_name', + violation_error_message='Tenant name must be unique per group.', + ), ), migrations.AddConstraint( model_name='tenant', - constraint=models.UniqueConstraint(condition=models.Q(('group__isnull', True)), fields=('name',), name='tenancy_tenant_unique_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('group__isnull', True)), fields=('name',), name='tenancy_tenant_unique_name' + ), ), migrations.AddConstraint( model_name='tenant', - constraint=models.UniqueConstraint(fields=('group', 'slug'), name='tenancy_tenant_unique_group_slug', violation_error_message='Tenant slug must be unique per group.'), + constraint=models.UniqueConstraint( + fields=('group', 'slug'), + name='tenancy_tenant_unique_group_slug', + violation_error_message='Tenant slug must be unique per group.', + ), ), migrations.AddConstraint( model_name='tenant', - constraint=models.UniqueConstraint(condition=models.Q(('group__isnull', True)), fields=('slug',), name='tenancy_tenant_unique_slug'), + constraint=models.UniqueConstraint( + condition=models.Q(('group__isnull', True)), fields=('slug',), name='tenancy_tenant_unique_slug' + ), ), migrations.AddField( model_name='contactassignment', diff --git a/netbox/tenancy/migrations/0012_contactassignment_custom_fields.py b/netbox/tenancy/migrations/0012_contactassignment_custom_fields.py index ee6726822..7f681fd91 100644 --- a/netbox/tenancy/migrations/0012_contactassignment_custom_fields.py +++ b/netbox/tenancy/migrations/0012_contactassignment_custom_fields.py @@ -5,7 +5,6 @@ import utilities.json class Migration(migrations.Migration): - dependencies = [ ('tenancy', '0011_contactassignment_tags'), ] diff --git a/netbox/tenancy/migrations/0013_gfk_indexes.py b/netbox/tenancy/migrations/0013_gfk_indexes.py index dd23cefbb..9d58c8932 100644 --- a/netbox/tenancy/migrations/0013_gfk_indexes.py +++ b/netbox/tenancy/migrations/0013_gfk_indexes.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('tenancy', '0012_contactassignment_custom_fields'), ] diff --git a/netbox/tenancy/migrations/0014_contactassignment_ordering.py b/netbox/tenancy/migrations/0014_contactassignment_ordering.py index 66f08aa2a..5e2c39311 100644 --- a/netbox/tenancy/migrations/0014_contactassignment_ordering.py +++ b/netbox/tenancy/migrations/0014_contactassignment_ordering.py @@ -4,7 +4,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('tenancy', '0013_gfk_indexes'), ] diff --git a/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py b/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py index 58b14e10f..f2c1ce190 100644 --- a/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py +++ b/netbox/tenancy/migrations/0015_contactassignment_rename_content_type.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('extras', '0111_rename_content_types'), @@ -25,16 +24,13 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='contactassignment', - index=models.Index( - fields=['object_type', 'object_id'], - name='tenancy_con_object__6f20f7_idx' - ), + index=models.Index(fields=['object_type', 'object_id'], name='tenancy_con_object__6f20f7_idx'), ), migrations.AddConstraint( model_name='contactassignment', constraint=models.UniqueConstraint( fields=('object_type', 'object_id', 'contact', 'role'), - name='tenancy_contactassignment_unique_object_contact_role' + name='tenancy_contactassignment_unique_object_contact_role', ), ), ] diff --git a/netbox/tenancy/migrations/0016_charfield_null_choices.py b/netbox/tenancy/migrations/0016_charfield_null_choices.py index 815a1bdf2..9f5016a13 100644 --- a/netbox/tenancy/migrations/0016_charfield_null_choices.py +++ b/netbox/tenancy/migrations/0016_charfield_null_choices.py @@ -11,7 +11,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('tenancy', '0015_contactassignment_rename_content_type'), ] @@ -22,8 +21,5 @@ class Migration(migrations.Migration): name='priority', field=models.CharField(blank=True, max_length=50, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/tenancy/migrations/0017_natural_ordering.py b/netbox/tenancy/migrations/0017_natural_ordering.py index de1fb49aa..beb98d634 100644 --- a/netbox/tenancy/migrations/0017_natural_ordering.py +++ b/netbox/tenancy/migrations/0017_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('tenancy', '0016_charfield_null_choices'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py index ec73cac4a..005bcf737 100644 --- a/netbox/tenancy/tables/columns.py +++ b/netbox/tenancy/tables/columns.py @@ -2,6 +2,7 @@ from django.utils.translation import gettext_lazy as _ import django_tables2 as tables from netbox.tables import columns +from .template_code import * __all__ = ( 'ContactsColumnMixin', @@ -15,15 +16,7 @@ class TenantColumn(tables.TemplateColumn): """ Include the tenant description. """ - template_code = """ - {% if record.tenant %} - {{ record.tenant }} - {% elif record.vrf.tenant %} - {{ record.vrf.tenant }}* - {% else %} - — - {% endif %} - """ + template_code = TENANT_COLUMN def __init__(self, *args, **kwargs): super().__init__(template_code=self.template_code, *args, **kwargs) @@ -36,15 +29,7 @@ class TenantGroupColumn(tables.TemplateColumn): """ Include the tenant group description. """ - template_code = """ - {% if record.tenant and record.tenant.group %} - {{ record.tenant.group }} - {% elif record.vrf.tenant and record.vrf.tenant.group %} - {{ record.vrf.tenant.group }}* - {% else %} - — - {% endif %} - """ + template_code = TENANT_GROUP_COLUMN def __init__(self, accessor=tables.A('tenant__group'), *args, **kwargs): if 'verbose_name' not in kwargs: diff --git a/netbox/tenancy/tables/template_code.py b/netbox/tenancy/tables/template_code.py new file mode 100644 index 000000000..1d15a8708 --- /dev/null +++ b/netbox/tenancy/tables/template_code.py @@ -0,0 +1,19 @@ +TENANT_COLUMN = """ +{% if record.tenant %} + {{ record.tenant }} +{% elif record.vrf.tenant %} + {{ record.vrf.tenant }}* +{% else %} + — +{% endif %} +""" + +TENANT_GROUP_COLUMN = """ +{% if record.tenant and record.tenant.group %} + {{ record.tenant.group }} +{% elif record.vrf.tenant and record.vrf.tenant.group %} + {{ record.vrf.tenant.group }}* +{% else %} + — +{% endif %} +""" diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py index 5a6fe0453..c32ad3826 100644 --- a/netbox/tenancy/tests/test_api.py +++ b/netbox/tenancy/tests/test_api.py @@ -239,9 +239,24 @@ class ContactAssignmentTest(APIViewTestCases.APIViewTestCase): ContactRole.objects.bulk_create(contact_roles) contact_assignments = ( - ContactAssignment(object=sites[0], contact=contacts[0], role=contact_roles[0], priority=ContactPriorityChoices.PRIORITY_PRIMARY), - ContactAssignment(object=sites[0], contact=contacts[1], role=contact_roles[1], priority=ContactPriorityChoices.PRIORITY_SECONDARY), - ContactAssignment(object=sites[0], contact=contacts[2], role=contact_roles[2], priority=ContactPriorityChoices.PRIORITY_TERTIARY), + ContactAssignment( + object=sites[0], + contact=contacts[0], + role=contact_roles[0], + priority=ContactPriorityChoices.PRIORITY_PRIMARY, + ), + ContactAssignment( + object=sites[0], + contact=contacts[1], + role=contact_roles[1], + priority=ContactPriorityChoices.PRIORITY_SECONDARY, + ), + ContactAssignment( + object=sites[0], + contact=contacts[2], + role=contact_roles[2], + priority=ContactPriorityChoices.PRIORITY_TERTIARY, + ), ) ContactAssignment.objects.bulk_create(contact_assignments) diff --git a/netbox/users/migrations/0001_squashed_0011.py b/netbox/users/migrations/0001_squashed_0011.py index cad84201c..263604d34 100644 --- a/netbox/users/migrations/0001_squashed_0011.py +++ b/netbox/users/migrations/0001_squashed_0011.py @@ -8,7 +8,6 @@ import users.models class Migration(migrations.Migration): - initial = True dependencies = [ @@ -39,15 +38,33 @@ class Migration(migrations.Migration): ('password', models.CharField(max_length=128)), ('last_login', models.DateTimeField(blank=True, null=True)), ('is_superuser', models.BooleanField(default=False)), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()])), + ( + 'username', + models.CharField( + error_messages={'unique': 'A user with that username already exists.'}, + max_length=150, + unique=True, + validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], + ), + ), ('first_name', models.CharField(blank=True, max_length=150)), ('last_name', models.CharField(blank=True, max_length=150)), ('email', models.EmailField(blank=True, max_length=254)), ('is_staff', models.BooleanField(default=False)), ('is_active', models.BooleanField(default=True)), ('date_joined', models.DateTimeField(default=django.utils.timezone.now)), - ('groups', models.ManyToManyField(blank=True, related_name='user_set', related_query_name='user', to='auth.group')), - ('user_permissions', models.ManyToManyField(blank=True, related_name='user_set', related_query_name='user', to='auth.permission')), + ( + 'groups', + models.ManyToManyField( + blank=True, related_name='user_set', related_query_name='user', to='auth.group' + ), + ), + ( + 'user_permissions', + models.ManyToManyField( + blank=True, related_name='user_set', related_query_name='user', to='auth.permission' + ), + ), ], options={ 'verbose_name': 'user', @@ -64,7 +81,12 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False)), ('data', models.JSONField(default=dict)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='config', to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, related_name='config', to=settings.AUTH_USER_MODEL + ), + ), ], options={ 'verbose_name': 'User Preferences', @@ -78,10 +100,20 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(primary_key=True, serialize=False)), ('created', models.DateTimeField(auto_now_add=True)), ('expires', models.DateTimeField(blank=True, null=True)), - ('key', models.CharField(max_length=40, unique=True, validators=[django.core.validators.MinLengthValidator(40)])), + ( + 'key', + models.CharField( + max_length=40, unique=True, validators=[django.core.validators.MinLengthValidator(40)] + ), + ), ('write_enabled', models.BooleanField(default=True)), ('description', models.CharField(blank=True, max_length=200)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tokens', to=settings.AUTH_USER_MODEL)), + ( + 'user', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='tokens', to=settings.AUTH_USER_MODEL + ), + ), ], ), migrations.CreateModel( @@ -91,11 +123,37 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ('description', models.CharField(blank=True, max_length=200)), ('enabled', models.BooleanField(default=True)), - ('actions', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None)), + ( + 'actions', + django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=30), size=None), + ), ('constraints', models.JSONField(blank=True, null=True)), ('groups', models.ManyToManyField(blank=True, related_name='object_permissions', to='auth.Group')), - ('object_types', models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='contenttypes.ContentType')), - ('users', models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL)), + ( + 'object_types', + models.ManyToManyField( + limit_choices_to=models.Q( + models.Q( + models.Q( + ( + 'app_label__in', + ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users'], + ), + _negated=True, + ), + models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), + models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), + _connector='OR', + ) + ), + related_name='object_permissions', + to='contenttypes.ContentType', + ), + ), + ( + 'users', + models.ManyToManyField(blank=True, related_name='object_permissions', to=settings.AUTH_USER_MODEL), + ), ], options={ 'verbose_name': 'permission', diff --git a/netbox/users/migrations/0002_squashed_0004.py b/netbox/users/migrations/0002_squashed_0004.py index 078721c48..275d7a7a9 100644 --- a/netbox/users/migrations/0002_squashed_0004.py +++ b/netbox/users/migrations/0002_squashed_0004.py @@ -5,11 +5,10 @@ import ipam.fields class Migration(migrations.Migration): - replaces = [ ('users', '0002_standardize_id_fields'), ('users', '0003_token_allowed_ips_last_used'), - ('users', '0004_netboxgroup_netboxuser') + ('users', '0004_netboxgroup_netboxuser'), ] dependencies = [ @@ -36,7 +35,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='token', name='allowed_ips', - field=django.contrib.postgres.fields.ArrayField(base_field=ipam.fields.IPNetworkField(), blank=True, null=True, size=None), + field=django.contrib.postgres.fields.ArrayField( + base_field=ipam.fields.IPNetworkField(), blank=True, null=True, size=None + ), ), migrations.AddField( model_name='token', @@ -45,8 +46,7 @@ class Migration(migrations.Migration): ), migrations.CreateModel( name='NetBoxGroup', - fields=[ - ], + fields=[], options={ 'verbose_name': 'Group', 'proxy': True, diff --git a/netbox/users/migrations/0005_alter_user_table.py b/netbox/users/migrations/0005_alter_user_table.py index 1163da0ae..2e9f699b3 100644 --- a/netbox/users/migrations/0005_alter_user_table.py +++ b/netbox/users/migrations/0005_alter_user_table.py @@ -19,7 +19,6 @@ def update_content_types(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('users', '0002_squashed_0004'), ('extras', '0113_customfield_rename_object_type'), @@ -33,24 +32,17 @@ class Migration(migrations.Migration): name='user', table=None, ), - # Convert the `id` column to a 64-bit integer (BigAutoField is implied by DEFAULT_AUTO_FIELD) - migrations.RunSQL("ALTER TABLE users_user ALTER COLUMN id TYPE bigint"), - + migrations.RunSQL('ALTER TABLE users_user ALTER COLUMN id TYPE bigint'), # Rename auth_user_* sequences - migrations.RunSQL("ALTER TABLE auth_user_groups_id_seq RENAME TO users_user_groups_id_seq"), - migrations.RunSQL("ALTER TABLE auth_user_id_seq RENAME TO users_user_id_seq"), - migrations.RunSQL("ALTER TABLE auth_user_user_permissions_id_seq RENAME TO users_user_user_permissions_id_seq"), - + migrations.RunSQL('ALTER TABLE auth_user_groups_id_seq RENAME TO users_user_groups_id_seq'), + migrations.RunSQL('ALTER TABLE auth_user_id_seq RENAME TO users_user_id_seq'), + migrations.RunSQL('ALTER TABLE auth_user_user_permissions_id_seq RENAME TO users_user_user_permissions_id_seq'), # Rename auth_user_* indexes - migrations.RunSQL("ALTER INDEX auth_user_pkey RENAME TO users_user_pkey"), + migrations.RunSQL('ALTER INDEX auth_user_pkey RENAME TO users_user_pkey'), # Hash is deterministic; generated via schema_editor._create_index_name() - migrations.RunSQL("ALTER INDEX auth_user_username_6821ab7c_like RENAME TO users_user_username_06e46fe6_like"), - migrations.RunSQL("ALTER INDEX auth_user_username_key RENAME TO users_user_username_key"), - + migrations.RunSQL('ALTER INDEX auth_user_username_6821ab7c_like RENAME TO users_user_username_06e46fe6_like'), + migrations.RunSQL('ALTER INDEX auth_user_username_key RENAME TO users_user_username_key'), # Update ContentTypes - migrations.RunPython( - code=update_content_types, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_content_types, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/users/migrations/0006_custom_group_model.py b/netbox/users/migrations/0006_custom_group_model.py index f958d242a..f70c1d58d 100644 --- a/netbox/users/migrations/0006_custom_group_model.py +++ b/netbox/users/migrations/0006_custom_group_model.py @@ -16,7 +16,6 @@ def update_custom_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('users', '0005_alter_user_table'), ] @@ -29,7 +28,12 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=150, unique=True)), ('description', models.CharField(blank=True, max_length=200)), - ('permissions', models.ManyToManyField(blank=True, related_name='groups', related_query_name='group', to='auth.permission')), + ( + 'permissions', + models.ManyToManyField( + blank=True, related_name='groups', related_query_name='group', to='auth.permission' + ), + ), ], options={ 'ordering': ('name',), @@ -40,17 +44,10 @@ class Migration(migrations.Migration): ('objects', users.models.GroupManager()), ], ), - # Copy existing groups from the old table into the new one - migrations.RunSQL( - "INSERT INTO users_group (SELECT id, name, '' AS description FROM auth_group)" - ), - + migrations.RunSQL("INSERT INTO users_group (SELECT id, name, '' AS description FROM auth_group)"), # Update the sequence for group ID values - migrations.RunSQL( - "SELECT setval('users_group_id_seq', (SELECT MAX(id) FROM users_group))" - ), - + migrations.RunSQL("SELECT setval('users_group_id_seq', (SELECT MAX(id) FROM users_group))"), # Update the "groups" M2M fields on User & ObjectPermission migrations.AlterField( model_name='user', @@ -62,23 +59,12 @@ class Migration(migrations.Migration): name='groups', field=models.ManyToManyField(blank=True, related_name='object_permissions', to='users.group'), ), - # Delete any lingering group assignments for legacy permissions (from before NetBox v2.9) - migrations.RunSQL( - "DELETE from auth_group_permissions" - ), - + migrations.RunSQL('DELETE from auth_group_permissions'), # Delete groups from the old table - migrations.RunSQL( - "DELETE from auth_group" - ), - + migrations.RunSQL('DELETE from auth_group'), # Update custom fields - migrations.RunPython( - code=update_custom_fields, - reverse_code=migrations.RunPython.noop - ), - + migrations.RunPython(code=update_custom_fields, reverse_code=migrations.RunPython.noop), # Delete the proxy model migrations.DeleteModel( name='NetBoxGroup', diff --git a/netbox/users/migrations/0007_objectpermission_update_object_types.py b/netbox/users/migrations/0007_objectpermission_update_object_types.py index d3018a602..598b00b92 100644 --- a/netbox/users/migrations/0007_objectpermission_update_object_types.py +++ b/netbox/users/migrations/0007_objectpermission_update_object_types.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('core', '0010_gfk_indexes'), ('users', '0006_custom_group_model'), @@ -14,6 +13,23 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='objectpermission', name='object_types', - field=models.ManyToManyField(limit_choices_to=models.Q(models.Q(models.Q(('app_label__in', ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']), _negated=True), models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), _connector='OR')), related_name='object_permissions', to='core.objecttype'), + field=models.ManyToManyField( + limit_choices_to=models.Q( + models.Q( + models.Q( + ( + 'app_label__in', + ['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users'], + ), + _negated=True, + ), + models.Q(('app_label', 'auth'), ('model__in', ['group', 'user'])), + models.Q(('app_label', 'users'), ('model__in', ['objectpermission', 'token'])), + _connector='OR', + ) + ), + related_name='object_permissions', + to='core.objecttype', + ), ), ] diff --git a/netbox/users/migrations/0008_flip_objectpermission_assignments.py b/netbox/users/migrations/0008_flip_objectpermission_assignments.py index c61c8b124..11dea5819 100644 --- a/netbox/users/migrations/0008_flip_objectpermission_assignments.py +++ b/netbox/users/migrations/0008_flip_objectpermission_assignments.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('users', '0007_objectpermission_update_object_types'), ] @@ -24,52 +23,47 @@ class Migration(migrations.Migration): database_operations=[ # Rename table migrations.RunSQL( - "ALTER TABLE users_objectpermission_groups" - " RENAME TO users_group_object_permissions" + 'ALTER TABLE users_objectpermission_groups' ' RENAME TO users_group_object_permissions' ), migrations.RunSQL( - "ALTER TABLE users_objectpermission_groups_id_seq" - " RENAME TO users_group_object_permissions_id_seq" + 'ALTER TABLE users_objectpermission_groups_id_seq' + ' RENAME TO users_group_object_permissions_id_seq' ), - # Rename constraints migrations.RunSQL( - "ALTER TABLE users_group_object_permissions RENAME CONSTRAINT " - "users_objectpermissi_group_id_fb7ba6e0_fk_users_gro TO " - "users_group_object_p_group_id_90dd183a_fk_users_gro" + 'ALTER TABLE users_group_object_permissions RENAME CONSTRAINT ' + 'users_objectpermissi_group_id_fb7ba6e0_fk_users_gro TO ' + 'users_group_object_p_group_id_90dd183a_fk_users_gro' ), # Fix for #15698: Drop & recreate constraint which may not exist migrations.RunSQL( - "ALTER TABLE users_group_object_permissions DROP CONSTRAINT IF EXISTS " - "users_objectpermissi_objectpermission_id_2f7cc117_fk_users_obj" + 'ALTER TABLE users_group_object_permissions DROP CONSTRAINT IF EXISTS ' + 'users_objectpermissi_objectpermission_id_2f7cc117_fk_users_obj' ), migrations.RunSQL( - "ALTER TABLE users_group_object_permissions ADD CONSTRAINT " - "users_group_object_p_objectpermission_id_dd489dc4_fk_users_obj " - "FOREIGN KEY (objectpermission_id) REFERENCES users_objectpermission(id) " - "DEFERRABLE INITIALLY DEFERRED" + 'ALTER TABLE users_group_object_permissions ADD CONSTRAINT ' + 'users_group_object_p_objectpermission_id_dd489dc4_fk_users_obj ' + 'FOREIGN KEY (objectpermission_id) REFERENCES users_objectpermission(id) ' + 'DEFERRABLE INITIALLY DEFERRED' ), - # Rename indexes migrations.RunSQL( - "ALTER INDEX users_objectpermission_groups_pkey " - " RENAME TO users_group_object_permissions_pkey" + 'ALTER INDEX users_objectpermission_groups_pkey ' ' RENAME TO users_group_object_permissions_pkey' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_g_objectpermission_id_grou_3b62a39c_uniq " - " RENAME TO users_group_object_permi_group_id_objectpermissio_db1f8cbe_uniq" + 'ALTER INDEX users_objectpermission_g_objectpermission_id_grou_3b62a39c_uniq ' + ' RENAME TO users_group_object_permi_group_id_objectpermissio_db1f8cbe_uniq' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_groups_group_id_fb7ba6e0" - " RENAME TO users_group_object_permissions_group_id_90dd183a" + 'ALTER INDEX users_objectpermission_groups_group_id_fb7ba6e0' + ' RENAME TO users_group_object_permissions_group_id_90dd183a' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_groups_objectpermission_id_2f7cc117" - " RENAME TO users_group_object_permissions_objectpermission_id_dd489dc4" + 'ALTER INDEX users_objectpermission_groups_objectpermission_id_2f7cc117' + ' RENAME TO users_group_object_permissions_objectpermission_id_dd489dc4' ), - ] + ], ), - # Flip M2M assignments for ObjectPermission to Users migrations.SeparateDatabaseAndState( state_operations=[ @@ -86,49 +80,44 @@ class Migration(migrations.Migration): database_operations=[ # Rename table migrations.RunSQL( - "ALTER TABLE users_objectpermission_users" - " RENAME TO users_user_object_permissions" + 'ALTER TABLE users_objectpermission_users' ' RENAME TO users_user_object_permissions' ), migrations.RunSQL( - "ALTER TABLE users_objectpermission_users_id_seq" - " RENAME TO users_user_object_permissions_id_seq" + 'ALTER TABLE users_objectpermission_users_id_seq' ' RENAME TO users_user_object_permissions_id_seq' ), - # Rename constraints migrations.RunSQL( - "ALTER TABLE users_user_object_permissions RENAME CONSTRAINT " - "users_objectpermission_users_user_id_16c0905d_fk_auth_user_id TO " - "users_user_object_permissions_user_id_9d647aac_fk_users_user_id" + 'ALTER TABLE users_user_object_permissions RENAME CONSTRAINT ' + 'users_objectpermission_users_user_id_16c0905d_fk_auth_user_id TO ' + 'users_user_object_permissions_user_id_9d647aac_fk_users_user_id' ), # Fix for #15698: Drop & recreate constraint which may not exist migrations.RunSQL( - "ALTER TABLE users_user_object_permissions DROP CONSTRAINT IF EXISTS " - "users_objectpermissi_objectpermission_id_78a9c2e6_fk_users_obj" + 'ALTER TABLE users_user_object_permissions DROP CONSTRAINT IF EXISTS ' + 'users_objectpermissi_objectpermission_id_78a9c2e6_fk_users_obj' ), migrations.RunSQL( - "ALTER TABLE users_user_object_permissions ADD CONSTRAINT " - "users_user_object_pe_objectpermission_id_29b431b4_fk_users_obj " - "FOREIGN KEY (objectpermission_id) REFERENCES users_objectpermission(id) " - "DEFERRABLE INITIALLY DEFERRED" + 'ALTER TABLE users_user_object_permissions ADD CONSTRAINT ' + 'users_user_object_pe_objectpermission_id_29b431b4_fk_users_obj ' + 'FOREIGN KEY (objectpermission_id) REFERENCES users_objectpermission(id) ' + 'DEFERRABLE INITIALLY DEFERRED' ), - # Rename indexes migrations.RunSQL( - "ALTER INDEX users_objectpermission_users_pkey " - " RENAME TO users_user_object_permissions_pkey" + 'ALTER INDEX users_objectpermission_users_pkey ' ' RENAME TO users_user_object_permissions_pkey' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_u_objectpermission_id_user_3a7db108_uniq " - " RENAME TO users_user_object_permis_user_id_objectpermission_0a98550e_uniq" + 'ALTER INDEX users_objectpermission_u_objectpermission_id_user_3a7db108_uniq ' + ' RENAME TO users_user_object_permis_user_id_objectpermission_0a98550e_uniq' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_users_user_id_16c0905d" - " RENAME TO users_user_object_permissions_user_id_9d647aac" + 'ALTER INDEX users_objectpermission_users_user_id_16c0905d' + ' RENAME TO users_user_object_permissions_user_id_9d647aac' ), migrations.RunSQL( - "ALTER INDEX users_objectpermission_users_objectpermission_id_78a9c2e6" - " RENAME TO users_user_object_permissions_objectpermission_id_29b431b4" + 'ALTER INDEX users_objectpermission_users_objectpermission_id_78a9c2e6' + ' RENAME TO users_user_object_permissions_objectpermission_id_29b431b4' ), - ] + ], ), ] diff --git a/netbox/users/migrations/0009_update_group_perms.py b/netbox/users/migrations/0009_update_group_perms.py index f3b197492..7698fd1e7 100644 --- a/netbox/users/migrations/0009_update_group_perms.py +++ b/netbox/users/migrations/0009_update_group_perms.py @@ -18,17 +18,13 @@ def update_content_types(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('users', '0008_flip_objectpermission_assignments'), ] operations = [ # Update ContentTypes - migrations.RunPython( - code=update_content_types, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=update_content_types, reverse_code=migrations.RunPython.noop), migrations.AlterField( model_name='objectpermission', name='object_types', diff --git a/netbox/users/tests/test_filtersets.py b/netbox/users/tests/test_filtersets.py index fdf25d970..8b683b346 100644 --- a/netbox/users/tests/test_filtersets.py +++ b/netbox/users/tests/test_filtersets.py @@ -286,9 +286,15 @@ class TokenTestCase(TestCase, BaseFilterSetTests): future_date = make_aware(datetime.datetime(3000, 1, 1)) past_date = make_aware(datetime.datetime(2000, 1, 1)) tokens = ( - Token(user=users[0], key=Token.generate_key(), expires=future_date, write_enabled=True, description='foobar1'), - Token(user=users[1], key=Token.generate_key(), expires=future_date, write_enabled=True, description='foobar2'), - Token(user=users[2], key=Token.generate_key(), expires=past_date, write_enabled=False), + Token( + user=users[0], key=Token.generate_key(), expires=future_date, write_enabled=True, description='foobar1' + ), + Token( + user=users[1], key=Token.generate_key(), expires=future_date, write_enabled=True, description='foobar2' + ), + Token( + user=users[2], key=Token.generate_key(), expires=past_date, write_enabled=False + ), ) Token.objects.bulk_create(tokens) diff --git a/netbox/users/tests/test_views.py b/netbox/users/tests/test_views.py index 8386364dd..8226a8be9 100644 --- a/netbox/users/tests/test_views.py +++ b/netbox/users/tests/test_views.py @@ -23,11 +23,16 @@ class UserTestCase( @classmethod def setUpTestData(cls): - users = ( - User(username='username1', first_name='first1', last_name='last1', email='user1@foo.com', password='pass1xxx'), - User(username='username2', first_name='first2', last_name='last2', email='user2@foo.com', password='pass2xxx'), - User(username='username3', first_name='first3', last_name='last3', email='user3@foo.com', password='pass3xxx'), + User( + username='username1', first_name='first1', last_name='last1', email='user1@foo.com', password='pass1xxx' + ), + User( + username='username2', first_name='first2', last_name='last2', email='user2@foo.com', password='pass2xxx' + ), + User( + username='username3', first_name='first3', last_name='last3', email='user3@foo.com', password='pass3xxx' + ), ) User.objects.bulk_create(users) diff --git a/netbox/utilities/socks.py b/netbox/utilities/socks.py index bb0b6b250..6b62e8fc7 100644 --- a/netbox/utilities/socks.py +++ b/netbox/utilities/socks.py @@ -26,7 +26,10 @@ class ProxyHTTPConnection(HTTPConnection): try: from python_socks.sync import Proxy except ModuleNotFoundError as e: - logger.info("Configuring an HTTP proxy using SOCKS requires the python_socks library. Check that it has been installed.") + logger.info( + "Configuring an HTTP proxy using SOCKS requires the python_socks library. Check that it has been " + "installed." + ) raise e proxy = Proxy.from_url(self._proxy_url, rdns=self.use_rdns) diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py index 0471b1cfd..12e38a27f 100644 --- a/netbox/utilities/testing/api.py +++ b/netbox/utilities/testing/api.py @@ -443,7 +443,10 @@ class APIViewTestCases: # Compile list of fields to include fields_string = '' - file_fields = (strawberry_django.fields.types.DjangoFileType, strawberry_django.fields.types.DjangoImageType) + file_fields = ( + strawberry_django.fields.types.DjangoFileType, + strawberry_django.fields.types.DjangoImageType, + ) for field in type_class.__strawberry_definition__.fields: if ( field.type in file_fields or ( diff --git a/netbox/utilities/tests/test_filters.py b/netbox/utilities/tests/test_filters.py index 031f31a12..6956396d2 100644 --- a/netbox/utilities/tests/test_filters.py +++ b/netbox/utilities/tests/test_filters.py @@ -427,9 +427,46 @@ class DynamicFilterLookupExpressionTest(TestCase): Rack.objects.bulk_create(racks) devices = ( - Device(name='Device 1', device_type=device_types[0], role=roles[0], platform=platforms[0], serial='ABC', asset_tag='1001', site=sites[0], rack=racks[0], position=1, face=DeviceFaceChoices.FACE_FRONT, status=DeviceStatusChoices.STATUS_ACTIVE, local_context_data={"foo": 123}), - Device(name='Device 2', device_type=device_types[1], role=roles[1], platform=platforms[1], serial='DEF', asset_tag='1002', site=sites[1], rack=racks[1], position=2, face=DeviceFaceChoices.FACE_FRONT, status=DeviceStatusChoices.STATUS_STAGED), - Device(name='Device 3', device_type=device_types[2], role=roles[2], platform=platforms[2], serial='GHI', asset_tag='1003', site=sites[2], rack=racks[2], position=3, face=DeviceFaceChoices.FACE_REAR, status=DeviceStatusChoices.STATUS_FAILED), + Device( + name='Device 1', + device_type=device_types[0], + role=roles[0], + platform=platforms[0], + serial='ABC', + asset_tag='1001', + site=sites[0], + rack=racks[0], + position=1, + face=DeviceFaceChoices.FACE_FRONT, + status=DeviceStatusChoices.STATUS_ACTIVE, + local_context_data={'foo': 123}, + ), + Device( + name='Device 2', + device_type=device_types[1], + role=roles[1], + platform=platforms[1], + serial='DEF', + asset_tag='1002', + site=sites[1], + rack=racks[1], + position=2, + face=DeviceFaceChoices.FACE_FRONT, + status=DeviceStatusChoices.STATUS_STAGED, + ), + Device( + name='Device 3', + device_type=device_types[2], + role=roles[2], + platform=platforms[2], + serial='GHI', + asset_tag='1003', + site=sites[2], + rack=racks[2], + position=3, + face=DeviceFaceChoices.FACE_REAR, + status=DeviceStatusChoices.STATUS_FAILED, + ), ) Device.objects.bulk_create(devices) diff --git a/netbox/virtualization/api/serializers_/clusters.py b/netbox/virtualization/api/serializers_/clusters.py index 450924fef..ff64db1cf 100644 --- a/netbox/virtualization/api/serializers_/clusters.py +++ b/netbox/virtualization/api/serializers_/clusters.py @@ -75,9 +75,9 @@ class ClusterSerializer(NetBoxModelSerializer): class Meta: model = Cluster fields = [ - 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', 'scope_id', 'scope', - 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'device_count', - 'virtualmachine_count', 'allocated_vcpus', 'allocated_memory', 'allocated_disk' + 'id', 'url', 'display_url', 'display', 'name', 'type', 'group', 'status', 'tenant', 'scope_type', + 'scope_id', 'scope', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'device_count', 'virtualmachine_count', 'allocated_vcpus', 'allocated_memory', 'allocated_disk' ] brief_fields = ('id', 'url', 'display', 'name', 'description', 'virtualmachine_count') diff --git a/netbox/virtualization/api/serializers_/virtualmachines.py b/netbox/virtualization/api/serializers_/virtualmachines.py index dfc205b7c..05fa2e427 100644 --- a/netbox/virtualization/api/serializers_/virtualmachines.py +++ b/netbox/virtualization/api/serializers_/virtualmachines.py @@ -49,8 +49,8 @@ class VirtualMachineSerializer(NetBoxModelSerializer): class Meta: model = VirtualMachine fields = [ - 'id', 'url', 'display_url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial', 'role', 'tenant', - 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', + 'id', 'url', 'display_url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial', 'role', + 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments', 'config_template', 'local_context_data', 'tags', 'custom_fields', 'created', 'last_updated', 'interface_count', 'virtual_disk_count', ] @@ -62,8 +62,8 @@ class VirtualMachineWithConfigContextSerializer(VirtualMachineSerializer): class Meta(VirtualMachineSerializer.Meta): fields = [ - 'id', 'url', 'display_url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial', 'role', 'tenant', - 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', + 'id', 'url', 'display_url', 'display', 'name', 'status', 'site', 'cluster', 'device', 'serial', 'role', + 'tenant', 'platform', 'primary_ip', 'primary_ip4', 'primary_ip6', 'vcpus', 'memory', 'disk', 'description', 'comments', 'config_template', 'local_context_data', 'tags', 'custom_fields', 'config_context', 'created', 'last_updated', 'interface_count', 'virtual_disk_count', ] diff --git a/netbox/virtualization/forms/bulk_import.py b/netbox/virtualization/forms/bulk_import.py index 027f3b309..6b5b62d11 100644 --- a/netbox/virtualization/forms/bulk_import.py +++ b/netbox/virtualization/forms/bulk_import.py @@ -73,7 +73,9 @@ class ClusterImportForm(ScopedImportForm, NetBoxModelImportForm): class Meta: model = Cluster - fields = ('name', 'type', 'group', 'status', 'scope_type', 'scope_id', 'tenant', 'description', 'comments', 'tags') + fields = ( + 'name', 'type', 'group', 'status', 'scope_type', 'scope_id', 'tenant', 'description', 'comments', 'tags', + ) labels = { 'scope_id': _('Scope ID'), } diff --git a/netbox/virtualization/migrations/0001_squashed_0022.py b/netbox/virtualization/migrations/0001_squashed_0022.py index 2a7894737..c7aa35ec7 100644 --- a/netbox/virtualization/migrations/0001_squashed_0022.py +++ b/netbox/virtualization/migrations/0001_squashed_0022.py @@ -10,7 +10,6 @@ import utilities.query_functions class Migration(migrations.Migration): - initial = True dependencies = [ @@ -100,17 +99,79 @@ class Migration(migrations.Migration): ('local_context_data', models.JSONField(blank=True, null=True)), ('name', models.CharField(max_length=64)), ('status', models.CharField(default='active', max_length=50)), - ('vcpus', models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True, validators=[django.core.validators.MinValueValidator(0.01)])), + ( + 'vcpus', + models.DecimalField( + blank=True, + decimal_places=2, + max_digits=6, + null=True, + validators=[django.core.validators.MinValueValidator(0.01)], + ), + ), ('memory', models.PositiveIntegerField(blank=True, null=True)), ('disk', models.PositiveIntegerField(blank=True, null=True)), ('comments', models.TextField(blank=True)), - ('cluster', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='virtualization.cluster')), - ('platform', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='virtual_machines', to='dcim.platform')), - ('primary_ip4', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), - ('primary_ip6', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ipam.ipaddress')), - ('role', models.ForeignKey(blank=True, limit_choices_to={'vm_role': True}, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='dcim.devicerole')), + ( + 'cluster', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='virtualization.cluster', + ), + ), + ( + 'platform', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='virtual_machines', + to='dcim.platform', + ), + ), + ( + 'primary_ip4', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), + ), + ( + 'primary_ip6', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='+', + to='ipam.ipaddress', + ), + ), + ( + 'role', + models.ForeignKey( + blank=True, + limit_choices_to={'vm_role': True}, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='dcim.devicerole', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='tenancy.tenant', + ), + ), ], options={ 'ordering': ('name', 'pk'), @@ -120,12 +181,24 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cluster', name='group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='clusters', to='virtualization.clustergroup'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='clusters', + to='virtualization.clustergroup', + ), ), migrations.AddField( model_name='cluster', name='site', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='clusters', to='dcim.site'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='clusters', + to='dcim.site', + ), ), migrations.AddField( model_name='cluster', @@ -135,12 +208,20 @@ class Migration(migrations.Migration): migrations.AddField( model_name='cluster', name='tenant', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='clusters', to='tenancy.tenant'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='clusters', + to='tenancy.tenant', + ), ), migrations.AddField( model_name='cluster', name='type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='clusters', to='virtualization.clustertype'), + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='clusters', to='virtualization.clustertype' + ), ), migrations.CreateModel( name='VMInterface', @@ -151,16 +232,59 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(primary_key=True, serialize=False)), ('enabled', models.BooleanField(default=True)), ('mac_address', dcim.fields.MACAddressField(blank=True, null=True)), - ('mtu', models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(65536)])), + ( + 'mtu', + models.PositiveIntegerField( + blank=True, + null=True, + validators=[ + django.core.validators.MinValueValidator(1), + django.core.validators.MaxValueValidator(65536), + ], + ), + ), ('mode', models.CharField(blank=True, max_length=50)), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface + ), + ), ('description', models.CharField(blank=True, max_length=200)), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='child_interfaces', to='virtualization.vminterface')), - ('tagged_vlans', models.ManyToManyField(blank=True, related_name='vminterfaces_as_tagged', to='ipam.VLAN')), + ( + 'parent', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='child_interfaces', + to='virtualization.vminterface', + ), + ), + ( + 'tagged_vlans', + models.ManyToManyField(blank=True, related_name='vminterfaces_as_tagged', to='ipam.VLAN'), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('untagged_vlan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vminterfaces_as_untagged', to='ipam.vlan')), - ('virtual_machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='interfaces', to='virtualization.virtualmachine')), + ( + 'untagged_vlan', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='vminterfaces_as_untagged', + to='ipam.vlan', + ), + ), + ( + 'virtual_machine', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='interfaces', + to='virtualization.virtualmachine', + ), + ), ], options={ 'verbose_name': 'interface', diff --git a/netbox/virtualization/migrations/0023_squashed_0036.py b/netbox/virtualization/migrations/0023_squashed_0036.py index bbfb62b39..0665aaab6 100644 --- a/netbox/virtualization/migrations/0023_squashed_0036.py +++ b/netbox/virtualization/migrations/0023_squashed_0036.py @@ -7,7 +7,6 @@ import utilities.ordering class Migration(migrations.Migration): - replaces = [ ('virtualization', '0023_virtualmachine_natural_ordering'), ('virtualization', '0024_cluster_relax_uniqueness'), @@ -22,7 +21,7 @@ class Migration(migrations.Migration): ('virtualization', '0033_unique_constraints'), ('virtualization', '0034_standardize_description_comments'), ('virtualization', '0035_virtualmachine_interface_count'), - ('virtualization', '0036_virtualmachine_config_template') + ('virtualization', '0036_virtualmachine_config_template'), ] dependencies = [ @@ -40,7 +39,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='virtualmachine', name='_name', - field=utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize), + field=utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize + ), ), migrations.AlterField( model_name='cluster', @@ -64,7 +65,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vminterface', name='bridge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bridge_interfaces', to='virtualization.vminterface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='bridge_interfaces', + to='virtualization.vminterface', + ), ), migrations.AlterField( model_name='cluster', @@ -94,7 +101,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vminterface', name='vrf', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='vminterfaces', to='ipam.vrf'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='vminterfaces', + to='ipam.vrf', + ), ), migrations.AlterField( model_name='cluster', @@ -129,17 +142,35 @@ class Migration(migrations.Migration): migrations.AddField( model_name='virtualmachine', name='site', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='dcim.site'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='dcim.site', + ), ), migrations.AddField( model_name='virtualmachine', name='device', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='dcim.device'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='dcim.device', + ), ), migrations.AlterField( model_name='virtualmachine', name='cluster', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='virtual_machines', to='virtualization.cluster'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='virtual_machines', + to='virtualization.cluster', + ), ), migrations.AlterUniqueTogether( name='cluster', @@ -155,7 +186,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='cluster', - constraint=models.UniqueConstraint(fields=('group', 'name'), name='virtualization_cluster_unique_group_name'), + constraint=models.UniqueConstraint( + fields=('group', 'name'), name='virtualization_cluster_unique_group_name' + ), ), migrations.AddConstraint( model_name='cluster', @@ -163,15 +196,28 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='virtualmachine', - constraint=models.UniqueConstraint(django.db.models.functions.text.Lower('name'), models.F('cluster'), models.F('tenant'), name='virtualization_virtualmachine_unique_name_cluster_tenant'), + constraint=models.UniqueConstraint( + django.db.models.functions.text.Lower('name'), + models.F('cluster'), + models.F('tenant'), + name='virtualization_virtualmachine_unique_name_cluster_tenant', + ), ), migrations.AddConstraint( model_name='virtualmachine', - constraint=models.UniqueConstraint(django.db.models.functions.text.Lower('name'), models.F('cluster'), condition=models.Q(('tenant__isnull', True)), name='virtualization_virtualmachine_unique_name_cluster', violation_error_message='Virtual machine name must be unique per cluster.'), + constraint=models.UniqueConstraint( + django.db.models.functions.text.Lower('name'), + models.F('cluster'), + condition=models.Q(('tenant__isnull', True)), + name='virtualization_virtualmachine_unique_name_cluster', + violation_error_message='Virtual machine name must be unique per cluster.', + ), ), migrations.AddConstraint( model_name='vminterface', - constraint=models.UniqueConstraint(fields=('virtual_machine', 'name'), name='virtualization_vminterface_unique_virtual_machine_name'), + constraint=models.UniqueConstraint( + fields=('virtual_machine', 'name'), name='virtualization_vminterface_unique_virtual_machine_name' + ), ), migrations.AddField( model_name='cluster', @@ -186,11 +232,19 @@ class Migration(migrations.Migration): migrations.AddField( model_name='virtualmachine', name='interface_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='virtual_machine', to_model='virtualization.VMInterface'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='virtual_machine', to_model='virtualization.VMInterface' + ), ), migrations.AddField( model_name='virtualmachine', name='config_template', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='%(class)ss', to='extras.configtemplate'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='%(class)ss', + to='extras.configtemplate', + ), ), ] diff --git a/netbox/virtualization/migrations/0037_protect_child_interfaces.py b/netbox/virtualization/migrations/0037_protect_child_interfaces.py index ab6cf0cb3..a9d2075c1 100644 --- a/netbox/virtualization/migrations/0037_protect_child_interfaces.py +++ b/netbox/virtualization/migrations/0037_protect_child_interfaces.py @@ -5,7 +5,6 @@ import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0036_virtualmachine_config_template'), ] @@ -14,6 +13,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='vminterface', name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.RESTRICT, related_name='child_interfaces', to='virtualization.vminterface'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.RESTRICT, + related_name='child_interfaces', + to='virtualization.vminterface', + ), ), ] diff --git a/netbox/virtualization/migrations/0038_virtualdisk.py b/netbox/virtualization/migrations/0038_virtualdisk.py index 59d45c975..2f7824121 100644 --- a/netbox/virtualization/migrations/0038_virtualdisk.py +++ b/netbox/virtualization/migrations/0038_virtualdisk.py @@ -9,7 +9,6 @@ import utilities.tracking class Migration(migrations.Migration): - dependencies = [ ('extras', '0099_cachedvalue_ordering'), ('virtualization', '0037_protect_child_interfaces'), @@ -19,7 +18,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='virtualmachine', name='virtual_disk_count', - field=utilities.fields.CounterCacheField(default=0, editable=False, to_field='virtual_machine', to_model='virtualization.VirtualDisk'), + field=utilities.fields.CounterCacheField( + default=0, editable=False, to_field='virtual_machine', to_model='virtualization.VirtualDisk' + ), ), migrations.CreateModel( name='VirtualDisk', @@ -27,13 +28,28 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('name', models.CharField(max_length=64)), - ('_name', utilities.fields.NaturalOrderingField('name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface)), + ( + '_name', + utilities.fields.NaturalOrderingField( + 'name', blank=True, max_length=100, naturalize_function=utilities.ordering.naturalize_interface + ), + ), ('description', models.CharField(blank=True, max_length=200)), ('size', models.PositiveIntegerField()), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('virtual_machine', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(class)ss', to='virtualization.virtualmachine')), + ( + 'virtual_machine', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='%(class)ss', + to='virtualization.virtualmachine', + ), + ), ], options={ 'verbose_name': 'virtual disk', @@ -45,6 +61,8 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='virtualdisk', - constraint=models.UniqueConstraint(fields=('virtual_machine', 'name'), name='virtualization_virtualdisk_unique_virtual_machine_name'), + constraint=models.UniqueConstraint( + fields=('virtual_machine', 'name'), name='virtualization_virtualdisk_unique_virtual_machine_name' + ), ), ] diff --git a/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py b/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py index 15b58fa22..758c21edc 100644 --- a/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py +++ b/netbox/virtualization/migrations/0039_virtualmachine_serial_number.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0038_virtualdisk'), ] diff --git a/netbox/virtualization/migrations/0040_convert_disk_size.py b/netbox/virtualization/migrations/0040_convert_disk_size.py index 6471a0908..4b0aec7bd 100644 --- a/netbox/virtualization/migrations/0040_convert_disk_size.py +++ b/netbox/virtualization/migrations/0040_convert_disk_size.py @@ -18,14 +18,10 @@ def convert_disk_size(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0039_virtualmachine_serial_number'), ] operations = [ - migrations.RunPython( - code=convert_disk_size, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=convert_disk_size, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/virtualization/migrations/0041_charfield_null_choices.py b/netbox/virtualization/migrations/0041_charfield_null_choices.py index 88b7f9b2c..22eb9955a 100644 --- a/netbox/virtualization/migrations/0041_charfield_null_choices.py +++ b/netbox/virtualization/migrations/0041_charfield_null_choices.py @@ -11,7 +11,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0040_convert_disk_size'), ] @@ -22,8 +21,5 @@ class Migration(migrations.Migration): name='mode', field=models.CharField(blank=True, max_length=50, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py index 3a6d5e481..ad93a751f 100644 --- a/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py +++ b/netbox/virtualization/migrations/0042_vminterface_vlan_translation_policy.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('ipam', '0074_vlantranslationpolicy_vlantranslationrule'), ('virtualization', '0041_charfield_null_choices'), @@ -13,6 +12,8 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vminterface', name='vlan_translation_policy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy'), + field=models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlantranslationpolicy' + ), ), ] diff --git a/netbox/virtualization/migrations/0043_qinq_svlan.py b/netbox/virtualization/migrations/0043_qinq_svlan.py index 422289fb7..b407facce 100644 --- a/netbox/virtualization/migrations/0043_qinq_svlan.py +++ b/netbox/virtualization/migrations/0043_qinq_svlan.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('ipam', '0075_vlan_qinq'), ('virtualization', '0042_vminterface_vlan_translation_policy'), @@ -13,7 +12,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='vminterface', name='qinq_svlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_svlan', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='%(class)ss_svlan', + to='ipam.vlan', + ), ), migrations.AlterField( model_name='vminterface', @@ -23,6 +28,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='vminterface', name='untagged_vlan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)ss_as_untagged', to='ipam.vlan'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='%(class)ss_as_untagged', + to='ipam.vlan', + ), ), ] diff --git a/netbox/virtualization/migrations/0044_cluster_scope.py b/netbox/virtualization/migrations/0044_cluster_scope.py index b7af25f8b..521db1877 100644 --- a/netbox/virtualization/migrations/0044_cluster_scope.py +++ b/netbox/virtualization/migrations/0044_cluster_scope.py @@ -11,13 +11,11 @@ def copy_site_assignments(apps, schema_editor): Site = apps.get_model('dcim', 'Site') Cluster.objects.filter(site__isnull=False).update( - scope_type=ContentType.objects.get_for_model(Site), - scope_id=models.F('site_id') + scope_type=ContentType.objects.get_for_model(Site), scope_id=models.F('site_id') ) class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('virtualization', '0043_qinq_svlan'), @@ -41,11 +39,6 @@ class Migration(migrations.Migration): to='contenttypes.contenttype', ), ), - # Copy over existing site assignments - migrations.RunPython( - code=copy_site_assignments, - reverse_code=migrations.RunPython.noop - ), - + migrations.RunPython(code=copy_site_assignments, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/virtualization/migrations/0045_clusters_cached_relations.py b/netbox/virtualization/migrations/0045_clusters_cached_relations.py index ff851aa7c..6d0c8ff33 100644 --- a/netbox/virtualization/migrations/0045_clusters_cached_relations.py +++ b/netbox/virtualization/migrations/0045_clusters_cached_relations.py @@ -19,7 +19,6 @@ def populate_denormalized_fields(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0044_cluster_scope'), ] @@ -69,13 +68,8 @@ class Migration(migrations.Migration): to='dcim.sitegroup', ), ), - # Populate denormalized FK values - migrations.RunPython( - code=populate_denormalized_fields, - reverse_code=migrations.RunPython.noop - ), - + migrations.RunPython(code=populate_denormalized_fields, reverse_code=migrations.RunPython.noop), migrations.RemoveConstraint( model_name='cluster', name='virtualization_cluster_unique_site_name', diff --git a/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py b/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py index 7b1168da0..75c806382 100644 --- a/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py +++ b/netbox/virtualization/migrations/0046_alter_cluster__location_alter_cluster__region_and_more.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0196_qinq_svlan'), ('virtualization', '0045_clusters_cached_relations'), diff --git a/netbox/virtualization/migrations/0047_natural_ordering.py b/netbox/virtualization/migrations/0047_natural_ordering.py index 4454cfe2d..4ce5b8370 100644 --- a/netbox/virtualization/migrations/0047_natural_ordering.py +++ b/netbox/virtualization/migrations/0047_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('virtualization', '0046_alter_cluster__location_alter_cluster__region_and_more'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/virtualization/migrations/0048_populate_mac_addresses.py b/netbox/virtualization/migrations/0048_populate_mac_addresses.py index 328d6438a..a4be1e2be 100644 --- a/netbox/virtualization/migrations/0048_populate_mac_addresses.py +++ b/netbox/virtualization/migrations/0048_populate_mac_addresses.py @@ -10,9 +10,7 @@ def populate_mac_addresses(apps, schema_editor): mac_addresses = [ MACAddress( - mac_address=vminterface.mac_address, - assigned_object_type=vminterface_ct, - assigned_object_id=vminterface.pk + mac_address=vminterface.mac_address, assigned_object_type=vminterface_ct, assigned_object_id=vminterface.pk ) for vminterface in VMInterface.objects.filter(mac_address__isnull=False) ] @@ -24,7 +22,6 @@ def populate_mac_addresses(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('dcim', '0199_macaddress'), ('virtualization', '0047_natural_ordering'), @@ -39,13 +36,10 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', - to='dcim.macaddress' + to='dcim.macaddress', ), ), - migrations.RunPython( - code=populate_mac_addresses, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=populate_mac_addresses, reverse_code=migrations.RunPython.noop), migrations.RemoveField( model_name='vminterface', name='mac_address', diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index 91807e35b..d07bb4519 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -100,7 +100,7 @@ class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): class Meta(NetBoxTable.Meta): model = Cluster fields = ( - 'pk', 'id', 'name', 'type', 'group', 'status', 'tenant', 'tenant_group', 'scope', 'scope_type', 'description', - 'comments', 'device_count', 'vm_count', 'contacts', 'tags', 'created', 'last_updated', + 'pk', 'id', 'name', 'type', 'group', 'status', 'tenant', 'tenant_group', 'scope', 'scope_type', + 'description', 'comments', 'device_count', 'vm_count', 'contacts', 'tags', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'type', 'group', 'status', 'tenant', 'site', 'device_count', 'vm_count') diff --git a/netbox/virtualization/tables/template_code.py b/netbox/virtualization/tables/template_code.py new file mode 100644 index 000000000..a6b7251f2 --- /dev/null +++ b/netbox/virtualization/tables/template_code.py @@ -0,0 +1,32 @@ +VMINTERFACE_BUTTONS = """ +{% if perms.virtualization.change_vminterface %} + + +
      + {% if perms.ipam.add_ipaddress %} +
    • IP Address
      • + {% endif %} + {% if perms.dcim.add_macaddress %} +
    • MAC Address
      • + {% endif %} + {% if perms.vpn.add_l2vpntermination %} +
    • L2VPN Termination
      • + {% endif %} + {% if perms.ipam.add_fhrpgroupassignment %} +
    • Assign FHRP Group
      • + {% endif %} +
    +     +{% endif %} +{% if perms.vpn.add_tunnel and not record.tunnel_termination %} + + + +{% elif perms.vpn.delete_tunneltermination and record.tunnel_termination %} + + + +{% endif %} +""" diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index fe7a66ac1..116051037 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -6,6 +6,7 @@ from netbox.tables import NetBoxTable, columns from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin from utilities.templatetags.helpers import humanize_megabytes from virtualization.models import VirtualDisk, VirtualMachine, VMInterface +from .template_code import * __all__ = ( 'VirtualDiskTable', @@ -15,39 +16,6 @@ __all__ = ( 'VMInterfaceTable', ) -VMINTERFACE_BUTTONS = """ -{% if perms.virtualization.change_vminterface %} - - -
      - {% if perms.ipam.add_ipaddress %} -
    • IP Address
      • - {% endif %} - {% if perms.dcim.add_macaddress %} -
    • MAC Address
      • - {% endif %} - {% if perms.vpn.add_l2vpntermination %} -
    • L2VPN Termination
      • - {% endif %} - {% if perms.ipam.add_fhrpgroupassignment %} -
    • Assign FHRP Group
      • - {% endif %} -
    -     -{% endif %} -{% if perms.vpn.add_tunnel and not record.tunnel_termination %} - - - -{% elif perms.vpn.delete_tunneltermination and record.tunnel_termination %} - - - -{% endif %} -""" - # # Virtual machines diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py index 149b64684..c57b57f2e 100644 --- a/netbox/virtualization/tests/test_api.py +++ b/netbox/virtualization/tests/test_api.py @@ -109,9 +109,24 @@ class ClusterTest(APIViewTestCases.APIViewTestCase): ClusterGroup.objects.bulk_create(cluster_groups) clusters = ( - Cluster(name='Cluster 1', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), - Cluster(name='Cluster 2', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), - Cluster(name='Cluster 3', type=cluster_types[0], group=cluster_groups[0], status=ClusterStatusChoices.STATUS_PLANNED), + Cluster( + name='Cluster 1', + type=cluster_types[0], + group=cluster_groups[0], + status=ClusterStatusChoices.STATUS_PLANNED, + ), + Cluster( + name='Cluster 2', + type=cluster_types[0], + group=cluster_groups[0], + status=ClusterStatusChoices.STATUS_PLANNED, + ), + Cluster( + name='Cluster 3', + type=cluster_types[0], + group=cluster_groups[0], + status=ClusterStatusChoices.STATUS_PLANNED, + ), ) for cluster in clusters: cluster.save() @@ -169,9 +184,25 @@ class VirtualMachineTest(APIViewTestCases.APIViewTestCase): device2 = create_test_device('device2', site=sites[1], cluster=clusters[1]) virtual_machines = ( - VirtualMachine(name='Virtual Machine 1', site=sites[0], cluster=clusters[0], device=device1, local_context_data={'A': 1}), - VirtualMachine(name='Virtual Machine 2', site=sites[0], cluster=clusters[0], local_context_data={'B': 2}), - VirtualMachine(name='Virtual Machine 3', site=sites[0], cluster=clusters[0], local_context_data={'C': 3}), + VirtualMachine( + name='Virtual Machine 1', + site=sites[0], + cluster=clusters[0], + device=device1, + local_context_data={'A': 1}, + ), + VirtualMachine( + name='Virtual Machine 2', + site=sites[0], + cluster=clusters[0], + local_context_data={'B': 2 + }), + VirtualMachine( + name='Virtual Machine 3', + site=sites[0], + cluster=clusters[0], + local_context_data={'C': 3} + ), ) VirtualMachine.objects.bulk_create(virtual_machines) diff --git a/netbox/virtualization/tests/test_views.py b/netbox/virtualization/tests/test_views.py index dfd7e041c..3c8d7eadc 100644 --- a/netbox/virtualization/tests/test_views.py +++ b/netbox/virtualization/tests/test_views.py @@ -117,9 +117,27 @@ class ClusterTestCase(ViewTestCases.PrimaryObjectViewTestCase): ClusterType.objects.bulk_create(clustertypes) clusters = ( - Cluster(name='Cluster 1', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), - Cluster(name='Cluster 2', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), - Cluster(name='Cluster 3', group=clustergroups[0], type=clustertypes[0], status=ClusterStatusChoices.STATUS_ACTIVE, scope=sites[0]), + Cluster( + name='Cluster 1', + group=clustergroups[0], + type=clustertypes[0], + status=ClusterStatusChoices.STATUS_ACTIVE, + scope=sites[0], + ), + Cluster( + name='Cluster 2', + group=clustergroups[0], + type=clustertypes[0], + status=ClusterStatusChoices.STATUS_ACTIVE, + scope=sites[0], + ), + Cluster( + name='Cluster 3', + group=clustergroups[0], + type=clustertypes[0], + status=ClusterStatusChoices.STATUS_ACTIVE, + scope=sites[0], + ), ) for cluster in clusters: cluster.save() @@ -214,9 +232,30 @@ class VirtualMachineTestCase(ViewTestCases.PrimaryObjectViewTestCase): ) virtual_machines = ( - VirtualMachine(name='Virtual Machine 1', site=sites[0], cluster=clusters[0], device=devices[0], role=roles[0], platform=platforms[0]), - VirtualMachine(name='Virtual Machine 2', site=sites[0], cluster=clusters[0], device=devices[0], role=roles[0], platform=platforms[0]), - VirtualMachine(name='Virtual Machine 3', site=sites[0], cluster=clusters[0], device=devices[0], role=roles[0], platform=platforms[0]), + VirtualMachine( + name='Virtual Machine 1', + site=sites[0], + cluster=clusters[0], + device=devices[0], + role=roles[0], + platform=platforms[0], + ), + VirtualMachine( + name='Virtual Machine 2', + site=sites[0], + cluster=clusters[0], + device=devices[0], + role=roles[0], + platform=platforms[0], + ), + VirtualMachine( + name='Virtual Machine 3', + site=sites[0], + cluster=clusters[0], + device=devices[0], + role=roles[0], + platform=platforms[0], + ), ) VirtualMachine.objects.bulk_create(virtual_machines) diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 605de0911..ccba12239 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -177,7 +177,11 @@ class ClusterView(generic.ObjectView): queryset = Cluster.objects.all() def get_extra_context(self, request, instance): - return instance.virtual_machines.aggregate(vcpus_sum=Sum('vcpus'), memory_sum=Sum('memory'), disk_sum=Sum('disk')) + return instance.virtual_machines.aggregate( + vcpus_sum=Sum('vcpus'), + memory_sum=Sum('memory'), + disk_sum=Sum('disk') + ) @register_model_view(Cluster, 'virtualmachines', path='virtual-machines') diff --git a/netbox/vpn/api/serializers_/crypto.py b/netbox/vpn/api/serializers_/crypto.py index c11b8de2b..fbd04c230 100644 --- a/netbox/vpn/api/serializers_/crypto.py +++ b/netbox/vpn/api/serializers_/crypto.py @@ -74,7 +74,8 @@ class IPSecProposalSerializer(NetBoxModelSerializer): model = IPSecProposal fields = ( 'id', 'url', 'display_url', 'display', 'name', 'description', 'encryption_algorithm', - 'authentication_algorithm', 'sa_lifetime_seconds', 'sa_lifetime_data', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'authentication_algorithm', 'sa_lifetime_seconds', 'sa_lifetime_data', 'comments', 'tags', 'custom_fields', + 'created', 'last_updated', ) brief_fields = ('id', 'url', 'display', 'name', 'description') diff --git a/netbox/vpn/migrations/0001_initial.py b/netbox/vpn/migrations/0001_initial.py index 681474837..b44ae3e52 100644 --- a/netbox/vpn/migrations/0001_initial.py +++ b/netbox/vpn/migrations/0001_initial.py @@ -5,7 +5,6 @@ import utilities.json class Migration(migrations.Migration): - initial = True dependencies = [ @@ -23,7 +22,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), @@ -46,7 +48,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), @@ -70,7 +75,6 @@ class Migration(migrations.Migration): name='tags', field=taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag'), ), - # IPSec migrations.CreateModel( name='IPSecProposal', @@ -78,7 +82,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), @@ -100,7 +107,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), @@ -128,13 +138,26 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), ('mode', models.CharField()), - ('ike_policy', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ipsec_profiles', to='vpn.ikepolicy')), - ('ipsec_policy', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='ipsec_profiles', to='vpn.ipsecpolicy')), + ( + 'ike_policy', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='ipsec_profiles', to='vpn.ikepolicy' + ), + ), + ( + 'ipsec_policy', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='ipsec_profiles', to='vpn.ipsecpolicy' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -143,7 +166,6 @@ class Migration(migrations.Migration): 'ordering': ('name',), }, ), - # Tunnels migrations.CreateModel( name='TunnelGroup', @@ -151,7 +173,10 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), ('description', models.CharField(blank=True, max_length=200)), @@ -173,17 +198,47 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), ('status', models.CharField(default='active', max_length=50)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tunnels', to='vpn.tunnelgroup')), + ( + 'group', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='tunnels', + to='vpn.tunnelgroup', + ), + ), ('encapsulation', models.CharField(max_length=50)), ('tunnel_id', models.PositiveBigIntegerField(blank=True, null=True)), - ('ipsec_profile', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tunnels', to='vpn.ipsecprofile')), + ( + 'ipsec_profile', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='tunnels', + to='vpn.ipsecprofile', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tunnels', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='tunnels', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'tunnel', @@ -197,7 +252,9 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='tunnel', - constraint=models.UniqueConstraint(condition=models.Q(('group__isnull', True)), fields=('name',), name='vpn_tunnel_name'), + constraint=models.UniqueConstraint( + condition=models.Q(('group__isnull', True)), fields=('name',), name='vpn_tunnel_name' + ), ), migrations.CreateModel( name='TunnelTermination', @@ -205,13 +262,35 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('role', models.CharField(default='peer', max_length=50)), ('termination_id', models.PositiveBigIntegerField(blank=True, null=True)), - ('termination_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('outside_ip', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tunnel_termination', to='ipam.ipaddress')), + ( + 'termination_type', + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype' + ), + ), + ( + 'outside_ip', + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='tunnel_termination', + to='ipam.ipaddress', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tunnel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='vpn.tunnel')), + ( + 'tunnel', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='vpn.tunnel' + ), + ), ], options={ 'verbose_name': 'tunnel termination', @@ -225,6 +304,10 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='tunneltermination', - constraint=models.UniqueConstraint(fields=('termination_type', 'termination_id'), name='vpn_tunneltermination_termination', violation_error_message='An object may be terminated to only one tunnel at a time.'), + constraint=models.UniqueConstraint( + fields=('termination_type', 'termination_id'), + name='vpn_tunneltermination_termination', + violation_error_message='An object may be terminated to only one tunnel at a time.', + ), ), ] diff --git a/netbox/vpn/migrations/0002_move_l2vpn.py b/netbox/vpn/migrations/0002_move_l2vpn.py index b83ea4655..5f1480dce 100644 --- a/netbox/vpn/migrations/0002_move_l2vpn.py +++ b/netbox/vpn/migrations/0002_move_l2vpn.py @@ -5,7 +5,6 @@ import utilities.json class Migration(migrations.Migration): - dependencies = [ ('extras', '0099_cachedvalue_ordering'), ('contenttypes', '0002_remove_content_type_name'), @@ -23,17 +22,35 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('description', models.CharField(blank=True, max_length=200)), ('comments', models.TextField(blank=True)), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), ('type', models.CharField(max_length=50)), ('identifier', models.BigIntegerField(blank=True, null=True)), - ('export_targets', models.ManyToManyField(blank=True, related_name='exporting_l2vpns', to='ipam.routetarget')), - ('import_targets', models.ManyToManyField(blank=True, related_name='importing_l2vpns', to='ipam.routetarget')), + ( + 'export_targets', + models.ManyToManyField(blank=True, related_name='exporting_l2vpns', to='ipam.routetarget'), + ), + ( + 'import_targets', + models.ManyToManyField(blank=True, related_name='importing_l2vpns', to='ipam.routetarget'), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='l2vpns', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='l2vpns', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'L2VPN', @@ -47,10 +64,33 @@ class Migration(migrations.Migration): ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('assigned_object_id', models.PositiveBigIntegerField()), - ('assigned_object_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'dcim'), ('model', 'interface')), models.Q(('app_label', 'ipam'), ('model', 'vlan')), models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), - ('l2vpn', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='vpn.l2vpn')), + ( + 'assigned_object_type', + models.ForeignKey( + limit_choices_to=models.Q( + models.Q( + models.Q(('app_label', 'dcim'), ('model', 'interface')), + models.Q(('app_label', 'ipam'), ('model', 'vlan')), + models.Q(('app_label', 'virtualization'), ('model', 'vminterface')), + _connector='OR', + ) + ), + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='contenttypes.contenttype', + ), + ), + ( + 'l2vpn', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, related_name='terminations', to='vpn.l2vpn' + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -66,12 +106,13 @@ class Migration(migrations.Migration): migrations.AddConstraint( model_name='l2vpntermination', constraint=models.UniqueConstraint( - fields=('assigned_object_type', 'assigned_object_id'), - name='vpn_l2vpntermination_assigned_object' + fields=('assigned_object_type', 'assigned_object_id'), name='vpn_l2vpntermination_assigned_object' ), ), migrations.AddIndex( model_name='l2vpntermination', - index=models.Index(fields=['assigned_object_type', 'assigned_object_id'], name='vpn_l2vpnte_assigne_9c55f8_idx'), + index=models.Index( + fields=['assigned_object_type', 'assigned_object_id'], name='vpn_l2vpnte_assigne_9c55f8_idx' + ), ), ] diff --git a/netbox/vpn/migrations/0003_ipaddress_multiple_tunnel_terminations.py b/netbox/vpn/migrations/0003_ipaddress_multiple_tunnel_terminations.py index 2747669ae..ce042b4db 100644 --- a/netbox/vpn/migrations/0003_ipaddress_multiple_tunnel_terminations.py +++ b/netbox/vpn/migrations/0003_ipaddress_multiple_tunnel_terminations.py @@ -5,7 +5,6 @@ import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('ipam', '0069_gfk_indexes'), ('vpn', '0002_move_l2vpn'), @@ -15,6 +14,12 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tunneltermination', name='outside_ip', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='tunnel_terminations', to='ipam.ipaddress'), + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='tunnel_terminations', + to='ipam.ipaddress', + ), ), ] diff --git a/netbox/vpn/migrations/0004_alter_ikepolicy_mode.py b/netbox/vpn/migrations/0004_alter_ikepolicy_mode.py index 40dd4f99e..44bf4d35b 100644 --- a/netbox/vpn/migrations/0004_alter_ikepolicy_mode.py +++ b/netbox/vpn/migrations/0004_alter_ikepolicy_mode.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('vpn', '0003_ipaddress_multiple_tunnel_terminations'), ] diff --git a/netbox/vpn/migrations/0005_rename_indexes.py b/netbox/vpn/migrations/0005_rename_indexes.py index 805b380cc..f24106c1f 100644 --- a/netbox/vpn/migrations/0005_rename_indexes.py +++ b/netbox/vpn/migrations/0005_rename_indexes.py @@ -2,43 +2,56 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('vpn', '0004_alter_ikepolicy_mode'), ] operations = [ - # Rename vpn_l2vpn constraints - migrations.RunSQL("ALTER TABLE vpn_l2vpn RENAME CONSTRAINT ipam_l2vpn_tenant_id_bb2564a6_fk_tenancy_tenant_id TO vpn_l2vpn_tenant_id_57ec8f92_fk_tenancy_tenant_id"), - + migrations.RunSQL(( + 'ALTER TABLE vpn_l2vpn ' + 'RENAME CONSTRAINT ipam_l2vpn_tenant_id_bb2564a6_fk_tenancy_tenant_id ' + 'TO vpn_l2vpn_tenant_id_57ec8f92_fk_tenancy_tenant_id' + )), # Rename ipam_l2vpn_* sequences - migrations.RunSQL("ALTER TABLE ipam_l2vpn_export_targets_id_seq RENAME TO vpn_l2vpn_export_targets_id_seq"), - migrations.RunSQL("ALTER TABLE ipam_l2vpn_id_seq RENAME TO vpn_l2vpn_id_seq"), - migrations.RunSQL("ALTER TABLE ipam_l2vpn_import_targets_id_seq RENAME TO vpn_l2vpn_import_targets_id_seq"), - + migrations.RunSQL('ALTER TABLE ipam_l2vpn_export_targets_id_seq RENAME TO vpn_l2vpn_export_targets_id_seq'), + migrations.RunSQL('ALTER TABLE ipam_l2vpn_id_seq RENAME TO vpn_l2vpn_id_seq'), + migrations.RunSQL('ALTER TABLE ipam_l2vpn_import_targets_id_seq RENAME TO vpn_l2vpn_import_targets_id_seq'), # Rename ipam_l2vpn_* indexes - migrations.RunSQL("ALTER INDEX ipam_l2vpn_pkey RENAME TO vpn_l2vpn_pkey"), - migrations.RunSQL("ALTER INDEX ipam_l2vpn_name_5e1c080f_like RENAME TO vpn_l2vpn_name_8824eda5_like"), - migrations.RunSQL("ALTER INDEX ipam_l2vpn_name_key RENAME TO vpn_l2vpn_name_key"), - migrations.RunSQL("ALTER INDEX ipam_l2vpn_slug_24008406_like RENAME TO vpn_l2vpn_slug_76b5a174_like"), - migrations.RunSQL("ALTER INDEX ipam_l2vpn_tenant_id_bb2564a6 RENAME TO vpn_l2vpn_tenant_id_57ec8f92"), + migrations.RunSQL('ALTER INDEX ipam_l2vpn_pkey RENAME TO vpn_l2vpn_pkey'), + migrations.RunSQL('ALTER INDEX ipam_l2vpn_name_5e1c080f_like RENAME TO vpn_l2vpn_name_8824eda5_like'), + migrations.RunSQL('ALTER INDEX ipam_l2vpn_name_key RENAME TO vpn_l2vpn_name_key'), + migrations.RunSQL('ALTER INDEX ipam_l2vpn_slug_24008406_like RENAME TO vpn_l2vpn_slug_76b5a174_like'), + migrations.RunSQL('ALTER INDEX ipam_l2vpn_tenant_id_bb2564a6 RENAME TO vpn_l2vpn_tenant_id_57ec8f92'), # The unique index for L2VPN.slug may have one of two names, depending on how it was created, # so we check for both. - migrations.RunSQL("ALTER INDEX IF EXISTS ipam_l2vpn_slug_24008406_uniq RENAME TO vpn_l2vpn_slug_76b5a174_uniq"), - migrations.RunSQL("ALTER INDEX IF EXISTS ipam_l2vpn_slug_key RENAME TO vpn_l2vpn_slug_key"), - + migrations.RunSQL('ALTER INDEX IF EXISTS ipam_l2vpn_slug_24008406_uniq RENAME TO vpn_l2vpn_slug_76b5a174_uniq'), + migrations.RunSQL('ALTER INDEX IF EXISTS ipam_l2vpn_slug_key RENAME TO vpn_l2vpn_slug_key'), # Rename vpn_l2vpntermination constraints - migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpntermination_assigned_object_id_check TO vpn_l2vpntermination_assigned_object_id_check"), - migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpnterminatio_assigned_object_type_3923c124_fk_django_co TO vpn_l2vpntermination_assigned_object_type_id_f063b865_fk_django_co"), - migrations.RunSQL("ALTER TABLE vpn_l2vpntermination RENAME CONSTRAINT ipam_l2vpntermination_l2vpn_id_9e570aa1_fk_ipam_l2vpn_id TO vpn_l2vpntermination_l2vpn_id_f5367bbe_fk_vpn_l2vpn_id"), - + migrations.RunSQL(( + 'ALTER TABLE vpn_l2vpntermination ' + 'RENAME CONSTRAINT ipam_l2vpntermination_assigned_object_id_check ' + 'TO vpn_l2vpntermination_assigned_object_id_check' + )), + migrations.RunSQL(( + 'ALTER TABLE vpn_l2vpntermination ' + 'RENAME CONSTRAINT ipam_l2vpnterminatio_assigned_object_type_3923c124_fk_django_co ' + 'TO vpn_l2vpntermination_assigned_object_type_id_f063b865_fk_django_co' + )), + migrations.RunSQL(( + 'ALTER TABLE vpn_l2vpntermination ' + 'RENAME CONSTRAINT ipam_l2vpntermination_l2vpn_id_9e570aa1_fk_ipam_l2vpn_id ' + 'TO vpn_l2vpntermination_l2vpn_id_f5367bbe_fk_vpn_l2vpn_id' + )), # Rename ipam_l2vpn_termination_* sequences - migrations.RunSQL("ALTER TABLE ipam_l2vpntermination_id_seq RENAME TO vpn_l2vpntermination_id_seq"), - + migrations.RunSQL('ALTER TABLE ipam_l2vpntermination_id_seq RENAME TO vpn_l2vpntermination_id_seq'), # Rename ipam_l2vpn_* indexes - migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_pkey RENAME TO vpn_l2vpntermination_pkey"), - migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_assigned_object_type_id_3923c124 RENAME TO vpn_l2vpntermination_assigned_object_type_id_f063b865"), - migrations.RunSQL("ALTER INDEX ipam_l2vpntermination_l2vpn_id_9e570aa1 RENAME TO vpn_l2vpntermination_l2vpn_id_f5367bbe"), - + migrations.RunSQL('ALTER INDEX ipam_l2vpntermination_pkey RENAME TO vpn_l2vpntermination_pkey'), + migrations.RunSQL(( + 'ALTER INDEX ipam_l2vpntermination_assigned_object_type_id_3923c124 ' + 'RENAME TO vpn_l2vpntermination_assigned_object_type_id_f063b865' + )), + migrations.RunSQL( + 'ALTER INDEX ipam_l2vpntermination_l2vpn_id_9e570aa1 RENAME TO vpn_l2vpntermination_l2vpn_id_f5367bbe' + ), ] diff --git a/netbox/vpn/migrations/0006_charfield_null_choices.py b/netbox/vpn/migrations/0006_charfield_null_choices.py index 1943c466f..784b66d72 100644 --- a/netbox/vpn/migrations/0006_charfield_null_choices.py +++ b/netbox/vpn/migrations/0006_charfield_null_choices.py @@ -16,7 +16,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('vpn', '0005_rename_indexes'), ] @@ -42,8 +41,5 @@ class Migration(migrations.Migration): name='encryption_algorithm', field=models.CharField(blank=True, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/vpn/migrations/0007_natural_ordering.py b/netbox/vpn/migrations/0007_natural_ordering.py index 01dd4620f..3eb8ab5a9 100644 --- a/netbox/vpn/migrations/0007_natural_ordering.py +++ b/netbox/vpn/migrations/0007_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('vpn', '0006_charfield_null_choices'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/wireless/api/serializers_/wirelesslans.py b/netbox/wireless/api/serializers_/wirelesslans.py index 637089277..68f79daf6 100644 --- a/netbox/wireless/api/serializers_/wirelesslans.py +++ b/netbox/wireless/api/serializers_/wirelesslans.py @@ -52,9 +52,9 @@ class WirelessLANSerializer(NetBoxModelSerializer): class Meta: model = WirelessLAN fields = [ - 'id', 'url', 'display_url', 'display', 'ssid', 'description', 'group', 'status', 'vlan', 'scope_type', 'scope_id', 'scope', - 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'description', 'comments', 'tags', 'custom_fields', - 'created', 'last_updated', + 'id', 'url', 'display_url', 'display', 'ssid', 'description', 'group', 'status', 'vlan', 'scope_type', + 'scope_id', 'scope', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'description', 'comments', 'tags', + 'custom_fields', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'ssid', 'description') diff --git a/netbox/wireless/forms/bulk_import.py b/netbox/wireless/forms/bulk_import.py index f23ccf203..1fece7e46 100644 --- a/netbox/wireless/forms/bulk_import.py +++ b/netbox/wireless/forms/bulk_import.py @@ -76,8 +76,8 @@ class WirelessLANImportForm(ScopedImportForm, NetBoxModelImportForm): class Meta: model = WirelessLAN fields = ( - 'ssid', 'group', 'status', 'vlan', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'scope_type', 'scope_id', - 'description', 'comments', 'tags', + 'ssid', 'group', 'status', 'vlan', 'tenant', 'auth_type', 'auth_cipher', 'auth_psk', 'scope_type', + 'scope_id', 'description', 'comments', 'tags', ) labels = { 'scope_id': _('Scope ID'), diff --git a/netbox/wireless/migrations/0001_squashed_0008.py b/netbox/wireless/migrations/0001_squashed_0008.py index 2326f5cf7..8886580e1 100644 --- a/netbox/wireless/migrations/0001_squashed_0008.py +++ b/netbox/wireless/migrations/0001_squashed_0008.py @@ -8,7 +8,6 @@ import wireless.models class Migration(migrations.Migration): - replaces = [ ('wireless', '0001_wireless'), ('wireless', '0002_standardize_id_fields'), @@ -17,7 +16,7 @@ class Migration(migrations.Migration): ('wireless', '0005_wirelesslink_interface_types'), ('wireless', '0006_unique_constraints'), ('wireless', '0007_standardize_description_comments'), - ('wireless', '0008_wirelesslan_status') + ('wireless', '0008_wirelesslan_status'), ] dependencies = [ @@ -33,7 +32,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('name', models.CharField(max_length=100, unique=True)), ('slug', models.SlugField(max_length=100, unique=True)), @@ -43,7 +45,16 @@ class Migration(migrations.Migration): ('rght', models.PositiveIntegerField(editable=False)), ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), ('level', models.PositiveIntegerField(editable=False)), - ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='wireless.wirelesslangroup')), + ( + 'parent', + mptt.fields.TreeForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='children', + to='wireless.wirelesslangroup', + ), + ), ], options={ 'ordering': ('name', 'pk'), @@ -56,17 +67,43 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('ssid', models.CharField(max_length=32)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wireless_lans', to='wireless.wirelesslangroup')), + ( + 'group', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + related_name='wireless_lans', + to='wireless.wirelesslangroup', + ), + ), ('description', models.CharField(blank=True, max_length=200)), ('auth_cipher', models.CharField(blank=True, max_length=50)), ('auth_psk', models.CharField(blank=True, max_length=64)), ('auth_type', models.CharField(blank=True, max_length=50)), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('vlan', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlan')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='wireless_lans', to='tenancy.tenant')), + ( + 'vlan', + models.ForeignKey( + blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ipam.vlan' + ), + ), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='wireless_lans', + to='tenancy.tenant', + ), + ), ], options={ 'verbose_name': 'Wireless LAN', @@ -78,7 +115,10 @@ class Migration(migrations.Migration): fields=[ ('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)), + ( + 'custom_field_data', + models.JSONField(blank=True, default=dict, encoder=utilities.json.CustomFieldJSONEncoder), + ), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)), ('ssid', models.CharField(blank=True, max_length=32)), ('status', models.CharField(default='connected', max_length=50)), @@ -86,12 +126,55 @@ class Migration(migrations.Migration): ('auth_cipher', models.CharField(blank=True, max_length=50)), ('auth_psk', models.CharField(blank=True, max_length=64)), ('auth_type', models.CharField(blank=True, max_length=50)), - ('_interface_a_device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device')), - ('_interface_b_device', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='dcim.device')), - ('interface_a', models.ForeignKey(limit_choices_to=wireless.models.get_wireless_interface_types, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface')), - ('interface_b', models.ForeignKey(limit_choices_to=wireless.models.get_wireless_interface_types, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface')), + ( + '_interface_a_device', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='+', + to='dcim.device', + ), + ), + ( + '_interface_b_device', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name='+', + to='dcim.device', + ), + ), + ( + 'interface_a', + models.ForeignKey( + limit_choices_to=wireless.models.get_wireless_interface_types, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='dcim.interface', + ), + ), + ( + 'interface_b', + models.ForeignKey( + limit_choices_to=wireless.models.get_wireless_interface_types, + on_delete=django.db.models.deletion.PROTECT, + related_name='+', + to='dcim.interface', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), - ('tenant', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='wireless_links', to='tenancy.tenant')), + ( + 'tenant', + models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name='wireless_links', + to='tenancy.tenant', + ), + ), ], options={ 'ordering': ['pk'], @@ -100,11 +183,15 @@ class Migration(migrations.Migration): ), migrations.AddConstraint( model_name='wirelesslangroup', - constraint=models.UniqueConstraint(fields=('parent', 'name'), name='wireless_wirelesslangroup_unique_parent_name'), + constraint=models.UniqueConstraint( + fields=('parent', 'name'), name='wireless_wirelesslangroup_unique_parent_name' + ), ), migrations.AddConstraint( model_name='wirelesslink', - constraint=models.UniqueConstraint(fields=('interface_a', 'interface_b'), name='wireless_wirelesslink_unique_interfaces'), + constraint=models.UniqueConstraint( + fields=('interface_a', 'interface_b'), name='wireless_wirelesslink_unique_interfaces' + ), ), migrations.AddField( model_name='wirelesslan', diff --git a/netbox/wireless/migrations/0009_wirelesslink_distance.py b/netbox/wireless/migrations/0009_wirelesslink_distance.py index 6a778ef00..6ddf4ab44 100644 --- a/netbox/wireless/migrations/0009_wirelesslink_distance.py +++ b/netbox/wireless/migrations/0009_wirelesslink_distance.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('wireless', '0001_squashed_0008'), ] diff --git a/netbox/wireless/migrations/0010_charfield_null_choices.py b/netbox/wireless/migrations/0010_charfield_null_choices.py index 9bfdc54ed..f0394618a 100644 --- a/netbox/wireless/migrations/0010_charfield_null_choices.py +++ b/netbox/wireless/migrations/0010_charfield_null_choices.py @@ -16,7 +16,6 @@ def set_null_values(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ('wireless', '0009_wirelesslink_distance'), ] @@ -47,8 +46,5 @@ class Migration(migrations.Migration): name='distance_unit', field=models.CharField(blank=True, max_length=50, null=True), ), - migrations.RunPython( - code=set_null_values, - reverse_code=migrations.RunPython.noop - ), + migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py b/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py index ea4470641..334d41bdd 100644 --- a/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py +++ b/netbox/wireless/migrations/0011_wirelesslan__location_wirelesslan__region_and_more.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('contenttypes', '0002_remove_content_type_name'), ('dcim', '0196_qinq_svlan'), diff --git a/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py b/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py index 7edaff92b..21f118bd0 100644 --- a/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py +++ b/netbox/wireless/migrations/0012_alter_wirelesslan__location_and_more.py @@ -5,7 +5,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('dcim', '0196_qinq_svlan'), ('wireless', '0011_wirelesslan__location_wirelesslan__region_and_more'), diff --git a/netbox/wireless/migrations/0013_natural_ordering.py b/netbox/wireless/migrations/0013_natural_ordering.py index e33c87c60..7caede643 100644 --- a/netbox/wireless/migrations/0013_natural_ordering.py +++ b/netbox/wireless/migrations/0013_natural_ordering.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('wireless', '0012_alter_wirelesslan__location_and_more'), ('dcim', '0197_natural_sort_collation'), diff --git a/netbox/wireless/tables/wirelesslan.py b/netbox/wireless/tables/wirelesslan.py index 40f52f8a5..fe9c0f5fa 100644 --- a/netbox/wireless/tables/wirelesslan.py +++ b/netbox/wireless/tables/wirelesslan.py @@ -72,7 +72,8 @@ class WirelessLANTable(TenancyColumnsMixin, NetBoxTable): model = WirelessLAN fields = ( 'pk', 'ssid', 'group', 'status', 'tenant', 'tenant_group', 'vlan', 'interface_count', 'auth_type', - 'auth_cipher', 'auth_psk', 'scope', 'scope_type', 'description', 'comments', 'tags', 'created', 'last_updated', + 'auth_cipher', 'auth_psk', 'scope', 'scope_type', 'description', 'comments', 'tags', 'created', + 'last_updated', ) default_columns = ('pk', 'ssid', 'group', 'status', 'description', 'vlan', 'auth_type', 'interface_count') diff --git a/netbox/wireless/tests/test_filtersets.py b/netbox/wireless/tests/test_filtersets.py index 76ef4e220..27aab83d8 100644 --- a/netbox/wireless/tests/test_filtersets.py +++ b/netbox/wireless/tests/test_filtersets.py @@ -27,8 +27,18 @@ class WirelessLANGroupTestCase(TestCase, ChangeLoggedFilterSetTests): group.save() groups = ( - WirelessLANGroup(name='Wireless LAN Group 1A', slug='wireless-lan-group-1a', parent=parent_groups[0], description='foobar1'), - WirelessLANGroup(name='Wireless LAN Group 1B', slug='wireless-lan-group-1b', parent=parent_groups[0], description='foobar2'), + WirelessLANGroup( + name='Wireless LAN Group 1A', + slug='wireless-lan-group-1a', + parent=parent_groups[0], + description='foobar1', + ), + WirelessLANGroup( + name='Wireless LAN Group 1B', + slug='wireless-lan-group-1b', + parent=parent_groups[0], + description='foobar2', + ), WirelessLANGroup(name='Wireless LAN Group 2A', slug='wireless-lan-group-2a', parent=parent_groups[1]), WirelessLANGroup(name='Wireless LAN Group 2B', slug='wireless-lan-group-2b', parent=parent_groups[1]), WirelessLANGroup(name='Wireless LAN Group 3A', slug='wireless-lan-group-3a', parent=parent_groups[2]), diff --git a/netbox/wireless/tests/test_views.py b/netbox/wireless/tests/test_views.py index 713ba81d7..51af37364 100644 --- a/netbox/wireless/tests/test_views.py +++ b/netbox/wireless/tests/test_views.py @@ -113,9 +113,20 @@ class WirelessLANTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.csv_data = ( "group,ssid,status,tenant,scope_type,scope_id", - f"Wireless LAN Group 2,WLAN4,{WirelessLANStatusChoices.STATUS_ACTIVE},{tenants[0].name},,", - f"Wireless LAN Group 2,WLAN5,{WirelessLANStatusChoices.STATUS_DISABLED},{tenants[1].name},dcim.site,{sites[0].pk}", - f"Wireless LAN Group 2,WLAN6,{WirelessLANStatusChoices.STATUS_RESERVED},{tenants[2].name},dcim.site,{sites[1].pk}", + "Wireless LAN Group 2,WLAN4,{status},{tenant},,".format( + status=WirelessLANStatusChoices.STATUS_ACTIVE, + tenant=tenants[0].name + ), + "Wireless LAN Group 2,WLAN5,{status},{tenant},dcim.site,{site}".format( + status=WirelessLANStatusChoices.STATUS_DISABLED, + tenant=tenants[1].name, + site=sites[0].pk + ), + "Wireless LAN Group 2,WLAN6,{status},{tenant},dcim.site,{site}".format( + status=WirelessLANStatusChoices.STATUS_RESERVED, + tenant=tenants[2].name, + site=sites[1].pk + ), ) cls.csv_update_data = ( @@ -157,11 +168,17 @@ class WirelessLinkTestCase(ViewTestCases.PrimaryObjectViewTestCase): ] Interface.objects.bulk_create(interfaces) - wirelesslink1 = WirelessLink(interface_a=interfaces[0], interface_b=interfaces[1], ssid='LINK1', tenant=tenants[0]) + wirelesslink1 = WirelessLink( + interface_a=interfaces[0], interface_b=interfaces[1], ssid='LINK1', tenant=tenants[0] + ) wirelesslink1.save() - wirelesslink2 = WirelessLink(interface_a=interfaces[2], interface_b=interfaces[3], ssid='LINK2', tenant=tenants[0]) + wirelesslink2 = WirelessLink( + interface_a=interfaces[2], interface_b=interfaces[3], ssid='LINK2', tenant=tenants[0] + ) wirelesslink2.save() - wirelesslink3 = WirelessLink(interface_a=interfaces[4], interface_b=interfaces[5], ssid='LINK3', tenant=tenants[0]) + wirelesslink3 = WirelessLink( + interface_a=interfaces[4], interface_b=interfaces[5], ssid='LINK3', tenant=tenants[0] + ) wirelesslink3.save() tags = create_tags('Alpha', 'Bravo', 'Charlie') diff --git a/ruff.toml b/ruff.toml index 94a0e1c61..12dac331e 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,4 +1,15 @@ +exclude = [ + "netbox/project-static/**" +] +line-length = 120 + [lint] -extend-select = ["E1", "E2", "E3", "W"] -ignore = ["E501", "F403", "F405"] +extend-select = ["E1", "E2", "E3", "E501", "W"] +ignore = ["F403", "F405"] preview = true + +[lint.per-file-ignores] +"template_code.py" = ["E501"] + +[format] +quote-style = "single" From ff7a59db2ec6cf322bb1887375ffb03e7a7f3c8e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Nov 2024 16:01:31 -0500 Subject: [PATCH 037/190] Closes #17752: Rename URL paths for bulk import to *_bulk_import --- netbox/circuits/tests/test_views.py | 8 +-- netbox/circuits/urls.py | 4 +- netbox/circuits/views.py | 16 ++--- netbox/core/views.py | 2 +- netbox/dcim/tests/test_views.py | 10 +-- netbox/dcim/views.py | 64 +++++++++---------- netbox/extras/tests/test_custom_validation.py | 4 +- netbox/extras/tests/test_customfields.py | 2 +- netbox/extras/views.py | 24 +++---- netbox/ipam/tests/test_views.py | 4 +- netbox/ipam/views.py | 34 +++++----- netbox/netbox/constants.py | 2 +- netbox/netbox/navigation/__init__.py | 8 +-- netbox/netbox/navigation/menu.py | 8 +-- netbox/netbox/tests/test_import.py | 14 ++-- netbox/templates/generic/object_list.html | 2 +- netbox/tenancy/views.py | 14 ++-- netbox/users/views.py | 6 +- netbox/utilities/templatetags/buttons.py | 2 +- netbox/utilities/testing/views.py | 14 ++-- netbox/virtualization/views.py | 14 ++-- netbox/vpn/views.py | 20 +++--- netbox/wireless/views.py | 6 +- 23 files changed, 141 insertions(+), 141 deletions(-) diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py index 3a9bd4dff..036bebe23 100644 --- a/netbox/circuits/tests/test_views.py +++ b/netbox/circuits/tests/test_views.py @@ -239,10 +239,10 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase): obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Try GET with model-level permission - self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(self._get_queryset().count(), initial_count + 1) @@ -655,10 +655,10 @@ class VirtualCircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase): obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Try GET with model-level permission - self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(self._get_queryset().count(), initial_count + 1) diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 56ba5eb8a..49eaa3910 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -37,7 +37,7 @@ urlpatterns = [ # Virtual circuits path('virtual-circuits/', views.VirtualCircuitListView.as_view(), name='virtualcircuit_list'), path('virtual-circuits/add/', views.VirtualCircuitEditView.as_view(), name='virtualcircuit_add'), - path('virtual-circuits/import/', views.VirtualCircuitBulkImportView.as_view(), name='virtualcircuit_import'), + path('virtual-circuits/import/', views.VirtualCircuitBulkImportView.as_view(), name='virtualcircuit_bulk_import'), path('virtual-circuits/edit/', views.VirtualCircuitBulkEditView.as_view(), name='virtualcircuit_bulk_edit'), path('virtual-circuits/delete/', views.VirtualCircuitBulkDeleteView.as_view(), name='virtualcircuit_bulk_delete'), path('virtual-circuits//', include(get_model_urls('circuits', 'virtualcircuit'))), @@ -56,7 +56,7 @@ urlpatterns = [ path( 'virtual-circuit-terminations/import/', views.VirtualCircuitTerminationBulkImportView.as_view(), - name='virtualcircuittermination_import', + name='virtualcircuittermination_bulk_import', ), path( 'virtual-circuit-terminations/edit/', diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 7410d0a8f..09f79789e 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -49,7 +49,7 @@ class ProviderDeleteView(generic.ObjectDeleteView): queryset = Provider.objects.all() -@register_model_view(Provider, 'import', detail=False) +@register_model_view(Provider, 'bulk_import', detail=False) class ProviderBulkImportView(generic.BulkImportView): queryset = Provider.objects.all() model_form = forms.ProviderImportForm @@ -115,7 +115,7 @@ class ProviderAccountDeleteView(generic.ObjectDeleteView): queryset = ProviderAccount.objects.all() -@register_model_view(ProviderAccount, 'import', detail=False) +@register_model_view(ProviderAccount, 'bulk_import', detail=False) class ProviderAccountBulkImportView(generic.BulkImportView): queryset = ProviderAccount.objects.all() model_form = forms.ProviderAccountImportForm @@ -189,7 +189,7 @@ class ProviderNetworkDeleteView(generic.ObjectDeleteView): queryset = ProviderNetwork.objects.all() -@register_model_view(ProviderNetwork, 'import', detail=False) +@register_model_view(ProviderNetwork, 'bulk_import', detail=False) class ProviderNetworkBulkImportView(generic.BulkImportView): queryset = ProviderNetwork.objects.all() model_form = forms.ProviderNetworkImportForm @@ -246,7 +246,7 @@ class CircuitTypeDeleteView(generic.ObjectDeleteView): queryset = CircuitType.objects.all() -@register_model_view(CircuitType, 'import', detail=False) +@register_model_view(CircuitType, 'bulk_import', detail=False) class CircuitTypeBulkImportView(generic.BulkImportView): queryset = CircuitType.objects.all() model_form = forms.CircuitTypeImportForm @@ -302,7 +302,7 @@ class CircuitDeleteView(generic.ObjectDeleteView): queryset = Circuit.objects.all() -@register_model_view(Circuit, 'import', detail=False) +@register_model_view(Circuit, 'bulk_import', detail=False) class CircuitBulkImportView(generic.BulkImportView): queryset = Circuit.objects.all() model_form = forms.CircuitImportForm @@ -447,7 +447,7 @@ class CircuitTerminationDeleteView(generic.ObjectDeleteView): queryset = CircuitTermination.objects.all() -@register_model_view(CircuitTermination, 'import', detail=False) +@register_model_view(CircuitTermination, 'bulk_import', detail=False) class CircuitTerminationBulkImportView(generic.BulkImportView): queryset = CircuitTermination.objects.all() model_form = forms.CircuitTerminationImportForm @@ -508,7 +508,7 @@ class CircuitGroupDeleteView(generic.ObjectDeleteView): queryset = CircuitGroup.objects.all() -@register_model_view(CircuitGroup, 'import', detail=False) +@register_model_view(CircuitGroup, 'bulk_import', detail=False) class CircuitGroupBulkImportView(generic.BulkImportView): queryset = CircuitGroup.objects.all() model_form = forms.CircuitGroupImportForm @@ -558,7 +558,7 @@ class CircuitGroupAssignmentDeleteView(generic.ObjectDeleteView): queryset = CircuitGroupAssignment.objects.all() -@register_model_view(CircuitGroupAssignment, 'import', detail=False) +@register_model_view(CircuitGroupAssignment, 'bulk_import', detail=False) class CircuitGroupAssignmentBulkImportView(generic.BulkImportView): queryset = CircuitGroupAssignment.objects.all() model_form = forms.CircuitGroupAssignmentImportForm diff --git a/netbox/core/views.py b/netbox/core/views.py index b49676d49..a9ec5d70a 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -105,7 +105,7 @@ class DataSourceDeleteView(generic.ObjectDeleteView): queryset = DataSource.objects.all() -@register_model_view(DataSource, 'import', detail=False) +@register_model_view(DataSource, 'bulk_import', detail=False) class DataSourceBulkImportView(generic.BulkImportView): queryset = DataSource.objects.all() model_form = forms.DataSourceImportForm diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index c2c5b6a01..bb942c685 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -900,7 +900,7 @@ inventory-items: 'data': IMPORT_DATA, 'format': 'yaml' } - response = self.client.post(reverse('dcim:devicetype_import'), data=form_data, follow=True) + response = self.client.post(reverse('dcim:devicetype_bulk_import'), data=form_data, follow=True) self.assertHttpStatus(response, 200) device_type = DeviceType.objects.get(model='TEST-1000') @@ -1228,7 +1228,7 @@ front-ports: 'data': IMPORT_DATA, 'format': 'yaml' } - response = self.client.post(reverse('dcim:moduletype_import'), data=form_data, follow=True) + response = self.client.post(reverse('dcim:moduletype_bulk_import'), data=form_data, follow=True) self.assertHttpStatus(response, 200) module_type = ModuleType.objects.get(model='TEST-1000') @@ -2170,7 +2170,7 @@ class ModuleTestCase( f"{device.name},{module_bay.name},{module_type.model},active,false" ] request = { - 'path': self._get_url('import'), + 'path': self._get_url('bulk_import'), 'data': { 'data': '\n'.join(csv_data), 'format': ImportFormatChoices.CSV, @@ -2187,7 +2187,7 @@ class ModuleTestCase( module_bay = ModuleBay.objects.get(device=device, name='Module Bay 5') csv_data[1] = f"{device.name},{module_bay.name},{module_type.model},active,true" request = { - 'path': self._get_url('import'), + 'path': self._get_url('bulk_import'), 'data': { 'data': '\n'.join(csv_data), 'format': ImportFormatChoices.CSV, @@ -2264,7 +2264,7 @@ class ModuleTestCase( f"{device.name},{module_bay.name},{module_type.model},active,false,true" ] request = { - 'path': self._get_url('import'), + 'path': self._get_url('bulk_import'), 'data': { 'data': '\n'.join(csv_data), 'format': ImportFormatChoices.CSV, diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 731034dc1..8b0628de5 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -266,7 +266,7 @@ class RegionDeleteView(generic.ObjectDeleteView): queryset = Region.objects.all() -@register_model_view(Region, 'import', detail=False) +@register_model_view(Region, 'bulk_import', detail=False) class RegionBulkImportView(generic.BulkImportView): queryset = Region.objects.all() model_form = forms.RegionImportForm @@ -359,7 +359,7 @@ class SiteGroupDeleteView(generic.ObjectDeleteView): queryset = SiteGroup.objects.all() -@register_model_view(SiteGroup, 'import', detail=False) +@register_model_view(SiteGroup, 'bulk_import', detail=False) class SiteGroupBulkImportView(generic.BulkImportView): queryset = SiteGroup.objects.all() model_form = forms.SiteGroupImportForm @@ -448,7 +448,7 @@ class SiteDeleteView(generic.ObjectDeleteView): queryset = Site.objects.all() -@register_model_view(Site, 'import', detail=False) +@register_model_view(Site, 'bulk_import', detail=False) class SiteBulkImportView(generic.BulkImportView): queryset = Site.objects.all() model_form = forms.SiteImportForm @@ -533,7 +533,7 @@ class LocationDeleteView(generic.ObjectDeleteView): queryset = Location.objects.all() -@register_model_view(Location, 'import', detail=False) +@register_model_view(Location, 'bulk_import', detail=False) class LocationBulkImportView(generic.BulkImportView): queryset = Location.objects.all() model_form = forms.LocationImportForm @@ -607,7 +607,7 @@ class RackRoleDeleteView(generic.ObjectDeleteView): queryset = RackRole.objects.all() -@register_model_view(RackRole, 'import', detail=False) +@register_model_view(RackRole, 'bulk_import', detail=False) class RackRoleBulkImportView(generic.BulkImportView): queryset = RackRole.objects.all() model_form = forms.RackRoleImportForm @@ -668,7 +668,7 @@ class RackTypeDeleteView(generic.ObjectDeleteView): queryset = RackType.objects.all() -@register_model_view(RackType, 'import', detail=False) +@register_model_view(RackType, 'bulk_import', detail=False) class RackTypeBulkImportView(generic.BulkImportView): queryset = RackType.objects.all() model_form = forms.RackTypeImportForm @@ -836,7 +836,7 @@ class RackDeleteView(generic.ObjectDeleteView): queryset = Rack.objects.all() -@register_model_view(Rack, 'import', detail=False) +@register_model_view(Rack, 'bulk_import', detail=False) class RackBulkImportView(generic.BulkImportView): queryset = Rack.objects.all() model_form = forms.RackImportForm @@ -898,7 +898,7 @@ class RackReservationDeleteView(generic.ObjectDeleteView): queryset = RackReservation.objects.all() -@register_model_view(RackReservation, 'import', detail=False) +@register_model_view(RackReservation, 'bulk_import', detail=False) class RackReservationImportView(generic.BulkImportView): queryset = RackReservation.objects.all() model_form = forms.RackReservationImportForm @@ -968,7 +968,7 @@ class ManufacturerDeleteView(generic.ObjectDeleteView): queryset = Manufacturer.objects.all() -@register_model_view(Manufacturer, 'import', detail=False) +@register_model_view(Manufacturer, 'bulk_import', detail=False) class ManufacturerBulkImportView(generic.BulkImportView): queryset = Manufacturer.objects.all() model_form = forms.ManufacturerImportForm @@ -1194,7 +1194,7 @@ class DeviceTypeInventoryItemsView(DeviceTypeComponentsView): ) -@register_model_view(DeviceType, 'import', detail=False) +@register_model_view(DeviceType, 'bulk_import', detail=False) class DeviceTypeImportView(generic.BulkImportView): additional_permissions = [ 'dcim.add_devicetype', @@ -1408,7 +1408,7 @@ class ModuleTypeModuleBaysView(ModuleTypeComponentsView): ) -@register_model_view(ModuleType, 'import', detail=False) +@register_model_view(ModuleType, 'bulk_import', detail=False) class ModuleTypeImportView(generic.BulkImportView): additional_permissions = [ 'dcim.add_moduletype', @@ -1904,7 +1904,7 @@ class DeviceRoleDeleteView(generic.ObjectDeleteView): queryset = DeviceRole.objects.all() -@register_model_view(DeviceRole, 'import', detail=False) +@register_model_view(DeviceRole, 'bulk_import', detail=False) class DeviceRoleBulkImportView(generic.BulkImportView): queryset = DeviceRole.objects.all() model_form = forms.DeviceRoleImportForm @@ -1968,7 +1968,7 @@ class PlatformDeleteView(generic.ObjectDeleteView): queryset = Platform.objects.all() -@register_model_view(Platform, 'import', detail=False) +@register_model_view(Platform, 'bulk_import', detail=False) class PlatformBulkImportView(generic.BulkImportView): queryset = Platform.objects.all() model_form = forms.PlatformImportForm @@ -2289,7 +2289,7 @@ class DeviceVirtualMachinesView(generic.ObjectChildrenView): return self.child_model.objects.restrict(request.user, 'view').filter(cluster=parent.cluster, device=parent) -@register_model_view(Device, 'import', detail=False) +@register_model_view(Device, 'bulk_import', detail=False) class DeviceBulkImportView(generic.BulkImportView): queryset = Device.objects.all() model_form = forms.DeviceImportForm @@ -2367,7 +2367,7 @@ class ModuleDeleteView(generic.ObjectDeleteView): queryset = Module.objects.all() -@register_model_view(Module, 'import', detail=False) +@register_model_view(Module, 'bulk_import', detail=False) class ModuleBulkImportView(generic.BulkImportView): queryset = Module.objects.all() model_form = forms.ModuleImportForm @@ -2428,7 +2428,7 @@ class ConsolePortDeleteView(generic.ObjectDeleteView): queryset = ConsolePort.objects.all() -@register_model_view(ConsolePort, 'import', detail=False) +@register_model_view(ConsolePort, 'bulk_import', detail=False) class ConsolePortBulkImportView(generic.BulkImportView): queryset = ConsolePort.objects.all() model_form = forms.ConsolePortImportForm @@ -2503,7 +2503,7 @@ class ConsoleServerPortDeleteView(generic.ObjectDeleteView): queryset = ConsoleServerPort.objects.all() -@register_model_view(ConsoleServerPort, 'import', detail=False) +@register_model_view(ConsoleServerPort, 'bulk_import', detail=False) class ConsoleServerPortBulkImportView(generic.BulkImportView): queryset = ConsoleServerPort.objects.all() model_form = forms.ConsoleServerPortImportForm @@ -2578,7 +2578,7 @@ class PowerPortDeleteView(generic.ObjectDeleteView): queryset = PowerPort.objects.all() -@register_model_view(PowerPort, 'import', detail=False) +@register_model_view(PowerPort, 'bulk_import', detail=False) class PowerPortBulkImportView(generic.BulkImportView): queryset = PowerPort.objects.all() model_form = forms.PowerPortImportForm @@ -2653,7 +2653,7 @@ class PowerOutletDeleteView(generic.ObjectDeleteView): queryset = PowerOutlet.objects.all() -@register_model_view(PowerOutlet, 'import', detail=False) +@register_model_view(PowerOutlet, 'bulk_import', detail=False) class PowerOutletBulkImportView(generic.BulkImportView): queryset = PowerOutlet.objects.all() model_form = forms.PowerOutletImportForm @@ -2785,7 +2785,7 @@ class InterfaceDeleteView(generic.ObjectDeleteView): queryset = Interface.objects.all() -@register_model_view(Interface, 'import', detail=False) +@register_model_view(Interface, 'bulk_import', detail=False) class InterfaceBulkImportView(generic.BulkImportView): queryset = Interface.objects.all() model_form = forms.InterfaceImportForm @@ -2871,7 +2871,7 @@ class FrontPortDeleteView(generic.ObjectDeleteView): queryset = FrontPort.objects.all() -@register_model_view(FrontPort, 'import', detail=False) +@register_model_view(FrontPort, 'bulk_import', detail=False) class FrontPortBulkImportView(generic.BulkImportView): queryset = FrontPort.objects.all() model_form = forms.FrontPortImportForm @@ -2946,7 +2946,7 @@ class RearPortDeleteView(generic.ObjectDeleteView): queryset = RearPort.objects.all() -@register_model_view(RearPort, 'import', detail=False) +@register_model_view(RearPort, 'bulk_import', detail=False) class RearPortBulkImportView(generic.BulkImportView): queryset = RearPort.objects.all() model_form = forms.RearPortImportForm @@ -3021,7 +3021,7 @@ class ModuleBayDeleteView(generic.ObjectDeleteView): queryset = ModuleBay.objects.all() -@register_model_view(ModuleBay, 'import', detail=False) +@register_model_view(ModuleBay, 'bulk_import', detail=False) class ModuleBayBulkImportView(generic.BulkImportView): queryset = ModuleBay.objects.all() model_form = forms.ModuleBayImportForm @@ -3168,7 +3168,7 @@ class DeviceBayDepopulateView(generic.ObjectEditView): }) -@register_model_view(DeviceBay, 'import', detail=False) +@register_model_view(DeviceBay, 'bulk_import', detail=False) class DeviceBayBulkImportView(generic.BulkImportView): queryset = DeviceBay.objects.all() model_form = forms.DeviceBayImportForm @@ -3234,7 +3234,7 @@ class InventoryItemDeleteView(generic.ObjectDeleteView): queryset = InventoryItem.objects.all() -@register_model_view(InventoryItem, 'import', detail=False) +@register_model_view(InventoryItem, 'bulk_import', detail=False) class InventoryItemBulkImportView(generic.BulkImportView): queryset = InventoryItem.objects.all() model_form = forms.InventoryItemImportForm @@ -3315,7 +3315,7 @@ class InventoryItemRoleDeleteView(generic.ObjectDeleteView): queryset = InventoryItemRole.objects.all() -@register_model_view(InventoryItemRole, 'import', detail=False) +@register_model_view(InventoryItemRole, 'bulk_import', detail=False) class InventoryItemRoleBulkImportView(generic.BulkImportView): queryset = InventoryItemRole.objects.all() model_form = forms.InventoryItemRoleImportForm @@ -3511,7 +3511,7 @@ class CableDeleteView(generic.ObjectDeleteView): queryset = Cable.objects.all() -@register_model_view(Cable, 'import', detail=False) +@register_model_view(Cable, 'bulk_import', detail=False) class CableBulkImportView(generic.BulkImportView): queryset = Cable.objects.all() model_form = forms.CableImportForm @@ -3812,7 +3812,7 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL }) -@register_model_view(VirtualChassis, 'import', detail=False) +@register_model_view(VirtualChassis, 'bulk_import', detail=False) class VirtualChassisBulkImportView(generic.BulkImportView): queryset = VirtualChassis.objects.all() model_form = forms.VirtualChassisImportForm @@ -3869,7 +3869,7 @@ class PowerPanelDeleteView(generic.ObjectDeleteView): queryset = PowerPanel.objects.all() -@register_model_view(PowerPanel, 'import', detail=False) +@register_model_view(PowerPanel, 'bulk_import', detail=False) class PowerPanelBulkImportView(generic.BulkImportView): queryset = PowerPanel.objects.all() model_form = forms.PowerPanelImportForm @@ -3926,7 +3926,7 @@ class PowerFeedDeleteView(generic.ObjectDeleteView): queryset = PowerFeed.objects.all() -@register_model_view(PowerFeed, 'import', detail=False) +@register_model_view(PowerFeed, 'bulk_import', detail=False) class PowerFeedBulkImportView(generic.BulkImportView): queryset = PowerFeed.objects.all() model_form = forms.PowerFeedImportForm @@ -3998,7 +3998,7 @@ class VirtualDeviceContextDeleteView(generic.ObjectDeleteView): queryset = VirtualDeviceContext.objects.all() -@register_model_view(VirtualDeviceContext, 'import', detail=False) +@register_model_view(VirtualDeviceContext, 'bulk_import', detail=False) class VirtualDeviceContextBulkImportView(generic.BulkImportView): queryset = VirtualDeviceContext.objects.all() model_form = forms.VirtualDeviceContextImportForm @@ -4048,7 +4048,7 @@ class MACAddressDeleteView(generic.ObjectDeleteView): queryset = MACAddress.objects.all() -@register_model_view(MACAddress, 'import', detail=False) +@register_model_view(MACAddress, 'bulk_import', detail=False) class MACAddressBulkImportView(generic.BulkImportView): queryset = MACAddress.objects.all() model_form = forms.MACAddressImportForm diff --git a/netbox/extras/tests/test_custom_validation.py b/netbox/extras/tests/test_custom_validation.py index 652bc241b..6eb90e5b0 100644 --- a/netbox/extras/tests/test_custom_validation.py +++ b/netbox/extras/tests/test_custom_validation.py @@ -191,7 +191,7 @@ class BulkImportCustomValidationTest(ModelViewTestCase): # Attempt to import providers without tags request = { - 'path': self._get_url('import'), + 'path': self._get_url('bulk_import'), 'data': post_data(data), } response = self.client.post(**request) @@ -207,7 +207,7 @@ class BulkImportCustomValidationTest(ModelViewTestCase): ) data['data'] = '\n'.join(csv_data) request = { - 'path': self._get_url('import'), + 'path': self._get_url('bulk_import'), 'data': post_data(data), } response = self.client.post(**request) diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index ce26cb889..d36477da8 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -1325,7 +1325,7 @@ class CustomFieldImportTest(TestCase): ) csv_data = '\n'.join(','.join(row) for row in data) - response = self.client.post(reverse('dcim:site_import'), { + response = self.client.post(reverse('dcim:site_bulk_import'), { 'data': csv_data, 'format': ImportFormatChoices.CSV, 'csv_delimiter': CSVDelimiterChoices.AUTO, diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 04f29a020..2c390a78c 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -82,7 +82,7 @@ class CustomFieldDeleteView(generic.ObjectDeleteView): queryset = CustomField.objects.select_related('choice_set') -@register_model_view(CustomField, 'import', detail=False) +@register_model_view(CustomField, 'bulk_import', detail=False) class CustomFieldBulkImportView(generic.BulkImportView): queryset = CustomField.objects.select_related('choice_set') model_form = forms.CustomFieldImportForm @@ -151,7 +151,7 @@ class CustomFieldChoiceSetDeleteView(generic.ObjectDeleteView): queryset = CustomFieldChoiceSet.objects.all() -@register_model_view(CustomFieldChoiceSet, 'import', detail=False) +@register_model_view(CustomFieldChoiceSet, 'bulk_import', detail=False) class CustomFieldChoiceSetBulkImportView(generic.BulkImportView): queryset = CustomFieldChoiceSet.objects.all() model_form = forms.CustomFieldChoiceSetImportForm @@ -201,7 +201,7 @@ class CustomLinkDeleteView(generic.ObjectDeleteView): queryset = CustomLink.objects.all() -@register_model_view(CustomLink, 'import', detail=False) +@register_model_view(CustomLink, 'bulk_import', detail=False) class CustomLinkBulkImportView(generic.BulkImportView): queryset = CustomLink.objects.all() model_form = forms.CustomLinkImportForm @@ -256,7 +256,7 @@ class ExportTemplateDeleteView(generic.ObjectDeleteView): queryset = ExportTemplate.objects.all() -@register_model_view(ExportTemplate, 'import', detail=False) +@register_model_view(ExportTemplate, 'bulk_import', detail=False) class ExportTemplateBulkImportView(generic.BulkImportView): queryset = ExportTemplate.objects.all() model_form = forms.ExportTemplateImportForm @@ -333,7 +333,7 @@ class SavedFilterDeleteView(SavedFilterMixin, generic.ObjectDeleteView): queryset = SavedFilter.objects.all() -@register_model_view(SavedFilter, 'import', detail=False) +@register_model_view(SavedFilter, 'bulk_import', detail=False) class SavedFilterBulkImportView(SavedFilterMixin, generic.BulkImportView): queryset = SavedFilter.objects.all() model_form = forms.SavedFilterImportForm @@ -414,7 +414,7 @@ class NotificationGroupDeleteView(generic.ObjectDeleteView): queryset = NotificationGroup.objects.all() -@register_model_view(NotificationGroup, 'import', detail=False) +@register_model_view(NotificationGroup, 'bulk_import', detail=False) class NotificationGroupBulkImportView(generic.BulkImportView): queryset = NotificationGroup.objects.all() model_form = forms.NotificationGroupImportForm @@ -560,7 +560,7 @@ class WebhookDeleteView(generic.ObjectDeleteView): queryset = Webhook.objects.all() -@register_model_view(Webhook, 'import', detail=False) +@register_model_view(Webhook, 'bulk_import', detail=False) class WebhookBulkImportView(generic.BulkImportView): queryset = Webhook.objects.all() model_form = forms.WebhookImportForm @@ -610,7 +610,7 @@ class EventRuleDeleteView(generic.ObjectDeleteView): queryset = EventRule.objects.all() -@register_model_view(EventRule, 'import', detail=False) +@register_model_view(EventRule, 'bulk_import', detail=False) class EventRuleBulkImportView(generic.BulkImportView): queryset = EventRule.objects.all() model_form = forms.EventRuleImportForm @@ -683,7 +683,7 @@ class TagDeleteView(generic.ObjectDeleteView): queryset = Tag.objects.all() -@register_model_view(Tag, 'import', detail=False) +@register_model_view(Tag, 'bulk_import', detail=False) class TagBulkImportView(generic.BulkImportView): queryset = Tag.objects.all() model_form = forms.TagImportForm @@ -859,7 +859,7 @@ class ConfigTemplateDeleteView(generic.ObjectDeleteView): queryset = ConfigTemplate.objects.all() -@register_model_view(ConfigTemplate, 'import', detail=False) +@register_model_view(ConfigTemplate, 'bulk_import', detail=False) class ConfigTemplateBulkImportView(generic.BulkImportView): queryset = ConfigTemplate.objects.all() model_form = forms.ConfigTemplateImportForm @@ -942,8 +942,8 @@ class JournalEntryListView(generic.ObjectListView): filterset_form = forms.JournalEntryFilterForm table = tables.JournalEntryTable actions = { - 'import': {'add'}, 'export': {'view'}, + 'bulk_import': {'add'}, 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, } @@ -983,7 +983,7 @@ class JournalEntryDeleteView(generic.ObjectDeleteView): return reverse(viewname, kwargs={'pk': obj.pk}) -@register_model_view(JournalEntry, 'import', detail=False) +@register_model_view(JournalEntry, 'bulk_import', detail=False) class JournalEntryBulkImportView(generic.BulkImportView): queryset = JournalEntry.objects.all() model_form = forms.JournalEntryImportForm diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index d26a82414..e9903d766 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -521,7 +521,7 @@ scope_id: {site.pk} 'data': IMPORT_DATA, 'format': 'yaml' } - response = self.client.post(reverse('ipam:prefix_import'), data=form_data, follow=True) + response = self.client.post(reverse('ipam:prefix_bulk_import'), data=form_data, follow=True) self.assertHttpStatus(response, 200) prefix = Prefix.objects.get(prefix='10.1.1.0/24') @@ -553,7 +553,7 @@ vlan: 102 'data': IMPORT_DATA, 'format': 'yaml' } - response = self.client.post(reverse('ipam:prefix_import'), data=form_data, follow=True) + response = self.client.post(reverse('ipam:prefix_bulk_import'), data=form_data, follow=True) self.assertHttpStatus(response, 200) prefix = Prefix.objects.get(prefix='10.1.2.0/24') diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 327c05f3d..f83934906 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -70,7 +70,7 @@ class VRFDeleteView(generic.ObjectDeleteView): queryset = VRF.objects.all() -@register_model_view(VRF, 'import', detail=False) +@register_model_view(VRF, 'bulk_import', detail=False) class VRFBulkImportView(generic.BulkImportView): queryset = VRF.objects.all() model_form = forms.VRFImportForm @@ -120,7 +120,7 @@ class RouteTargetDeleteView(generic.ObjectDeleteView): queryset = RouteTarget.objects.all() -@register_model_view(RouteTarget, 'import', detail=False) +@register_model_view(RouteTarget, 'bulk_import', detail=False) class RouteTargetBulkImportView(generic.BulkImportView): queryset = RouteTarget.objects.all() model_form = forms.RouteTargetImportForm @@ -177,7 +177,7 @@ class RIRDeleteView(generic.ObjectDeleteView): queryset = RIR.objects.all() -@register_model_view(RIR, 'import', detail=False) +@register_model_view(RIR, 'bulk_import', detail=False) class RIRBulkImportView(generic.BulkImportView): queryset = RIR.objects.all() model_form = forms.RIRImportForm @@ -252,7 +252,7 @@ class ASNRangeDeleteView(generic.ObjectDeleteView): queryset = ASNRange.objects.all() -@register_model_view(ASNRange, 'import', detail=False) +@register_model_view(ASNRange, 'bulk_import', detail=False) class ASNRangeBulkImportView(generic.BulkImportView): queryset = ASNRange.objects.all() model_form = forms.ASNRangeImportForm @@ -317,7 +317,7 @@ class ASNDeleteView(generic.ObjectDeleteView): queryset = ASN.objects.all() -@register_model_view(ASN, 'import', detail=False) +@register_model_view(ASN, 'bulk_import', detail=False) class ASNBulkImportView(generic.BulkImportView): queryset = ASN.objects.all() model_form = forms.ASNImportForm @@ -409,7 +409,7 @@ class AggregateDeleteView(generic.ObjectDeleteView): queryset = Aggregate.objects.all() -@register_model_view(Aggregate, 'import', detail=False) +@register_model_view(Aggregate, 'bulk_import', detail=False) class AggregateBulkImportView(generic.BulkImportView): queryset = Aggregate.objects.all() model_form = forms.AggregateImportForm @@ -477,7 +477,7 @@ class RoleDeleteView(generic.ObjectDeleteView): queryset = Role.objects.all() -@register_model_view(Role, 'import', detail=False) +@register_model_view(Role, 'bulk_import', detail=False) class RoleBulkImportView(generic.BulkImportView): queryset = Role.objects.all() model_form = forms.RoleImportForm @@ -663,7 +663,7 @@ class PrefixDeleteView(generic.ObjectDeleteView): queryset = Prefix.objects.all() -@register_model_view(Prefix, 'import', detail=False) +@register_model_view(Prefix, 'bulk_import', detail=False) class PrefixBulkImportView(generic.BulkImportView): queryset = Prefix.objects.all() model_form = forms.PrefixImportForm @@ -757,7 +757,7 @@ class IPRangeDeleteView(generic.ObjectDeleteView): queryset = IPRange.objects.all() -@register_model_view(IPRange, 'import', detail=False) +@register_model_view(IPRange, 'bulk_import', detail=False) class IPRangeBulkImportView(generic.BulkImportView): queryset = IPRange.objects.all() model_form = forms.IPRangeImportForm @@ -919,7 +919,7 @@ class IPAddressBulkCreateView(generic.BulkCreateView): template_name = 'ipam/ipaddress_bulk_add.html' -@register_model_view(IPAddress, 'import', detail=False) +@register_model_view(IPAddress, 'bulk_import', detail=False) class IPAddressBulkImportView(generic.BulkImportView): queryset = IPAddress.objects.all() model_form = forms.IPAddressImportForm @@ -997,7 +997,7 @@ class VLANGroupDeleteView(generic.ObjectDeleteView): queryset = VLANGroup.objects.all() -@register_model_view(VLANGroup, 'import', detail=False) +@register_model_view(VLANGroup, 'bulk_import', detail=False) class VLANGroupBulkImportView(generic.BulkImportView): queryset = VLANGroup.objects.all() model_form = forms.VLANGroupImportForm @@ -1082,7 +1082,7 @@ class VLANTranslationPolicyDeleteView(generic.ObjectDeleteView): queryset = VLANTranslationPolicy.objects.all() -@register_model_view(VLANTranslationPolicy, 'import', detail=False) +@register_model_view(VLANTranslationPolicy, 'bulk_import', detail=False) class VLANTranslationPolicyBulkImportView(generic.BulkImportView): queryset = VLANTranslationPolicy.objects.all() model_form = forms.VLANTranslationPolicyImportForm @@ -1137,7 +1137,7 @@ class VLANTranslationRuleDeleteView(generic.ObjectDeleteView): queryset = VLANTranslationRule.objects.all() -@register_model_view(VLANTranslationRule, 'import', detail=False) +@register_model_view(VLANTranslationRule, 'bulk_import', detail=False) class VLANTranslationRuleBulkImportView(generic.BulkImportView): queryset = VLANTranslationRule.objects.all() model_form = forms.VLANTranslationRuleImportForm @@ -1218,7 +1218,7 @@ class FHRPGroupDeleteView(generic.ObjectDeleteView): queryset = FHRPGroup.objects.all() -@register_model_view(FHRPGroup, 'import', detail=False) +@register_model_view(FHRPGroup, 'bulk_import', detail=False) class FHRPGroupBulkImportView(generic.BulkImportView): queryset = FHRPGroup.objects.all() model_form = forms.FHRPGroupImportForm @@ -1344,7 +1344,7 @@ class VLANDeleteView(generic.ObjectDeleteView): queryset = VLAN.objects.all() -@register_model_view(VLAN, 'import', detail=False) +@register_model_view(VLAN, 'bulk_import', detail=False) class VLANBulkImportView(generic.BulkImportView): queryset = VLAN.objects.all() model_form = forms.VLANImportForm @@ -1394,7 +1394,7 @@ class ServiceTemplateDeleteView(generic.ObjectDeleteView): queryset = ServiceTemplate.objects.all() -@register_model_view(ServiceTemplate, 'import', detail=False) +@register_model_view(ServiceTemplate, 'bulk_import', detail=False) class ServiceTemplateBulkImportView(generic.BulkImportView): queryset = ServiceTemplate.objects.all() model_form = forms.ServiceTemplateImportForm @@ -1449,7 +1449,7 @@ class ServiceDeleteView(generic.ObjectDeleteView): queryset = Service.objects.all() -@register_model_view(Service, 'import', detail=False) +@register_model_view(Service, 'bulk_import', detail=False) class ServiceBulkImportView(generic.BulkImportView): queryset = Service.objects.all() model_form = forms.ServiceImportForm diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index b8c679ec0..8d20fed45 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -31,8 +31,8 @@ ADVISORY_LOCK_KEYS = { # Default view action permission mapping DEFAULT_ACTION_PERMISSIONS = { 'add': {'add'}, - 'import': {'add'}, 'export': {'view'}, + 'bulk_import': {'add'}, 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, } diff --git a/netbox/netbox/navigation/__init__.py b/netbox/netbox/navigation/__init__.py index b4f7dbd9f..75ca8f440 100644 --- a/netbox/netbox/navigation/__init__.py +++ b/netbox/netbox/navigation/__init__.py @@ -60,7 +60,7 @@ class Menu: # Utility functions # -def get_model_item(app_label, model_name, label, actions=('add', 'import')): +def get_model_item(app_label, model_name, label, actions=('add', 'bulk_import')): return MenuItem( link=f'{app_label}:{model_name}_list', link_text=label, @@ -69,7 +69,7 @@ def get_model_item(app_label, model_name, label, actions=('add', 'import')): ) -def get_model_buttons(app_label, model_name, actions=('add', 'import')): +def get_model_buttons(app_label, model_name, actions=('add', 'bulk_import')): buttons = [] if 'add' in actions: @@ -81,10 +81,10 @@ def get_model_buttons(app_label, model_name, actions=('add', 'import')): permissions=[f'{app_label}.add_{model_name}'] ) ) - if 'import' in actions: + if 'bulk_import' in actions: buttons.append( MenuItemButton( - link=f'{app_label}:{model_name}_import', + link=f'{app_label}:{model_name}_bulk_import', title='Import', icon_class='mdi mdi-upload', permissions=[f'{app_label}.add_{model_name}'] diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index ba20e5f98..cf0649ac0 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -33,7 +33,7 @@ ORGANIZATION_MENU = Menu( get_model_item('tenancy', 'contact', _('Contacts')), get_model_item('tenancy', 'contactgroup', _('Contact Groups')), get_model_item('tenancy', 'contactrole', _('Contact Roles')), - get_model_item('tenancy', 'contactassignment', _('Contact Assignments'), actions=['import']), + get_model_item('tenancy', 'contactassignment', _('Contact Assignments'), actions=['bulk_import']), ), ), ), @@ -386,7 +386,7 @@ OPERATIONS_MENU = Menu( label=_('Logging'), items=( get_model_item('extras', 'notificationgroup', _('Notification Groups')), - get_model_item('extras', 'journalentry', _('Journal Entries'), actions=['import']), + get_model_item('extras', 'journalentry', _('Journal Entries'), actions=['bulk_import']), get_model_item('core', 'objectchange', _('Change Log'), actions=[]), ), ), @@ -413,7 +413,7 @@ ADMIN_MENU = Menu( permissions=['users.add_user'] ), MenuItemButton( - link='users:user_import', + link='users:user_bulk_import', title='Import', icon_class='mdi mdi-upload', permissions=['users.add_user'] @@ -433,7 +433,7 @@ ADMIN_MENU = Menu( permissions=['users.add_group'] ), MenuItemButton( - link='users:group_import', + link='users:group_bulk_import', title='Import', icon_class='mdi mdi-upload', permissions=['users.add_group'] diff --git a/netbox/netbox/tests/test_import.py b/netbox/netbox/tests/test_import.py index 16711ef72..690a6dc14 100644 --- a/netbox/netbox/tests/test_import.py +++ b/netbox/netbox/tests/test_import.py @@ -37,7 +37,7 @@ class CSVImportTestCase(ModelViewTestCase): } # Form validation should fail with invalid header present - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 200) self.assertEqual(Region.objects.count(), 0) # Correct the CSV header name @@ -45,7 +45,7 @@ class CSVImportTestCase(ModelViewTestCase): data['data'] = self._get_csv_data(csv_data) # Validation should succeed - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(Region.objects.count(), 3) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @@ -71,10 +71,10 @@ class CSVImportTestCase(ModelViewTestCase): obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Try GET with model-level permission - self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) regions = Region.objects.all() self.assertEqual(regions.count(), 4) self.assertEqual( @@ -111,10 +111,10 @@ class CSVImportTestCase(ModelViewTestCase): obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Try GET with model-level permission - self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 200) self.assertEqual(Region.objects.count(), 0) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @@ -138,6 +138,6 @@ class CSVImportTestCase(ModelViewTestCase): ) cf.object_types.set([ObjectType.objects.get_for_model(self.model)]) - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) region = Region.objects.get(slug='region-1') self.assertEqual(region.cf['tcf'], 'def-cf-text') diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index fdd3cd3d8..e6d5505a4 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -34,7 +34,7 @@ Context: {% if 'add' in actions %} {% add_button model %} {% endif %} - {% if 'import' in actions %} + {% if 'bulk_import' in actions %} {% import_button model %} {% endif %} {% if 'export' in actions %} diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py index 6f16842f6..0988d2e65 100644 --- a/netbox/tenancy/views.py +++ b/netbox/tenancy/views.py @@ -80,7 +80,7 @@ class TenantGroupDeleteView(generic.ObjectDeleteView): queryset = TenantGroup.objects.all() -@register_model_view(TenantGroup, 'import', detail=False) +@register_model_view(TenantGroup, 'bulk_import', detail=False) class TenantGroupBulkImportView(generic.BulkImportView): queryset = TenantGroup.objects.all() model_form = forms.TenantGroupImportForm @@ -147,7 +147,7 @@ class TenantDeleteView(generic.ObjectDeleteView): queryset = Tenant.objects.all() -@register_model_view(Tenant, 'import', detail=False) +@register_model_view(Tenant, 'bulk_import', detail=False) class TenantBulkImportView(generic.BulkImportView): queryset = Tenant.objects.all() model_form = forms.TenantImportForm @@ -215,7 +215,7 @@ class ContactGroupDeleteView(generic.ObjectDeleteView): queryset = ContactGroup.objects.all() -@register_model_view(ContactGroup, 'import', detail=False) +@register_model_view(ContactGroup, 'bulk_import', detail=False) class ContactGroupBulkImportView(generic.BulkImportView): queryset = ContactGroup.objects.all() model_form = forms.ContactGroupImportForm @@ -282,7 +282,7 @@ class ContactRoleDeleteView(generic.ObjectDeleteView): queryset = ContactRole.objects.all() -@register_model_view(ContactRole, 'import', detail=False) +@register_model_view(ContactRole, 'bulk_import', detail=False) class ContactRoleBulkImportView(generic.BulkImportView): queryset = ContactRole.objects.all() model_form = forms.ContactRoleImportForm @@ -334,7 +334,7 @@ class ContactDeleteView(generic.ObjectDeleteView): queryset = Contact.objects.all() -@register_model_view(Contact, 'import', detail=False) +@register_model_view(Contact, 'bulk_import', detail=False) class ContactBulkImportView(generic.BulkImportView): queryset = Contact.objects.all() model_form = forms.ContactImportForm @@ -370,8 +370,8 @@ class ContactAssignmentListView(generic.ObjectListView): filterset_form = forms.ContactAssignmentFilterForm table = tables.ContactAssignmentTable actions = { - 'import': {'add'}, 'export': {'view'}, + 'bulk_import': {'add'}, 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, } @@ -397,7 +397,7 @@ class ContactAssignmentEditView(generic.ObjectEditView): } -@register_model_view(ContactAssignment, 'import', detail=False) +@register_model_view(ContactAssignment, 'bulk_import', detail=False) class ContactAssignmentBulkImportView(generic.BulkImportView): queryset = ContactAssignment.objects.all() model_form = forms.ContactAssignmentImportForm diff --git a/netbox/users/views.py b/netbox/users/views.py index 904a44674..ca928e582 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -38,7 +38,7 @@ class TokenDeleteView(generic.ObjectDeleteView): queryset = Token.objects.all() -@register_model_view(Token, 'import', detail=False) +@register_model_view(Token, 'bulk_import', detail=False) class TokenBulkImportView(generic.BulkImportView): queryset = Token.objects.all() model_form = forms.TokenImportForm @@ -95,7 +95,7 @@ class UserDeleteView(generic.ObjectDeleteView): queryset = User.objects.all() -@register_model_view(User, 'import', detail=False) +@register_model_view(User, 'bulk_import', detail=False) class UserBulkImportView(generic.BulkImportView): queryset = User.objects.all() model_form = forms.UserImportForm @@ -146,7 +146,7 @@ class GroupDeleteView(generic.ObjectDeleteView): queryset = Group.objects.all() -@register_model_view(Group, 'import', detail=False) +@register_model_view(Group, 'bulk_import', detail=False) class GroupBulkImportView(generic.BulkImportView): queryset = Group.objects.all() model_form = forms.GroupImportForm diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py index 675fa98eb..d38c8863f 100644 --- a/netbox/utilities/templatetags/buttons.py +++ b/netbox/utilities/templatetags/buttons.py @@ -158,7 +158,7 @@ def add_button(model, action='add'): @register.inclusion_tag('buttons/import.html') -def import_button(model, action='import'): +def import_button(model, action='bulk_import'): try: url = reverse(get_viewname(model, action)) except NoReverseMatch: diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index 18c767bd0..c451649ff 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -594,10 +594,10 @@ class ViewTestCases: # Test GET without permission with disable_warnings('django.request'): - self.assertHttpStatus(self.client.get(self._get_url('import')), 403) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 403) # Try POST without permission - response = self.client.post(self._get_url('import'), data) + response = self.client.post(self._get_url('bulk_import'), data) with disable_warnings('django.request'): self.assertHttpStatus(response, 403) @@ -620,10 +620,10 @@ class ViewTestCases: obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Try GET with model-level permission - self.assertHttpStatus(self.client.get(self._get_url('import')), 200) + self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @@ -649,7 +649,7 @@ class ViewTestCases: obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Test POST with permission - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(initial_count, self._get_queryset().count()) reader = csv.DictReader(array, delimiter=',') @@ -684,7 +684,7 @@ class ViewTestCases: obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Attempt to import non-permitted objects - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 200) self.assertEqual(self._get_queryset().count(), initial_count) # Update permission constraints @@ -692,7 +692,7 @@ class ViewTestCases: obj_perm.save() # Import permitted objects - self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302) + self.assertHttpStatus(self.client.post(self._get_url('bulk_import'), data), 302) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) class BulkEditObjectsViewTestCase(ModelViewTestCase): diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index ccba12239..46613b742 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -63,7 +63,7 @@ class ClusterTypeDeleteView(generic.ObjectDeleteView): queryset = ClusterType.objects.all() -@register_model_view(ClusterType, 'import', detail=False) +@register_model_view(ClusterType, 'bulk_import', detail=False) class ClusterTypeBulkImportView(generic.BulkImportView): queryset = ClusterType.objects.all() model_form = forms.ClusterTypeImportForm @@ -124,7 +124,7 @@ class ClusterGroupDeleteView(generic.ObjectDeleteView): queryset = ClusterGroup.objects.all() -@register_model_view(ClusterGroup, 'import', detail=False) +@register_model_view(ClusterGroup, 'bulk_import', detail=False) class ClusterGroupBulkImportView(generic.BulkImportView): queryset = ClusterGroup.objects.annotate( cluster_count=count_related(Cluster, 'group') @@ -212,8 +212,8 @@ class ClusterDevicesView(generic.ObjectChildrenView): template_name = 'virtualization/cluster/devices.html' actions = { 'add': {'add'}, - 'import': {'add'}, 'export': {'view'}, + 'bulk_import': {'add'}, 'bulk_edit': {'change'}, 'bulk_remove_devices': {'change'}, } @@ -240,7 +240,7 @@ class ClusterDeleteView(generic.ObjectDeleteView): queryset = Cluster.objects.all() -@register_model_view(Cluster, 'import', detail=False) +@register_model_view(Cluster, 'bulk_import', detail=False) class ClusterBulkImportView(generic.BulkImportView): queryset = Cluster.objects.all() model_form = forms.ClusterImportForm @@ -489,7 +489,7 @@ class VirtualMachineDeleteView(generic.ObjectDeleteView): queryset = VirtualMachine.objects.all() -@register_model_view(VirtualMachine, 'import', detail=False) +@register_model_view(VirtualMachine, 'bulk_import', detail=False) class VirtualMachineBulkImportView(generic.BulkImportView): queryset = VirtualMachine.objects.all() model_form = forms.VirtualMachineImportForm @@ -588,7 +588,7 @@ class VMInterfaceDeleteView(generic.ObjectDeleteView): queryset = VMInterface.objects.all() -@register_model_view(VMInterface, 'import', detail=False) +@register_model_view(VMInterface, 'bulk_import', detail=False) class VMInterfaceBulkImportView(generic.BulkImportView): queryset = VMInterface.objects.all() model_form = forms.VMInterfaceImportForm @@ -651,7 +651,7 @@ class VirtualDiskDeleteView(generic.ObjectDeleteView): queryset = VirtualDisk.objects.all() -@register_model_view(VirtualDisk, 'import', detail=False) +@register_model_view(VirtualDisk, 'bulk_import', detail=False) class VirtualDiskBulkImportView(generic.BulkImportView): queryset = VirtualDisk.objects.all() model_form = forms.VirtualDiskImportForm diff --git a/netbox/vpn/views.py b/netbox/vpn/views.py index f1546bfbe..3372e9412 100644 --- a/netbox/vpn/views.py +++ b/netbox/vpn/views.py @@ -43,7 +43,7 @@ class TunnelGroupDeleteView(generic.ObjectDeleteView): queryset = TunnelGroup.objects.all() -@register_model_view(TunnelGroup, 'import', detail=False) +@register_model_view(TunnelGroup, 'bulk_import', detail=False) class TunnelGroupBulkImportView(generic.BulkImportView): queryset = TunnelGroup.objects.all() model_form = forms.TunnelGroupImportForm @@ -107,7 +107,7 @@ class TunnelDeleteView(generic.ObjectDeleteView): queryset = Tunnel.objects.all() -@register_model_view(Tunnel, 'import', detail=False) +@register_model_view(Tunnel, 'bulk_import', detail=False) class TunnelBulkImportView(generic.BulkImportView): queryset = Tunnel.objects.all() model_form = forms.TunnelImportForm @@ -161,7 +161,7 @@ class TunnelTerminationDeleteView(generic.ObjectDeleteView): queryset = TunnelTermination.objects.all() -@register_model_view(TunnelTermination, 'import', detail=False) +@register_model_view(TunnelTermination, 'bulk_import', detail=False) class TunnelTerminationBulkImportView(generic.BulkImportView): queryset = TunnelTermination.objects.all() model_form = forms.TunnelTerminationImportForm @@ -211,7 +211,7 @@ class IKEProposalDeleteView(generic.ObjectDeleteView): queryset = IKEProposal.objects.all() -@register_model_view(IKEProposal, 'import', detail=False) +@register_model_view(IKEProposal, 'bulk_import', detail=False) class IKEProposalBulkImportView(generic.BulkImportView): queryset = IKEProposal.objects.all() model_form = forms.IKEProposalImportForm @@ -261,7 +261,7 @@ class IKEPolicyDeleteView(generic.ObjectDeleteView): queryset = IKEPolicy.objects.all() -@register_model_view(IKEPolicy, 'import', detail=False) +@register_model_view(IKEPolicy, 'bulk_import', detail=False) class IKEPolicyBulkImportView(generic.BulkImportView): queryset = IKEPolicy.objects.all() model_form = forms.IKEPolicyImportForm @@ -311,7 +311,7 @@ class IPSecProposalDeleteView(generic.ObjectDeleteView): queryset = IPSecProposal.objects.all() -@register_model_view(IPSecProposal, 'import', detail=False) +@register_model_view(IPSecProposal, 'bulk_import', detail=False) class IPSecProposalBulkImportView(generic.BulkImportView): queryset = IPSecProposal.objects.all() model_form = forms.IPSecProposalImportForm @@ -361,7 +361,7 @@ class IPSecPolicyDeleteView(generic.ObjectDeleteView): queryset = IPSecPolicy.objects.all() -@register_model_view(IPSecPolicy, 'import', detail=False) +@register_model_view(IPSecPolicy, 'bulk_import', detail=False) class IPSecPolicyBulkImportView(generic.BulkImportView): queryset = IPSecPolicy.objects.all() model_form = forms.IPSecPolicyImportForm @@ -411,7 +411,7 @@ class IPSecProfileDeleteView(generic.ObjectDeleteView): queryset = IPSecProfile.objects.all() -@register_model_view(IPSecProfile, 'import', detail=False) +@register_model_view(IPSecProfile, 'bulk_import', detail=False) class IPSecProfileBulkImportView(generic.BulkImportView): queryset = IPSecProfile.objects.all() model_form = forms.IPSecProfileImportForm @@ -476,7 +476,7 @@ class L2VPNDeleteView(generic.ObjectDeleteView): queryset = L2VPN.objects.all() -@register_model_view(L2VPN, 'import', detail=False) +@register_model_view(L2VPN, 'bulk_import', detail=False) class L2VPNBulkImportView(generic.BulkImportView): queryset = L2VPN.objects.all() model_form = forms.L2VPNImportForm @@ -531,7 +531,7 @@ class L2VPNTerminationDeleteView(generic.ObjectDeleteView): queryset = L2VPNTermination.objects.all() -@register_model_view(L2VPNTermination, 'import', detail=False) +@register_model_view(L2VPNTermination, 'bulk_import', detail=False) class L2VPNTerminationBulkImportView(generic.BulkImportView): queryset = L2VPNTermination.objects.all() model_form = forms.L2VPNTerminationImportForm diff --git a/netbox/wireless/views.py b/netbox/wireless/views.py index 6c5ae6f94..c03564b27 100644 --- a/netbox/wireless/views.py +++ b/netbox/wireless/views.py @@ -48,7 +48,7 @@ class WirelessLANGroupDeleteView(generic.ObjectDeleteView): queryset = WirelessLANGroup.objects.all() -@register_model_view(WirelessLANGroup, 'import', detail=False) +@register_model_view(WirelessLANGroup, 'bulk_import', detail=False) class WirelessLANGroupBulkImportView(generic.BulkImportView): queryset = WirelessLANGroup.objects.all() model_form = forms.WirelessLANGroupImportForm @@ -123,7 +123,7 @@ class WirelessLANDeleteView(generic.ObjectDeleteView): queryset = WirelessLAN.objects.all() -@register_model_view(WirelessLAN, 'import', detail=False) +@register_model_view(WirelessLAN, 'bulk_import', detail=False) class WirelessLANBulkImportView(generic.BulkImportView): queryset = WirelessLAN.objects.all() model_form = forms.WirelessLANImportForm @@ -173,7 +173,7 @@ class WirelessLinkDeleteView(generic.ObjectDeleteView): queryset = WirelessLink.objects.all() -@register_model_view(WirelessLink, 'import', detail=False) +@register_model_view(WirelessLink, 'bulk_import', detail=False) class WirelessLinkBulkImportView(generic.BulkImportView): queryset = WirelessLink.objects.all() model_form = forms.WirelessLinkImportForm From 14d769a501d8a1a103e795ca667aba595b2030e2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 22 Nov 2024 13:39:52 -0500 Subject: [PATCH 038/190] Draft v4.2 release notes --- docs/release-notes/version-4.2.md | 118 ++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 docs/release-notes/version-4.2.md diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md new file mode 100644 index 000000000..c32bddaeb --- /dev/null +++ b/docs/release-notes/version-4.2.md @@ -0,0 +1,118 @@ +# NetBox v4.2 + +## v4.2.0 (FUTURE) + +### Breaking Changes + +* Support for the Django admin UI has been completely removed. (The Django admin UI was disabled by default in NetBox v4.0.) +* NetBox has adopted collation-based natural ordering for many models. This may alter the order in which some objects are listed by default. +* The `site` and `provider_network` foreign key fields on `circuits.CircuitTermination` have been replaced by the `termination` generic foreign key. +* The `site` foreign key field on `ipam.Prefix` has been replaced by the `scope` generic foreign key. +* The `site` foreign key field on `virtualization.Cluster` has been replaced by the `scope` generic foreign key. +* Obsolete nested REST API serializers have been removed. These were deprecated in NetBox v4.1 under [#17143](https://github.com/netbox-community/netbox/issues/17143). + +### New Features + +#### Assign Multiple MAC Addresses per Interface ([#4867](https://github.com/netbox-community/netbox/issues/4867)) + +MAC addresses are now managed as independent objects, rather than attributes on device and VM interfaces. NetBox now supports the assignment of multiple MAC addresses per interface, and allows a primary MAC address to be designated for each. + +#### Quick Add UI Widget ([#5858](https://github.com/netbox-community/netbox/issues/5858)) + +A new UI widget has been introduced to enable conveniently creating new related objects while creating or editing an object. For instance, it is now possible to create and assign a new device role when creating or editing a device from within the device form. + +#### VLAN Translation ([#7336](https://github.com/netbox-community/netbox/issues/7336)) + +User can now define policies which track the translation of VLAN IDs on IEEE 802.1Q-encapsulated interfaces. Translation policies can be reused across multiple interfaces. + +#### Virtual Circuits ([#13086](https://github.com/netbox-community/netbox/issues/13086)) + +New models have been introduced to support the documentation of virtual circuits as an extension to the physical circuit modeling already supported. This enables users to accurately reflect point-to-point or multipoint virtual circuits atop infrastructure comprising physical circuits and cables. + +#### Q-in-Q Encapsulation ([#13428](https://github.com/netbox-community/netbox/issues/13428)) + +NetBox now supports the designation of customer VLANs (CVLANs) and service VLANs (SVLANs) to support IEEE 802.1ad/Q-in-Q encapsulation. Each interface can now have it mode designated "Q-in-Q" and be assigned an SVLAN. + +### Enhancements + +* [#6414](https://github.com/netbox-community/netbox/issues/6414) - Prefixes can now be scoped by region, site group, site, or location +* [#7699](https://github.com/netbox-community/netbox/issues/7699) - Virtualization clusters can now be scoped by region, site group, site, or location +* [#9604](https://github.com/netbox-community/netbox/issues/9604) - The scope of a circuit termination now include a region, site group, site, location, or provider network +* [#10711](https://github.com/netbox-community/netbox/issues/10711) - Wireless LANs can now be scoped by region, site group, site, or location +* [#11279](https://github.com/netbox-community/netbox/issues/11279) - Improved the use of natural ordering for various models throughout the application +* [#12596](https://github.com/netbox-community/netbox/issues/12596) - Extended the virtualization clusters REST API endpoint to report on allocated VM resources +* [#16547](https://github.com/netbox-community/netbox/issues/16547) - Add a geographic distance field for circuits +* [#16783](https://github.com/netbox-community/netbox/issues/16783) - Add an operational status field for inventory items +* [#17195](https://github.com/netbox-community/netbox/issues/17195) - Add a color field for power outlets + +### Plugins + +* [#15093](https://github.com/netbox-community/netbox/issues/15093) - Introduced the `events_pipeline` configuration parameter, which allows plugins to hook into NetBox event processing +* [#16546](https://github.com/netbox-community/netbox/issues/16546) - NetBoxModel now provides a default `get_absolute_url()` method +* [#16971](https://github.com/netbox-community/netbox/issues/16971) - Plugins can now easily register system jobs to perform background tasks +* [#17029](https://github.com/netbox-community/netbox/issues/17029) - Registering a `PluginTemplateExtension` subclass for a single model has been deprecated (replace `model` with `models`) +* [#18023](https://github.com/netbox-community/netbox/issues/18023) - Extend `register_model_view()` to handle list views + +### Other Changes + +* [#16136](https://github.com/netbox-community/netbox/issues/16136) - Removed support for the Django admin UI +* [#17165](https://github.com/netbox-community/netbox/issues/17165) - All obsolete nested REST API serializers have been removed +* [#17472](https://github.com/netbox-community/netbox/issues/17472) - The legacy staged changes API has been deprecated, and will be removed in Netbox v4.3 +* [#17476](https://github.com/netbox-community/netbox/issues/17476) - Upgrade to Django 5.1 +* [#17752](https://github.com/netbox-community/netbox/issues/17752) - Bulk object import URL paths have been renamed from `*_import` to `*_bulk_import` +* [#17761](https://github.com/netbox-community/netbox/issues/17761) - Optional choice fields now store empty values as null (rather than empty strings) in the database + +### REST API Changes + +* Added the following endpoints: + * `/api/circuits/virtual-circuits/` + * `/api/circuits/virtual-circuit-terminations/` + * `/api/dcim/mac-addresses/` + * `/api/ipam/vlan-translation-policies/` + * `/api/ipam/vlan-translation-rules/` +* circuits.Circuit + * Added the optional `distance` and `distance_unit` fields +* circuits.CircuitTermination + * Removed the `site` & `provider_network` fields + * Added the `termination_type` & `termination_id` fields to facilitate termination assignment + * Added the read-only `termination` field +* dcim.Interface + * The `mac_address` field is now read-only + * Added the `primary_mac_address` relation to dcim.MACAddress + * Added the read-only `mac_addresses` list + * Added the `qinq_svlan` relation to ipam.VLAN + * Added the `vlan_translation_policy` relation to ipam.VLANTranslationPolicy + * Added `mode` choice "Q-in-Q" +* dcim.InventoryItem + * Added the optional `status` choice field +* dcim.Location + * Added the read-only `prefix_count` field +* dcim.PowerOutlet + * Added the optional `color` field +* dcim.Region + * Added the read-only `prefix_count` field +* dcim.SiteGroup + * Added the read-only `prefix_count` field +* ipam.Prefix + * Removed the `site` field + * Added the `scope_type` & `scope_id` fields to facilitate scope assignment + * Added the read-only `scope` field +* ipam.VLAN + * Added the optional `qinq_role` selection field + * Added the `qinq_svlan` recursive relation +* virtualization.Cluster + * Removed the `site` field + * Added the `scope_type` & `scope_id` fields to facilitate scope assignment + * Added the read-only `scope` field +* virtualization.Cluster + * Added the read-only fields `allocated_vcpus`, `allocated_memory`, and `allocated_disk` +* virtualization.VMInterface + * The `mac_address` field is now read-only + * Added the `primary_mac_address` relation to dcim.MACAddress + * Added the read-only `mac_addresses` list + * Added the `qinq_svlan` relation to ipam.VLAN + * Added the `vlan_translation_policy` relation to ipam.VLANTranslationPolicy + * Added `mode` choice "Q-in-Q" +* wireless.WirelessLAN + * Added the `scope_type` & `scope_id` fields to support scope assignment + * Added the read-only `scope` field From 0946a536f3d39fcbc137ab6fca1383ba2adcffe6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 09:56:02 -0500 Subject: [PATCH 039/190] #4867: Misc cleanup --- netbox/dcim/forms/common.py | 3 ++- netbox/dcim/forms/model_forms.py | 6 ++++++ netbox/netbox/navigation/menu.py | 12 ++++++------ netbox/templates/dcim/interface.html | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/forms/common.py b/netbox/dcim/forms/common.py index 04c53b384..65d0d0f23 100644 --- a/netbox/dcim/forms/common.py +++ b/netbox/dcim/forms/common.py @@ -23,7 +23,8 @@ class InterfaceCommonForm(forms.Form): primary_mac_address = DynamicModelChoiceField( queryset=MACAddress.objects.all(), label=_('Primary MAC address'), - required=False + required=False, + quick_add=True ) def __init__(self, *args, **kwargs): diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 37cce9060..3e6d87ff0 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -1758,11 +1758,17 @@ class MACAddressForm(NetBoxModelForm): label=_('Interface'), queryset=Interface.objects.all(), required=False, + context={ + 'parent': 'device', + }, ) vminterface = DynamicModelChoiceField( label=_('VM Interface'), queryset=VMInterface.objects.all(), required=False, + context={ + 'parent': 'virtual_machine', + }, ) fieldsets = ( diff --git a/netbox/netbox/navigation/menu.py b/netbox/netbox/navigation/menu.py index cf0649ac0..fbbd3d0b1 100644 --- a/netbox/netbox/navigation/menu.py +++ b/netbox/netbox/navigation/menu.py @@ -88,12 +88,6 @@ DEVICES_MENU = Menu( get_model_item('dcim', 'manufacturer', _('Manufacturers')), ), ), - MenuGroup( - label=_('Addressing'), - items=( - get_model_item('dcim', 'macaddress', _('MAC Addresses')), - ), - ), MenuGroup( label=_('Device Components'), items=( @@ -110,6 +104,12 @@ DEVICES_MENU = Menu( get_model_item('dcim', 'inventoryitemrole', _('Inventory Item Roles')), ), ), + MenuGroup( + label=_('Addressing'), + items=( + get_model_item('dcim', 'macaddress', _('MAC Addresses')), + ), + ), ), ) diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index b0d307bee..1658dd37e 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -124,8 +124,8 @@ {% trans "MAC Address" %} - {% if object.mac_address %} - {{ object.mac_address }} + {% if object.primary_mac_address %} + {{ object.primary_mac_address|linkify }} {% trans "Primary" %} {% else %} {{ ''|placeholder }} From 5afa6d796418a4f7412ee03c07d2a491545f146a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 09:26:01 -0500 Subject: [PATCH 040/190] Closed #18093: Remove redirects for pre-v4.1 virtual disk views --- netbox/virtualization/urls.py | 6 +----- netbox/virtualization/views.py | 10 ---------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/netbox/virtualization/urls.py b/netbox/virtualization/urls.py index 2aeeead77..679f6f229 100644 --- a/netbox/virtualization/urls.py +++ b/netbox/virtualization/urls.py @@ -1,4 +1,4 @@ -from django.urls import include, path, re_path +from django.urls import include, path from utilities.urls import get_model_urls from . import views @@ -33,8 +33,4 @@ urlpatterns = [ views.VirtualMachineBulkAddVirtualDiskView.as_view(), name='virtualmachine_bulk_add_virtualdisk' ), - - # TODO: Remove in v4.2 - # Redirect old (pre-v4.1) URLs for VirtualDisk views - re_path('disks/(?P[a-z0-9/-]*)', views.VirtualDiskRedirectView.as_view()), ] diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 46613b742..ef42f94ef 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -7,7 +7,6 @@ from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import gettext_lazy as _ -from django.views.generic.base import RedirectView from jinja2.exceptions import TemplateError from dcim.filtersets import DeviceFilterSet @@ -678,15 +677,6 @@ class VirtualDiskBulkDeleteView(generic.BulkDeleteView): table = tables.VirtualDiskTable -# TODO: Remove in v4.2 -class VirtualDiskRedirectView(RedirectView): - """ - Redirect old (pre-v4.1) URLs for VirtualDisk views. - """ - def get_redirect_url(self, path): - return f"{reverse('virtualization:virtualdisk_list')}{path}" - - # # Bulk Device component creation # From 6d65d92c3871a3bfa31b5b2110fff7502edcfd16 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 13:26:17 -0500 Subject: [PATCH 041/190] #7336: Misc cleanup --- netbox/ipam/api/serializers_/vlans.py | 6 +++--- netbox/ipam/forms/bulk_import.py | 6 ++++++ netbox/ipam/models/vlans.py | 2 ++ netbox/ipam/tables/vlans.py | 9 +++++++-- netbox/ipam/tests/test_views.py | 14 +++++++------- netbox/ipam/views.py | 4 +++- netbox/templates/ipam/vlantranslationpolicy.html | 10 ++++++++++ 7 files changed, 38 insertions(+), 13 deletions(-) diff --git a/netbox/ipam/api/serializers_/vlans.py b/netbox/ipam/api/serializers_/vlans.py index 05fdd5813..9b5501dc5 100644 --- a/netbox/ipam/api/serializers_/vlans.py +++ b/netbox/ipam/api/serializers_/vlans.py @@ -121,7 +121,7 @@ class VLANTranslationRuleSerializer(NetBoxModelSerializer): class Meta: model = VLANTranslationRule - fields = ['id', 'policy', 'local_vid', 'remote_vid'] + fields = ['id', 'url', 'display', 'policy', 'local_vid', 'remote_vid', 'description'] class VLANTranslationPolicySerializer(NetBoxModelSerializer): @@ -129,5 +129,5 @@ class VLANTranslationPolicySerializer(NetBoxModelSerializer): class Meta: model = VLANTranslationPolicy - fields = ['id', 'url', 'name', 'description', 'display', 'rules'] - brief_fields = ('id', 'url', 'name', 'description', 'display') + fields = ['id', 'url', 'display', 'name', 'description', 'display', 'rules'] + brief_fields = ('id', 'url', 'display', 'name', 'description') diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index 7e1382be9..e8d48de7c 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -487,6 +487,12 @@ class VLANTranslationPolicyImportForm(NetBoxModelImportForm): class VLANTranslationRuleImportForm(NetBoxModelImportForm): + policy = CSVModelChoiceField( + label=_('Policy'), + queryset=VLANTranslationPolicy.objects.all(), + to_field_name='name', + help_text=_('VLAN translation policy') + ) class Meta: model = VLANTranslationRule diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index dfa814619..4c7f191c9 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -379,6 +379,8 @@ class VLANTranslationRule(NetBoxModel): 'ipam.VLANTranslationPolicy', ) + clone_fields = ['policy'] + class Meta: verbose_name = _('VLAN translation rule') ordering = ('policy', 'local_vid',) diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index e3d7c7e63..aa1900e41 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -231,6 +231,11 @@ class VLANTranslationPolicyTable(NetBoxTable): verbose_name=_('Name'), linkify=True ) + rule_count = columns.LinkedCountColumn( + viewname='ipam:vlantranslationrule_list', + url_params={'policy_id': 'pk'}, + verbose_name=_('Rules') + ) description = tables.Column( verbose_name=_('Description'), ) @@ -241,9 +246,9 @@ class VLANTranslationPolicyTable(NetBoxTable): class Meta(NetBoxTable.Meta): model = VLANTranslationPolicy fields = ( - 'pk', 'id', 'name', 'description', 'tags', 'created', 'last_updated', + 'pk', 'id', 'name', 'rule_count', 'description', 'tags', 'created', 'last_updated', ) - default_columns = ('pk', 'name', 'description') + default_columns = ('pk', 'name', 'rule_count', 'description') class VLANTranslationRuleTable(NetBoxTable): diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index e9903d766..d7d367bb7 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -973,16 +973,16 @@ class VLANTranslationRuleTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.csv_data = ( "policy,local_vid,remote_vid", - f"{vlan_translation_policies[0].pk},103,203", - f"{vlan_translation_policies[0].pk},104,204", - f"{vlan_translation_policies[1].pk},105,205", + f"{vlan_translation_policies[0].name},103,203", + f"{vlan_translation_policies[0].name},104,204", + f"{vlan_translation_policies[1].name},105,205", ) cls.csv_update_data = ( - "id,policy,local_vid,remote_vid", - f"{vlan_translation_rules[0].pk},{vlan_translation_policies[1].pk},105,205", - f"{vlan_translation_rules[1].pk},{vlan_translation_policies[1].pk},106,206", - f"{vlan_translation_rules[2].pk},{vlan_translation_policies[0].pk},107,207", + "id,local_vid,remote_vid", + f"{vlan_translation_rules[0].pk},105,205", + f"{vlan_translation_rules[1].pk},106,206", + f"{vlan_translation_rules[2].pk},107,207", ) cls.bulk_edit_data = { diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index f83934906..f145716e9 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -1050,7 +1050,9 @@ class VLANGroupVLANsView(generic.ObjectChildrenView): @register_model_view(VLANTranslationPolicy, 'list', path='', detail=False) class VLANTranslationPolicyListView(generic.ObjectListView): - queryset = VLANTranslationPolicy.objects.all() + queryset = VLANTranslationPolicy.objects.annotate( + rule_count=count_related(VLANTranslationRule, 'policy'), + ) filterset = filtersets.VLANTranslationPolicyFilterSet filterset_form = forms.VLANTranslationPolicyFilterForm table = tables.VLANTranslationPolicyTable diff --git a/netbox/templates/ipam/vlantranslationpolicy.html b/netbox/templates/ipam/vlantranslationpolicy.html index 5217db913..58a1201d4 100644 --- a/netbox/templates/ipam/vlantranslationpolicy.html +++ b/netbox/templates/ipam/vlantranslationpolicy.html @@ -18,6 +18,16 @@ {% trans "Description" %} {{ object.description|placeholder }} + + {% trans "Rules" %} + + {% if object.rules.count %} + {{ object.rules.count }} + {% else %} + 0 + {% endif %} + +
    {% plugin_left_page object %} From 02cbdc10f20fa6699b291c2367b61af0250172b4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 13:28:17 -0500 Subject: [PATCH 042/190] #9604: Remove provider_network from CircuitTerminationSerializer & CircuitCircuitTerminationSerializer --- netbox/circuits/api/serializers_/circuits.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index 70644a7b7..9b25c3af2 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -54,13 +54,12 @@ class CircuitCircuitTerminationSerializer(WritableNestedSerializer): ) termination_id = serializers.IntegerField(allow_null=True, required=False, default=None) termination = serializers.SerializerMethodField(read_only=True) - provider_network = ProviderNetworkSerializer(nested=True, allow_null=True) class Meta: model = CircuitTermination fields = [ - 'id', 'url', 'display_url', 'display', 'termination_type', 'termination_id', 'termination', - 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'description', + 'id', 'url', 'display_url', 'display', 'termination_type', 'termination_id', 'termination', 'port_speed', + 'upstream_speed', 'xconnect_id', 'description', ] @extend_schema_field(serializers.JSONField(allow_null=True)) @@ -133,15 +132,14 @@ class CircuitTerminationSerializer(NetBoxModelSerializer, CabledObjectSerializer ) termination_id = serializers.IntegerField(allow_null=True, required=False, default=None) termination = serializers.SerializerMethodField(read_only=True) - provider_network = ProviderNetworkSerializer(nested=True, required=False, allow_null=True) class Meta: model = CircuitTermination fields = [ 'id', 'url', 'display_url', 'display', 'circuit', 'term_side', 'termination_type', 'termination_id', - 'termination', 'provider_network', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', - 'mark_connected', 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'tags', 'custom_fields', 'created', - 'last_updated', '_occupied', + 'termination', 'port_speed', 'upstream_speed', 'xconnect_id', 'pp_info', 'description', 'mark_connected', + 'cable', 'cable_end', 'link_peers', 'link_peers_type', 'tags', 'custom_fields', 'created', 'last_updated', + '_occupied', ] brief_fields = ('id', 'url', 'display', 'circuit', 'term_side', 'description', 'cable', '_occupied') From dd29c0ede56873522fa8989ef926d4f2093fe25b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 13:35:15 -0500 Subject: [PATCH 043/190] #16136: Remove obsolete accommodation for Django admin UI --- netbox/templates/django/forms/widgets/checkbox.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/netbox/templates/django/forms/widgets/checkbox.html b/netbox/templates/django/forms/widgets/checkbox.html index f769fce96..8a1e1d23a 100644 --- a/netbox/templates/django/forms/widgets/checkbox.html +++ b/netbox/templates/django/forms/widgets/checkbox.html @@ -1,7 +1,6 @@ {% comment %} Include a hidden field of the same name to ensure that unchecked checkboxes - are always included in the submitted form data. Omit fields names - _selected_action to avoid breaking the admin UI. + are always included in the submitted form data. {% endcomment %} -{% if widget.name != '_selected_action' %}{% endif %} + From b45b8f3a4d217494050533c1251dac601230fbe0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 14:02:45 -0500 Subject: [PATCH 044/190] #7336: Correct API test --- netbox/ipam/tests/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/ipam/tests/test_api.py b/netbox/ipam/tests/test_api.py index cbcb2e7c8..e9dcacc16 100644 --- a/netbox/ipam/tests/test_api.py +++ b/netbox/ipam/tests/test_api.py @@ -1080,7 +1080,7 @@ class VLANTranslationPolicyTest(APIViewTestCases.APIViewTestCase): class VLANTranslationRuleTest(APIViewTestCases.APIViewTestCase): model = VLANTranslationRule - brief_fields = ['id', 'local_vid', 'policy', 'remote_vid',] + brief_fields = ['description', 'display', 'id', 'local_vid', 'policy', 'remote_vid', 'url'] @classmethod def setUpTestData(cls): From 17189456c9e2d54e4ab67c1b38932c96d31b3968 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 14:51:59 -0500 Subject: [PATCH 045/190] #13086: Include button to terminate virtual circuit on interfaces table --- netbox/dcim/tables/template_code.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index e6f2c8817..449d55e14 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -390,6 +390,15 @@ INTERFACE_BUTTONS = """ {% endif %} + {% if perms.circuits.add_virtualcircuittermination and not record.virtual_circuit_termination %} + + + + {% elif perms.circuits.delete_virtualcircuittermination and record.virtual_circuit_termination %} + + + + {% endif %} {% elif record.is_wired and perms.dcim.add_cable %} From f17545788f8cb690c5e2b5bd9aebea020b2f0239 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 15:26:20 -0500 Subject: [PATCH 046/190] #16547: Reorder API serializer fields for Circuit --- netbox/circuits/api/serializers_/circuits.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/circuits/api/serializers_/circuits.py b/netbox/circuits/api/serializers_/circuits.py index 9b25c3af2..0365dca33 100644 --- a/netbox/circuits/api/serializers_/circuits.py +++ b/netbox/circuits/api/serializers_/circuits.py @@ -104,18 +104,19 @@ class CircuitSerializer(NetBoxModelSerializer): provider_account = ProviderAccountSerializer(nested=True, required=False, allow_null=True, default=None) status = ChoiceField(choices=CircuitStatusChoices, required=False) type = CircuitTypeSerializer(nested=True) + distance_unit = ChoiceField(choices=DistanceUnitChoices, allow_blank=True, required=False, allow_null=True) tenant = TenantSerializer(nested=True, required=False, allow_null=True) termination_a = CircuitCircuitTerminationSerializer(read_only=True, allow_null=True) termination_z = CircuitCircuitTerminationSerializer(read_only=True, allow_null=True) assignments = CircuitGroupAssignmentSerializer_(nested=True, many=True, required=False) - distance_unit = ChoiceField(choices=DistanceUnitChoices, allow_blank=True, required=False, allow_null=True) class Meta: model = Circuit fields = [ 'id', 'url', 'display_url', 'display', 'cid', 'provider', 'provider_account', 'type', 'status', 'tenant', - 'install_date', 'termination_date', 'commit_rate', 'description', 'termination_a', 'termination_z', - 'distance', 'distance_unit', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'assignments', + 'install_date', 'termination_date', 'commit_rate', 'description', 'distance', 'distance_unit', + 'termination_a', 'termination_z', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', + 'assignments', ] brief_fields = ('id', 'url', 'display', 'provider', 'cid', 'description') From b841875f6375990a4bf066abb888a6eb8ffeef05 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 15:30:15 -0500 Subject: [PATCH 047/190] #16783: Misc cleanup --- netbox/dcim/forms/filtersets.py | 2 +- netbox/templates/dcim/inventoryitem.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 4a373a996..37b8afd17 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -1524,7 +1524,7 @@ class InventoryItemFilterForm(DeviceComponentFilterForm): fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet( - 'name', 'label', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered', + 'name', 'label', 'status', 'role_id', 'manufacturer_id', 'serial', 'asset_tag', 'discovered', name=_('Attributes') ), FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', name=_('Location')), diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index f17bf2ade..fd8ea42eb 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -32,6 +32,10 @@ {% trans "Label" %} {{ object.label|placeholder }} + + {% trans "Status" %} + {% badge object.get_status_display bg_color=object.get_status_color %} + {% trans "Role" %} {{ object.role|linkify|placeholder }} @@ -56,10 +60,6 @@ {% trans "Asset Tag" %} {{ object.asset_tag|placeholder }} - - {% trans "Status" %} - {% badge object.get_status_display bg_color=object.get_status_color %} - {% trans "Description" %} {{ object.description|placeholder }} From d093b21bc0047f42d4e3b287f98f6403ac695480 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Nov 2024 16:50:53 -0500 Subject: [PATCH 048/190] #17761: Set null=True on Site.time_zone --- netbox/dcim/migrations/0194_charfield_null_choices.py | 8 ++++++++ netbox/dcim/models/sites.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/netbox/dcim/migrations/0194_charfield_null_choices.py b/netbox/dcim/migrations/0194_charfield_null_choices.py index 83c056386..e13b0e10d 100644 --- a/netbox/dcim/migrations/0194_charfield_null_choices.py +++ b/netbox/dcim/migrations/0194_charfield_null_choices.py @@ -1,3 +1,4 @@ +import timezone_field.fields from django.db import migrations, models @@ -24,6 +25,7 @@ def set_null_values(apps, schema_editor): Rack = apps.get_model('dcim', 'Rack') RackType = apps.get_model('dcim', 'RackType') RearPort = apps.get_model('dcim', 'RearPort') + Site = apps.get_model('dcim', 'Site') Cable.objects.filter(length_unit='').update(length_unit=None) Cable.objects.filter(type='').update(type=None) @@ -66,6 +68,7 @@ def set_null_values(apps, schema_editor): RackType.objects.filter(outer_unit='').update(outer_unit=None) RackType.objects.filter(weight_unit='').update(weight_unit=None) RearPort.objects.filter(cable_end='').update(cable_end=None) + Site.objects.filter(time_zone='').update(time_zone=None) class Migration(migrations.Migration): @@ -279,5 +282,10 @@ class Migration(migrations.Migration): name='cable_end', field=models.CharField(blank=True, max_length=1, null=True), ), + migrations.AlterField( + model_name='site', + name='time_zone', + field=timezone_field.fields.TimeZoneField(blank=True, null=True), + ), migrations.RunPython(code=set_null_values, reverse_code=migrations.RunPython.noop), ] diff --git a/netbox/dcim/models/sites.py b/netbox/dcim/models/sites.py index 0985a8d7a..7880a067f 100644 --- a/netbox/dcim/models/sites.py +++ b/netbox/dcim/models/sites.py @@ -189,7 +189,8 @@ class Site(ContactsMixin, ImageAttachmentsMixin, PrimaryModel): blank=True ) time_zone = TimeZoneField( - blank=True + blank=True, + null=True ) physical_address = models.CharField( verbose_name=_('physical address'), From 9b4b56febc3e1078fb1e18d05a4439d271b89fde Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Nov 2024 09:56:33 -0500 Subject: [PATCH 049/190] #13428: Misc cleanup --- netbox/dcim/forms/bulk_edit.py | 15 +++++++++++++-- netbox/dcim/forms/model_forms.py | 2 +- netbox/ipam/choices.py | 4 ++-- netbox/ipam/forms/bulk_import.py | 2 +- netbox/templates/dcim/interface.html | 6 ++++++ netbox/templates/ipam/vlan.html | 6 +++--- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 654459fce..dccca1bdf 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -7,6 +7,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import * from extras.models import ConfigTemplate +from ipam.choices import VLANQinQRoleChoices from ipam.models import ASN, VLAN, VLANGroup, VRF from netbox.choices import * from netbox.forms import NetBoxModelBulkEditForm @@ -1522,6 +1523,16 @@ class InterfaceBulkEditForm( 'available_on_device': '$device', } ) + qinq_svlan = DynamicModelChoiceField( + queryset=VLAN.objects.all(), + required=False, + label=_('Q-in-Q Service VLAN'), + query_params={ + 'group_id': '$vlan_group', + 'available_on_device': '$device', + 'qinq_role': VLANQinQRoleChoices.ROLE_SERVICE, + } + ) vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, @@ -1548,7 +1559,7 @@ class InterfaceBulkEditForm( FieldSet('vdcs', 'mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected', name=_('Operation')), FieldSet('poe_mode', 'poe_type', name=_('PoE')), FieldSet('parent', 'bridge', 'lag', name=_('Related Interfaces')), - FieldSet('mode', 'vlan_group', 'untagged_vlan', name=_('802.1Q Switching')), + FieldSet('mode', 'vlan_group', 'untagged_vlan', 'qinq_svlan', name=_('802.1Q Switching')), FieldSet( TabbedGroups( FieldSet('tagged_vlans', name=_('Assignment')), @@ -1563,7 +1574,7 @@ class InterfaceBulkEditForm( nullable_fields = ( 'module', 'label', 'parent', 'bridge', 'lag', 'speed', 'duplex', 'wwn', 'vdcs', 'mtu', 'description', 'poe_mode', 'poe_type', 'mode', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'tx_power', - 'untagged_vlan', 'tagged_vlans', 'vrf', 'wireless_lans' + 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'vrf', 'wireless_lans' ) def __init__(self, *args, **kwargs): diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 3e6d87ff0..d6fdb21e2 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -1395,7 +1395,7 @@ class InterfaceForm(InterfaceCommonForm, ModularDeviceComponentForm): 'available_on_device': '$device', } ) - qinq_svlan = DynamicModelMultipleChoiceField( + qinq_svlan = DynamicModelChoiceField( queryset=VLAN.objects.all(), required=False, label=_('Q-in-Q Service VLAN'), diff --git a/netbox/ipam/choices.py b/netbox/ipam/choices.py index 4d9c0bdd4..51b65a6da 100644 --- a/netbox/ipam/choices.py +++ b/netbox/ipam/choices.py @@ -159,8 +159,8 @@ class VLANStatusChoices(ChoiceSet): class VLANQinQRoleChoices(ChoiceSet): - ROLE_SERVICE = 's-vlan' - ROLE_CUSTOMER = 'c-vlan' + ROLE_SERVICE = 'svlan' + ROLE_CUSTOMER = 'cvlan' CHOICES = [ (ROLE_SERVICE, _('Service'), 'blue'), diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index e8d48de7c..0b37665d5 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -459,7 +459,7 @@ class VLANImportForm(NetBoxModelImportForm): ) qinq_role = CSVChoiceField( label=_('Q-in-Q role'), - choices=VLANStatusChoices, + choices=VLANQinQRoleChoices, required=False, help_text=_('Operational status') ) diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 1658dd37e..510780dd9 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -81,6 +81,12 @@ {% trans "802.1Q Mode" %} {{ object.get_mode_display|placeholder }} + {% if object.mode == 'q-in-q' %} + + {% trans "Q-in-Q SVLAN" %} + {{ object.qinq_svlan|linkify|placeholder }} + + {% endif %} {% trans "Transmit power (dBm)" %} {{ object.tx_power|placeholder }} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index a10a1439a..fa480f2f6 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -72,7 +72,7 @@ {% endif %} - {% if object.qinq_role == 'c-vlan' %} + {% if object.qinq_role == 'cvlan' %} {% trans "Q-in-Q SVLAN" %} {{ object.qinq_svlan|linkify|placeholder }} @@ -108,13 +108,13 @@ {% htmx_table 'ipam:prefix_list' vlan_id=object.pk %} - {% if object.qinq_role == 's-vlan' %} + {% if object.qinq_role == 'svlan' %}

    {% trans "Customer VLANs" %} {% if perms.ipam.add_vlan %}
    - + {% trans "Add a VLAN" %}
    From a24576f12607a73f24d2c75d9a2c97194a3066d6 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Tue, 26 Nov 2024 07:01:06 -0800 Subject: [PATCH 050/190] 7848 Add RQ API (#17938) * 7848 Add Background Tasks (RQ) to API * 7848 Tasks * 7848 cleanup * 7848 add worker support * 7848 switch to APIView * 7848 Task detail view * 7848 Task enqueue, requeue, stop * 7848 Task enqueue, requeue, stop * 7848 Task enqueue, requeue, stop * 7848 tests * 7848 tests * 7848 OpenAPI doc generation * 7848 OpenAPI doc generation * 7848 review changes * 7848 viewset * 7848 viewset * 7848 fix tests * 7848 more viewsets * 7848 fix docstring * 7848 review comments * 7848 review comments - get all tasks * 7848 queue detail view * 7848 cleanup * 7848 cleanup * 7848 cleanup * 7848 cleanup * Rename viewsets for consistency w/serializers * Misc cleanup * 7848 review changes * 7848 review changes * 7848 add test * 7848 queue detail view * 7848 fix tests * 7848 fix the spectacular test failure * 7848 fix the spectacular test failure * Misc cleanup --------- Co-authored-by: Jeremy Stretch --- netbox/core/api/schema.py | 3 + netbox/core/api/serializers.py | 1 + netbox/core/api/serializers_/tasks.py | 87 +++++++++++++ netbox/core/api/urls.py | 5 +- netbox/core/api/views.py | 161 ++++++++++++++++++++++++ netbox/core/tests/test_api.py | 170 +++++++++++++++++++++++++- netbox/core/utils.py | 155 +++++++++++++++++++++++ netbox/core/views.py | 104 ++-------------- netbox/netbox/api/pagination.py | 25 ++++ 9 files changed, 612 insertions(+), 99 deletions(-) create mode 100644 netbox/core/api/serializers_/tasks.py create mode 100644 netbox/core/utils.py diff --git a/netbox/core/api/schema.py b/netbox/core/api/schema.py index fad907ac1..663ee2899 100644 --- a/netbox/core/api/schema.py +++ b/netbox/core/api/schema.py @@ -158,6 +158,9 @@ class NetBoxAutoSchema(AutoSchema): fields = {} if hasattr(serializer, 'child') else serializer.fields remove_fields = [] + # If you get a failure here for "AttributeError: 'cached_property' object has no attribute 'items'" + # it is probably because you are using a viewsets.ViewSet for the API View and are defining a + # serializer_class. You will also need to define a get_serializer() method like for GenericAPIView. for child_name, child in fields.items(): # read_only fields don't need to be in writable (write only) serializers if 'read_only' in dir(child) and child.read_only: diff --git a/netbox/core/api/serializers.py b/netbox/core/api/serializers.py index 2dde6be9f..9a6d4d726 100644 --- a/netbox/core/api/serializers.py +++ b/netbox/core/api/serializers.py @@ -1,3 +1,4 @@ from .serializers_.change_logging import * from .serializers_.data import * from .serializers_.jobs import * +from .serializers_.tasks import * diff --git a/netbox/core/api/serializers_/tasks.py b/netbox/core/api/serializers_/tasks.py new file mode 100644 index 000000000..53f2b5126 --- /dev/null +++ b/netbox/core/api/serializers_/tasks.py @@ -0,0 +1,87 @@ +from rest_framework import serializers +from rest_framework.reverse import reverse + +__all__ = ( + 'BackgroundTaskSerializer', + 'BackgroundQueueSerializer', + 'BackgroundWorkerSerializer', +) + + +class BackgroundTaskSerializer(serializers.Serializer): + id = serializers.CharField() + url = serializers.HyperlinkedIdentityField( + view_name='core-api:rqtask-detail', + lookup_field='id', + lookup_url_kwarg='pk' + ) + description = serializers.CharField() + origin = serializers.CharField() + func_name = serializers.CharField() + args = serializers.ListField(child=serializers.CharField()) + kwargs = serializers.DictField() + result = serializers.CharField() + timeout = serializers.IntegerField() + result_ttl = serializers.IntegerField() + created_at = serializers.DateTimeField() + enqueued_at = serializers.DateTimeField() + started_at = serializers.DateTimeField() + ended_at = serializers.DateTimeField() + worker_name = serializers.CharField() + position = serializers.SerializerMethodField() + status = serializers.SerializerMethodField() + meta = serializers.DictField() + last_heartbeat = serializers.CharField() + + is_finished = serializers.BooleanField() + is_queued = serializers.BooleanField() + is_failed = serializers.BooleanField() + is_started = serializers.BooleanField() + is_deferred = serializers.BooleanField() + is_canceled = serializers.BooleanField() + is_scheduled = serializers.BooleanField() + is_stopped = serializers.BooleanField() + + def get_position(self, obj) -> int: + return obj.get_position() + + def get_status(self, obj) -> str: + return obj.get_status() + + +class BackgroundQueueSerializer(serializers.Serializer): + name = serializers.CharField() + url = serializers.SerializerMethodField() + jobs = serializers.IntegerField() + oldest_job_timestamp = serializers.CharField() + index = serializers.IntegerField() + scheduler_pid = serializers.CharField() + workers = serializers.IntegerField() + finished_jobs = serializers.IntegerField() + started_jobs = serializers.IntegerField() + deferred_jobs = serializers.IntegerField() + failed_jobs = serializers.IntegerField() + scheduled_jobs = serializers.IntegerField() + + def get_url(self, obj): + return reverse('core-api:rqqueue-detail', args=[obj['name']], request=self.context.get("request")) + + +class BackgroundWorkerSerializer(serializers.Serializer): + name = serializers.CharField() + url = serializers.HyperlinkedIdentityField( + view_name='core-api:rqworker-detail', + lookup_field='name' + ) + state = serializers.SerializerMethodField() + birth_date = serializers.DateTimeField() + queue_names = serializers.ListField( + child=serializers.CharField() + ) + pid = serializers.CharField() + successful_job_count = serializers.IntegerField() + failed_job_count = serializers.IntegerField() + total_working_time = serializers.IntegerField() + + def get_state(self, obj): + return obj.get_state() diff --git a/netbox/core/api/urls.py b/netbox/core/api/urls.py index 95ee1896e..3c22f1cf4 100644 --- a/netbox/core/api/urls.py +++ b/netbox/core/api/urls.py @@ -1,6 +1,7 @@ from netbox.api.routers import NetBoxRouter from . import views +app_name = 'core-api' router = NetBoxRouter() router.APIRootView = views.CoreRootView @@ -9,6 +10,8 @@ router.register('data-sources', views.DataSourceViewSet) router.register('data-files', views.DataFileViewSet) router.register('jobs', views.JobViewSet) router.register('object-changes', views.ObjectChangeViewSet) +router.register('background-queues', views.BackgroundQueueViewSet, basename='rqqueue') +router.register('background-workers', views.BackgroundWorkerViewSet, basename='rqworker') +router.register('background-tasks', views.BackgroundTaskViewSet, basename='rqtask') -app_name = 'core-api' urlpatterns = router.urls diff --git a/netbox/core/api/views.py b/netbox/core/api/views.py index b3a024c02..4e5b148fc 100644 --- a/netbox/core/api/views.py +++ b/netbox/core/api/views.py @@ -1,5 +1,8 @@ +from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404 from django.utils.translation import gettext_lazy as _ +from drf_spectacular.types import OpenApiTypes +from drf_spectacular.utils import extend_schema from rest_framework.decorators import action from rest_framework.exceptions import PermissionDenied from rest_framework.response import Response @@ -10,8 +13,17 @@ from core import filtersets from core.choices import DataSourceStatusChoices from core.jobs import SyncDataSourceJob from core.models import * +from core.utils import delete_rq_job, enqueue_rq_job, get_rq_jobs, requeue_rq_job, stop_rq_job +from django_rq.queues import get_redis_connection +from django_rq.utils import get_statistics +from django_rq.settings import QUEUES_LIST from netbox.api.metadata import ContentTypeMetadata +from netbox.api.pagination import LimitOffsetListPagination from netbox.api.viewsets import NetBoxModelViewSet, NetBoxReadOnlyModelViewSet +from rest_framework import viewsets +from rest_framework.permissions import IsAdminUser +from rq.job import Job as RQ_Job +from rq.worker import Worker from . import serializers @@ -71,3 +83,152 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet): queryset = ObjectChange.objects.valid_models() serializer_class = serializers.ObjectChangeSerializer filterset_class = filtersets.ObjectChangeFilterSet + + +class BaseRQViewSet(viewsets.ViewSet): + """ + Base class for RQ view sets. Provides a list() method. Subclasses must implement get_data(). + """ + permission_classes = [IsAdminUser] + serializer_class = None + + def get_data(self): + raise NotImplementedError() + + @extend_schema(responses={200: OpenApiTypes.OBJECT}) + def list(self, request): + data = self.get_data() + paginator = LimitOffsetListPagination() + data = paginator.paginate_list(data, request) + + serializer = self.serializer_class(data, many=True, context={'request': request}) + return paginator.get_paginated_response(serializer.data) + + def get_serializer(self, *args, **kwargs): + """ + Return the serializer instance that should be used for validating and + deserializing input, and for serializing output. + """ + serializer_class = self.get_serializer_class() + kwargs['context'] = self.get_serializer_context() + return serializer_class(*args, **kwargs) + + +class BackgroundQueueViewSet(BaseRQViewSet): + """ + Retrieve a list of RQ Queues. + Note: Queue names are not URL safe so not returning a detail view. + """ + serializer_class = serializers.BackgroundQueueSerializer + lookup_field = 'name' + lookup_value_regex = r'[\w.@+-]+' + + def get_view_name(self): + return "Background Queues" + + def get_data(self): + return get_statistics(run_maintenance_tasks=True)["queues"] + + @extend_schema(responses={200: OpenApiTypes.OBJECT}) + def retrieve(self, request, name): + data = self.get_data() + if not data: + raise Http404 + + for queue in data: + if queue['name'] == name: + serializer = self.serializer_class(queue, context={'request': request}) + return Response(serializer.data) + + raise Http404 + + +class BackgroundWorkerViewSet(BaseRQViewSet): + """ + Retrieve a list of RQ Workers. + """ + serializer_class = serializers.BackgroundWorkerSerializer + lookup_field = 'name' + + def get_view_name(self): + return "Background Workers" + + def get_data(self): + config = QUEUES_LIST[0] + return Worker.all(get_redis_connection(config['connection_config'])) + + def retrieve(self, request, name): + # all the RQ queues should use the same connection + config = QUEUES_LIST[0] + workers = Worker.all(get_redis_connection(config['connection_config'])) + worker = next((item for item in workers if item.name == name), None) + if not worker: + raise Http404 + + serializer = serializers.BackgroundWorkerSerializer(worker, context={'request': request}) + return Response(serializer.data) + + +class BackgroundTaskViewSet(BaseRQViewSet): + """ + Retrieve a list of RQ Tasks. + """ + serializer_class = serializers.BackgroundTaskSerializer + + def get_view_name(self): + return "Background Tasks" + + def get_data(self): + return get_rq_jobs() + + def get_task_from_id(self, task_id): + config = QUEUES_LIST[0] + task = RQ_Job.fetch(task_id, connection=get_redis_connection(config['connection_config'])) + if not task: + raise Http404 + + return task + + @extend_schema(responses={200: OpenApiTypes.OBJECT}) + def retrieve(self, request, pk): + """ + Retrieve the details of the specified RQ Task. + """ + task = self.get_task_from_id(pk) + serializer = self.serializer_class(task, context={'request': request}) + return Response(serializer.data) + + @action(methods=["POST"], detail=True) + def delete(self, request, pk): + """ + Delete the specified RQ Task. + """ + delete_rq_job(pk) + return HttpResponse(status=200) + + @action(methods=["POST"], detail=True) + def requeue(self, request, pk): + """ + Requeues the specified RQ Task. + """ + requeue_rq_job(pk) + return HttpResponse(status=200) + + @action(methods=["POST"], detail=True) + def enqueue(self, request, pk): + """ + Enqueues the specified RQ Task. + """ + enqueue_rq_job(pk) + return HttpResponse(status=200) + + @action(methods=["POST"], detail=True) + def stop(self, request, pk): + """ + Stops the specified RQ Task. + """ + stopped_jobs = stop_rq_job(pk) + if len(stopped_jobs) == 1: + return HttpResponse(status=200) + else: + return HttpResponse(status=204) diff --git a/netbox/core/tests/test_api.py b/netbox/core/tests/test_api.py index eeb3bd9c4..d8fb8fd83 100644 --- a/netbox/core/tests/test_api.py +++ b/netbox/core/tests/test_api.py @@ -1,7 +1,14 @@ +import uuid + +from django_rq import get_queue +from django_rq.workers import get_worker from django.urls import reverse from django.utils import timezone +from rq.job import Job as RQ_Job, JobStatus +from rq.registry import FailedJobRegistry, StartedJobRegistry -from utilities.testing import APITestCase, APIViewTestCases +from users.models import Token, User +from utilities.testing import APITestCase, APIViewTestCases, TestCase from ..models import * @@ -91,3 +98,164 @@ class DataFileTest( ), ) DataFile.objects.bulk_create(data_files) + + +class BackgroundTaskTestCase(TestCase): + user_permissions = () + + @staticmethod + def dummy_job_default(): + return "Job finished" + + @staticmethod + def dummy_job_failing(): + raise Exception("Job failed") + + def setUp(self): + """ + Create a user and token for API calls. + """ + # Create the test user and assign permissions + self.user = User.objects.create_user(username='testuser') + self.user.is_staff = True + self.user.is_active = True + self.user.save() + self.token = Token.objects.create(user=self.user) + self.header = {'HTTP_AUTHORIZATION': f'Token {self.token.key}'} + + # Clear all queues prior to running each test + get_queue('default').connection.flushall() + get_queue('high').connection.flushall() + get_queue('low').connection.flushall() + + def test_background_queue_list(self): + url = reverse('core-api:rqqueue-list') + + # Attempt to load view without permission + self.user.is_staff = False + self.user.save() + response = self.client.get(url, **self.header) + self.assertEqual(response.status_code, 403) + + # Load view with permission + self.user.is_staff = True + self.user.save() + response = self.client.get(url, **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn('default', str(response.content)) + self.assertIn('high', str(response.content)) + self.assertIn('low', str(response.content)) + + def test_background_queue(self): + response = self.client.get(reverse('core-api:rqqueue-detail', args=['default']), **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn('default', str(response.content)) + self.assertIn('oldest_job_timestamp', str(response.content)) + self.assertIn('scheduled_jobs', str(response.content)) + + def test_background_task_list(self): + queue = get_queue('default') + queue.enqueue(self.dummy_job_default) + + response = self.client.get(reverse('core-api:rqtask-list'), **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn('origin', str(response.content)) + self.assertIn('core.tests.test_api.BackgroundTaskTestCase.dummy_job_default()', str(response.content)) + + def test_background_task(self): + queue = get_queue('default') + job = queue.enqueue(self.dummy_job_default) + + response = self.client.get(reverse('core-api:rqtask-detail', args=[job.id]), **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn(str(job.id), str(response.content)) + self.assertIn('origin', str(response.content)) + self.assertIn('meta', str(response.content)) + self.assertIn('kwargs', str(response.content)) + + def test_background_task_delete(self): + queue = get_queue('default') + job = queue.enqueue(self.dummy_job_default) + + response = self.client.post(reverse('core-api:rqtask-delete', args=[job.id]), **self.header) + self.assertEqual(response.status_code, 200) + self.assertFalse(RQ_Job.exists(job.id, connection=queue.connection)) + queue = get_queue('default') + self.assertNotIn(job.id, queue.job_ids) + + def test_background_task_requeue(self): + queue = get_queue('default') + + # Enqueue & run a job that will fail + job = queue.enqueue(self.dummy_job_failing) + worker = get_worker('default') + worker.work(burst=True) + self.assertTrue(job.is_failed) + + # Re-enqueue the failed job and check that its status has been reset + response = self.client.post(reverse('core-api:rqtask-requeue', args=[job.id]), **self.header) + self.assertEqual(response.status_code, 200) + job = RQ_Job.fetch(job.id, queue.connection) + self.assertFalse(job.is_failed) + + def test_background_task_enqueue(self): + queue = get_queue('default') + + # Enqueue some jobs that each depends on its predecessor + job = previous_job = None + for _ in range(0, 3): + job = queue.enqueue(self.dummy_job_default, depends_on=previous_job) + previous_job = job + + # Check that the last job to be enqueued has a status of deferred + self.assertIsNotNone(job) + self.assertEqual(job.get_status(), JobStatus.DEFERRED) + self.assertIsNone(job.enqueued_at) + + # Force-enqueue the deferred job + response = self.client.post(reverse('core-api:rqtask-enqueue', args=[job.id]), **self.header) + self.assertEqual(response.status_code, 200) + + # Check that job's status is updated correctly + job = queue.fetch_job(job.id) + self.assertEqual(job.get_status(), JobStatus.QUEUED) + self.assertIsNotNone(job.enqueued_at) + + def test_background_task_stop(self): + queue = get_queue('default') + + worker = get_worker('default') + job = queue.enqueue(self.dummy_job_default) + worker.prepare_job_execution(job) + + self.assertEqual(job.get_status(), JobStatus.STARTED) + response = self.client.post(reverse('core-api:rqtask-stop', args=[job.id]), **self.header) + self.assertEqual(response.status_code, 200) + worker.monitor_work_horse(job, queue) # Sets the job as Failed and removes from Started + started_job_registry = StartedJobRegistry(queue.name, connection=queue.connection) + self.assertEqual(len(started_job_registry), 0) + + canceled_job_registry = FailedJobRegistry(queue.name, connection=queue.connection) + self.assertEqual(len(canceled_job_registry), 1) + self.assertIn(job.id, canceled_job_registry) + + def test_worker_list(self): + worker1 = get_worker('default', name=uuid.uuid4().hex) + worker1.register_birth() + + worker2 = get_worker('high') + worker2.register_birth() + + response = self.client.get(reverse('core-api:rqworker-list'), **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn(str(worker1.name), str(response.content)) + + def test_worker(self): + worker1 = get_worker('default', name=uuid.uuid4().hex) + worker1.register_birth() + + response = self.client.get(reverse('core-api:rqworker-detail', args=[worker1.name]), **self.header) + self.assertEqual(response.status_code, 200) + self.assertIn(str(worker1.name), str(response.content)) + self.assertIn('birth_date', str(response.content)) + self.assertIn('total_working_time', str(response.content)) diff --git a/netbox/core/utils.py b/netbox/core/utils.py new file mode 100644 index 000000000..26adfdfa2 --- /dev/null +++ b/netbox/core/utils.py @@ -0,0 +1,155 @@ +from django.http import Http404 +from django.utils.translation import gettext_lazy as _ +from django_rq.queues import get_queue, get_queue_by_index, get_redis_connection +from django_rq.settings import QUEUES_MAP, QUEUES_LIST +from django_rq.utils import get_jobs, stop_jobs +from rq import requeue_job +from rq.exceptions import NoSuchJobError +from rq.job import Job as RQ_Job, JobStatus as RQJobStatus +from rq.registry import ( + DeferredJobRegistry, + FailedJobRegistry, + FinishedJobRegistry, + ScheduledJobRegistry, + StartedJobRegistry, +) + +__all__ = ( + 'delete_rq_job', + 'enqueue_rq_job', + 'get_rq_jobs', + 'get_rq_jobs_from_status', + 'requeue_rq_job', + 'stop_rq_job', +) + + +def get_rq_jobs(): + """ + Return a list of all RQ jobs. + """ + jobs = set() + + for queue in QUEUES_LIST: + queue = get_queue(queue['name']) + jobs.update(queue.get_jobs()) + + return list(jobs) + + +def get_rq_jobs_from_status(queue, status): + """ + Return the RQ jobs with the given status. + """ + jobs = [] + + try: + registry_cls = { + RQJobStatus.STARTED: StartedJobRegistry, + RQJobStatus.DEFERRED: DeferredJobRegistry, + RQJobStatus.FINISHED: FinishedJobRegistry, + RQJobStatus.FAILED: FailedJobRegistry, + RQJobStatus.SCHEDULED: ScheduledJobRegistry, + }[status] + except KeyError: + raise Http404 + registry = registry_cls(queue.name, queue.connection) + + job_ids = registry.get_job_ids() + if status != RQJobStatus.DEFERRED: + jobs = get_jobs(queue, job_ids, registry) + else: + # Deferred jobs require special handling + for job_id in job_ids: + try: + jobs.append(RQ_Job.fetch(job_id, connection=queue.connection, serializer=queue.serializer)) + except NoSuchJobError: + pass + + if jobs and status == RQJobStatus.SCHEDULED: + for job in jobs: + job.scheduled_at = registry.get_scheduled_time(job) + + return jobs + + +def delete_rq_job(job_id): + """ + Delete the specified RQ job. + """ + config = QUEUES_LIST[0] + try: + job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) + except NoSuchJobError: + raise Http404(_("Job {job_id} not found").format(job_id=job_id)) + + queue_index = QUEUES_MAP[job.origin] + queue = get_queue_by_index(queue_index) + + # Remove job id from queue and delete the actual job + queue.connection.lrem(queue.key, 0, job.id) + job.delete() + + +def requeue_rq_job(job_id): + """ + Requeue the specified RQ job. + """ + config = QUEUES_LIST[0] + try: + job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) + except NoSuchJobError: + raise Http404(_("Job {id} not found.").format(id=job_id)) + + queue_index = QUEUES_MAP[job.origin] + queue = get_queue_by_index(queue_index) + + requeue_job(job_id, connection=queue.connection, serializer=queue.serializer) + + +def enqueue_rq_job(job_id): + """ + Enqueue the specified RQ job. + """ + config = QUEUES_LIST[0] + try: + job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) + except NoSuchJobError: + raise Http404(_("Job {id} not found.").format(id=job_id)) + + queue_index = QUEUES_MAP[job.origin] + queue = get_queue_by_index(queue_index) + + try: + # _enqueue_job is new in RQ 1.14, this is used to enqueue + # job regardless of its dependencies + queue._enqueue_job(job) + except AttributeError: + queue.enqueue_job(job) + + # Remove job from correct registry if needed + if job.get_status() == RQJobStatus.DEFERRED: + registry = DeferredJobRegistry(queue.name, queue.connection) + registry.remove(job) + elif job.get_status() == RQJobStatus.FINISHED: + registry = FinishedJobRegistry(queue.name, queue.connection) + registry.remove(job) + elif job.get_status() == RQJobStatus.SCHEDULED: + registry = ScheduledJobRegistry(queue.name, queue.connection) + registry.remove(job) + + +def stop_rq_job(job_id): + """ + Stop the specified RQ job. + """ + config = QUEUES_LIST[0] + try: + job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) + except NoSuchJobError: + raise Http404(_("Job {job_id} not found").format(job_id=job_id)) + + queue_index = QUEUES_MAP[job.origin] + queue = get_queue_by_index(queue_index) + + return stop_jobs(queue, job_id)[0] diff --git a/netbox/core/views.py b/netbox/core/views.py index a9ec5d70a..713807a82 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -14,16 +14,13 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import View from django_rq.queues import get_connection, get_queue_by_index, get_redis_connection from django_rq.settings import QUEUES_MAP, QUEUES_LIST -from django_rq.utils import get_jobs, get_statistics, stop_jobs -from rq import requeue_job +from django_rq.utils import get_statistics from rq.exceptions import NoSuchJobError from rq.job import Job as RQ_Job, JobStatus as RQJobStatus -from rq.registry import ( - DeferredJobRegistry, FailedJobRegistry, FinishedJobRegistry, ScheduledJobRegistry, StartedJobRegistry, -) from rq.worker import Worker from rq.worker_registration import clean_worker_registry +from core.utils import delete_rq_job, enqueue_rq_job, get_rq_jobs_from_status, requeue_rq_job, stop_rq_job from netbox.config import get_config, PARAMS from netbox.views import generic from netbox.views.generic.base import BaseObjectView @@ -363,41 +360,12 @@ class BackgroundTaskListView(TableMixin, BaseRQView): table = tables.BackgroundTaskTable def get_table_data(self, request, queue, status): - jobs = [] # Call get_jobs() to returned queued tasks if status == RQJobStatus.QUEUED: return queue.get_jobs() - # For other statuses, determine the registry to list (or raise a 404 for invalid statuses) - try: - registry_cls = { - RQJobStatus.STARTED: StartedJobRegistry, - RQJobStatus.DEFERRED: DeferredJobRegistry, - RQJobStatus.FINISHED: FinishedJobRegistry, - RQJobStatus.FAILED: FailedJobRegistry, - RQJobStatus.SCHEDULED: ScheduledJobRegistry, - }[status] - except KeyError: - raise Http404 - registry = registry_cls(queue.name, queue.connection) - - job_ids = registry.get_job_ids() - if status != RQJobStatus.DEFERRED: - jobs = get_jobs(queue, job_ids, registry) - else: - # Deferred jobs require special handling - for job_id in job_ids: - try: - jobs.append(RQ_Job.fetch(job_id, connection=queue.connection, serializer=queue.serializer)) - except NoSuchJobError: - pass - - if jobs and status == RQJobStatus.SCHEDULED: - for job in jobs: - job.scheduled_at = registry.get_scheduled_time(job) - - return jobs + return get_rq_jobs_from_status(queue, status) def get(self, request, queue_index, status): queue = get_queue_by_index(queue_index) @@ -463,19 +431,7 @@ class BackgroundTaskDeleteView(BaseRQView): form = ConfirmationForm(request.POST) if form.is_valid(): - # all the RQ queues should use the same connection - config = QUEUES_LIST[0] - try: - job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) - except NoSuchJobError: - raise Http404(_("Job {job_id} not found").format(job_id=job_id)) - - queue_index = QUEUES_MAP[job.origin] - queue = get_queue_by_index(queue_index) - - # Remove job id from queue and delete the actual job - queue.connection.lrem(queue.key, 0, job.id) - job.delete() + delete_rq_job(job_id) messages.success(request, _('Job {id} has been deleted.').format(id=job_id)) else: messages.error(request, _('Error deleting job {id}: {error}').format(id=job_id, error=form.errors[0])) @@ -486,17 +442,7 @@ class BackgroundTaskDeleteView(BaseRQView): class BackgroundTaskRequeueView(BaseRQView): def get(self, request, job_id): - # all the RQ queues should use the same connection - config = QUEUES_LIST[0] - try: - job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) - except NoSuchJobError: - raise Http404(_("Job {id} not found.").format(id=job_id)) - - queue_index = QUEUES_MAP[job.origin] - queue = get_queue_by_index(queue_index) - - requeue_job(job_id, connection=queue.connection, serializer=queue.serializer) + requeue_rq_job(job_id) messages.success(request, _('Job {id} has been re-enqueued.').format(id=job_id)) return redirect(reverse('core:background_task', args=[job_id])) @@ -505,33 +451,7 @@ class BackgroundTaskEnqueueView(BaseRQView): def get(self, request, job_id): # all the RQ queues should use the same connection - config = QUEUES_LIST[0] - try: - job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) - except NoSuchJobError: - raise Http404(_("Job {id} not found.").format(id=job_id)) - - queue_index = QUEUES_MAP[job.origin] - queue = get_queue_by_index(queue_index) - - try: - # _enqueue_job is new in RQ 1.14, this is used to enqueue - # job regardless of its dependencies - queue._enqueue_job(job) - except AttributeError: - queue.enqueue_job(job) - - # Remove job from correct registry if needed - if job.get_status() == RQJobStatus.DEFERRED: - registry = DeferredJobRegistry(queue.name, queue.connection) - registry.remove(job) - elif job.get_status() == RQJobStatus.FINISHED: - registry = FinishedJobRegistry(queue.name, queue.connection) - registry.remove(job) - elif job.get_status() == RQJobStatus.SCHEDULED: - registry = ScheduledJobRegistry(queue.name, queue.connection) - registry.remove(job) - + enqueue_rq_job(job_id) messages.success(request, _('Job {id} has been enqueued.').format(id=job_id)) return redirect(reverse('core:background_task', args=[job_id])) @@ -539,17 +459,7 @@ class BackgroundTaskEnqueueView(BaseRQView): class BackgroundTaskStopView(BaseRQView): def get(self, request, job_id): - # all the RQ queues should use the same connection - config = QUEUES_LIST[0] - try: - job = RQ_Job.fetch(job_id, connection=get_redis_connection(config['connection_config']),) - except NoSuchJobError: - raise Http404(_("Job {job_id} not found").format(job_id=job_id)) - - queue_index = QUEUES_MAP[job.origin] - queue = get_queue_by_index(queue_index) - - stopped_jobs = stop_jobs(queue, job_id)[0] + stopped_jobs = stop_rq_job(job_id) if len(stopped_jobs) == 1: messages.success(request, _('Job {id} has been stopped.').format(id=job_id)) else: diff --git a/netbox/netbox/api/pagination.py b/netbox/netbox/api/pagination.py index 5ecade264..f47434ebd 100644 --- a/netbox/netbox/api/pagination.py +++ b/netbox/netbox/api/pagination.py @@ -83,3 +83,28 @@ class StripCountAnnotationsPaginator(OptionalLimitOffsetPagination): cloned_queryset.query.annotations.clear() return cloned_queryset.count() + + +class LimitOffsetListPagination(LimitOffsetPagination): + """ + DRF LimitOffset Paginator but for list instead of queryset + """ + count = 0 + offset = 0 + + def paginate_list(self, data, request, view=None): + self.request = request + self.limit = self.get_limit(request) + self.count = len(data) + self.offset = self.get_offset(request) + + if self.limit is None: + self.limit = self.count + + if self.count == 0 or self.offset > self.count: + return [] + + if self.count > self.limit and self.template is not None: + self.display_page_controls = True + + return data[self.offset:self.offset + self.limit] From 64e56cd7c84b80fb78a293ba9cc6a5100c99b589 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Nov 2024 10:35:30 -0500 Subject: [PATCH 051/190] #16971: Improve example in documentation --- docs/plugins/development/background-jobs.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/plugins/development/background-jobs.md b/docs/plugins/development/background-jobs.md index d51981b9e..3d789b6b9 100644 --- a/docs/plugins/development/background-jobs.md +++ b/docs/plugins/development/background-jobs.md @@ -87,14 +87,17 @@ class MyHousekeepingJob(JobRunner): def run(self, *args, **kwargs): MyModel.objects.filter(foo='bar').delete() - -system_jobs = ( - MyHousekeepingJob, -) ``` !!! note - Ensure that any system jobs are imported on initialization. Otherwise, they won't be registered. This can be achieved by extending the PluginConfig's `ready()` method. + Ensure that any system jobs are imported on initialization. Otherwise, they won't be registered. This can be achieved by extending the PluginConfig's `ready()` method. For example: + + ```python + def ready(self): + super().ready() + + from .jobs import MyHousekeepingJob + ``` ## Task queues From 3ee951b0d08cfa0fca34a0d0fea36a39180a951f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Nov 2024 10:45:30 -0500 Subject: [PATCH 052/190] Fix missing/incorrect documentation links --- docs/models/virtualization/vminterface.md | 4 +- docs/plugins/development/index.md | 46 +++++++++++------------ mkdocs.yml | 4 ++ 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md index 6617b5e59..880cf927b 100644 --- a/docs/models/virtualization/vminterface.md +++ b/docs/models/virtualization/vminterface.md @@ -29,10 +29,10 @@ If not selected, this interface will be treated as disabled/inoperative. ### Primary MAC Address -The [MAC address](./macaddress.md) assigned to this interface which is designated as its primary. +The [MAC address](../dcim/macaddress.md) assigned to this interface which is designated as its primary. !!! note "Changed in NetBox v4.2" - The MAC address of an interface (formerly a concrete database field) is available as a property, `mac_address`, which reflects the value of the primary linked [MAC address](./macaddress.md) object. + The MAC address of an interface (formerly a concrete database field) is available as a property, `mac_address`, which reflects the value of the primary linked [MAC address](../dcim/macaddress.md) object. ### MTU diff --git a/docs/plugins/development/index.md b/docs/plugins/development/index.md index 8a83ab71b..246816349 100644 --- a/docs/plugins/development/index.md +++ b/docs/plugins/development/index.md @@ -98,29 +98,29 @@ NetBox looks for the `config` variable within a plugin's `__init__.py` to load i ### PluginConfig Attributes -| Name | Description | -|-----------------------|--------------------------------------------------------------------------------------------------------------------------| -| `name` | Raw plugin name; same as the plugin's source directory | -| `verbose_name` | Human-friendly name for the plugin | -| `version` | Current release ([semantic versioning](https://semver.org/) is encouraged) | -| `description` | Brief description of the plugin's purpose | -| `author` | Name of plugin's author | -| `author_email` | Author's public email address | -| `base_url` | Base path to use for plugin URLs (optional). If not specified, the project's `name` will be used. | -| `required_settings` | A list of any configuration parameters that **must** be defined by the user | -| `default_settings` | A dictionary of configuration parameters and their default values | -| `django_apps` | A list of additional Django apps to load alongside the plugin | -| `min_version` | Minimum version of NetBox with which the plugin is compatible | -| `max_version` | Maximum version of NetBox with which the plugin is compatible | -| `middleware` | A list of middleware classes to append after NetBox's build-in middleware | -| `queues` | A list of custom background task queues to create | -| `events_pipeline` | A list of handlers to add to [`EVENTS_PIPELINE`](./miscellaneous.md#events_pipeline), identified by dotted paths | -| `search_extensions` | The dotted path to the list of search index classes (default: `search.indexes`) | -| `data_backends` | The dotted path to the list of data source backend classes (default: `data_backends.backends`) | -| `template_extensions` | The dotted path to the list of template extension classes (default: `template_content.template_extensions`) | -| `menu_items` | The dotted path to the list of menu items provided by the plugin (default: `navigation.menu_items`) | -| `graphql_schema` | The dotted path to the plugin's GraphQL schema class, if any (default: `graphql.schema`) | -| `user_preferences` | The dotted path to the dictionary mapping of user preferences defined by the plugin (default: `preferences.preferences`) | +| Name | Description | +|-----------------------|------------------------------------------------------------------------------------------------------------------------------------| +| `name` | Raw plugin name; same as the plugin's source directory | +| `verbose_name` | Human-friendly name for the plugin | +| `version` | Current release ([semantic versioning](https://semver.org/) is encouraged) | +| `description` | Brief description of the plugin's purpose | +| `author` | Name of plugin's author | +| `author_email` | Author's public email address | +| `base_url` | Base path to use for plugin URLs (optional). If not specified, the project's `name` will be used. | +| `required_settings` | A list of any configuration parameters that **must** be defined by the user | +| `default_settings` | A dictionary of configuration parameters and their default values | +| `django_apps` | A list of additional Django apps to load alongside the plugin | +| `min_version` | Minimum version of NetBox with which the plugin is compatible | +| `max_version` | Maximum version of NetBox with which the plugin is compatible | +| `middleware` | A list of middleware classes to append after NetBox's build-in middleware | +| `queues` | A list of custom background task queues to create | +| `events_pipeline` | A list of handlers to add to [`EVENTS_PIPELINE`](../../configuration/miscellaneous.md#events_pipeline), identified by dotted paths | +| `search_extensions` | The dotted path to the list of search index classes (default: `search.indexes`) | +| `data_backends` | The dotted path to the list of data source backend classes (default: `data_backends.backends`) | +| `template_extensions` | The dotted path to the list of template extension classes (default: `template_content.template_extensions`) | +| `menu_items` | The dotted path to the list of menu items provided by the plugin (default: `navigation.menu_items`) | +| `graphql_schema` | The dotted path to the plugin's GraphQL schema class, if any (default: `graphql.schema`) | +| `user_preferences` | The dotted path to the dictionary mapping of user preferences defined by the plugin (default: `preferences.preferences`) | All required settings must be configured by the user. If a configuration parameter is listed in both `required_settings` and `default_settings`, the default setting will be ignored. diff --git a/mkdocs.yml b/mkdocs.yml index a66baa286..f870b69d6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -199,6 +199,7 @@ nav: - InventoryItemRole: 'models/dcim/inventoryitemrole.md' - InventoryItemTemplate: 'models/dcim/inventoryitemtemplate.md' - Location: 'models/dcim/location.md' + - MACAddress: 'models/dcim/macaddress.md' - Manufacturer: 'models/dcim/manufacturer.md' - Module: 'models/dcim/module.md' - ModuleBay: 'models/dcim/modulebay.md' @@ -257,6 +258,8 @@ nav: - ServiceTemplate: 'models/ipam/servicetemplate.md' - VLAN: 'models/ipam/vlan.md' - VLANGroup: 'models/ipam/vlangroup.md' + - VLANTranslationPolicy: 'models/ipam/vlantranslationpolicy.md' + - VLANTranslationRule: 'models/ipam/vlantranslationrule.md' - VRF: 'models/ipam/vrf.md' - Tenancy: - Contact: 'models/tenancy/contact.md' @@ -308,6 +311,7 @@ nav: - git Cheat Sheet: 'development/git-cheat-sheet.md' - Release Notes: - Summary: 'release-notes/index.md' + - Version 4.2: 'release-notes/version-4.2.md' - Version 4.1: 'release-notes/version-4.1.md' - Version 4.0: 'release-notes/version-4.0.md' - Version 3.7: 'release-notes/version-3.7.md' From d511ba487db89bf0a96bf0ab61cc43ad7298eaca Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Nov 2024 12:20:59 -0500 Subject: [PATCH 053/190] #13086: Add virtual circuit to InterfaceTable --- netbox/dcim/tables/devices.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 59d0845d5..963150a7a 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -647,6 +647,10 @@ class InterfaceTable(BaseInterfaceTable, ModularDeviceComponentTable, PathEndpoi verbose_name=_('VRF'), linkify=True ) + virtual_circuit_termination = tables.Column( + verbose_name=_('Virtual Circuit'), + linkify=True + ) tags = columns.TagColumn( url_name='dcim:interface_list' ) From 678d89d406d1cc21af4dc70bc8c861f397b7f385 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Nov 2024 12:38:29 -0500 Subject: [PATCH 054/190] Update documentation for v4.2 --- docs/configuration/miscellaneous.md | 1 + docs/configuration/system.md | 2 -- docs/features/notifications.md | 2 -- docs/models/circuits/circuitgroup.md | 2 -- docs/models/circuits/circuittermination.md | 2 ++ docs/models/circuits/virtualcircuit.md | 2 ++ docs/models/circuits/virtualcircuittermination.md | 2 ++ docs/models/dcim/interface.md | 5 +++++ docs/models/dcim/inventoryitem.md | 10 ++++++---- docs/models/dcim/macaddress.md | 2 ++ docs/models/dcim/modulebay.md | 2 -- docs/models/dcim/moduletype.md | 2 -- docs/models/dcim/poweroutlet.md | 2 ++ docs/models/dcim/racktype.md | 2 -- docs/models/extras/customfield.md | 2 -- docs/models/ipam/prefix.md | 6 ++++-- docs/models/ipam/vlan.md | 4 ++++ docs/models/ipam/vlangroup.md | 2 -- docs/models/ipam/vlantranslationpolicy.md | 2 ++ docs/models/ipam/vlantranslationrule.md | 2 ++ docs/models/virtualization/cluster.md | 2 ++ docs/models/virtualization/virtualmachine.md | 2 -- docs/models/virtualization/vminterface.md | 5 +++++ docs/models/wireless/wirelesslan.md | 2 ++ docs/models/wireless/wirelesslink.md | 2 -- docs/plugins/development/background-jobs.md | 4 ++-- docs/plugins/development/event-types.md | 2 -- docs/plugins/development/views.md | 2 -- docs/release-notes/index.md | 8 ++++++++ 29 files changed, 53 insertions(+), 32 deletions(-) diff --git a/docs/configuration/miscellaneous.md b/docs/configuration/miscellaneous.md index b983acd80..c14c0ac77 100644 --- a/docs/configuration/miscellaneous.md +++ b/docs/configuration/miscellaneous.md @@ -108,6 +108,7 @@ By default, NetBox will prevent the creation of duplicate prefixes and IP addres ## EVENTS_PIPELINE +!!! info "This parameter was introduced in NetBox v4.2." Default: `['extras.events.process_event_queue',]` diff --git a/docs/configuration/system.md b/docs/configuration/system.md index 25c724bc9..af3a6f5e6 100644 --- a/docs/configuration/system.md +++ b/docs/configuration/system.md @@ -89,8 +89,6 @@ addresses (and [`DEBUG`](./development.md#debug) is true). ## ISOLATED_DEPLOYMENT -!!! info "This feature was introduced in NetBox v4.1." - Default: False Set this configuration parameter to True for NetBox deployments which do not have Internet access. This will disable miscellaneous functionality which depends on access to the Internet. diff --git a/docs/features/notifications.md b/docs/features/notifications.md index a28a17947..0567a6db6 100644 --- a/docs/features/notifications.md +++ b/docs/features/notifications.md @@ -1,7 +1,5 @@ # Notifications -!!! info "This feature was introduced in NetBox v4.1." - NetBox includes a system for generating user notifications, which can be marked as read or deleted by individual users. There are two built-in mechanisms for generating a notification: * A user can subscribe to an object. When that object is modified, a notification is created to inform the user of the change. diff --git a/docs/models/circuits/circuitgroup.md b/docs/models/circuits/circuitgroup.md index faa9dbc14..6d1503509 100644 --- a/docs/models/circuits/circuitgroup.md +++ b/docs/models/circuits/circuitgroup.md @@ -1,7 +1,5 @@ # Circuit Groups -!!! info "This feature was introduced in NetBox v4.1." - [Circuits](./circuit.md) can be arranged into administrative groups for organization. The assignment of a circuit to a group is optional. ## Fields diff --git a/docs/models/circuits/circuittermination.md b/docs/models/circuits/circuittermination.md index 791863483..4b1a16ded 100644 --- a/docs/models/circuits/circuittermination.md +++ b/docs/models/circuits/circuittermination.md @@ -23,6 +23,8 @@ If selected, the circuit termination will be considered "connected" even if no c ### Termination +!!! info "This field replaced the `site` and `provider_network` fields in NetBox v4.2." + The [region](../dcim/region.md), [site group](../dcim/sitegroup.md), [site](../dcim/site.md), [location](../dcim/location.md) or [provider network](./providernetwork.md) with which this circuit termination is associated. Once created, a cable can be connected between the circuit termination and a device interface (or similar component). ### Port Speed diff --git a/docs/models/circuits/virtualcircuit.md b/docs/models/circuits/virtualcircuit.md index a379b6330..c81c654c8 100644 --- a/docs/models/circuits/virtualcircuit.md +++ b/docs/models/circuits/virtualcircuit.md @@ -1,5 +1,7 @@ # Virtual Circuits +!!! info "This feature was introduced in NetBox v4.2." + A virtual circuit can connect two or more interfaces atop a set of decoupled physical connections. For example, it's very common to form a virtual connection between two virtual interfaces, each of which is bound to a physical interface on its respective device and physically connected to a [provider network](./providernetwork.md) via an independent [physical circuit](./circuit.md). ## Fields diff --git a/docs/models/circuits/virtualcircuittermination.md b/docs/models/circuits/virtualcircuittermination.md index 82ea43eef..a7833e13c 100644 --- a/docs/models/circuits/virtualcircuittermination.md +++ b/docs/models/circuits/virtualcircuittermination.md @@ -1,5 +1,7 @@ # Virtual Circuit Terminations +!!! info "This feature was introduced in NetBox v4.2." + This model represents the connection of a virtual [interface](../dcim/interface.md) to a [virtual circuit](./virtualcircuit.md). ## Fields diff --git a/docs/models/dcim/interface.md b/docs/models/dcim/interface.md index f2af1a2ad..b7115050f 100644 --- a/docs/models/dcim/interface.md +++ b/docs/models/dcim/interface.md @@ -112,6 +112,7 @@ For switched Ethernet interfaces, this identifies the 802.1Q encapsulation strat * **Access:** All traffic is assigned to a single VLAN, with no tagging. * **Tagged:** One untagged "native" VLAN is allowed, as well as any number of tagged VLANs. * **Tagged (all):** Implies that all VLANs are carried by the interface. One untagged VLAN may be designated. +* **Q-in-Q:** Q-in-Q (IEEE 802.1ad) encapsulation is performed using the assigned SVLAN. This field must be left blank for routed interfaces which do employ 802.1Q encapsulation. @@ -125,6 +126,8 @@ The tagged VLANs which are configured to be carried by this interface. Valid onl ### Q-in-Q SVLAN +!!! info "This field was introduced in NetBox v4.2." + The assigned service VLAN (for Q-in-Q/802.1ad interfaces). ### Wireless Role @@ -152,4 +155,6 @@ The [wireless LANs](../wireless/wirelesslan.md) for which this interface carries ### VLAN Translation Policy +!!! info "This field was introduced in NetBox v4.2." + The [VLAN translation policy](../ipam/vlantranslationpolicy.md) that applies to this interface (optional). diff --git a/docs/models/dcim/inventoryitem.md b/docs/models/dcim/inventoryitem.md index a6dfa32db..2d648341b 100644 --- a/docs/models/dcim/inventoryitem.md +++ b/docs/models/dcim/inventoryitem.md @@ -25,6 +25,12 @@ The inventory item's name. If the inventory item is assigned to a parent item, i An alternative physical label identifying the inventory item. +### Status + +!!! info "This field was introduced in NetBox v4.2." + +The inventory item's operational status. + ### Role The functional [role](./inventoryitemrole.md) assigned to this inventory item. @@ -44,7 +50,3 @@ The serial number assigned by the manufacturer. ### Asset Tag A unique, locally-administered label used to identify hardware resources. - -### Status - -The inventory item's operational status. diff --git a/docs/models/dcim/macaddress.md b/docs/models/dcim/macaddress.md index fe3d1f0e3..5b1dd93be 100644 --- a/docs/models/dcim/macaddress.md +++ b/docs/models/dcim/macaddress.md @@ -1,5 +1,7 @@ # MAC Addresses +!!! info "This feature was introduced in NetBox v4.2." + A MAC address object in NetBox comprises a single Ethernet link layer address, and represents a MAC address as reported by or assigned to a network interface. MAC addresses can be assigned to [device](../dcim/device.md) and [virtual machine](../virtualization/virtualmachine.md) interfaces. A MAC address can be specified as the primary MAC address for a given device or VM interface. Most interfaces have only a single MAC address, hard-coded at the factory. However, on some devices (particularly virtual interfaces) it is possible to assign additional MAC addresses or change existing ones. For this reason NetBox allows multiple MACAddress objects to be assigned to a single interface. diff --git a/docs/models/dcim/modulebay.md b/docs/models/dcim/modulebay.md index 1bff799c2..494012a7b 100644 --- a/docs/models/dcim/modulebay.md +++ b/docs/models/dcim/modulebay.md @@ -16,8 +16,6 @@ The device to which this module bay belongs. ### Module -!!! info "This feature was introduced in NetBox v4.1." - The module to which this bay belongs (optional). ### Name diff --git a/docs/models/dcim/moduletype.md b/docs/models/dcim/moduletype.md index 225873d61..7077e16c2 100644 --- a/docs/models/dcim/moduletype.md +++ b/docs/models/dcim/moduletype.md @@ -42,6 +42,4 @@ The numeric weight of the module, including a unit designation (e.g. 3 kilograms ### Airflow -!!! info "The `airflow` field was introduced in NetBox v4.1." - The direction in which air circulates through the device chassis for cooling. diff --git a/docs/models/dcim/poweroutlet.md b/docs/models/dcim/poweroutlet.md index fe9390056..a99f60b23 100644 --- a/docs/models/dcim/poweroutlet.md +++ b/docs/models/dcim/poweroutlet.md @@ -31,6 +31,8 @@ The type of power outlet. ### Color +!!! info "This field was introduced in NetBox v4.2." + The power outlet's color (optional). ### Power Port diff --git a/docs/models/dcim/racktype.md b/docs/models/dcim/racktype.md index eeb90bd29..b5f2d99e7 100644 --- a/docs/models/dcim/racktype.md +++ b/docs/models/dcim/racktype.md @@ -1,7 +1,5 @@ # Rack Types -!!! info "This feature was introduced in NetBox v4.1." - A rack type defines the physical characteristics of a particular model of [rack](./rack.md). ## Fields diff --git a/docs/models/extras/customfield.md b/docs/models/extras/customfield.md index 9aab66a36..a5d083492 100644 --- a/docs/models/extras/customfield.md +++ b/docs/models/extras/customfield.md @@ -44,8 +44,6 @@ For object and multiple-object fields only. Designates the type of NetBox object ### Related Object Filter -!!! info "This field was introduced in NetBox v4.1." - For object and multi-object custom fields, a filter may be defined to limit the available objects when populating a field value. This filter maps object attributes to values. For example, `{"status": "active"}` will include only objects with a status of "active." !!! warning diff --git a/docs/models/ipam/prefix.md b/docs/models/ipam/prefix.md index 2fb01daf0..939ca3ea5 100644 --- a/docs/models/ipam/prefix.md +++ b/docs/models/ipam/prefix.md @@ -34,9 +34,11 @@ Designates whether the prefix should be treated as a pool. If selected, the firs If selected, this prefix will report 100% utilization regardless of how many child objects have been defined within it. -### Site +### Scope -The [site](../dcim/site.md) to which this prefix is assigned (optional). +!!! info "This field replaced the `site` field in NetBox v4.2." + +The [region](../dcim/region.md), [site](../dcim/site.md), [site group](../dcim/sitegroup.md) or [location](../dcim/location.md) to which the prefix is assigned (optional). ### VLAN diff --git a/docs/models/ipam/vlan.md b/docs/models/ipam/vlan.md index dc547ddbc..3c90d8cc9 100644 --- a/docs/models/ipam/vlan.md +++ b/docs/models/ipam/vlan.md @@ -29,8 +29,12 @@ The [VLAN group](./vlangroup.md) or [site](../dcim/site.md) to which the VLAN is ### Q-in-Q Role +!!! info "This field was introduced in NetBox v4.2." + For VLANs which comprise a Q-in-Q/IEEE 802.1ad topology, this field indicates whether the VLAN is treated as a service or customer VLAN. ### Q-in-Q Service VLAN +!!! info "This field was introduced in NetBox v4.2." + The designated parent service VLAN for a Q-in-Q customer VLAN. This may be set only for Q-in-Q custom VLANs. diff --git a/docs/models/ipam/vlangroup.md b/docs/models/ipam/vlangroup.md index 20989452f..67050ab4c 100644 --- a/docs/models/ipam/vlangroup.md +++ b/docs/models/ipam/vlangroup.md @@ -16,8 +16,6 @@ A unique URL-friendly identifier. (This value can be used for filtering.) ### VLAN ID Ranges -!!! info "This field replaced the legacy `min_vid` and `max_vid` fields in NetBox v4.1." - The set of VLAN IDs which are encompassed by the group. By default, this will be the entire range of valid IEEE 802.1Q VLAN IDs (1 to 4094, inclusive). VLANs created within a group must have a VID that falls within one of these ranges. Ranges may not overlap. ### Scope diff --git a/docs/models/ipam/vlantranslationpolicy.md b/docs/models/ipam/vlantranslationpolicy.md index 59541931e..9e3e8de98 100644 --- a/docs/models/ipam/vlantranslationpolicy.md +++ b/docs/models/ipam/vlantranslationpolicy.md @@ -1,5 +1,7 @@ # VLAN Translation Policies +!!! info "This feature was introduced in NetBox v4.2." + VLAN translation is a feature that consists of VLAN translation policies and [VLAN translation rules](./vlantranslationrule.md). Many rules can belong to a policy, and each rule defines a mapping of a local to remote VLAN ID (VID). A policy can then be assigned to an [Interface](../dcim/interface.md) or [VMInterface](../virtualization/vminterface.md), and all VLAN translation rules associated with that policy will be visible in the interface details. There are uniqueness constraints on `(policy, local_vid)` and on `(policy, remote_vid)` in the `VLANTranslationRule` model. Thus, you cannot have multiple rules linked to the same policy that have the same local VID or the same remote VID. A set of policies and rules might look like this: diff --git a/docs/models/ipam/vlantranslationrule.md b/docs/models/ipam/vlantranslationrule.md index bffc030ed..eb356d0d0 100644 --- a/docs/models/ipam/vlantranslationrule.md +++ b/docs/models/ipam/vlantranslationrule.md @@ -1,5 +1,7 @@ # VLAN Translation Rules +!!! info "This feature was introduced in NetBox v4.2." + A VLAN translation rule represents a one-to-one mapping of a local VLAN ID (VID) to a remote VID. Many rules can belong to a single policy. See [VLAN translation policies](./vlantranslationpolicy.md) for an overview of the VLAN Translation feature. diff --git a/docs/models/virtualization/cluster.md b/docs/models/virtualization/cluster.md index 9acdb2bc4..b9e6b608f 100644 --- a/docs/models/virtualization/cluster.md +++ b/docs/models/virtualization/cluster.md @@ -25,4 +25,6 @@ The cluster's operational status. ### Scope +!!! info "This field replaced the `site` field in NetBox v4.2." + The [region](../dcim/region.md), [site](../dcim/site.md), [site group](../dcim/sitegroup.md) or [location](../dcim/location.md) with which this cluster is associated. diff --git a/docs/models/virtualization/virtualmachine.md b/docs/models/virtualization/virtualmachine.md index 7ea31111c..a90b2752d 100644 --- a/docs/models/virtualization/virtualmachine.md +++ b/docs/models/virtualization/virtualmachine.md @@ -57,6 +57,4 @@ The amount of disk storage provisioned, in megabytes. ### Serial Number -!!! info "This field was introduced in NetBox v4.1." - Optional serial number assigned to this virtual machine. Unlike devices, uniqueness is not enforced for virtual machine serial numbers. diff --git a/docs/models/virtualization/vminterface.md b/docs/models/virtualization/vminterface.md index 880cf927b..ba0c68b15 100644 --- a/docs/models/virtualization/vminterface.md +++ b/docs/models/virtualization/vminterface.md @@ -45,6 +45,7 @@ For switched Ethernet interfaces, this identifies the 802.1Q encapsulation strat * **Access:** All traffic is assigned to a single VLAN, with no tagging. * **Tagged:** One untagged "native" VLAN is allowed, as well as any number of tagged VLANs. * **Tagged (all):** Implies that all VLANs are carried by the interface. One untagged VLAN may be designated. +* **Q-in-Q:** Q-in-Q (IEEE 802.1ad) encapsulation is performed using the assigned SVLAN. This field must be left blank for routed interfaces which do employ 802.1Q encapsulation. @@ -58,6 +59,8 @@ The tagged VLANs which are configured to be carried by this interface. Valid onl ### Q-in-Q SVLAN +!!! info "This field was introduced in NetBox v4.2." + The assigned service VLAN (for Q-in-Q/802.1ad interfaces). ### VRF @@ -66,4 +69,6 @@ The [virtual routing and forwarding](../ipam/vrf.md) instance to which this inte ### VLAN Translation Policy +!!! info "This field was introduced in NetBox v4.2." + The [VLAN translation policy](../ipam/vlantranslationpolicy.md) that applies to this interface (optional). diff --git a/docs/models/wireless/wirelesslan.md b/docs/models/wireless/wirelesslan.md index a448c42a2..2ce673086 100644 --- a/docs/models/wireless/wirelesslan.md +++ b/docs/models/wireless/wirelesslan.md @@ -46,4 +46,6 @@ The security key configured on each client to grant access to the secured wirele ### Scope +!!! info "This field was introduced in NetBox v4.2." + The [region](../dcim/region.md), [site](../dcim/site.md), [site group](../dcim/sitegroup.md) or [location](../dcim/location.md) with which this wireless LAN is associated. diff --git a/docs/models/wireless/wirelesslink.md b/docs/models/wireless/wirelesslink.md index 7553902b0..a9fd6b4fc 100644 --- a/docs/models/wireless/wirelesslink.md +++ b/docs/models/wireless/wirelesslink.md @@ -22,8 +22,6 @@ The service set identifier (SSID) for the wireless link (optional). ### Distance -!!! info "This field was introduced in NetBox v4.1." - The distance between the link's two endpoints, including a unit designation (e.g. 100 meters or 25 feet). ### Authentication Type diff --git a/docs/plugins/development/background-jobs.md b/docs/plugins/development/background-jobs.md index 3d789b6b9..9be52c3ca 100644 --- a/docs/plugins/development/background-jobs.md +++ b/docs/plugins/development/background-jobs.md @@ -1,7 +1,5 @@ # Background Jobs -!!! info "This feature was introduced in NetBox v4.1." - NetBox plugins can defer certain operations by enqueuing [background jobs](../../features/background-jobs.md), which are executed asynchronously by background workers. This is helpful for decoupling long-running processes from the user-facing request-response cycle. For example, your plugin might need to fetch data from a remote system. Depending on the amount of data and the responsiveness of the remote server, this could take a few minutes. Deferring this task to a queued job ensures that it can be completed in the background, without interrupting the user. The data it fetches can be made available once the job has completed. @@ -69,6 +67,8 @@ class MyModel(NetBoxModel): ### System Jobs +!!! info "This feature was introduced in NetBox v4.2." + Some plugins may implement background jobs that are decoupled from the request/response cycle. Typical use cases would be housekeeping tasks or synchronization jobs. These can be registered as _system jobs_ using the `system_job()` decorator. The job interval must be passed as an integer (in minutes) when registering a system job. System jobs are scheduled automatically when the RQ worker (`manage.py rqworker`) is run. #### Example diff --git a/docs/plugins/development/event-types.md b/docs/plugins/development/event-types.md index 4bcdeea31..65e2bbc5c 100644 --- a/docs/plugins/development/event-types.md +++ b/docs/plugins/development/event-types.md @@ -1,7 +1,5 @@ # Event Types -!!! info "This feature was introduced in NetBox v4.1." - Plugins can register their own custom event types for use with NetBox [event rules](../../models/extras/eventrule.md). This is accomplished by calling the `register()` method on an instance of the `EventType` class. This can be done anywhere within the plugin. An example is provided below. ```python diff --git a/docs/plugins/development/views.md b/docs/plugins/development/views.md index 3b6213917..e3740de59 100644 --- a/docs/plugins/development/views.md +++ b/docs/plugins/development/views.md @@ -206,8 +206,6 @@ Plugins can inject custom content into certain areas of core NetBox views. This | `right_page()` | Object view | Inject content on the right side of the page | | `full_width_page()` | Object view | Inject content across the entire bottom of the page | -!!! info "The `navbar()` and `alerts()` methods were introduced in NetBox v4.1." - Additionally, a `render()` method is available for convenience. This method accepts the name of a template to render, and any additional context data you want to pass. Its use is optional, however. To control where the custom content is injected, plugin authors can specify an iterable of models by overriding the `models` attribute on the subclass. Extensions which do not specify a set of models will be invoked on every view, where supported. diff --git a/docs/release-notes/index.md b/docs/release-notes/index.md index 82da8cc4e..d996224c1 100644 --- a/docs/release-notes/index.md +++ b/docs/release-notes/index.md @@ -10,6 +10,14 @@ Minor releases are published in April, August, and December of each calendar yea This page contains a history of all major and minor releases since NetBox v2.0. For more detail on a specific patch release, please see the release notes page for that specific minor release. +#### [Version 4.2](./version-4.2.md) (January 2025) + +* Assign Multiple MAC Addresses per Interface ([#4867](https://github.com/netbox-community/netbox/issues/4867)) +* Quick Add UI Widget ([#5858](https://github.com/netbox-community/netbox/issues/5858)) +* VLAN Translation ([#7336](https://github.com/netbox-community/netbox/issues/7336)) +* Virtual Circuits ([#13086](https://github.com/netbox-community/netbox/issues/13086)) +* Q-in-Q Encapsulation ([#13428](https://github.com/netbox-community/netbox/issues/13428)) + #### [Version 4.1](./version-4.1.md) (September 2024) * Circuit Groups ([#7025](https://github.com/netbox-community/netbox/issues/7025)) From 27d970df418680f7fc3d0fcb2c6b2ba291db2757 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 2 Dec 2024 09:32:38 -0500 Subject: [PATCH 055/190] Update UI dependencies --- .../dist/graphiql/graphiql.min.js | 5568 +++++++---------- netbox/project-static/dist/netbox.js | Bin 390918 -> 390368 bytes netbox/project-static/dist/netbox.js.map | Bin 527957 -> 524890 bytes .../netbox-graphiql/package.json | 6 +- netbox/project-static/package.json | 6 +- .../src/select/classes/dynamicTomSelect.ts | 39 +- netbox/project-static/tsconfig.json | 4 +- netbox/project-static/yarn.lock | 82 +- 8 files changed, 2406 insertions(+), 3299 deletions(-) diff --git a/netbox/project-static/dist/graphiql/graphiql.min.js b/netbox/project-static/dist/graphiql/graphiql.min.js index 862ce3a80..03d4ac1e1 100644 --- a/netbox/project-static/dist/graphiql/graphiql.min.js +++ b/netbox/project-static/dist/graphiql/graphiql.min.js @@ -22986,17 +22986,79 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.GraphQLError = void 0; +exports.formatError = formatError; +exports.printError = printError; var _isObjectLike = __webpack_require__(/*! ../jsutils/isObjectLike.mjs */ "../../../node_modules/graphql/jsutils/isObjectLike.mjs"); var _location = __webpack_require__(/*! ../language/location.mjs */ "../../../node_modules/graphql/language/location.mjs"); var _printLocation = __webpack_require__(/*! ../language/printLocation.mjs */ "../../../node_modules/graphql/language/printLocation.mjs"); +function toNormalizedOptions(args) { + const firstArg = args[0]; + if (firstArg == null || 'kind' in firstArg || 'length' in firstArg) { + return { + nodes: firstArg, + source: args[1], + positions: args[2], + path: args[3], + originalError: args[4], + extensions: args[5] + }; + } + return firstArg; +} /** * A GraphQLError describes an Error found during the parse, validate, or * execute phases of performing a GraphQL operation. In addition to a message * and stack trace, it also includes information about the locations in a * GraphQL document and/or execution result that correspond to the Error. */ + class GraphQLError extends Error { - constructor(message, options = {}) { + /** + * An array of `{ line, column }` locations within the source GraphQL document + * which correspond to this error. + * + * Errors during validation often contain multiple locations, for example to + * point out two things with the same name. Errors during execution include a + * single location, the field which produced the error. + * + * Enumerable, and appears in the result of JSON.stringify(). + */ + + /** + * An array describing the JSON-path into the execution response which + * corresponds to this error. Only included for errors during execution. + * + * Enumerable, and appears in the result of JSON.stringify(). + */ + + /** + * An array of GraphQL AST Nodes corresponding to this error. + */ + + /** + * The source GraphQL document for the first location of this error. + * + * Note that if this Error represents more than one node, the source may not + * represent nodes after the first node. + */ + + /** + * An array of character offsets within the source GraphQL document + * which correspond to this error. + */ + + /** + * The original error thrown from a field resolver during execution. + */ + + /** + * Extension fields to add to the formatted error. + */ + + /** + * @deprecated Please use the `GraphQLErrorOptions` constructor overload instead. + */ + constructor(message, ...rawArgs) { var _this$nodes, _nodeLocations$, _ref; const { nodes, @@ -23005,22 +23067,22 @@ class GraphQLError extends Error { path, originalError, extensions - } = options; + } = toNormalizedOptions(rawArgs); super(message); this.name = 'GraphQLError'; this.path = path !== null && path !== void 0 ? path : undefined; - this.originalError = originalError !== null && originalError !== void 0 ? originalError : undefined; - // Compute list of blame nodes. + this.originalError = originalError !== null && originalError !== void 0 ? originalError : undefined; // Compute list of blame nodes. + this.nodes = undefinedIfEmpty(Array.isArray(nodes) ? nodes : nodes ? [nodes] : undefined); - const nodeLocations = undefinedIfEmpty((_this$nodes = this.nodes) === null || _this$nodes === void 0 ? void 0 : _this$nodes.map(node => node.loc).filter(loc => loc != null)); - // Compute locations in the source for the given nodes/positions. + const nodeLocations = undefinedIfEmpty((_this$nodes = this.nodes) === null || _this$nodes === void 0 ? void 0 : _this$nodes.map(node => node.loc).filter(loc => loc != null)); // Compute locations in the source for the given nodes/positions. + this.source = source !== null && source !== void 0 ? source : nodeLocations === null || nodeLocations === void 0 ? void 0 : (_nodeLocations$ = nodeLocations[0]) === null || _nodeLocations$ === void 0 ? void 0 : _nodeLocations$.source; this.positions = positions !== null && positions !== void 0 ? positions : nodeLocations === null || nodeLocations === void 0 ? void 0 : nodeLocations.map(loc => loc.start); this.locations = positions && source ? positions.map(pos => (0, _location.getLocation)(source, pos)) : nodeLocations === null || nodeLocations === void 0 ? void 0 : nodeLocations.map(loc => (0, _location.getLocation)(loc.source, loc.start)); const originalExtensions = (0, _isObjectLike.isObjectLike)(originalError === null || originalError === void 0 ? void 0 : originalError.extensions) ? originalError === null || originalError === void 0 ? void 0 : originalError.extensions : undefined; - this.extensions = (_ref = extensions !== null && extensions !== void 0 ? extensions : originalExtensions) !== null && _ref !== void 0 ? _ref : Object.create(null); - // Only properties prescribed by the spec should be enumerable. + this.extensions = (_ref = extensions !== null && extensions !== void 0 ? extensions : originalExtensions) !== null && _ref !== void 0 ? _ref : Object.create(null); // Only properties prescribed by the spec should be enumerable. // Keep the rest as non-enumerable. + Object.defineProperties(this, { message: { writable: true, @@ -23041,17 +23103,18 @@ class GraphQLError extends Error { originalError: { enumerable: false } - }); - // Include (non-enumerable) stack trace. + }); // Include (non-enumerable) stack trace. + /* c8 ignore start */ // FIXME: https://github.com/graphql/graphql-js/issues/2317 - if ((originalError === null || originalError === void 0 ? void 0 : originalError.stack) != null) { + + if (originalError !== null && originalError !== void 0 && originalError.stack) { Object.defineProperty(this, 'stack', { value: originalError.stack, writable: true, configurable: true }); - } else if (Error.captureStackTrace != null) { + } else if (Error.captureStackTrace) { Error.captureStackTrace(this, GraphQLError); } else { Object.defineProperty(this, 'stack', { @@ -23100,6 +23163,29 @@ exports.GraphQLError = GraphQLError; function undefinedIfEmpty(array) { return array === undefined || array.length === 0 ? undefined : array; } +/** + * See: https://spec.graphql.org/draft/#sec-Errors + */ + +/** + * Prints a GraphQLError to a string, representing useful location information + * about the error's position in the source. + * + * @deprecated Please use `error.toString` instead. Will be removed in v17 + */ +function printError(error) { + return error.toString(); +} +/** + * Given a GraphQLError, format it according to the rules described by the + * Response Format, Errors section of the GraphQL Specification. + * + * @deprecated Please use `error.toJSON` instead. Will be removed in v17 + */ + +function formatError(error) { + return error.toJSON(); +} /***/ }), @@ -23120,12 +23206,24 @@ Object.defineProperty(exports, "GraphQLError", ({ return _GraphQLError.GraphQLError; } })); +Object.defineProperty(exports, "formatError", ({ + enumerable: true, + get: function () { + return _GraphQLError.formatError; + } +})); Object.defineProperty(exports, "locatedError", ({ enumerable: true, get: function () { return _locatedError.locatedError; } })); +Object.defineProperty(exports, "printError", ({ + enumerable: true, + get: function () { + return _GraphQLError.printError; + } +})); Object.defineProperty(exports, "syntaxError", ({ enumerable: true, get: function () { @@ -23157,15 +23255,16 @@ var _GraphQLError = __webpack_require__(/*! ./GraphQLError.mjs */ "../../../node * GraphQL operation, produce a new GraphQLError aware of the location in the * document responsible for the original Error. */ + function locatedError(rawOriginalError, nodes, path) { - var _originalError$nodes; - const originalError = (0, _toError.toError)(rawOriginalError); - // Note: this uses a brand-check to support GraphQL errors originating from other contexts. + var _nodes; + const originalError = (0, _toError.toError)(rawOriginalError); // Note: this uses a brand-check to support GraphQL errors originating from other contexts. + if (isLocatedGraphQLError(originalError)) { return originalError; } return new _GraphQLError.GraphQLError(originalError.message, { - nodes: (_originalError$nodes = originalError.nodes) !== null && _originalError$nodes !== void 0 ? _originalError$nodes : nodes, + nodes: (_nodes = originalError.nodes) !== null && _nodes !== void 0 ? _nodes : nodes, source: originalError.source, positions: originalError.positions, path, @@ -23195,6 +23294,7 @@ var _GraphQLError = __webpack_require__(/*! ./GraphQLError.mjs */ "../../../node * Produces a GraphQLError representing a syntax error, containing useful * descriptive information about the syntax error's position in the source. */ + function syntaxError(source, position, description) { return new _GraphQLError.GraphQLError(`Syntax Error: ${description}`, { source, @@ -23204,613 +23304,6 @@ function syntaxError(source, position, description) { /***/ }), -/***/ "../../../node_modules/graphql/execution/IncrementalGraph.mjs": -/*!********************************************************************!*\ - !*** ../../../node_modules/graphql/execution/IncrementalGraph.mjs ***! - \********************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.IncrementalGraph = void 0; -var _BoxedPromiseOrValue = __webpack_require__(/*! ../jsutils/BoxedPromiseOrValue.mjs */ "../../../node_modules/graphql/jsutils/BoxedPromiseOrValue.mjs"); -var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); -var _isPromise = __webpack_require__(/*! ../jsutils/isPromise.mjs */ "../../../node_modules/graphql/jsutils/isPromise.mjs"); -var _promiseWithResolvers = __webpack_require__(/*! ../jsutils/promiseWithResolvers.mjs */ "../../../node_modules/graphql/jsutils/promiseWithResolvers.mjs"); -var _types = __webpack_require__(/*! ./types.mjs */ "../../../node_modules/graphql/execution/types.mjs"); -/** - * @internal - */ -class IncrementalGraph { - constructor() { - this._rootNodes = new Set(); - this._completedQueue = []; - this._nextQueue = []; - } - getNewRootNodes(incrementalDataRecords) { - const initialResultChildren = new Set(); - this._addIncrementalDataRecords(incrementalDataRecords, undefined, initialResultChildren); - return this._promoteNonEmptyToRoot(initialResultChildren); - } - addCompletedSuccessfulExecutionGroup(successfulExecutionGroup) { - for (const deferredFragmentRecord of successfulExecutionGroup.pendingExecutionGroup.deferredFragmentRecords) { - deferredFragmentRecord.pendingExecutionGroups.delete(successfulExecutionGroup.pendingExecutionGroup); - deferredFragmentRecord.successfulExecutionGroups.add(successfulExecutionGroup); - } - const incrementalDataRecords = successfulExecutionGroup.incrementalDataRecords; - if (incrementalDataRecords !== undefined) { - this._addIncrementalDataRecords(incrementalDataRecords, successfulExecutionGroup.pendingExecutionGroup.deferredFragmentRecords); - } - } - *currentCompletedBatch() { - let completed; - while ((completed = this._completedQueue.shift()) !== undefined) { - yield completed; - } - if (this._rootNodes.size === 0) { - for (const resolve of this._nextQueue) { - resolve(undefined); - } - } - } - nextCompletedBatch() { - const { - promise, - resolve - } = (0, _promiseWithResolvers.promiseWithResolvers)(); - this._nextQueue.push(resolve); - return promise; - } - abort() { - for (const resolve of this._nextQueue) { - resolve(undefined); - } - } - hasNext() { - return this._rootNodes.size > 0; - } - completeDeferredFragment(deferredFragmentRecord) { - if (!this._rootNodes.has(deferredFragmentRecord) || deferredFragmentRecord.pendingExecutionGroups.size > 0) { - return; - } - const successfulExecutionGroups = Array.from(deferredFragmentRecord.successfulExecutionGroups); - this._removeRootNode(deferredFragmentRecord); - for (const successfulExecutionGroup of successfulExecutionGroups) { - for (const otherDeferredFragmentRecord of successfulExecutionGroup.pendingExecutionGroup.deferredFragmentRecords) { - otherDeferredFragmentRecord.successfulExecutionGroups.delete(successfulExecutionGroup); - } - } - const newRootNodes = this._promoteNonEmptyToRoot(deferredFragmentRecord.children); - return { - newRootNodes, - successfulExecutionGroups - }; - } - removeDeferredFragment(deferredFragmentRecord) { - if (!this._rootNodes.has(deferredFragmentRecord)) { - return false; - } - this._removeRootNode(deferredFragmentRecord); - return true; - } - removeStream(streamRecord) { - this._removeRootNode(streamRecord); - } - _removeRootNode(deliveryGroup) { - this._rootNodes.delete(deliveryGroup); - } - _addIncrementalDataRecords(incrementalDataRecords, parents, initialResultChildren) { - for (const incrementalDataRecord of incrementalDataRecords) { - if ((0, _types.isPendingExecutionGroup)(incrementalDataRecord)) { - for (const deferredFragmentRecord of incrementalDataRecord.deferredFragmentRecords) { - this._addDeferredFragment(deferredFragmentRecord, initialResultChildren); - deferredFragmentRecord.pendingExecutionGroups.add(incrementalDataRecord); - } - if (this._completesRootNode(incrementalDataRecord)) { - this._onExecutionGroup(incrementalDataRecord); - } - } else if (parents === undefined) { - initialResultChildren !== undefined || (0, _invariant.invariant)(false); - initialResultChildren.add(incrementalDataRecord); - } else { - for (const parent of parents) { - this._addDeferredFragment(parent, initialResultChildren); - parent.children.add(incrementalDataRecord); - } - } - } - } - _promoteNonEmptyToRoot(maybeEmptyNewRootNodes) { - const newRootNodes = []; - for (const node of maybeEmptyNewRootNodes) { - if ((0, _types.isDeferredFragmentRecord)(node)) { - if (node.pendingExecutionGroups.size > 0) { - for (const pendingExecutionGroup of node.pendingExecutionGroups) { - if (!this._completesRootNode(pendingExecutionGroup)) { - this._onExecutionGroup(pendingExecutionGroup); - } - } - this._rootNodes.add(node); - newRootNodes.push(node); - continue; - } - for (const child of node.children) { - maybeEmptyNewRootNodes.add(child); - } - } else { - this._rootNodes.add(node); - newRootNodes.push(node); - // eslint-disable-next-line @typescript-eslint/no-floating-promises - this._onStreamItems(node); - } - } - return newRootNodes; - } - _completesRootNode(pendingExecutionGroup) { - return pendingExecutionGroup.deferredFragmentRecords.some(deferredFragmentRecord => this._rootNodes.has(deferredFragmentRecord)); - } - _addDeferredFragment(deferredFragmentRecord, initialResultChildren) { - if (this._rootNodes.has(deferredFragmentRecord)) { - return; - } - const parent = deferredFragmentRecord.parent; - if (parent === undefined) { - initialResultChildren !== undefined || (0, _invariant.invariant)(false); - initialResultChildren.add(deferredFragmentRecord); - return; - } - parent.children.add(deferredFragmentRecord); - this._addDeferredFragment(parent, initialResultChildren); - } - _onExecutionGroup(pendingExecutionGroup) { - let completedExecutionGroup = pendingExecutionGroup.result; - if (!(completedExecutionGroup instanceof _BoxedPromiseOrValue.BoxedPromiseOrValue)) { - completedExecutionGroup = completedExecutionGroup(); - } - const value = completedExecutionGroup.value; - if ((0, _isPromise.isPromise)(value)) { - // eslint-disable-next-line @typescript-eslint/no-floating-promises - value.then(resolved => this._enqueue(resolved)); - } else { - this._enqueue(value); - } - } - async _onStreamItems(streamRecord) { - let items = []; - let errors = []; - let incrementalDataRecords = []; - const streamItemQueue = streamRecord.streamItemQueue; - let streamItemRecord; - while ((streamItemRecord = streamItemQueue.shift()) !== undefined) { - let result = streamItemRecord instanceof _BoxedPromiseOrValue.BoxedPromiseOrValue ? streamItemRecord.value : streamItemRecord().value; - if ((0, _isPromise.isPromise)(result)) { - if (items.length > 0) { - this._enqueue({ - streamRecord, - result: - // TODO add additional test case or rework for coverage - errors.length > 0 /* c8 ignore start */ ? { - items, - errors - } /* c8 ignore stop */ : { - items - }, - incrementalDataRecords - }); - items = []; - errors = []; - incrementalDataRecords = []; - } - // eslint-disable-next-line no-await-in-loop - result = await result; - // wait an additional tick to coalesce resolving additional promises - // within the queue - // eslint-disable-next-line no-await-in-loop - await Promise.resolve(); - } - if (result.item === undefined) { - if (items.length > 0) { - this._enqueue({ - streamRecord, - result: errors.length > 0 ? { - items, - errors - } : { - items - }, - incrementalDataRecords - }); - } - this._enqueue(result.errors === undefined ? { - streamRecord - } : { - streamRecord, - errors: result.errors - }); - return; - } - items.push(result.item); - if (result.errors !== undefined) { - errors.push(...result.errors); - } - if (result.incrementalDataRecords !== undefined) { - incrementalDataRecords.push(...result.incrementalDataRecords); - } - } - } - *_yieldCurrentCompletedIncrementalData(first) { - yield first; - yield* this.currentCompletedBatch(); - } - _enqueue(completed) { - const next = this._nextQueue.shift(); - if (next !== undefined) { - next(this._yieldCurrentCompletedIncrementalData(completed)); - return; - } - this._completedQueue.push(completed); - } -} -exports.IncrementalGraph = IncrementalGraph; - -/***/ }), - -/***/ "../../../node_modules/graphql/execution/IncrementalPublisher.mjs": -/*!************************************************************************!*\ - !*** ../../../node_modules/graphql/execution/IncrementalPublisher.mjs ***! - \************************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.buildIncrementalResponse = buildIncrementalResponse; -var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); -var _Path = __webpack_require__(/*! ../jsutils/Path.mjs */ "../../../node_modules/graphql/jsutils/Path.mjs"); -var _IncrementalGraph = __webpack_require__(/*! ./IncrementalGraph.mjs */ "../../../node_modules/graphql/execution/IncrementalGraph.mjs"); -var _types = __webpack_require__(/*! ./types.mjs */ "../../../node_modules/graphql/execution/types.mjs"); -function buildIncrementalResponse(context, result, errors, incrementalDataRecords) { - const incrementalPublisher = new IncrementalPublisher(context); - return incrementalPublisher.buildResponse(result, errors, incrementalDataRecords); -} -/** - * This class is used to publish incremental results to the client, enabling semi-concurrent - * execution while preserving result order. - * - * @internal - */ -class IncrementalPublisher { - constructor(context) { - this._context = context; - this._nextId = 0; - this._incrementalGraph = new _IncrementalGraph.IncrementalGraph(); - } - buildResponse(data, errors, incrementalDataRecords) { - const newRootNodes = this._incrementalGraph.getNewRootNodes(incrementalDataRecords); - const pending = this._toPendingResults(newRootNodes); - const initialResult = errors === undefined ? { - data, - pending, - hasNext: true - } : { - errors, - data, - pending, - hasNext: true - }; - return { - initialResult, - subsequentResults: this._subscribe() - }; - } - _toPendingResults(newRootNodes) { - const pendingResults = []; - for (const node of newRootNodes) { - const id = String(this._getNextId()); - node.id = id; - const pendingResult = { - id, - path: (0, _Path.pathToArray)(node.path) - }; - if (node.label !== undefined) { - pendingResult.label = node.label; - } - pendingResults.push(pendingResult); - } - return pendingResults; - } - _getNextId() { - return String(this._nextId++); - } - _subscribe() { - let isDone = false; - const _next = async () => { - if (isDone) { - await this._returnAsyncIteratorsIgnoringErrors(); - return { - value: undefined, - done: true - }; - } - const context = { - pending: [], - incremental: [], - completed: [] - }; - let batch = this._incrementalGraph.currentCompletedBatch(); - do { - for (const completedResult of batch) { - this._handleCompletedIncrementalData(completedResult, context); - } - const { - incremental, - completed - } = context; - if (incremental.length > 0 || completed.length > 0) { - const hasNext = this._incrementalGraph.hasNext(); - if (!hasNext) { - isDone = true; - } - const subsequentIncrementalExecutionResult = { - hasNext - }; - const pending = context.pending; - if (pending.length > 0) { - subsequentIncrementalExecutionResult.pending = pending; - } - if (incremental.length > 0) { - subsequentIncrementalExecutionResult.incremental = incremental; - } - if (completed.length > 0) { - subsequentIncrementalExecutionResult.completed = completed; - } - return { - value: subsequentIncrementalExecutionResult, - done: false - }; - } - // eslint-disable-next-line no-await-in-loop - batch = await this._incrementalGraph.nextCompletedBatch(); - } while (batch !== undefined); - await this._returnAsyncIteratorsIgnoringErrors(); - return { - value: undefined, - done: true - }; - }; - const _return = async () => { - isDone = true; - this._incrementalGraph.abort(); - await this._returnAsyncIterators(); - return { - value: undefined, - done: true - }; - }; - const _throw = async error => { - isDone = true; - this._incrementalGraph.abort(); - await this._returnAsyncIterators(); - return Promise.reject(error); - }; - return { - [Symbol.asyncIterator]() { - return this; - }, - next: _next, - return: _return, - throw: _throw - }; - } - _handleCompletedIncrementalData(completedIncrementalData, context) { - if ((0, _types.isCompletedExecutionGroup)(completedIncrementalData)) { - this._handleCompletedExecutionGroup(completedIncrementalData, context); - } else { - this._handleCompletedStreamItems(completedIncrementalData, context); - } - } - _handleCompletedExecutionGroup(completedExecutionGroup, context) { - if ((0, _types.isFailedExecutionGroup)(completedExecutionGroup)) { - for (const deferredFragmentRecord of completedExecutionGroup.pendingExecutionGroup.deferredFragmentRecords) { - const id = deferredFragmentRecord.id; - if (!this._incrementalGraph.removeDeferredFragment(deferredFragmentRecord)) { - // This can occur if multiple deferred grouped field sets error for a fragment. - continue; - } - id !== undefined || (0, _invariant.invariant)(false); - context.completed.push({ - id, - errors: completedExecutionGroup.errors - }); - } - return; - } - this._incrementalGraph.addCompletedSuccessfulExecutionGroup(completedExecutionGroup); - for (const deferredFragmentRecord of completedExecutionGroup.pendingExecutionGroup.deferredFragmentRecords) { - const completion = this._incrementalGraph.completeDeferredFragment(deferredFragmentRecord); - if (completion === undefined) { - continue; - } - const id = deferredFragmentRecord.id; - id !== undefined || (0, _invariant.invariant)(false); - const incremental = context.incremental; - const { - newRootNodes, - successfulExecutionGroups - } = completion; - context.pending.push(...this._toPendingResults(newRootNodes)); - for (const successfulExecutionGroup of successfulExecutionGroups) { - const { - bestId, - subPath - } = this._getBestIdAndSubPath(id, deferredFragmentRecord, successfulExecutionGroup); - const incrementalEntry = { - ...successfulExecutionGroup.result, - id: bestId - }; - if (subPath !== undefined) { - incrementalEntry.subPath = subPath; - } - incremental.push(incrementalEntry); - } - context.completed.push({ - id - }); - } - } - _handleCompletedStreamItems(streamItemsResult, context) { - const streamRecord = streamItemsResult.streamRecord; - const id = streamRecord.id; - id !== undefined || (0, _invariant.invariant)(false); - if (streamItemsResult.errors !== undefined) { - context.completed.push({ - id, - errors: streamItemsResult.errors - }); - this._incrementalGraph.removeStream(streamRecord); - if ((0, _types.isCancellableStreamRecord)(streamRecord)) { - this._context.cancellableStreams !== undefined || (0, _invariant.invariant)(false); - this._context.cancellableStreams.delete(streamRecord); - streamRecord.earlyReturn().catch(() => { - /* c8 ignore next 1 */ - // ignore error - }); - } - } else if (streamItemsResult.result === undefined) { - context.completed.push({ - id - }); - this._incrementalGraph.removeStream(streamRecord); - if ((0, _types.isCancellableStreamRecord)(streamRecord)) { - this._context.cancellableStreams !== undefined || (0, _invariant.invariant)(false); - this._context.cancellableStreams.delete(streamRecord); - } - } else { - const incrementalEntry = { - id, - ...streamItemsResult.result - }; - context.incremental.push(incrementalEntry); - const incrementalDataRecords = streamItemsResult.incrementalDataRecords; - if (incrementalDataRecords !== undefined) { - const newRootNodes = this._incrementalGraph.getNewRootNodes(incrementalDataRecords); - context.pending.push(...this._toPendingResults(newRootNodes)); - } - } - } - _getBestIdAndSubPath(initialId, initialDeferredFragmentRecord, completedExecutionGroup) { - let maxLength = (0, _Path.pathToArray)(initialDeferredFragmentRecord.path).length; - let bestId = initialId; - for (const deferredFragmentRecord of completedExecutionGroup.pendingExecutionGroup.deferredFragmentRecords) { - if (deferredFragmentRecord === initialDeferredFragmentRecord) { - continue; - } - const id = deferredFragmentRecord.id; - // TODO: add test case for when an fragment has not been released, but might be processed for the shortest path. - /* c8 ignore next 3 */ - if (id === undefined) { - continue; - } - const fragmentPath = (0, _Path.pathToArray)(deferredFragmentRecord.path); - const length = fragmentPath.length; - if (length > maxLength) { - maxLength = length; - bestId = id; - } - } - const subPath = completedExecutionGroup.path.slice(maxLength); - return { - bestId, - subPath: subPath.length > 0 ? subPath : undefined - }; - } - async _returnAsyncIterators() { - const cancellableStreams = this._context.cancellableStreams; - if (cancellableStreams === undefined) { - return; - } - const promises = []; - for (const streamRecord of cancellableStreams) { - if (streamRecord.earlyReturn !== undefined) { - promises.push(streamRecord.earlyReturn()); - } - } - await Promise.all(promises); - } - async _returnAsyncIteratorsIgnoringErrors() { - await this._returnAsyncIterators().catch(() => { - // Ignore errors - }); - } -} - -/***/ }), - -/***/ "../../../node_modules/graphql/execution/buildExecutionPlan.mjs": -/*!**********************************************************************!*\ - !*** ../../../node_modules/graphql/execution/buildExecutionPlan.mjs ***! - \**********************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.buildExecutionPlan = buildExecutionPlan; -var _getBySet = __webpack_require__(/*! ../jsutils/getBySet.mjs */ "../../../node_modules/graphql/jsutils/getBySet.mjs"); -var _isSameSet = __webpack_require__(/*! ../jsutils/isSameSet.mjs */ "../../../node_modules/graphql/jsutils/isSameSet.mjs"); -function buildExecutionPlan(originalGroupedFieldSet, parentDeferUsages = new Set()) { - const groupedFieldSet = new Map(); - const newGroupedFieldSets = new Map(); - for (const [responseKey, fieldGroup] of originalGroupedFieldSet) { - const filteredDeferUsageSet = getFilteredDeferUsageSet(fieldGroup); - if ((0, _isSameSet.isSameSet)(filteredDeferUsageSet, parentDeferUsages)) { - groupedFieldSet.set(responseKey, fieldGroup); - continue; - } - let newGroupedFieldSet = (0, _getBySet.getBySet)(newGroupedFieldSets, filteredDeferUsageSet); - if (newGroupedFieldSet === undefined) { - newGroupedFieldSet = new Map(); - newGroupedFieldSets.set(filteredDeferUsageSet, newGroupedFieldSet); - } - newGroupedFieldSet.set(responseKey, fieldGroup); - } - return { - groupedFieldSet, - newGroupedFieldSets - }; -} -function getFilteredDeferUsageSet(fieldGroup) { - const filteredDeferUsageSet = new Set(); - for (const fieldDetails of fieldGroup) { - const deferUsage = fieldDetails.deferUsage; - if (deferUsage === undefined) { - filteredDeferUsageSet.clear(); - return filteredDeferUsageSet; - } - filteredDeferUsageSet.add(deferUsage); - } - for (const deferUsage of filteredDeferUsageSet) { - let parentDeferUsage = deferUsage.parentDeferUsage; - while (parentDeferUsage !== undefined) { - if (filteredDeferUsageSet.has(parentDeferUsage)) { - filteredDeferUsageSet.delete(deferUsage); - break; - } - parentDeferUsage = parentDeferUsage.parentDeferUsage; - } - } - return filteredDeferUsageSet; -} - -/***/ }), - /***/ "../../../node_modules/graphql/execution/collectFields.mjs": /*!*****************************************************************!*\ !*** ../../../node_modules/graphql/execution/collectFields.mjs ***! @@ -23824,9 +23317,6 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.collectFields = collectFields; exports.collectSubfields = collectSubfields; -var _AccumulatorMap = __webpack_require__(/*! ../jsutils/AccumulatorMap.mjs */ "../../../node_modules/graphql/jsutils/AccumulatorMap.mjs"); -var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); -var _ast = __webpack_require__(/*! ../language/ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); var _directives = __webpack_require__(/*! ../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); @@ -23841,22 +23331,11 @@ var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/gra * * @internal */ -function collectFields(schema, fragments, variableValues, runtimeType, operation) { - const groupedFieldSet = new _AccumulatorMap.AccumulatorMap(); - const newDeferUsages = []; - const context = { - schema, - fragments, - variableValues, - runtimeType, - operation, - visitedFragmentNames: new Set() - }; - collectFieldsImpl(context, operation.selectionSet, groupedFieldSet, newDeferUsages); - return { - groupedFieldSet, - newDeferUsages - }; + +function collectFields(schema, fragments, variableValues, runtimeType, selectionSet) { + const fields = new Map(); + collectFieldsImpl(schema, fragments, variableValues, runtimeType, selectionSet, fields, new Set()); + return fields; } /** * Given an array of field nodes, collects all of the subfields of the passed @@ -23868,38 +23347,18 @@ function collectFields(schema, fragments, variableValues, runtimeType, operation * * @internal */ -// eslint-disable-next-line max-params -function collectSubfields(schema, fragments, variableValues, operation, returnType, fieldGroup) { - const context = { - schema, - fragments, - variableValues, - runtimeType: returnType, - operation, - visitedFragmentNames: new Set() - }; - const subGroupedFieldSet = new _AccumulatorMap.AccumulatorMap(); - const newDeferUsages = []; - for (const fieldDetail of fieldGroup) { - const node = fieldDetail.node; + +function collectSubfields(schema, fragments, variableValues, returnType, fieldNodes) { + const subFieldNodes = new Map(); + const visitedFragmentNames = new Set(); + for (const node of fieldNodes) { if (node.selectionSet) { - collectFieldsImpl(context, node.selectionSet, subGroupedFieldSet, newDeferUsages, fieldDetail.deferUsage); + collectFieldsImpl(schema, fragments, variableValues, returnType, node.selectionSet, subFieldNodes, visitedFragmentNames); } } - return { - groupedFieldSet: subGroupedFieldSet, - newDeferUsages - }; + return subFieldNodes; } -function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsages, deferUsage) { - const { - schema, - fragments, - variableValues, - runtimeType, - operation, - visitedFragmentNames - } = context; +function collectFieldsImpl(schema, fragments, variableValues, runtimeType, selectionSet, fields, visitedFragmentNames) { for (const selection of selectionSet.selections) { switch (selection.kind) { case _kinds.Kind.FIELD: @@ -23907,10 +23366,13 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage if (!shouldIncludeNode(variableValues, selection)) { continue; } - groupedFieldSet.add(getFieldEntryKey(selection), { - node: selection, - deferUsage - }); + const name = getFieldEntryKey(selection); + const fieldList = fields.get(name); + if (fieldList !== undefined) { + fieldList.push(selection); + } else { + fields.set(name, [selection]); + } break; } case _kinds.Kind.INLINE_FRAGMENT: @@ -23918,61 +23380,31 @@ function collectFieldsImpl(context, selectionSet, groupedFieldSet, newDeferUsage if (!shouldIncludeNode(variableValues, selection) || !doesFragmentConditionMatch(schema, selection, runtimeType)) { continue; } - const newDeferUsage = getDeferUsage(operation, variableValues, selection, deferUsage); - if (!newDeferUsage) { - collectFieldsImpl(context, selection.selectionSet, groupedFieldSet, newDeferUsages, deferUsage); - } else { - newDeferUsages.push(newDeferUsage); - collectFieldsImpl(context, selection.selectionSet, groupedFieldSet, newDeferUsages, newDeferUsage); - } + collectFieldsImpl(schema, fragments, variableValues, runtimeType, selection.selectionSet, fields, visitedFragmentNames); break; } case _kinds.Kind.FRAGMENT_SPREAD: { const fragName = selection.name.value; - const newDeferUsage = getDeferUsage(operation, variableValues, selection, deferUsage); - if (!newDeferUsage && (visitedFragmentNames.has(fragName) || !shouldIncludeNode(variableValues, selection))) { + if (visitedFragmentNames.has(fragName) || !shouldIncludeNode(variableValues, selection)) { continue; } + visitedFragmentNames.add(fragName); const fragment = fragments[fragName]; - if (fragment == null || !doesFragmentConditionMatch(schema, fragment, runtimeType)) { + if (!fragment || !doesFragmentConditionMatch(schema, fragment, runtimeType)) { continue; } - if (!newDeferUsage) { - visitedFragmentNames.add(fragName); - collectFieldsImpl(context, fragment.selectionSet, groupedFieldSet, newDeferUsages, deferUsage); - } else { - newDeferUsages.push(newDeferUsage); - collectFieldsImpl(context, fragment.selectionSet, groupedFieldSet, newDeferUsages, newDeferUsage); - } + collectFieldsImpl(schema, fragments, variableValues, runtimeType, fragment.selectionSet, fields, visitedFragmentNames); break; } } } } -/** - * Returns an object containing the `@defer` arguments if a field should be - * deferred based on the experimental flag, defer directive present and - * not disabled by the "if" argument. - */ -function getDeferUsage(operation, variableValues, node, parentDeferUsage) { - const defer = (0, _values.getDirectiveValues)(_directives.GraphQLDeferDirective, node, variableValues); - if (!defer) { - return; - } - if (defer.if === false) { - return; - } - operation.operation !== _ast.OperationTypeNode.SUBSCRIPTION || (0, _invariant.invariant)(false, '`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.'); - return { - label: typeof defer.label === 'string' ? defer.label : undefined, - parentDeferUsage - }; -} /** * Determines if a field should be included based on the `@include` and `@skip` * directives, where `@skip` has higher precedence than `@include`. */ + function shouldIncludeNode(variableValues, node) { const skip = (0, _values.getDirectiveValues)(_directives.GraphQLSkipDirective, node, variableValues); if ((skip === null || skip === void 0 ? void 0 : skip.if) === true) { @@ -23987,6 +23419,7 @@ function shouldIncludeNode(variableValues, node) { /** * Determines if a fragment is applicable to the given type. */ + function doesFragmentConditionMatch(schema, fragment, type) { const typeConditionNode = fragment.typeCondition; if (!typeConditionNode) { @@ -24004,6 +23437,7 @@ function doesFragmentConditionMatch(schema, fragment, type) { /** * Implements the logic to compute the key of a given field's entry */ + function getFieldEntryKey(node) { return node.alias ? node.alias.value : node.name.value; } @@ -24021,18 +23455,16 @@ function getFieldEntryKey(node) { Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.assertValidExecutionArguments = assertValidExecutionArguments; exports.buildExecutionContext = buildExecutionContext; exports.buildResolveInfo = buildResolveInfo; -exports.createSourceEventStream = createSourceEventStream; exports.defaultTypeResolver = exports.defaultFieldResolver = void 0; exports.execute = execute; exports.executeSync = executeSync; -exports.experimentalExecuteIncrementally = experimentalExecuteIncrementally; -exports.subscribe = subscribe; -var _BoxedPromiseOrValue = __webpack_require__(/*! ../jsutils/BoxedPromiseOrValue.mjs */ "../../../node_modules/graphql/jsutils/BoxedPromiseOrValue.mjs"); +exports.getFieldDef = getFieldDef; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); -var _isAsyncIterable = __webpack_require__(/*! ../jsutils/isAsyncIterable.mjs */ "../../../node_modules/graphql/jsutils/isAsyncIterable.mjs"); var _isIterableObject = __webpack_require__(/*! ../jsutils/isIterableObject.mjs */ "../../../node_modules/graphql/jsutils/isIterableObject.mjs"); var _isObjectLike = __webpack_require__(/*! ../jsutils/isObjectLike.mjs */ "../../../node_modules/graphql/jsutils/isObjectLike.mjs"); var _isPromise = __webpack_require__(/*! ../jsutils/isPromise.mjs */ "../../../node_modules/graphql/jsutils/isPromise.mjs"); @@ -24045,25 +23477,44 @@ var _locatedError = __webpack_require__(/*! ../error/locatedError.mjs */ "../../ var _ast = __webpack_require__(/*! ../language/ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); -var _directives = __webpack_require__(/*! ../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); +var _introspection = __webpack_require__(/*! ../type/introspection.mjs */ "../../../node_modules/graphql/type/introspection.mjs"); var _validate = __webpack_require__(/*! ../type/validate.mjs */ "../../../node_modules/graphql/type/validate.mjs"); -var _buildExecutionPlan = __webpack_require__(/*! ./buildExecutionPlan.mjs */ "../../../node_modules/graphql/execution/buildExecutionPlan.mjs"); var _collectFields = __webpack_require__(/*! ./collectFields.mjs */ "../../../node_modules/graphql/execution/collectFields.mjs"); -var _IncrementalPublisher = __webpack_require__(/*! ./IncrementalPublisher.mjs */ "../../../node_modules/graphql/execution/IncrementalPublisher.mjs"); -var _mapAsyncIterable = __webpack_require__(/*! ./mapAsyncIterable.mjs */ "../../../node_modules/graphql/execution/mapAsyncIterable.mjs"); -var _types = __webpack_require__(/*! ./types.mjs */ "../../../node_modules/graphql/execution/types.mjs"); var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/graphql/execution/values.mjs"); -/* eslint-disable max-params */ -// This file contains a lot of such errors but we plan to refactor it anyway -// so just disable it for entire file. /** * A memoized collection of relevant subfields with regard to the return * type. Memoizing ensures the subfields are not repeatedly calculated, which * saves overhead when resolving lists of values. */ -const collectSubfields = (0, _memoize.memoize3)((exeContext, returnType, fieldGroup) => (0, _collectFields.collectSubfields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, exeContext.operation, returnType, fieldGroup)); -const UNEXPECTED_EXPERIMENTAL_DIRECTIVES = 'The provided schema unexpectedly contains experimental directives (@defer or @stream). These directives may only be utilized if experimental execution features are explicitly enabled.'; -const UNEXPECTED_MULTIPLE_PAYLOADS = 'Executing this GraphQL operation would unexpectedly produce multiple payloads (due to @defer or @stream directive)'; + +const collectSubfields = (0, _memoize.memoize3)((exeContext, returnType, fieldNodes) => (0, _collectFields.collectSubfields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, returnType, fieldNodes)); +/** + * Terminology + * + * "Definitions" are the generic name for top-level statements in the document. + * Examples of this include: + * 1) Operations (such as a query) + * 2) Fragments + * + * "Operations" are a generic name for requests in the document. + * Examples of this include: + * 1) query, + * 2) mutation + * + * "Selections" are the definitions that can appear legally and at + * single level of the query. These include: + * 1) field references e.g `a` + * 2) fragment "spreads" e.g. `...c` + * 3) inline fragment "spreads" e.g. `...on Type { a }` + */ + +/** + * Data that must be available at all points during query execution. + * + * Namely, schema of the type system that is currently executing, + * and the fragments defined in the query document + */ + /** * Implements the "Executing requests" section of the GraphQL specification. * @@ -24073,177 +23524,105 @@ const UNEXPECTED_MULTIPLE_PAYLOADS = 'Executing this GraphQL operation would une * * If the arguments to this function do not result in a legal execution context, * a GraphQLError will be thrown immediately explaining the invalid input. - * - * This function does not support incremental delivery (`@defer` and `@stream`). - * If an operation which would defer or stream data is executed with this - * function, it will throw or return a rejected promise. - * Use `experimentalExecuteIncrementally` if you want to support incremental - * delivery. */ function execute(args) { - if (args.schema.getDirective('defer') || args.schema.getDirective('stream')) { - throw new Error(UNEXPECTED_EXPERIMENTAL_DIRECTIVES); - } - const result = experimentalExecuteIncrementally(args); - if (!(0, _isPromise.isPromise)(result)) { - if ('initialResult' in result) { - // This can happen if the operation contains @defer or @stream directives - // and is not validated prior to execution - throw new Error(UNEXPECTED_MULTIPLE_PAYLOADS); - } - return result; - } - return result.then(incrementalResult => { - if ('initialResult' in incrementalResult) { - // This can happen if the operation contains @defer or @stream directives - // and is not validated prior to execution - throw new Error(UNEXPECTED_MULTIPLE_PAYLOADS); - } - return incrementalResult; - }); -} -/** - * Implements the "Executing requests" section of the GraphQL specification, - * including `@defer` and `@stream` as proposed in - * https://github.com/graphql/graphql-spec/pull/742 - * - * This function returns a Promise of an ExperimentalIncrementalExecutionResults - * object. This object either consists of a single ExecutionResult, or an - * object containing an `initialResult` and a stream of `subsequentResults`. - * - * If the arguments to this function do not result in a legal execution context, - * a GraphQLError will be thrown immediately explaining the invalid input. - */ -function experimentalExecuteIncrementally(args) { - // If a valid execution context cannot be created due to incorrect arguments, + // Temporary for v15 to v16 migration. Remove in v17 + arguments.length < 2 || (0, _devAssert.devAssert)(false, 'graphql@16 dropped long-deprecated support for positional arguments, please pass an object instead.'); + const { + schema, + document, + variableValues, + rootValue + } = args; // If arguments are missing or incorrect, throw an error. + + assertValidExecutionArguments(schema, document, variableValues); // If a valid execution context cannot be created due to incorrect arguments, // a "Response" with only errors is returned. - const exeContext = buildExecutionContext(args); - // Return early errors if execution context failed. + + const exeContext = buildExecutionContext(args); // Return early errors if execution context failed. + if (!('schema' in exeContext)) { return { errors: exeContext }; - } - return executeOperation(exeContext); -} -/** - * Implements the "Executing operations" section of the spec. - * - * Returns a Promise that will eventually resolve to the data described by - * The "Response" section of the GraphQL specification. - * - * If errors are encountered while executing a GraphQL field, only that - * field and its descendants will be omitted, and sibling fields will still - * be executed. An execution which encounters errors will still result in a - * resolved Promise. - * - * Errors from sub-fields of a NonNull type may propagate to the top level, - * at which point we still log the error and null the parent field, which - * in this case is the entire response. - */ -function executeOperation(exeContext) { + } // Return a Promise that will eventually resolve to the data described by + // The "Response" section of the GraphQL specification. + // + // If errors are encountered while executing a GraphQL field, only that + // field and its descendants will be omitted, and sibling fields will still + // be executed. An execution which encounters errors will still result in a + // resolved Promise. + // + // Errors from sub-fields of a NonNull type may propagate to the top level, + // at which point we still log the error and null the parent field, which + // in this case is the entire response. + try { const { - operation, - schema, - fragments, - variableValues, - rootValue + operation } = exeContext; - const rootType = schema.getRootType(operation.operation); - if (rootType == null) { - throw new _GraphQLError.GraphQLError(`Schema is not configured to execute ${operation.operation} operation.`, { - nodes: operation + const result = executeOperation(exeContext, operation, rootValue); + if ((0, _isPromise.isPromise)(result)) { + return result.then(data => buildResponse(data, exeContext.errors), error => { + exeContext.errors.push(error); + return buildResponse(null, exeContext.errors); }); } - const collectedFields = (0, _collectFields.collectFields)(schema, fragments, variableValues, rootType, operation); - let groupedFieldSet = collectedFields.groupedFieldSet; - const newDeferUsages = collectedFields.newDeferUsages; - let graphqlWrappedResult; - if (newDeferUsages.length === 0) { - graphqlWrappedResult = executeRootGroupedFieldSet(exeContext, operation.operation, rootType, rootValue, groupedFieldSet, undefined); - } else { - const executionPlan = (0, _buildExecutionPlan.buildExecutionPlan)(groupedFieldSet); - groupedFieldSet = executionPlan.groupedFieldSet; - const newGroupedFieldSets = executionPlan.newGroupedFieldSets; - const newDeferMap = addNewDeferredFragments(newDeferUsages, new Map()); - graphqlWrappedResult = executeRootGroupedFieldSet(exeContext, operation.operation, rootType, rootValue, groupedFieldSet, newDeferMap); - if (newGroupedFieldSets.size > 0) { - const newPendingExecutionGroups = collectExecutionGroups(exeContext, rootType, rootValue, undefined, undefined, newGroupedFieldSets, newDeferMap); - graphqlWrappedResult = withNewExecutionGroups(graphqlWrappedResult, newPendingExecutionGroups); - } - } - if ((0, _isPromise.isPromise)(graphqlWrappedResult)) { - return graphqlWrappedResult.then(resolved => buildDataResponse(exeContext, resolved[0], resolved[1]), error => ({ - data: null, - errors: withError(exeContext.errors, error) - })); - } - return buildDataResponse(exeContext, graphqlWrappedResult[0], graphqlWrappedResult[1]); + return buildResponse(result, exeContext.errors); } catch (error) { - return { - data: null, - errors: withError(exeContext.errors, error) - }; + exeContext.errors.push(error); + return buildResponse(null, exeContext.errors); } } -function withNewExecutionGroups(result, newPendingExecutionGroups) { - if ((0, _isPromise.isPromise)(result)) { - return result.then(resolved => { - addIncrementalDataRecords(resolved, newPendingExecutionGroups); - return resolved; - }); - } - addIncrementalDataRecords(result, newPendingExecutionGroups); - return result; -} -function addIncrementalDataRecords(graphqlWrappedResult, incrementalDataRecords) { - if (incrementalDataRecords === undefined) { - return; - } - if (graphqlWrappedResult[1] === undefined) { - graphqlWrappedResult[1] = [...incrementalDataRecords]; - } else { - graphqlWrappedResult[1].push(...incrementalDataRecords); - } -} -function withError(errors, error) { - return errors === undefined ? [error] : [...errors, error]; -} -function buildDataResponse(exeContext, data, incrementalDataRecords) { - const errors = exeContext.errors; - if (incrementalDataRecords === undefined) { - return errors !== undefined ? { - errors, - data - } : { - data - }; - } - return (0, _IncrementalPublisher.buildIncrementalResponse)(exeContext, data, errors, incrementalDataRecords); -} /** * Also implements the "Executing requests" section of the GraphQL specification. * However, it guarantees to complete synchronously (or throw an error) assuming * that all field resolvers are also synchronous. */ + function executeSync(args) { - const result = experimentalExecuteIncrementally(args); - // Assert that the execution was synchronous. - if ((0, _isPromise.isPromise)(result) || 'initialResult' in result) { + const result = execute(args); // Assert that the execution was synchronous. + + if ((0, _isPromise.isPromise)(result)) { throw new Error('GraphQL execution failed to complete synchronously.'); } return result; } +/** + * Given a completed execution context and data, build the `{ errors, data }` + * response defined by the "Response" section of the GraphQL specification. + */ + +function buildResponse(data, errors) { + return errors.length === 0 ? { + data + } : { + errors, + data + }; +} +/** + * Essential assertions before executing to provide developer feedback for + * improper use of the GraphQL library. + * + * @internal + */ + +function assertValidExecutionArguments(schema, document, rawVariableValues) { + document || (0, _devAssert.devAssert)(false, 'Must provide document.'); // If the schema used for execution is invalid, throw an error. + + (0, _validate.assertValidSchema)(schema); // Variables, if provided, must be an object. + + rawVariableValues == null || (0, _isObjectLike.isObjectLike)(rawVariableValues) || (0, _devAssert.devAssert)(false, 'Variables must be provided as an Object where each property is a variable value. Perhaps look to see if an unparsed JSON string was provided.'); +} /** * Constructs a ExecutionContext object from the arguments passed to * execute, which we will pass throughout the other execution methods. * * Throws a GraphQLError if a valid execution context cannot be created. * - * TODO: consider no longer exporting this function * @internal */ + function buildExecutionContext(args) { var _definition$name, _operation$variableDe; const { @@ -24255,11 +23634,8 @@ function buildExecutionContext(args) { operationName, fieldResolver, typeResolver, - subscribeFieldResolver, - enableEarlyExecution + subscribeFieldResolver } = args; - // If the schema used for execution is invalid, throw an error. - (0, _validate.assertValidSchema)(schema); let operation; const fragments = Object.create(null); for (const definition of document.definitions) { @@ -24277,8 +23653,7 @@ function buildExecutionContext(args) { case _kinds.Kind.FRAGMENT_DEFINITION: fragments[definition.name.value] = definition; break; - default: - // ignore non-executable definitions + default: // ignore non-executable definitions } } if (!operation) { @@ -24286,9 +23661,10 @@ function buildExecutionContext(args) { return [new _GraphQLError.GraphQLError(`Unknown operation named "${operationName}".`)]; } return [new _GraphQLError.GraphQLError('Must provide an operation.')]; - } - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + } // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const variableDefinitions = (_operation$variableDe = operation.variableDefinitions) !== null && _operation$variableDe !== void 0 ? _operation$variableDe : []; const coercedVariableValues = (0, _values.getVariableValues)(schema, variableDefinitions, rawVariableValues !== null && rawVariableValues !== void 0 ? rawVariableValues : {}, { maxErrors: 50 @@ -24306,100 +23682,91 @@ function buildExecutionContext(args) { fieldResolver: fieldResolver !== null && fieldResolver !== void 0 ? fieldResolver : defaultFieldResolver, typeResolver: typeResolver !== null && typeResolver !== void 0 ? typeResolver : defaultTypeResolver, subscribeFieldResolver: subscribeFieldResolver !== null && subscribeFieldResolver !== void 0 ? subscribeFieldResolver : defaultFieldResolver, - enableEarlyExecution: enableEarlyExecution === true, - errors: undefined, - cancellableStreams: undefined + errors: [] }; } -function buildPerEventExecutionContext(exeContext, payload) { - return { - ...exeContext, - rootValue: payload, - errors: undefined - }; -} -function executeRootGroupedFieldSet(exeContext, operation, rootType, rootValue, groupedFieldSet, deferMap) { - switch (operation) { +/** + * Implements the "Executing operations" section of the spec. + */ + +function executeOperation(exeContext, operation, rootValue) { + const rootType = exeContext.schema.getRootType(operation.operation); + if (rootType == null) { + throw new _GraphQLError.GraphQLError(`Schema is not configured to execute ${operation.operation} operation.`, { + nodes: operation + }); + } + const rootFields = (0, _collectFields.collectFields)(exeContext.schema, exeContext.fragments, exeContext.variableValues, rootType, operation.selectionSet); + const path = undefined; + switch (operation.operation) { case _ast.OperationTypeNode.QUERY: - return executeFields(exeContext, rootType, rootValue, undefined, groupedFieldSet, undefined, deferMap); + return executeFields(exeContext, rootType, rootValue, path, rootFields); case _ast.OperationTypeNode.MUTATION: - return executeFieldsSerially(exeContext, rootType, rootValue, undefined, groupedFieldSet, undefined, deferMap); + return executeFieldsSerially(exeContext, rootType, rootValue, path, rootFields); case _ast.OperationTypeNode.SUBSCRIPTION: // TODO: deprecate `subscribe` and move all logic here // Temporary solution until we finish merging execute and subscribe together - return executeFields(exeContext, rootType, rootValue, undefined, groupedFieldSet, undefined, deferMap); + return executeFields(exeContext, rootType, rootValue, path, rootFields); } } /** * Implements the "Executing selection sets" section of the spec * for fields that must be executed serially. */ -function executeFieldsSerially(exeContext, parentType, sourceValue, path, groupedFieldSet, incrementalContext, deferMap) { - return (0, _promiseReduce.promiseReduce)(groupedFieldSet, (graphqlWrappedResult, [responseName, fieldGroup]) => { + +function executeFieldsSerially(exeContext, parentType, sourceValue, path, fields) { + return (0, _promiseReduce.promiseReduce)(fields.entries(), (results, [responseName, fieldNodes]) => { const fieldPath = (0, _Path.addPath)(path, responseName, parentType.name); - const result = executeField(exeContext, parentType, sourceValue, fieldGroup, fieldPath, incrementalContext, deferMap); + const result = executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath); if (result === undefined) { - return graphqlWrappedResult; + return results; } if ((0, _isPromise.isPromise)(result)) { - return result.then(resolved => { - graphqlWrappedResult[0][responseName] = resolved[0]; - addIncrementalDataRecords(graphqlWrappedResult, resolved[1]); - return graphqlWrappedResult; + return result.then(resolvedResult => { + results[responseName] = resolvedResult; + return results; }); } - graphqlWrappedResult[0][responseName] = result[0]; - addIncrementalDataRecords(graphqlWrappedResult, result[1]); - return graphqlWrappedResult; - }, [Object.create(null), undefined]); + results[responseName] = result; + return results; + }, Object.create(null)); } /** * Implements the "Executing selection sets" section of the spec * for fields that may be executed in parallel. */ -function executeFields(exeContext, parentType, sourceValue, path, groupedFieldSet, incrementalContext, deferMap) { + +function executeFields(exeContext, parentType, sourceValue, path, fields) { const results = Object.create(null); - const graphqlWrappedResult = [results, undefined]; let containsPromise = false; try { - for (const [responseName, fieldGroup] of groupedFieldSet) { + for (const [responseName, fieldNodes] of fields.entries()) { const fieldPath = (0, _Path.addPath)(path, responseName, parentType.name); - const result = executeField(exeContext, parentType, sourceValue, fieldGroup, fieldPath, incrementalContext, deferMap); + const result = executeField(exeContext, parentType, sourceValue, fieldNodes, fieldPath); if (result !== undefined) { + results[responseName] = result; if ((0, _isPromise.isPromise)(result)) { - results[responseName] = result.then(resolved => { - addIncrementalDataRecords(graphqlWrappedResult, resolved[1]); - return resolved[0]; - }); containsPromise = true; - } else { - results[responseName] = result[0]; - addIncrementalDataRecords(graphqlWrappedResult, result[1]); } } } } catch (error) { if (containsPromise) { // Ensure that any promises returned by other fields are handled, as they may also reject. - return (0, _promiseForObject.promiseForObject)(results, () => { - /* noop */ - }).finally(() => { + return (0, _promiseForObject.promiseForObject)(results).finally(() => { throw error; }); } throw error; - } - // If there are no promises, we can just return the object and any incrementalDataRecords + } // If there are no promises, we can just return the object + if (!containsPromise) { - return graphqlWrappedResult; - } - // Otherwise, results is a map from field name to the result of resolving that + return results; + } // Otherwise, results is a map from field name to the result of resolving that // field, which is possibly a promise. Return a promise that will return this // same map, but with any promises replaced with the values they resolved to. - return (0, _promiseForObject.promiseForObject)(results, resolved => [resolved, graphqlWrappedResult[1]]); -} -function toNodes(fieldGroup) { - return fieldGroup.map(fieldDetails => fieldDetails.node); + + return (0, _promiseForObject.promiseForObject)(results); } /** * Implements the "Executing fields" section of the spec @@ -24407,49 +23774,51 @@ function toNodes(fieldGroup) { * calling its resolve function, then calls completeValue to complete promises, * serialize scalars, or execute the sub-selection-set for objects. */ -function executeField(exeContext, parentType, source, fieldGroup, path, incrementalContext, deferMap) { + +function executeField(exeContext, parentType, source, fieldNodes, path) { var _fieldDef$resolve; - const fieldName = fieldGroup[0].node.name.value; - const fieldDef = exeContext.schema.getField(parentType, fieldName); + const fieldDef = getFieldDef(exeContext.schema, parentType, fieldNodes[0]); if (!fieldDef) { return; } const returnType = fieldDef.type; const resolveFn = (_fieldDef$resolve = fieldDef.resolve) !== null && _fieldDef$resolve !== void 0 ? _fieldDef$resolve : exeContext.fieldResolver; - const info = buildResolveInfo(exeContext, fieldDef, toNodes(fieldGroup), parentType, path); - // Get the resolve function, regardless of if its result is normal or abrupt (error). + const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path); // Get the resolve function, regardless of if its result is normal or abrupt (error). + try { // Build a JS object of arguments from the field.arguments AST, using the // variables scope to fulfill any variable references. // TODO: find a way to memoize, in case this field is within a List type. - const args = (0, _values.getArgumentValues)(fieldDef, fieldGroup[0].node, exeContext.variableValues); - // The resolve function's optional third argument is a context value that + const args = (0, _values.getArgumentValues)(fieldDef, fieldNodes[0], exeContext.variableValues); // The resolve function's optional third argument is a context value that // is provided to every resolve function within an execution. It is commonly // used to represent an authenticated user, or request-specific caches. + const contextValue = exeContext.contextValue; const result = resolveFn(source, args, contextValue, info); + let completed; if ((0, _isPromise.isPromise)(result)) { - return completePromisedValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap); + completed = result.then(resolved => completeValue(exeContext, returnType, fieldNodes, info, path, resolved)); + } else { + completed = completeValue(exeContext, returnType, fieldNodes, info, path, result); } - const completed = completeValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap); if ((0, _isPromise.isPromise)(completed)) { // Note: we don't rely on a `catch` method, but we do expect "thenable" // to take a second callback for the error case. return completed.then(undefined, rawError => { - handleFieldError(rawError, exeContext, returnType, fieldGroup, path, incrementalContext); - return [null, undefined]; + const error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(path)); + return handleFieldError(error, returnType, exeContext); }); } return completed; } catch (rawError) { - handleFieldError(rawError, exeContext, returnType, fieldGroup, path, incrementalContext); - return [null, undefined]; + const error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(path)); + return handleFieldError(error, returnType, exeContext); } } /** - * TODO: consider no longer exporting this function * @internal */ + function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) { // The resolve function's optional fourth argument is a collection of // information about the current execution state. @@ -24466,22 +23835,16 @@ function buildResolveInfo(exeContext, fieldDef, fieldNodes, parentType, path) { variableValues: exeContext.variableValues }; } -function handleFieldError(rawError, exeContext, returnType, fieldGroup, path, incrementalContext) { - const error = (0, _locatedError.locatedError)(rawError, toNodes(fieldGroup), (0, _Path.pathToArray)(path)); +function handleFieldError(error, returnType, exeContext) { // If the field type is non-nullable, then it is resolved without any // protection from errors, however it still properly locates the error. if ((0, _definition.isNonNullType)(returnType)) { throw error; - } - // Otherwise, error protection is applied, logging the error and resolving + } // Otherwise, error protection is applied, logging the error and resolving // a null value for this field if one is encountered. - const context = incrementalContext !== null && incrementalContext !== void 0 ? incrementalContext : exeContext; - let errors = context.errors; - if (errors === undefined) { - errors = []; - context.errors = errors; - } - errors.push(error); + + exeContext.errors.push(error); + return null; } /** * Implements the instructions for completeValue as defined in the @@ -24504,271 +23867,94 @@ function handleFieldError(rawError, exeContext, returnType, fieldGroup, path, in * Otherwise, the field type expects a sub-selection set, and will complete the * value by executing all sub-selections. */ -function completeValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap) { + +function completeValue(exeContext, returnType, fieldNodes, info, path, result) { // If result is an Error, throw a located error. if (result instanceof Error) { throw result; - } - // If field type is NonNull, complete for inner type, and throw field error + } // If field type is NonNull, complete for inner type, and throw field error // if result is null. + if ((0, _definition.isNonNullType)(returnType)) { - const completed = completeValue(exeContext, returnType.ofType, fieldGroup, info, path, result, incrementalContext, deferMap); - if (completed[0] === null) { + const completed = completeValue(exeContext, returnType.ofType, fieldNodes, info, path, result); + if (completed === null) { throw new Error(`Cannot return null for non-nullable field ${info.parentType.name}.${info.fieldName}.`); } return completed; - } - // If result value is null or undefined then return null. + } // If result value is null or undefined then return null. + if (result == null) { - return [null, undefined]; - } - // If field type is List, complete each item in the list with the inner type + return null; + } // If field type is List, complete each item in the list with the inner type + if ((0, _definition.isListType)(returnType)) { - return completeListValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap); - } - // If field type is a leaf type, Scalar or Enum, serialize to a valid value, + return completeListValue(exeContext, returnType, fieldNodes, info, path, result); + } // If field type is a leaf type, Scalar or Enum, serialize to a valid value, // returning null if serialization is not possible. + if ((0, _definition.isLeafType)(returnType)) { - return [completeLeafValue(returnType, result), undefined]; - } - // If field type is an abstract type, Interface or Union, determine the + return completeLeafValue(returnType, result); + } // If field type is an abstract type, Interface or Union, determine the // runtime Object type and complete for that type. + if ((0, _definition.isAbstractType)(returnType)) { - return completeAbstractValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap); - } - // If field type is Object, execute and complete all sub-selections. + return completeAbstractValue(exeContext, returnType, fieldNodes, info, path, result); + } // If field type is Object, execute and complete all sub-selections. + if ((0, _definition.isObjectType)(returnType)) { - return completeObjectValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap); + return completeObjectValue(exeContext, returnType, fieldNodes, info, path, result); } /* c8 ignore next 6 */ // Not reachable, all possible output types have been considered. + false || (0, _invariant.invariant)(false, 'Cannot complete value of unexpected output type: ' + (0, _inspect.inspect)(returnType)); } -async function completePromisedValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap) { - try { - const resolved = await result; - let completed = completeValue(exeContext, returnType, fieldGroup, info, path, resolved, incrementalContext, deferMap); - if ((0, _isPromise.isPromise)(completed)) { - completed = await completed; - } - return completed; - } catch (rawError) { - handleFieldError(rawError, exeContext, returnType, fieldGroup, path, incrementalContext); - return [null, undefined]; - } -} -/** - * Returns an object containing info for streaming if a field should be - * streamed based on the experimental flag, stream directive present and - * not disabled by the "if" argument. - */ -function getStreamUsage(exeContext, fieldGroup, path) { - // do not stream inner lists of multi-dimensional lists - if (typeof path.key === 'number') { - return; - } - // TODO: add test for this case (a streamed list nested under a list). - /* c8 ignore next 7 */ - if (fieldGroup._streamUsage !== undefined) { - return fieldGroup._streamUsage; - } - // validation only allows equivalent streams on multiple fields, so it is - // safe to only check the first fieldNode for the stream directive - const stream = (0, _values.getDirectiveValues)(_directives.GraphQLStreamDirective, fieldGroup[0].node, exeContext.variableValues); - if (!stream) { - return; - } - if (stream.if === false) { - return; - } - typeof stream.initialCount === 'number' || (0, _invariant.invariant)(false, 'initialCount must be a number'); - stream.initialCount >= 0 || (0, _invariant.invariant)(false, 'initialCount must be a positive integer'); - exeContext.operation.operation !== _ast.OperationTypeNode.SUBSCRIPTION || (0, _invariant.invariant)(false, '`@stream` directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.'); - const streamedFieldGroup = fieldGroup.map(fieldDetails => ({ - node: fieldDetails.node, - deferUsage: undefined - })); - const streamUsage = { - initialCount: stream.initialCount, - label: typeof stream.label === 'string' ? stream.label : undefined, - fieldGroup: streamedFieldGroup - }; - fieldGroup._streamUsage = streamUsage; - return streamUsage; -} -/** - * Complete a async iterator value by completing the result and calling - * recursively until all the results are completed. - */ -async function completeAsyncIteratorValue(exeContext, itemType, fieldGroup, info, path, asyncIterator, incrementalContext, deferMap) { - let containsPromise = false; - const completedResults = []; - const graphqlWrappedResult = [completedResults, undefined]; - let index = 0; - const streamUsage = getStreamUsage(exeContext, fieldGroup, path); - const earlyReturn = asyncIterator.return === undefined ? undefined : asyncIterator.return.bind(asyncIterator); - try { - // eslint-disable-next-line no-constant-condition - while (true) { - if (streamUsage && index >= streamUsage.initialCount) { - const streamItemQueue = buildAsyncStreamItemQueue(index, path, asyncIterator, exeContext, streamUsage.fieldGroup, info, itemType); - let streamRecord; - if (earlyReturn === undefined) { - streamRecord = { - label: streamUsage.label, - path, - streamItemQueue - }; - } else { - streamRecord = { - label: streamUsage.label, - path, - earlyReturn, - streamItemQueue - }; - if (exeContext.cancellableStreams === undefined) { - exeContext.cancellableStreams = new Set(); - } - exeContext.cancellableStreams.add(streamRecord); - } - addIncrementalDataRecords(graphqlWrappedResult, [streamRecord]); - break; - } - const itemPath = (0, _Path.addPath)(path, index, undefined); - let iteration; - try { - // eslint-disable-next-line no-await-in-loop - iteration = await asyncIterator.next(); - } catch (rawError) { - throw (0, _locatedError.locatedError)(rawError, toNodes(fieldGroup), (0, _Path.pathToArray)(path)); - } - // TODO: add test case for stream returning done before initialCount - /* c8 ignore next 3 */ - if (iteration.done) { - break; - } - const item = iteration.value; - // TODO: add tests for stream backed by asyncIterator that returns a promise - /* c8 ignore start */ - if ((0, _isPromise.isPromise)(item)) { - completedResults.push(completePromisedListItemValue(item, graphqlWrappedResult, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap)); - containsPromise = true; - } else if ( /* c8 ignore stop */ - completeListItemValue(item, completedResults, graphqlWrappedResult, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap) - // TODO: add tests for stream backed by asyncIterator that completes to a promise - /* c8 ignore start */) { - containsPromise = true; - } - /* c8 ignore stop */ - index++; - } - } catch (error) { - if (earlyReturn !== undefined) { - earlyReturn().catch(() => { - /* c8 ignore next 1 */ - // ignore error - }); - } - throw error; - } - return containsPromise ? /* c8 ignore start */Promise.all(completedResults).then(resolved => [resolved, graphqlWrappedResult[1]]) : /* c8 ignore stop */graphqlWrappedResult; -} /** * Complete a list value by completing each item in the list with the * inner type */ -function completeListValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap) { - const itemType = returnType.ofType; - if ((0, _isAsyncIterable.isAsyncIterable)(result)) { - const asyncIterator = result[Symbol.asyncIterator](); - return completeAsyncIteratorValue(exeContext, itemType, fieldGroup, info, path, asyncIterator, incrementalContext, deferMap); - } + +function completeListValue(exeContext, returnType, fieldNodes, info, path, result) { if (!(0, _isIterableObject.isIterableObject)(result)) { throw new _GraphQLError.GraphQLError(`Expected Iterable, but did not find one for field "${info.parentType.name}.${info.fieldName}".`); - } - return completeIterableValue(exeContext, itemType, fieldGroup, info, path, result, incrementalContext, deferMap); -} -function completeIterableValue(exeContext, itemType, fieldGroup, info, path, items, incrementalContext, deferMap) { - // This is specified as a simple map, however we're optimizing the path + } // This is specified as a simple map, however we're optimizing the path // where the list contains no Promises by avoiding creating another Promise. + + const itemType = returnType.ofType; let containsPromise = false; - const completedResults = []; - const graphqlWrappedResult = [completedResults, undefined]; - let index = 0; - const streamUsage = getStreamUsage(exeContext, fieldGroup, path); - const iterator = items[Symbol.iterator](); - let iteration = iterator.next(); - while (!iteration.done) { - const item = iteration.value; - if (streamUsage && index >= streamUsage.initialCount) { - const syncStreamRecord = { - label: streamUsage.label, - path, - streamItemQueue: buildSyncStreamItemQueue(item, index, path, iterator, exeContext, streamUsage.fieldGroup, info, itemType) - }; - addIncrementalDataRecords(graphqlWrappedResult, [syncStreamRecord]); - break; - } + const completedResults = Array.from(result, (item, index) => { // No need to modify the info object containing the path, // since from here on it is not ever accessed by resolver functions. const itemPath = (0, _Path.addPath)(path, index, undefined); - if ((0, _isPromise.isPromise)(item)) { - completedResults.push(completePromisedListItemValue(item, graphqlWrappedResult, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap)); - containsPromise = true; - } else if (completeListItemValue(item, completedResults, graphqlWrappedResult, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap)) { - containsPromise = true; + try { + let completedItem; + if ((0, _isPromise.isPromise)(item)) { + completedItem = item.then(resolved => completeValue(exeContext, itemType, fieldNodes, info, itemPath, resolved)); + } else { + completedItem = completeValue(exeContext, itemType, fieldNodes, info, itemPath, item); + } + if ((0, _isPromise.isPromise)(completedItem)) { + containsPromise = true; // Note: we don't rely on a `catch` method, but we do expect "thenable" + // to take a second callback for the error case. + + return completedItem.then(undefined, rawError => { + const error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(itemPath)); + return handleFieldError(error, itemType, exeContext); + }); + } + return completedItem; + } catch (rawError) { + const error = (0, _locatedError.locatedError)(rawError, fieldNodes, (0, _Path.pathToArray)(itemPath)); + return handleFieldError(error, itemType, exeContext); } - index++; - iteration = iterator.next(); - } - return containsPromise ? Promise.all(completedResults).then(resolved => [resolved, graphqlWrappedResult[1]]) : graphqlWrappedResult; -} -/** - * Complete a list item value by adding it to the completed results. - * - * Returns true if the value is a Promise. - */ -function completeListItemValue(item, completedResults, parent, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap) { - try { - const completedItem = completeValue(exeContext, itemType, fieldGroup, info, itemPath, item, incrementalContext, deferMap); - if ((0, _isPromise.isPromise)(completedItem)) { - // Note: we don't rely on a `catch` method, but we do expect "thenable" - // to take a second callback for the error case. - completedResults.push(completedItem.then(resolved => { - addIncrementalDataRecords(parent, resolved[1]); - return resolved[0]; - }, rawError => { - handleFieldError(rawError, exeContext, itemType, fieldGroup, itemPath, incrementalContext); - return null; - })); - return true; - } - completedResults.push(completedItem[0]); - addIncrementalDataRecords(parent, completedItem[1]); - } catch (rawError) { - handleFieldError(rawError, exeContext, itemType, fieldGroup, itemPath, incrementalContext); - completedResults.push(null); - } - return false; -} -async function completePromisedListItemValue(item, parent, exeContext, itemType, fieldGroup, info, itemPath, incrementalContext, deferMap) { - try { - const resolved = await item; - let completed = completeValue(exeContext, itemType, fieldGroup, info, itemPath, resolved, incrementalContext, deferMap); - if ((0, _isPromise.isPromise)(completed)) { - completed = await completed; - } - addIncrementalDataRecords(parent, completed[1]); - return completed[0]; - } catch (rawError) { - handleFieldError(rawError, exeContext, itemType, fieldGroup, itemPath, incrementalContext); - return null; - } + }); + return containsPromise ? Promise.all(completedResults) : completedResults; } /** * Complete a Scalar or Enum by serializing to a valid value, returning * null if serialization is not possible. */ + function completeLeafValue(returnType, result) { const serializedResult = returnType.serialize(result); if (serializedResult == null) { @@ -24780,24 +23966,23 @@ function completeLeafValue(returnType, result) { * Complete a value of an abstract type by determining the runtime object type * of that value, then complete the value for that type. */ -function completeAbstractValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap) { + +function completeAbstractValue(exeContext, returnType, fieldNodes, info, path, result) { var _returnType$resolveTy; const resolveTypeFn = (_returnType$resolveTy = returnType.resolveType) !== null && _returnType$resolveTy !== void 0 ? _returnType$resolveTy : exeContext.typeResolver; const contextValue = exeContext.contextValue; const runtimeType = resolveTypeFn(result, contextValue, info, returnType); if ((0, _isPromise.isPromise)(runtimeType)) { - return runtimeType.then(resolvedRuntimeType => completeObjectValue(exeContext, ensureValidRuntimeType(resolvedRuntimeType, exeContext, returnType, fieldGroup, info, result), fieldGroup, info, path, result, incrementalContext, deferMap)); + return runtimeType.then(resolvedRuntimeType => completeObjectValue(exeContext, ensureValidRuntimeType(resolvedRuntimeType, exeContext, returnType, fieldNodes, info, result), fieldNodes, info, path, result)); } - return completeObjectValue(exeContext, ensureValidRuntimeType(runtimeType, exeContext, returnType, fieldGroup, info, result), fieldGroup, info, path, result, incrementalContext, deferMap); + return completeObjectValue(exeContext, ensureValidRuntimeType(runtimeType, exeContext, returnType, fieldNodes, info, result), fieldNodes, info, path, result); } -function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldGroup, info, result) { +function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldNodes, info, result) { if (runtimeTypeName == null) { - throw new _GraphQLError.GraphQLError(`Abstract type "${returnType.name}" must resolve to an Object type at runtime for field "${info.parentType.name}.${info.fieldName}". Either the "${returnType.name}" type should provide a "resolveType" function or each possible type should provide an "isTypeOf" function.`, { - nodes: toNodes(fieldGroup) - }); - } - // releases before 16.0.0 supported returning `GraphQLObjectType` from `resolveType` + throw new _GraphQLError.GraphQLError(`Abstract type "${returnType.name}" must resolve to an Object type at runtime for field "${info.parentType.name}.${info.fieldName}". Either the "${returnType.name}" type should provide a "resolveType" function or each possible type should provide an "isTypeOf" function.`, fieldNodes); + } // releases before 16.0.0 supported returning `GraphQLObjectType` from `resolveType` // TODO: remove in 17.0.0 release + if ((0, _definition.isObjectType)(runtimeTypeName)) { throw new _GraphQLError.GraphQLError('Support for returning GraphQLObjectType from resolveType was removed in graphql-js@16.0.0 please return type name instead.'); } @@ -24807,17 +23992,17 @@ function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldGr const runtimeType = exeContext.schema.getType(runtimeTypeName); if (runtimeType == null) { throw new _GraphQLError.GraphQLError(`Abstract type "${returnType.name}" was resolved to a type "${runtimeTypeName}" that does not exist inside the schema.`, { - nodes: toNodes(fieldGroup) + nodes: fieldNodes }); } if (!(0, _definition.isObjectType)(runtimeType)) { throw new _GraphQLError.GraphQLError(`Abstract type "${returnType.name}" was resolved to a non-object type "${runtimeTypeName}".`, { - nodes: toNodes(fieldGroup) + nodes: fieldNodes }); } if (!exeContext.schema.isSubType(returnType, runtimeType)) { throw new _GraphQLError.GraphQLError(`Runtime Object type "${runtimeType.name}" is not a possible type for "${returnType.name}".`, { - nodes: toNodes(fieldGroup) + nodes: fieldNodes }); } return runtimeType; @@ -24825,92 +24010,34 @@ function ensureValidRuntimeType(runtimeTypeName, exeContext, returnType, fieldGr /** * Complete an Object value by executing all sub-selections. */ -function completeObjectValue(exeContext, returnType, fieldGroup, info, path, result, incrementalContext, deferMap) { - // If there is an isTypeOf predicate function, call it with the + +function completeObjectValue(exeContext, returnType, fieldNodes, info, path, result) { + // Collect sub-fields to execute to complete this value. + const subFieldNodes = collectSubfields(exeContext, returnType, fieldNodes); // If there is an isTypeOf predicate function, call it with the // current result. If isTypeOf returns false, then raise an error rather // than continuing execution. + if (returnType.isTypeOf) { const isTypeOf = returnType.isTypeOf(result, exeContext.contextValue, info); if ((0, _isPromise.isPromise)(isTypeOf)) { return isTypeOf.then(resolvedIsTypeOf => { if (!resolvedIsTypeOf) { - throw invalidReturnTypeError(returnType, result, fieldGroup); + throw invalidReturnTypeError(returnType, result, fieldNodes); } - return collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, result, incrementalContext, deferMap); + return executeFields(exeContext, returnType, result, path, subFieldNodes); }); } if (!isTypeOf) { - throw invalidReturnTypeError(returnType, result, fieldGroup); + throw invalidReturnTypeError(returnType, result, fieldNodes); } } - return collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, result, incrementalContext, deferMap); + return executeFields(exeContext, returnType, result, path, subFieldNodes); } -function invalidReturnTypeError(returnType, result, fieldGroup) { +function invalidReturnTypeError(returnType, result, fieldNodes) { return new _GraphQLError.GraphQLError(`Expected value of type "${returnType.name}" but got: ${(0, _inspect.inspect)(result)}.`, { - nodes: toNodes(fieldGroup) + nodes: fieldNodes }); } -/** - * Instantiates new DeferredFragmentRecords for the given path within an - * incremental data record, returning an updated map of DeferUsage - * objects to DeferredFragmentRecords. - * - * Note: As defer directives may be used with operations returning lists, - * a DeferUsage object may correspond to many DeferredFragmentRecords. - * - * DeferredFragmentRecord creation includes the following steps: - * 1. The new DeferredFragmentRecord is instantiated at the given path. - * 2. The parent result record is calculated from the given incremental data - * record. - * 3. The IncrementalPublisher is notified that a new DeferredFragmentRecord - * with the calculated parent has been added; the record will be released only - * after the parent has completed. - * - */ -function addNewDeferredFragments(newDeferUsages, newDeferMap, path) { - // For each new deferUsage object: - for (const newDeferUsage of newDeferUsages) { - const parentDeferUsage = newDeferUsage.parentDeferUsage; - const parent = parentDeferUsage === undefined ? undefined : deferredFragmentRecordFromDeferUsage(parentDeferUsage, newDeferMap); - // Instantiate the new record. - const deferredFragmentRecord = new _types.DeferredFragmentRecord(path, newDeferUsage.label, parent); - // Update the map. - newDeferMap.set(newDeferUsage, deferredFragmentRecord); - } - return newDeferMap; -} -function deferredFragmentRecordFromDeferUsage(deferUsage, deferMap) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - return deferMap.get(deferUsage); -} -function collectAndExecuteSubfields(exeContext, returnType, fieldGroup, path, result, incrementalContext, deferMap) { - // Collect sub-fields to execute to complete this value. - const collectedSubfields = collectSubfields(exeContext, returnType, fieldGroup); - let groupedFieldSet = collectedSubfields.groupedFieldSet; - const newDeferUsages = collectedSubfields.newDeferUsages; - if (deferMap === undefined && newDeferUsages.length === 0) { - return executeFields(exeContext, returnType, result, path, groupedFieldSet, incrementalContext, undefined); - } - const subExecutionPlan = buildSubExecutionPlan(groupedFieldSet, incrementalContext === null || incrementalContext === void 0 ? void 0 : incrementalContext.deferUsageSet); - groupedFieldSet = subExecutionPlan.groupedFieldSet; - const newGroupedFieldSets = subExecutionPlan.newGroupedFieldSets; - const newDeferMap = addNewDeferredFragments(newDeferUsages, new Map(deferMap), path); - const subFields = executeFields(exeContext, returnType, result, path, groupedFieldSet, incrementalContext, newDeferMap); - if (newGroupedFieldSets.size > 0) { - const newPendingExecutionGroups = collectExecutionGroups(exeContext, returnType, result, path, incrementalContext === null || incrementalContext === void 0 ? void 0 : incrementalContext.deferUsageSet, newGroupedFieldSets, newDeferMap); - return withNewExecutionGroups(subFields, newPendingExecutionGroups); - } - return subFields; -} -function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet) { - let executionPlan = originalGroupedFieldSet._executionPlan; - if (executionPlan !== undefined) { - return executionPlan; - } - executionPlan = (0, _buildExecutionPlan.buildExecutionPlan)(originalGroupedFieldSet, deferUsageSet); - originalGroupedFieldSet._executionPlan = executionPlan; - return executionPlan; -} /** * If a resolveType function is not given, then a default resolve behavior is * used which attempts two strategies: @@ -24921,12 +24048,13 @@ function buildSubExecutionPlan(originalGroupedFieldSet, deferUsageSet) { * Otherwise, test each possible type for the abstract type by calling * isTypeOf for the object being coerced, returning the first type that matches. */ + const defaultTypeResolver = function (value, contextValue, info, abstractType) { // First, look for `__typename`. if ((0, _isObjectLike.isObjectLike)(value) && typeof value.__typename === 'string') { return value.__typename; - } - // Otherwise, test each possible type. + } // Otherwise, test each possible type. + const possibleTypes = info.schema.getPossibleTypes(abstractType); const promisedIsTypeOfResults = []; for (let i = 0; i < possibleTypes.length; i++) { @@ -24968,340 +24096,27 @@ const defaultFieldResolver = function (source, args, contextValue, info) { } }; /** - * Implements the "Subscribe" algorithm described in the GraphQL specification. + * This method looks up the field on the given type definition. + * It has special casing for the three introspection fields, + * __schema, __type and __typename. __typename is special because + * it can always be queried as a field, even in situations where no + * other fields are allowed, like on a Union. __schema and __type + * could get automatically added to the query type, but that would + * require mutating type definitions, which would cause issues. * - * Returns a Promise which resolves to either an AsyncIterator (if successful) - * or an ExecutionResult (error). The promise will be rejected if the schema or - * other arguments to this function are invalid, or if the resolved event stream - * is not an async iterable. - * - * If the client-provided arguments to this function do not result in a - * compliant subscription, a GraphQL Response (ExecutionResult) with descriptive - * errors and no data will be returned. - * - * If the source stream could not be created due to faulty subscription resolver - * logic or underlying systems, the promise will resolve to a single - * ExecutionResult containing `errors` and no `data`. - * - * If the operation succeeded, the promise resolves to an AsyncIterator, which - * yields a stream of ExecutionResults representing the response stream. - * - * This function does not support incremental delivery (`@defer` and `@stream`). - * If an operation which would defer or stream data is executed with this - * function, a field error will be raised at the location of the `@defer` or - * `@stream` directive. - * - * Accepts an object with named arguments. + * @internal */ exports.defaultFieldResolver = defaultFieldResolver; -function subscribe(args) { - // If a valid execution context cannot be created due to incorrect arguments, - // a "Response" with only errors is returned. - const exeContext = buildExecutionContext(args); - // Return early errors if execution context failed. - if (!('schema' in exeContext)) { - return { - errors: exeContext - }; +function getFieldDef(schema, parentType, fieldNode) { + const fieldName = fieldNode.name.value; + if (fieldName === _introspection.SchemaMetaFieldDef.name && schema.getQueryType() === parentType) { + return _introspection.SchemaMetaFieldDef; + } else if (fieldName === _introspection.TypeMetaFieldDef.name && schema.getQueryType() === parentType) { + return _introspection.TypeMetaFieldDef; + } else if (fieldName === _introspection.TypeNameMetaFieldDef.name) { + return _introspection.TypeNameMetaFieldDef; } - const resultOrStream = createSourceEventStreamImpl(exeContext); - if ((0, _isPromise.isPromise)(resultOrStream)) { - return resultOrStream.then(resolvedResultOrStream => mapSourceToResponse(exeContext, resolvedResultOrStream)); - } - return mapSourceToResponse(exeContext, resultOrStream); -} -function mapSourceToResponse(exeContext, resultOrStream) { - if (!(0, _isAsyncIterable.isAsyncIterable)(resultOrStream)) { - return resultOrStream; - } - // For each payload yielded from a subscription, map it over the normal - // GraphQL `execute` function, with `payload` as the rootValue. - // This implements the "MapSourceToResponseEvent" algorithm described in - // the GraphQL specification. The `execute` function provides the - // "ExecuteSubscriptionEvent" algorithm, as it is nearly identical to the - // "ExecuteQuery" algorithm, for which `execute` is also used. - return (0, _mapAsyncIterable.mapAsyncIterable)(resultOrStream, payload => executeOperation(buildPerEventExecutionContext(exeContext, payload))); -} -/** - * Implements the "CreateSourceEventStream" algorithm described in the - * GraphQL specification, resolving the subscription source event stream. - * - * Returns a Promise which resolves to either an AsyncIterable (if successful) - * or an ExecutionResult (error). The promise will be rejected if the schema or - * other arguments to this function are invalid, or if the resolved event stream - * is not an async iterable. - * - * If the client-provided arguments to this function do not result in a - * compliant subscription, a GraphQL Response (ExecutionResult) with - * descriptive errors and no data will be returned. - * - * If the the source stream could not be created due to faulty subscription - * resolver logic or underlying systems, the promise will resolve to a single - * ExecutionResult containing `errors` and no `data`. - * - * If the operation succeeded, the promise resolves to the AsyncIterable for the - * event stream returned by the resolver. - * - * A Source Event Stream represents a sequence of events, each of which triggers - * a GraphQL execution for that event. - * - * This may be useful when hosting the stateful subscription service in a - * different process or machine than the stateless GraphQL execution engine, - * or otherwise separating these two steps. For more on this, see the - * "Supporting Subscriptions at Scale" information in the GraphQL specification. - */ -function createSourceEventStream(args) { - // If a valid execution context cannot be created due to incorrect arguments, - // a "Response" with only errors is returned. - const exeContext = buildExecutionContext(args); - // Return early errors if execution context failed. - if (!('schema' in exeContext)) { - return { - errors: exeContext - }; - } - return createSourceEventStreamImpl(exeContext); -} -function createSourceEventStreamImpl(exeContext) { - try { - const eventStream = executeSubscription(exeContext); - if ((0, _isPromise.isPromise)(eventStream)) { - return eventStream.then(undefined, error => ({ - errors: [error] - })); - } - return eventStream; - } catch (error) { - return { - errors: [error] - }; - } -} -function executeSubscription(exeContext) { - const { - schema, - fragments, - operation, - variableValues, - rootValue - } = exeContext; - const rootType = schema.getSubscriptionType(); - if (rootType == null) { - throw new _GraphQLError.GraphQLError('Schema is not configured to execute subscription operation.', { - nodes: operation - }); - } - const { - groupedFieldSet - } = (0, _collectFields.collectFields)(schema, fragments, variableValues, rootType, operation); - const firstRootField = groupedFieldSet.entries().next().value; - const [responseName, fieldGroup] = firstRootField; - const fieldName = fieldGroup[0].node.name.value; - const fieldDef = schema.getField(rootType, fieldName); - const fieldNodes = fieldGroup.map(fieldDetails => fieldDetails.node); - if (!fieldDef) { - throw new _GraphQLError.GraphQLError(`The subscription field "${fieldName}" is not defined.`, { - nodes: fieldNodes - }); - } - const path = (0, _Path.addPath)(undefined, responseName, rootType.name); - const info = buildResolveInfo(exeContext, fieldDef, fieldNodes, rootType, path); - try { - var _fieldDef$subscribe; - // Implements the "ResolveFieldEventStream" algorithm from GraphQL specification. - // It differs from "ResolveFieldValue" due to providing a different `resolveFn`. - // Build a JS object of arguments from the field.arguments AST, using the - // variables scope to fulfill any variable references. - const args = (0, _values.getArgumentValues)(fieldDef, fieldNodes[0], variableValues); - // The resolve function's optional third argument is a context value that - // is provided to every resolve function within an execution. It is commonly - // used to represent an authenticated user, or request-specific caches. - const contextValue = exeContext.contextValue; - // Call the `subscribe()` resolver or the default resolver to produce an - // AsyncIterable yielding raw payloads. - const resolveFn = (_fieldDef$subscribe = fieldDef.subscribe) !== null && _fieldDef$subscribe !== void 0 ? _fieldDef$subscribe : exeContext.subscribeFieldResolver; - const result = resolveFn(rootValue, args, contextValue, info); - if ((0, _isPromise.isPromise)(result)) { - return result.then(assertEventStream).then(undefined, error => { - throw (0, _locatedError.locatedError)(error, fieldNodes, (0, _Path.pathToArray)(path)); - }); - } - return assertEventStream(result); - } catch (error) { - throw (0, _locatedError.locatedError)(error, fieldNodes, (0, _Path.pathToArray)(path)); - } -} -function assertEventStream(result) { - if (result instanceof Error) { - throw result; - } - // Assert field returned an event stream, otherwise yield an error. - if (!(0, _isAsyncIterable.isAsyncIterable)(result)) { - throw new _GraphQLError.GraphQLError('Subscription field must return Async Iterable. ' + `Received: ${(0, _inspect.inspect)(result)}.`); - } - return result; -} -function collectExecutionGroups(exeContext, parentType, sourceValue, path, parentDeferUsages, newGroupedFieldSets, deferMap) { - const newPendingExecutionGroups = []; - for (const [deferUsageSet, groupedFieldSet] of newGroupedFieldSets) { - const deferredFragmentRecords = getDeferredFragmentRecords(deferUsageSet, deferMap); - const pendingExecutionGroup = { - deferredFragmentRecords, - result: undefined - }; - const executor = () => executeExecutionGroup(pendingExecutionGroup, exeContext, parentType, sourceValue, path, groupedFieldSet, { - errors: undefined, - deferUsageSet - }, deferMap); - if (exeContext.enableEarlyExecution) { - pendingExecutionGroup.result = new _BoxedPromiseOrValue.BoxedPromiseOrValue(shouldDefer(parentDeferUsages, deferUsageSet) ? Promise.resolve().then(executor) : executor()); - } else { - pendingExecutionGroup.result = () => new _BoxedPromiseOrValue.BoxedPromiseOrValue(executor()); - } - newPendingExecutionGroups.push(pendingExecutionGroup); - } - return newPendingExecutionGroups; -} -function shouldDefer(parentDeferUsages, deferUsages) { - // If we have a new child defer usage, defer. - // Otherwise, this defer usage was already deferred when it was initially - // encountered, and is now in the midst of executing early, so the new - // deferred grouped fields set can be executed immediately. - return parentDeferUsages === undefined || !Array.from(deferUsages).every(deferUsage => parentDeferUsages.has(deferUsage)); -} -function executeExecutionGroup(pendingExecutionGroup, exeContext, parentType, sourceValue, path, groupedFieldSet, incrementalContext, deferMap) { - let result; - try { - result = executeFields(exeContext, parentType, sourceValue, path, groupedFieldSet, incrementalContext, deferMap); - } catch (error) { - return { - pendingExecutionGroup, - path: (0, _Path.pathToArray)(path), - errors: withError(incrementalContext.errors, error) - }; - } - if ((0, _isPromise.isPromise)(result)) { - return result.then(resolved => buildCompletedExecutionGroup(incrementalContext.errors, pendingExecutionGroup, path, resolved), error => ({ - pendingExecutionGroup, - path: (0, _Path.pathToArray)(path), - errors: withError(incrementalContext.errors, error) - })); - } - return buildCompletedExecutionGroup(incrementalContext.errors, pendingExecutionGroup, path, result); -} -function buildCompletedExecutionGroup(errors, pendingExecutionGroup, path, result) { - return { - pendingExecutionGroup, - path: (0, _Path.pathToArray)(path), - result: errors === undefined ? { - data: result[0] - } : { - data: result[0], - errors - }, - incrementalDataRecords: result[1] - }; -} -function getDeferredFragmentRecords(deferUsages, deferMap) { - return Array.from(deferUsages).map(deferUsage => deferredFragmentRecordFromDeferUsage(deferUsage, deferMap)); -} -function buildSyncStreamItemQueue(initialItem, initialIndex, streamPath, iterator, exeContext, fieldGroup, info, itemType) { - const streamItemQueue = []; - const enableEarlyExecution = exeContext.enableEarlyExecution; - const firstExecutor = () => { - const initialPath = (0, _Path.addPath)(streamPath, initialIndex, undefined); - const firstStreamItem = new _BoxedPromiseOrValue.BoxedPromiseOrValue(completeStreamItem(initialPath, initialItem, exeContext, { - errors: undefined - }, fieldGroup, info, itemType)); - let iteration = iterator.next(); - let currentIndex = initialIndex + 1; - let currentStreamItem = firstStreamItem; - while (!iteration.done) { - // TODO: add test case for early sync termination - /* c8 ignore next 6 */ - if (currentStreamItem instanceof _BoxedPromiseOrValue.BoxedPromiseOrValue) { - const result = currentStreamItem.value; - if (!(0, _isPromise.isPromise)(result) && result.errors !== undefined) { - break; - } - } - const itemPath = (0, _Path.addPath)(streamPath, currentIndex, undefined); - const value = iteration.value; - const currentExecutor = () => completeStreamItem(itemPath, value, exeContext, { - errors: undefined - }, fieldGroup, info, itemType); - currentStreamItem = enableEarlyExecution ? new _BoxedPromiseOrValue.BoxedPromiseOrValue(currentExecutor()) : () => new _BoxedPromiseOrValue.BoxedPromiseOrValue(currentExecutor()); - streamItemQueue.push(currentStreamItem); - iteration = iterator.next(); - currentIndex = initialIndex + 1; - } - streamItemQueue.push(new _BoxedPromiseOrValue.BoxedPromiseOrValue({})); - return firstStreamItem.value; - }; - streamItemQueue.push(enableEarlyExecution ? new _BoxedPromiseOrValue.BoxedPromiseOrValue(Promise.resolve().then(firstExecutor)) : () => new _BoxedPromiseOrValue.BoxedPromiseOrValue(firstExecutor())); - return streamItemQueue; -} -function buildAsyncStreamItemQueue(initialIndex, streamPath, asyncIterator, exeContext, fieldGroup, info, itemType) { - const streamItemQueue = []; - const executor = () => getNextAsyncStreamItemResult(streamItemQueue, streamPath, initialIndex, asyncIterator, exeContext, fieldGroup, info, itemType); - streamItemQueue.push(exeContext.enableEarlyExecution ? new _BoxedPromiseOrValue.BoxedPromiseOrValue(executor()) : () => new _BoxedPromiseOrValue.BoxedPromiseOrValue(executor())); - return streamItemQueue; -} -async function getNextAsyncStreamItemResult(streamItemQueue, streamPath, index, asyncIterator, exeContext, fieldGroup, info, itemType) { - let iteration; - try { - iteration = await asyncIterator.next(); - } catch (error) { - return { - errors: [(0, _locatedError.locatedError)(error, toNodes(fieldGroup), (0, _Path.pathToArray)(streamPath))] - }; - } - if (iteration.done) { - return {}; - } - const itemPath = (0, _Path.addPath)(streamPath, index, undefined); - const result = completeStreamItem(itemPath, iteration.value, exeContext, { - errors: undefined - }, fieldGroup, info, itemType); - const executor = () => getNextAsyncStreamItemResult(streamItemQueue, streamPath, index + 1, asyncIterator, exeContext, fieldGroup, info, itemType); - streamItemQueue.push(exeContext.enableEarlyExecution ? new _BoxedPromiseOrValue.BoxedPromiseOrValue(executor()) : () => new _BoxedPromiseOrValue.BoxedPromiseOrValue(executor())); - return result; -} -function completeStreamItem(itemPath, item, exeContext, incrementalContext, fieldGroup, info, itemType) { - if ((0, _isPromise.isPromise)(item)) { - return completePromisedValue(exeContext, itemType, fieldGroup, info, itemPath, item, incrementalContext, new Map()).then(resolvedItem => buildStreamItemResult(incrementalContext.errors, resolvedItem), error => ({ - errors: withError(incrementalContext.errors, error) - })); - } - let result; - try { - try { - result = completeValue(exeContext, itemType, fieldGroup, info, itemPath, item, incrementalContext, new Map()); - } catch (rawError) { - handleFieldError(rawError, exeContext, itemType, fieldGroup, itemPath, incrementalContext); - result = [null, undefined]; - } - } catch (error) { - return { - errors: withError(incrementalContext.errors, error) - }; - } - if ((0, _isPromise.isPromise)(result)) { - return result.then(undefined, rawError => { - handleFieldError(rawError, exeContext, itemType, fieldGroup, itemPath, incrementalContext); - return [null, undefined]; - }).then(resolvedItem => buildStreamItemResult(incrementalContext.errors, resolvedItem), error => ({ - errors: withError(incrementalContext.errors, error) - })); - } - return buildStreamItemResult(incrementalContext.errors, result); -} -function buildStreamItemResult(errors, result) { - return { - item: result[0], - errors, - incrementalDataRecords: result[1] - }; + return parentType.getFields()[fieldName]; } /***/ }), @@ -25320,7 +24135,7 @@ Object.defineProperty(exports, "__esModule", ({ Object.defineProperty(exports, "createSourceEventStream", ({ enumerable: true, get: function () { - return _execute.createSourceEventStream; + return _subscribe.createSourceEventStream; } })); Object.defineProperty(exports, "defaultFieldResolver", ({ @@ -25347,12 +24162,6 @@ Object.defineProperty(exports, "executeSync", ({ return _execute.executeSync; } })); -Object.defineProperty(exports, "experimentalExecuteIncrementally", ({ - enumerable: true, - get: function () { - return _execute.experimentalExecuteIncrementally; - } -})); Object.defineProperty(exports, "getArgumentValues", ({ enumerable: true, get: function () { @@ -25380,18 +24189,19 @@ Object.defineProperty(exports, "responsePathAsArray", ({ Object.defineProperty(exports, "subscribe", ({ enumerable: true, get: function () { - return _execute.subscribe; + return _subscribe.subscribe; } })); var _Path = __webpack_require__(/*! ../jsutils/Path.mjs */ "../../../node_modules/graphql/jsutils/Path.mjs"); var _execute = __webpack_require__(/*! ./execute.mjs */ "../../../node_modules/graphql/execution/execute.mjs"); +var _subscribe = __webpack_require__(/*! ./subscribe.mjs */ "../../../node_modules/graphql/execution/subscribe.mjs"); var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/graphql/execution/values.mjs"); /***/ }), -/***/ "../../../node_modules/graphql/execution/mapAsyncIterable.mjs": +/***/ "../../../node_modules/graphql/execution/mapAsyncIterator.mjs": /*!********************************************************************!*\ - !*** ../../../node_modules/graphql/execution/mapAsyncIterable.mjs ***! + !*** ../../../node_modules/graphql/execution/mapAsyncIterator.mjs ***! \********************************************************************/ /***/ (function(__unused_webpack_module, exports) { @@ -25400,12 +24210,12 @@ var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/gra Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.mapAsyncIterable = mapAsyncIterable; +exports.mapAsyncIterator = mapAsyncIterator; /** * Given an AsyncIterable and a callback function, return an AsyncIterator * which produces values mapped via calling the callback function. */ -function mapAsyncIterable(iterable, callback) { +function mapAsyncIterator(iterable, callback) { const iterator = iterable[Symbol.asyncIterator](); async function mapResult(result) { if (result.done) { @@ -25455,49 +24265,201 @@ function mapAsyncIterable(iterable, callback) { /***/ }), -/***/ "../../../node_modules/graphql/execution/types.mjs": -/*!*********************************************************!*\ - !*** ../../../node_modules/graphql/execution/types.mjs ***! - \*********************************************************/ -/***/ (function(__unused_webpack_module, exports) { +/***/ "../../../node_modules/graphql/execution/subscribe.mjs": +/*!*************************************************************!*\ + !*** ../../../node_modules/graphql/execution/subscribe.mjs ***! + \*************************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.DeferredFragmentRecord = void 0; -exports.isCancellableStreamRecord = isCancellableStreamRecord; -exports.isCompletedExecutionGroup = isCompletedExecutionGroup; -exports.isDeferredFragmentRecord = isDeferredFragmentRecord; -exports.isFailedExecutionGroup = isFailedExecutionGroup; -exports.isPendingExecutionGroup = isPendingExecutionGroup; -function isPendingExecutionGroup(incrementalDataRecord) { - return 'deferredFragmentRecords' in incrementalDataRecord; +exports.createSourceEventStream = createSourceEventStream; +exports.subscribe = subscribe; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); +var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); +var _isAsyncIterable = __webpack_require__(/*! ../jsutils/isAsyncIterable.mjs */ "../../../node_modules/graphql/jsutils/isAsyncIterable.mjs"); +var _Path = __webpack_require__(/*! ../jsutils/Path.mjs */ "../../../node_modules/graphql/jsutils/Path.mjs"); +var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); +var _locatedError = __webpack_require__(/*! ../error/locatedError.mjs */ "../../../node_modules/graphql/error/locatedError.mjs"); +var _collectFields = __webpack_require__(/*! ./collectFields.mjs */ "../../../node_modules/graphql/execution/collectFields.mjs"); +var _execute = __webpack_require__(/*! ./execute.mjs */ "../../../node_modules/graphql/execution/execute.mjs"); +var _mapAsyncIterator = __webpack_require__(/*! ./mapAsyncIterator.mjs */ "../../../node_modules/graphql/execution/mapAsyncIterator.mjs"); +var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/graphql/execution/values.mjs"); +/** + * Implements the "Subscribe" algorithm described in the GraphQL specification. + * + * Returns a Promise which resolves to either an AsyncIterator (if successful) + * or an ExecutionResult (error). The promise will be rejected if the schema or + * other arguments to this function are invalid, or if the resolved event stream + * is not an async iterable. + * + * If the client-provided arguments to this function do not result in a + * compliant subscription, a GraphQL Response (ExecutionResult) with + * descriptive errors and no data will be returned. + * + * If the source stream could not be created due to faulty subscription + * resolver logic or underlying systems, the promise will resolve to a single + * ExecutionResult containing `errors` and no `data`. + * + * If the operation succeeded, the promise resolves to an AsyncIterator, which + * yields a stream of ExecutionResults representing the response stream. + * + * Accepts either an object with named arguments, or individual arguments. + */ + +async function subscribe(args) { + // Temporary for v15 to v16 migration. Remove in v17 + arguments.length < 2 || (0, _devAssert.devAssert)(false, 'graphql@16 dropped long-deprecated support for positional arguments, please pass an object instead.'); + const resultOrStream = await createSourceEventStream(args); + if (!(0, _isAsyncIterable.isAsyncIterable)(resultOrStream)) { + return resultOrStream; + } // For each payload yielded from a subscription, map it over the normal + // GraphQL `execute` function, with `payload` as the rootValue. + // This implements the "MapSourceToResponseEvent" algorithm described in + // the GraphQL specification. The `execute` function provides the + // "ExecuteSubscriptionEvent" algorithm, as it is nearly identical to the + // "ExecuteQuery" algorithm, for which `execute` is also used. + + const mapSourceToResponse = payload => (0, _execute.execute)({ + ...args, + rootValue: payload + }); // Map every source value to a ExecutionResult value as described above. + + return (0, _mapAsyncIterator.mapAsyncIterator)(resultOrStream, mapSourceToResponse); } -function isCompletedExecutionGroup(subsequentResult) { - return 'pendingExecutionGroup' in subsequentResult; +function toNormalizedArgs(args) { + const firstArg = args[0]; + if (firstArg && 'document' in firstArg) { + return firstArg; + } + return { + schema: firstArg, + // FIXME: when underlying TS bug fixed, see https://github.com/microsoft/TypeScript/issues/31613 + document: args[1], + rootValue: args[2], + contextValue: args[3], + variableValues: args[4], + operationName: args[5], + subscribeFieldResolver: args[6] + }; } -function isFailedExecutionGroup(completedExecutionGroup) { - return completedExecutionGroup.errors !== undefined; -} -/** @internal */ -class DeferredFragmentRecord { - constructor(path, label, parent) { - this.path = path; - this.label = label; - this.parent = parent; - this.pendingExecutionGroups = new Set(); - this.successfulExecutionGroups = new Set(); - this.children = new Set(); +/** + * Implements the "CreateSourceEventStream" algorithm described in the + * GraphQL specification, resolving the subscription source event stream. + * + * Returns a Promise which resolves to either an AsyncIterable (if successful) + * or an ExecutionResult (error). The promise will be rejected if the schema or + * other arguments to this function are invalid, or if the resolved event stream + * is not an async iterable. + * + * If the client-provided arguments to this function do not result in a + * compliant subscription, a GraphQL Response (ExecutionResult) with + * descriptive errors and no data will be returned. + * + * If the the source stream could not be created due to faulty subscription + * resolver logic or underlying systems, the promise will resolve to a single + * ExecutionResult containing `errors` and no `data`. + * + * If the operation succeeded, the promise resolves to the AsyncIterable for the + * event stream returned by the resolver. + * + * A Source Event Stream represents a sequence of events, each of which triggers + * a GraphQL execution for that event. + * + * This may be useful when hosting the stateful subscription service in a + * different process or machine than the stateless GraphQL execution engine, + * or otherwise separating these two steps. For more on this, see the + * "Supporting Subscriptions at Scale" information in the GraphQL specification. + */ + +async function createSourceEventStream(...rawArgs) { + const args = toNormalizedArgs(rawArgs); + const { + schema, + document, + variableValues + } = args; // If arguments are missing or incorrectly typed, this is an internal + // developer mistake which should throw an early error. + + (0, _execute.assertValidExecutionArguments)(schema, document, variableValues); // If a valid execution context cannot be created due to incorrect arguments, + // a "Response" with only errors is returned. + + const exeContext = (0, _execute.buildExecutionContext)(args); // Return early errors if execution context failed. + + if (!('schema' in exeContext)) { + return { + errors: exeContext + }; + } + try { + const eventStream = await executeSubscription(exeContext); // Assert field returned an event stream, otherwise yield an error. + + if (!(0, _isAsyncIterable.isAsyncIterable)(eventStream)) { + throw new Error('Subscription field must return Async Iterable. ' + `Received: ${(0, _inspect.inspect)(eventStream)}.`); + } + return eventStream; + } catch (error) { + // If it GraphQLError, report it as an ExecutionResult, containing only errors and no data. + // Otherwise treat the error as a system-class error and re-throw it. + if (error instanceof _GraphQLError.GraphQLError) { + return { + errors: [error] + }; + } + throw error; } } -exports.DeferredFragmentRecord = DeferredFragmentRecord; -function isDeferredFragmentRecord(deliveryGroup) { - return deliveryGroup instanceof DeferredFragmentRecord; -} -function isCancellableStreamRecord(deliveryGroup) { - return 'earlyReturn' in deliveryGroup; +async function executeSubscription(exeContext) { + const { + schema, + fragments, + operation, + variableValues, + rootValue + } = exeContext; + const rootType = schema.getSubscriptionType(); + if (rootType == null) { + throw new _GraphQLError.GraphQLError('Schema is not configured to execute subscription operation.', { + nodes: operation + }); + } + const rootFields = (0, _collectFields.collectFields)(schema, fragments, variableValues, rootType, operation.selectionSet); + const [responseName, fieldNodes] = [...rootFields.entries()][0]; + const fieldDef = (0, _execute.getFieldDef)(schema, rootType, fieldNodes[0]); + if (!fieldDef) { + const fieldName = fieldNodes[0].name.value; + throw new _GraphQLError.GraphQLError(`The subscription field "${fieldName}" is not defined.`, { + nodes: fieldNodes + }); + } + const path = (0, _Path.addPath)(undefined, responseName, rootType.name); + const info = (0, _execute.buildResolveInfo)(exeContext, fieldDef, fieldNodes, rootType, path); + try { + var _fieldDef$subscribe; + + // Implements the "ResolveFieldEventStream" algorithm from GraphQL specification. + // It differs from "ResolveFieldValue" due to providing a different `resolveFn`. + // Build a JS object of arguments from the field.arguments AST, using the + // variables scope to fulfill any variable references. + const args = (0, _values.getArgumentValues)(fieldDef, fieldNodes[0], variableValues); // The resolve function's optional third argument is a context value that + // is provided to every resolve function within an execution. It is commonly + // used to represent an authenticated user, or request-specific caches. + + const contextValue = exeContext.contextValue; // Call the `subscribe()` resolver or the default resolver to produce an + // AsyncIterable yielding raw payloads. + + const resolveFn = (_fieldDef$subscribe = fieldDef.subscribe) !== null && _fieldDef$subscribe !== void 0 ? _fieldDef$subscribe : exeContext.subscribeFieldResolver; + const eventStream = await resolveFn(rootValue, args, contextValue, info); + if (eventStream instanceof Error) { + throw eventStream; + } + return eventStream; + } catch (error) { + throw (0, _locatedError.locatedError)(error, fieldNodes, (0, _Path.pathToArray)(path)); + } } /***/ }), @@ -25517,6 +24479,7 @@ exports.getArgumentValues = getArgumentValues; exports.getDirectiveValues = getDirectiveValues; exports.getVariableValues = getVariableValues; var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); +var _keyMap = __webpack_require__(/*! ../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _printPathArray = __webpack_require__(/*! ../jsutils/printPathArray.mjs */ "../../../node_modules/graphql/jsutils/printPathArray.mjs"); var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); @@ -25570,7 +24533,7 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) { })); continue; } - if (!Object.hasOwn(inputs, varName)) { + if (!hasOwnProperty(inputs, varName)) { if (varDefNode.defaultValue) { coercedValues[varName] = (0, _valueFromAST.valueFromAST)(varDefNode.defaultValue, varType); } else if ((0, _definition.isNonNullType)(varType)) { @@ -25610,18 +24573,20 @@ function coerceVariableValues(schema, varDefNodes, inputs, onError) { * exposed to user code. Care should be taken to not pull values from the * Object prototype. */ + function getArgumentValues(def, node, variableValues) { var _node$arguments; - const coercedValues = {}; - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const coercedValues = {}; // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const argumentNodes = (_node$arguments = node.arguments) !== null && _node$arguments !== void 0 ? _node$arguments : []; - const argNodeMap = new Map(argumentNodes.map(arg => [arg.name.value, arg])); + const argNodeMap = (0, _keyMap.keyMap)(argumentNodes, arg => arg.name.value); for (const argDef of def.args) { const name = argDef.name; const argType = argDef.type; - const argumentNode = argNodeMap.get(name); - if (argumentNode == null) { + const argumentNode = argNodeMap[name]; + if (!argumentNode) { if (argDef.defaultValue !== undefined) { coercedValues[name] = argDef.defaultValue; } else if ((0, _definition.isNonNullType)(argType)) { @@ -25635,7 +24600,7 @@ function getArgumentValues(def, node, variableValues) { let isNull = valueNode.kind === _kinds.Kind.NULL; if (valueNode.kind === _kinds.Kind.VARIABLE) { const variableName = valueNode.name.value; - if (variableValues == null || !Object.hasOwn(variableValues, variableName)) { + if (variableValues == null || !hasOwnProperty(variableValues, variableName)) { if (argDef.defaultValue !== undefined) { coercedValues[name] = argDef.defaultValue; } else if ((0, _definition.isNonNullType)(argType)) { @@ -25676,6 +24641,7 @@ function getArgumentValues(def, node, variableValues) { * exposed to user code. Care should be taken to not pull values from the * Object prototype. */ + function getDirectiveValues(directiveDef, node, variableValues) { var _node$directives; const directiveNode = (_node$directives = node.directives) === null || _node$directives === void 0 ? void 0 : _node$directives.find(directive => directive.name.value === directiveDef.name); @@ -25683,6 +24649,9 @@ function getDirectiveValues(directiveDef, node, variableValues) { return getArgumentValues(directiveDef, directiveNode, variableValues); } } +function hasOwnProperty(obj, prop) { + return Object.prototype.hasOwnProperty.call(obj, prop); +} /***/ }), @@ -25699,11 +24668,52 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.graphql = graphql; exports.graphqlSync = graphqlSync; +var _devAssert = __webpack_require__(/*! ./jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _isPromise = __webpack_require__(/*! ./jsutils/isPromise.mjs */ "../../../node_modules/graphql/jsutils/isPromise.mjs"); var _parser = __webpack_require__(/*! ./language/parser.mjs */ "../../../node_modules/graphql/language/parser.mjs"); var _validate = __webpack_require__(/*! ./type/validate.mjs */ "../../../node_modules/graphql/type/validate.mjs"); var _validate2 = __webpack_require__(/*! ./validation/validate.mjs */ "../../../node_modules/graphql/validation/validate.mjs"); var _execute = __webpack_require__(/*! ./execution/execute.mjs */ "../../../node_modules/graphql/execution/execute.mjs"); +/** + * This is the primary entry point function for fulfilling GraphQL operations + * by parsing, validating, and executing a GraphQL document along side a + * GraphQL schema. + * + * More sophisticated GraphQL servers, such as those which persist queries, + * may wish to separate the validation and execution phases to a static time + * tooling step, and a server runtime step. + * + * Accepts either an object with named arguments, or individual arguments: + * + * schema: + * The GraphQL type system to use when validating and executing a query. + * source: + * A GraphQL language formatted string representing the requested operation. + * rootValue: + * The value provided as the first argument to resolver functions on the top + * level type (e.g. the query object type). + * contextValue: + * The context value is provided as an argument to resolver functions after + * field arguments. It is used to pass shared information useful at any point + * during executing this query, for example the currently logged in user and + * connections to databases or other services. + * variableValues: + * A mapping of variable name to runtime value to use for all variables + * defined in the requestString. + * operationName: + * The name of the operation to use if requestString contains multiple + * possible operations. Can be omitted if requestString contains only + * one operation. + * fieldResolver: + * A resolver function to use when one is not provided by the schema. + * If not provided, the default field resolver is used (which looks for a + * value or method on the source value with the field's name). + * typeResolver: + * A type resolver function to use when none is provided by the schema. + * If not provided, the default type resolver is used (which looks for a + * `__typename` field or alternatively calls the `isTypeOf` method). + */ + function graphql(args) { // Always return a Promise for a consistent API. return new Promise(resolve => resolve(graphqlImpl(args))); @@ -25714,15 +24724,18 @@ function graphql(args) { * However, it guarantees to complete synchronously (or throw an error) assuming * that all field resolvers are also synchronous. */ + function graphqlSync(args) { - const result = graphqlImpl(args); - // Assert that the execution was synchronous. + const result = graphqlImpl(args); // Assert that the execution was synchronous. + if ((0, _isPromise.isPromise)(result)) { throw new Error('GraphQL execution failed to complete synchronously.'); } return result; } function graphqlImpl(args) { + // Temporary for v15 to v16 migration. Remove in v17 + arguments.length < 2 || (0, _devAssert.devAssert)(false, 'graphql@16 dropped long-deprecated support for positional arguments, please pass an object instead.'); const { schema, source, @@ -25732,15 +24745,15 @@ function graphqlImpl(args) { operationName, fieldResolver, typeResolver - } = args; - // Validate Schema + } = args; // Validate Schema + const schemaValidationErrors = (0, _validate.validateSchema)(schema); if (schemaValidationErrors.length > 0) { return { errors: schemaValidationErrors }; - } - // Parse + } // Parse + let document; try { document = (0, _parser.parse)(source); @@ -25748,15 +24761,15 @@ function graphqlImpl(args) { return { errors: [syntaxError] }; - } - // Validate + } // Validate + const validationErrors = (0, _validate2.validate)(schema, document); if (validationErrors.length > 0) { return { errors: validationErrors }; - } - // Execute + } // Execute + return (0, _execute.execute)({ schema, document, @@ -25848,12 +24861,6 @@ Object.defineProperty(exports, "GraphQLBoolean", ({ return _index.GraphQLBoolean; } })); -Object.defineProperty(exports, "GraphQLDeferDirective", ({ - enumerable: true, - get: function () { - return _index.GraphQLDeferDirective; - } -})); Object.defineProperty(exports, "GraphQLDeprecatedDirective", ({ enumerable: true, get: function () { @@ -25962,12 +24969,6 @@ Object.defineProperty(exports, "GraphQLSpecifiedByDirective", ({ return _index.GraphQLSpecifiedByDirective; } })); -Object.defineProperty(exports, "GraphQLStreamDirective", ({ - enumerable: true, - get: function () { - return _index.GraphQLStreamDirective; - } -})); Object.defineProperty(exports, "GraphQLString", ({ enumerable: true, get: function () { @@ -26430,6 +25431,12 @@ Object.defineProperty(exports, "assertUnionType", ({ return _index.assertUnionType; } })); +Object.defineProperty(exports, "assertValidName", ({ + enumerable: true, + get: function () { + return _index6.assertValidName; + } +})); Object.defineProperty(exports, "assertValidSchema", ({ enumerable: true, get: function () { @@ -26514,12 +25521,6 @@ Object.defineProperty(exports, "executeSync", ({ return _index3.executeSync; } })); -Object.defineProperty(exports, "experimentalExecuteIncrementally", ({ - enumerable: true, - get: function () { - return _index3.experimentalExecuteIncrementally; - } -})); Object.defineProperty(exports, "extendSchema", ({ enumerable: true, get: function () { @@ -26538,6 +25539,12 @@ Object.defineProperty(exports, "findDangerousChanges", ({ return _index6.findDangerousChanges; } })); +Object.defineProperty(exports, "formatError", ({ + enumerable: true, + get: function () { + return _index5.formatError; + } +})); Object.defineProperty(exports, "getArgumentValues", ({ enumerable: true, get: function () { @@ -26586,12 +25593,24 @@ Object.defineProperty(exports, "getOperationAST", ({ return _index6.getOperationAST; } })); +Object.defineProperty(exports, "getOperationRootType", ({ + enumerable: true, + get: function () { + return _index6.getOperationRootType; + } +})); Object.defineProperty(exports, "getVariableValues", ({ enumerable: true, get: function () { return _index3.getVariableValues; } })); +Object.defineProperty(exports, "getVisitFn", ({ + enumerable: true, + get: function () { + return _index2.getVisitFn; + } +})); Object.defineProperty(exports, "graphql", ({ enumerable: true, get: function () { @@ -26712,12 +25731,6 @@ Object.defineProperty(exports, "isNonNullType", ({ return _index.isNonNullType; } })); -Object.defineProperty(exports, "isNullabilityAssertionNode", ({ - enumerable: true, - get: function () { - return _index2.isNullabilityAssertionNode; - } -})); Object.defineProperty(exports, "isNullableType", ({ enumerable: true, get: function () { @@ -26826,6 +25839,12 @@ Object.defineProperty(exports, "isUnionType", ({ return _index.isUnionType; } })); +Object.defineProperty(exports, "isValidNameError", ({ + enumerable: true, + get: function () { + return _index6.isValidNameError; + } +})); Object.defineProperty(exports, "isValueNode", ({ enumerable: true, get: function () { @@ -26880,10 +25899,10 @@ Object.defineProperty(exports, "print", ({ return _index2.print; } })); -Object.defineProperty(exports, "printDirective", ({ +Object.defineProperty(exports, "printError", ({ enumerable: true, get: function () { - return _index6.printDirective; + return _index5.printError; } })); Object.defineProperty(exports, "printIntrospectionSchema", ({ @@ -27053,76 +26072,6 @@ var _index6 = __webpack_require__(/*! ./utilities/index.mjs */ "../../../node_mo /***/ }), -/***/ "../../../node_modules/graphql/jsutils/AccumulatorMap.mjs": -/*!****************************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/AccumulatorMap.mjs ***! - \****************************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.AccumulatorMap = void 0; -/** - * ES6 Map with additional `add` method to accumulate items. - */ -class AccumulatorMap extends Map { - get [Symbol.toStringTag]() { - return 'AccumulatorMap'; - } - add(key, item) { - const group = this.get(key); - if (group === undefined) { - this.set(key, [item]); - } else { - group.push(item); - } - } -} -exports.AccumulatorMap = AccumulatorMap; - -/***/ }), - -/***/ "../../../node_modules/graphql/jsutils/BoxedPromiseOrValue.mjs": -/*!*********************************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/BoxedPromiseOrValue.mjs ***! - \*********************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.BoxedPromiseOrValue = void 0; -var _isPromise = __webpack_require__(/*! ./isPromise.mjs */ "../../../node_modules/graphql/jsutils/isPromise.mjs"); -/** - * A BoxedPromiseOrValue is a container for a value or promise where the value - * will be updated when the promise resolves. - * - * A BoxedPromiseOrValue may only be used with promises whose possible - * rejection has already been handled, otherwise this will lead to unhandled - * promise rejections. - * - * @internal - * */ -class BoxedPromiseOrValue { - constructor(value) { - this.value = value; - if ((0, _isPromise.isPromise)(value)) { - // eslint-disable-next-line @typescript-eslint/no-floating-promises - value.then(resolved => { - this.value = resolved; - }); - } - } -} -exports.BoxedPromiseOrValue = BoxedPromiseOrValue; - -/***/ }), - /***/ "../../../node_modules/graphql/jsutils/Path.mjs": /*!******************************************************!*\ !*** ../../../node_modules/graphql/jsutils/Path.mjs ***! @@ -27149,6 +26098,7 @@ function addPath(prev, key, typename) { /** * Given a Path, return an Array of the path keys. */ + function pathToArray(path) { const flattened = []; let curr = path; @@ -27161,27 +26111,6 @@ function pathToArray(path) { /***/ }), -/***/ "../../../node_modules/graphql/jsutils/capitalize.mjs": -/*!************************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/capitalize.mjs ***! - \************************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.capitalize = capitalize; -/** - * Converts the first character of string to upper case and the remaining to lower case. - */ -function capitalize(str) { - return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase(); -} - -/***/ }), - /***/ "../../../node_modules/graphql/jsutils/devAssert.mjs": /*!***********************************************************!*\ !*** ../../../node_modules/graphql/jsutils/devAssert.mjs ***! @@ -27195,7 +26124,8 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.devAssert = devAssert; function devAssert(condition, message) { - if (!condition) { + const booleanCondition = Boolean(condition); + if (!booleanCondition) { throw new Error(message); } } @@ -27206,7 +26136,7 @@ function devAssert(condition, message) { /*!************************************************************!*\ !*** ../../../node_modules/graphql/jsutils/didYouMean.mjs ***! \************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { +/***/ (function(__unused_webpack_module, exports) { @@ -27214,84 +26144,29 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.didYouMean = didYouMean; -var _formatList = __webpack_require__(/*! ./formatList.mjs */ "../../../node_modules/graphql/jsutils/formatList.mjs"); const MAX_SUGGESTIONS = 5; +/** + * Given [ A, B, C ] return ' Did you mean A, B, or C?'. + */ + function didYouMean(firstArg, secondArg) { - const [subMessage, suggestions] = secondArg ? [firstArg, secondArg] : [undefined, firstArg]; - if (suggestions.length === 0) { - return ''; - } + const [subMessage, suggestionsArg] = secondArg ? [firstArg, secondArg] : [undefined, firstArg]; let message = ' Did you mean '; - if (subMessage != null) { + if (subMessage) { message += subMessage + ' '; } - const suggestionList = (0, _formatList.orList)(suggestions.slice(0, MAX_SUGGESTIONS).map(x => `"${x}"`)); - return message + suggestionList + '?'; -} - -/***/ }), - -/***/ "../../../node_modules/graphql/jsutils/formatList.mjs": -/*!************************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/formatList.mjs ***! - \************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.andList = andList; -exports.orList = orList; -var _invariant = __webpack_require__(/*! ./invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); -/** - * Given [ A, B, C ] return 'A, B, or C'. - */ -function orList(items) { - return formatList('or', items); -} -/** - * Given [ A, B, C ] return 'A, B, and C'. - */ -function andList(items) { - return formatList('and', items); -} -function formatList(conjunction, items) { - items.length !== 0 || (0, _invariant.invariant)(false); - switch (items.length) { + const suggestions = suggestionsArg.map(x => `"${x}"`); + switch (suggestions.length) { + case 0: + return ''; case 1: - return items[0]; + return message + suggestions[0] + '?'; case 2: - return items[0] + ' ' + conjunction + ' ' + items[1]; + return message + suggestions[0] + ' or ' + suggestions[1] + '?'; } - const allButLast = items.slice(0, -1); - const lastItem = items.at(-1); - return allButLast.join(', ') + ', ' + conjunction + ' ' + lastItem; -} - -/***/ }), - -/***/ "../../../node_modules/graphql/jsutils/getBySet.mjs": -/*!**********************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/getBySet.mjs ***! - \**********************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.getBySet = getBySet; -var _isSameSet = __webpack_require__(/*! ./isSameSet.mjs */ "../../../node_modules/graphql/jsutils/isSameSet.mjs"); -function getBySet(map, setToMatch) { - for (const set of map.keys()) { - if ((0, _isSameSet.isSameSet)(set, setToMatch)) { - return map.get(set); - } - } - return undefined; + const selected = suggestions.slice(0, MAX_SUGGESTIONS); + const lastItem = selected.pop(); + return message + selected.join(', ') + ', or ' + lastItem + '?'; } /***/ }), @@ -27300,7 +26175,7 @@ function getBySet(map, setToMatch) { /*!*********************************************************!*\ !*** ../../../node_modules/graphql/jsutils/groupBy.mjs ***! \*********************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { +/***/ (function(__unused_webpack_module, exports) { @@ -27308,14 +26183,19 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.groupBy = groupBy; -var _AccumulatorMap = __webpack_require__(/*! ./AccumulatorMap.mjs */ "../../../node_modules/graphql/jsutils/AccumulatorMap.mjs"); /** * Groups array items into a Map, given a function to produce grouping key. */ function groupBy(list, keyFn) { - const result = new _AccumulatorMap.AccumulatorMap(); + const result = new Map(); for (const item of list) { - result.add(keyFn(item), item); + const key = keyFn(item); + const group = result.get(key); + if (group === undefined) { + result.set(key, [item]); + } else { + group.push(item); + } } return result; } @@ -27360,6 +26240,7 @@ const MAX_RECURSIVE_DEPTH = 2; /** * Used to print values in error messages. */ + function inspect(value) { return formatValue(value, []); } @@ -27384,8 +26265,8 @@ function formatObjectValue(value, previouslySeenValues) { } const seenValues = [...previouslySeenValues, value]; if (isJSONable(value)) { - const jsonValue = value.toJSON(); - // check for infinite recursion + const jsonValue = value.toJSON(); // check for infinite recursion + if (jsonValue !== value) { return typeof jsonValue === 'string' ? jsonValue : formatValue(jsonValue, seenValues); } @@ -27454,15 +26335,21 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.instanceOf = void 0; var _inspect = __webpack_require__(/*! ./inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); +/* c8 ignore next 3 */ + +const isProduction = globalThis.process && +// eslint-disable-next-line no-undef +"development" === 'production'; /** * A replacement for instanceof which includes an error warning when multi-realm * constructors are detected. * See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production * See: https://webpack.js.org/guides/production/ */ + const instanceOf = exports.instanceOf = /* c8 ignore next 6 */ // FIXME: https://github.com/graphql/graphql-js/issues/2317 -globalThis.process != null && globalThis.process.env.NODE_ENV === 'production' ? function instanceOf(value, constructor) { +isProduction ? function instanceOf(value, constructor) { return value instanceof constructor; } : function instanceOf(value, constructor) { if (value instanceof constructor) { @@ -27470,11 +26357,13 @@ globalThis.process != null && globalThis.process.env.NODE_ENV === 'production' ? } if (typeof value === 'object' && value !== null) { var _value$constructor; + // Prefer Symbol.toStringTag since it is immune to minification. const className = constructor.prototype[Symbol.toStringTag]; const valueClassName = // We still need to support constructor's name to detect conflicts with older versions of this library. - Symbol.toStringTag in value ? value[Symbol.toStringTag] : (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name; + Symbol.toStringTag in value // @ts-expect-error TS bug see, https://github.com/microsoft/TypeScript/issues/38009 + ? value[Symbol.toStringTag] : (_value$constructor = value.constructor) === null || _value$constructor === void 0 ? void 0 : _value$constructor.name; if (className === valueClassName) { const stringifiedValue = (0, _inspect.inspect)(value); throw new Error(`Cannot use ${className} "${stringifiedValue}" from another module or realm. @@ -27509,7 +26398,8 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.invariant = invariant; function invariant(condition, message) { - if (!condition) { + const booleanCondition = Boolean(condition); + if (!booleanCondition) { throw new Error(message != null ? message : 'Unexpected invariant triggered.'); } } @@ -27617,32 +26507,6 @@ function isPromise(value) { /***/ }), -/***/ "../../../node_modules/graphql/jsutils/isSameSet.mjs": -/*!***********************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/isSameSet.mjs ***! - \***********************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.isSameSet = isSameSet; -function isSameSet(setA, setB) { - if (setA.size !== setB.size) { - return false; - } - for (const item of setA) { - if (!setB.has(item)) { - return false; - } - } - return true; -} - -/***/ }), - /***/ "../../../node_modules/graphql/jsutils/keyMap.mjs": /*!********************************************************!*\ !*** ../../../node_modules/graphql/jsutils/keyMap.mjs ***! @@ -27904,15 +26768,14 @@ exports.promiseForObject = promiseForObject; * This is akin to bluebird's `Promise.props`, but implemented only using * `Promise.all` so it will work with any implementation of ES6 promises. */ -async function promiseForObject(object, callback) { - const keys = Object.keys(object); - const values = Object.values(object); - const resolvedValues = await Promise.all(values); - const resolvedObject = Object.create(null); - for (let i = 0; i < keys.length; ++i) { - resolvedObject[keys[i]] = resolvedValues[i]; - } - return callback(resolvedObject); +function promiseForObject(object) { + return Promise.all(Object.values(object)).then(resolvedValues => { + const resolvedObject = Object.create(null); + for (const [i, key] of Object.keys(object).entries()) { + resolvedObject[key] = resolvedValues[i]; + } + return resolvedObject; + }); } /***/ }), @@ -27947,39 +26810,6 @@ function promiseReduce(values, callbackFn, initialValue) { /***/ }), -/***/ "../../../node_modules/graphql/jsutils/promiseWithResolvers.mjs": -/*!**********************************************************************!*\ - !*** ../../../node_modules/graphql/jsutils/promiseWithResolvers.mjs ***! - \**********************************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.promiseWithResolvers = promiseWithResolvers; -/** - * Based on Promise.withResolvers proposal - * https://github.com/tc39/proposal-promise-with-resolvers - */ -function promiseWithResolvers() { - // these are assigned synchronously within the Promise constructor - let resolve; - let reject; - const promise = new Promise((res, rej) => { - resolve = res; - reject = rej; - }); - return { - promise, - resolve, - reject - }; -} - -/***/ }), - /***/ "../../../node_modules/graphql/jsutils/suggestionList.mjs": /*!****************************************************************!*\ !*** ../../../node_modules/graphql/jsutils/suggestionList.mjs ***! @@ -27997,6 +26827,7 @@ var _naturalCompare = __webpack_require__(/*! ./naturalCompare.mjs */ "../../../ * Given an invalid input string and a list of valid options, returns a filtered * list of valid options sorted based on their similarity with the input. */ + function suggestionList(input, options) { const optionsByDistance = Object.create(null); const lexicalDistance = new LexicalDistance(input); @@ -28026,6 +26857,7 @@ function suggestionList(input, options) { * * This distance can be useful for detecting typos in input or sorting */ + class LexicalDistance { constructor(input) { this._input = input; @@ -28037,8 +26869,8 @@ class LexicalDistance { if (this._input === option) { return 0; } - const optionLowerCase = option.toLowerCase(); - // Any case change counts as a single edit + const optionLowerCase = option.toLowerCase(); // Any case change counts as a single edit + if (this._inputLowerCase === optionLowerCase) { return 1; } @@ -28068,7 +26900,8 @@ class LexicalDistance { // delete currentRow[j - 1] + 1, // insert - upRow[j - 1] + cost); + upRow[j - 1] + cost // substitute + ); if (i > 1 && j > 1 && a[i - 1] === b[j - 2] && a[i - 2] === b[j - 1]) { // transposition const doubleDiagonalCell = rows[(i - 2) % 3][j - 2]; @@ -28078,8 +26911,8 @@ class LexicalDistance { smallestCell = currentCell; } currentRow[j] = currentCell; - } - // Early exit, since distance can't go smaller than smallest element of the previous row. + } // Early exit, since distance can't go smaller than smallest element of the previous row. + if (smallestCell > threshold) { return undefined; } @@ -28115,6 +26948,7 @@ var _inspect = __webpack_require__(/*! ./inspect.mjs */ "../../../node_modules/g /** * Sometimes a non-error is thrown, wrap it as an Error instance to ensure a consistent Error interface. */ + function toError(thrownValue) { return thrownValue instanceof Error ? thrownValue : new NonErrorThrown(thrownValue); } @@ -28174,6 +27008,25 @@ exports.isNode = isNode; * identify the region of the source from which the AST derived. */ class Location { + /** + * The character offset at which this Node begins. + */ + + /** + * The character offset at which this Node ends. + */ + + /** + * The Token at which this Node begins. + */ + + /** + * The Token at which this Node ends. + */ + + /** + * The Source document the AST represents. + */ constructor(startToken, endToken, source) { this.start = startToken.start; this.end = endToken.end; @@ -28197,14 +27050,45 @@ class Location { */ exports.Location = Location; class Token { - // eslint-disable-next-line max-params + /** + * The kind of Token. + */ + + /** + * The character offset at which this Node begins. + */ + + /** + * The character offset at which this Node ends. + */ + + /** + * The 1-indexed line number on which this Token appears. + */ + + /** + * The 1-indexed column number at which this Token begins. + */ + + /** + * For non-punctuation tokens, represents the interpreted value of the token. + * + * Note: is undefined for punctuation tokens, but typed as string for + * convenience in the parser. + */ + + /** + * Tokens exist as nodes in a double-linked-list amongst all tokens + * including ignored tokens. is always the first node and + * the last. + */ constructor(kind, start, end, line, column, value) { this.kind = kind; this.start = start; this.end = end; this.line = line; - this.column = column; - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.column = column; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + this.value = value; this.prev = null; this.next = null; @@ -28221,6 +27105,10 @@ class Token { }; } } +/** + * The list of all possible AST node types. + */ + /** * @internal */ @@ -28232,16 +27120,8 @@ const QueryDocumentKeys = exports.QueryDocumentKeys = { VariableDefinition: ['variable', 'type', 'defaultValue', 'directives'], Variable: ['name'], SelectionSet: ['selections'], - Field: ['alias', 'name', 'arguments', 'directives', 'selectionSet', - // Note: Client Controlled Nullability is experimental and may be changed - // or removed in the future. - 'nullabilityAssertion'], + Field: ['alias', 'name', 'arguments', 'directives', 'selectionSet'], Argument: ['name', 'value'], - // Note: Client Controlled Nullability is experimental and may be changed - // or removed in the future. - ListNullabilityOperator: ['nullabilityAssertion'], - NonNullAssertion: ['nullabilityAssertion'], - ErrorBoundary: ['nullabilityAssertion'], FragmentSpread: ['name', 'directives'], InlineFragment: ['typeCondition', 'directives', 'selectionSet'], FragmentDefinition: ['name', @@ -28284,10 +27164,13 @@ const kindValues = new Set(Object.keys(QueryDocumentKeys)); /** * @internal */ + function isNode(maybeNode) { const maybeKind = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.kind; return typeof maybeKind === 'string' && kindValues.has(maybeKind); } +/** Name */ + var OperationTypeNode; (function (OperationTypeNode) { OperationTypeNode['QUERY'] = 'query'; @@ -28320,28 +27203,28 @@ var _characterClasses = __webpack_require__(/*! ./characterClasses.mjs */ "../.. * * @internal */ + function dedentBlockStringLines(lines) { - var _firstNonEmptyLine; + var _firstNonEmptyLine2; let commonIndent = Number.MAX_SAFE_INTEGER; let firstNonEmptyLine = null; let lastNonEmptyLine = -1; for (let i = 0; i < lines.length; ++i) { + var _firstNonEmptyLine; const line = lines[i]; const indent = leadingWhitespace(line); if (indent === line.length) { continue; // skip empty lines } - firstNonEmptyLine ??= i; + firstNonEmptyLine = (_firstNonEmptyLine = firstNonEmptyLine) !== null && _firstNonEmptyLine !== void 0 ? _firstNonEmptyLine : i; lastNonEmptyLine = i; if (i !== 0 && indent < commonIndent) { commonIndent = indent; } } - return lines - // Remove common indentation from all lines but first. - .map((line, i) => i === 0 ? line : line.slice(commonIndent)) - // Remove leading and trailing blank lines. - .slice((_firstNonEmptyLine = firstNonEmptyLine) !== null && _firstNonEmptyLine !== void 0 ? _firstNonEmptyLine : 0, lastNonEmptyLine + 1); + return lines // Remove common indentation from all lines but first. + .map((line, i) => i === 0 ? line : line.slice(commonIndent)) // Remove leading and trailing blank lines. + .slice((_firstNonEmptyLine2 = firstNonEmptyLine) !== null && _firstNonEmptyLine2 !== void 0 ? _firstNonEmptyLine2 : 0, lastNonEmptyLine + 1); } function leadingWhitespace(str) { let i = 0; @@ -28353,6 +27236,7 @@ function leadingWhitespace(str) { /** * @internal */ + function isPrintableAsBlockString(value) { if (value === '') { return true; // empty string is printable @@ -28378,10 +27262,12 @@ function isPrintableAsBlockString(value) { case 0x000f: return false; // Has non-printable characters + case 0x000d: // \r return false; // Has \r or \r\n which will be replaced as \n + case 10: // \n if (isEmptyLine && !seenNonEmptyLine) { @@ -28392,12 +27278,13 @@ function isPrintableAsBlockString(value) { hasIndent = false; break; case 9: // \t + case 32: // - hasIndent ||= isEmptyLine; + hasIndent || (hasIndent = isEmptyLine); break; default: - hasCommonIndent &&= hasIndent; + hasCommonIndent && (hasCommonIndent = hasIndent); isEmptyLine = false; } } @@ -28416,24 +27303,25 @@ function isPrintableAsBlockString(value) { * * @internal */ + function printBlockString(value, options) { - const escapedValue = value.replaceAll('"""', '\\"""'); - // Expand a block string's raw value into independent lines. + const escapedValue = value.replace(/"""/g, '\\"""'); // Expand a block string's raw value into independent lines. + const lines = escapedValue.split(/\r\n|[\n\r]/g); - const isSingleLine = lines.length === 1; - // If common indentation is found we can fix some of those cases by adding leading new line - const forceLeadingNewLine = lines.length > 1 && lines.slice(1).every(line => line.length === 0 || (0, _characterClasses.isWhiteSpace)(line.charCodeAt(0))); - // Trailing triple quotes just looks confusing but doesn't force trailing new line - const hasTrailingTripleQuotes = escapedValue.endsWith('\\"""'); - // Trailing quote (single or double) or slash forces trailing new line + const isSingleLine = lines.length === 1; // If common indentation is found we can fix some of those cases by adding leading new line + + const forceLeadingNewLine = lines.length > 1 && lines.slice(1).every(line => line.length === 0 || (0, _characterClasses.isWhiteSpace)(line.charCodeAt(0))); // Trailing triple quotes just looks confusing but doesn't force trailing new line + + const hasTrailingTripleQuotes = escapedValue.endsWith('\\"""'); // Trailing quote (single or double) or slash forces trailing new line + const hasTrailingQuote = value.endsWith('"') && !hasTrailingTripleQuotes; const hasTrailingSlash = value.endsWith('\\'); const forceTrailingNewline = hasTrailingQuote || hasTrailingSlash; const printAsMultipleLines = !(options !== null && options !== void 0 && options.minimize) && ( // add leading and trailing new lines only if it improves readability !isSingleLine || value.length > 70 || forceTrailingNewline || forceLeadingNewLine || hasTrailingTripleQuotes); - let result = ''; - // Format a multi-line block quote to account for leading space. + let result = ''; // Format a multi-line block quote to account for leading space. + const skipLeadingNewLine = isSingleLine && (0, _characterClasses.isWhiteSpace)(value.charCodeAt(0)); if (printAsMultipleLines && !skipLeadingNewLine || forceLeadingNewLine) { result += '\n'; @@ -28481,6 +27369,7 @@ function isWhiteSpace(code) { * ``` * @internal */ + function isDigit(code) { return code >= 0x0030 && code <= 0x0039; } @@ -28494,6 +27383,7 @@ function isDigit(code) { * ``` * @internal */ + function isLetter(code) { return code >= 0x0061 && code <= 0x007a || // A-Z @@ -28508,6 +27398,7 @@ function isLetter(code) { * ``` * @internal */ + function isNameStart(code) { return isLetter(code) || code === 0x005f; } @@ -28520,6 +27411,7 @@ function isNameStart(code) { * ``` * @internal */ + function isNameContinue(code) { return isLetter(code) || isDigit(code) || code === 0x005f; } @@ -28543,7 +27435,6 @@ exports.DirectiveLocation = void 0; */ var DirectiveLocation; (function (DirectiveLocation) { - /** Request Definitions */ DirectiveLocation['QUERY'] = 'QUERY'; DirectiveLocation['MUTATION'] = 'MUTATION'; DirectiveLocation['SUBSCRIPTION'] = 'SUBSCRIPTION'; @@ -28552,7 +27443,6 @@ var DirectiveLocation; DirectiveLocation['FRAGMENT_SPREAD'] = 'FRAGMENT_SPREAD'; DirectiveLocation['INLINE_FRAGMENT'] = 'INLINE_FRAGMENT'; DirectiveLocation['VARIABLE_DEFINITION'] = 'VARIABLE_DEFINITION'; - /** Type System Definitions */ DirectiveLocation['SCHEMA'] = 'SCHEMA'; DirectiveLocation['SCALAR'] = 'SCALAR'; DirectiveLocation['OBJECT'] = 'OBJECT'; @@ -28566,6 +27456,12 @@ var DirectiveLocation; DirectiveLocation['INPUT_FIELD_DEFINITION'] = 'INPUT_FIELD_DEFINITION'; })(DirectiveLocation || (exports.DirectiveLocation = DirectiveLocation = {})); +/** + * The enum type representing the directive location values. + * + * @deprecated Please use `DirectiveLocation`. Will be remove in v17. + */ + /***/ }), /***/ "../../../node_modules/graphql/language/index.mjs": @@ -28645,6 +27541,12 @@ Object.defineProperty(exports, "getLocation", ({ return _location.getLocation; } })); +Object.defineProperty(exports, "getVisitFn", ({ + enumerable: true, + get: function () { + return _visitor.getVisitFn; + } +})); Object.defineProperty(exports, "isConstValueNode", ({ enumerable: true, get: function () { @@ -28663,12 +27565,6 @@ Object.defineProperty(exports, "isExecutableDefinitionNode", ({ return _predicates.isExecutableDefinitionNode; } })); -Object.defineProperty(exports, "isNullabilityAssertionNode", ({ - enumerable: true, - get: function () { - return _predicates.isNullabilityAssertionNode; - } -})); Object.defineProperty(exports, "isSelectionNode", ({ enumerable: true, get: function () { @@ -28797,24 +27693,16 @@ exports.Kind = void 0; */ var Kind; (function (Kind) { - /** Name */ Kind['NAME'] = 'Name'; - /** Document */ Kind['DOCUMENT'] = 'Document'; Kind['OPERATION_DEFINITION'] = 'OperationDefinition'; Kind['VARIABLE_DEFINITION'] = 'VariableDefinition'; Kind['SELECTION_SET'] = 'SelectionSet'; Kind['FIELD'] = 'Field'; Kind['ARGUMENT'] = 'Argument'; - /** Nullability Modifiers */ - Kind['LIST_NULLABILITY_OPERATOR'] = 'ListNullabilityOperator'; - Kind['NON_NULL_ASSERTION'] = 'NonNullAssertion'; - Kind['ERROR_BOUNDARY'] = 'ErrorBoundary'; - /** Fragments */ Kind['FRAGMENT_SPREAD'] = 'FragmentSpread'; Kind['INLINE_FRAGMENT'] = 'InlineFragment'; Kind['FRAGMENT_DEFINITION'] = 'FragmentDefinition'; - /** Values */ Kind['VARIABLE'] = 'Variable'; Kind['INT'] = 'IntValue'; Kind['FLOAT'] = 'FloatValue'; @@ -28825,16 +27713,12 @@ var Kind; Kind['LIST'] = 'ListValue'; Kind['OBJECT'] = 'ObjectValue'; Kind['OBJECT_FIELD'] = 'ObjectField'; - /** Directives */ Kind['DIRECTIVE'] = 'Directive'; - /** Types */ Kind['NAMED_TYPE'] = 'NamedType'; Kind['LIST_TYPE'] = 'ListType'; Kind['NON_NULL_TYPE'] = 'NonNullType'; - /** Type System Definitions */ Kind['SCHEMA_DEFINITION'] = 'SchemaDefinition'; Kind['OPERATION_TYPE_DEFINITION'] = 'OperationTypeDefinition'; - /** Type Definitions */ Kind['SCALAR_TYPE_DEFINITION'] = 'ScalarTypeDefinition'; Kind['OBJECT_TYPE_DEFINITION'] = 'ObjectTypeDefinition'; Kind['FIELD_DEFINITION'] = 'FieldDefinition'; @@ -28844,11 +27728,8 @@ var Kind; Kind['ENUM_TYPE_DEFINITION'] = 'EnumTypeDefinition'; Kind['ENUM_VALUE_DEFINITION'] = 'EnumValueDefinition'; Kind['INPUT_OBJECT_TYPE_DEFINITION'] = 'InputObjectTypeDefinition'; - /** Directive Definitions */ Kind['DIRECTIVE_DEFINITION'] = 'DirectiveDefinition'; - /** Type System Extensions */ Kind['SCHEMA_EXTENSION'] = 'SchemaExtension'; - /** Type Extensions */ Kind['SCALAR_TYPE_EXTENSION'] = 'ScalarTypeExtension'; Kind['OBJECT_TYPE_EXTENSION'] = 'ObjectTypeExtension'; Kind['INTERFACE_TYPE_EXTENSION'] = 'InterfaceTypeExtension'; @@ -28857,6 +27738,12 @@ var Kind; Kind['INPUT_OBJECT_TYPE_EXTENSION'] = 'InputObjectTypeExtension'; })(Kind || (exports.Kind = Kind = {})); +/** + * The enum type representing the possible kind values of AST nodes. + * + * @deprecated Please use `Kind`. Will be remove in v17. + */ + /***/ }), /***/ "../../../node_modules/graphql/language/lexer.mjs": @@ -28885,7 +27772,23 @@ var _tokenKind = __webpack_require__(/*! ./tokenKind.mjs */ "../../../node_modul * EOF, after which the lexer will repeatedly return the same EOF token * whenever called. */ + class Lexer { + /** + * The previously focused non-ignored token. + */ + + /** + * The currently focused non-ignored token. + */ + + /** + * The (1-indexed) line containing the current token. + */ + + /** + * The character offset at which the current line begins. + */ constructor(source) { const startOfFileToken = new _ast.Token(_tokenKind.TokenKind.SOF, 0, 0, 0, 0); this.source = source; @@ -28900,6 +27803,7 @@ class Lexer { /** * Advances the token stream to the next non-ignored token. */ + advance() { this.lastToken = this.token; const token = this.token = this.lookahead(); @@ -28909,6 +27813,7 @@ class Lexer { * Looks ahead and returns the next non-ignored token, but does not change * the state of Lexer. */ + lookahead() { let token = this.token; if (token.kind !== _tokenKind.TokenKind.EOF) { @@ -28917,10 +27822,10 @@ class Lexer { token = token.next; } else { // Read the next token and form a link in the token linked-list. - const nextToken = readNextToken(this, token.end); - // @ts-expect-error next is only mutable during parsing. - token.next = nextToken; - // @ts-expect-error prev is only mutable during parsing. + const nextToken = readNextToken(this, token.end); // @ts-expect-error next is only mutable during parsing. + + token.next = nextToken; // @ts-expect-error prev is only mutable during parsing. + nextToken.prev = token; token = nextToken; } @@ -28934,7 +27839,7 @@ class Lexer { */ exports.Lexer = Lexer; function isPunctuatorTokenKind(kind) { - return kind === _tokenKind.TokenKind.BANG || kind === _tokenKind.TokenKind.QUESTION_MARK || kind === _tokenKind.TokenKind.DOLLAR || kind === _tokenKind.TokenKind.AMP || kind === _tokenKind.TokenKind.PAREN_L || kind === _tokenKind.TokenKind.PAREN_R || kind === _tokenKind.TokenKind.SPREAD || kind === _tokenKind.TokenKind.COLON || kind === _tokenKind.TokenKind.EQUALS || kind === _tokenKind.TokenKind.AT || kind === _tokenKind.TokenKind.BRACKET_L || kind === _tokenKind.TokenKind.BRACKET_R || kind === _tokenKind.TokenKind.BRACE_L || kind === _tokenKind.TokenKind.PIPE || kind === _tokenKind.TokenKind.BRACE_R; + return kind === _tokenKind.TokenKind.BANG || kind === _tokenKind.TokenKind.DOLLAR || kind === _tokenKind.TokenKind.AMP || kind === _tokenKind.TokenKind.PAREN_L || kind === _tokenKind.TokenKind.PAREN_R || kind === _tokenKind.TokenKind.SPREAD || kind === _tokenKind.TokenKind.COLON || kind === _tokenKind.TokenKind.EQUALS || kind === _tokenKind.TokenKind.AT || kind === _tokenKind.TokenKind.BRACKET_L || kind === _tokenKind.TokenKind.BRACKET_R || kind === _tokenKind.TokenKind.BRACE_L || kind === _tokenKind.TokenKind.PIPE || kind === _tokenKind.TokenKind.BRACE_R; } /** * A Unicode scalar value is any Unicode code point except surrogate code @@ -28944,6 +27849,7 @@ function isPunctuatorTokenKind(kind) { * SourceCharacter :: * - "Any Unicode scalar value" */ + function isUnicodeScalarValue(code) { return code >= 0x0000 && code <= 0xd7ff || code >= 0xe000 && code <= 0x10ffff; } @@ -28955,6 +27861,7 @@ function isUnicodeScalarValue(code) { * encodes a supplementary code point (above U+FFFF), but unpaired surrogate * code points are not valid source characters. */ + function isSupplementaryCodePoint(body, location) { return isLeadingSurrogate(body.charCodeAt(location)) && isTrailingSurrogate(body.charCodeAt(location + 1)); } @@ -28971,6 +27878,7 @@ function isTrailingSurrogate(code) { * Printable ASCII is printed quoted, while other points are printed in Unicode * code point form (ie. U+1234). */ + function printCodePointAt(lexer, location) { const code = lexer.source.body.codePointAt(location); if (code === undefined) { @@ -28979,13 +27887,14 @@ function printCodePointAt(lexer, location) { // Printable ASCII const char = String.fromCodePoint(code); return char === '"' ? "'\"'" : `"${char}"`; - } - // Unicode code point + } // Unicode code point + return 'U+' + code.toString(16).toUpperCase().padStart(4, '0'); } /** * Create a token with line and column location information. */ + function createToken(lexer, kind, start, end, value) { const line = lexer.line; const col = 1 + start - lexer.lineStart; @@ -28998,13 +27907,14 @@ function createToken(lexer, kind, start, end, value) { * punctuators immediately or calls the appropriate helper function for more * complicated tokens. */ + function readNextToken(lexer, start) { const body = lexer.source.body; const bodyLength = body.length; let position = start; while (position < bodyLength) { - const code = body.charCodeAt(position); - // SourceCharacter + const code = body.charCodeAt(position); // SourceCharacter + switch (code) { // Ignored :: // - UnicodeBOM @@ -29021,8 +27931,11 @@ function readNextToken(lexer, start) { // // Comma :: , case 0xfeff: // + case 0x0009: // \t + case 0x0020: // + case 0x002c: // , ++position; @@ -29031,6 +27944,7 @@ function readNextToken(lexer, start) { // - "New Line (U+000A)" // - "Carriage Return (U+000D)" [lookahead != "New Line (U+000A)"] // - "Carriage Return (U+000D)" "New Line (U+000A)" + case 0x000a: // \n ++position; @@ -29048,6 +27962,7 @@ function readNextToken(lexer, start) { lexer.lineStart = position; continue; // Comment + case 0x0023: // # return readComment(lexer, position); @@ -29059,6 +27974,7 @@ function readNextToken(lexer, start) { // - StringValue // // Punctuator :: one of ! $ & ( ) ... : = @ [ ] { | } + case 0x0021: // ! return createToken(lexer, _tokenKind.TokenKind.BANG, position, position + 1); @@ -29104,22 +28020,20 @@ function readNextToken(lexer, start) { case 0x007d: // } return createToken(lexer, _tokenKind.TokenKind.BRACE_R, position, position + 1); - case 0x003f: - // ? - return createToken(lexer, _tokenKind.TokenKind.QUESTION_MARK, position, position + 1); // StringValue + case 0x0022: // " if (body.charCodeAt(position + 1) === 0x0022 && body.charCodeAt(position + 2) === 0x0022) { return readBlockString(lexer, position); } return readString(lexer, position); - } - // IntValue | FloatValue (Digit | -) + } // IntValue | FloatValue (Digit | -) + if ((0, _characterClasses.isDigit)(code) || code === 0x002d) { return readNumber(lexer, position, code); - } - // Name + } // Name + if ((0, _characterClasses.isNameStart)(code)) { return readName(lexer, position); } @@ -29136,17 +28050,18 @@ function readNextToken(lexer, start) { * CommentChar :: SourceCharacter but not LineTerminator * ``` */ + function readComment(lexer, start) { const body = lexer.source.body; const bodyLength = body.length; let position = start + 1; while (position < bodyLength) { - const code = body.charCodeAt(position); - // LineTerminator (\n | \r) + const code = body.charCodeAt(position); // LineTerminator (\n | \r) + if (code === 0x000a || code === 0x000d) { break; - } - // SourceCharacter + } // SourceCharacter + if (isUnicodeScalarValue(code)) { ++position; } else if (isSupplementaryCodePoint(body, position)) { @@ -29186,16 +28101,17 @@ function readComment(lexer, start) { * Sign :: one of + - * ``` */ + function readNumber(lexer, start, firstCode) { const body = lexer.source.body; let position = start; let code = firstCode; - let isFloat = false; - // NegativeSign (-) + let isFloat = false; // NegativeSign (-) + if (code === 0x002d) { code = body.charCodeAt(++position); - } - // Zero (0) + } // Zero (0) + if (code === 0x0030) { code = body.charCodeAt(++position); if ((0, _characterClasses.isDigit)(code)) { @@ -29204,26 +28120,26 @@ function readNumber(lexer, start, firstCode) { } else { position = readDigits(lexer, position, code); code = body.charCodeAt(position); - } - // Full stop (.) + } // Full stop (.) + if (code === 0x002e) { isFloat = true; code = body.charCodeAt(++position); position = readDigits(lexer, position, code); code = body.charCodeAt(position); - } - // E e + } // E e + if (code === 0x0045 || code === 0x0065) { isFloat = true; - code = body.charCodeAt(++position); - // + - + code = body.charCodeAt(++position); // + - + if (code === 0x002b || code === 0x002d) { code = body.charCodeAt(++position); } position = readDigits(lexer, position, code); code = body.charCodeAt(position); - } - // Numbers cannot be followed by . or NameStart + } // Numbers cannot be followed by . or NameStart + if (code === 0x002e || (0, _characterClasses.isNameStart)(code)) { throw (0, _syntaxError.syntaxError)(lexer.source, position, `Invalid number, expected digit but got: ${printCodePointAt(lexer, position)}.`); } @@ -29232,12 +28148,14 @@ function readNumber(lexer, start, firstCode) { /** * Returns the new position in the source after reading one or more digits. */ + function readDigits(lexer, start, firstCode) { if (!(0, _characterClasses.isDigit)(firstCode)) { throw (0, _syntaxError.syntaxError)(lexer.source, start, `Invalid number, expected digit but got: ${printCodePointAt(lexer, start)}.`); } const body = lexer.source.body; let position = start + 1; // +1 to skip first firstCode + while ((0, _characterClasses.isDigit)(body.charCodeAt(position))) { ++position; } @@ -29263,6 +28181,7 @@ function readDigits(lexer, start, firstCode) { * EscapedCharacter :: one of `"` `\` `/` `b` `f` `n` `r` `t` * ``` */ + function readString(lexer, start) { const body = lexer.source.body; const bodyLength = body.length; @@ -29270,13 +28189,13 @@ function readString(lexer, start) { let chunkStart = position; let value = ''; while (position < bodyLength) { - const code = body.charCodeAt(position); - // Closing Quote (") + const code = body.charCodeAt(position); // Closing Quote (") + if (code === 0x0022) { value += body.slice(chunkStart, position); return createToken(lexer, _tokenKind.TokenKind.STRING, start, position + 1, value); - } - // Escape Sequence (\) + } // Escape Sequence (\) + if (code === 0x005c) { value += body.slice(chunkStart, position); const escape = body.charCodeAt(position + 1) === 0x0075 // u @@ -29286,12 +28205,12 @@ function readString(lexer, start) { position += escape.size; chunkStart = position; continue; - } - // LineTerminator (\n | \r) + } // LineTerminator (\n | \r) + if (code === 0x000a || code === 0x000d) { break; - } - // SourceCharacter + } // SourceCharacter + if (isUnicodeScalarValue(code)) { ++position; } else if (isSupplementaryCodePoint(body, position)) { @@ -29301,15 +28220,16 @@ function readString(lexer, start) { } } throw (0, _syntaxError.syntaxError)(lexer.source, position, 'Unterminated string.'); -} +} // The string value and lexed size of an escape sequence. + function readEscapedUnicodeVariableWidth(lexer, position) { const body = lexer.source.body; let point = 0; - let size = 3; - // Cannot be larger than 12 chars (\u{00000000}). + let size = 3; // Cannot be larger than 12 chars (\u{00000000}). + while (size < 12) { - const code = body.charCodeAt(position + size++); - // Closing Brace (}) + const code = body.charCodeAt(position + size++); // Closing Brace (}) + if (code === 0x007d) { // Must be at least 5 chars (\u{0}) and encode a Unicode scalar value. if (size < 5 || !isUnicodeScalarValue(point)) { @@ -29319,8 +28239,8 @@ function readEscapedUnicodeVariableWidth(lexer, position) { value: String.fromCodePoint(point), size }; - } - // Append this hex digit to the code point. + } // Append this hex digit to the code point. + point = point << 4 | readHexDigit(code); if (point < 0) { break; @@ -29336,9 +28256,9 @@ function readEscapedUnicodeFixedWidth(lexer, position) { value: String.fromCodePoint(code), size: 6 }; - } - // GraphQL allows JSON-style surrogate pair escape sequences, but only when + } // GraphQL allows JSON-style surrogate pair escape sequences, but only when // a valid pair is formed. + if (isLeadingSurrogate(code)) { // \u if (body.charCodeAt(position + 6) === 0x005c && body.charCodeAt(position + 7) === 0x0075) { @@ -29366,6 +28286,7 @@ function readEscapedUnicodeFixedWidth(lexer, position) { * * Returns a negative number if any char was not a valid hexadecimal digit. */ + function read16BitHexCode(body, position) { // readHexDigit() returns -1 on error. ORing a negative value with any other // value always produces a negative value. @@ -29385,6 +28306,7 @@ function read16BitHexCode(body, position) { * - `A` `B` `C` `D` `E` `F` * - `a` `b` `c` `d` `e` `f` */ + function readHexDigit(code) { return code >= 0x0030 && code <= 0x0039 // 0-9 ? code - 0x0030 : code >= 0x0041 && code <= 0x0046 // A-F @@ -29403,6 +28325,7 @@ function readHexDigit(code) { * | `r` | U+000D | carriage return | * | `t` | U+0009 | horizontal tab | */ + function readEscapedCharacter(lexer, position) { const body = lexer.source.body; const code = body.charCodeAt(position + 1); @@ -29470,6 +28393,7 @@ function readEscapedCharacter(lexer, position) { * - `\"""` * ``` */ + function readBlockString(lexer, start) { const body = lexer.source.body; const bodyLength = body.length; @@ -29479,8 +28403,8 @@ function readBlockString(lexer, start) { let currentLine = ''; const blockLines = []; while (position < bodyLength) { - const code = body.charCodeAt(position); - // Closing Triple-Quote (""") + const code = body.charCodeAt(position); // Closing Triple-Quote (""") + if (code === 0x0022 && body.charCodeAt(position + 1) === 0x0022 && body.charCodeAt(position + 2) === 0x0022) { currentLine += body.slice(chunkStart, position); blockLines.push(currentLine); @@ -29490,15 +28414,16 @@ function readBlockString(lexer, start) { lexer.line += blockLines.length - 1; lexer.lineStart = lineStart; return token; - } - // Escaped Triple-Quote (\""") + } // Escaped Triple-Quote (\""") + if (code === 0x005c && body.charCodeAt(position + 1) === 0x0022 && body.charCodeAt(position + 2) === 0x0022 && body.charCodeAt(position + 3) === 0x0022) { currentLine += body.slice(chunkStart, position); chunkStart = position + 1; // skip only slash + position += 4; continue; - } - // LineTerminator + } // LineTerminator + if (code === 0x000a || code === 0x000d) { currentLine += body.slice(chunkStart, position); blockLines.push(currentLine); @@ -29511,8 +28436,8 @@ function readBlockString(lexer, start) { chunkStart = position; lineStart = position; continue; - } - // SourceCharacter + } // SourceCharacter + if (isUnicodeScalarValue(code)) { ++position; } else if (isSupplementaryCodePoint(body, position)) { @@ -29531,6 +28456,7 @@ function readBlockString(lexer, start) { * - NameStart NameContinue* [lookahead != NameContinue] * ``` */ + function readName(lexer, start) { const body = lexer.source.body; const bodyLength = body.length; @@ -29562,6 +28488,10 @@ Object.defineProperty(exports, "__esModule", ({ exports.getLocation = getLocation; var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); const LineRegExp = /\r\n|[\n\r]/g; +/** + * Represents a location in a Source. + */ + /** * Takes a Source and a UTF-8 character offset, and returns the corresponding * line and column as a SourceLocation. @@ -29608,6 +28538,10 @@ var _kinds = __webpack_require__(/*! ./kinds.mjs */ "../../../node_modules/graph var _lexer = __webpack_require__(/*! ./lexer.mjs */ "../../../node_modules/graphql/language/lexer.mjs"); var _source = __webpack_require__(/*! ./source.mjs */ "../../../node_modules/graphql/language/source.mjs"); var _tokenKind = __webpack_require__(/*! ./tokenKind.mjs */ "../../../node_modules/graphql/language/tokenKind.mjs"); +/** + * Configuration options to control parser behavior + */ + /** * Given a GraphQL source, parses it into a Document. * Throws GraphQLError if a syntax error is encountered. @@ -29626,6 +28560,7 @@ function parse(source, options) { * * Consider providing the results to the utility function: valueFromAST(). */ + function parseValue(source, options) { const parser = new Parser(source, options); parser.expectToken(_tokenKind.TokenKind.SOF); @@ -29637,6 +28572,7 @@ function parseValue(source, options) { * Similar to parseValue(), but raises a parse error if it encounters a * variable. The return type will be a constant value. */ + function parseConstValue(source, options) { const parser = new Parser(source, options); parser.expectToken(_tokenKind.TokenKind.SOF); @@ -29654,6 +28590,7 @@ function parseConstValue(source, options) { * * Consider providing the results to the utility function: typeFromAST(). */ + function parseType(source, options) { const parser = new Parser(source, options); parser.expectToken(_tokenKind.TokenKind.SOF); @@ -29672,6 +28609,7 @@ function parseType(source, options) { * * @internal */ + class Parser { constructor(source, options = {}) { const sourceObj = (0, _source.isSource)(source) ? source : new _source.Source(source); @@ -29682,17 +28620,19 @@ class Parser { /** * Converts a name lex token into a name parse node. */ + parseName() { const token = this.expectToken(_tokenKind.TokenKind.NAME); return this.node(token, { kind: _kinds.Kind.NAME, value: token.value }); - } - // Implements the parsing rules in the Document section. + } // Implements the parsing rules in the Document section. + /** * Document : Definition+ */ + parseDocument() { return this.node(this._lexer.token, { kind: _kinds.Kind.DOCUMENT, @@ -29722,11 +28662,12 @@ class Parser { * - EnumTypeDefinition * - InputObjectTypeDefinition */ + parseDefinition() { if (this.peek(_tokenKind.TokenKind.BRACE_L)) { return this.parseOperationDefinition(); - } - // Many definitions begin with a description and require a lookahead. + } // Many definitions begin with a description and require a lookahead. + const hasDescription = this.peekDescription(); const keywordToken = hasDescription ? this._lexer.lookahead() : this._lexer.token; if (keywordToken.kind === _tokenKind.TokenKind.NAME) { @@ -29763,13 +28704,14 @@ class Parser { } } throw this.unexpected(keywordToken); - } - // Implements the parsing rules in the Operations section. + } // Implements the parsing rules in the Operations section. + /** * OperationDefinition : * - SelectionSet * - OperationType Name? VariableDefinitions? Directives? SelectionSet */ + parseOperationDefinition() { const start = this._lexer.token; if (this.peek(_tokenKind.TokenKind.BRACE_L)) { @@ -29799,6 +28741,7 @@ class Parser { /** * OperationType : one of query mutation subscription */ + parseOperationType() { const operationToken = this.expectToken(_tokenKind.TokenKind.NAME); switch (operationToken.value) { @@ -29814,12 +28757,14 @@ class Parser { /** * VariableDefinitions : ( VariableDefinition+ ) */ + parseVariableDefinitions() { return this.optionalMany(_tokenKind.TokenKind.PAREN_L, this.parseVariableDefinition, _tokenKind.TokenKind.PAREN_R); } /** * VariableDefinition : Variable : Type DefaultValue? Directives[Const]? */ + parseVariableDefinition() { return this.node(this._lexer.token, { kind: _kinds.Kind.VARIABLE_DEFINITION, @@ -29832,6 +28777,7 @@ class Parser { /** * Variable : $ Name */ + parseVariable() { const start = this._lexer.token; this.expectToken(_tokenKind.TokenKind.DOLLAR); @@ -29845,6 +28791,7 @@ class Parser { * SelectionSet : { Selection+ } * ``` */ + parseSelectionSet() { return this.node(this._lexer.token, { kind: _kinds.Kind.SELECTION_SET, @@ -29857,6 +28804,7 @@ class Parser { * - FragmentSpread * - InlineFragment */ + parseSelection() { return this.peek(_tokenKind.TokenKind.SPREAD) ? this.parseFragment() : this.parseField(); } @@ -29865,6 +28813,7 @@ class Parser { * * Alias : Name : */ + parseField() { const start = this._lexer.token; const nameOrAlias = this.parseName(); @@ -29881,47 +28830,22 @@ class Parser { alias, name, arguments: this.parseArguments(false), - // Experimental support for Client Controlled Nullability changes - // the grammar of Field: - nullabilityAssertion: this.parseNullabilityAssertion(), directives: this.parseDirectives(false), selectionSet: this.peek(_tokenKind.TokenKind.BRACE_L) ? this.parseSelectionSet() : undefined }); } - // TODO: add grammar comment after it finalizes - parseNullabilityAssertion() { - // Note: Client Controlled Nullability is experimental and may be changed or - // removed in the future. - if (this._options.experimentalClientControlledNullability !== true) { - return undefined; - } - const start = this._lexer.token; - let nullabilityAssertion; - if (this.expectOptionalToken(_tokenKind.TokenKind.BRACKET_L)) { - const innerModifier = this.parseNullabilityAssertion(); - this.expectToken(_tokenKind.TokenKind.BRACKET_R); - nullabilityAssertion = this.node(start, { - kind: _kinds.Kind.LIST_NULLABILITY_OPERATOR, - nullabilityAssertion: innerModifier - }); - } - if (this.expectOptionalToken(_tokenKind.TokenKind.BANG)) { - nullabilityAssertion = this.node(start, { - kind: _kinds.Kind.NON_NULL_ASSERTION, - nullabilityAssertion - }); - } else if (this.expectOptionalToken(_tokenKind.TokenKind.QUESTION_MARK)) { - nullabilityAssertion = this.node(start, { - kind: _kinds.Kind.ERROR_BOUNDARY, - nullabilityAssertion - }); - } - return nullabilityAssertion; - } + /** + * Arguments[Const] : ( Argument[?Const]+ ) + */ + parseArguments(isConst) { const item = isConst ? this.parseConstArgument : this.parseArgument; return this.optionalMany(_tokenKind.TokenKind.PAREN_L, item, _tokenKind.TokenKind.PAREN_R); } + /** + * Argument[Const] : Name : Value[?Const] + */ + parseArgument(isConst = false) { const start = this._lexer.token; const name = this.parseName(); @@ -29934,8 +28858,8 @@ class Parser { } parseConstArgument() { return this.parseArgument(true); - } - // Implements the parsing rules in the Fragments section. + } // Implements the parsing rules in the Fragments section. + /** * Corresponds to both FragmentSpread and InlineFragment in the spec. * @@ -29943,6 +28867,7 @@ class Parser { * * InlineFragment : ... TypeCondition? Directives? SelectionSet */ + parseFragment() { const start = this._lexer.token; this.expectToken(_tokenKind.TokenKind.SPREAD); @@ -29967,12 +28892,13 @@ class Parser { * * TypeCondition : NamedType */ + parseFragmentDefinition() { const start = this._lexer.token; - this.expectKeyword('fragment'); - // Legacy support for defining variables within fragments changes + this.expectKeyword('fragment'); // Legacy support for defining variables within fragments changes // the grammar of FragmentDefinition: // - fragment FragmentName VariableDefinitions? on TypeCondition Directives? SelectionSet + if (this._options.allowLegacyFragmentVariables === true) { return this.node(start, { kind: _kinds.Kind.FRAGMENT_DEFINITION, @@ -29994,12 +28920,33 @@ class Parser { /** * FragmentName : Name but not `on` */ + parseFragmentName() { if (this._lexer.token.value === 'on') { throw this.unexpected(); } return this.parseName(); - } + } // Implements the parsing rules in the Values section. + + /** + * Value[Const] : + * - [~Const] Variable + * - IntValue + * - FloatValue + * - StringValue + * - BooleanValue + * - NullValue + * - EnumValue + * - ListValue[?Const] + * - ObjectValue[?Const] + * + * BooleanValue : one of `true` `false` + * + * NullValue : `null` + * + * EnumValue : Name but not `true`, `false` or `null` + */ + parseValueLiteral(isConst) { const token = this._lexer.token; switch (token.kind) { @@ -30072,6 +29019,12 @@ class Parser { block: token.kind === _tokenKind.TokenKind.BLOCK_STRING }); } + /** + * ListValue[Const] : + * - [ ] + * - [ Value[?Const]+ ] + */ + parseList(isConst) { const item = () => this.parseValueLiteral(isConst); return this.node(this._lexer.token, { @@ -30079,6 +29032,14 @@ class Parser { values: this.any(_tokenKind.TokenKind.BRACKET_L, item, _tokenKind.TokenKind.BRACKET_R) }); } + /** + * ``` + * ObjectValue[Const] : + * - { } + * - { ObjectField[?Const]+ } + * ``` + */ + parseObject(isConst) { const item = () => this.parseObjectField(isConst); return this.node(this._lexer.token, { @@ -30086,6 +29047,10 @@ class Parser { fields: this.any(_tokenKind.TokenKind.BRACE_L, item, _tokenKind.TokenKind.BRACE_R) }); } + /** + * ObjectField[Const] : Name : Value[?Const] + */ + parseObjectField(isConst) { const start = this._lexer.token; const name = this.parseName(); @@ -30095,7 +29060,12 @@ class Parser { name, value: this.parseValueLiteral(isConst) }); - } + } // Implements the parsing rules in the Directives section. + + /** + * Directives[Const] : Directive[?Const]+ + */ + parseDirectives(isConst) { const directives = []; while (this.peek(_tokenKind.TokenKind.AT)) { @@ -30106,6 +29076,12 @@ class Parser { parseConstDirectives() { return this.parseDirectives(true); } + /** + * ``` + * Directive[Const] : @ Name Arguments[?Const]? + * ``` + */ + parseDirective(isConst) { const start = this._lexer.token; this.expectToken(_tokenKind.TokenKind.AT); @@ -30114,14 +29090,15 @@ class Parser { name: this.parseName(), arguments: this.parseArguments(isConst) }); - } - // Implements the parsing rules in the Types section. + } // Implements the parsing rules in the Types section. + /** * Type : * - NamedType * - ListType * - NonNullType */ + parseTypeReference() { const start = this._lexer.token; let type; @@ -30146,19 +29123,21 @@ class Parser { /** * NamedType : Name */ + parseNamedType() { return this.node(this._lexer.token, { kind: _kinds.Kind.NAMED_TYPE, name: this.parseName() }); - } - // Implements the parsing rules in the Type Definition section. + } // Implements the parsing rules in the Type Definition section. + peekDescription() { return this.peek(_tokenKind.TokenKind.STRING) || this.peek(_tokenKind.TokenKind.BLOCK_STRING); } /** * Description : StringValue */ + parseDescription() { if (this.peekDescription()) { return this.parseStringLiteral(); @@ -30169,6 +29148,7 @@ class Parser { * SchemaDefinition : Description? schema Directives[Const]? { OperationTypeDefinition+ } * ``` */ + parseSchemaDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30185,6 +29165,7 @@ class Parser { /** * OperationTypeDefinition : OperationType : NamedType */ + parseOperationTypeDefinition() { const start = this._lexer.token; const operation = this.parseOperationType(); @@ -30199,6 +29180,7 @@ class Parser { /** * ScalarTypeDefinition : Description? scalar Name Directives[Const]? */ + parseScalarTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30217,6 +29199,7 @@ class Parser { * Description? * type Name ImplementsInterfaces? Directives[Const]? FieldsDefinition? */ + parseObjectTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30239,6 +29222,7 @@ class Parser { * - implements `&`? NamedType * - ImplementsInterfaces & NamedType */ + parseImplementsInterfaces() { return this.expectOptionalKeyword('implements') ? this.delimitedMany(_tokenKind.TokenKind.AMP, this.parseNamedType) : []; } @@ -30247,6 +29231,7 @@ class Parser { * FieldsDefinition : { FieldDefinition+ } * ``` */ + parseFieldsDefinition() { return this.optionalMany(_tokenKind.TokenKind.BRACE_L, this.parseFieldDefinition, _tokenKind.TokenKind.BRACE_R); } @@ -30254,6 +29239,7 @@ class Parser { * FieldDefinition : * - Description? Name ArgumentsDefinition? : Type Directives[Const]? */ + parseFieldDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30274,6 +29260,7 @@ class Parser { /** * ArgumentsDefinition : ( InputValueDefinition+ ) */ + parseArgumentDefs() { return this.optionalMany(_tokenKind.TokenKind.PAREN_L, this.parseInputValueDef, _tokenKind.TokenKind.PAREN_R); } @@ -30281,6 +29268,7 @@ class Parser { * InputValueDefinition : * - Description? Name : Type DefaultValue? Directives[Const]? */ + parseInputValueDef() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30305,6 +29293,7 @@ class Parser { * InterfaceTypeDefinition : * - Description? interface Name Directives[Const]? FieldsDefinition? */ + parseInterfaceTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30326,6 +29315,7 @@ class Parser { * UnionTypeDefinition : * - Description? union Name Directives[Const]? UnionMemberTypes? */ + parseUnionTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30346,6 +29336,7 @@ class Parser { * - = `|`? NamedType * - UnionMemberTypes | NamedType */ + parseUnionMemberTypes() { return this.expectOptionalToken(_tokenKind.TokenKind.EQUALS) ? this.delimitedMany(_tokenKind.TokenKind.PIPE, this.parseNamedType) : []; } @@ -30353,6 +29344,7 @@ class Parser { * EnumTypeDefinition : * - Description? enum Name Directives[Const]? EnumValuesDefinition? */ + parseEnumTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30373,12 +29365,14 @@ class Parser { * EnumValuesDefinition : { EnumValueDefinition+ } * ``` */ + parseEnumValuesDefinition() { return this.optionalMany(_tokenKind.TokenKind.BRACE_L, this.parseEnumValueDefinition, _tokenKind.TokenKind.BRACE_R); } /** * EnumValueDefinition : Description? EnumValue Directives[Const]? */ + parseEnumValueDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30394,6 +29388,7 @@ class Parser { /** * EnumValue : Name but not `true`, `false` or `null` */ + parseEnumValueName() { if (this._lexer.token.value === 'true' || this._lexer.token.value === 'false' || this._lexer.token.value === 'null') { throw (0, _syntaxError.syntaxError)(this._lexer.source, this._lexer.token.start, `${getTokenDesc(this._lexer.token)} is reserved and cannot be used for an enum value.`); @@ -30404,6 +29399,7 @@ class Parser { * InputObjectTypeDefinition : * - Description? input Name Directives[Const]? InputFieldsDefinition? */ + parseInputObjectTypeDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30424,6 +29420,7 @@ class Parser { * InputFieldsDefinition : { InputValueDefinition+ } * ``` */ + parseInputFieldsDefinition() { return this.optionalMany(_tokenKind.TokenKind.BRACE_L, this.parseInputValueDef, _tokenKind.TokenKind.BRACE_R); } @@ -30440,6 +29437,7 @@ class Parser { * - EnumTypeExtension * - InputObjectTypeDefinition */ + parseTypeSystemExtension() { const keywordToken = this._lexer.lookahead(); if (keywordToken.kind === _tokenKind.TokenKind.NAME) { @@ -30469,6 +29467,7 @@ class Parser { * - extend schema Directives[Const] * ``` */ + parseSchemaExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30488,6 +29487,7 @@ class Parser { * ScalarTypeExtension : * - extend scalar Name Directives[Const] */ + parseScalarTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30509,6 +29509,7 @@ class Parser { * - extend type Name ImplementsInterfaces? Directives[Const] * - extend type Name ImplementsInterfaces */ + parseObjectTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30534,6 +29535,7 @@ class Parser { * - extend interface Name ImplementsInterfaces? Directives[Const] * - extend interface Name ImplementsInterfaces */ + parseInterfaceTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30558,6 +29560,7 @@ class Parser { * - extend union Name Directives[Const]? UnionMemberTypes * - extend union Name Directives[Const] */ + parseUnionTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30580,6 +29583,7 @@ class Parser { * - extend enum Name Directives[Const]? EnumValuesDefinition * - extend enum Name Directives[Const] */ + parseEnumTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30602,6 +29606,7 @@ class Parser { * - extend input Name Directives[Const]? InputFieldsDefinition * - extend input Name Directives[Const] */ + parseInputObjectTypeExtension() { const start = this._lexer.token; this.expectKeyword('extend'); @@ -30625,6 +29630,7 @@ class Parser { * - Description? directive @ Name ArgumentsDefinition? `repeatable`? on DirectiveLocations * ``` */ + parseDirectiveDefinition() { const start = this._lexer.token; const description = this.parseDescription(); @@ -30649,6 +29655,7 @@ class Parser { * - `|`? DirectiveLocation * - DirectiveLocations | DirectiveLocation */ + parseDirectiveLocations() { return this.delimitedMany(_tokenKind.TokenKind.PIPE, this.parseDirectiveLocation); } @@ -30679,20 +29686,22 @@ class Parser { * `INPUT_OBJECT` * `INPUT_FIELD_DEFINITION` */ + parseDirectiveLocation() { const start = this._lexer.token; const name = this.parseName(); - if (Object.hasOwn(_directiveLocation.DirectiveLocation, name.value)) { + if (Object.prototype.hasOwnProperty.call(_directiveLocation.DirectiveLocation, name.value)) { return name; } throw this.unexpected(start); - } - // Core parsing utility functions + } // Core parsing utility functions + /** * Returns a node that, if configured to do so, sets a "loc" field as a * location object, used to identify the place in the source that created a * given parsed object. */ + node(startToken, node) { if (this._options.noLocation !== true) { node.loc = new _ast.Location(startToken, this._lexer.lastToken, this._lexer.source); @@ -30702,6 +29711,7 @@ class Parser { /** * Determines if the next token is of a given kind */ + peek(kind) { return this._lexer.token.kind === kind; } @@ -30709,6 +29719,7 @@ class Parser { * If the next token is of the given kind, return that token after advancing the lexer. * Otherwise, do not change the parser state and throw an error. */ + expectToken(kind) { const token = this._lexer.token; if (token.kind === kind) { @@ -30721,6 +29732,7 @@ class Parser { * If the next token is of the given kind, return "true" after advancing the lexer. * Otherwise, do not change the parser state and return "false". */ + expectOptionalToken(kind) { const token = this._lexer.token; if (token.kind === kind) { @@ -30733,6 +29745,7 @@ class Parser { * If the next token is a given keyword, advance the lexer. * Otherwise, do not change the parser state and throw an error. */ + expectKeyword(value) { const token = this._lexer.token; if (token.kind === _tokenKind.TokenKind.NAME && token.value === value) { @@ -30745,6 +29758,7 @@ class Parser { * If the next token is a given keyword, return "true" after advancing the lexer. * Otherwise, do not change the parser state and return "false". */ + expectOptionalKeyword(value) { const token = this._lexer.token; if (token.kind === _tokenKind.TokenKind.NAME && token.value === value) { @@ -30756,6 +29770,7 @@ class Parser { /** * Helper function for creating an error when an unexpected lexed token is encountered. */ + unexpected(atToken) { const token = atToken !== null && atToken !== void 0 ? atToken : this._lexer.token; return (0, _syntaxError.syntaxError)(this._lexer.source, token.start, `Unexpected ${getTokenDesc(token)}.`); @@ -30765,6 +29780,7 @@ class Parser { * This list begins with a lex token of openKind and ends with a lex token of closeKind. * Advances the parser to the next lex token after the closing token. */ + any(openKind, parseFn, closeKind) { this.expectToken(openKind); const nodes = []; @@ -30779,6 +29795,7 @@ class Parser { * that begins with a lex token of openKind and ends with a lex token of closeKind. * Advances the parser to the next lex token after the closing token. */ + optionalMany(openKind, parseFn, closeKind) { if (this.expectOptionalToken(openKind)) { const nodes = []; @@ -30794,6 +29811,7 @@ class Parser { * This list begins with a lex token of openKind and ends with a lex token of closeKind. * Advances the parser to the next lex token after the closing token. */ + many(openKind, parseFn, closeKind) { this.expectToken(openKind); const nodes = []; @@ -30807,6 +29825,7 @@ class Parser { * This list may begin with a lex token of delimiterKind followed by items separated by lex tokens of tokenKind. * Advances the parser to the next lex token after last item in the list. */ + delimitedMany(delimiterKind, parseFn) { this.expectOptionalToken(delimiterKind); const nodes = []; @@ -30823,7 +29842,7 @@ class Parser { if (maxTokens !== undefined && token.kind !== _tokenKind.TokenKind.EOF) { ++this._tokenCounter; if (this._tokenCounter > maxTokens) { - throw (0, _syntaxError.syntaxError)(this._lexer.source, token.start, `Document contains more than ${maxTokens} tokens. Parsing aborted.`); + throw (0, _syntaxError.syntaxError)(this._lexer.source, token.start, `Document contains more that ${maxTokens} tokens. Parsing aborted.`); } } } @@ -30839,6 +29858,7 @@ function getTokenDesc(token) { /** * A helper function to describe a token kind as a string for debugging. */ + function getTokenKindDesc(kind) { return (0, _lexer.isPunctuatorTokenKind)(kind) ? `"${kind}"` : kind; } @@ -30859,7 +29879,6 @@ Object.defineProperty(exports, "__esModule", ({ exports.isConstValueNode = isConstValueNode; exports.isDefinitionNode = isDefinitionNode; exports.isExecutableDefinitionNode = isExecutableDefinitionNode; -exports.isNullabilityAssertionNode = isNullabilityAssertionNode; exports.isSelectionNode = isSelectionNode; exports.isTypeDefinitionNode = isTypeDefinitionNode; exports.isTypeExtensionNode = isTypeExtensionNode; @@ -30877,9 +29896,6 @@ function isExecutableDefinitionNode(node) { function isSelectionNode(node) { return node.kind === _kinds.Kind.FIELD || node.kind === _kinds.Kind.FRAGMENT_SPREAD || node.kind === _kinds.Kind.INLINE_FRAGMENT; } -function isNullabilityAssertionNode(node) { - return node.kind === _kinds.Kind.LIST_NULLABILITY_OPERATOR || node.kind === _kinds.Kind.NON_NULL_ASSERTION || node.kind === _kinds.Kind.ERROR_BOUNDARY; -} function isValueNode(node) { return node.kind === _kinds.Kind.VARIABLE || node.kind === _kinds.Kind.INT || node.kind === _kinds.Kind.FLOAT || node.kind === _kinds.Kind.STRING || node.kind === _kinds.Kind.BOOLEAN || node.kind === _kinds.Kind.NULL || node.kind === _kinds.Kind.ENUM || node.kind === _kinds.Kind.LIST || node.kind === _kinds.Kind.OBJECT; } @@ -30927,6 +29943,7 @@ function printLocation(location) { /** * Render a helpful description of the location in the GraphQL Source document. */ + function printSourceLocation(source, sourceLocation) { const firstLineColumnOffset = source.locationOffset.column - 1; const body = ''.padStart(firstLineColumnOffset) + source.body; @@ -30937,8 +29954,8 @@ function printSourceLocation(source, sourceLocation) { const columnNum = sourceLocation.column + columnOffset; const locationStr = `${source.name}:${lineNum}:${columnNum}\n`; const lines = body.split(/\r\n|[\n\r]/g); - const locationLine = lines[lineIndex]; - // Special case for minified documents + const locationLine = lines[lineIndex]; // Special case for minified documents + if (locationLine.length > 120) { const subLineIndex = Math.floor(columnNum / 80); const subLineColumnNum = columnNum % 80; @@ -30978,14 +29995,24 @@ exports.printString = printString; */ function printString(str) { return `"${str.replace(escapedRegExp, escapedReplacer)}"`; -} -// eslint-disable-next-line no-control-regex +} // eslint-disable-next-line no-control-regex + const escapedRegExp = /[\x00-\x1f\x22\x5c\x7f-\x9f]/g; function escapedReplacer(str) { return escapeSequences[str.charCodeAt(0)]; -} -// prettier-ignore -const escapeSequences = ['\\u0000', '\\u0001', '\\u0002', '\\u0003', '\\u0004', '\\u0005', '\\u0006', '\\u0007', '\\b', '\\t', '\\n', '\\u000B', '\\f', '\\r', '\\u000E', '\\u000F', '\\u0010', '\\u0011', '\\u0012', '\\u0013', '\\u0014', '\\u0015', '\\u0016', '\\u0017', '\\u0018', '\\u0019', '\\u001A', '\\u001B', '\\u001C', '\\u001D', '\\u001E', '\\u001F', '', '', '\\"', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '\\\\', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '\\u007F', '\\u0080', '\\u0081', '\\u0082', '\\u0083', '\\u0084', '\\u0085', '\\u0086', '\\u0087', '\\u0088', '\\u0089', '\\u008A', '\\u008B', '\\u008C', '\\u008D', '\\u008E', '\\u008F', '\\u0090', '\\u0091', '\\u0092', '\\u0093', '\\u0094', '\\u0095', '\\u0096', '\\u0097', '\\u0098', '\\u0099', '\\u009A', '\\u009B', '\\u009C', '\\u009D', '\\u009E', '\\u009F']; +} // prettier-ignore + +const escapeSequences = ['\\u0000', '\\u0001', '\\u0002', '\\u0003', '\\u0004', '\\u0005', '\\u0006', '\\u0007', '\\b', '\\t', '\\n', '\\u000B', '\\f', '\\r', '\\u000E', '\\u000F', '\\u0010', '\\u0011', '\\u0012', '\\u0013', '\\u0014', '\\u0015', '\\u0016', '\\u0017', '\\u0018', '\\u0019', '\\u001A', '\\u001B', '\\u001C', '\\u001D', '\\u001E', '\\u001F', '', '', '\\"', '', '', '', '', '', '', '', '', '', '', '', '', '', +// 2F +'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', +// 3F +'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', +// 4F +'', '', '', '', '', '', '', '', '', '', '', '', '\\\\', '', '', '', +// 5F +'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', +// 6F +'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '\\u007F', '\\u0080', '\\u0081', '\\u0082', '\\u0083', '\\u0084', '\\u0085', '\\u0086', '\\u0087', '\\u0088', '\\u0089', '\\u008A', '\\u008B', '\\u008C', '\\u008D', '\\u008E', '\\u008F', '\\u0090', '\\u0091', '\\u0092', '\\u0093', '\\u0094', '\\u0095', '\\u0096', '\\u0097', '\\u0098', '\\u0099', '\\u009A', '\\u009B', '\\u009C', '\\u009D', '\\u009E', '\\u009F']; /***/ }), @@ -31008,6 +30035,7 @@ var _visitor = __webpack_require__(/*! ./visitor.mjs */ "../../../node_modules/g * Converts an AST into a string, using one set of reasonable * formatting rules. */ + function print(ast) { return (0, _visitor.visit)(ast, printDocASTReducer); } @@ -31026,9 +30054,9 @@ const printDocASTReducer = { OperationDefinition: { leave(node) { const varDefs = wrap('(', join(node.variableDefinitions, ', '), ')'); - const prefix = join([node.operation, join([node.name, varDefs]), join(node.directives, ' ')], ' '); - // Anonymous queries with no directives or variable definitions can use + const prefix = join([node.operation, join([node.name, varDefs]), join(node.directives, ' ')], ' '); // Anonymous queries with no directives or variable definitions can use // the query short form. + return (prefix === 'query' ? '' : prefix + ' ') + node.selectionSet; } }, @@ -31050,19 +30078,15 @@ const printDocASTReducer = { alias, name, arguments: args, - nullabilityAssertion, directives, selectionSet }) { - const prefix = join([wrap('', alias, ': '), name], ''); + const prefix = wrap('', alias, ': ') + name; let argsLine = prefix + wrap('(', join(args, ', '), ')'); if (argsLine.length > MAX_LINE_LENGTH) { argsLine = prefix + wrap('(\n', indent(join(args, '\n')), '\n)'); } - return join([argsLine, - // Note: Client Controlled Nullability is experimental and may be - // changed or removed in the future. - nullabilityAssertion, wrap(' ', join(directives, ' ')), wrap(' ', selectionSet)]); + return join([argsLine, join(directives, ' '), selectionSet], ' '); } }, Argument: { @@ -31071,28 +30095,6 @@ const printDocASTReducer = { value }) => name + ': ' + value }, - // Nullability Modifiers - ListNullabilityOperator: { - leave({ - nullabilityAssertion - }) { - return join(['[', nullabilityAssertion, ']']); - } - }, - NonNullAssertion: { - leave({ - nullabilityAssertion - }) { - return join([nullabilityAssertion, '!']); - } - }, - ErrorBoundary: { - leave({ - nullabilityAssertion - }) { - return join([nullabilityAssertion, '?']); - } - }, // Fragments FragmentSpread: { leave: ({ @@ -31114,8 +30116,8 @@ const printDocASTReducer = { variableDefinitions, directives, selectionSet - }) => - // Note: fragment variable definitions are experimental and may be changed + } // Note: fragment variable definitions are experimental and may be changed + ) => // or removed in the future. `fragment ${name}${wrap('(', join(variableDefinitions, ', '), ')')} ` + `on ${typeCondition} ${wrap('', join(directives, ' '), ' ')}` + selectionSet }, @@ -31134,7 +30136,7 @@ const printDocASTReducer = { leave: ({ value, block: isBlockString - }) => isBlockString === true ? (0, _blockString.printBlockString)(value) : (0, _printString.printString)(value) + }) => isBlockString ? (0, _blockString.printBlockString)(value) : (0, _printString.printString)(value) }, BooleanValue: { leave: ({ @@ -31152,21 +30154,12 @@ const printDocASTReducer = { ListValue: { leave: ({ values - }) => { - const valuesLine = '[' + join(values, ', ') + ']'; - if (valuesLine.length > MAX_LINE_LENGTH) { - return '[\n' + indent(join(values, '\n')) + '\n]'; - } - return valuesLine; - } + }) => '[' + join(values, ', ') + ']' }, ObjectValue: { leave: ({ fields - }) => { - const fieldsLine = '{ ' + join(fields, ', ') + ' }'; - return fieldsLine.length > MAX_LINE_LENGTH ? block(fields) : fieldsLine; - } + }) => '{' + join(fields, ', ') + '}' }, ObjectField: { leave: ({ @@ -31348,6 +30341,7 @@ const printDocASTReducer = { * Given maybeArray, print an empty string if it is null or empty, otherwise * print all items together separated by separator if provided */ + function join(maybeArray, separator = '') { var _maybeArray$filter$jo; return (_maybeArray$filter$jo = maybeArray === null || maybeArray === void 0 ? void 0 : maybeArray.filter(x => x).join(separator)) !== null && _maybeArray$filter$jo !== void 0 ? _maybeArray$filter$jo : ''; @@ -31355,21 +30349,25 @@ function join(maybeArray, separator = '') { /** * Given array, print each item on its own line, wrapped in an indented `{ }` block. */ + function block(array) { return wrap('{\n', indent(join(array, '\n')), '\n}'); } /** * If maybeString is not null or empty, then wrap with start and end, otherwise print an empty string. */ + function wrap(start, maybeString, end = '') { return maybeString != null && maybeString !== '' ? start + maybeString + end : ''; } function indent(str) { - return wrap(' ', str.replaceAll('\n', '\n ')); + return wrap(' ', str.replace(/\n/g, '\n ')); } function hasMultilineItems(maybeArray) { var _maybeArray$some; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ return (_maybeArray$some = maybeArray === null || maybeArray === void 0 ? void 0 : maybeArray.some(str => str.includes('\n'))) !== null && _maybeArray$some !== void 0 ? _maybeArray$some : false; } @@ -31390,6 +30388,7 @@ Object.defineProperty(exports, "__esModule", ({ exports.Source = void 0; exports.isSource = isSource; var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); +var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _instanceOf = __webpack_require__(/*! ../jsutils/instanceOf.mjs */ "../../../node_modules/graphql/jsutils/instanceOf.mjs"); /** * A representation of source input to GraphQL. The `name` and `locationOffset` parameters are @@ -31403,6 +30402,7 @@ class Source { line: 1, column: 1 }) { + typeof body === 'string' || (0, _devAssert.devAssert)(false, `Body must be a string. Received: ${(0, _inspect.inspect)(body)}.`); this.body = body; this.name = name; this.locationOffset = locationOffset; @@ -31446,7 +30446,6 @@ var TokenKind; TokenKind['SOF'] = ''; TokenKind['EOF'] = ''; TokenKind['BANG'] = '!'; - TokenKind['QUESTION_MARK'] = '?'; TokenKind['DOLLAR'] = '$'; TokenKind['AMP'] = '&'; TokenKind['PAREN_L'] = '('; @@ -31468,6 +30467,12 @@ var TokenKind; TokenKind['COMMENT'] = 'Comment'; })(TokenKind || (exports.TokenKind = TokenKind = {})); +/** + * The enum type representing the token kinds values. + * + * @deprecated Please use `TokenKind`. Will be remove in v17. + */ + /***/ }), /***/ "../../../node_modules/graphql/language/visitor.mjs": @@ -31483,19 +30488,105 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.BREAK = void 0; exports.getEnterLeaveForKind = getEnterLeaveForKind; +exports.getVisitFn = getVisitFn; exports.visit = visit; exports.visitInParallel = visitInParallel; var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _ast = __webpack_require__(/*! ./ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); var _kinds = __webpack_require__(/*! ./kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); +/** + * A visitor is provided to visit, it contains the collection of + * relevant functions to be called during the visitor's traversal. + */ + const BREAK = exports.BREAK = Object.freeze({}); +/** + * visit() will walk through an AST using a depth-first traversal, calling + * the visitor's enter function at each node in the traversal, and calling the + * leave function after visiting that node and all of its child nodes. + * + * By returning different values from the enter and leave functions, the + * behavior of the visitor can be altered, including skipping over a sub-tree of + * the AST (by returning false), editing the AST by returning a value or null + * to remove the value, or to stop the whole traversal by returning BREAK. + * + * When using visit() to edit an AST, the original AST will not be modified, and + * a new version of the AST with the changes applied will be returned from the + * visit function. + * + * ```ts + * const editedAST = visit(ast, { + * enter(node, key, parent, path, ancestors) { + * // @return + * // undefined: no action + * // false: skip visiting this node + * // visitor.BREAK: stop visiting altogether + * // null: delete this node + * // any value: replace this node with the returned value + * }, + * leave(node, key, parent, path, ancestors) { + * // @return + * // undefined: no action + * // false: no action + * // visitor.BREAK: stop visiting altogether + * // null: delete this node + * // any value: replace this node with the returned value + * } + * }); + * ``` + * + * Alternatively to providing enter() and leave() functions, a visitor can + * instead provide functions named the same as the kinds of AST nodes, or + * enter/leave visitors at a named key, leading to three permutations of the + * visitor API: + * + * 1) Named visitors triggered when entering a node of a specific kind. + * + * ```ts + * visit(ast, { + * Kind(node) { + * // enter the "Kind" node + * } + * }) + * ``` + * + * 2) Named visitors that trigger upon entering and leaving a node of a specific kind. + * + * ```ts + * visit(ast, { + * Kind: { + * enter(node) { + * // enter the "Kind" node + * } + * leave(node) { + * // leave the "Kind" node + * } + * } + * }) + * ``` + * + * 3) Generic visitors that trigger upon entering and leaving any node. + * + * ```ts + * visit(ast, { + * enter(node) { + * // enter any node + * }, + * leave(node) { + * // leave any node + * } + * }) + * ``` + */ + function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { const enterLeaveMap = new Map(); for (const kind of Object.values(_kinds.Kind)) { enterLeaveMap.set(kind, getEnterLeaveForKind(visitor, kind)); } /* eslint-disable no-undef-init */ + let stack = undefined; let inArray = Array.isArray(root); let keys = [root]; @@ -31507,6 +30598,7 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { const path = []; const ancestors = []; /* eslint-enable no-undef-init */ + do { index++; const isLeaving = index === keys.length; @@ -31540,7 +30632,7 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { edits = stack.edits; inArray = stack.inArray; stack = stack.prev; - } else if (parent != null) { + } else if (parent) { key = inArray ? index : keys[index]; node = parent[key]; if (node === null || node === undefined) { @@ -31580,7 +30672,7 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { if (isLeaving) { path.pop(); } else { - var _visitorKeys$node$kin; + var _node$kind; stack = { inArray, index, @@ -31589,10 +30681,10 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { prev: stack }; inArray = Array.isArray(node); - keys = inArray ? node : (_visitorKeys$node$kin = visitorKeys[node.kind]) !== null && _visitorKeys$node$kin !== void 0 ? _visitorKeys$node$kin : []; + keys = inArray ? node : (_node$kind = visitorKeys[node.kind]) !== null && _node$kind !== void 0 ? _node$kind : []; index = -1; edits = []; - if (parent != null) { + if (parent) { ancestors.push(parent); } parent = node; @@ -31600,7 +30692,7 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { } while (stack !== undefined); if (edits.length !== 0) { // New root - return edits.at(-1)[1]; + return edits[edits.length - 1][1]; } return root; } @@ -31610,6 +30702,7 @@ function visit(root, visitor, visitorKeys = _ast.QueryDocumentKeys) { * * If a prior visitor edits a node, no following visitors will see that node. */ + function visitInParallel(visitors) { const skipping = new Array(visitors.length).fill(null); const mergedVisitor = Object.create(null); @@ -31622,7 +30715,7 @@ function visitInParallel(visitors) { enter, leave } = getEnterLeaveForKind(visitors[i], kind); - hasVisitor ||= enter != null || leave != null; + hasVisitor || (hasVisitor = enter != null || leave != null); enterList[i] = enter; leaveList[i] = leave; } @@ -31670,6 +30763,7 @@ function visitInParallel(visitors) { /** * Given a visitor instance and a node kind, return EnterLeaveVisitor for that kind. */ + function getEnterLeaveForKind(visitor, kind) { const kindVisitor = visitor[kind]; if (typeof kindVisitor === 'object') { @@ -31681,13 +30775,29 @@ function getEnterLeaveForKind(visitor, kind) { enter: kindVisitor, leave: undefined }; - } - // { enter() {}, leave() {} } + } // { enter() {}, leave() {} } + return { enter: visitor.enter, leave: visitor.leave }; } +/** + * Given a visitor instance, if it is leaving or not, and a node kind, return + * the function the visitor runtime should call. + * + * @deprecated Please use `getEnterLeaveForKind` instead. Will be removed in v17 + */ + +/* c8 ignore next 8 */ + +function getVisitFn(visitor, kind, isLeaving) { + const { + enter, + leave + } = getEnterLeaveForKind(visitor, kind); + return isLeaving ? leave : enter; +} /***/ }), @@ -31704,12 +30814,16 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.assertEnumValueName = assertEnumValueName; exports.assertName = assertName; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _characterClasses = __webpack_require__(/*! ../language/characterClasses.mjs */ "../../../node_modules/graphql/language/characterClasses.mjs"); /** * Upholds the spec rules about naming. */ + function assertName(name) { + name != null || (0, _devAssert.devAssert)(false, 'Must provide name.'); + typeof name === 'string' || (0, _devAssert.devAssert)(false, 'Expected name to be a string.'); if (name.length === 0) { throw new _GraphQLError.GraphQLError('Expected name to be a non-empty string.'); } @@ -31728,6 +30842,7 @@ function assertName(name) { * * @internal */ + function assertEnumValueName(name) { if (name === 'true' || name === 'false' || name === 'null') { throw new _GraphQLError.GraphQLError(`Enum values cannot be named: ${name}`); @@ -31796,6 +30911,7 @@ var _didYouMean = __webpack_require__(/*! ../jsutils/didYouMean.mjs */ "../../.. var _identityFunc = __webpack_require__(/*! ../jsutils/identityFunc.mjs */ "../../../node_modules/graphql/jsutils/identityFunc.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _instanceOf = __webpack_require__(/*! ../jsutils/instanceOf.mjs */ "../../../node_modules/graphql/jsutils/instanceOf.mjs"); +var _isObjectLike = __webpack_require__(/*! ../jsutils/isObjectLike.mjs */ "../../../node_modules/graphql/jsutils/isObjectLike.mjs"); var _keyMap = __webpack_require__(/*! ../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _keyValMap = __webpack_require__(/*! ../jsutils/keyValMap.mjs */ "../../../node_modules/graphql/jsutils/keyValMap.mjs"); var _mapValue = __webpack_require__(/*! ../jsutils/mapValue.mjs */ "../../../node_modules/graphql/jsutils/mapValue.mjs"); @@ -31818,6 +30934,7 @@ function assertType(type) { /** * There are predicates for each kind of GraphQL type. */ + function isScalarType(type) { return (0, _instanceOf.instanceOf)(type, GraphQLScalarType); } @@ -31890,6 +31007,10 @@ function assertNonNullType(type) { } return type; } +/** + * These types may be used as input types for arguments and directives. + */ + function isInputType(type) { return isScalarType(type) || isEnumType(type) || isInputObjectType(type) || isWrappingType(type) && isInputType(type.ofType); } @@ -31899,6 +31020,10 @@ function assertInputType(type) { } return type; } +/** + * These types may be used as output types as the result of fields. + */ + function isOutputType(type) { return isScalarType(type) || isObjectType(type) || isInterfaceType(type) || isUnionType(type) || isEnumType(type) || isWrappingType(type) && isOutputType(type.ofType); } @@ -31908,6 +31033,10 @@ function assertOutputType(type) { } return type; } +/** + * These types may describe types which may be leaf values. + */ + function isLeafType(type) { return isScalarType(type) || isEnumType(type); } @@ -31917,6 +31046,10 @@ function assertLeafType(type) { } return type; } +/** + * These types may describe the parent context of a selection set. + */ + function isCompositeType(type) { return isObjectType(type) || isInterfaceType(type) || isUnionType(type); } @@ -31926,6 +31059,10 @@ function assertCompositeType(type) { } return type; } +/** + * These types may describe the parent context of a selection set. + */ + function isAbstractType(type) { return isInterfaceType(type) || isUnionType(type); } @@ -31954,8 +31091,10 @@ function assertAbstractType(type) { * }) * ``` */ + class GraphQLList { constructor(ofType) { + isType(ofType) || (0, _devAssert.devAssert)(false, `Expected ${(0, _inspect.inspect)(ofType)} to be a GraphQL type.`); this.ofType = ofType; } get [Symbol.toStringTag]() { @@ -31992,6 +31131,7 @@ class GraphQLList { exports.GraphQLList = GraphQLList; class GraphQLNonNull { constructor(ofType) { + isNullableType(ofType) || (0, _devAssert.devAssert)(false, `Expected ${(0, _inspect.inspect)(ofType)} to be a GraphQL nullable type.`); this.ofType = ofType; } get [Symbol.toStringTag]() { @@ -32004,6 +31144,9 @@ class GraphQLNonNull { return this.toString(); } } +/** + * These types wrap and modify other types + */ exports.GraphQLNonNull = GraphQLNonNull; function isWrappingType(type) { return isListType(type) || isNonNullType(type); @@ -32014,6 +31157,10 @@ function assertWrappingType(type) { } return type; } +/** + * These types can all accept null as a value. + */ + function isNullableType(type) { return isType(type) && !isNonNullType(type); } @@ -32028,6 +31175,10 @@ function getNullableType(type) { return isNonNullType(type) ? type.ofType : type; } } +/** + * These named types do not include modifiers like List or NonNull. + */ + function isNamedType(type) { return isScalarType(type) || isObjectType(type) || isInterfaceType(type) || isUnionType(type) || isEnumType(type) || isInputObjectType(type); } @@ -32046,12 +31197,27 @@ function getNamedType(type) { return unwrappedType; } } +/** + * Used while defining GraphQL types to allow for circular references in + * otherwise immutable type definitions. + */ + function resolveReadonlyArrayThunk(thunk) { return typeof thunk === 'function' ? thunk() : thunk; } function resolveObjMapThunk(thunk) { return typeof thunk === 'function' ? thunk() : thunk; } +/** + * Custom extensions + * + * @remarks + * Use a unique identifier name for your extension, for example the name of + * your library or project. Do not use a shortened identifier as this increases + * the risk of conflicts. We recommend you add at most one extension field, + * an object which can contain all the values you need. + */ + /** * Scalar Type Definition * @@ -32096,6 +31262,8 @@ class GraphQLScalarType { this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN = config.extensionASTNodes) !== null && _config$extensionASTN !== void 0 ? _config$extensionASTN : []; + config.specifiedByURL == null || typeof config.specifiedByURL === 'string' || (0, _devAssert.devAssert)(false, `${this.name} must provide "specifiedByURL" as a string, ` + `but got: ${(0, _inspect.inspect)(config.specifiedByURL)}.`); + config.serialize == null || typeof config.serialize === 'function' || (0, _devAssert.devAssert)(false, `${this.name} must provide "serialize" function. If this custom Scalar is also used as an input type, ensure "parseValue" and "parseLiteral" functions are also provided.`); if (config.parseLiteral) { typeof config.parseValue === 'function' && typeof config.parseLiteral === 'function' || (0, _devAssert.devAssert)(false, `${this.name} must provide both "parseValue" and "parseLiteral" functions.`); } @@ -32123,6 +31291,7 @@ class GraphQLScalarType { return this.toString(); } } + /** * Object Type Definition * @@ -32173,10 +31342,9 @@ class GraphQLObjectType { this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN2 = config.extensionASTNodes) !== null && _config$extensionASTN2 !== void 0 ? _config$extensionASTN2 : []; - // prettier-ignore - // FIXME: blocked by https://github.com/prettier/prettier/issues/14625 - this._fields = defineFieldMap.bind(undefined, config.fields); - this._interfaces = defineInterfaces.bind(undefined, config.interfaces); + this._fields = () => defineFieldMap(config); + this._interfaces = () => defineInterfaces(config); + config.isTypeOf == null || typeof config.isTypeOf === 'function' || (0, _devAssert.devAssert)(false, `${this.name} must provide "isTypeOf" as a function, ` + `but got: ${(0, _inspect.inspect)(config.isTypeOf)}.`); } get [Symbol.toStringTag]() { return 'GraphQLObjectType'; @@ -32213,14 +31381,21 @@ class GraphQLObjectType { } } exports.GraphQLObjectType = GraphQLObjectType; -function defineInterfaces(interfaces) { - return resolveReadonlyArrayThunk(interfaces !== null && interfaces !== void 0 ? interfaces : []); +function defineInterfaces(config) { + var _config$interfaces; + const interfaces = resolveReadonlyArrayThunk((_config$interfaces = config.interfaces) !== null && _config$interfaces !== void 0 ? _config$interfaces : []); + Array.isArray(interfaces) || (0, _devAssert.devAssert)(false, `${config.name} interfaces must be an Array or a function which returns an Array.`); + return interfaces; } -function defineFieldMap(fields) { - const fieldMap = resolveObjMapThunk(fields); +function defineFieldMap(config) { + const fieldMap = resolveObjMapThunk(config.fields); + isPlainObj(fieldMap) || (0, _devAssert.devAssert)(false, `${config.name} fields must be an object with field names as keys or a function which returns such an object.`); return (0, _mapValue.mapValue)(fieldMap, (fieldConfig, fieldName) => { var _fieldConfig$args; + isPlainObj(fieldConfig) || (0, _devAssert.devAssert)(false, `${config.name}.${fieldName} field config must be an object.`); + fieldConfig.resolve == null || typeof fieldConfig.resolve === 'function' || (0, _devAssert.devAssert)(false, `${config.name}.${fieldName} field resolver must be a function if ` + `provided, but got: ${(0, _inspect.inspect)(fieldConfig.resolve)}.`); const argsConfig = (_fieldConfig$args = fieldConfig.args) !== null && _fieldConfig$args !== void 0 ? _fieldConfig$args : {}; + isPlainObj(argsConfig) || (0, _devAssert.devAssert)(false, `${config.name}.${fieldName} args must be an object with argument names as keys.`); return { name: (0, _assertName.assertName)(fieldName), description: fieldConfig.description, @@ -32234,8 +31409,8 @@ function defineFieldMap(fields) { }; }); } -function defineArguments(args) { - return Object.entries(args).map(([argName, argConfig]) => ({ +function defineArguments(config) { + return Object.entries(config).map(([argName, argConfig]) => ({ name: (0, _assertName.assertName)(argName), description: argConfig.description, type: argConfig.type, @@ -32245,6 +31420,9 @@ function defineArguments(args) { astNode: argConfig.astNode })); } +function isPlainObj(obj) { + return (0, _isObjectLike.isObjectLike)(obj) && !Array.isArray(obj); +} function fieldsToFieldsConfig(fields) { return (0, _mapValue.mapValue)(fields, field => ({ description: field.description, @@ -32260,6 +31438,7 @@ function fieldsToFieldsConfig(fields) { /** * @internal */ + function argsToArgsConfig(args) { return (0, _keyValMap.keyValMap)(args, arg => arg.name, arg => ({ description: arg.description, @@ -32273,6 +31452,7 @@ function argsToArgsConfig(args) { function isRequiredArgument(arg) { return isNonNullType(arg.type) && arg.defaultValue === undefined; } + /** * Interface Type Definition * @@ -32301,10 +31481,9 @@ class GraphQLInterfaceType { this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN3 = config.extensionASTNodes) !== null && _config$extensionASTN3 !== void 0 ? _config$extensionASTN3 : []; - // prettier-ignore - // FIXME: blocked by https://github.com/prettier/prettier/issues/14625 - this._fields = defineFieldMap.bind(undefined, config.fields); - this._interfaces = defineInterfaces.bind(undefined, config.interfaces); + this._fields = defineFieldMap.bind(undefined, config); + this._interfaces = defineInterfaces.bind(undefined, config); + config.resolveType == null || typeof config.resolveType === 'function' || (0, _devAssert.devAssert)(false, `${this.name} must provide "resolveType" as a function, ` + `but got: ${(0, _inspect.inspect)(config.resolveType)}.`); } get [Symbol.toStringTag]() { return 'GraphQLInterfaceType'; @@ -32340,6 +31519,7 @@ class GraphQLInterfaceType { return this.toString(); } } + /** * Union Type Definition * @@ -32374,7 +31554,8 @@ class GraphQLUnionType { this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN4 = config.extensionASTNodes) !== null && _config$extensionASTN4 !== void 0 ? _config$extensionASTN4 : []; - this._types = defineTypes.bind(undefined, config.types); + this._types = defineTypes.bind(undefined, config); + config.resolveType == null || typeof config.resolveType === 'function' || (0, _devAssert.devAssert)(false, `${this.name} must provide "resolveType" as a function, ` + `but got: ${(0, _inspect.inspect)(config.resolveType)}.`); } get [Symbol.toStringTag]() { return 'GraphQLUnionType'; @@ -32404,19 +31585,12 @@ class GraphQLUnionType { } } exports.GraphQLUnionType = GraphQLUnionType; -function defineTypes(types) { - return resolveReadonlyArrayThunk(types); -} -function enumValuesFromConfig(values) { - return Object.entries(values).map(([valueName, valueConfig]) => ({ - name: (0, _assertName.assertEnumValueName)(valueName), - description: valueConfig.description, - value: valueConfig.value !== undefined ? valueConfig.value : valueName, - deprecationReason: valueConfig.deprecationReason, - extensions: (0, _toObjMap.toObjMap)(valueConfig.extensions), - astNode: valueConfig.astNode - })); +function defineTypes(config) { + const types = resolveReadonlyArrayThunk(config.types); + Array.isArray(types) || (0, _devAssert.devAssert)(false, `Must provide Array of types or a function which returns such an array for Union ${config.name}.`); + return types; } + /** * Enum Type Definition * @@ -32440,7 +31614,8 @@ function enumValuesFromConfig(values) { * Note: If a value is not provided in a definition, the name of the enum value * will be used as its internal value. */ -class GraphQLEnumType /* */ { +class GraphQLEnumType { + /* */ constructor(config) { var _config$extensionASTN5; this.name = (0, _assertName.assertName)(config.name); @@ -32448,7 +31623,7 @@ class GraphQLEnumType /* */ { this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN5 = config.extensionASTNodes) !== null && _config$extensionASTN5 !== void 0 ? _config$extensionASTN5 : []; - this._values = typeof config.values === 'function' ? config.values : enumValuesFromConfig(config.values); + this._values = typeof config.values === 'function' ? config.values : defineEnumValues(this.name, config.values); this._valueLookup = null; this._nameLookup = null; } @@ -32457,7 +31632,7 @@ class GraphQLEnumType /* */ { } getValues() { if (typeof this._values === 'function') { - this._values = enumValuesFromConfig(this._values()); + this._values = defineEnumValues(this.name, this._values()); } return this._values; } @@ -32467,7 +31642,7 @@ class GraphQLEnumType /* */ { } return this._nameLookup[name]; } - serialize(outputValue /* T */) { + serialize(outputValue) { if (this._valueLookup === null) { this._valueLookup = new Map(this.getValues().map(enumValue => [enumValue.value, enumValue])); } @@ -32477,7 +31652,8 @@ class GraphQLEnumType /* */ { } return enumValue.name; } - parseValue(inputValue) { + parseValue(inputValue) /* T */ + { if (typeof inputValue !== 'string') { const valueStr = (0, _inspect.inspect)(inputValue); throw new _GraphQLError.GraphQLError(`Enum "${this.name}" cannot represent non-string value: ${valueStr}.` + didYouMeanEnumValue(this, valueStr)); @@ -32488,7 +31664,8 @@ class GraphQLEnumType /* */ { } return enumValue.value; } - parseLiteral(valueNode, _variables) { + parseLiteral(valueNode, _variables) /* T */ + { // Note: variables will be resolved to a value before calling this function. if (valueNode.kind !== _kinds.Kind.ENUM) { const valueStr = (0, _printer.print)(valueNode); @@ -32535,6 +31712,21 @@ function didYouMeanEnumValue(enumType, unknownValueStr) { const suggestedValues = (0, _suggestionList.suggestionList)(unknownValueStr, allNames); return (0, _didYouMean.didYouMean)('the enum value', suggestedValues); } +function defineEnumValues(typeName, valueMap) { + isPlainObj(valueMap) || (0, _devAssert.devAssert)(false, `${typeName} values must be an object with value names as keys.`); + return Object.entries(valueMap).map(([valueName, valueConfig]) => { + isPlainObj(valueConfig) || (0, _devAssert.devAssert)(false, `${typeName}.${valueName} must refer to an object with a "value" key ` + `representing an internal value but got: ${(0, _inspect.inspect)(valueConfig)}.`); + return { + name: (0, _assertName.assertEnumValueName)(valueName), + description: valueConfig.description, + value: valueConfig.value !== undefined ? valueConfig.value : valueName, + deprecationReason: valueConfig.deprecationReason, + extensions: (0, _toObjMap.toObjMap)(valueConfig.extensions), + astNode: valueConfig.astNode + }; + }); +} + /** * Input Object Type Definition * @@ -32565,7 +31757,7 @@ class GraphQLInputObjectType { this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN6 = config.extensionASTNodes) !== null && _config$extensionASTN6 !== void 0 ? _config$extensionASTN6 : []; this.isOneOf = (_config$isOneOf = config.isOneOf) !== null && _config$isOneOf !== void 0 ? _config$isOneOf : false; - this._fields = defineInputFieldMap.bind(undefined, config.fields); + this._fields = defineInputFieldMap.bind(undefined, config); } get [Symbol.toStringTag]() { return 'GraphQLInputObjectType'; @@ -32603,17 +31795,21 @@ class GraphQLInputObjectType { } } exports.GraphQLInputObjectType = GraphQLInputObjectType; -function defineInputFieldMap(fields) { - const fieldMap = resolveObjMapThunk(fields); - return (0, _mapValue.mapValue)(fieldMap, (fieldConfig, fieldName) => ({ - name: (0, _assertName.assertName)(fieldName), - description: fieldConfig.description, - type: fieldConfig.type, - defaultValue: fieldConfig.defaultValue, - deprecationReason: fieldConfig.deprecationReason, - extensions: (0, _toObjMap.toObjMap)(fieldConfig.extensions), - astNode: fieldConfig.astNode - })); +function defineInputFieldMap(config) { + const fieldMap = resolveObjMapThunk(config.fields); + isPlainObj(fieldMap) || (0, _devAssert.devAssert)(false, `${config.name} fields must be an object with field names as keys or a function which returns such an object.`); + return (0, _mapValue.mapValue)(fieldMap, (fieldConfig, fieldName) => { + !('resolve' in fieldConfig) || (0, _devAssert.devAssert)(false, `${config.name}.${fieldName} field has a resolve property, but Input Types cannot define resolvers.`); + return { + name: (0, _assertName.assertName)(fieldName), + description: fieldConfig.description, + type: fieldConfig.type, + defaultValue: fieldConfig.defaultValue, + deprecationReason: fieldConfig.deprecationReason, + extensions: (0, _toObjMap.toObjMap)(fieldConfig.extensions), + astNode: fieldConfig.astNode + }; + }); } function isRequiredInputField(field) { return isNonNullType(field.type) && field.defaultValue === undefined; @@ -32632,13 +31828,15 @@ function isRequiredInputField(field) { Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.GraphQLStreamDirective = exports.GraphQLSpecifiedByDirective = exports.GraphQLSkipDirective = exports.GraphQLOneOfDirective = exports.GraphQLIncludeDirective = exports.GraphQLDirective = exports.GraphQLDeprecatedDirective = exports.GraphQLDeferDirective = exports.DEFAULT_DEPRECATION_REASON = void 0; +exports.GraphQLSpecifiedByDirective = exports.GraphQLSkipDirective = exports.GraphQLOneOfDirective = exports.GraphQLIncludeDirective = exports.GraphQLDirective = exports.GraphQLDeprecatedDirective = exports.DEFAULT_DEPRECATION_REASON = void 0; exports.assertDirective = assertDirective; exports.isDirective = isDirective; exports.isSpecifiedDirective = isSpecifiedDirective; exports.specifiedDirectives = void 0; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _instanceOf = __webpack_require__(/*! ../jsutils/instanceOf.mjs */ "../../../node_modules/graphql/jsutils/instanceOf.mjs"); +var _isObjectLike = __webpack_require__(/*! ../jsutils/isObjectLike.mjs */ "../../../node_modules/graphql/jsutils/isObjectLike.mjs"); var _toObjMap = __webpack_require__(/*! ../jsutils/toObjMap.mjs */ "../../../node_modules/graphql/jsutils/toObjMap.mjs"); var _directiveLocation = __webpack_require__(/*! ../language/directiveLocation.mjs */ "../../../node_modules/graphql/language/directiveLocation.mjs"); var _assertName = __webpack_require__(/*! ./assertName.mjs */ "../../../node_modules/graphql/type/assertName.mjs"); @@ -32647,6 +31845,7 @@ var _scalars = __webpack_require__(/*! ./scalars.mjs */ "../../../node_modules/g /** * Test if the given value is a GraphQL directive. */ + function isDirective(directive) { return (0, _instanceOf.instanceOf)(directive, GraphQLDirective); } @@ -32656,6 +31855,16 @@ function assertDirective(directive) { } return directive; } +/** + * Custom extensions + * + * @remarks + * Use a unique identifier name for your extension, for example the name of + * your library or project. Do not use a shortened identifier as this increases + * the risk of conflicts. We recommend you add at most one extension field, + * an object which can contain all the values you need. + */ + /** * Directives are used by the GraphQL runtime as a way of modifying execution * behavior. Type system creators will usually not create these directly. @@ -32669,7 +31878,9 @@ class GraphQLDirective { this.isRepeatable = (_config$isRepeatable = config.isRepeatable) !== null && _config$isRepeatable !== void 0 ? _config$isRepeatable : false; this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; + Array.isArray(config.locations) || (0, _devAssert.devAssert)(false, `@${config.name} locations must be an Array.`); const args = (_config$args = config.args) !== null && _config$args !== void 0 ? _config$args : {}; + (0, _isObjectLike.isObjectLike)(args) && !Array.isArray(args) || (0, _devAssert.devAssert)(false, `@${config.name} args must be an object with argument names as keys.`); this.args = (0, _definition.defineArguments)(args); } get [Symbol.toStringTag]() { @@ -32693,6 +31904,7 @@ class GraphQLDirective { return this.toString(); } } + /** * Used to conditionally include fields or fragments. */ @@ -32711,6 +31923,7 @@ const GraphQLIncludeDirective = exports.GraphQLIncludeDirective = new GraphQLDir /** * Used to conditionally skip (exclude) fields or fragments. */ + const GraphQLSkipDirective = exports.GraphQLSkipDirective = new GraphQLDirective({ name: 'skip', description: 'Directs the executor to skip this field or fragment when the `if` argument is true.', @@ -32722,56 +31935,15 @@ const GraphQLSkipDirective = exports.GraphQLSkipDirective = new GraphQLDirective } } }); -/** - * Used to conditionally defer fragments. - */ -const GraphQLDeferDirective = exports.GraphQLDeferDirective = new GraphQLDirective({ - name: 'defer', - description: 'Directs the executor to defer this fragment when the `if` argument is true or undefined.', - locations: [_directiveLocation.DirectiveLocation.FRAGMENT_SPREAD, _directiveLocation.DirectiveLocation.INLINE_FRAGMENT], - args: { - if: { - type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean), - description: 'Deferred when true or undefined.', - defaultValue: true - }, - label: { - type: _scalars.GraphQLString, - description: 'Unique name' - } - } -}); -/** - * Used to conditionally stream list fields. - */ -const GraphQLStreamDirective = exports.GraphQLStreamDirective = new GraphQLDirective({ - name: 'stream', - description: 'Directs the executor to stream plural fields when the `if` argument is true or undefined.', - locations: [_directiveLocation.DirectiveLocation.FIELD], - args: { - if: { - type: new _definition.GraphQLNonNull(_scalars.GraphQLBoolean), - description: 'Stream when true or undefined.', - defaultValue: true - }, - label: { - type: _scalars.GraphQLString, - description: 'Unique name' - }, - initialCount: { - defaultValue: 0, - type: _scalars.GraphQLInt, - description: 'Number of items to return immediately' - } - } -}); /** * Constant string used for default reason for a deprecation. */ + const DEFAULT_DEPRECATION_REASON = exports.DEFAULT_DEPRECATION_REASON = 'No longer supported'; /** * Used to declare element of a GraphQL schema as deprecated. */ + const GraphQLDeprecatedDirective = exports.GraphQLDeprecatedDirective = new GraphQLDirective({ name: 'deprecated', description: 'Marks an element of a GraphQL schema as no longer supported.', @@ -32787,6 +31959,7 @@ const GraphQLDeprecatedDirective = exports.GraphQLDeprecatedDirective = new Grap /** * Used to provide a URL for specifying the behavior of custom scalar definitions. */ + const GraphQLSpecifiedByDirective = exports.GraphQLSpecifiedByDirective = new GraphQLDirective({ name: 'specifiedBy', description: 'Exposes a URL that specifies the behavior of this scalar.', @@ -32801,6 +31974,7 @@ const GraphQLSpecifiedByDirective = exports.GraphQLSpecifiedByDirective = new Gr /** * Used to indicate an Input Object is a OneOf Input Object. */ + const GraphQLOneOfDirective = exports.GraphQLOneOfDirective = new GraphQLDirective({ name: 'oneOf', description: 'Indicates exactly one field must be supplied and this field must not be `null`.', @@ -32810,6 +31984,7 @@ const GraphQLOneOfDirective = exports.GraphQLOneOfDirective = new GraphQLDirecti /** * The full list of specified directives. */ + const specifiedDirectives = exports.specifiedDirectives = Object.freeze([GraphQLIncludeDirective, GraphQLSkipDirective, GraphQLDeprecatedDirective, GraphQLSpecifiedByDirective, GraphQLOneOfDirective]); function isSpecifiedDirective(directive) { return specifiedDirectives.some(({ @@ -32854,12 +32029,6 @@ Object.defineProperty(exports, "GraphQLBoolean", ({ return _scalars.GraphQLBoolean; } })); -Object.defineProperty(exports, "GraphQLDeferDirective", ({ - enumerable: true, - get: function () { - return _directives.GraphQLDeferDirective; - } -})); Object.defineProperty(exports, "GraphQLDeprecatedDirective", ({ enumerable: true, get: function () { @@ -32962,12 +32131,6 @@ Object.defineProperty(exports, "GraphQLSpecifiedByDirective", ({ return _directives.GraphQLSpecifiedByDirective; } })); -Object.defineProperty(exports, "GraphQLStreamDirective", ({ - enumerable: true, - get: function () { - return _directives.GraphQLStreamDirective; - } -})); Object.defineProperty(exports, "GraphQLString", ({ enumerable: true, get: function () { @@ -33474,7 +32637,7 @@ const __Directive = exports.__Directive = new _definition.GraphQLObjectType({ resolve(field, { includeDeprecated }) { - return includeDeprecated === true ? field.args : field.args.filter(arg => arg.deprecationReason == null); + return includeDeprecated ? field.args : field.args.filter(arg => arg.deprecationReason == null); } } }) @@ -33594,6 +32757,7 @@ const __Type = exports.__Type = new _definition.GraphQLObjectType({ } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered) + false || (0, _invariant.invariant)(false, `Unexpected type: "${(0, _inspect.inspect)(type)}".`); } }, @@ -33603,9 +32767,8 @@ const __Type = exports.__Type = new _definition.GraphQLObjectType({ }, description: { type: _scalars.GraphQLString, - resolve: type => - // FIXME: add test case - /* c8 ignore next */ + resolve: (type // FIXME: add test case + ) => /* c8 ignore next */ 'description' in type ? type.description : undefined }, specifiedByURL: { @@ -33625,7 +32788,7 @@ const __Type = exports.__Type = new _definition.GraphQLObjectType({ }) { if ((0, _definition.isObjectType)(type) || (0, _definition.isInterfaceType)(type)) { const fields = Object.values(type.getFields()); - return includeDeprecated === true ? fields : fields.filter(field => field.deprecationReason == null); + return includeDeprecated ? fields : fields.filter(field => field.deprecationReason == null); } } }, @@ -33660,7 +32823,7 @@ const __Type = exports.__Type = new _definition.GraphQLObjectType({ }) { if ((0, _definition.isEnumType)(type)) { const values = type.getValues(); - return includeDeprecated === true ? values : values.filter(field => field.deprecationReason == null); + return includeDeprecated ? values : values.filter(field => field.deprecationReason == null); } } }, @@ -33677,7 +32840,7 @@ const __Type = exports.__Type = new _definition.GraphQLObjectType({ }) { if ((0, _definition.isInputObjectType)(type)) { const values = Object.values(type.getFields()); - return includeDeprecated === true ? values : values.filter(field => field.deprecationReason == null); + return includeDeprecated ? values : values.filter(field => field.deprecationReason == null); } } }, @@ -33718,7 +32881,7 @@ const __Field = exports.__Field = new _definition.GraphQLObjectType({ resolve(field, { includeDeprecated }) { - return includeDeprecated === true ? field.args : field.args.filter(arg => arg.deprecationReason == null); + return includeDeprecated ? field.args : field.args.filter(arg => arg.deprecationReason == null); } }, type: { @@ -33848,6 +33011,7 @@ const __TypeKind = exports.__TypeKind = new _definition.GraphQLEnumType({ * Note that these are GraphQLField and not GraphQLFieldConfig, * so the format for args is different. */ + const SchemaMetaFieldDef = exports.SchemaMetaFieldDef = { name: '__schema', type: new _definition.GraphQLNonNull(__Schema), @@ -33927,11 +33091,13 @@ var _definition = __webpack_require__(/*! ./definition.mjs */ "../../../node_mod * Maximum possible Int value as per GraphQL Spec (32-bit signed integer). * n.b. This differs from JavaScript's numbers that are IEEE 754 doubles safe up-to 2^53 - 1 * */ + const GRAPHQL_MAX_INT = exports.GRAPHQL_MAX_INT = 2147483647; /** * Minimum possible Int value as per GraphQL Spec (32-bit signed integer). * n.b. This differs from JavaScript's numbers that are IEEE 754 doubles safe starting at -(2^53 - 1) * */ + const GRAPHQL_MIN_INT = exports.GRAPHQL_MIN_INT = -2147483648; const GraphQLInt = exports.GraphQLInt = new _definition.GraphQLScalarType({ name: 'Int', @@ -34002,9 +33168,7 @@ const GraphQLFloat = exports.GraphQLFloat = new _definition.GraphQLScalarType({ }, parseLiteral(valueNode) { if (valueNode.kind !== _kinds.Kind.FLOAT && valueNode.kind !== _kinds.Kind.INT) { - throw new _GraphQLError.GraphQLError(`Float cannot represent non numeric value: ${(0, _printer.print)(valueNode)}`, { - nodes: valueNode - }); + throw new _GraphQLError.GraphQLError(`Float cannot represent non numeric value: ${(0, _printer.print)(valueNode)}`, valueNode); } return parseFloat(valueNode.value); } @@ -34013,9 +33177,9 @@ const GraphQLString = exports.GraphQLString = new _definition.GraphQLScalarType( name: 'String', description: 'The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.', serialize(outputValue) { - const coercedValue = serializeObject(outputValue); - // Serialize string, boolean and number values to a string, but do not + const coercedValue = serializeObject(outputValue); // Serialize string, boolean and number values to a string, but do not // attempt to coerce object, function, symbol, or other types as strings. + if (typeof coercedValue === 'string') { return coercedValue; } @@ -34106,10 +33270,10 @@ function isSpecifiedScalarType(type) { return specifiedScalarTypes.some(({ name }) => type.name === name); -} -// Support serializing objects with custom valueOf() or toJSON() functions - +} // Support serializing objects with custom valueOf() or toJSON() functions - // a common way to represent a complex value which can be represented as // a string (ex: MongoDB id objects). + function serializeObject(outputValue) { if ((0, _isObjectLike.isObjectLike)(outputValue)) { if (typeof outputValue.valueOf === 'function') { @@ -34141,8 +33305,10 @@ Object.defineProperty(exports, "__esModule", ({ exports.GraphQLSchema = void 0; exports.assertSchema = assertSchema; exports.isSchema = isSchema; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _instanceOf = __webpack_require__(/*! ../jsutils/instanceOf.mjs */ "../../../node_modules/graphql/jsutils/instanceOf.mjs"); +var _isObjectLike = __webpack_require__(/*! ../jsutils/isObjectLike.mjs */ "../../../node_modules/graphql/jsutils/isObjectLike.mjs"); var _toObjMap = __webpack_require__(/*! ../jsutils/toObjMap.mjs */ "../../../node_modules/graphql/jsutils/toObjMap.mjs"); var _ast = __webpack_require__(/*! ../language/ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); var _definition = __webpack_require__(/*! ./definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); @@ -34151,6 +33317,7 @@ var _introspection = __webpack_require__(/*! ./introspection.mjs */ "../../../no /** * Test if the given value is a GraphQL schema. */ + function isSchema(schema) { return (0, _instanceOf.instanceOf)(schema, GraphQLSchema); } @@ -34160,6 +33327,16 @@ function assertSchema(schema) { } return schema; } +/** + * Custom extensions + * + * @remarks + * Use a unique identifier name for your extension, for example the name of + * your library or project. Do not use a shortened identifier as this increases + * the risk of conflicts. We recommend you add at most one extension field, + * an object which can contain all the values you need. + */ + /** * Schema Definition * @@ -34229,22 +33406,28 @@ function assertSchema(schema) { * ``` */ class GraphQLSchema { + // Used as a cache for validateSchema(). constructor(config) { var _config$extensionASTN, _config$directives; + // If this schema was built from a source known to be valid, then it may be // marked with assumeValid to avoid an additional type system validation. - this.__validationErrors = config.assumeValid === true ? [] : undefined; + this.__validationErrors = config.assumeValid === true ? [] : undefined; // Check for common mistakes during construction to produce early errors. + + (0, _isObjectLike.isObjectLike)(config) || (0, _devAssert.devAssert)(false, 'Must provide configuration object.'); + !config.types || Array.isArray(config.types) || (0, _devAssert.devAssert)(false, `"types" must be Array if provided but got: ${(0, _inspect.inspect)(config.types)}.`); + !config.directives || Array.isArray(config.directives) || (0, _devAssert.devAssert)(false, '"directives" must be Array if provided but got: ' + `${(0, _inspect.inspect)(config.directives)}.`); this.description = config.description; this.extensions = (0, _toObjMap.toObjMap)(config.extensions); this.astNode = config.astNode; this.extensionASTNodes = (_config$extensionASTN = config.extensionASTNodes) !== null && _config$extensionASTN !== void 0 ? _config$extensionASTN : []; this._queryType = config.query; this._mutationType = config.mutation; - this._subscriptionType = config.subscription; - // Provide specified directives (e.g. @include and @skip) by default. - this._directives = (_config$directives = config.directives) !== null && _config$directives !== void 0 ? _config$directives : _directives.specifiedDirectives; - // To preserve order of user-provided types, we add first to add them to + this._subscriptionType = config.subscription; // Provide specified directives (e.g. @include and @skip) by default. + + this._directives = (_config$directives = config.directives) !== null && _config$directives !== void 0 ? _config$directives : _directives.specifiedDirectives; // To preserve order of user-provided types, we add first to add them to // the set of "collected" types, so `collectReferencedTypes` ignore them. + const allReferencedTypes = new Set(config.types); if (config.types != null) { for (const type of config.types) { @@ -34271,17 +33454,18 @@ class GraphQLSchema { } } } - collectReferencedTypes(_introspection.__Schema, allReferencedTypes); - // Storing the resulting map for reference by the schema. + collectReferencedTypes(_introspection.__Schema, allReferencedTypes); // Storing the resulting map for reference by the schema. + this._typeMap = Object.create(null); - this._subTypeMap = new Map(); - // Keep track of all implementations by interface name. + this._subTypeMap = Object.create(null); // Keep track of all implementations by interface name. + this._implementationsMap = Object.create(null); for (const namedType of allReferencedTypes) { if (namedType == null) { continue; } const typeName = namedType.name; + typeName || (0, _devAssert.devAssert)(false, 'One of the provided types for building the Schema is missing a name.'); if (this._typeMap[typeName] !== undefined) { throw new Error(`Schema must contain uniquely named types but contains multiple types named "${typeName}".`); } @@ -34356,17 +33540,25 @@ class GraphQLSchema { }; } isSubType(abstractType, maybeSubType) { - let set = this._subTypeMap.get(abstractType); - if (set === undefined) { + let map = this._subTypeMap[abstractType.name]; + if (map === undefined) { + map = Object.create(null); if ((0, _definition.isUnionType)(abstractType)) { - set = new Set(abstractType.getTypes()); + for (const type of abstractType.getTypes()) { + map[type.name] = true; + } } else { const implementations = this.getImplementations(abstractType); - set = new Set([...implementations.objects, ...implementations.interfaces]); + for (const type of implementations.objects) { + map[type.name] = true; + } + for (const type of implementations.interfaces) { + map[type.name] = true; + } } - this._subTypeMap.set(abstractType, set); + this._subTypeMap[abstractType.name] = map; } - return set.has(maybeSubType); + return map[maybeSubType.name] !== undefined; } getDirectives() { return this._directives; @@ -34374,33 +33566,6 @@ class GraphQLSchema { getDirective(name) { return this.getDirectives().find(directive => directive.name === name); } - /** - * This method looks up the field on the given type definition. - * It has special casing for the three introspection fields, `__schema`, - * `__type` and `__typename`. - * - * `__typename` is special because it can always be queried as a field, even - * in situations where no other fields are allowed, like on a Union. - * - * `__schema` and `__type` could get automatically added to the query type, - * but that would require mutating type definitions, which would cause issues. - */ - getField(parentType, fieldName) { - switch (fieldName) { - case _introspection.SchemaMetaFieldDef.name: - return this.getQueryType() === parentType ? _introspection.SchemaMetaFieldDef : undefined; - case _introspection.TypeMetaFieldDef.name: - return this.getQueryType() === parentType ? _introspection.TypeMetaFieldDef : undefined; - case _introspection.TypeNameMetaFieldDef.name: - return _introspection.TypeNameMetaFieldDef; - } - // this function is part "hot" path inside executor and check presence - // of 'getFields' is faster than to use `!isUnionType` - if ('getFields' in parentType) { - return parentType.getFields()[fieldName]; - } - return undefined; - } toConfig() { return { description: this.description, @@ -34459,9 +33624,6 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.assertValidSchema = assertValidSchema; exports.validateSchema = validateSchema; -var _AccumulatorMap = __webpack_require__(/*! ../jsutils/AccumulatorMap.mjs */ "../../../node_modules/graphql/jsutils/AccumulatorMap.mjs"); -var _capitalize = __webpack_require__(/*! ../jsutils/capitalize.mjs */ "../../../node_modules/graphql/jsutils/capitalize.mjs"); -var _formatList = __webpack_require__(/*! ../jsutils/formatList.mjs */ "../../../node_modules/graphql/jsutils/formatList.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _ast = __webpack_require__(/*! ../language/ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); @@ -34477,20 +33639,21 @@ var _schema = __webpack_require__(/*! ./schema.mjs */ "../../../node_modules/gra * Validation runs synchronously, returning an array of encountered errors, or * an empty array if no errors were encountered and the Schema is valid. */ + function validateSchema(schema) { // First check to ensure the provided value is in fact a GraphQLSchema. - (0, _schema.assertSchema)(schema); - // If this Schema has already been validated, return the previous results. + (0, _schema.assertSchema)(schema); // If this Schema has already been validated, return the previous results. + if (schema.__validationErrors) { return schema.__validationErrors; - } - // Validate the schema, producing a list of errors. + } // Validate the schema, producing a list of errors. + const context = new SchemaValidationContext(schema); validateRootTypes(context); validateDirectives(context); - validateTypes(context); - // Persist the results of validation before returning to ensure validation + validateTypes(context); // Persist the results of validation before returning to ensure validation // does not run multiple times for this schema. + const errors = context.getErrors(); schema.__validationErrors = errors; return errors; @@ -34499,6 +33662,7 @@ function validateSchema(schema) { * Utility function which asserts a schema is valid by throwing an error if * it is invalid. */ + function assertValidSchema(schema) { const errors = validateSchema(schema); if (errors.length !== 0) { @@ -34522,28 +33686,22 @@ class SchemaValidationContext { } function validateRootTypes(context) { const schema = context.schema; - if (schema.getQueryType() == null) { + const queryType = schema.getQueryType(); + if (!queryType) { context.reportError('Query root type must be provided.', schema.astNode); + } else if (!(0, _definition.isObjectType)(queryType)) { + var _getOperationTypeNode; + context.reportError(`Query root type must be Object type, it cannot be ${(0, _inspect.inspect)(queryType)}.`, (_getOperationTypeNode = getOperationTypeNode(schema, _ast.OperationTypeNode.QUERY)) !== null && _getOperationTypeNode !== void 0 ? _getOperationTypeNode : queryType.astNode); } - const rootTypesMap = new _AccumulatorMap.AccumulatorMap(); - for (const operationType of Object.values(_ast.OperationTypeNode)) { - const rootType = schema.getRootType(operationType); - if (rootType != null) { - if (!(0, _definition.isObjectType)(rootType)) { - var _getOperationTypeNode; - const operationTypeStr = (0, _capitalize.capitalize)(operationType); - const rootTypeStr = (0, _inspect.inspect)(rootType); - context.reportError(operationType === _ast.OperationTypeNode.QUERY ? `${operationTypeStr} root type must be Object type, it cannot be ${rootTypeStr}.` : `${operationTypeStr} root type must be Object type if provided, it cannot be ${rootTypeStr}.`, (_getOperationTypeNode = getOperationTypeNode(schema, operationType)) !== null && _getOperationTypeNode !== void 0 ? _getOperationTypeNode : rootType.astNode); - } else { - rootTypesMap.add(rootType, operationType); - } - } + const mutationType = schema.getMutationType(); + if (mutationType && !(0, _definition.isObjectType)(mutationType)) { + var _getOperationTypeNode2; + context.reportError('Mutation root type must be Object type if provided, it cannot be ' + `${(0, _inspect.inspect)(mutationType)}.`, (_getOperationTypeNode2 = getOperationTypeNode(schema, _ast.OperationTypeNode.MUTATION)) !== null && _getOperationTypeNode2 !== void 0 ? _getOperationTypeNode2 : mutationType.astNode); } - for (const [rootType, operationTypes] of rootTypesMap) { - if (operationTypes.length > 1) { - const operationList = (0, _formatList.andList)(operationTypes); - context.reportError(`All root types must be different, "${rootType.name}" type is used as ${operationList} root types.`, operationTypes.map(operationType => getOperationTypeNode(schema, operationType))); - } + const subscriptionType = schema.getSubscriptionType(); + if (subscriptionType && !(0, _definition.isObjectType)(subscriptionType)) { + var _getOperationTypeNode3; + context.reportError('Subscription root type must be Object type if provided, it cannot be ' + `${(0, _inspect.inspect)(subscriptionType)}.`, (_getOperationTypeNode3 = getOperationTypeNode(schema, _ast.OperationTypeNode.SUBSCRIPTION)) !== null && _getOperationTypeNode3 !== void 0 ? _getOperationTypeNode3 : subscriptionType.astNode); } } function getOperationTypeNode(schema, operation) { @@ -34552,7 +33710,9 @@ function getOperationTypeNode(schema, operation) { // FIXME: https://github.com/graphql/graphql-js/issues/2203 schemaNode => { var _schemaNode$operation; - return /* c8 ignore next */(_schemaNode$operation = schemaNode === null || schemaNode === void 0 ? void 0 : schemaNode.operationTypes) !== null && _schemaNode$operation !== void 0 ? _schemaNode$operation : []; + return /* c8 ignore next */( + (_schemaNode$operation = schemaNode === null || schemaNode === void 0 ? void 0 : schemaNode.operationTypes) !== null && _schemaNode$operation !== void 0 ? _schemaNode$operation : [] + ); }).find(operationNode => operationNode.operation === operation)) === null || _flatMap$find === void 0 ? void 0 : _flatMap$find.type; } function validateDirectives(context) { @@ -34561,17 +33721,15 @@ function validateDirectives(context) { if (!(0, _directives.isDirective)(directive)) { context.reportError(`Expected directive but got: ${(0, _inspect.inspect)(directive)}.`, directive === null || directive === void 0 ? void 0 : directive.astNode); continue; - } - // Ensure they are named correctly. - validateName(context, directive); - if (directive.locations.length === 0) { - context.reportError(`Directive @${directive.name} must include 1 or more locations.`, directive.astNode); - } + } // Ensure they are named correctly. + + validateName(context, directive); // TODO: Ensure proper locations. // Ensure the arguments are valid. + for (const arg of directive.args) { // Ensure they are named correctly. - validateName(context, arg); - // Ensure the type is an input type. + validateName(context, arg); // Ensure the type is an input type. + if (!(0, _definition.isInputType)(arg.type)) { context.reportError(`The type of @${directive.name}(${arg.name}:) must be Input Type ` + `but got: ${(0, _inspect.inspect)(arg.type)}.`, arg.astNode); } @@ -34596,20 +33754,20 @@ function validateTypes(context) { if (!(0, _definition.isNamedType)(type)) { context.reportError(`Expected GraphQL named type but got: ${(0, _inspect.inspect)(type)}.`, type.astNode); continue; - } - // Ensure it is named correctly (excluding introspection types). + } // Ensure it is named correctly (excluding introspection types). + if (!(0, _introspection.isIntrospectionType)(type)) { validateName(context, type); } if ((0, _definition.isObjectType)(type)) { // Ensure fields are valid - validateFields(context, type); - // Ensure objects implement the interfaces they claim to. + validateFields(context, type); // Ensure objects implement the interfaces they claim to. + validateInterfaces(context, type); } else if ((0, _definition.isInterfaceType)(type)) { // Ensure fields are valid. - validateFields(context, type); - // Ensure interfaces implement the interfaces they claim to. + validateFields(context, type); // Ensure interfaces implement the interfaces they claim to. + validateInterfaces(context, type); } else if ((0, _definition.isUnionType)(type)) { // Ensure Unions include valid member types. @@ -34619,32 +33777,32 @@ function validateTypes(context) { validateEnumValues(context, type); } else if ((0, _definition.isInputObjectType)(type)) { // Ensure Input Object fields are valid. - validateInputFields(context, type); - // Ensure Input Objects do not contain non-nullable circular references + validateInputFields(context, type); // Ensure Input Objects do not contain non-nullable circular references + validateInputObjectCircularRefs(type); } } } function validateFields(context, type) { - const fields = Object.values(type.getFields()); - // Objects and Interfaces both must define one or more fields. + const fields = Object.values(type.getFields()); // Objects and Interfaces both must define one or more fields. + if (fields.length === 0) { context.reportError(`Type ${type.name} must define one or more fields.`, [type.astNode, ...type.extensionASTNodes]); } for (const field of fields) { // Ensure they are named correctly. - validateName(context, field); - // Ensure the type is an output type + validateName(context, field); // Ensure the type is an output type + if (!(0, _definition.isOutputType)(field.type)) { var _field$astNode; context.reportError(`The type of ${type.name}.${field.name} must be Output Type ` + `but got: ${(0, _inspect.inspect)(field.type)}.`, (_field$astNode = field.astNode) === null || _field$astNode === void 0 ? void 0 : _field$astNode.type); - } - // Ensure the arguments are valid + } // Ensure the arguments are valid + for (const arg of field.args) { - const argName = arg.name; - // Ensure they are named correctly. - validateName(context, arg); - // Ensure the type is an input type + const argName = arg.name; // Ensure they are named correctly. + + validateName(context, arg); // Ensure the type is an input type + if (!(0, _definition.isInputType)(arg.type)) { var _arg$astNode2; context.reportError(`The type of ${type.name}.${field.name}(${argName}:) must be Input ` + `Type but got: ${(0, _inspect.inspect)(arg.type)}.`, (_arg$astNode2 = arg.astNode) === null || _arg$astNode2 === void 0 ? void 0 : _arg$astNode2.type); @@ -34657,7 +33815,7 @@ function validateFields(context, type) { } } function validateInterfaces(context, type) { - const ifaceTypeNames = new Set(); + const ifaceTypeNames = Object.create(null); for (const iface of type.getInterfaces()) { if (!(0, _definition.isInterfaceType)(iface)) { context.reportError(`Type ${(0, _inspect.inspect)(type)} must only implement Interface types, ` + `it cannot implement ${(0, _inspect.inspect)(iface)}.`, getAllImplementsInterfaceNodes(type, iface)); @@ -34667,51 +33825,50 @@ function validateInterfaces(context, type) { context.reportError(`Type ${type.name} cannot implement itself because it would create a circular reference.`, getAllImplementsInterfaceNodes(type, iface)); continue; } - if (ifaceTypeNames.has(iface.name)) { + if (ifaceTypeNames[iface.name]) { context.reportError(`Type ${type.name} can only implement ${iface.name} once.`, getAllImplementsInterfaceNodes(type, iface)); continue; } - ifaceTypeNames.add(iface.name); + ifaceTypeNames[iface.name] = true; validateTypeImplementsAncestors(context, type, iface); validateTypeImplementsInterface(context, type, iface); } } function validateTypeImplementsInterface(context, type, iface) { - const typeFieldMap = type.getFields(); - // Assert each interface field is implemented. + const typeFieldMap = type.getFields(); // Assert each interface field is implemented. + for (const ifaceField of Object.values(iface.getFields())) { const fieldName = ifaceField.name; - const typeField = typeFieldMap[fieldName]; - // Assert interface field exists on type. - if (typeField == null) { + const typeField = typeFieldMap[fieldName]; // Assert interface field exists on type. + + if (!typeField) { context.reportError(`Interface field ${iface.name}.${fieldName} expected but ${type.name} does not provide it.`, [ifaceField.astNode, type.astNode, ...type.extensionASTNodes]); continue; - } - // Assert interface field type is satisfied by type field type, by being + } // Assert interface field type is satisfied by type field type, by being // a valid subtype. (covariant) + if (!(0, _typeComparators.isTypeSubTypeOf)(context.schema, typeField.type, ifaceField.type)) { var _ifaceField$astNode, _typeField$astNode; context.reportError(`Interface field ${iface.name}.${fieldName} expects type ` + `${(0, _inspect.inspect)(ifaceField.type)} but ${type.name}.${fieldName} ` + `is type ${(0, _inspect.inspect)(typeField.type)}.`, [(_ifaceField$astNode = ifaceField.astNode) === null || _ifaceField$astNode === void 0 ? void 0 : _ifaceField$astNode.type, (_typeField$astNode = typeField.astNode) === null || _typeField$astNode === void 0 ? void 0 : _typeField$astNode.type]); - } - // Assert each interface field arg is implemented. + } // Assert each interface field arg is implemented. + for (const ifaceArg of ifaceField.args) { const argName = ifaceArg.name; - const typeArg = typeField.args.find(arg => arg.name === argName); - // Assert interface field arg exists on object field. + const typeArg = typeField.args.find(arg => arg.name === argName); // Assert interface field arg exists on object field. + if (!typeArg) { context.reportError(`Interface field argument ${iface.name}.${fieldName}(${argName}:) expected but ${type.name}.${fieldName} does not provide it.`, [ifaceArg.astNode, typeField.astNode]); continue; - } - // Assert interface field arg type matches object field arg type. + } // Assert interface field arg type matches object field arg type. // (invariant) // TODO: change to contravariant? + if (!(0, _typeComparators.isEqualType)(ifaceArg.type, typeArg.type)) { var _ifaceArg$astNode, _typeArg$astNode; context.reportError(`Interface field argument ${iface.name}.${fieldName}(${argName}:) ` + `expects type ${(0, _inspect.inspect)(ifaceArg.type)} but ` + `${type.name}.${fieldName}(${argName}:) is type ` + `${(0, _inspect.inspect)(typeArg.type)}.`, [(_ifaceArg$astNode = ifaceArg.astNode) === null || _ifaceArg$astNode === void 0 ? void 0 : _ifaceArg$astNode.type, (_typeArg$astNode = typeArg.astNode) === null || _typeArg$astNode === void 0 ? void 0 : _typeArg$astNode.type]); - } - // TODO: validate default values? - } - // Assert additional arguments must not be required. + } // TODO: validate default values? + } // Assert additional arguments must not be required. + for (const typeArg of typeField.args) { const argName = typeArg.name; const ifaceArg = ifaceField.args.find(arg => arg.name === argName); @@ -34734,13 +33891,13 @@ function validateUnionMembers(context, union) { if (memberTypes.length === 0) { context.reportError(`Union type ${union.name} must define one or more member types.`, [union.astNode, ...union.extensionASTNodes]); } - const includedTypeNames = new Set(); + const includedTypeNames = Object.create(null); for (const memberType of memberTypes) { - if (includedTypeNames.has(memberType.name)) { + if (includedTypeNames[memberType.name]) { context.reportError(`Union type ${union.name} can only include type ${memberType.name} once.`, getUnionMemberTypeNodes(union, memberType.name)); continue; } - includedTypeNames.add(memberType.name); + includedTypeNames[memberType.name] = true; if (!(0, _definition.isObjectType)(memberType)) { context.reportError(`Union type ${union.name} can only include Object types, ` + `it cannot include ${(0, _inspect.inspect)(memberType)}.`, getUnionMemberTypeNodes(union, String(memberType))); } @@ -34760,12 +33917,12 @@ function validateInputFields(context, inputObj) { const fields = Object.values(inputObj.getFields()); if (fields.length === 0) { context.reportError(`Input Object type ${inputObj.name} must define one or more fields.`, [inputObj.astNode, ...inputObj.extensionASTNodes]); - } - // Ensure the arguments are valid + } // Ensure the arguments are valid + for (const field of fields) { // Ensure they are named correctly. - validateName(context, field); - // Ensure the type is an input type + validateName(context, field); // Ensure the type is an input type + if (!(0, _definition.isInputType)(field.type)) { var _field$astNode2; context.reportError(`The type of ${inputObj.name}.${field.name} must be Input Type ` + `but got: ${(0, _inspect.inspect)(field.type)}.`, (_field$astNode2 = field.astNode) === null || _field$astNode2 === void 0 ? void 0 : _field$astNode2.type); @@ -34792,20 +33949,20 @@ function createInputObjectCircularRefsValidator(context) { // Modified copy of algorithm from 'src/validation/rules/NoFragmentCycles.js'. // Tracks already visited types to maintain O(N) and to ensure that cycles // are not redundantly reported. - const visitedTypes = new Set(); - // Array of types nodes used to produce meaningful errors - const fieldPath = []; - // Position in the type path + const visitedTypes = Object.create(null); // Array of types nodes used to produce meaningful errors + + const fieldPath = []; // Position in the type path + const fieldPathIndexByTypeName = Object.create(null); - return detectCycleRecursive; - // This does a straight-forward DFS to find cycles. + return detectCycleRecursive; // This does a straight-forward DFS to find cycles. // It does not terminate when a cycle was found but continues to explore // the graph to find all possible cycles. + function detectCycleRecursive(inputObj) { - if (visitedTypes.has(inputObj)) { + if (visitedTypes[inputObj.name]) { return; } - visitedTypes.add(inputObj); + visitedTypes[inputObj.name] = true; fieldPathIndexByTypeName[inputObj.name] = fieldPath.length; const fields = Object.values(inputObj.getFields()); for (const field of fields) { @@ -34831,11 +33988,13 @@ function getAllImplementsInterfaceNodes(type, iface) { astNode, extensionASTNodes } = type; - const nodes = astNode != null ? [astNode, ...extensionASTNodes] : extensionASTNodes; - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const nodes = astNode != null ? [astNode, ...extensionASTNodes] : extensionASTNodes; // FIXME: https://github.com/graphql/graphql-js/issues/2203 + return nodes.flatMap(typeNode => { var _typeNode$interfaces; - return /* c8 ignore next */(_typeNode$interfaces = typeNode.interfaces) !== null && _typeNode$interfaces !== void 0 ? _typeNode$interfaces : []; + return /* c8 ignore next */( + (_typeNode$interfaces = typeNode.interfaces) !== null && _typeNode$interfaces !== void 0 ? _typeNode$interfaces : [] + ); }).filter(ifaceNode => ifaceNode.name.value === iface.name); } function getUnionMemberTypeNodes(union, typeName) { @@ -34843,11 +34002,13 @@ function getUnionMemberTypeNodes(union, typeName) { astNode, extensionASTNodes } = union; - const nodes = astNode != null ? [astNode, ...extensionASTNodes] : extensionASTNodes; - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const nodes = astNode != null ? [astNode, ...extensionASTNodes] : extensionASTNodes; // FIXME: https://github.com/graphql/graphql-js/issues/2203 + return nodes.flatMap(unionNode => { var _unionNode$types; - return /* c8 ignore next */(_unionNode$types = unionNode.types) !== null && _unionNode$types !== void 0 ? _unionNode$types : []; + return /* c8 ignore next */( + (_unionNode$types = unionNode.types) !== null && _unionNode$types !== void 0 ? _unionNode$types : [] + ); }).filter(typeNode => typeNode.name.value === typeName); } function getDeprecatedDirectiveNode(definitionNode) { @@ -34874,12 +34035,14 @@ var _ast = __webpack_require__(/*! ../language/ast.mjs */ "../../../node_modules var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _visitor = __webpack_require__(/*! ../language/visitor.mjs */ "../../../node_modules/graphql/language/visitor.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); +var _introspection = __webpack_require__(/*! ../type/introspection.mjs */ "../../../node_modules/graphql/type/introspection.mjs"); var _typeFromAST = __webpack_require__(/*! ./typeFromAST.mjs */ "../../../node_modules/graphql/utilities/typeFromAST.mjs"); /** * TypeInfo is a utility class which, given a GraphQL schema, can keep track * of the current field and type definitions at any point in a GraphQL document * AST during a recursive descent by calling `enter(node)` and `leave(node)`. */ + class TypeInfo { constructor(schema, /** @@ -34914,22 +34077,34 @@ class TypeInfo { return 'TypeInfo'; } getType() { - return this._typeStack.at(-1); + if (this._typeStack.length > 0) { + return this._typeStack[this._typeStack.length - 1]; + } } getParentType() { - return this._parentTypeStack.at(-1); + if (this._parentTypeStack.length > 0) { + return this._parentTypeStack[this._parentTypeStack.length - 1]; + } } getInputType() { - return this._inputTypeStack.at(-1); + if (this._inputTypeStack.length > 0) { + return this._inputTypeStack[this._inputTypeStack.length - 1]; + } } getParentInputType() { - return this._inputTypeStack.at(-2); + if (this._inputTypeStack.length > 1) { + return this._inputTypeStack[this._inputTypeStack.length - 2]; + } } getFieldDef() { - return this._fieldDefStack.at(-1); + if (this._fieldDefStack.length > 0) { + return this._fieldDefStack[this._fieldDefStack.length - 1]; + } } getDefaultValue() { - return this._defaultValueStack.at(-1); + if (this._defaultValueStack.length > 0) { + return this._defaultValueStack[this._defaultValueStack.length - 1]; + } } getDirective() { return this._directive; @@ -34941,11 +34116,11 @@ class TypeInfo { return this._enumValue; } enter(node) { - const schema = this._schema; - // Note: many of the types below are explicitly typed as "unknown" to drop + const schema = this._schema; // Note: many of the types below are explicitly typed as "unknown" to drop // any assumptions of a valid schema to ensure runtime types are properly // checked before continuing since TypeInfo is used as part of validation // which occurs before guarantees of schema and document validity. + switch (node.kind) { case _kinds.Kind.SELECTION_SET: { @@ -35011,8 +34186,8 @@ class TypeInfo { case _kinds.Kind.LIST: { const listType = (0, _definition.getNullableType)(this.getInputType()); - const itemType = (0, _definition.isListType)(listType) ? listType.ofType : listType; - // List positions never have a default value. + const itemType = (0, _definition.isListType)(listType) ? listType.ofType : listType; // List positions never have a default value. + this._defaultValueStack.push(undefined); this._inputTypeStack.push((0, _definition.isInputType)(itemType) ? itemType : undefined); break; @@ -35024,7 +34199,7 @@ class TypeInfo { let inputField; if ((0, _definition.isInputObjectType)(objectType)) { inputField = objectType.getFields()[node.name.value]; - if (inputField != null) { + if (inputField) { inputFieldType = inputField.type; } } @@ -35042,8 +34217,7 @@ class TypeInfo { this._enumValue = enumValue; break; } - default: - // Ignore other nodes + default: // Ignore other nodes } } leave(node) { @@ -35079,19 +34253,37 @@ class TypeInfo { case _kinds.Kind.ENUM: this._enumValue = null; break; - default: - // Ignore other nodes + default: // Ignore other nodes } } } + +/** + * Not exactly the same as the executor's definition of getFieldDef, in this + * statically evaluated environment we do not always have an Object type, + * and need to handle Interface and Union types. + */ exports.TypeInfo = TypeInfo; function getFieldDef(schema, parentType, fieldNode) { - return schema.getField(parentType, fieldNode.name.value); + const name = fieldNode.name.value; + if (name === _introspection.SchemaMetaFieldDef.name && schema.getQueryType() === parentType) { + return _introspection.SchemaMetaFieldDef; + } + if (name === _introspection.TypeMetaFieldDef.name && schema.getQueryType() === parentType) { + return _introspection.TypeMetaFieldDef; + } + if (name === _introspection.TypeNameMetaFieldDef.name && (0, _definition.isCompositeType)(parentType)) { + return _introspection.TypeNameMetaFieldDef; + } + if ((0, _definition.isObjectType)(parentType) || (0, _definition.isInterfaceType)(parentType)) { + return parentType.getFields()[name]; + } } /** * Creates a new visitor instance which maintains a provided TypeInfo instance * along with visiting visitor. */ + function visitWithTypeInfo(typeInfo, visitor) { return { enter(...args) { @@ -35124,6 +34316,56 @@ function visitWithTypeInfo(typeInfo, visitor) { /***/ }), +/***/ "../../../node_modules/graphql/utilities/assertValidName.mjs": +/*!*******************************************************************!*\ + !*** ../../../node_modules/graphql/utilities/assertValidName.mjs ***! + \*******************************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports.assertValidName = assertValidName; +exports.isValidNameError = isValidNameError; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); +var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); +var _assertName = __webpack_require__(/*! ../type/assertName.mjs */ "../../../node_modules/graphql/type/assertName.mjs"); +/* c8 ignore start */ + +/** + * Upholds the spec rules about naming. + * @deprecated Please use `assertName` instead. Will be removed in v17 + */ + +function assertValidName(name) { + const error = isValidNameError(name); + if (error) { + throw error; + } + return name; +} +/** + * Returns an Error if a name is invalid. + * @deprecated Please use `assertName` instead. Will be removed in v17 + */ + +function isValidNameError(name) { + typeof name === 'string' || (0, _devAssert.devAssert)(false, 'Expected name to be a string.'); + if (name.startsWith('__')) { + return new _GraphQLError.GraphQLError(`Name "${name}" must not begin with "__", which is reserved by GraphQL introspection.`); + } + try { + (0, _assertName.assertName)(name); + } catch (error) { + return error; + } +} +/* c8 ignore stop */ + +/***/ }), + /***/ "../../../node_modules/graphql/utilities/astFromValue.mjs": /*!****************************************************************!*\ !*** ../../../node_modules/graphql/utilities/astFromValue.mjs ***! @@ -35164,6 +34406,7 @@ var _scalars = __webpack_require__(/*! ../type/scalars.mjs */ "../../../node_mod * | null | NullValue | * */ + function astFromValue(value, type) { if ((0, _definition.isNonNullType)(type)) { const astValue = astFromValue(value, type.ofType); @@ -35171,19 +34414,19 @@ function astFromValue(value, type) { return null; } return astValue; - } - // only explicit null, not undefined, NaN + } // only explicit null, not undefined, NaN + if (value === null) { return { kind: _kinds.Kind.NULL }; - } - // undefined + } // undefined + if (value === undefined) { return null; - } - // Convert JavaScript array to GraphQL list. If the GraphQLType is a list, but + } // Convert JavaScript array to GraphQL list. If the GraphQLType is a list, but // the value is not an array, convert the value using the list's item type. + if ((0, _definition.isListType)(type)) { const itemType = type.ofType; if ((0, _isIterableObject.isIterableObject)(value)) { @@ -35200,9 +34443,9 @@ function astFromValue(value, type) { }; } return astFromValue(value, itemType); - } - // Populate the fields of the input object by creating ASTs from each value + } // Populate the fields of the input object by creating ASTs from each value // in the JavaScript object according to the fields in the input type. + if ((0, _definition.isInputObjectType)(type)) { if (!(0, _isObjectLike.isObjectLike)(value)) { return null; @@ -35232,15 +34475,15 @@ function astFromValue(value, type) { const serialized = type.serialize(value); if (serialized == null) { return null; - } - // Others serialize based on their corresponding JavaScript scalar types. + } // Others serialize based on their corresponding JavaScript scalar types. + if (typeof serialized === 'boolean') { return { kind: _kinds.Kind.BOOLEAN, value: serialized }; - } - // JavaScript numbers can be Int or Float values. + } // JavaScript numbers can be Int or Float values. + if (typeof serialized === 'number' && Number.isFinite(serialized)) { const stringNum = String(serialized); return integerStringRegExp.test(stringNum) ? { @@ -35258,8 +34501,8 @@ function astFromValue(value, type) { kind: _kinds.Kind.ENUM, value: serialized }; - } - // ID types can use Int literals. + } // ID types can use Int literals. + if (type === _scalars.GraphQLID && integerStringRegExp.test(serialized)) { return { kind: _kinds.Kind.INT, @@ -35275,6 +34518,7 @@ function astFromValue(value, type) { } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected input type: ' + (0, _inspect.inspect)(type)); } /** @@ -35282,6 +34526,7 @@ function astFromValue(value, type) { * - NegativeSign? 0 * - NegativeSign? NonZeroDigit ( Digit+ )? */ + const integerStringRegExp = /^-?(?:0|[1-9][0-9]*)$/; /***/ }), @@ -35299,6 +34544,8 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.buildASTSchema = buildASTSchema; exports.buildSchema = buildSchema; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); +var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _parser = __webpack_require__(/*! ../language/parser.mjs */ "../../../node_modules/graphql/language/parser.mjs"); var _directives = __webpack_require__(/*! ../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); var _schema = __webpack_require__(/*! ../type/schema.mjs */ "../../../node_modules/graphql/type/schema.mjs"); @@ -35315,6 +34562,7 @@ var _extendSchema = __webpack_require__(/*! ./extendSchema.mjs */ "../../../node * has no resolve methods, so execution will use default resolvers. */ function buildASTSchema(documentAST, options) { + documentAST != null && documentAST.kind === _kinds.Kind.DOCUMENT || (0, _devAssert.devAssert)(false, 'Must provide valid Document AST.'); if ((options === null || options === void 0 ? void 0 : options.assumeValid) !== true && (options === null || options === void 0 ? void 0 : options.assumeValidSDL) !== true) { (0, _validate.assertValidSDL)(documentAST); } @@ -35360,6 +34608,7 @@ function buildASTSchema(documentAST, options) { * A helper function to build a GraphQLSchema directly from a source * document. */ + function buildSchema(source, options) { const document = (0, _parser.parse)(source, { noLocation: options === null || options === void 0 ? void 0 : options.noLocation, @@ -35408,50 +34657,49 @@ var _valueFromAST = __webpack_require__(/*! ./valueFromAST.mjs */ "../../../node * This function expects a complete introspection result. Don't forget to check * the "errors" field of a server response before calling this function. */ + function buildClientSchema(introspection, options) { - // Even though the `introspection` argument is typed, in most cases it's received - // as an untyped value from the server, so we will do an additional check here. - (0, _isObjectLike.isObjectLike)(introspection) && (0, _isObjectLike.isObjectLike)(introspection.__schema) || (0, _devAssert.devAssert)(false, `Invalid or incomplete introspection result. Ensure that you are passing "data" property of introspection response and no "errors" was returned alongside: ${(0, _inspect.inspect)(introspection)}.`); - // Get the schema from the introspection result. - const schemaIntrospection = introspection.__schema; - // Iterate through all types, getting the type definition for each. - const typeMap = new Map(schemaIntrospection.types.map(typeIntrospection => [typeIntrospection.name, buildType(typeIntrospection)])); - // Include standard types only if they are used. + (0, _isObjectLike.isObjectLike)(introspection) && (0, _isObjectLike.isObjectLike)(introspection.__schema) || (0, _devAssert.devAssert)(false, `Invalid or incomplete introspection result. Ensure that you are passing "data" property of introspection response and no "errors" was returned alongside: ${(0, _inspect.inspect)(introspection)}.`); // Get the schema from the introspection result. + + const schemaIntrospection = introspection.__schema; // Iterate through all types, getting the type definition for each. + + const typeMap = (0, _keyValMap.keyValMap)(schemaIntrospection.types, typeIntrospection => typeIntrospection.name, typeIntrospection => buildType(typeIntrospection)); // Include standard types only if they are used. + for (const stdType of [..._scalars.specifiedScalarTypes, ..._introspection.introspectionTypes]) { - if (typeMap.has(stdType.name)) { - typeMap.set(stdType.name, stdType); + if (typeMap[stdType.name]) { + typeMap[stdType.name] = stdType; } - } - // Get the root Query, Mutation, and Subscription types. - const queryType = schemaIntrospection.queryType != null ? getObjectType(schemaIntrospection.queryType) : null; - const mutationType = schemaIntrospection.mutationType != null ? getObjectType(schemaIntrospection.mutationType) : null; - const subscriptionType = schemaIntrospection.subscriptionType != null ? getObjectType(schemaIntrospection.subscriptionType) : null; - // Get the directives supported by Introspection, assuming empty-set if + } // Get the root Query, Mutation, and Subscription types. + + const queryType = schemaIntrospection.queryType ? getObjectType(schemaIntrospection.queryType) : null; + const mutationType = schemaIntrospection.mutationType ? getObjectType(schemaIntrospection.mutationType) : null; + const subscriptionType = schemaIntrospection.subscriptionType ? getObjectType(schemaIntrospection.subscriptionType) : null; // Get the directives supported by Introspection, assuming empty-set if // directives were not queried for. - const directives = schemaIntrospection.directives != null ? schemaIntrospection.directives.map(buildDirective) : []; - // Then produce and return a Schema with these types. + + const directives = schemaIntrospection.directives ? schemaIntrospection.directives.map(buildDirective) : []; // Then produce and return a Schema with these types. + return new _schema.GraphQLSchema({ description: schemaIntrospection.description, query: queryType, mutation: mutationType, subscription: subscriptionType, - types: [...typeMap.values()], + types: Object.values(typeMap), directives, assumeValid: options === null || options === void 0 ? void 0 : options.assumeValid - }); - // Given a type reference in introspection, return the GraphQLType instance. + }); // Given a type reference in introspection, return the GraphQLType instance. // preferring cached instances before building new instances. + function getType(typeRef) { if (typeRef.kind === _introspection.TypeKind.LIST) { const itemRef = typeRef.ofType; - if (itemRef == null) { + if (!itemRef) { throw new Error('Decorated type deeper than introspection query.'); } return new _definition.GraphQLList(getType(itemRef)); } if (typeRef.kind === _introspection.TypeKind.NON_NULL) { const nullableRef = typeRef.ofType; - if (nullableRef == null) { + if (!nullableRef) { throw new Error('Decorated type deeper than introspection query.'); } const nullableType = getType(nullableRef); @@ -35464,8 +34712,8 @@ function buildClientSchema(introspection, options) { if (!typeName) { throw new Error(`Unknown type reference: ${(0, _inspect.inspect)(typeRef)}.`); } - const type = typeMap.get(typeName); - if (type == null) { + const type = typeMap[typeName]; + if (!type) { throw new Error(`Invalid or incomplete schema, unknown type: ${typeName}. Ensure that a full introspection query is used in order to build a client schema.`); } return type; @@ -35475,9 +34723,9 @@ function buildClientSchema(introspection, options) { } function getInterfaceType(typeRef) { return (0, _definition.assertInterfaceType)(getNamedType(typeRef)); - } - // Given a type's introspection result, construct the correct + } // Given a type's introspection result, construct the correct // GraphQLType instance. + function buildType(type) { // eslint-disable-next-line @typescript-eslint/prefer-optional-chain if (type != null && type.name != null && type.kind != null) { @@ -35514,7 +34762,7 @@ function buildClientSchema(introspection, options) { if (implementingIntrospection.interfaces === null && implementingIntrospection.kind === _introspection.TypeKind.INTERFACE) { return []; } - if (implementingIntrospection.interfaces == null) { + if (!implementingIntrospection.interfaces) { const implementingIntrospectionStr = (0, _inspect.inspect)(implementingIntrospection); throw new Error(`Introspection result missing interfaces: ${implementingIntrospectionStr}.`); } @@ -35537,7 +34785,7 @@ function buildClientSchema(introspection, options) { }); } function buildUnionDef(unionIntrospection) { - if (unionIntrospection.possibleTypes == null) { + if (!unionIntrospection.possibleTypes) { const unionIntrospectionStr = (0, _inspect.inspect)(unionIntrospection); throw new Error(`Introspection result missing possibleTypes: ${unionIntrospectionStr}.`); } @@ -35548,7 +34796,7 @@ function buildClientSchema(introspection, options) { }); } function buildEnumDef(enumIntrospection) { - if (enumIntrospection.enumValues == null) { + if (!enumIntrospection.enumValues) { const enumIntrospectionStr = (0, _inspect.inspect)(enumIntrospection); throw new Error(`Introspection result missing enumValues: ${enumIntrospectionStr}.`); } @@ -35562,7 +34810,7 @@ function buildClientSchema(introspection, options) { }); } function buildInputObjectDef(inputObjectIntrospection) { - if (inputObjectIntrospection.inputFields == null) { + if (!inputObjectIntrospection.inputFields) { const inputObjectIntrospectionStr = (0, _inspect.inspect)(inputObjectIntrospection); throw new Error(`Introspection result missing inputFields: ${inputObjectIntrospectionStr}.`); } @@ -35574,7 +34822,7 @@ function buildClientSchema(introspection, options) { }); } function buildFieldDefMap(typeIntrospection) { - if (typeIntrospection.fields == null) { + if (!typeIntrospection.fields) { throw new Error(`Introspection result missing fields: ${(0, _inspect.inspect)(typeIntrospection)}.`); } return (0, _keyValMap.keyValMap)(typeIntrospection.fields, fieldIntrospection => fieldIntrospection.name, buildField); @@ -35585,7 +34833,7 @@ function buildClientSchema(introspection, options) { const typeStr = (0, _inspect.inspect)(type); throw new Error(`Introspection must provide output type for fields, but received: ${typeStr}.`); } - if (fieldIntrospection.args == null) { + if (!fieldIntrospection.args) { const fieldIntrospectionStr = (0, _inspect.inspect)(fieldIntrospection); throw new Error(`Introspection result missing field args: ${fieldIntrospectionStr}.`); } @@ -35614,11 +34862,11 @@ function buildClientSchema(introspection, options) { }; } function buildDirective(directiveIntrospection) { - if (directiveIntrospection.args == null) { + if (!directiveIntrospection.args) { const directiveIntrospectionStr = (0, _inspect.inspect)(directiveIntrospection); throw new Error(`Introspection result missing directive args: ${directiveIntrospectionStr}.`); } - if (directiveIntrospection.locations == null) { + if (!directiveIntrospection.locations) { const directiveIntrospectionStr = (0, _inspect.inspect)(directiveIntrospection); throw new Error(`Introspection result missing directive locations: ${directiveIntrospectionStr}.`); } @@ -35689,8 +34937,8 @@ function coerceInputValueImpl(inputValue, type, onError, path) { const itemPath = (0, _Path.addPath)(path, index, undefined); return coerceInputValueImpl(itemValue, itemType, onError, itemPath); }); - } - // Lists accept a non-list value as a list of one. + } // Lists accept a non-list value as a list of one. + return [coerceInputValueImpl(inputValue, itemType, onError, path)]; } if ((0, _definition.isInputObjectType)(type)) { @@ -35712,10 +34960,10 @@ function coerceInputValueImpl(inputValue, type, onError, path) { continue; } coercedValue[field.name] = coerceInputValueImpl(fieldValue, field.type, onError, (0, _Path.addPath)(path, field.name, type.name)); - } - // Ensure every provided field is defined. + } // Ensure every provided field is defined. + for (const fieldName of Object.keys(inputValue)) { - if (fieldDefs[fieldName] == null) { + if (!fieldDefs[fieldName]) { const suggestions = (0, _suggestionList.suggestionList)(fieldName, Object.keys(type.getFields())); onError((0, _Path.pathToArray)(path), inputValue, new _GraphQLError.GraphQLError(`Field "${fieldName}" is not defined by type "${type.name}".` + (0, _didYouMean.didYouMean)(suggestions))); } @@ -35734,10 +34982,10 @@ function coerceInputValueImpl(inputValue, type, onError, path) { return coercedValue; } if ((0, _definition.isLeafType)(type)) { - let parseResult; - // Scalars and Enums determine if an input value is valid via parseValue(), + let parseResult; // Scalars and Enums determine if a input value is valid via parseValue(), // which can throw to indicate failure. If it throws, maintain a reference // to the original error. + try { parseResult = type.parseValue(inputValue); } catch (error) { @@ -35757,6 +35005,7 @@ function coerceInputValueImpl(inputValue, type, onError, path) { } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected input type: ' + (0, _inspect.inspect)(type)); } @@ -35780,6 +35029,7 @@ var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_mod * concatenate the ASTs together into batched AST, useful for validating many * GraphQL source files which together represent one conceptual application. */ + function concatAST(documents) { const definitions = []; for (const doc of documents) { @@ -35806,11 +35056,13 @@ Object.defineProperty(exports, "__esModule", ({ })); exports.extendSchema = extendSchema; exports.extendSchemaImpl = extendSchemaImpl; -var _AccumulatorMap = __webpack_require__(/*! ../jsutils/AccumulatorMap.mjs */ "../../../node_modules/graphql/jsutils/AccumulatorMap.mjs"); +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); +var _keyMap = __webpack_require__(/*! ../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _mapValue = __webpack_require__(/*! ../jsutils/mapValue.mjs */ "../../../node_modules/graphql/jsutils/mapValue.mjs"); var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); +var _predicates = __webpack_require__(/*! ../language/predicates.mjs */ "../../../node_modules/graphql/language/predicates.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); var _directives = __webpack_require__(/*! ../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); var _introspection = __webpack_require__(/*! ../type/introspection.mjs */ "../../../node_modules/graphql/type/introspection.mjs"); @@ -35833,6 +35085,7 @@ var _valueFromAST = __webpack_require__(/*! ./valueFromAST.mjs */ "../../../node */ function extendSchema(schema, documentAST, options) { (0, _schema.assertSchema)(schema); + documentAST != null && documentAST.kind === _kinds.Kind.DOCUMENT || (0, _devAssert.devAssert)(false, 'Must provide valid Document AST.'); if ((options === null || options === void 0 ? void 0 : options.assumeValid) !== true && (options === null || options === void 0 ? void 0 : options.assumeValidSDL) !== true) { (0, _validate.assertValidSDLExtension)(documentAST, schema); } @@ -35843,77 +35096,47 @@ function extendSchema(schema, documentAST, options) { /** * @internal */ + function extendSchemaImpl(schemaConfig, documentAST, options) { - var _schemaDef$descriptio, _schemaDef, _schemaDef$descriptio2, _schemaDef2, _options$assumeValid; + var _schemaDef, _schemaDef$descriptio, _schemaDef2, _options$assumeValid; + // Collect the type definitions and extensions found in the document. const typeDefs = []; - const scalarExtensions = new _AccumulatorMap.AccumulatorMap(); - const objectExtensions = new _AccumulatorMap.AccumulatorMap(); - const interfaceExtensions = new _AccumulatorMap.AccumulatorMap(); - const unionExtensions = new _AccumulatorMap.AccumulatorMap(); - const enumExtensions = new _AccumulatorMap.AccumulatorMap(); - const inputObjectExtensions = new _AccumulatorMap.AccumulatorMap(); - // New directives and types are separate because a directives and types can + const typeExtensionsMap = Object.create(null); // New directives and types are separate because a directives and types can // have the same name. For example, a type named "skip". + const directiveDefs = []; - let schemaDef; - // Schema extensions are collected which may add additional operation types. + let schemaDef; // Schema extensions are collected which may add additional operation types. + const schemaExtensions = []; - let isSchemaChanged = false; for (const def of documentAST.definitions) { - switch (def.kind) { - case _kinds.Kind.SCHEMA_DEFINITION: - schemaDef = def; - break; - case _kinds.Kind.SCHEMA_EXTENSION: - schemaExtensions.push(def); - break; - case _kinds.Kind.DIRECTIVE_DEFINITION: - directiveDefs.push(def); - break; - // Type Definitions - case _kinds.Kind.SCALAR_TYPE_DEFINITION: - case _kinds.Kind.OBJECT_TYPE_DEFINITION: - case _kinds.Kind.INTERFACE_TYPE_DEFINITION: - case _kinds.Kind.UNION_TYPE_DEFINITION: - case _kinds.Kind.ENUM_TYPE_DEFINITION: - case _kinds.Kind.INPUT_OBJECT_TYPE_DEFINITION: - typeDefs.push(def); - break; - // Type System Extensions - case _kinds.Kind.SCALAR_TYPE_EXTENSION: - scalarExtensions.add(def.name.value, def); - break; - case _kinds.Kind.OBJECT_TYPE_EXTENSION: - objectExtensions.add(def.name.value, def); - break; - case _kinds.Kind.INTERFACE_TYPE_EXTENSION: - interfaceExtensions.add(def.name.value, def); - break; - case _kinds.Kind.UNION_TYPE_EXTENSION: - unionExtensions.add(def.name.value, def); - break; - case _kinds.Kind.ENUM_TYPE_EXTENSION: - enumExtensions.add(def.name.value, def); - break; - case _kinds.Kind.INPUT_OBJECT_TYPE_EXTENSION: - inputObjectExtensions.add(def.name.value, def); - break; - default: - continue; + if (def.kind === _kinds.Kind.SCHEMA_DEFINITION) { + schemaDef = def; + } else if (def.kind === _kinds.Kind.SCHEMA_EXTENSION) { + schemaExtensions.push(def); + } else if ((0, _predicates.isTypeDefinitionNode)(def)) { + typeDefs.push(def); + } else if ((0, _predicates.isTypeExtensionNode)(def)) { + const extendedTypeName = def.name.value; + const existingTypeExtensions = typeExtensionsMap[extendedTypeName]; + typeExtensionsMap[extendedTypeName] = existingTypeExtensions ? existingTypeExtensions.concat([def]) : [def]; + } else if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) { + directiveDefs.push(def); } - isSchemaChanged = true; - } - // If this document contains no new types, extensions, or directives then + } // If this document contains no new types, extensions, or directives then // return the same unmodified GraphQLSchema instance. - if (!isSchemaChanged) { + + if (Object.keys(typeExtensionsMap).length === 0 && typeDefs.length === 0 && directiveDefs.length === 0 && schemaExtensions.length === 0 && schemaDef == null) { return schemaConfig; } - const typeMap = new Map(schemaConfig.types.map(type => [type.name, extendNamedType(type)])); + const typeMap = Object.create(null); + for (const existingType of schemaConfig.types) { + typeMap[existingType.name] = extendNamedType(existingType); + } for (const typeNode of typeDefs) { - var _stdTypeMap$get; + var _stdTypeMap$name; const name = typeNode.name.value; - typeMap.set(name, (_stdTypeMap$get = stdTypeMap.get(name)) !== null && _stdTypeMap$get !== void 0 ? _stdTypeMap$get : buildType(typeNode)); + typeMap[name] = (_stdTypeMap$name = stdTypeMap[name]) !== null && _stdTypeMap$name !== void 0 ? _stdTypeMap$name : buildType(typeNode); } const operationTypes = { // Get the extended root operation types. @@ -35923,20 +35146,20 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { // Then, incorporate schema definition and all schema extensions. ...(schemaDef && getOperationTypes([schemaDef])), ...getOperationTypes(schemaExtensions) - }; - // Then produce and return a Schema config with these types. + }; // Then produce and return a Schema config with these types. + return { - description: (_schemaDef$descriptio = (_schemaDef = schemaDef) === null || _schemaDef === void 0 ? void 0 : (_schemaDef$descriptio2 = _schemaDef.description) === null || _schemaDef$descriptio2 === void 0 ? void 0 : _schemaDef$descriptio2.value) !== null && _schemaDef$descriptio !== void 0 ? _schemaDef$descriptio : schemaConfig.description, + description: (_schemaDef = schemaDef) === null || _schemaDef === void 0 ? void 0 : (_schemaDef$descriptio = _schemaDef.description) === null || _schemaDef$descriptio === void 0 ? void 0 : _schemaDef$descriptio.value, ...operationTypes, - types: Array.from(typeMap.values()), + types: Object.values(typeMap), directives: [...schemaConfig.directives.map(replaceDirective), ...directiveDefs.map(buildDirective)], - extensions: schemaConfig.extensions, + extensions: Object.create(null), astNode: (_schemaDef2 = schemaDef) !== null && _schemaDef2 !== void 0 ? _schemaDef2 : schemaConfig.astNode, extensionASTNodes: schemaConfig.extensionASTNodes.concat(schemaExtensions), assumeValid: (_options$assumeValid = options === null || options === void 0 ? void 0 : options.assumeValid) !== null && _options$assumeValid !== void 0 ? _options$assumeValid : false - }; - // Below are functions used for producing this schema that have closed over + }; // Below are functions used for producing this schema that have closed over // this scope and have access to the schema, cache, and newly defined types. + function replaceType(type) { if ((0, _definition.isListType)(type)) { // @ts-expect-error @@ -35945,21 +35168,17 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { if ((0, _definition.isNonNullType)(type)) { // @ts-expect-error return new _definition.GraphQLNonNull(replaceType(type.ofType)); - } - // @ts-expect-error FIXME + } // @ts-expect-error FIXME + return replaceNamedType(type); } function replaceNamedType(type) { // Note: While this could make early assertions to get the correctly // typed values, that would throw immediately while type system // validation with validateSchema() will produce more actionable results. - return typeMap.get(type.name); + return typeMap[type.name]; } function replaceDirective(directive) { - if ((0, _directives.isSpecifiedDirective)(directive)) { - // Builtin directives are not extended. - return directive; - } const config = directive.toConfig(); return new _directives.GraphQLDirective({ ...config, @@ -35991,12 +35210,13 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } /* c8 ignore next 3 */ // Not reachable, all possible type definition nodes have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected type: ' + (0, _inspect.inspect)(type)); } function extendInputObjectType(type) { - var _inputObjectExtension; + var _typeExtensionsMap$co; const config = type.toConfig(); - const extensions = (_inputObjectExtension = inputObjectExtensions.get(config.name)) !== null && _inputObjectExtension !== void 0 ? _inputObjectExtension : []; + const extensions = (_typeExtensionsMap$co = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co !== void 0 ? _typeExtensionsMap$co : []; return new _definition.GraphQLInputObjectType({ ...config, fields: () => ({ @@ -36010,9 +35230,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { }); } function extendEnumType(type) { - var _enumExtensions$get; + var _typeExtensionsMap$ty; const config = type.toConfig(); - const extensions = (_enumExtensions$get = enumExtensions.get(type.name)) !== null && _enumExtensions$get !== void 0 ? _enumExtensions$get : []; + const extensions = (_typeExtensionsMap$ty = typeExtensionsMap[type.name]) !== null && _typeExtensionsMap$ty !== void 0 ? _typeExtensionsMap$ty : []; return new _definition.GraphQLEnumType({ ...config, values: { @@ -36023,9 +35243,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { }); } function extendScalarType(type) { - var _scalarExtensions$get; + var _typeExtensionsMap$co2; const config = type.toConfig(); - const extensions = (_scalarExtensions$get = scalarExtensions.get(config.name)) !== null && _scalarExtensions$get !== void 0 ? _scalarExtensions$get : []; + const extensions = (_typeExtensionsMap$co2 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co2 !== void 0 ? _typeExtensionsMap$co2 : []; let specifiedByURL = config.specifiedByURL; for (const extensionNode of extensions) { var _getSpecifiedByURL; @@ -36038,9 +35258,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { }); } function extendObjectType(type) { - var _objectExtensions$get; + var _typeExtensionsMap$co3; const config = type.toConfig(); - const extensions = (_objectExtensions$get = objectExtensions.get(config.name)) !== null && _objectExtensions$get !== void 0 ? _objectExtensions$get : []; + const extensions = (_typeExtensionsMap$co3 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co3 !== void 0 ? _typeExtensionsMap$co3 : []; return new _definition.GraphQLObjectType({ ...config, interfaces: () => [...type.getInterfaces().map(replaceNamedType), ...buildInterfaces(extensions)], @@ -36052,9 +35272,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { }); } function extendInterfaceType(type) { - var _interfaceExtensions$; + var _typeExtensionsMap$co4; const config = type.toConfig(); - const extensions = (_interfaceExtensions$ = interfaceExtensions.get(config.name)) !== null && _interfaceExtensions$ !== void 0 ? _interfaceExtensions$ : []; + const extensions = (_typeExtensionsMap$co4 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co4 !== void 0 ? _typeExtensionsMap$co4 : []; return new _definition.GraphQLInterfaceType({ ...config, interfaces: () => [...type.getInterfaces().map(replaceNamedType), ...buildInterfaces(extensions)], @@ -36066,9 +35286,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { }); } function extendUnionType(type) { - var _unionExtensions$get; + var _typeExtensionsMap$co5; const config = type.toConfig(); - const extensions = (_unionExtensions$get = unionExtensions.get(config.name)) !== null && _unionExtensions$get !== void 0 ? _unionExtensions$get : []; + const extensions = (_typeExtensionsMap$co5 = typeExtensionsMap[config.name]) !== null && _typeExtensionsMap$co5 !== void 0 ? _typeExtensionsMap$co5 : []; return new _definition.GraphQLUnionType({ ...config, types: () => [...type.getTypes().map(replaceNamedType), ...buildUnionTypes(extensions)], @@ -36092,8 +35312,10 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { const opTypes = {}; for (const node of nodes) { var _node$operationTypes; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 - const operationTypesNodes = /* c8 ignore next */(_node$operationTypes = node.operationTypes) !== null && _node$operationTypes !== void 0 ? _node$operationTypes : []; + const operationTypesNodes = /* c8 ignore next */ + (_node$operationTypes = node.operationTypes) !== null && _node$operationTypes !== void 0 ? _node$operationTypes : []; for (const operationType of operationTypesNodes) { // Note: While this could make early assertions to get the correctly // typed values below, that would throw immediately while type system @@ -36105,9 +35327,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { return opTypes; } function getNamedType(node) { - var _stdTypeMap$get2; + var _stdTypeMap$name2; const name = node.name.value; - const type = (_stdTypeMap$get2 = stdTypeMap.get(name)) !== null && _stdTypeMap$get2 !== void 0 ? _stdTypeMap$get2 : typeMap.get(name); + const type = (_stdTypeMap$name2 = stdTypeMap[name]) !== null && _stdTypeMap$name2 !== void 0 ? _stdTypeMap$name2 : typeMap[name]; if (type === undefined) { throw new Error(`Unknown type: "${name}".`); } @@ -36140,8 +35362,10 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { const fieldConfigMap = Object.create(null); for (const node of nodes) { var _node$fields; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 - const nodeFields = /* c8 ignore next */(_node$fields = node.fields) !== null && _node$fields !== void 0 ? _node$fields : []; + const nodeFields = /* c8 ignore next */ + (_node$fields = node.fields) !== null && _node$fields !== void 0 ? _node$fields : []; for (const field of nodeFields) { var _field$description; fieldConfigMap[field.name.value] = { @@ -36160,10 +35384,12 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } function buildArgumentMap(args) { // FIXME: https://github.com/graphql/graphql-js/issues/2203 - const argsNodes = /* c8 ignore next */args !== null && args !== void 0 ? args : []; + const argsNodes = /* c8 ignore next */ + args !== null && args !== void 0 ? args : []; const argConfigMap = Object.create(null); for (const arg of argsNodes) { var _arg$description; + // Note: While this could make assertions to get the correctly typed // value, that would throw immediately while type system validation // with validateSchema() will produce more actionable results. @@ -36182,10 +35408,13 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { const inputFieldMap = Object.create(null); for (const node of nodes) { var _node$fields2; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 - const fieldsNodes = /* c8 ignore next */(_node$fields2 = node.fields) !== null && _node$fields2 !== void 0 ? _node$fields2 : []; + const fieldsNodes = /* c8 ignore next */ + (_node$fields2 = node.fields) !== null && _node$fields2 !== void 0 ? _node$fields2 : []; for (const field of fieldsNodes) { var _field$description2; + // Note: While this could make assertions to get the correctly typed // value, that would throw immediately while type system validation // with validateSchema() will produce more actionable results. @@ -36205,8 +35434,10 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { const enumValueMap = Object.create(null); for (const node of nodes) { var _node$values; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 - const valuesNodes = /* c8 ignore next */(_node$values = node.values) !== null && _node$values !== void 0 ? _node$values : []; + const valuesNodes = /* c8 ignore next */ + (_node$values = node.values) !== null && _node$values !== void 0 ? _node$values : []; for (const value of valuesNodes) { var _value$description; enumValueMap[value.name.value] = { @@ -36227,7 +35458,9 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { // FIXME: https://github.com/graphql/graphql-js/issues/2203 node => { var _node$interfaces$map, _node$interfaces; - return /* c8 ignore next */(_node$interfaces$map = (_node$interfaces = node.interfaces) === null || _node$interfaces === void 0 ? void 0 : _node$interfaces.map(getNamedType)) !== null && _node$interfaces$map !== void 0 ? _node$interfaces$map : []; + return /* c8 ignore next */( + (_node$interfaces$map = (_node$interfaces = node.interfaces) === null || _node$interfaces === void 0 ? void 0 : _node$interfaces.map(getNamedType)) !== null && _node$interfaces$map !== void 0 ? _node$interfaces$map : [] + ); }); } function buildUnionTypes(nodes) { @@ -36239,16 +35472,19 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { // FIXME: https://github.com/graphql/graphql-js/issues/2203 node => { var _node$types$map, _node$types; - return /* c8 ignore next */(_node$types$map = (_node$types = node.types) === null || _node$types === void 0 ? void 0 : _node$types.map(getNamedType)) !== null && _node$types$map !== void 0 ? _node$types$map : []; + return /* c8 ignore next */( + (_node$types$map = (_node$types = node.types) === null || _node$types === void 0 ? void 0 : _node$types.map(getNamedType)) !== null && _node$types$map !== void 0 ? _node$types$map : [] + ); }); } function buildType(astNode) { + var _typeExtensionsMap$na; const name = astNode.name.value; + const extensionASTNodes = (_typeExtensionsMap$na = typeExtensionsMap[name]) !== null && _typeExtensionsMap$na !== void 0 ? _typeExtensionsMap$na : []; switch (astNode.kind) { case _kinds.Kind.OBJECT_TYPE_DEFINITION: { - var _objectExtensions$get2, _astNode$description; - const extensionASTNodes = (_objectExtensions$get2 = objectExtensions.get(name)) !== null && _objectExtensions$get2 !== void 0 ? _objectExtensions$get2 : []; + var _astNode$description; const allNodes = [astNode, ...extensionASTNodes]; return new _definition.GraphQLObjectType({ name, @@ -36261,8 +35497,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } case _kinds.Kind.INTERFACE_TYPE_DEFINITION: { - var _interfaceExtensions$2, _astNode$description2; - const extensionASTNodes = (_interfaceExtensions$2 = interfaceExtensions.get(name)) !== null && _interfaceExtensions$2 !== void 0 ? _interfaceExtensions$2 : []; + var _astNode$description2; const allNodes = [astNode, ...extensionASTNodes]; return new _definition.GraphQLInterfaceType({ name, @@ -36275,8 +35510,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } case _kinds.Kind.ENUM_TYPE_DEFINITION: { - var _enumExtensions$get2, _astNode$description3; - const extensionASTNodes = (_enumExtensions$get2 = enumExtensions.get(name)) !== null && _enumExtensions$get2 !== void 0 ? _enumExtensions$get2 : []; + var _astNode$description3; const allNodes = [astNode, ...extensionASTNodes]; return new _definition.GraphQLEnumType({ name, @@ -36288,8 +35522,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } case _kinds.Kind.UNION_TYPE_DEFINITION: { - var _unionExtensions$get2, _astNode$description4; - const extensionASTNodes = (_unionExtensions$get2 = unionExtensions.get(name)) !== null && _unionExtensions$get2 !== void 0 ? _unionExtensions$get2 : []; + var _astNode$description4; const allNodes = [astNode, ...extensionASTNodes]; return new _definition.GraphQLUnionType({ name, @@ -36301,8 +35534,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } case _kinds.Kind.SCALAR_TYPE_DEFINITION: { - var _scalarExtensions$get2, _astNode$description5; - const extensionASTNodes = (_scalarExtensions$get2 = scalarExtensions.get(name)) !== null && _scalarExtensions$get2 !== void 0 ? _scalarExtensions$get2 : []; + var _astNode$description5; return new _definition.GraphQLScalarType({ name, description: (_astNode$description5 = astNode.description) === null || _astNode$description5 === void 0 ? void 0 : _astNode$description5.value, @@ -36313,8 +35545,7 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } case _kinds.Kind.INPUT_OBJECT_TYPE_DEFINITION: { - var _inputObjectExtension2, _astNode$description6; - const extensionASTNodes = (_inputObjectExtension2 = inputObjectExtensions.get(name)) !== null && _inputObjectExtension2 !== void 0 ? _inputObjectExtension2 : []; + var _astNode$description6; const allNodes = [astNode, ...extensionASTNodes]; return new _definition.GraphQLInputObjectType({ name, @@ -36328,27 +35559,30 @@ function extendSchemaImpl(schemaConfig, documentAST, options) { } } } -const stdTypeMap = new Map([..._scalars.specifiedScalarTypes, ..._introspection.introspectionTypes].map(type => [type.name, type])); +const stdTypeMap = (0, _keyMap.keyMap)([..._scalars.specifiedScalarTypes, ..._introspection.introspectionTypes], type => type.name); /** * Given a field or enum value node, returns the string value for the * deprecation reason. */ + function getDeprecationReason(node) { - const deprecated = (0, _values.getDirectiveValues)(_directives.GraphQLDeprecatedDirective, node); - // @ts-expect-error validated by `getDirectiveValues` + const deprecated = (0, _values.getDirectiveValues)(_directives.GraphQLDeprecatedDirective, node); // @ts-expect-error validated by `getDirectiveValues` + return deprecated === null || deprecated === void 0 ? void 0 : deprecated.reason; } /** * Given a scalar node, returns the string value for the specifiedByURL. */ + function getSpecifiedByURL(node) { - const specifiedBy = (0, _values.getDirectiveValues)(_directives.GraphQLSpecifiedByDirective, node); - // @ts-expect-error validated by `getDirectiveValues` + const specifiedBy = (0, _values.getDirectiveValues)(_directives.GraphQLSpecifiedByDirective, node); // @ts-expect-error validated by `getDirectiveValues` + return specifiedBy === null || specifiedBy === void 0 ? void 0 : specifiedBy.url; } /** * Given an input object node, returns if the node should be OneOf. */ + function isOneOf(node) { return Boolean((0, _values.getDirectiveValues)(_directives.GraphQLOneOfDirective, node)); } @@ -36417,6 +35651,7 @@ function findBreakingChanges(oldSchema, newSchema) { * Given two schemas, returns an Array containing descriptions of all the types * of potentially dangerous changes covered by the other functions down below. */ + function findDangerousChanges(oldSchema, newSchema) { // @ts-expect-error return findSchemaChanges(oldSchema, newSchema).filter(change => change.type in DangerousChangeType); @@ -36685,8 +35920,8 @@ function isChangeSafeForInputObjectFieldOrFieldArg(oldType, newType) { // moving from non-null to nullable of the same underlying type is safe !(0, _definition.isNonNullType)(newType) && isChangeSafeForInputObjectFieldOrFieldArg(oldType.ofType, newType) ); - } - // if they're both named types, see if their names are equivalent + } // if they're both named types, see if their names are equivalent + return (0, _definition.isNamedType)(newType) && oldType.name === newType.name; } function typeKindName(type) { @@ -36710,6 +35945,7 @@ function typeKindName(type) { } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected type: ' + (0, _inspect.inspect)(type)); } function stringifyValue(value, type) { @@ -36912,6 +36148,7 @@ var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_mod * name. If a name is not provided, an operation is only returned if only one is * provided in the document. */ + function getOperationAST(documentAST, operationName) { let operation = null; for (const definition of documentAST.definitions) { @@ -36935,6 +36172,59 @@ function getOperationAST(documentAST, operationName) { /***/ }), +/***/ "../../../node_modules/graphql/utilities/getOperationRootType.mjs": +/*!************************************************************************!*\ + !*** ../../../node_modules/graphql/utilities/getOperationRootType.mjs ***! + \************************************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports.getOperationRootType = getOperationRootType; +var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); +/** + * Extracts the root type of the operation from the schema. + * + * @deprecated Please use `GraphQLSchema.getRootType` instead. Will be removed in v17 + */ +function getOperationRootType(schema, operation) { + if (operation.operation === 'query') { + const queryType = schema.getQueryType(); + if (!queryType) { + throw new _GraphQLError.GraphQLError('Schema does not define the required query root type.', { + nodes: operation + }); + } + return queryType; + } + if (operation.operation === 'mutation') { + const mutationType = schema.getMutationType(); + if (!mutationType) { + throw new _GraphQLError.GraphQLError('Schema is not configured for mutations.', { + nodes: operation + }); + } + return mutationType; + } + if (operation.operation === 'subscription') { + const subscriptionType = schema.getSubscriptionType(); + if (!subscriptionType) { + throw new _GraphQLError.GraphQLError('Schema is not configured for subscriptions.', { + nodes: operation + }); + } + return subscriptionType; + } + throw new _GraphQLError.GraphQLError('Can only have query, mutation and subscription operations.', { + nodes: operation + }); +} + +/***/ }), + /***/ "../../../node_modules/graphql/utilities/index.mjs": /*!*********************************************************!*\ !*** ../../../node_modules/graphql/utilities/index.mjs ***! @@ -36964,6 +36254,12 @@ Object.defineProperty(exports, "TypeInfo", ({ return _TypeInfo.TypeInfo; } })); +Object.defineProperty(exports, "assertValidName", ({ + enumerable: true, + get: function () { + return _assertValidName.assertValidName; + } +})); Object.defineProperty(exports, "astFromValue", ({ enumerable: true, get: function () { @@ -37036,6 +36332,12 @@ Object.defineProperty(exports, "getOperationAST", ({ return _getOperationAST.getOperationAST; } })); +Object.defineProperty(exports, "getOperationRootType", ({ + enumerable: true, + get: function () { + return _getOperationRootType.getOperationRootType; + } +})); Object.defineProperty(exports, "introspectionFromSchema", ({ enumerable: true, get: function () { @@ -37054,18 +36356,18 @@ Object.defineProperty(exports, "isTypeSubTypeOf", ({ return _typeComparators.isTypeSubTypeOf; } })); +Object.defineProperty(exports, "isValidNameError", ({ + enumerable: true, + get: function () { + return _assertValidName.isValidNameError; + } +})); Object.defineProperty(exports, "lexicographicSortSchema", ({ enumerable: true, get: function () { return _lexicographicSortSchema.lexicographicSortSchema; } })); -Object.defineProperty(exports, "printDirective", ({ - enumerable: true, - get: function () { - return _printSchema.printDirective; - } -})); Object.defineProperty(exports, "printIntrospectionSchema", ({ enumerable: true, get: function () { @@ -37122,6 +36424,7 @@ Object.defineProperty(exports, "visitWithTypeInfo", ({ })); var _getIntrospectionQuery = __webpack_require__(/*! ./getIntrospectionQuery.mjs */ "../../../node_modules/graphql/utilities/getIntrospectionQuery.mjs"); var _getOperationAST = __webpack_require__(/*! ./getOperationAST.mjs */ "../../../node_modules/graphql/utilities/getOperationAST.mjs"); +var _getOperationRootType = __webpack_require__(/*! ./getOperationRootType.mjs */ "../../../node_modules/graphql/utilities/getOperationRootType.mjs"); var _introspectionFromSchema = __webpack_require__(/*! ./introspectionFromSchema.mjs */ "../../../node_modules/graphql/utilities/introspectionFromSchema.mjs"); var _buildClientSchema = __webpack_require__(/*! ./buildClientSchema.mjs */ "../../../node_modules/graphql/utilities/buildClientSchema.mjs"); var _buildASTSchema = __webpack_require__(/*! ./buildASTSchema.mjs */ "../../../node_modules/graphql/utilities/buildASTSchema.mjs"); @@ -37138,6 +36441,7 @@ var _concatAST = __webpack_require__(/*! ./concatAST.mjs */ "../../../node_modul var _separateOperations = __webpack_require__(/*! ./separateOperations.mjs */ "../../../node_modules/graphql/utilities/separateOperations.mjs"); var _stripIgnoredCharacters = __webpack_require__(/*! ./stripIgnoredCharacters.mjs */ "../../../node_modules/graphql/utilities/stripIgnoredCharacters.mjs"); var _typeComparators = __webpack_require__(/*! ./typeComparators.mjs */ "../../../node_modules/graphql/utilities/typeComparators.mjs"); +var _assertValidName = __webpack_require__(/*! ./assertValidName.mjs */ "../../../node_modules/graphql/utilities/assertValidName.mjs"); var _findBreakingChanges = __webpack_require__(/*! ./findBreakingChanges.mjs */ "../../../node_modules/graphql/utilities/findBreakingChanges.mjs"); /***/ }), @@ -37167,6 +36471,7 @@ var _getIntrospectionQuery = __webpack_require__(/*! ./getIntrospectionQuery.mjs * This is the inverse of buildClientSchema. The primary use case is outside * of the server context, for instance when doing schema comparisons. */ + function introspectionFromSchema(schema, options) { const optionsWithDefaults = { specifiedByUrl: true, @@ -37181,7 +36486,7 @@ function introspectionFromSchema(schema, options) { schema, document }); - result.errors == null && result.data != null || (0, _invariant.invariant)(false); + !result.errors && result.data || (0, _invariant.invariant)(false); return result.data; } @@ -37201,6 +36506,7 @@ Object.defineProperty(exports, "__esModule", ({ exports.lexicographicSortSchema = lexicographicSortSchema; var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); +var _keyValMap = __webpack_require__(/*! ../jsutils/keyValMap.mjs */ "../../../node_modules/graphql/jsutils/keyValMap.mjs"); var _naturalCompare = __webpack_require__(/*! ../jsutils/naturalCompare.mjs */ "../../../node_modules/graphql/jsutils/naturalCompare.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); var _directives = __webpack_require__(/*! ../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); @@ -37211,12 +36517,13 @@ var _schema = __webpack_require__(/*! ../type/schema.mjs */ "../../../node_modul * * This function returns a sorted copy of the given GraphQLSchema. */ + function lexicographicSortSchema(schema) { const schemaConfig = schema.toConfig(); - const typeMap = new Map(sortByName(schemaConfig.types).map(type => [type.name, sortNamedType(type)])); + const typeMap = (0, _keyValMap.keyValMap)(sortByName(schemaConfig.types), type => type.name, sortNamedType); return new _schema.GraphQLSchema({ ...schemaConfig, - types: Array.from(typeMap.values()), + types: Object.values(typeMap), directives: sortByName(schemaConfig.directives).map(sortDirective), query: replaceMaybeType(schemaConfig.query), mutation: replaceMaybeType(schemaConfig.mutation), @@ -37229,12 +36536,12 @@ function lexicographicSortSchema(schema) { } else if ((0, _definition.isNonNullType)(type)) { // @ts-expect-error return new _definition.GraphQLNonNull(replaceType(type.ofType)); - } - // @ts-expect-error FIXME: TS Conversion + } // @ts-expect-error FIXME: TS Conversion + return replaceNamedType(type); } function replaceNamedType(type) { - return typeMap.get(type.name); + return typeMap[type.name]; } function replaceMaybeType(maybeType) { return maybeType && replaceNamedType(maybeType); @@ -37312,6 +36619,7 @@ function lexicographicSortSchema(schema) { } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected type: ' + (0, _inspect.inspect)(type)); } } @@ -37346,7 +36654,6 @@ function sortBy(array, mapToKey) { Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.printDirective = printDirective; exports.printIntrospectionSchema = printIntrospectionSchema; exports.printSchema = printSchema; exports.printType = printType; @@ -37375,19 +36682,23 @@ function printFilteredSchema(schema, directiveFilter, typeFilter) { return [printSchemaDefinition(schema), ...directives.map(directive => printDirective(directive)), ...types.map(type => printType(type))].filter(Boolean).join('\n\n'); } function printSchemaDefinition(schema) { - const queryType = schema.getQueryType(); - const mutationType = schema.getMutationType(); - const subscriptionType = schema.getSubscriptionType(); - // Special case: When a schema has no root operation types, no valid schema - // definition can be printed. - if (!queryType && !mutationType && !subscriptionType) { + if (schema.description == null && isSchemaOfCommonNames(schema)) { return; } - // Only print a schema definition if there is a description or if it should - // not be omitted because of having default type names. - if (schema.description != null || !hasDefaultRootOperationTypes(schema)) { - return printDescription(schema) + 'schema {\n' + (queryType ? ` query: ${queryType.name}\n` : '') + (mutationType ? ` mutation: ${mutationType.name}\n` : '') + (subscriptionType ? ` subscription: ${subscriptionType.name}\n` : '') + '}'; + const operationTypes = []; + const queryType = schema.getQueryType(); + if (queryType) { + operationTypes.push(` query: ${queryType.name}`); } + const mutationType = schema.getMutationType(); + if (mutationType) { + operationTypes.push(` mutation: ${mutationType.name}`); + } + const subscriptionType = schema.getSubscriptionType(); + if (subscriptionType) { + operationTypes.push(` subscription: ${subscriptionType.name}`); + } + return printDescription(schema) + `schema {\n${operationTypes.join('\n')}\n}`; } /** * GraphQL schema define root types for each type of operation. These types are @@ -37402,16 +36713,23 @@ function printSchemaDefinition(schema) { * } * ``` * - * When using this naming convention, the schema description can be omitted so - * long as these names are only used for operation types. - * - * Note however that if any of these default names are used elsewhere in the - * schema but not as a root operation type, the schema definition must still - * be printed to avoid ambiguity. + * When using this naming convention, the schema description can be omitted. */ -function hasDefaultRootOperationTypes(schema) { - /* eslint-disable eqeqeq */ - return schema.getQueryType() == schema.getType('Query') && schema.getMutationType() == schema.getType('Mutation') && schema.getSubscriptionType() == schema.getType('Subscription'); + +function isSchemaOfCommonNames(schema) { + const queryType = schema.getQueryType(); + if (queryType && queryType.name !== 'Query') { + return false; + } + const mutationType = schema.getMutationType(); + if (mutationType && mutationType.name !== 'Mutation') { + return false; + } + const subscriptionType = schema.getSubscriptionType(); + if (subscriptionType && subscriptionType.name !== 'Subscription') { + return false; + } + return true; } function printType(type) { if ((0, _definition.isScalarType)(type)) { @@ -37434,6 +36752,7 @@ function printType(type) { } /* c8 ignore next 3 */ // Not reachable, all possible types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected type: ' + (0, _inspect.inspect)(type)); } function printScalar(type) { @@ -37472,9 +36791,9 @@ function printBlock(items) { function printArgs(args, indentation = '') { if (args.length === 0) { return ''; - } - // If every arg does not have a description, print them on one line. - if (args.every(arg => arg.description == null)) { + } // If every arg does not have a description, print them on one line. + + if (args.every(arg => !arg.description)) { return '(' + args.map(printInputValue).join(', ') + ')'; } return '(\n' + args.map((arg, i) => printDescription(arg, ' ' + indentation, !i) + ' ' + indentation + printInputValue(arg)).join('\n') + '\n' + indentation + ')'; @@ -37526,7 +36845,7 @@ function printDescription(def, indentation = '', firstInBlock = true) { block: (0, _blockString.isPrintableAsBlockString)(description) }); const prefix = indentation && !firstInBlock ? '\n' + indentation : indentation; - return prefix + blockString.replaceAll('\n', '\n' + indentation) + '\n'; + return prefix + blockString.replace(/\n/g, '\n' + indentation) + '\n'; } /***/ }), @@ -37551,10 +36870,11 @@ var _visitor = __webpack_require__(/*! ../language/visitor.mjs */ "../../../node * which contains a single operation as well the fragment definitions it * refers to. */ + function separateOperations(documentAST) { const operations = []; - const depGraph = Object.create(null); - // Populate metadata and build a dependency graph. + const depGraph = Object.create(null); // Populate metadata and build a dependency graph. + for (const definitionNode of documentAST.definitions) { switch (definitionNode.kind) { case _kinds.Kind.OPERATION_DEFINITION: @@ -37563,22 +36883,21 @@ function separateOperations(documentAST) { case _kinds.Kind.FRAGMENT_DEFINITION: depGraph[definitionNode.name.value] = collectDependencies(definitionNode.selectionSet); break; - default: - // ignore non-executable definitions + default: // ignore non-executable definitions } - } - // For each operation, produce a new synthesized AST which includes only what + } // For each operation, produce a new synthesized AST which includes only what // is necessary for completing that operation. + const separatedDocumentASTs = Object.create(null); for (const operation of operations) { const dependencies = new Set(); for (const fragmentName of collectDependencies(operation.selectionSet)) { collectTransitiveDependencies(dependencies, depGraph, fragmentName); - } - // Provides the empty string for anonymous operations. - const operationName = operation.name ? operation.name.value : ''; - // The list of definition nodes to be included for this operation, sorted + } // Provides the empty string for anonymous operations. + + const operationName = operation.name ? operation.name.value : ''; // The list of definition nodes to be included for this operation, sorted // to retain the same order as the original document. + separatedDocumentASTs[operationName] = { kind: _kinds.Kind.DOCUMENT, definitions: documentAST.definitions.filter(node => node === operation || node.kind === _kinds.Kind.FRAGMENT_DEFINITION && dependencies.has(node.name.value)) @@ -37586,6 +36905,7 @@ function separateOperations(documentAST) { } return separatedDocumentASTs; } + // From a dependency graph, collects a list of transitive dependencies by // recursing through a dependency graph. function collectTransitiveDependencies(collected, depGraph, fromName) { @@ -37632,6 +36952,7 @@ var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_mod * * @internal */ + function sortValueNode(valueNode) { switch (valueNode.kind) { case _kinds.Kind.OBJECT: @@ -37739,6 +37060,7 @@ var _tokenKind = __webpack_require__(/*! ../language/tokenKind.mjs */ "../../../ * """Type description""" type Foo{"""Field description""" bar:String} * ``` */ + function stripIgnoredCharacters(source) { const sourceObj = (0, _source.isSource)(source) ? source : new _source.Source(source); const body = sourceObj.body; @@ -37753,6 +37075,7 @@ function stripIgnoredCharacters(source) { * Also prevent case of non-punctuator token following by spread resulting * in invalid token (e.g. `1...` is invalid Float token). */ + const isNonPunctuator = !(0, _lexer.isPunctuatorTokenKind)(currentToken.kind); if (wasLastAddedTokenNonPunctuator) { if (isNonPunctuator || currentToken.kind === _tokenKind.TokenKind.SPREAD) { @@ -37796,28 +37119,29 @@ function isEqualType(typeA, typeB) { // Equivalent types are equal. if (typeA === typeB) { return true; - } - // If either type is non-null, the other must also be non-null. + } // If either type is non-null, the other must also be non-null. + if ((0, _definition.isNonNullType)(typeA) && (0, _definition.isNonNullType)(typeB)) { return isEqualType(typeA.ofType, typeB.ofType); - } - // If either type is a list, the other must also be a list. + } // If either type is a list, the other must also be a list. + if ((0, _definition.isListType)(typeA) && (0, _definition.isListType)(typeB)) { return isEqualType(typeA.ofType, typeB.ofType); - } - // Otherwise the types are not equal. + } // Otherwise the types are not equal. + return false; } /** * Provided a type and a super type, return true if the first type is either * equal or a subset of the second super type (covariant). */ + function isTypeSubTypeOf(schema, maybeSubType, superType) { // Equivalent type is a valid subtype if (maybeSubType === superType) { return true; - } - // If superType is non-null, maybeSubType must also be non-null. + } // If superType is non-null, maybeSubType must also be non-null. + if ((0, _definition.isNonNullType)(superType)) { if ((0, _definition.isNonNullType)(maybeSubType)) { return isTypeSubTypeOf(schema, maybeSubType.ofType, superType.ofType); @@ -37827,8 +37151,8 @@ function isTypeSubTypeOf(schema, maybeSubType, superType) { if ((0, _definition.isNonNullType)(maybeSubType)) { // If superType is nullable, maybeSubType may be non-null or nullable. return isTypeSubTypeOf(schema, maybeSubType.ofType, superType); - } - // If superType type is a list, maybeSubType type must also be a list. + } // If superType type is a list, maybeSubType type must also be a list. + if ((0, _definition.isListType)(superType)) { if ((0, _definition.isListType)(maybeSubType)) { return isTypeSubTypeOf(schema, maybeSubType.ofType, superType.ofType); @@ -37838,9 +37162,9 @@ function isTypeSubTypeOf(schema, maybeSubType, superType) { if ((0, _definition.isListType)(maybeSubType)) { // If superType is not a list, maybeSubType must also be not a list. return false; - } - // If superType type is an abstract type, check if it is super type of maybeSubType. + } // If superType type is an abstract type, check if it is super type of maybeSubType. // Otherwise, the child type is not a valid subtype of the parent type. + return (0, _definition.isAbstractType)(superType) && ((0, _definition.isInterfaceType)(maybeSubType) || (0, _definition.isObjectType)(maybeSubType)) && schema.isSubType(superType, maybeSubType); } /** @@ -37852,6 +37176,7 @@ function isTypeSubTypeOf(schema, maybeSubType, superType) { * * This function is commutative. */ + function doTypesOverlap(schema, typeA, typeB) { // Equivalent types overlap if (typeA === typeB) { @@ -37862,15 +37187,15 @@ function doTypesOverlap(schema, typeA, typeB) { // If both types are abstract, then determine if there is any intersection // between possible concrete types of each. return schema.getPossibleTypes(typeA).some(type => schema.isSubType(typeB, type)); - } - // Determine if the latter type is a possible concrete type of the former. + } // Determine if the latter type is a possible concrete type of the former. + return schema.isSubType(typeA, typeB); } if ((0, _definition.isAbstractType)(typeB)) { // Determine if the former type is a possible concrete type of the latter. return schema.isSubType(typeB, typeA); - } - // Otherwise the types do not overlap. + } // Otherwise the types do not overlap. + return false; } @@ -37923,6 +37248,7 @@ Object.defineProperty(exports, "__esModule", ({ exports.valueFromAST = valueFromAST; var _inspect = __webpack_require__(/*! ../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); var _invariant = __webpack_require__(/*! ../jsutils/invariant.mjs */ "../../../node_modules/graphql/jsutils/invariant.mjs"); +var _keyMap = __webpack_require__(/*! ../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); /** @@ -37945,6 +37271,7 @@ var _definition = __webpack_require__(/*! ../type/definition.mjs */ "../../../no * | NullValue | null | * */ + function valueFromAST(valueNode, type, variables) { if (!valueNode) { // When there is no node, then there is also no value. @@ -37960,10 +37287,10 @@ function valueFromAST(valueNode, type, variables) { const variableValue = variables[variableName]; if (variableValue === null && (0, _definition.isNonNullType)(type)) { return; // Invalid: intentionally return no value. - } - // Note: This does no further checking that this variable is correct. + } // Note: This does no further checking that this variable is correct. // This assumes that this query has been validated and the variable // usage here is of the correct type. + return variableValue; } if ((0, _definition.isNonNullType)(type)) { @@ -38009,10 +37336,10 @@ function valueFromAST(valueNode, type, variables) { return; // Invalid: intentionally return no value. } const coercedObj = Object.create(null); - const fieldNodes = new Map(valueNode.fields.map(field => [field.name.value, field])); + const fieldNodes = (0, _keyMap.keyMap)(valueNode.fields, field => field.name.value); for (const field of Object.values(type.getFields())) { - const fieldNode = fieldNodes.get(field.name); - if (fieldNode == null || isMissingVariable(fieldNode.value, variables)) { + const fieldNode = fieldNodes[field.name]; + if (!fieldNode || isMissingVariable(fieldNode.value, variables)) { if (field.defaultValue !== undefined) { coercedObj[field.name] = field.defaultValue; } else if ((0, _definition.isNonNullType)(field.type)) { @@ -38054,10 +37381,11 @@ function valueFromAST(valueNode, type, variables) { } /* c8 ignore next 3 */ // Not reachable, all possible input types have been considered. + false || (0, _invariant.invariant)(false, 'Unexpected input type: ' + (0, _inspect.inspect)(type)); -} -// Returns true if the provided valueNode is a variable which is not defined +} // Returns true if the provided valueNode is a variable which is not defined // in the set of variables. + function isMissingVariable(valueNode, variables) { return valueNode.kind === _kinds.Kind.VARIABLE && (variables == null || variables[valueNode.name.value] === undefined); } @@ -38094,6 +37422,7 @@ var _kinds = __webpack_require__(/*! ../language/kinds.mjs */ "../../../node_mod * | Null | null | * */ + function valueFromASTUntyped(valueNode, variables) { switch (valueNode.kind) { case _kinds.Kind.NULL: @@ -38192,14 +37521,14 @@ class ASTValidationContext { let fragments = this._recursivelyReferencedFragments.get(operation); if (!fragments) { fragments = []; - const collectedNames = new Set(); + const collectedNames = Object.create(null); const nodesToVisit = [operation.selectionSet]; let node; while (node = nodesToVisit.pop()) { for (const spread of this.getFragmentSpreads(node)) { const fragName = spread.name.value; - if (!collectedNames.has(fragName)) { - collectedNames.add(fragName); + if (collectedNames[fragName] !== true) { + collectedNames[fragName] = true; const fragment = this.getFragment(fragName); if (fragment) { fragments.push(fragment); @@ -38312,24 +37641,6 @@ exports.ValidationContext = ValidationContext; Object.defineProperty(exports, "__esModule", ({ value: true })); -Object.defineProperty(exports, "DeferStreamDirectiveLabelRule", ({ - enumerable: true, - get: function () { - return _DeferStreamDirectiveLabelRule.DeferStreamDirectiveLabelRule; - } -})); -Object.defineProperty(exports, "DeferStreamDirectiveOnRootFieldRule", ({ - enumerable: true, - get: function () { - return _DeferStreamDirectiveOnRootFieldRule.DeferStreamDirectiveOnRootFieldRule; - } -})); -Object.defineProperty(exports, "DeferStreamDirectiveOnValidOperationsRule", ({ - enumerable: true, - get: function () { - return _DeferStreamDirectiveOnValidOperationsRule.DeferStreamDirectiveOnValidOperationsRule; - } -})); Object.defineProperty(exports, "ExecutableDefinitionsRule", ({ enumerable: true, get: function () { @@ -38462,12 +37773,6 @@ Object.defineProperty(exports, "SingleFieldSubscriptionsRule", ({ return _SingleFieldSubscriptionsRule.SingleFieldSubscriptionsRule; } })); -Object.defineProperty(exports, "StreamDirectiveOnListFieldRule", ({ - enumerable: true, - get: function () { - return _StreamDirectiveOnListFieldRule.StreamDirectiveOnListFieldRule; - } -})); Object.defineProperty(exports, "UniqueArgumentDefinitionNamesRule", ({ enumerable: true, get: function () { @@ -38585,9 +37890,6 @@ Object.defineProperty(exports, "validate", ({ var _validate = __webpack_require__(/*! ./validate.mjs */ "../../../node_modules/graphql/validation/validate.mjs"); var _ValidationContext = __webpack_require__(/*! ./ValidationContext.mjs */ "../../../node_modules/graphql/validation/ValidationContext.mjs"); var _specifiedRules = __webpack_require__(/*! ./specifiedRules.mjs */ "../../../node_modules/graphql/validation/specifiedRules.mjs"); -var _DeferStreamDirectiveLabelRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveLabelRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveLabelRule.mjs"); -var _DeferStreamDirectiveOnRootFieldRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveOnRootFieldRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnRootFieldRule.mjs"); -var _DeferStreamDirectiveOnValidOperationsRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveOnValidOperationsRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnValidOperationsRule.mjs"); var _ExecutableDefinitionsRule = __webpack_require__(/*! ./rules/ExecutableDefinitionsRule.mjs */ "../../../node_modules/graphql/validation/rules/ExecutableDefinitionsRule.mjs"); var _FieldsOnCorrectTypeRule = __webpack_require__(/*! ./rules/FieldsOnCorrectTypeRule.mjs */ "../../../node_modules/graphql/validation/rules/FieldsOnCorrectTypeRule.mjs"); var _FragmentsOnCompositeTypesRule = __webpack_require__(/*! ./rules/FragmentsOnCompositeTypesRule.mjs */ "../../../node_modules/graphql/validation/rules/FragmentsOnCompositeTypesRule.mjs"); @@ -38605,7 +37907,6 @@ var _PossibleFragmentSpreadsRule = __webpack_require__(/*! ./rules/PossibleFragm var _ProvidedRequiredArgumentsRule = __webpack_require__(/*! ./rules/ProvidedRequiredArgumentsRule.mjs */ "../../../node_modules/graphql/validation/rules/ProvidedRequiredArgumentsRule.mjs"); var _ScalarLeafsRule = __webpack_require__(/*! ./rules/ScalarLeafsRule.mjs */ "../../../node_modules/graphql/validation/rules/ScalarLeafsRule.mjs"); var _SingleFieldSubscriptionsRule = __webpack_require__(/*! ./rules/SingleFieldSubscriptionsRule.mjs */ "../../../node_modules/graphql/validation/rules/SingleFieldSubscriptionsRule.mjs"); -var _StreamDirectiveOnListFieldRule = __webpack_require__(/*! ./rules/StreamDirectiveOnListFieldRule.mjs */ "../../../node_modules/graphql/validation/rules/StreamDirectiveOnListFieldRule.mjs"); var _UniqueArgumentNamesRule = __webpack_require__(/*! ./rules/UniqueArgumentNamesRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueArgumentNamesRule.mjs"); var _UniqueDirectivesPerLocationRule = __webpack_require__(/*! ./rules/UniqueDirectivesPerLocationRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueDirectivesPerLocationRule.mjs"); var _UniqueFragmentNamesRule = __webpack_require__(/*! ./rules/UniqueFragmentNamesRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueFragmentNamesRule.mjs"); @@ -38629,182 +37930,6 @@ var _NoSchemaIntrospectionCustomRule = __webpack_require__(/*! ./rules/custom/No /***/ }), -/***/ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveLabelRule.mjs": -/*!****************************************************************************************!*\ - !*** ../../../node_modules/graphql/validation/rules/DeferStreamDirectiveLabelRule.mjs ***! - \****************************************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.DeferStreamDirectiveLabelRule = DeferStreamDirectiveLabelRule; -var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); -var _kinds = __webpack_require__(/*! ../../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); -var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); -/** - * Defer and stream directive labels are unique - * - * A GraphQL document is only valid if defer and stream directives' label argument is static and unique. - */ -function DeferStreamDirectiveLabelRule(context) { - const knownLabels = new Map(); - return { - Directive(node) { - if (node.name.value === _directives.GraphQLDeferDirective.name || node.name.value === _directives.GraphQLStreamDirective.name) { - var _node$arguments; - const labelArgument = (_node$arguments = node.arguments) === null || _node$arguments === void 0 ? void 0 : _node$arguments.find(arg => arg.name.value === 'label'); - const labelValue = labelArgument === null || labelArgument === void 0 ? void 0 : labelArgument.value; - if (!labelValue) { - return; - } - if (labelValue.kind !== _kinds.Kind.STRING) { - context.reportError(new _GraphQLError.GraphQLError(`Directive "${node.name.value}"'s label argument must be a static string.`, { - nodes: node - })); - return; - } - const knownLabel = knownLabels.get(labelValue.value); - if (knownLabel != null) { - context.reportError(new _GraphQLError.GraphQLError('Defer/Stream directive label argument must be unique.', { - nodes: [knownLabel, node] - })); - } else { - knownLabels.set(labelValue.value, node); - } - } - } - }; -} - -/***/ }), - -/***/ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnRootFieldRule.mjs": -/*!**********************************************************************************************!*\ - !*** ../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnRootFieldRule.mjs ***! - \**********************************************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.DeferStreamDirectiveOnRootFieldRule = DeferStreamDirectiveOnRootFieldRule; -var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); -var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); -/** - * Defer and stream directives are used on valid root field - * - * A GraphQL document is only valid if defer directives are not used on root mutation or subscription types. - */ -function DeferStreamDirectiveOnRootFieldRule(context) { - return { - Directive(node) { - const mutationType = context.getSchema().getMutationType(); - const subscriptionType = context.getSchema().getSubscriptionType(); - const parentType = context.getParentType(); - if (parentType && node.name.value === _directives.GraphQLDeferDirective.name) { - if (mutationType && parentType === mutationType) { - context.reportError(new _GraphQLError.GraphQLError(`Defer directive cannot be used on root mutation type "${parentType.name}".`, { - nodes: node - })); - } - if (subscriptionType && parentType === subscriptionType) { - context.reportError(new _GraphQLError.GraphQLError(`Defer directive cannot be used on root subscription type "${parentType.name}".`, { - nodes: node - })); - } - } - if (parentType && node.name.value === _directives.GraphQLStreamDirective.name) { - if (mutationType && parentType === mutationType) { - context.reportError(new _GraphQLError.GraphQLError(`Stream directive cannot be used on root mutation type "${parentType.name}".`, { - nodes: node - })); - } - if (subscriptionType && parentType === subscriptionType) { - context.reportError(new _GraphQLError.GraphQLError(`Stream directive cannot be used on root subscription type "${parentType.name}".`, { - nodes: node - })); - } - } - } - }; -} - -/***/ }), - -/***/ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnValidOperationsRule.mjs": -/*!****************************************************************************************************!*\ - !*** ../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnValidOperationsRule.mjs ***! - \****************************************************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.DeferStreamDirectiveOnValidOperationsRule = DeferStreamDirectiveOnValidOperationsRule; -var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); -var _ast = __webpack_require__(/*! ../../language/ast.mjs */ "../../../node_modules/graphql/language/ast.mjs"); -var _kinds = __webpack_require__(/*! ../../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); -var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); -function ifArgumentCanBeFalse(node) { - var _node$arguments; - const ifArgument = (_node$arguments = node.arguments) === null || _node$arguments === void 0 ? void 0 : _node$arguments.find(arg => arg.name.value === 'if'); - if (!ifArgument) { - return false; - } - if (ifArgument.value.kind === _kinds.Kind.BOOLEAN) { - if (ifArgument.value.value) { - return false; - } - } else if (ifArgument.value.kind !== _kinds.Kind.VARIABLE) { - return false; - } - return true; -} -/** - * Defer And Stream Directives Are Used On Valid Operations - * - * A GraphQL document is only valid if defer directives are not used on root mutation or subscription types. - */ -function DeferStreamDirectiveOnValidOperationsRule(context) { - const fragmentsUsedOnSubscriptions = new Set(); - return { - OperationDefinition(operation) { - if (operation.operation === _ast.OperationTypeNode.SUBSCRIPTION) { - for (const fragment of context.getRecursivelyReferencedFragments(operation)) { - fragmentsUsedOnSubscriptions.add(fragment.name.value); - } - } - }, - Directive(node, _key, _parent, _path, ancestors) { - const definitionNode = ancestors[2]; - if ('kind' in definitionNode && (definitionNode.kind === _kinds.Kind.FRAGMENT_DEFINITION && fragmentsUsedOnSubscriptions.has(definitionNode.name.value) || definitionNode.kind === _kinds.Kind.OPERATION_DEFINITION && definitionNode.operation === _ast.OperationTypeNode.SUBSCRIPTION)) { - if (node.name.value === _directives.GraphQLDeferDirective.name) { - if (!ifArgumentCanBeFalse(node)) { - context.reportError(new _GraphQLError.GraphQLError('Defer directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.', { - nodes: node - })); - } - } else if (node.name.value === _directives.GraphQLStreamDirective.name) { - if (!ifArgumentCanBeFalse(node)) { - context.reportError(new _GraphQLError.GraphQLError('Stream directive not supported on subscription operations. Disable `@stream` by setting the `if` argument to `false`.', { - nodes: node - })); - } - } - } - } - }; -} - -/***/ }), - /***/ "../../../node_modules/graphql/validation/rules/ExecutableDefinitionsRule.mjs": /*!************************************************************************************!*\ !*** ../../../node_modules/graphql/validation/rules/ExecutableDefinitionsRule.mjs ***! @@ -38880,14 +38005,14 @@ function FieldsOnCorrectTypeRule(context) { if (!fieldDef) { // This field doesn't exist, lets look for suggestions. const schema = context.getSchema(); - const fieldName = node.name.value; - // First determine if there are any suggested types to condition on. - let suggestion = (0, _didYouMean.didYouMean)('to use an inline fragment on', getSuggestedTypeNames(schema, type, fieldName)); - // If there are no suggested types, then perhaps this was a typo? + const fieldName = node.name.value; // First determine if there are any suggested types to condition on. + + let suggestion = (0, _didYouMean.didYouMean)('to use an inline fragment on', getSuggestedTypeNames(schema, type, fieldName)); // If there are no suggested types, then perhaps this was a typo? + if (suggestion === '') { suggestion = (0, _didYouMean.didYouMean)(getSuggestedFieldNames(type, fieldName)); - } - // Report an error, including helpful suggestions. + } // Report an error, including helpful suggestions. + context.reportError(new _GraphQLError.GraphQLError(`Cannot query field "${fieldName}" on type "${type.name}".` + suggestion, { nodes: node })); @@ -38901,6 +38026,7 @@ function FieldsOnCorrectTypeRule(context) { * they implement. If any of those types include the provided field, suggest them, * sorted by how often the type is referenced. */ + function getSuggestedTypeNames(schema, type, fieldName) { if (!(0, _definition.isAbstractType)(type)) { // Must be an Object type, which does not have possible fields. @@ -38909,18 +38035,18 @@ function getSuggestedTypeNames(schema, type, fieldName) { const suggestedTypes = new Set(); const usageCount = Object.create(null); for (const possibleType of schema.getPossibleTypes(type)) { - if (possibleType.getFields()[fieldName] == null) { + if (!possibleType.getFields()[fieldName]) { continue; - } - // This object type defines this field. + } // This object type defines this field. + suggestedTypes.add(possibleType); usageCount[possibleType.name] = 1; for (const possibleInterface of possibleType.getInterfaces()) { var _usageCount$possibleI; - if (possibleInterface.getFields()[fieldName] == null) { + if (!possibleInterface.getFields()[fieldName]) { continue; - } - // This interface type defines this field. + } // This interface type defines this field. + suggestedTypes.add(possibleInterface); usageCount[possibleInterface.name] = ((_usageCount$possibleI = usageCount[possibleInterface.name]) !== null && _usageCount$possibleI !== void 0 ? _usageCount$possibleI : 0) + 1; } @@ -38930,8 +38056,8 @@ function getSuggestedTypeNames(schema, type, fieldName) { const usageCountDiff = usageCount[typeB.name] - usageCount[typeA.name]; if (usageCountDiff !== 0) { return usageCountDiff; - } - // Suggest super types first followed by subtypes + } // Suggest super types first followed by subtypes + if ((0, _definition.isInterfaceType)(typeA) && schema.isSubType(typeA, typeB)) { return -1; } @@ -38945,12 +38071,13 @@ function getSuggestedTypeNames(schema, type, fieldName) { * For the field name provided, determine if there are any similar field names * that may be the result of a typo. */ + function getSuggestedFieldNames(type, fieldName) { if ((0, _definition.isObjectType)(type) || (0, _definition.isInterfaceType)(type)) { const possibleFieldNames = Object.keys(type.getFields()); return (0, _suggestionList.suggestionList)(fieldName, possibleFieldNames); - } - // Otherwise, must be a Union type, which does not define fields. + } // Otherwise, must be a Union type, which does not define fields. + return []; } @@ -39058,28 +38185,31 @@ function KnownArgumentNamesRule(context) { /** * @internal */ + function KnownArgumentNamesOnDirectivesRule(context) { - const directiveArgs = new Map(); + const directiveArgs = Object.create(null); const schema = context.getSchema(); const definedDirectives = schema ? schema.getDirectives() : _directives.specifiedDirectives; for (const directive of definedDirectives) { - directiveArgs.set(directive.name, directive.args.map(arg => arg.name)); + directiveArgs[directive.name] = directive.args.map(arg => arg.name); } const astDefinitions = context.getDocument().definitions; for (const def of astDefinitions) { if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) { var _def$arguments; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const argsNodes = (_def$arguments = def.arguments) !== null && _def$arguments !== void 0 ? _def$arguments : []; - directiveArgs.set(def.name.value, argsNodes.map(arg => arg.name.value)); + directiveArgs[def.name.value] = argsNodes.map(arg => arg.name.value); } } return { Directive(directiveNode) { const directiveName = directiveNode.name.value; - const knownArgs = directiveArgs.get(directiveName); - if (directiveNode.arguments != null && knownArgs != null) { + const knownArgs = directiveArgs[directiveName]; + if (directiveNode.arguments && knownArgs) { for (const argNode of directiveNode.arguments) { const argName = argNode.name.value; if (!knownArgs.includes(argName)) { @@ -39125,30 +38255,30 @@ var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../.. * See https://spec.graphql.org/draft/#sec-Directives-Are-Defined */ function KnownDirectivesRule(context) { - const locationsMap = new Map(); + const locationsMap = Object.create(null); const schema = context.getSchema(); const definedDirectives = schema ? schema.getDirectives() : _directives.specifiedDirectives; for (const directive of definedDirectives) { - locationsMap.set(directive.name, directive.locations); + locationsMap[directive.name] = directive.locations; } const astDefinitions = context.getDocument().definitions; for (const def of astDefinitions) { if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) { - locationsMap.set(def.name.value, def.locations.map(name => name.value)); + locationsMap[def.name.value] = def.locations.map(name => name.value); } } return { Directive(node, _key, _parent, _path, ancestors) { const name = node.name.value; - const locations = locationsMap.get(name); - if (locations == null) { + const locations = locationsMap[name]; + if (!locations) { context.reportError(new _GraphQLError.GraphQLError(`Unknown directive "@${name}".`, { nodes: node })); return; } const candidateLocation = getDirectiveLocationForASTPath(ancestors); - if (candidateLocation != null && !locations.includes(candidateLocation)) { + if (candidateLocation && !locations.includes(candidateLocation)) { context.reportError(new _GraphQLError.GraphQLError(`Directive "@${name}" may not be used on ${candidateLocation}.`, { nodes: node })); @@ -39157,8 +38287,8 @@ function KnownDirectivesRule(context) { }; } function getDirectiveLocationForASTPath(ancestors) { - const appliedTo = ancestors.at(-1); - appliedTo != null && 'kind' in appliedTo || (0, _invariant.invariant)(false); + const appliedTo = ancestors[ancestors.length - 1]; + 'kind' in appliedTo || (0, _invariant.invariant)(false); switch (appliedTo.kind) { case _kinds.Kind.OPERATION_DEFINITION: return getDirectiveLocationForOperation(appliedTo.operation); @@ -39199,12 +38329,14 @@ function getDirectiveLocationForASTPath(ancestors) { return _directiveLocation.DirectiveLocation.INPUT_OBJECT; case _kinds.Kind.INPUT_VALUE_DEFINITION: { - const parentNode = ancestors.at(-3); - parentNode != null && 'kind' in parentNode || (0, _invariant.invariant)(false); + const parentNode = ancestors[ancestors.length - 3]; + 'kind' in parentNode || (0, _invariant.invariant)(false); return parentNode.kind === _kinds.Kind.INPUT_OBJECT_TYPE_DEFINITION ? _directiveLocation.DirectiveLocation.INPUT_FIELD_DEFINITION : _directiveLocation.DirectiveLocation.ARGUMENT_DEFINITION; } // Not reachable, all possible types have been considered. - /* c8 ignore next 2 */ + + /* c8 ignore next */ + default: false || (0, _invariant.invariant)(false, 'Unexpected kind: ' + (0, _inspect.inspect)(appliedTo.kind)); } @@ -39286,23 +38418,26 @@ var _scalars = __webpack_require__(/*! ../../type/scalars.mjs */ "../../../node_ * See https://spec.graphql.org/draft/#sec-Fragment-Spread-Type-Existence */ function KnownTypeNamesRule(context) { - var _context$getSchema$ge, _context$getSchema; - const { - definitions - } = context.getDocument(); - const existingTypesMap = (_context$getSchema$ge = (_context$getSchema = context.getSchema()) === null || _context$getSchema === void 0 ? void 0 : _context$getSchema.getTypeMap()) !== null && _context$getSchema$ge !== void 0 ? _context$getSchema$ge : {}; - const typeNames = new Set([...Object.keys(existingTypesMap), ...definitions.filter(_predicates.isTypeDefinitionNode).map(def => def.name.value)]); + const schema = context.getSchema(); + const existingTypesMap = schema ? schema.getTypeMap() : Object.create(null); + const definedTypes = Object.create(null); + for (const def of context.getDocument().definitions) { + if ((0, _predicates.isTypeDefinitionNode)(def)) { + definedTypes[def.name.value] = true; + } + } + const typeNames = [...Object.keys(existingTypesMap), ...Object.keys(definedTypes)]; return { NamedType(node, _1, parent, _2, ancestors) { const typeName = node.name.value; - if (!typeNames.has(typeName)) { + if (!existingTypesMap[typeName] && !definedTypes[typeName]) { var _ancestors$; const definitionNode = (_ancestors$ = ancestors[2]) !== null && _ancestors$ !== void 0 ? _ancestors$ : parent; const isSDL = definitionNode != null && isSDLNode(definitionNode); - if (isSDL && standardTypeNames.has(typeName)) { + if (isSDL && standardTypeNames.includes(typeName)) { return; } - const suggestedTypes = (0, _suggestionList.suggestionList)(typeName, isSDL ? [...standardTypeNames, ...typeNames] : [...typeNames]); + const suggestedTypes = (0, _suggestionList.suggestionList)(typeName, isSDL ? standardTypeNames.concat(typeNames) : typeNames); context.reportError(new _GraphQLError.GraphQLError(`Unknown type "${typeName}".` + (0, _didYouMean.didYouMean)(suggestedTypes), { nodes: node })); @@ -39310,7 +38445,7 @@ function KnownTypeNamesRule(context) { } }; } -const standardTypeNames = new Set([..._scalars.specifiedScalarTypes, ..._introspection.introspectionTypes].map(type => type.name)); +const standardTypeNames = [..._scalars.specifiedScalarTypes, ..._introspection.introspectionTypes].map(type => type.name); function isSDLNode(value) { return 'kind' in value && ((0, _predicates.isTypeSystemDefinitionNode)(value) || (0, _predicates.isTypeSystemExtensionNode)(value)); } @@ -39429,14 +38564,14 @@ function MaxIntrospectionDepthRule(context) { } const fragment = context.getFragment(fragmentName); if (!fragment) { - // Missing fragments checks are handled by the `KnownFragmentNamesRule`. + // Missing fragments checks are handled by `KnownFragmentNamesRule`. return false; - } - // Rather than following an immutable programming pattern which has + } // Rather than following an immutable programming pattern which has // significant memory and garbage collection overhead, we've opted to // take a mutable approach for efficiency's sake. Importantly visiting a // fragment twice is fine, so long as you don't do one visit inside the // other. + try { visitedFragments[fragmentName] = true; return checkDepth(fragment, visitedFragments, depth); @@ -39446,15 +38581,14 @@ function MaxIntrospectionDepthRule(context) { } if (node.kind === _kinds.Kind.FIELD && ( // check all introspection lists - // TODO: instead of relying on field names, check whether the type is a list node.name.value === 'fields' || node.name.value === 'interfaces' || node.name.value === 'possibleTypes' || node.name.value === 'inputFields')) { // eslint-disable-next-line no-param-reassign depth++; if (depth >= MAX_LISTS_DEPTH) { return true; } - } - // handles fields and inline fragments + } // handles fields and inline fragments + if ('selectionSet' in node && node.selectionSet) { for (const child of node.selectionSet.selections) { if (checkDepth(child, visitedFragments, depth)) { @@ -39504,10 +38638,10 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ function NoFragmentCyclesRule(context) { // Tracks already visited fragments to maintain O(N) and to ensure that cycles // are not redundantly reported. - const visitedFrags = new Set(); - // Array of AST nodes used to produce meaningful errors - const spreadPath = []; - // Position in the spread path + const visitedFrags = Object.create(null); // Array of AST nodes used to produce meaningful errors + + const spreadPath = []; // Position in the spread path + const spreadPathIndexByName = Object.create(null); return { OperationDefinition: () => false, @@ -39515,16 +38649,16 @@ function NoFragmentCyclesRule(context) { detectCycleRecursive(node); return false; } - }; - // This does a straight-forward DFS to find cycles. + }; // This does a straight-forward DFS to find cycles. // It does not terminate when a cycle was found but continues to explore // the graph to find all possible cycles. + function detectCycleRecursive(fragment) { - if (visitedFrags.has(fragment.name.value)) { + if (visitedFrags[fragment.name.value]) { return; } const fragmentName = fragment.name.value; - visitedFrags.add(fragmentName); + visitedFrags[fragmentName] = true; const spreadNodes = context.getFragmentSpreads(fragment.selectionSet); if (spreadNodes.length === 0) { return; @@ -39576,21 +38710,28 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * See https://spec.graphql.org/draft/#sec-All-Variable-Uses-Defined */ function NoUndefinedVariablesRule(context) { + let variableNameDefined = Object.create(null); return { - OperationDefinition(operation) { - var _operation$variableDe; - const variableNameDefined = new Set((_operation$variableDe = operation.variableDefinitions) === null || _operation$variableDe === void 0 ? void 0 : _operation$variableDe.map(node => node.variable.name.value)); - const usages = context.getRecursiveVariableUsages(operation); - for (const { - node - } of usages) { - const varName = node.name.value; - if (!variableNameDefined.has(varName)) { - context.reportError(new _GraphQLError.GraphQLError(operation.name ? `Variable "$${varName}" is not defined by operation "${operation.name.value}".` : `Variable "$${varName}" is not defined.`, { - nodes: [node, operation] - })); + OperationDefinition: { + enter() { + variableNameDefined = Object.create(null); + }, + leave(operation) { + const usages = context.getRecursiveVariableUsages(operation); + for (const { + node + } of usages) { + const varName = node.name.value; + if (variableNameDefined[varName] !== true) { + context.reportError(new _GraphQLError.GraphQLError(operation.name ? `Variable "$${varName}" is not defined by operation "${operation.name.value}".` : `Variable "$${varName}" is not defined.`, { + nodes: [node, operation] + })); + } } } + }, + VariableDefinition(node) { + variableNameDefined[node.variable.name.value] = true; } }; } @@ -39619,13 +38760,11 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * See https://spec.graphql.org/draft/#sec-Fragments-Must-Be-Used */ function NoUnusedFragmentsRule(context) { - const fragmentNameUsed = new Set(); + const operationDefs = []; const fragmentDefs = []; return { - OperationDefinition(operation) { - for (const fragment of context.getRecursivelyReferencedFragments(operation)) { - fragmentNameUsed.add(fragment.name.value); - } + OperationDefinition(node) { + operationDefs.push(node); return false; }, FragmentDefinition(node) { @@ -39634,9 +38773,15 @@ function NoUnusedFragmentsRule(context) { }, Document: { leave() { + const fragmentNameUsed = Object.create(null); + for (const operation of operationDefs) { + for (const fragment of context.getRecursivelyReferencedFragments(operation)) { + fragmentNameUsed[fragment.name.value] = true; + } + } for (const fragmentDef of fragmentDefs) { const fragName = fragmentDef.name.value; - if (!fragmentNameUsed.has(fragName)) { + if (fragmentNameUsed[fragName] !== true) { context.reportError(new _GraphQLError.GraphQLError(`Fragment "${fragName}" is never used.`, { nodes: fragmentDef })); @@ -39671,24 +38816,32 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * See https://spec.graphql.org/draft/#sec-All-Variables-Used */ function NoUnusedVariablesRule(context) { + let variableDefs = []; return { - OperationDefinition(operation) { - var _operation$variableDe; - const usages = context.getRecursiveVariableUsages(operation); - const variableNameUsed = new Set(usages.map(({ - node - }) => node.name.value)); - // FIXME: https://github.com/graphql/graphql-js/issues/2203 - /* c8 ignore next */ - const variableDefinitions = (_operation$variableDe = operation.variableDefinitions) !== null && _operation$variableDe !== void 0 ? _operation$variableDe : []; - for (const variableDef of variableDefinitions) { - const variableName = variableDef.variable.name.value; - if (!variableNameUsed.has(variableName)) { - context.reportError(new _GraphQLError.GraphQLError(operation.name ? `Variable "$${variableName}" is never used in operation "${operation.name.value}".` : `Variable "$${variableName}" is never used.`, { - nodes: variableDef - })); + OperationDefinition: { + enter() { + variableDefs = []; + }, + leave(operation) { + const variableNameUsed = Object.create(null); + const usages = context.getRecursiveVariableUsages(operation); + for (const { + node + } of usages) { + variableNameUsed[node.name.value] = true; + } + for (const variableDef of variableDefs) { + const variableName = variableDef.variable.name.value; + if (variableNameUsed[variableName] !== true) { + context.reportError(new _GraphQLError.GraphQLError(operation.name ? `Variable "$${variableName}" is never used in operation "${operation.name.value}".` : `Variable "$${variableName}" is never used.`, { + nodes: variableDef + })); + } } } + }, + VariableDefinition(def) { + variableDefs.push(def); } }; } @@ -39714,9 +38867,6 @@ var _printer = __webpack_require__(/*! ../../language/printer.mjs */ "../../../n var _definition = __webpack_require__(/*! ../../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); var _sortValueNode = __webpack_require__(/*! ../../utilities/sortValueNode.mjs */ "../../../node_modules/graphql/utilities/sortValueNode.mjs"); var _typeFromAST = __webpack_require__(/*! ../../utilities/typeFromAST.mjs */ "../../../node_modules/graphql/utilities/typeFromAST.mjs"); -/* eslint-disable max-params */ -// This file contains a lot of such errors but we plan to refactor it anyway -// so just disable it for entire file. function reasonMessage(reason) { if (Array.isArray(reason)) { return reason.map(([responseName, subReason]) => `subfields "${responseName}" conflict because ` + reasonMessage(subReason)).join(' and '); @@ -39732,14 +38882,15 @@ function reasonMessage(reason) { * * See https://spec.graphql.org/draft/#sec-Field-Selection-Merging */ + function OverlappingFieldsCanBeMergedRule(context) { // A memoization for when two fragments are compared "between" each other for // conflicts. Two fragments may be compared many times, so memoizing this can // dramatically improve the performance of this validator. - const comparedFragmentPairs = new PairSet(); - // A cache for the "field map" and list of fragment names found in any given + const comparedFragmentPairs = new PairSet(); // A cache for the "field map" and list of fragment names found in any given // selection set. Selection sets may be asked for this information multiple // times, so this improves the performance of this validator. + const cachedFieldsAndFragmentNames = new Map(); return { SelectionSet(selectionSet) { @@ -39753,6 +38904,7 @@ function OverlappingFieldsCanBeMergedRule(context) { } }; } + /** * Algorithm: * @@ -39812,43 +38964,43 @@ function OverlappingFieldsCanBeMergedRule(context) { // GraphQL Document. function findConflictsWithinSelectionSet(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, parentType, selectionSet) { const conflicts = []; - const [fieldMap, fragmentNames] = getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType, selectionSet); - // (A) Find find all conflicts "within" the fields of this selection set. + const [fieldMap, fragmentNames] = getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType, selectionSet); // (A) Find find all conflicts "within" the fields of this selection set. // Note: this is the *only place* `collectConflictsWithin` is called. + collectConflictsWithin(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, fieldMap); if (fragmentNames.length !== 0) { // (B) Then collect conflicts between these fields and those represented by // each spread fragment name found. for (let i = 0; i < fragmentNames.length; i++) { - collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, false, fieldMap, fragmentNames[i]); - // (C) Then compare this fragment with all other fragments found in this + collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, false, fieldMap, fragmentNames[i]); // (C) Then compare this fragment with all other fragments found in this // selection set to collect conflicts between fragments spread together. // This compares each item in the list of fragment names to every other // item in that same list (except for itself). + for (let j = i + 1; j < fragmentNames.length; j++) { collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, false, fragmentNames[i], fragmentNames[j]); } } } return conflicts; -} -// Collect all conflicts found between a set of fields and a fragment reference +} // Collect all conflicts found between a set of fields and a fragment reference // including via spreading in any nested fragments. + function collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap, fragmentName) { const fragment = context.getFragment(fragmentName); if (!fragment) { return; } - const [fieldMap2, referencedFragmentNames] = getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment); - // Do not compare a fragment's fieldMap to itself. + const [fieldMap2, referencedFragmentNames] = getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment); // Do not compare a fragment's fieldMap to itself. + if (fieldMap === fieldMap2) { return; - } - // (D) First collect any conflicts between the provided collection of fields + } // (D) First collect any conflicts between the provided collection of fields // and the collection of fields represented by the given fragment. - collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap, fieldMap2); - // (E) Then collect any conflicts between the provided collection of fields + + collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap, fieldMap2); // (E) Then collect any conflicts between the provided collection of fields // and any fragment names found in the given fragment. + for (const referencedFragmentName of referencedFragmentNames) { // Memoize so two fragments are not compared for conflicts more than once. if (comparedFragmentPairs.has(referencedFragmentName, fragmentName, areMutuallyExclusive)) { @@ -39857,15 +39009,15 @@ function collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFiel comparedFragmentPairs.add(referencedFragmentName, fragmentName, areMutuallyExclusive); collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap, referencedFragmentName); } -} -// Collect all conflicts found between two fragments, including via spreading in +} // Collect all conflicts found between two fragments, including via spreading in // any nested fragments. + function collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fragmentName1, fragmentName2) { // No need to compare a fragment to itself. if (fragmentName1 === fragmentName2) { return; - } - // Memoize so two fragments are not compared for conflicts more than once. + } // Memoize so two fragments are not compared for conflicts more than once. + if (comparedFragmentPairs.has(fragmentName1, fragmentName2, areMutuallyExclusive)) { return; } @@ -39876,57 +39028,57 @@ function collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFra return; } const [fieldMap1, referencedFragmentNames1] = getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment1); - const [fieldMap2, referencedFragmentNames2] = getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment2); - // (F) First, collect all conflicts between these two collections of fields + const [fieldMap2, referencedFragmentNames2] = getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment2); // (F) First, collect all conflicts between these two collections of fields // (not including any nested fragments). - collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap1, fieldMap2); - // (G) Then collect conflicts between the first fragment and any nested + + collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap1, fieldMap2); // (G) Then collect conflicts between the first fragment and any nested // fragments spread in the second fragment. + for (const referencedFragmentName2 of referencedFragmentNames2) { collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fragmentName1, referencedFragmentName2); - } - // (G) Then collect conflicts between the second fragment and any nested + } // (G) Then collect conflicts between the second fragment and any nested // fragments spread in the first fragment. + for (const referencedFragmentName1 of referencedFragmentNames1) { collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, referencedFragmentName1, fragmentName2); } -} -// Find all conflicts found between two selection sets, including those found +} // Find all conflicts found between two selection sets, including those found // via spreading in fragments. Called when determining if conflicts exist // between the sub-fields of two overlapping fields. + function findConflictsBetweenSubSelectionSets(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, parentType1, selectionSet1, parentType2, selectionSet2) { const conflicts = []; const [fieldMap1, fragmentNames1] = getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType1, selectionSet1); - const [fieldMap2, fragmentNames2] = getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType2, selectionSet2); - // (H) First, collect all conflicts between these two collections of field. - collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap1, fieldMap2); - // (I) Then collect conflicts between the first collection of fields and + const [fieldMap2, fragmentNames2] = getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType2, selectionSet2); // (H) First, collect all conflicts between these two collections of field. + + collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap1, fieldMap2); // (I) Then collect conflicts between the first collection of fields and // those referenced by each fragment name associated with the second. + for (const fragmentName2 of fragmentNames2) { collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap1, fragmentName2); - } - // (I) Then collect conflicts between the second collection of fields and + } // (I) Then collect conflicts between the second collection of fields and // those referenced by each fragment name associated with the first. + for (const fragmentName1 of fragmentNames1) { collectConflictsBetweenFieldsAndFragment(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fieldMap2, fragmentName1); - } - // (J) Also collect conflicts between any fragment names by the first and + } // (J) Also collect conflicts between any fragment names by the first and // fragment names by the second. This compares each item in the first set of // names to each item in the second set of names. + for (const fragmentName1 of fragmentNames1) { for (const fragmentName2 of fragmentNames2) { collectConflictsBetweenFragments(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, areMutuallyExclusive, fragmentName1, fragmentName2); } } return conflicts; -} -// Collect all Conflicts "within" one collection of fields. +} // Collect all Conflicts "within" one collection of fields. + function collectConflictsWithin(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, fieldMap) { // A field map is a keyed collection, where each key represents a response // name and the value at that key is a list of all fields which provide that // response name. For every response name, if there are multiple fields, they // must be compared to find a potential conflict. - for (const [responseName, fields] of fieldMap.entries()) { + for (const [responseName, fields] of Object.entries(fieldMap)) { // This compares every field in the list to every other field in this list // (except to itself). If the list only has one item, nothing needs to // be compared. @@ -39943,21 +39095,21 @@ function collectConflictsWithin(context, conflicts, cachedFieldsAndFragmentNames } } } -} -// Collect all Conflicts between two collections of fields. This is similar to, +} // Collect all Conflicts between two collections of fields. This is similar to, // but different from the `collectConflictsWithin` function above. This check // assumes that `collectConflictsWithin` has already been called on each // provided collection of fields. This is true because this validator traverses // each individual selection set. + function collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentNames, comparedFragmentPairs, parentFieldsAreMutuallyExclusive, fieldMap1, fieldMap2) { // A field map is a keyed collection, where each key represents a response // name and the value at that key is a list of all fields which provide that // response name. For any response name which appears in both provided field // maps, each field from the first field map must be compared to every field // in the second field map to find potential conflicts. - for (const [responseName, fields1] of fieldMap1.entries()) { - const fields2 = fieldMap2.get(responseName); - if (fields2 != null) { + for (const [responseName, fields1] of Object.entries(fieldMap1)) { + const fields2 = fieldMap2[responseName]; + if (fields2) { for (const field1 of fields1) { for (const field2 of fields2) { const conflict = findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, parentFieldsAreMutuallyExclusive, responseName, field1, field2); @@ -39968,14 +39120,12 @@ function collectConflictsBetween(context, conflicts, cachedFieldsAndFragmentName } } } -} -// Determines if there is a conflict between two particular fields, including +} // Determines if there is a conflict between two particular fields, including // comparing their sub-fields. + function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPairs, parentFieldsAreMutuallyExclusive, responseName, field1, field2) { - var _node1$directives, _node2$directives; const [parentType1, node1, def1] = field1; - const [parentType2, node2, def2] = field2; - // If it is known that two fields could not possibly apply at the same + const [parentType2, node2, def2] = field2; // If it is known that two fields could not possibly apply at the same // time, due to the parent types, then it is safe to permit them to diverge // in aliased field or arguments used as they will not present any ambiguity // by differing. @@ -39983,6 +39133,7 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai // different Object types. Interface or Union types might overlap - if not // in the current state of the schema, then perhaps in some future version, // thus may not safely diverge. + const areMutuallyExclusive = parentFieldsAreMutuallyExclusive || parentType1 !== parentType2 && (0, _definition.isObjectType)(parentType1) && (0, _definition.isObjectType)(parentType2); if (!areMutuallyExclusive) { // Two aliases must refer to the same field. @@ -39990,27 +39141,21 @@ function findConflict(context, cachedFieldsAndFragmentNames, comparedFragmentPai const name2 = node2.name.value; if (name1 !== name2) { return [[responseName, `"${name1}" and "${name2}" are different fields`], [node1], [node2]]; - } - // Two field calls must have the same arguments. + } // Two field calls must have the same arguments. + if (!sameArguments(node1, node2)) { return [[responseName, 'they have differing arguments'], [node1], [node2]]; } - } - // FIXME https://github.com/graphql/graphql-js/issues/2203 - const directives1 = /* c8 ignore next */(_node1$directives = node1.directives) !== null && _node1$directives !== void 0 ? _node1$directives : []; - const directives2 = /* c8 ignore next */(_node2$directives = node2.directives) !== null && _node2$directives !== void 0 ? _node2$directives : []; - if (!sameStreams(directives1, directives2)) { - return [[responseName, 'they have differing stream directives'], [node1], [node2]]; - } - // The return type for each field. + } // The return type for each field. + const type1 = def1 === null || def1 === void 0 ? void 0 : def1.type; const type2 = def2 === null || def2 === void 0 ? void 0 : def2.type; if (type1 && type2 && doTypesConflict(type1, type2)) { return [[responseName, `they return conflicting types "${(0, _inspect.inspect)(type1)}" and "${(0, _inspect.inspect)(type2)}"`], [node1], [node2]]; - } - // Collect and compare sub-fields. Use the same "visited fragment names" list + } // Collect and compare sub-fields. Use the same "visited fragment names" list // for both collections so fields in a fragment reference are never // compared to themselves. + const selectionSet1 = node1.selectionSet; const selectionSet2 = node2.selectionSet; if (selectionSet1 && selectionSet2) { @@ -40027,8 +39172,12 @@ function sameArguments(node1, node2) { if (args2 === undefined || args2.length === 0) { return false; } + /* c8 ignore next */ + if (args1.length !== args2.length) { + /* c8 ignore next */ return false; + /* c8 ignore next */ } const values2 = new Map(args2.map(({ name, @@ -40045,26 +39194,10 @@ function sameArguments(node1, node2) { } function stringifyValue(value) { return (0, _printer.print)((0, _sortValueNode.sortValueNode)(value)); -} -function getStreamDirective(directives) { - return directives.find(directive => directive.name.value === 'stream'); -} -function sameStreams(directives1, directives2) { - const stream1 = getStreamDirective(directives1); - const stream2 = getStreamDirective(directives2); - if (!stream1 && !stream2) { - // both fields do not have streams - return true; - } else if (stream1 && stream2) { - // check if both fields have equivalent streams - return sameArguments(stream1, stream2); - } - // fields have a mix of stream and no stream - return false; -} -// Two types conflict if both types could not apply to a value simultaneously. +} // Two types conflict if both types could not apply to a value simultaneously. // Composite types are ignored as their individual field types will be compared // later recursively. However List and Non-Null types must match. + function doTypesConflict(type1, type2) { if ((0, _definition.isListType)(type1)) { return (0, _definition.isListType)(type2) ? doTypesConflict(type1.ofType, type2.ofType) : true; @@ -40082,24 +39215,24 @@ function doTypesConflict(type1, type2) { return type1 !== type2; } return false; -} -// Given a selection set, return the collection of fields (a mapping of response +} // Given a selection set, return the collection of fields (a mapping of response // name to field nodes and definitions) as well as a list of fragment names // referenced via fragment spreads. + function getFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, parentType, selectionSet) { const cached = cachedFieldsAndFragmentNames.get(selectionSet); if (cached) { return cached; } - const nodeAndDefs = new Map(); - const fragmentNames = new Set(); + const nodeAndDefs = Object.create(null); + const fragmentNames = Object.create(null); _collectFieldsAndFragmentNames(context, parentType, selectionSet, nodeAndDefs, fragmentNames); - const result = [nodeAndDefs, [...fragmentNames]]; + const result = [nodeAndDefs, Object.keys(fragmentNames)]; cachedFieldsAndFragmentNames.set(selectionSet, result); return result; -} -// Given a reference to a fragment, return the represented collection of fields +} // Given a reference to a fragment, return the represented collection of fields // as well as a list of nested fragment names referenced via fragment spreads. + function getReferencedFieldsAndFragmentNames(context, cachedFieldsAndFragmentNames, fragment) { // Short-circuit building a type from the node if possible. const cached = cachedFieldsAndFragmentNames.get(fragment.selectionSet); @@ -40120,16 +39253,14 @@ function _collectFieldsAndFragmentNames(context, parentType, selectionSet, nodeA fieldDef = parentType.getFields()[fieldName]; } const responseName = selection.alias ? selection.alias.value : fieldName; - let nodeAndDefsList = nodeAndDefs.get(responseName); - if (nodeAndDefsList == null) { - nodeAndDefsList = []; - nodeAndDefs.set(responseName, nodeAndDefsList); + if (!nodeAndDefs[responseName]) { + nodeAndDefs[responseName] = []; } - nodeAndDefsList.push([parentType, selection, fieldDef]); + nodeAndDefs[responseName].push([parentType, selection, fieldDef]); break; } case _kinds.Kind.FRAGMENT_SPREAD: - fragmentNames.add(selection.name.value); + fragmentNames[selection.name.value] = true; break; case _kinds.Kind.INLINE_FRAGMENT: { @@ -40140,9 +39271,9 @@ function _collectFieldsAndFragmentNames(context, parentType, selectionSet, nodeA } } } -} -// Given a series of Conflicts which occurred between two sub-fields, generate +} // Given a series of Conflicts which occurred between two sub-fields, generate // a single Conflict. + function subfieldConflicts(conflicts, responseName, node1, node2) { if (conflicts.length > 0) { return [[responseName, conflicts.map(([reason]) => reason)], [node1, ...conflicts.map(([, fields1]) => fields1).flat()], [node2, ...conflicts.map(([,, fields2]) => fields2).flat()]]; @@ -40151,6 +39282,7 @@ function subfieldConflicts(conflicts, responseName, node1, node2) { /** * A way to keep track of pairs of things when the ordering of the pair does not matter. */ + class PairSet { constructor() { this._data = new Map(); @@ -40161,10 +39293,10 @@ class PairSet { const result = (_this$_data$get = this._data.get(key1)) === null || _this$_data$get === void 0 ? void 0 : _this$_data$get.get(key2); if (result === undefined) { return false; - } - // areMutuallyExclusive being false is a superset of being true, hence if + } // areMutuallyExclusive being false is a superset of being true, hence if // we want to know if this PairSet "has" these two with no exclusivity, // we have to ensure it was added as such. + return areMutuallyExclusive ? true : areMutuallyExclusive === result; } add(a, b, areMutuallyExclusive) { @@ -40270,10 +39402,10 @@ var _definition = __webpack_require__(/*! ../../type/definition.mjs */ "../../.. */ function PossibleTypeExtensionsRule(context) { const schema = context.getSchema(); - const definedTypes = new Map(); + const definedTypes = Object.create(null); for (const def of context.getDocument().definitions) { if ((0, _predicates.isTypeDefinitionNode)(def)) { - definedTypes.set(def.name.value, def); + definedTypes[def.name.value] = def; } } return { @@ -40286,15 +39418,15 @@ function PossibleTypeExtensionsRule(context) { }; function checkExtension(node) { const typeName = node.name.value; - const defNode = definedTypes.get(typeName); + const defNode = definedTypes[typeName]; const existingType = schema === null || schema === void 0 ? void 0 : schema.getType(typeName); let expectedKind; - if (defNode != null) { + if (defNode) { expectedKind = defKindToExtKind[defNode.kind]; } else if (existingType) { expectedKind = typeToExtKind(existingType); } - if (expectedKind != null) { + if (expectedKind) { if (expectedKind !== node.kind) { const kindStr = extensionKindToTypeName(node.kind); context.reportError(new _GraphQLError.GraphQLError(`Cannot extend non-${kindStr} type "${typeName}".`, { @@ -40302,8 +39434,10 @@ function PossibleTypeExtensionsRule(context) { })); } } else { - var _schema$getTypeMap; - const allTypeNames = [...definedTypes.keys(), ...Object.keys((_schema$getTypeMap = schema === null || schema === void 0 ? void 0 : schema.getTypeMap()) !== null && _schema$getTypeMap !== void 0 ? _schema$getTypeMap : {})]; + const allTypeNames = Object.keys({ + ...definedTypes, + ...(schema === null || schema === void 0 ? void 0 : schema.getTypeMap()) + }); const suggestedTypes = (0, _suggestionList.suggestionList)(typeName, allTypeNames); context.reportError(new _GraphQLError.GraphQLError(`Cannot extend type "${typeName}" because it is not defined.` + (0, _didYouMean.didYouMean)(suggestedTypes), { nodes: node.name @@ -40340,6 +39474,7 @@ function typeToExtKind(type) { } /* c8 ignore next 3 */ // Not reachable. All possible types have been considered + false || (0, _invariant.invariant)(false, 'Unexpected type: ' + (0, _inspect.inspect)(type)); } function extensionKindToTypeName(kind) { @@ -40357,7 +39492,9 @@ function extensionKindToTypeName(kind) { case _kinds.Kind.INPUT_OBJECT_TYPE_EXTENSION: return 'input object'; // Not reachable. All possible types have been considered - /* c8 ignore next 2 */ + + /* c8 ignore next */ + default: false || (0, _invariant.invariant)(false, 'Unexpected kind: ' + (0, _inspect.inspect)(kind)); } @@ -40379,6 +39516,7 @@ Object.defineProperty(exports, "__esModule", ({ exports.ProvidedRequiredArgumentsOnDirectivesRule = ProvidedRequiredArgumentsOnDirectivesRule; exports.ProvidedRequiredArgumentsRule = ProvidedRequiredArgumentsRule; var _inspect = __webpack_require__(/*! ../../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); +var _keyMap = __webpack_require__(/*! ../../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _kinds = __webpack_require__(/*! ../../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _printer = __webpack_require__(/*! ../../language/printer.mjs */ "../../../node_modules/graphql/language/printer.mjs"); @@ -40402,7 +39540,8 @@ function ProvidedRequiredArgumentsRule(context) { if (!fieldDef) { return false; } - const providedArgs = new Set( // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const providedArgs = new Set( + // FIXME: https://github.com/graphql/graphql-js/issues/2203 /* c8 ignore next */ (_fieldNode$arguments = fieldNode.arguments) === null || _fieldNode$arguments === void 0 ? void 0 : _fieldNode$arguments.map(arg => arg.name.value)); for (const argDef of fieldDef.args) { @@ -40420,22 +39559,25 @@ function ProvidedRequiredArgumentsRule(context) { /** * @internal */ + function ProvidedRequiredArgumentsOnDirectivesRule(context) { var _schema$getDirectives; - const requiredArgsMap = new Map(); + const requiredArgsMap = Object.create(null); const schema = context.getSchema(); const definedDirectives = (_schema$getDirectives = schema === null || schema === void 0 ? void 0 : schema.getDirectives()) !== null && _schema$getDirectives !== void 0 ? _schema$getDirectives : _directives.specifiedDirectives; for (const directive of definedDirectives) { - requiredArgsMap.set(directive.name, new Map(directive.args.filter(_definition.isRequiredArgument).map(arg => [arg.name, arg]))); + requiredArgsMap[directive.name] = (0, _keyMap.keyMap)(directive.args.filter(_definition.isRequiredArgument), arg => arg.name); } const astDefinitions = context.getDocument().definitions; for (const def of astDefinitions) { if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) { var _def$arguments; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const argNodes = (_def$arguments = def.arguments) !== null && _def$arguments !== void 0 ? _def$arguments : []; - requiredArgsMap.set(def.name.value, new Map(argNodes.filter(isRequiredArgumentNode).map(arg => [arg.name.value, arg]))); + requiredArgsMap[def.name.value] = (0, _keyMap.keyMap)(argNodes.filter(isRequiredArgumentNode), arg => arg.name.value); } } return { @@ -40443,14 +39585,16 @@ function ProvidedRequiredArgumentsOnDirectivesRule(context) { // Validate on leave to allow for deeper errors to appear first. leave(directiveNode) { const directiveName = directiveNode.name.value; - const requiredArgs = requiredArgsMap.get(directiveName); - if (requiredArgs != null) { + const requiredArgs = requiredArgsMap[directiveName]; + if (requiredArgs) { var _directiveNode$argume; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const argNodes = (_directiveNode$argume = directiveNode.arguments) !== null && _directiveNode$argume !== void 0 ? _directiveNode$argume : []; const argNodeMap = new Set(argNodes.map(arg => arg.name.value)); - for (const [argName, argDef] of requiredArgs.entries()) { + for (const [argName, argDef] of Object.entries(requiredArgs)) { if (!argNodeMap.has(argName)) { const argType = (0, _definition.isType)(argDef.type) ? (0, _inspect.inspect)(argDef.type) : (0, _printer.print)(argDef.type); context.reportError(new _GraphQLError.GraphQLError(`Directive "@${directiveName}" argument "${argName}" of type "${argType}" is required, but it was not provided.`, { @@ -40533,9 +39677,6 @@ exports.SingleFieldSubscriptionsRule = SingleFieldSubscriptionsRule; var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _kinds = __webpack_require__(/*! ../../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); var _collectFields = __webpack_require__(/*! ../../execution/collectFields.mjs */ "../../../node_modules/graphql/execution/collectFields.mjs"); -function toNodes(fieldGroup) { - return fieldGroup.map(fieldDetails => fieldDetails.node); -} /** * Subscriptions must only include a non-introspection field. * @@ -40560,22 +39701,21 @@ function SingleFieldSubscriptionsRule(context) { fragments[definition.name.value] = definition; } } - const { - groupedFieldSet - } = (0, _collectFields.collectFields)(schema, fragments, variableValues, subscriptionType, node); - if (groupedFieldSet.size > 1) { - const fieldGroups = [...groupedFieldSet.values()]; - const extraFieldGroups = fieldGroups.slice(1); - const extraFieldSelections = extraFieldGroups.flatMap(fieldGroup => toNodes(fieldGroup)); + const fields = (0, _collectFields.collectFields)(schema, fragments, variableValues, subscriptionType, node.selectionSet); + if (fields.size > 1) { + const fieldSelectionLists = [...fields.values()]; + const extraFieldSelectionLists = fieldSelectionLists.slice(1); + const extraFieldSelections = extraFieldSelectionLists.flat(); context.reportError(new _GraphQLError.GraphQLError(operationName != null ? `Subscription "${operationName}" must select only one top level field.` : 'Anonymous Subscription must select only one top level field.', { nodes: extraFieldSelections })); } - for (const fieldGroup of groupedFieldSet.values()) { - const fieldName = toNodes(fieldGroup)[0].name.value; + for (const fieldNodes of fields.values()) { + const field = fieldNodes[0]; + const fieldName = field.name.value; if (fieldName.startsWith('__')) { context.reportError(new _GraphQLError.GraphQLError(operationName != null ? `Subscription "${operationName}" must not select an introspection top level field.` : 'Anonymous Subscription must not select an introspection top level field.', { - nodes: toNodes(fieldGroup) + nodes: fieldNodes })); } } @@ -40587,42 +39727,6 @@ function SingleFieldSubscriptionsRule(context) { /***/ }), -/***/ "../../../node_modules/graphql/validation/rules/StreamDirectiveOnListFieldRule.mjs": -/*!*****************************************************************************************!*\ - !*** ../../../node_modules/graphql/validation/rules/StreamDirectiveOnListFieldRule.mjs ***! - \*****************************************************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -Object.defineProperty(exports, "__esModule", ({ - value: true -})); -exports.StreamDirectiveOnListFieldRule = StreamDirectiveOnListFieldRule; -var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); -var _definition = __webpack_require__(/*! ../../type/definition.mjs */ "../../../node_modules/graphql/type/definition.mjs"); -var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../../node_modules/graphql/type/directives.mjs"); -/** - * Stream directives are used on list fields - * - * A GraphQL document is only valid if stream directives are used on list fields. - */ -function StreamDirectiveOnListFieldRule(context) { - return { - Directive(node) { - const fieldDef = context.getFieldDef(); - const parentType = context.getParentType(); - if (fieldDef && parentType && node.name.value === _directives.GraphQLStreamDirective.name && !((0, _definition.isListType)(fieldDef.type) || (0, _definition.isWrappingType)(fieldDef.type) && (0, _definition.isListType)(fieldDef.type.ofType))) { - context.reportError(new _GraphQLError.GraphQLError(`Stream directive cannot be used on non-list field "${fieldDef.name}" on type "${parentType.name}".`, { - nodes: node - })); - } - } - }; -} - -/***/ }), - /***/ "../../../node_modules/graphql/validation/rules/UniqueArgumentDefinitionNamesRule.mjs": /*!********************************************************************************************!*\ !*** ../../../node_modules/graphql/validation/rules/UniqueArgumentDefinitionNamesRule.mjs ***! @@ -40647,7 +39751,9 @@ function UniqueArgumentDefinitionNamesRule(context) { return { DirectiveDefinition(directiveNode) { var _directiveNode$argume; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const argumentNodes = (_directiveNode$argume = directiveNode.arguments) !== null && _directiveNode$argume !== void 0 ? _directiveNode$argume : []; return checkArgUniqueness(`@${directiveNode.name.value}`, argumentNodes); @@ -40659,15 +39765,17 @@ function UniqueArgumentDefinitionNamesRule(context) { }; function checkArgUniquenessPerField(typeNode) { var _typeNode$fields; - const typeName = typeNode.name.value; - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const typeName = typeNode.name.value; // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const fieldNodes = (_typeNode$fields = typeNode.fields) !== null && _typeNode$fields !== void 0 ? _typeNode$fields : []; for (const fieldDef of fieldNodes) { var _fieldDef$arguments; - const fieldName = fieldDef.name.value; - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + const fieldName = fieldDef.name.value; // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const argumentNodes = (_fieldDef$arguments = fieldDef.arguments) !== null && _fieldDef$arguments !== void 0 ? _fieldDef$arguments : []; checkArgUniqueness(`${typeName}.${fieldName}`, argumentNodes); } @@ -40717,7 +39825,9 @@ function UniqueArgumentNamesRule(context) { }; function checkArgUniqueness(parentNode) { var _parentNode$arguments; + // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const argumentNodes = (_parentNode$arguments = parentNode.arguments) !== null && _parentNode$arguments !== void 0 ? _parentNode$arguments : []; const seenArgs = (0, _groupBy.groupBy)(argumentNodes, arg => arg.name.value); @@ -40752,7 +39862,7 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * A GraphQL document is only valid if all defined directives have unique names. */ function UniqueDirectiveNamesRule(context) { - const knownDirectiveNames = new Map(); + const knownDirectiveNames = Object.create(null); const schema = context.getSchema(); return { DirectiveDefinition(node) { @@ -40763,13 +39873,12 @@ function UniqueDirectiveNamesRule(context) { })); return; } - const knownName = knownDirectiveNames.get(directiveName); - if (knownName) { + if (knownDirectiveNames[directiveName]) { context.reportError(new _GraphQLError.GraphQLError(`There can be only one directive named "@${directiveName}".`, { - nodes: [knownName, node.name] + nodes: [knownDirectiveNames[directiveName], node.name] })); } else { - knownDirectiveNames.set(directiveName, node.name); + knownDirectiveNames[directiveName] = node.name; } return false; } @@ -40803,20 +39912,20 @@ var _directives = __webpack_require__(/*! ../../type/directives.mjs */ "../../.. * See https://spec.graphql.org/draft/#sec-Directives-Are-Unique-Per-Location */ function UniqueDirectivesPerLocationRule(context) { - const uniqueDirectiveMap = new Map(); + const uniqueDirectiveMap = Object.create(null); const schema = context.getSchema(); const definedDirectives = schema ? schema.getDirectives() : _directives.specifiedDirectives; for (const directive of definedDirectives) { - uniqueDirectiveMap.set(directive.name, !directive.isRepeatable); + uniqueDirectiveMap[directive.name] = !directive.isRepeatable; } const astDefinitions = context.getDocument().definitions; for (const def of astDefinitions) { if (def.kind === _kinds.Kind.DIRECTIVE_DEFINITION) { - uniqueDirectiveMap.set(def.name.value, !def.repeatable); + uniqueDirectiveMap[def.name.value] = !def.repeatable; } } - const schemaDirectives = new Map(); - const typeDirectivesMap = new Map(); + const schemaDirectives = Object.create(null); + const typeDirectivesMap = Object.create(null); return { // Many different AST nodes may contain directives. Rather than listing // them all, just listen for entering any node, and check to see if it @@ -40830,24 +39939,22 @@ function UniqueDirectivesPerLocationRule(context) { seenDirectives = schemaDirectives; } else if ((0, _predicates.isTypeDefinitionNode)(node) || (0, _predicates.isTypeExtensionNode)(node)) { const typeName = node.name.value; - seenDirectives = typeDirectivesMap.get(typeName); + seenDirectives = typeDirectivesMap[typeName]; if (seenDirectives === undefined) { - seenDirectives = new Map(); - typeDirectivesMap.set(typeName, seenDirectives); + typeDirectivesMap[typeName] = seenDirectives = Object.create(null); } } else { - seenDirectives = new Map(); + seenDirectives = Object.create(null); } for (const directive of node.directives) { const directiveName = directive.name.value; - if (uniqueDirectiveMap.get(directiveName) === true) { - const seenDirective = seenDirectives.get(directiveName); - if (seenDirective != null) { + if (uniqueDirectiveMap[directiveName]) { + if (seenDirectives[directiveName]) { context.reportError(new _GraphQLError.GraphQLError(`The directive "@${directiveName}" can only be used once at this location.`, { - nodes: [seenDirective, directive] + nodes: [seenDirectives[directiveName], directive] })); } else { - seenDirectives.set(directiveName, directive); + seenDirectives[directiveName] = directive; } } } @@ -40879,7 +39986,7 @@ var _definition = __webpack_require__(/*! ../../type/definition.mjs */ "../../.. function UniqueEnumValueNamesRule(context) { const schema = context.getSchema(); const existingTypeMap = schema ? schema.getTypeMap() : Object.create(null); - const knownValueNames = new Map(); + const knownValueNames = Object.create(null); return { EnumTypeDefinition: checkValueUniqueness, EnumTypeExtension: checkValueUniqueness @@ -40887,14 +39994,14 @@ function UniqueEnumValueNamesRule(context) { function checkValueUniqueness(node) { var _node$values; const typeName = node.name.value; - let valueNames = knownValueNames.get(typeName); - if (valueNames == null) { - valueNames = new Map(); - knownValueNames.set(typeName, valueNames); - } - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + if (!knownValueNames[typeName]) { + knownValueNames[typeName] = Object.create(null); + } // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const valueNodes = (_node$values = node.values) !== null && _node$values !== void 0 ? _node$values : []; + const valueNames = knownValueNames[typeName]; for (const valueDef of valueNodes) { const valueName = valueDef.name.value; const existingType = existingTypeMap[typeName]; @@ -40902,15 +40009,12 @@ function UniqueEnumValueNamesRule(context) { context.reportError(new _GraphQLError.GraphQLError(`Enum value "${typeName}.${valueName}" already exists in the schema. It cannot also be defined in this type extension.`, { nodes: valueDef.name })); - continue; - } - const knownValueName = valueNames.get(valueName); - if (knownValueName != null) { + } else if (valueNames[valueName]) { context.reportError(new _GraphQLError.GraphQLError(`Enum value "${typeName}.${valueName}" can only be defined once.`, { - nodes: [knownValueName, valueDef.name] + nodes: [valueNames[valueName], valueDef.name] })); } else { - valueNames.set(valueName, valueDef.name); + valueNames[valueName] = valueDef.name; } } return false; @@ -40941,7 +40045,7 @@ var _definition = __webpack_require__(/*! ../../type/definition.mjs */ "../../.. function UniqueFieldDefinitionNamesRule(context) { const schema = context.getSchema(); const existingTypeMap = schema ? schema.getTypeMap() : Object.create(null); - const knownFieldNames = new Map(); + const knownFieldNames = Object.create(null); return { InputObjectTypeDefinition: checkFieldUniqueness, InputObjectTypeExtension: checkFieldUniqueness, @@ -40953,29 +40057,26 @@ function UniqueFieldDefinitionNamesRule(context) { function checkFieldUniqueness(node) { var _node$fields; const typeName = node.name.value; - let fieldNames = knownFieldNames.get(typeName); - if (fieldNames == null) { - fieldNames = new Map(); - knownFieldNames.set(typeName, fieldNames); - } - // FIXME: https://github.com/graphql/graphql-js/issues/2203 + if (!knownFieldNames[typeName]) { + knownFieldNames[typeName] = Object.create(null); + } // FIXME: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ + const fieldNodes = (_node$fields = node.fields) !== null && _node$fields !== void 0 ? _node$fields : []; + const fieldNames = knownFieldNames[typeName]; for (const fieldDef of fieldNodes) { const fieldName = fieldDef.name.value; if (hasField(existingTypeMap[typeName], fieldName)) { context.reportError(new _GraphQLError.GraphQLError(`Field "${typeName}.${fieldName}" already exists in the schema. It cannot also be defined in this type extension.`, { nodes: fieldDef.name })); - continue; - } - const knownFieldName = fieldNames.get(fieldName); - if (knownFieldName != null) { + } else if (fieldNames[fieldName]) { context.reportError(new _GraphQLError.GraphQLError(`Field "${typeName}.${fieldName}" can only be defined once.`, { - nodes: [knownFieldName, fieldDef.name] + nodes: [fieldNames[fieldName], fieldDef.name] })); } else { - fieldNames.set(fieldName, fieldDef.name); + fieldNames[fieldName] = fieldDef.name; } } return false; @@ -41011,18 +40112,17 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * See https://spec.graphql.org/draft/#sec-Fragment-Name-Uniqueness */ function UniqueFragmentNamesRule(context) { - const knownFragmentNames = new Map(); + const knownFragmentNames = Object.create(null); return { OperationDefinition: () => false, FragmentDefinition(node) { const fragmentName = node.name.value; - const knownFragmentName = knownFragmentNames.get(fragmentName); - if (knownFragmentName != null) { + if (knownFragmentNames[fragmentName]) { context.reportError(new _GraphQLError.GraphQLError(`There can be only one fragment named "${fragmentName}".`, { - nodes: [knownFragmentName, node.name] + nodes: [knownFragmentNames[fragmentName], node.name] })); } else { - knownFragmentNames.set(fragmentName, node.name); + knownFragmentNames[fragmentName] = node.name; } return false; } @@ -41055,28 +40155,27 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ */ function UniqueInputFieldNamesRule(context) { const knownNameStack = []; - let knownNames = new Map(); + let knownNames = Object.create(null); return { ObjectValue: { enter() { knownNameStack.push(knownNames); - knownNames = new Map(); + knownNames = Object.create(null); }, leave() { const prevKnownNames = knownNameStack.pop(); - prevKnownNames != null || (0, _invariant.invariant)(false); + prevKnownNames || (0, _invariant.invariant)(false); knownNames = prevKnownNames; } }, ObjectField(node) { const fieldName = node.name.value; - const knownName = knownNames.get(fieldName); - if (knownName != null) { + if (knownNames[fieldName]) { context.reportError(new _GraphQLError.GraphQLError(`There can be only one input field named "${fieldName}".`, { - nodes: [knownName, node.name] + nodes: [knownNames[fieldName], node.name] })); } else { - knownNames.set(fieldName, node.name); + knownNames[fieldName] = node.name; } } }; @@ -41105,18 +40204,17 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * See https://spec.graphql.org/draft/#sec-Operation-Name-Uniqueness */ function UniqueOperationNamesRule(context) { - const knownOperationNames = new Map(); + const knownOperationNames = Object.create(null); return { OperationDefinition(node) { const operationName = node.name; - if (operationName != null) { - const knownOperationName = knownOperationNames.get(operationName.value); - if (knownOperationName != null) { + if (operationName) { + if (knownOperationNames[operationName.value]) { context.reportError(new _GraphQLError.GraphQLError(`There can be only one operation named "${operationName.value}".`, { - nodes: [knownOperationName, operationName] + nodes: [knownOperationNames[operationName.value], operationName] })); } else { - knownOperationNames.set(operationName.value, operationName); + knownOperationNames[operationName.value] = operationName; } } return false; @@ -41147,7 +40245,7 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ */ function UniqueOperationTypesRule(context) { const schema = context.getSchema(); - const definedOperationTypes = new Map(); + const definedOperationTypes = Object.create(null); const existingOperationTypes = schema ? { query: schema.getQueryType(), mutation: schema.getMutationType(), @@ -41159,12 +40257,14 @@ function UniqueOperationTypesRule(context) { }; function checkOperationTypes(node) { var _node$operationTypes; + // See: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const operationTypesNodes = (_node$operationTypes = node.operationTypes) !== null && _node$operationTypes !== void 0 ? _node$operationTypes : []; for (const operationType of operationTypesNodes) { const operation = operationType.operation; - const alreadyDefinedOperationType = definedOperationTypes.get(operation); + const alreadyDefinedOperationType = definedOperationTypes[operation]; if (existingOperationTypes[operation]) { context.reportError(new _GraphQLError.GraphQLError(`Type for ${operation} already defined in the schema. It cannot be redefined.`, { nodes: operationType @@ -41174,7 +40274,7 @@ function UniqueOperationTypesRule(context) { nodes: [alreadyDefinedOperationType, operationType] })); } else { - definedOperationTypes.set(operation, operationType); + definedOperationTypes[operation] = operationType; } } return false; @@ -41202,7 +40302,7 @@ var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../ * A GraphQL document is only valid if all defined types have unique names. */ function UniqueTypeNamesRule(context) { - const knownTypeNames = new Map(); + const knownTypeNames = Object.create(null); const schema = context.getSchema(); return { ScalarTypeDefinition: checkTypeName, @@ -41220,13 +40320,12 @@ function UniqueTypeNamesRule(context) { })); return; } - const knownNameNode = knownTypeNames.get(typeName); - if (knownNameNode != null) { + if (knownTypeNames[typeName]) { context.reportError(new _GraphQLError.GraphQLError(`There can be only one type named "${typeName}".`, { - nodes: [knownNameNode, node.name] + nodes: [knownTypeNames[typeName], node.name] })); } else { - knownTypeNames.set(typeName, node.name); + knownTypeNames[typeName] = node.name; } return false; } @@ -41257,7 +40356,9 @@ function UniqueVariableNamesRule(context) { return { OperationDefinition(operationNode) { var _operationNode$variab; + // See: https://github.com/graphql/graphql-js/issues/2203 + /* c8 ignore next */ const variableDefinitions = (_operationNode$variab = operationNode.variableDefinitions) !== null && _operationNode$variab !== void 0 ? _operationNode$variab : []; const seenVariableDefinitions = (0, _groupBy.groupBy)(variableDefinitions, node => node.variable.name.value); @@ -41288,6 +40389,7 @@ Object.defineProperty(exports, "__esModule", ({ exports.ValuesOfCorrectTypeRule = ValuesOfCorrectTypeRule; var _didYouMean = __webpack_require__(/*! ../../jsutils/didYouMean.mjs */ "../../../node_modules/graphql/jsutils/didYouMean.mjs"); var _inspect = __webpack_require__(/*! ../../jsutils/inspect.mjs */ "../../../node_modules/graphql/jsutils/inspect.mjs"); +var _keyMap = __webpack_require__(/*! ../../jsutils/keyMap.mjs */ "../../../node_modules/graphql/jsutils/keyMap.mjs"); var _suggestionList = __webpack_require__(/*! ../../jsutils/suggestionList.mjs */ "../../../node_modules/graphql/jsutils/suggestionList.mjs"); var _GraphQLError = __webpack_require__(/*! ../../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _kinds = __webpack_require__(/*! ../../language/kinds.mjs */ "../../../node_modules/graphql/language/kinds.mjs"); @@ -41326,11 +40428,11 @@ function ValuesOfCorrectTypeRule(context) { if (!(0, _definition.isInputObjectType)(type)) { isValidValueNode(context, node); return false; // Don't traverse further. - } - // Ensure every required field exists. - const fieldNodeMap = new Map(node.fields.map(field => [field.name.value, field])); + } // Ensure every required field exists. + + const fieldNodeMap = (0, _keyMap.keyMap)(node.fields, field => field.name.value); for (const fieldDef of Object.values(type.getFields())) { - const fieldNode = fieldNodeMap.get(fieldDef.name); + const fieldNode = fieldNodeMap[fieldDef.name]; if (!fieldNode && (0, _definition.isRequiredInputField)(fieldDef)) { const typeStr = (0, _inspect.inspect)(fieldDef.type); context.reportError(new _GraphQLError.GraphQLError(`Field "${type.name}.${fieldDef.name}" of required type "${typeStr}" was not provided.`, { @@ -41371,6 +40473,7 @@ function ValuesOfCorrectTypeRule(context) { * Any value literal may be a valid representation of a Scalar, depending on * that scalar type. */ + function isValidValueNode(context, node) { // Report any error at the full type expected by the location. const locationType = context.getInputType(); @@ -41384,11 +40487,12 @@ function isValidValueNode(context, node) { nodes: node })); return; - } - // Scalars and Enums determine if a literal value is valid via parseLiteral(), + } // Scalars and Enums determine if a literal value is valid via parseLiteral(), // which may throw or return an invalid value to indicate failure. + try { - const parseResult = type.parseLiteral(node, undefined /* variables */); + const parseResult = type.parseLiteral(node, undefined + /* variables */); if (parseResult === undefined) { const typeStr = (0, _inspect.inspect)(locationType); context.reportError(new _GraphQLError.GraphQLError(`Expected value of type "${typeStr}", found ${(0, _printer.print)(node)}.`, { @@ -41408,8 +40512,8 @@ function isValidValueNode(context, node) { } } function validateOneOfInputObject(context, node, type, fieldNodeMap, variableDefinitions) { - var _fieldNodeMap$get; - const keys = Array.from(fieldNodeMap.keys()); + var _fieldNodeMap$keys$; + const keys = Object.keys(fieldNodeMap); const isNotExactlyOneField = keys.length !== 1; if (isNotExactlyOneField) { context.reportError(new _GraphQLError.GraphQLError(`OneOf Input Object "${type.name}" must specify exactly one key.`, { @@ -41417,7 +40521,7 @@ function validateOneOfInputObject(context, node, type, fieldNodeMap, variableDef })); return; } - const value = (_fieldNodeMap$get = fieldNodeMap.get(keys[0])) === null || _fieldNodeMap$get === void 0 ? void 0 : _fieldNodeMap$get.value; + const value = (_fieldNodeMap$keys$ = fieldNodeMap[keys[0]]) === null || _fieldNodeMap$keys$ === void 0 ? void 0 : _fieldNodeMap$keys$.value; const isNullLiteral = !value || value.kind === _kinds.Kind.NULL; const isVariable = (value === null || value === void 0 ? void 0 : value.kind) === _kinds.Kind.VARIABLE; if (isNullLiteral) { @@ -41507,11 +40611,11 @@ var _typeFromAST = __webpack_require__(/*! ../../utilities/typeFromAST.mjs */ ". * See https://spec.graphql.org/draft/#sec-All-Variable-Usages-are-Allowed */ function VariablesInAllowedPositionRule(context) { - let varDefMap; + let varDefMap = Object.create(null); return { OperationDefinition: { enter() { - varDefMap = new Map(); + varDefMap = Object.create(null); }, leave(operation) { const usages = context.getRecursiveVariableUsages(operation); @@ -41521,7 +40625,7 @@ function VariablesInAllowedPositionRule(context) { defaultValue } of usages) { const varName = node.name.value; - const varDef = varDefMap.get(varName); + const varDef = varDefMap[varName]; if (varDef && type) { // A var type is allowed if it is the same or more strict (e.g. is // a subtype of) than the expected type. It can be more strict if @@ -41542,7 +40646,7 @@ function VariablesInAllowedPositionRule(context) { } }, VariableDefinition(node) { - varDefMap.set(node.variable.name.value, node); + varDefMap[node.variable.name.value] = node; } }; } @@ -41551,6 +40655,7 @@ function VariablesInAllowedPositionRule(context) { * which includes considering if default values exist for either the variable * or the location at which it is located. */ + function allowedVariableUsage(schema, varType, varDefaultValue, locationType, locationDefaultValue) { if ((0, _definition.isNonNullType)(locationType) && !(0, _definition.isNonNullType)(varType)) { const hasNonNullVariableDefaultValue = varDefaultValue != null && varDefaultValue.kind !== _kinds.Kind.NULL; @@ -41703,9 +40808,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.specifiedSDLRules = exports.specifiedRules = exports.recommendedRules = void 0; -var _DeferStreamDirectiveLabelRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveLabelRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveLabelRule.mjs"); -var _DeferStreamDirectiveOnRootFieldRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveOnRootFieldRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnRootFieldRule.mjs"); -var _DeferStreamDirectiveOnValidOperationsRule = __webpack_require__(/*! ./rules/DeferStreamDirectiveOnValidOperationsRule.mjs */ "../../../node_modules/graphql/validation/rules/DeferStreamDirectiveOnValidOperationsRule.mjs"); var _ExecutableDefinitionsRule = __webpack_require__(/*! ./rules/ExecutableDefinitionsRule.mjs */ "../../../node_modules/graphql/validation/rules/ExecutableDefinitionsRule.mjs"); var _FieldsOnCorrectTypeRule = __webpack_require__(/*! ./rules/FieldsOnCorrectTypeRule.mjs */ "../../../node_modules/graphql/validation/rules/FieldsOnCorrectTypeRule.mjs"); var _FragmentsOnCompositeTypesRule = __webpack_require__(/*! ./rules/FragmentsOnCompositeTypesRule.mjs */ "../../../node_modules/graphql/validation/rules/FragmentsOnCompositeTypesRule.mjs"); @@ -41726,7 +40828,6 @@ var _PossibleTypeExtensionsRule = __webpack_require__(/*! ./rules/PossibleTypeEx var _ProvidedRequiredArgumentsRule = __webpack_require__(/*! ./rules/ProvidedRequiredArgumentsRule.mjs */ "../../../node_modules/graphql/validation/rules/ProvidedRequiredArgumentsRule.mjs"); var _ScalarLeafsRule = __webpack_require__(/*! ./rules/ScalarLeafsRule.mjs */ "../../../node_modules/graphql/validation/rules/ScalarLeafsRule.mjs"); var _SingleFieldSubscriptionsRule = __webpack_require__(/*! ./rules/SingleFieldSubscriptionsRule.mjs */ "../../../node_modules/graphql/validation/rules/SingleFieldSubscriptionsRule.mjs"); -var _StreamDirectiveOnListFieldRule = __webpack_require__(/*! ./rules/StreamDirectiveOnListFieldRule.mjs */ "../../../node_modules/graphql/validation/rules/StreamDirectiveOnListFieldRule.mjs"); var _UniqueArgumentDefinitionNamesRule = __webpack_require__(/*! ./rules/UniqueArgumentDefinitionNamesRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueArgumentDefinitionNamesRule.mjs"); var _UniqueArgumentNamesRule = __webpack_require__(/*! ./rules/UniqueArgumentNamesRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueArgumentNamesRule.mjs"); var _UniqueDirectiveNamesRule = __webpack_require__(/*! ./rules/UniqueDirectiveNamesRule.mjs */ "../../../node_modules/graphql/validation/rules/UniqueDirectiveNamesRule.mjs"); @@ -41742,14 +40843,7 @@ var _UniqueVariableNamesRule = __webpack_require__(/*! ./rules/UniqueVariableNam var _ValuesOfCorrectTypeRule = __webpack_require__(/*! ./rules/ValuesOfCorrectTypeRule.mjs */ "../../../node_modules/graphql/validation/rules/ValuesOfCorrectTypeRule.mjs"); var _VariablesAreInputTypesRule = __webpack_require__(/*! ./rules/VariablesAreInputTypesRule.mjs */ "../../../node_modules/graphql/validation/rules/VariablesAreInputTypesRule.mjs"); var _VariablesInAllowedPositionRule = __webpack_require__(/*! ./rules/VariablesInAllowedPositionRule.mjs */ "../../../node_modules/graphql/validation/rules/VariablesInAllowedPositionRule.mjs"); -// Spec Section: "Defer And Stream Directive Labels Are Unique" - -// Spec Section: "Defer And Stream Directives Are Used On Valid Root Field" - -// Spec Section: "Defer And Stream Directives Are Used On Valid Operations" - // Spec Section: "Executable Definitions" - // Spec Section: "Field Selections on Objects, Interfaces, and Unions Types" // Spec Section: "Fragments on Composite Types" @@ -41786,8 +40880,6 @@ var _VariablesInAllowedPositionRule = __webpack_require__(/*! ./rules/VariablesI // Spec Section: "Subscriptions with Single Root Field" -// Spec Section: "Stream Directives Are Used On List Fields" - // Spec Section: "Argument Uniqueness" // Spec Section: "Directives Are Unique Per Location" @@ -41817,10 +40909,12 @@ const recommendedRules = exports.recommendedRules = Object.freeze([_MaxIntrospec * The order of the rules in this list has been adjusted to lead to the * most clear output when encountering multiple validation errors. */ -const specifiedRules = exports.specifiedRules = Object.freeze([_ExecutableDefinitionsRule.ExecutableDefinitionsRule, _UniqueOperationNamesRule.UniqueOperationNamesRule, _LoneAnonymousOperationRule.LoneAnonymousOperationRule, _SingleFieldSubscriptionsRule.SingleFieldSubscriptionsRule, _KnownTypeNamesRule.KnownTypeNamesRule, _FragmentsOnCompositeTypesRule.FragmentsOnCompositeTypesRule, _VariablesAreInputTypesRule.VariablesAreInputTypesRule, _ScalarLeafsRule.ScalarLeafsRule, _FieldsOnCorrectTypeRule.FieldsOnCorrectTypeRule, _UniqueFragmentNamesRule.UniqueFragmentNamesRule, _KnownFragmentNamesRule.KnownFragmentNamesRule, _NoUnusedFragmentsRule.NoUnusedFragmentsRule, _PossibleFragmentSpreadsRule.PossibleFragmentSpreadsRule, _NoFragmentCyclesRule.NoFragmentCyclesRule, _UniqueVariableNamesRule.UniqueVariableNamesRule, _NoUndefinedVariablesRule.NoUndefinedVariablesRule, _NoUnusedVariablesRule.NoUnusedVariablesRule, _KnownDirectivesRule.KnownDirectivesRule, _UniqueDirectivesPerLocationRule.UniqueDirectivesPerLocationRule, _DeferStreamDirectiveOnRootFieldRule.DeferStreamDirectiveOnRootFieldRule, _DeferStreamDirectiveOnValidOperationsRule.DeferStreamDirectiveOnValidOperationsRule, _DeferStreamDirectiveLabelRule.DeferStreamDirectiveLabelRule, _StreamDirectiveOnListFieldRule.StreamDirectiveOnListFieldRule, _KnownArgumentNamesRule.KnownArgumentNamesRule, _UniqueArgumentNamesRule.UniqueArgumentNamesRule, _ValuesOfCorrectTypeRule.ValuesOfCorrectTypeRule, _ProvidedRequiredArgumentsRule.ProvidedRequiredArgumentsRule, _VariablesInAllowedPositionRule.VariablesInAllowedPositionRule, _OverlappingFieldsCanBeMergedRule.OverlappingFieldsCanBeMergedRule, _UniqueInputFieldNamesRule.UniqueInputFieldNamesRule, ...recommendedRules]); + +const specifiedRules = exports.specifiedRules = Object.freeze([_ExecutableDefinitionsRule.ExecutableDefinitionsRule, _UniqueOperationNamesRule.UniqueOperationNamesRule, _LoneAnonymousOperationRule.LoneAnonymousOperationRule, _SingleFieldSubscriptionsRule.SingleFieldSubscriptionsRule, _KnownTypeNamesRule.KnownTypeNamesRule, _FragmentsOnCompositeTypesRule.FragmentsOnCompositeTypesRule, _VariablesAreInputTypesRule.VariablesAreInputTypesRule, _ScalarLeafsRule.ScalarLeafsRule, _FieldsOnCorrectTypeRule.FieldsOnCorrectTypeRule, _UniqueFragmentNamesRule.UniqueFragmentNamesRule, _KnownFragmentNamesRule.KnownFragmentNamesRule, _NoUnusedFragmentsRule.NoUnusedFragmentsRule, _PossibleFragmentSpreadsRule.PossibleFragmentSpreadsRule, _NoFragmentCyclesRule.NoFragmentCyclesRule, _UniqueVariableNamesRule.UniqueVariableNamesRule, _NoUndefinedVariablesRule.NoUndefinedVariablesRule, _NoUnusedVariablesRule.NoUnusedVariablesRule, _KnownDirectivesRule.KnownDirectivesRule, _UniqueDirectivesPerLocationRule.UniqueDirectivesPerLocationRule, _KnownArgumentNamesRule.KnownArgumentNamesRule, _UniqueArgumentNamesRule.UniqueArgumentNamesRule, _ValuesOfCorrectTypeRule.ValuesOfCorrectTypeRule, _ProvidedRequiredArgumentsRule.ProvidedRequiredArgumentsRule, _VariablesInAllowedPositionRule.VariablesInAllowedPositionRule, _OverlappingFieldsCanBeMergedRule.OverlappingFieldsCanBeMergedRule, _UniqueInputFieldNamesRule.UniqueInputFieldNamesRule, ...recommendedRules]); /** * @internal */ + const specifiedSDLRules = exports.specifiedSDLRules = Object.freeze([_LoneSchemaDefinitionRule.LoneSchemaDefinitionRule, _UniqueOperationTypesRule.UniqueOperationTypesRule, _UniqueTypeNamesRule.UniqueTypeNamesRule, _UniqueEnumValueNamesRule.UniqueEnumValueNamesRule, _UniqueFieldDefinitionNamesRule.UniqueFieldDefinitionNamesRule, _UniqueArgumentDefinitionNamesRule.UniqueArgumentDefinitionNamesRule, _UniqueDirectiveNamesRule.UniqueDirectiveNamesRule, _KnownTypeNamesRule.KnownTypeNamesRule, _KnownDirectivesRule.KnownDirectivesRule, _UniqueDirectivesPerLocationRule.UniqueDirectivesPerLocationRule, _PossibleTypeExtensionsRule.PossibleTypeExtensionsRule, _KnownArgumentNamesRule.KnownArgumentNamesOnDirectivesRule, _UniqueArgumentNamesRule.UniqueArgumentNamesRule, _UniqueInputFieldNamesRule.UniqueInputFieldNamesRule, _ProvidedRequiredArgumentsRule.ProvidedRequiredArgumentsOnDirectivesRule]); /***/ }), @@ -41840,6 +40934,7 @@ exports.assertValidSDL = assertValidSDL; exports.assertValidSDLExtension = assertValidSDLExtension; exports.validate = validate; exports.validateSDL = validateSDL; +var _devAssert = __webpack_require__(/*! ../jsutils/devAssert.mjs */ "../../../node_modules/graphql/jsutils/devAssert.mjs"); var _GraphQLError = __webpack_require__(/*! ../error/GraphQLError.mjs */ "../../../node_modules/graphql/error/GraphQLError.mjs"); var _visitor = __webpack_require__(/*! ../language/visitor.mjs */ "../../../node_modules/graphql/language/visitor.mjs"); var _validate = __webpack_require__(/*! ../type/validate.mjs */ "../../../node_modules/graphql/type/validate.mjs"); @@ -41866,30 +40961,32 @@ var _ValidationContext = __webpack_require__(/*! ./ValidationContext.mjs */ "../ * Optionally a custom TypeInfo instance may be provided. If not provided, one * will be created from the provided schema. */ + function validate(schema, documentAST, rules = _specifiedRules.specifiedRules, options, /** @deprecated will be removed in 17.0.0 */ typeInfo = new _TypeInfo.TypeInfo(schema)) { var _options$maxErrors; const maxErrors = (_options$maxErrors = options === null || options === void 0 ? void 0 : options.maxErrors) !== null && _options$maxErrors !== void 0 ? _options$maxErrors : 100; - // If the schema used for validation is invalid, throw an error. + documentAST || (0, _devAssert.devAssert)(false, 'Must provide document.'); // If the schema used for validation is invalid, throw an error. + (0, _validate.assertValidSchema)(schema); - const abortError = new _GraphQLError.GraphQLError('Too many validation errors, error limit reached. Validation aborted.'); + const abortObj = Object.freeze({}); const errors = []; const context = new _ValidationContext.ValidationContext(schema, documentAST, typeInfo, error => { if (errors.length >= maxErrors) { - throw abortError; + errors.push(new _GraphQLError.GraphQLError('Too many validation errors, error limit reached. Validation aborted.')); // eslint-disable-next-line @typescript-eslint/no-throw-literal + + throw abortObj; } errors.push(error); - }); - // This uses a specialized visitor which runs multiple visitors in parallel, + }); // This uses a specialized visitor which runs multiple visitors in parallel, // while maintaining the visitor skip and break API. - const visitor = (0, _visitor.visitInParallel)(rules.map(rule => rule(context))); - // Visit the whole document with each instance of all provided rules. + + const visitor = (0, _visitor.visitInParallel)(rules.map(rule => rule(context))); // Visit the whole document with each instance of all provided rules. + try { (0, _visitor.visit)(documentAST, (0, _TypeInfo.visitWithTypeInfo)(typeInfo, visitor)); } catch (e) { - if (e === abortError) { - errors.push(abortError); - } else { + if (e !== abortObj) { throw e; } } @@ -41898,6 +40995,7 @@ typeInfo = new _TypeInfo.TypeInfo(schema)) { /** * @internal */ + function validateSDL(documentAST, schemaToExtend, rules = _specifiedRules.specifiedSDLRules) { const errors = []; const context = new _ValidationContext.SDLValidationContext(documentAST, schemaToExtend, error => { @@ -41913,6 +41011,7 @@ function validateSDL(documentAST, schemaToExtend, rules = _specifiedRules.specif * * @internal */ + function assertValidSDL(documentAST) { const errors = validateSDL(documentAST); if (errors.length !== 0) { @@ -41925,6 +41024,7 @@ function assertValidSDL(documentAST) { * * @internal */ + function assertValidSDLExtension(documentAST, schema) { const errors = validateSDL(documentAST, schema); if (errors.length !== 0) { @@ -41948,18 +41048,20 @@ Object.defineProperty(exports, "__esModule", ({ exports.versionInfo = exports.version = void 0; // Note: This file is autogenerated using "resources/gen-version.js" script and // automatically updated by "npm version" command. + /** * A string containing the version of the GraphQL.js library */ -const version = exports.version = '17.0.0-alpha.7'; +const version = exports.version = '16.9.0'; /** * An object containing the components of the GraphQL.js version string */ + const versionInfo = exports.versionInfo = Object.freeze({ - major: 17, - minor: 0, + major: 16, + minor: 9, patch: 0, - preReleaseTag: 'alpha.7' + preReleaseTag: null }); /***/ }), @@ -69309,7 +68411,7 @@ function createContextHook(context) { var _a; const value = React.useContext(context); if (value === null && (options == null ? void 0 : options.nonNull)) { - throw new Error(`Tried to use \`${((_a = options.caller) == null ? void 0 : _a.name) || useGivenContext.caller.name}\` without the necessary context. Make sure to render the \`${context.displayName}Provider\` component higher up the tree.`); + throw new Error(`Tried to use \`${((_a = options.caller) == null ? void 0 : _a.name) || "a component"}\` without the necessary context. Make sure to render the \`${context.displayName}Provider\` component higher up the tree.`); } return value; } diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 5e24ee6250e4ad778886c374c7ca972faf2e3ce6..beee9c5781500ba5781fb0ae7b7640961b293848 100644 GIT binary patch literal 390368 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�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 ybmy3v6MCg!8|D&&z!Xa>z&?S7ZK62@rW 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 literal 390918 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

    4^=g`Sff(E@L(RCtwPq+2STBdj%82Kz6K16l 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 ==iNqSOZ?wRQ<+?o@cctb!))0 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 delta 108389 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 diff --git a/netbox/project-static/netbox-graphiql/package.json b/netbox/project-static/netbox-graphiql/package.json index 27257e34c..c5b2f3077 100644 --- a/netbox/project-static/netbox-graphiql/package.json +++ b/netbox/project-static/netbox-graphiql/package.json @@ -1,13 +1,13 @@ { "name": "netbox-graphiql", - "version": "4.1.0", + "version": "4.2.0", "description": "NetBox GraphiQL Custom Front End", "main": "dist/graphiql.js", "license": "Apache-2.0", "private": true, "dependencies": { - "@graphiql/plugin-explorer": "3.2.2", - "graphiql": "3.7.1", + "@graphiql/plugin-explorer": "3.2.3", + "graphiql": "3.7.2", "graphql": "16.9.0", "js-cookie": "3.0.5", "react": "18.3.1", diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index 0750f397b..bbc9c6ff7 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -27,11 +27,11 @@ "bootstrap": "5.3.3", "clipboard": "2.0.11", "flatpickr": "4.6.13", - "gridstack": "10.3.1", + "gridstack": "11.1.1", "htmx.org": "1.9.12", "query-string": "9.1.1", - "sass": "1.80.5", - "tom-select": "2.3.1", + "sass": "1.81.0", + "tom-select": "2.4.1", "typeface-inter": "3.18.1", "typeface-roboto-mono": "1.1.13" }, diff --git a/netbox/project-static/src/select/classes/dynamicTomSelect.ts b/netbox/project-static/src/select/classes/dynamicTomSelect.ts index 72c9fe518..8e44ce6a7 100644 --- a/netbox/project-static/src/select/classes/dynamicTomSelect.ts +++ b/netbox/project-static/src/select/classes/dynamicTomSelect.ts @@ -1,18 +1,17 @@ -import { RecursivePartial, TomInput, TomOption, TomSettings } from 'tom-select/dist/types/types'; -import { addClasses } from 'tom-select/src/vanilla' +import { RecursivePartial, TomOption, TomSettings } from 'tom-select/dist/types/types'; +import { TomInput } from 'tom-select/dist/cjs/types/core'; +import { addClasses } from 'tom-select/src/vanilla.ts'; import queryString from 'query-string'; import TomSelect from 'tom-select'; import type { Stringifiable } from 'query-string'; import { DynamicParamsMap } from './dynamicParamsMap'; // Transitional -import { QueryFilter, PathFilter } from '../types' +import { QueryFilter, PathFilter } from '../types'; import { getElement, replaceAll } from '../../util'; - // Extends TomSelect to provide enhanced fetching of options via the REST API export class DynamicTomSelect extends TomSelect { - public readonly nullOption: Nullable = null; // Transitional code from APISelect @@ -25,7 +24,7 @@ export class DynamicTomSelect extends TomSelect { * Overrides */ - constructor( input_arg: string|TomInput, user_settings: RecursivePartial ) { + constructor(input_arg: string | TomInput, user_settings: RecursivePartial) { super(input_arg, user_settings); // Glean the REST API endpoint URL from the ' + cm.phrase("(Use line:column or scroll% syntax)") + ''; + } + function interpretLine(cm, string) { + var num = Number(string); + if (/^[-+]/.test(string)) return cm.getCursor().line + num;else return num - 1; + } + CodeMirror.commands.jumpToLine = function (cm) { + var cur = cm.getCursor(); + dialog(cm, getJumpDialog(cm), cm.phrase("Jump to line:"), cur.line + 1 + ":" + cur.ch, function (posStr) { + if (!posStr) return; + var match; + if (match = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr)) { + cm.setCursor(interpretLine(cm, match[1]), Number(match[2])); + } else if (match = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr)) { + var line = Math.round(cm.lineCount() * Number(match[1]) / 100); + if (/^[-+]/.test(match[1])) line = cur.line + line + 1; + cm.setCursor(line - 1, cur.ch); + } else if (match = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr)) { + cm.setCursor(interpretLine(cm, match[1]), cur.ch); + } + }); + }; + CodeMirror.keyMap["default"]["Alt-G"] = "jumpToLine"; +}); + +/***/ }), + +/***/ "../../../node_modules/codemirror/addon/search/search.js": +/*!***************************************************************!*\ + !*** ../../../node_modules/codemirror/addon/search/search.js ***! + \***************************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +// Define search commands. Depends on dialog.js or another +// implementation of the openDialog method. + +// Replace works a little oddly -- it will do the replace on the next +// Ctrl-G (or whatever is bound to findNext) press. You prevent a +// replace by making sure the match is no longer selected when hitting +// Ctrl-G. + +(function (mod) { + if (true) + // CommonJS + mod(__webpack_require__(/*! ../../lib/codemirror */ "../../../node_modules/codemirror/lib/codemirror.js"), __webpack_require__(/*! ./searchcursor */ "../../../node_modules/codemirror/addon/search/searchcursor.js"), __webpack_require__(/*! ../dialog/dialog */ "../../../node_modules/codemirror/addon/dialog/dialog.js"));else {} +})(function (CodeMirror) { + "use strict"; + + // default search panel location + CodeMirror.defineOption("search", { + bottom: false + }); + function searchOverlay(query, caseInsensitive) { + if (typeof query == "string") query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");else if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "gi" : "g"); + return { + token: function (stream) { + query.lastIndex = stream.pos; + var match = query.exec(stream.string); + if (match && match.index == stream.pos) { + stream.pos += match[0].length || 1; + return "searching"; + } else if (match) { + stream.pos = match.index; + } else { + stream.skipToEnd(); + } + } + }; + } + function SearchState() { + this.posFrom = this.posTo = this.lastQuery = this.query = null; + this.overlay = null; + } + function getSearchState(cm) { + return cm.state.search || (cm.state.search = new SearchState()); + } + function queryCaseInsensitive(query) { + return typeof query == "string" && query == query.toLowerCase(); + } + function getSearchCursor(cm, query, pos) { + // Heuristic: if the query string is all lowercase, do a case insensitive search. + return cm.getSearchCursor(query, pos, { + caseFold: queryCaseInsensitive(query), + multiline: true + }); + } + function persistentDialog(cm, text, deflt, onEnter, onKeyDown) { + cm.openDialog(text, onEnter, { + value: deflt, + selectValueOnOpen: true, + closeOnEnter: false, + onClose: function () { + clearSearch(cm); + }, + onKeyDown: onKeyDown, + bottom: cm.options.search.bottom + }); + } + function dialog(cm, text, shortText, deflt, f) { + if (cm.openDialog) cm.openDialog(text, f, { + value: deflt, + selectValueOnOpen: true, + bottom: cm.options.search.bottom + });else f(prompt(shortText, deflt)); + } + function confirmDialog(cm, text, shortText, fs) { + if (cm.openConfirm) cm.openConfirm(text, fs);else if (confirm(shortText)) fs[0](); + } + function parseString(string) { + return string.replace(/\\([nrt\\])/g, function (match, ch) { + if (ch == "n") return "\n"; + if (ch == "r") return "\r"; + if (ch == "t") return "\t"; + if (ch == "\\") return "\\"; + return match; + }); + } + function parseQuery(query) { + var isRE = query.match(/^\/(.*)\/([a-z]*)$/); + if (isRE) { + try { + query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); + } catch (e) {} // Not a regular expression after all, do a string search + } else { + query = parseString(query); + } + if (typeof query == "string" ? query == "" : query.test("")) query = /x^/; + return query; + } + function startSearch(cm, state, query) { + state.queryText = query; + state.query = parseQuery(query); + cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query)); + state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query)); + cm.addOverlay(state.overlay); + if (cm.showMatchesOnScrollbar) { + if (state.annotate) { + state.annotate.clear(); + state.annotate = null; + } + state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query)); + } + } + function doSearch(cm, rev, persistent, immediate) { + var state = getSearchState(cm); + if (state.query) return findNext(cm, rev); + var q = cm.getSelection() || state.lastQuery; + if (q instanceof RegExp && q.source == "x^") q = null; + if (persistent && cm.openDialog) { + var hiding = null; + var searchNext = function (query, event) { + CodeMirror.e_stop(event); + if (!query) return; + if (query != state.queryText) { + startSearch(cm, state, query); + state.posFrom = state.posTo = cm.getCursor(); + } + if (hiding) hiding.style.opacity = 1; + findNext(cm, event.shiftKey, function (_, to) { + var dialog; + if (to.line < 3 && document.querySelector && (dialog = cm.display.wrapper.querySelector(".CodeMirror-dialog")) && dialog.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top) (hiding = dialog).style.opacity = .4; + }); + }; + persistentDialog(cm, getQueryDialog(cm), q, searchNext, function (event, query) { + var keyName = CodeMirror.keyName(event); + var extra = cm.getOption('extraKeys'), + cmd = extra && extra[keyName] || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]; + if (cmd == "findNext" || cmd == "findPrev" || cmd == "findPersistentNext" || cmd == "findPersistentPrev") { + CodeMirror.e_stop(event); + startSearch(cm, getSearchState(cm), query); + cm.execCommand(cmd); + } else if (cmd == "find" || cmd == "findPersistent") { + CodeMirror.e_stop(event); + searchNext(query, event); + } + }); + if (immediate && q) { + startSearch(cm, state, q); + findNext(cm, rev); + } + } else { + dialog(cm, getQueryDialog(cm), "Search for:", q, function (query) { + if (query && !state.query) cm.operation(function () { + startSearch(cm, state, query); + state.posFrom = state.posTo = cm.getCursor(); + findNext(cm, rev); + }); + }); + } + } + function findNext(cm, rev, callback) { + cm.operation(function () { + var state = getSearchState(cm); + var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo); + if (!cursor.find(rev)) { + cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0)); + if (!cursor.find(rev)) return; + } + cm.setSelection(cursor.from(), cursor.to()); + cm.scrollIntoView({ + from: cursor.from(), + to: cursor.to() + }, 20); + state.posFrom = cursor.from(); + state.posTo = cursor.to(); + if (callback) callback(cursor.from(), cursor.to()); + }); + } + function clearSearch(cm) { + cm.operation(function () { + var state = getSearchState(cm); + state.lastQuery = state.query; + if (!state.query) return; + state.query = state.queryText = null; + cm.removeOverlay(state.overlay); + if (state.annotate) { + state.annotate.clear(); + state.annotate = null; + } + }); + } + function el(tag, attrs) { + var element = tag ? document.createElement(tag) : document.createDocumentFragment(); + for (var key in attrs) { + element[key] = attrs[key]; + } + for (var i = 2; i < arguments.length; i++) { + var child = arguments[i]; + element.appendChild(typeof child == "string" ? document.createTextNode(child) : child); + } + return element; + } + function getQueryDialog(cm) { + return el("", null, el("span", { + className: "CodeMirror-search-label" + }, cm.phrase("Search:")), " ", el("input", { + type: "text", + "style": "width: 10em", + className: "CodeMirror-search-field" + }), " ", el("span", { + style: "color: #888", + className: "CodeMirror-search-hint" + }, cm.phrase("(Use /re/ syntax for regexp search)"))); + } + function getReplaceQueryDialog(cm) { + return el("", null, " ", el("input", { + type: "text", + "style": "width: 10em", + className: "CodeMirror-search-field" + }), " ", el("span", { + style: "color: #888", + className: "CodeMirror-search-hint" + }, cm.phrase("(Use /re/ syntax for regexp search)"))); + } + function getReplacementQueryDialog(cm) { + return el("", null, el("span", { + className: "CodeMirror-search-label" + }, cm.phrase("With:")), " ", el("input", { + type: "text", + "style": "width: 10em", + className: "CodeMirror-search-field" + })); + } + function getDoReplaceConfirm(cm) { + return el("", null, el("span", { + className: "CodeMirror-search-label" + }, cm.phrase("Replace?")), " ", el("button", {}, cm.phrase("Yes")), " ", el("button", {}, cm.phrase("No")), " ", el("button", {}, cm.phrase("All")), " ", el("button", {}, cm.phrase("Stop"))); + } + function replaceAll(cm, query, text) { + cm.operation(function () { + for (var cursor = getSearchCursor(cm, query); cursor.findNext();) { + if (typeof query != "string") { + var match = cm.getRange(cursor.from(), cursor.to()).match(query); + cursor.replace(text.replace(/\$(\d)/g, function (_, i) { + return match[i]; + })); + } else cursor.replace(text); + } + }); + } + function replace(cm, all) { + if (cm.getOption("readOnly")) return; + var query = cm.getSelection() || getSearchState(cm).lastQuery; + var dialogText = all ? cm.phrase("Replace all:") : cm.phrase("Replace:"); + var fragment = el("", null, el("span", { + className: "CodeMirror-search-label" + }, dialogText), getReplaceQueryDialog(cm)); + dialog(cm, fragment, dialogText, query, function (query) { + if (!query) return; + query = parseQuery(query); + dialog(cm, getReplacementQueryDialog(cm), cm.phrase("Replace with:"), "", function (text) { + text = parseString(text); + if (all) { + replaceAll(cm, query, text); + } else { + clearSearch(cm); + var cursor = getSearchCursor(cm, query, cm.getCursor("from")); + var advance = function () { + var start = cursor.from(), + match; + if (!(match = cursor.findNext())) { + cursor = getSearchCursor(cm, query); + if (!(match = cursor.findNext()) || start && cursor.from().line == start.line && cursor.from().ch == start.ch) return; + } + cm.setSelection(cursor.from(), cursor.to()); + cm.scrollIntoView({ + from: cursor.from(), + to: cursor.to() + }); + confirmDialog(cm, getDoReplaceConfirm(cm), cm.phrase("Replace?"), [function () { + doReplace(match); + }, advance, function () { + replaceAll(cm, query, text); + }]); + }; + var doReplace = function (match) { + cursor.replace(typeof query == "string" ? text : text.replace(/\$(\d)/g, function (_, i) { + return match[i]; + })); + advance(); + }; + advance(); + } + }); + }); + } + CodeMirror.commands.find = function (cm) { + clearSearch(cm); + doSearch(cm); + }; + CodeMirror.commands.findPersistent = function (cm) { + clearSearch(cm); + doSearch(cm, false, true); + }; + CodeMirror.commands.findPersistentNext = function (cm) { + doSearch(cm, false, true, true); + }; + CodeMirror.commands.findPersistentPrev = function (cm) { + doSearch(cm, true, true, true); + }; + CodeMirror.commands.findNext = doSearch; + CodeMirror.commands.findPrev = function (cm) { + doSearch(cm, true); + }; + CodeMirror.commands.clearSearch = clearSearch; + CodeMirror.commands.replace = replace; + CodeMirror.commands.replaceAll = function (cm) { + replace(cm, true); + }; +}); + +/***/ }), + +/***/ "../../../node_modules/codemirror/addon/search/searchcursor.js": +/*!*********************************************************************!*\ + !*** ../../../node_modules/codemirror/addon/search/searchcursor.js ***! + \*********************************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +(function (mod) { + if (true) + // CommonJS + mod(__webpack_require__(/*! ../../lib/codemirror */ "../../../node_modules/codemirror/lib/codemirror.js"));else {} +})(function (CodeMirror) { + "use strict"; + + var Pos = CodeMirror.Pos; + function regexpFlags(regexp) { + var flags = regexp.flags; + return flags != null ? flags : (regexp.ignoreCase ? "i" : "") + (regexp.global ? "g" : "") + (regexp.multiline ? "m" : ""); + } + function ensureFlags(regexp, flags) { + var current = regexpFlags(regexp), + target = current; + for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1) target += flags.charAt(i); + return current == target ? regexp : new RegExp(regexp.source, target); + } + function maybeMultiline(regexp) { + return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source); + } + function searchRegexpForward(doc, regexp, start) { + regexp = ensureFlags(regexp, "g"); + for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) { + regexp.lastIndex = ch; + var string = doc.getLine(line), + match = regexp.exec(string); + if (match) return { + from: Pos(line, match.index), + to: Pos(line, match.index + match[0].length), + match: match + }; + } + } + function searchRegexpForwardMultiline(doc, regexp, start) { + if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start); + regexp = ensureFlags(regexp, "gm"); + var string, + chunk = 1; + for (var line = start.line, last = doc.lastLine(); line <= last;) { + // This grows the search buffer in exponentially-sized chunks + // between matches, so that nearby matches are fast and don't + // require concatenating the whole document (in case we're + // searching for something that has tons of matches), but at the + // same time, the amount of retries is limited. + for (var i = 0; i < chunk; i++) { + if (line > last) break; + var curLine = doc.getLine(line++); + string = string == null ? curLine : string + "\n" + curLine; + } + chunk = chunk * 2; + regexp.lastIndex = start.ch; + var match = regexp.exec(string); + if (match) { + var before = string.slice(0, match.index).split("\n"), + inside = match[0].split("\n"); + var startLine = start.line + before.length - 1, + startCh = before[before.length - 1].length; + return { + from: Pos(startLine, startCh), + to: Pos(startLine + inside.length - 1, inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length), + match: match + }; + } + } + } + function lastMatchIn(string, regexp, endMargin) { + var match, + from = 0; + while (from <= string.length) { + regexp.lastIndex = from; + var newMatch = regexp.exec(string); + if (!newMatch) break; + var end = newMatch.index + newMatch[0].length; + if (end > string.length - endMargin) break; + if (!match || end > match.index + match[0].length) match = newMatch; + from = newMatch.index + 1; + } + return match; + } + function searchRegexpBackward(doc, regexp, start) { + regexp = ensureFlags(regexp, "g"); + for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) { + var string = doc.getLine(line); + var match = lastMatchIn(string, regexp, ch < 0 ? 0 : string.length - ch); + if (match) return { + from: Pos(line, match.index), + to: Pos(line, match.index + match[0].length), + match: match + }; + } + } + function searchRegexpBackwardMultiline(doc, regexp, start) { + if (!maybeMultiline(regexp)) return searchRegexpBackward(doc, regexp, start); + regexp = ensureFlags(regexp, "gm"); + var string, + chunkSize = 1, + endMargin = doc.getLine(start.line).length - start.ch; + for (var line = start.line, first = doc.firstLine(); line >= first;) { + for (var i = 0; i < chunkSize && line >= first; i++) { + var curLine = doc.getLine(line--); + string = string == null ? curLine : curLine + "\n" + string; + } + chunkSize *= 2; + var match = lastMatchIn(string, regexp, endMargin); + if (match) { + var before = string.slice(0, match.index).split("\n"), + inside = match[0].split("\n"); + var startLine = line + before.length, + startCh = before[before.length - 1].length; + return { + from: Pos(startLine, startCh), + to: Pos(startLine + inside.length - 1, inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length), + match: match + }; + } + } + } + var doFold, noFold; + if (String.prototype.normalize) { + doFold = function (str) { + return str.normalize("NFD").toLowerCase(); + }; + noFold = function (str) { + return str.normalize("NFD"); + }; + } else { + doFold = function (str) { + return str.toLowerCase(); + }; + noFold = function (str) { + return str; + }; + } + + // Maps a position in a case-folded line back to a position in the original line + // (compensating for codepoints increasing in number during folding) + function adjustPos(orig, folded, pos, foldFunc) { + if (orig.length == folded.length) return pos; + for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) { + if (min == max) return min; + var mid = min + max >> 1; + var len = foldFunc(orig.slice(0, mid)).length; + if (len == pos) return mid;else if (len > pos) max = mid;else min = mid + 1; + } + } + function searchStringForward(doc, query, start, caseFold) { + // Empty string would match anything and never progress, so we + // define it to match nothing instead. + if (!query.length) return null; + var fold = caseFold ? doFold : noFold; + var lines = fold(query).split(/\r|\n\r?/); + search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) { + var orig = doc.getLine(line).slice(ch), + string = fold(orig); + if (lines.length == 1) { + var found = string.indexOf(lines[0]); + if (found == -1) continue search; + var start = adjustPos(orig, string, found, fold) + ch; + return { + from: Pos(line, adjustPos(orig, string, found, fold) + ch), + to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch) + }; + } else { + var cutFrom = string.length - lines[0].length; + if (string.slice(cutFrom) != lines[0]) continue search; + for (var i = 1; i < lines.length - 1; i++) if (fold(doc.getLine(line + i)) != lines[i]) continue search; + var end = doc.getLine(line + lines.length - 1), + endString = fold(end), + lastLine = lines[lines.length - 1]; + if (endString.slice(0, lastLine.length) != lastLine) continue search; + return { + from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch), + to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold)) + }; + } + } + } + function searchStringBackward(doc, query, start, caseFold) { + if (!query.length) return null; + var fold = caseFold ? doFold : noFold; + var lines = fold(query).split(/\r|\n\r?/); + search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) { + var orig = doc.getLine(line); + if (ch > -1) orig = orig.slice(0, ch); + var string = fold(orig); + if (lines.length == 1) { + var found = string.lastIndexOf(lines[0]); + if (found == -1) continue search; + return { + from: Pos(line, adjustPos(orig, string, found, fold)), + to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold)) + }; + } else { + var lastLine = lines[lines.length - 1]; + if (string.slice(0, lastLine.length) != lastLine) continue search; + for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++) if (fold(doc.getLine(start + i)) != lines[i]) continue search; + var top = doc.getLine(line + 1 - lines.length), + topString = fold(top); + if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search; + return { + from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)), + to: Pos(line, adjustPos(orig, string, lastLine.length, fold)) + }; + } + } + } + function SearchCursor(doc, query, pos, options) { + this.atOccurrence = false; + this.afterEmptyMatch = false; + this.doc = doc; + pos = pos ? doc.clipPos(pos) : Pos(0, 0); + this.pos = { + from: pos, + to: pos + }; + var caseFold; + if (typeof options == "object") { + caseFold = options.caseFold; + } else { + // Backwards compat for when caseFold was the 4th argument + caseFold = options; + options = null; + } + if (typeof query == "string") { + if (caseFold == null) caseFold = false; + this.matches = function (reverse, pos) { + return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold); + }; + } else { + query = ensureFlags(query, "gm"); + if (!options || options.multiline !== false) this.matches = function (reverse, pos) { + return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos); + };else this.matches = function (reverse, pos) { + return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos); + }; + } + } + SearchCursor.prototype = { + findNext: function () { + return this.find(false); + }, + findPrevious: function () { + return this.find(true); + }, + find: function (reverse) { + var head = this.doc.clipPos(reverse ? this.pos.from : this.pos.to); + if (this.afterEmptyMatch && this.atOccurrence) { + // do not return the same 0 width match twice + head = Pos(head.line, head.ch); + if (reverse) { + head.ch--; + if (head.ch < 0) { + head.line--; + head.ch = (this.doc.getLine(head.line) || "").length; + } + } else { + head.ch++; + if (head.ch > (this.doc.getLine(head.line) || "").length) { + head.ch = 0; + head.line++; + } + } + if (CodeMirror.cmpPos(head, this.doc.clipPos(head)) != 0) { + return this.atOccurrence = false; + } + } + var result = this.matches(reverse, head); + this.afterEmptyMatch = result && CodeMirror.cmpPos(result.from, result.to) == 0; + if (result) { + this.pos = result; + this.atOccurrence = true; + return this.pos.match || true; + } else { + var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0); + this.pos = { + from: end, + to: end + }; + return this.atOccurrence = false; + } + }, + from: function () { + if (this.atOccurrence) return this.pos.from; + }, + to: function () { + if (this.atOccurrence) return this.pos.to; + }, + replace: function (newText, origin) { + if (!this.atOccurrence) return; + var lines = CodeMirror.splitLines(newText); + this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin); + this.pos.to = Pos(this.pos.from.line + lines.length - 1, lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0)); + } + }; + CodeMirror.defineExtension("getSearchCursor", function (query, pos, caseFold) { + return new SearchCursor(this.doc, query, pos, caseFold); + }); + CodeMirror.defineDocExtension("getSearchCursor", function (query, pos, caseFold) { + return new SearchCursor(this, query, pos, caseFold); + }); + CodeMirror.defineExtension("selectMatches", function (query, caseFold) { + var ranges = []; + var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold); + while (cur.findNext()) { + if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break; + ranges.push({ + anchor: cur.from(), + head: cur.to() + }); + } + if (ranges.length) this.setSelections(ranges, 0); + }); +}); + +/***/ }), + +/***/ "../../../node_modules/codemirror/keymap/sublime.js": +/*!**********************************************************!*\ + !*** ../../../node_modules/codemirror/keymap/sublime.js ***! + \**********************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +// A rough approximation of Sublime Text's keybindings +// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js + +(function (mod) { + if (true) + // CommonJS + mod(__webpack_require__(/*! ../lib/codemirror */ "../../../node_modules/codemirror/lib/codemirror.js"), __webpack_require__(/*! ../addon/search/searchcursor */ "../../../node_modules/codemirror/addon/search/searchcursor.js"), __webpack_require__(/*! ../addon/edit/matchbrackets */ "../../../node_modules/codemirror/addon/edit/matchbrackets.js"));else {} +})(function (CodeMirror) { + "use strict"; + + var cmds = CodeMirror.commands; + var Pos = CodeMirror.Pos; + + // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that. + function findPosSubword(doc, start, dir) { + if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1)); + var line = doc.getLine(start.line); + if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0)); + var state = "start", + type, + startPos = start.ch; + for (var pos = startPos, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) { + var next = line.charAt(dir < 0 ? pos - 1 : pos); + var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o"; + if (cat == "w" && next.toUpperCase() == next) cat = "W"; + if (state == "start") { + if (cat != "o") { + state = "in"; + type = cat; + } else startPos = pos + dir; + } else if (state == "in") { + if (type != cat) { + if (type == "w" && cat == "W" && dir < 0) pos--; + if (type == "W" && cat == "w" && dir > 0) { + // From uppercase to lowercase + if (pos == startPos + 1) { + type = "w"; + continue; + } else pos--; + } + break; + } + } + } + return Pos(start.line, pos); + } + function moveSubword(cm, dir) { + cm.extendSelectionsBy(function (range) { + if (cm.display.shift || cm.doc.extend || range.empty()) return findPosSubword(cm.doc, range.head, dir);else return dir < 0 ? range.from() : range.to(); + }); + } + cmds.goSubwordLeft = function (cm) { + moveSubword(cm, -1); + }; + cmds.goSubwordRight = function (cm) { + moveSubword(cm, 1); + }; + cmds.scrollLineUp = function (cm) { + var info = cm.getScrollInfo(); + if (!cm.somethingSelected()) { + var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local"); + if (cm.getCursor().line >= visibleBottomLine) cm.execCommand("goLineUp"); + } + cm.scrollTo(null, info.top - cm.defaultTextHeight()); + }; + cmds.scrollLineDown = function (cm) { + var info = cm.getScrollInfo(); + if (!cm.somethingSelected()) { + var visibleTopLine = cm.lineAtHeight(info.top, "local") + 1; + if (cm.getCursor().line <= visibleTopLine) cm.execCommand("goLineDown"); + } + cm.scrollTo(null, info.top + cm.defaultTextHeight()); + }; + cmds.splitSelectionByLine = function (cm) { + var ranges = cm.listSelections(), + lineRanges = []; + for (var i = 0; i < ranges.length; i++) { + var from = ranges[i].from(), + to = ranges[i].to(); + for (var line = from.line; line <= to.line; ++line) if (!(to.line > from.line && line == to.line && to.ch == 0)) lineRanges.push({ + anchor: line == from.line ? from : Pos(line, 0), + head: line == to.line ? to : Pos(line) + }); + } + cm.setSelections(lineRanges, 0); + }; + cmds.singleSelectionTop = function (cm) { + var range = cm.listSelections()[0]; + cm.setSelection(range.anchor, range.head, { + scroll: false + }); + }; + cmds.selectLine = function (cm) { + var ranges = cm.listSelections(), + extended = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + extended.push({ + anchor: Pos(range.from().line, 0), + head: Pos(range.to().line + 1, 0) + }); + } + cm.setSelections(extended); + }; + function insertLine(cm, above) { + if (cm.isReadOnly()) return CodeMirror.Pass; + cm.operation(function () { + var len = cm.listSelections().length, + newSelection = [], + last = -1; + for (var i = 0; i < len; i++) { + var head = cm.listSelections()[i].head; + if (head.line <= last) continue; + var at = Pos(head.line + (above ? 0 : 1), 0); + cm.replaceRange("\n", at, null, "+insertLine"); + cm.indentLine(at.line, null, true); + newSelection.push({ + head: at, + anchor: at + }); + last = head.line + 1; + } + cm.setSelections(newSelection); + }); + cm.execCommand("indentAuto"); + } + cmds.insertLineAfter = function (cm) { + return insertLine(cm, false); + }; + cmds.insertLineBefore = function (cm) { + return insertLine(cm, true); + }; + function wordAt(cm, pos) { + var start = pos.ch, + end = start, + line = cm.getLine(pos.line); + while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start; + while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end; + return { + from: Pos(pos.line, start), + to: Pos(pos.line, end), + word: line.slice(start, end) + }; + } + cmds.selectNextOccurrence = function (cm) { + var from = cm.getCursor("from"), + to = cm.getCursor("to"); + var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel; + if (CodeMirror.cmpPos(from, to) == 0) { + var word = wordAt(cm, from); + if (!word.word) return; + cm.setSelection(word.from, word.to); + fullWord = true; + } else { + var text = cm.getRange(from, to); + var query = fullWord ? new RegExp("\\b" + text + "\\b") : text; + var cur = cm.getSearchCursor(query, to); + var found = cur.findNext(); + if (!found) { + cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0)); + found = cur.findNext(); + } + if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to())) return; + cm.addSelection(cur.from(), cur.to()); + } + if (fullWord) cm.state.sublimeFindFullWord = cm.doc.sel; + }; + cmds.skipAndSelectNextOccurrence = function (cm) { + var prevAnchor = cm.getCursor("anchor"), + prevHead = cm.getCursor("head"); + cmds.selectNextOccurrence(cm); + if (CodeMirror.cmpPos(prevAnchor, prevHead) != 0) { + cm.doc.setSelections(cm.doc.listSelections().filter(function (sel) { + return sel.anchor != prevAnchor || sel.head != prevHead; + })); + } + }; + function addCursorToSelection(cm, dir) { + var ranges = cm.listSelections(), + newRanges = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + var newAnchor = cm.findPosV(range.anchor, dir, "line", range.anchor.goalColumn); + var newHead = cm.findPosV(range.head, dir, "line", range.head.goalColumn); + newAnchor.goalColumn = range.anchor.goalColumn != null ? range.anchor.goalColumn : cm.cursorCoords(range.anchor, "div").left; + newHead.goalColumn = range.head.goalColumn != null ? range.head.goalColumn : cm.cursorCoords(range.head, "div").left; + var newRange = { + anchor: newAnchor, + head: newHead + }; + newRanges.push(range); + newRanges.push(newRange); + } + cm.setSelections(newRanges); + } + cmds.addCursorToPrevLine = function (cm) { + addCursorToSelection(cm, -1); + }; + cmds.addCursorToNextLine = function (cm) { + addCursorToSelection(cm, 1); + }; + function isSelectedRange(ranges, from, to) { + for (var i = 0; i < ranges.length; i++) if (CodeMirror.cmpPos(ranges[i].from(), from) == 0 && CodeMirror.cmpPos(ranges[i].to(), to) == 0) return true; + return false; + } + var mirror = "(){}[]"; + function selectBetweenBrackets(cm) { + var ranges = cm.listSelections(), + newRanges = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i], + pos = range.head, + opening = cm.scanForBracket(pos, -1); + if (!opening) return false; + for (;;) { + var closing = cm.scanForBracket(pos, 1); + if (!closing) return false; + if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) { + var startPos = Pos(opening.pos.line, opening.pos.ch + 1); + if (CodeMirror.cmpPos(startPos, range.from()) == 0 && CodeMirror.cmpPos(closing.pos, range.to()) == 0) { + opening = cm.scanForBracket(opening.pos, -1); + if (!opening) return false; + } else { + newRanges.push({ + anchor: startPos, + head: closing.pos + }); + break; + } + } + pos = Pos(closing.pos.line, closing.pos.ch + 1); + } + } + cm.setSelections(newRanges); + return true; + } + cmds.selectScope = function (cm) { + selectBetweenBrackets(cm) || cm.execCommand("selectAll"); + }; + cmds.selectBetweenBrackets = function (cm) { + if (!selectBetweenBrackets(cm)) return CodeMirror.Pass; + }; + function puncType(type) { + return !type ? null : /\bpunctuation\b/.test(type) ? type : undefined; + } + cmds.goToBracket = function (cm) { + cm.extendSelectionsBy(function (range) { + var next = cm.scanForBracket(range.head, 1, puncType(cm.getTokenTypeAt(range.head))); + if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos; + var prev = cm.scanForBracket(range.head, -1, puncType(cm.getTokenTypeAt(Pos(range.head.line, range.head.ch + 1)))); + return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head; + }); + }; + cmds.swapLineUp = function (cm) { + if (cm.isReadOnly()) return CodeMirror.Pass; + var ranges = cm.listSelections(), + linesToMove = [], + at = cm.firstLine() - 1, + newSels = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i], + from = range.from().line - 1, + to = range.to().line; + newSels.push({ + anchor: Pos(range.anchor.line - 1, range.anchor.ch), + head: Pos(range.head.line - 1, range.head.ch) + }); + if (range.to().ch == 0 && !range.empty()) --to; + if (from > at) linesToMove.push(from, to);else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; + at = to; + } + cm.operation(function () { + for (var i = 0; i < linesToMove.length; i += 2) { + var from = linesToMove[i], + to = linesToMove[i + 1]; + var line = cm.getLine(from); + cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine"); + if (to > cm.lastLine()) cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");else cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine"); + } + cm.setSelections(newSels); + cm.scrollIntoView(); + }); + }; + cmds.swapLineDown = function (cm) { + if (cm.isReadOnly()) return CodeMirror.Pass; + var ranges = cm.listSelections(), + linesToMove = [], + at = cm.lastLine() + 1; + for (var i = ranges.length - 1; i >= 0; i--) { + var range = ranges[i], + from = range.to().line + 1, + to = range.from().line; + if (range.to().ch == 0 && !range.empty()) from--; + if (from < at) linesToMove.push(from, to);else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; + at = to; + } + cm.operation(function () { + for (var i = linesToMove.length - 2; i >= 0; i -= 2) { + var from = linesToMove[i], + to = linesToMove[i + 1]; + var line = cm.getLine(from); + if (from == cm.lastLine()) cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");else cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine"); + cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine"); + } + cm.scrollIntoView(); + }); + }; + cmds.toggleCommentIndented = function (cm) { + cm.toggleComment({ + indent: true + }); + }; + cmds.joinLines = function (cm) { + var ranges = cm.listSelections(), + joined = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i], + from = range.from(); + var start = from.line, + end = range.to().line; + while (i < ranges.length - 1 && ranges[i + 1].from().line == end) end = ranges[++i].to().line; + joined.push({ + start: start, + end: end, + anchor: !range.empty() && from + }); + } + cm.operation(function () { + var offset = 0, + ranges = []; + for (var i = 0; i < joined.length; i++) { + var obj = joined[i]; + var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), + head; + for (var line = obj.start; line <= obj.end; line++) { + var actual = line - offset; + if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1); + if (actual < cm.lastLine()) { + cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length)); + ++offset; + } + } + ranges.push({ + anchor: anchor || head, + head: head + }); + } + cm.setSelections(ranges, 0); + }); + }; + cmds.duplicateLine = function (cm) { + cm.operation(function () { + var rangeCount = cm.listSelections().length; + for (var i = 0; i < rangeCount; i++) { + var range = cm.listSelections()[i]; + if (range.empty()) cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));else cm.replaceRange(cm.getRange(range.from(), range.to()), range.from()); + } + cm.scrollIntoView(); + }); + }; + function sortLines(cm, caseSensitive, direction) { + if (cm.isReadOnly()) return CodeMirror.Pass; + var ranges = cm.listSelections(), + toSort = [], + selected; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + if (range.empty()) continue; + var from = range.from().line, + to = range.to().line; + while (i < ranges.length - 1 && ranges[i + 1].from().line == to) to = ranges[++i].to().line; + if (!ranges[i].to().ch) to--; + toSort.push(from, to); + } + if (toSort.length) selected = true;else toSort.push(cm.firstLine(), cm.lastLine()); + cm.operation(function () { + var ranges = []; + for (var i = 0; i < toSort.length; i += 2) { + var from = toSort[i], + to = toSort[i + 1]; + var start = Pos(from, 0), + end = Pos(to); + var lines = cm.getRange(start, end, false); + if (caseSensitive) lines.sort(function (a, b) { + return a < b ? -direction : a == b ? 0 : direction; + });else lines.sort(function (a, b) { + var au = a.toUpperCase(), + bu = b.toUpperCase(); + if (au != bu) { + a = au; + b = bu; + } + return a < b ? -direction : a == b ? 0 : direction; + }); + cm.replaceRange(lines, start, end); + if (selected) ranges.push({ + anchor: start, + head: Pos(to + 1, 0) + }); + } + if (selected) cm.setSelections(ranges, 0); + }); + } + cmds.sortLines = function (cm) { + sortLines(cm, true, 1); + }; + cmds.reverseSortLines = function (cm) { + sortLines(cm, true, -1); + }; + cmds.sortLinesInsensitive = function (cm) { + sortLines(cm, false, 1); + }; + cmds.reverseSortLinesInsensitive = function (cm) { + sortLines(cm, false, -1); + }; + cmds.nextBookmark = function (cm) { + var marks = cm.state.sublimeBookmarks; + if (marks) while (marks.length) { + var current = marks.shift(); + var found = current.find(); + if (found) { + marks.push(current); + return cm.setSelection(found.from, found.to); + } + } + }; + cmds.prevBookmark = function (cm) { + var marks = cm.state.sublimeBookmarks; + if (marks) while (marks.length) { + marks.unshift(marks.pop()); + var found = marks[marks.length - 1].find(); + if (!found) marks.pop();else return cm.setSelection(found.from, found.to); + } + }; + cmds.toggleBookmark = function (cm) { + var ranges = cm.listSelections(); + var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []); + for (var i = 0; i < ranges.length; i++) { + var from = ranges[i].from(), + to = ranges[i].to(); + var found = ranges[i].empty() ? cm.findMarksAt(from) : cm.findMarks(from, to); + for (var j = 0; j < found.length; j++) { + if (found[j].sublimeBookmark) { + found[j].clear(); + for (var k = 0; k < marks.length; k++) if (marks[k] == found[j]) marks.splice(k--, 1); + break; + } + } + if (j == found.length) marks.push(cm.markText(from, to, { + sublimeBookmark: true, + clearWhenEmpty: false + })); + } + }; + cmds.clearBookmarks = function (cm) { + var marks = cm.state.sublimeBookmarks; + if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear(); + marks.length = 0; + }; + cmds.selectBookmarks = function (cm) { + var marks = cm.state.sublimeBookmarks, + ranges = []; + if (marks) for (var i = 0; i < marks.length; i++) { + var found = marks[i].find(); + if (!found) marks.splice(i--, 0);else ranges.push({ + anchor: found.from, + head: found.to + }); + } + if (ranges.length) cm.setSelections(ranges, 0); + }; + function modifyWordOrSelection(cm, mod) { + cm.operation(function () { + var ranges = cm.listSelections(), + indices = [], + replacements = []; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + if (range.empty()) { + indices.push(i); + replacements.push(""); + } else replacements.push(mod(cm.getRange(range.from(), range.to()))); + } + cm.replaceSelections(replacements, "around", "case"); + for (var i = indices.length - 1, at; i >= 0; i--) { + var range = ranges[indices[i]]; + if (at && CodeMirror.cmpPos(range.head, at) > 0) continue; + var word = wordAt(cm, range.head); + at = word.from; + cm.replaceRange(mod(word.word), word.from, word.to); + } + }); + } + cmds.smartBackspace = function (cm) { + if (cm.somethingSelected()) return CodeMirror.Pass; + cm.operation(function () { + var cursors = cm.listSelections(); + var indentUnit = cm.getOption("indentUnit"); + for (var i = cursors.length - 1; i >= 0; i--) { + var cursor = cursors[i].head; + var toStartOfLine = cm.getRange({ + line: cursor.line, + ch: 0 + }, cursor); + var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize")); + + // Delete by one character by default + var deletePos = cm.findPosH(cursor, -1, "char", false); + if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) { + var prevIndent = new Pos(cursor.line, CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit)); + + // Smart delete only if we found a valid prevIndent location + if (prevIndent.ch != cursor.ch) deletePos = prevIndent; + } + cm.replaceRange("", deletePos, cursor, "+delete"); + } + }); + }; + cmds.delLineRight = function (cm) { + cm.operation(function () { + var ranges = cm.listSelections(); + for (var i = ranges.length - 1; i >= 0; i--) cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete"); + cm.scrollIntoView(); + }); + }; + cmds.upcaseAtCursor = function (cm) { + modifyWordOrSelection(cm, function (str) { + return str.toUpperCase(); + }); + }; + cmds.downcaseAtCursor = function (cm) { + modifyWordOrSelection(cm, function (str) { + return str.toLowerCase(); + }); + }; + cmds.setSublimeMark = function (cm) { + if (cm.state.sublimeMark) cm.state.sublimeMark.clear(); + cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); + }; + cmds.selectToSublimeMark = function (cm) { + var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); + if (found) cm.setSelection(cm.getCursor(), found); + }; + cmds.deleteToSublimeMark = function (cm) { + var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); + if (found) { + var from = cm.getCursor(), + to = found; + if (CodeMirror.cmpPos(from, to) > 0) { + var tmp = to; + to = from; + from = tmp; + } + cm.state.sublimeKilled = cm.getRange(from, to); + cm.replaceRange("", from, to); + } + }; + cmds.swapWithSublimeMark = function (cm) { + var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); + if (found) { + cm.state.sublimeMark.clear(); + cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); + cm.setCursor(found); + } + }; + cmds.sublimeYank = function (cm) { + if (cm.state.sublimeKilled != null) cm.replaceSelection(cm.state.sublimeKilled, null, "paste"); + }; + cmds.showInCenter = function (cm) { + var pos = cm.cursorCoords(null, "local"); + cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2); + }; + function getTarget(cm) { + var from = cm.getCursor("from"), + to = cm.getCursor("to"); + if (CodeMirror.cmpPos(from, to) == 0) { + var word = wordAt(cm, from); + if (!word.word) return; + from = word.from; + to = word.to; + } + return { + from: from, + to: to, + query: cm.getRange(from, to), + word: word + }; + } + function findAndGoTo(cm, forward) { + var target = getTarget(cm); + if (!target) return; + var query = target.query; + var cur = cm.getSearchCursor(query, forward ? target.to : target.from); + if (forward ? cur.findNext() : cur.findPrevious()) { + cm.setSelection(cur.from(), cur.to()); + } else { + cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0) : cm.clipPos(Pos(cm.lastLine()))); + if (forward ? cur.findNext() : cur.findPrevious()) cm.setSelection(cur.from(), cur.to());else if (target.word) cm.setSelection(target.from, target.to); + } + } + ; + cmds.findUnder = function (cm) { + findAndGoTo(cm, true); + }; + cmds.findUnderPrevious = function (cm) { + findAndGoTo(cm, false); + }; + cmds.findAllUnder = function (cm) { + var target = getTarget(cm); + if (!target) return; + var cur = cm.getSearchCursor(target.query); + var matches = []; + var primaryIndex = -1; + while (cur.findNext()) { + matches.push({ + anchor: cur.from(), + head: cur.to() + }); + if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch) primaryIndex++; + } + cm.setSelections(matches, primaryIndex); + }; + var keyMap = CodeMirror.keyMap; + keyMap.macSublime = { + "Cmd-Left": "goLineStartSmart", + "Shift-Tab": "indentLess", + "Shift-Ctrl-K": "deleteLine", + "Alt-Q": "wrapLines", + "Ctrl-Left": "goSubwordLeft", + "Ctrl-Right": "goSubwordRight", + "Ctrl-Alt-Up": "scrollLineUp", + "Ctrl-Alt-Down": "scrollLineDown", + "Cmd-L": "selectLine", + "Shift-Cmd-L": "splitSelectionByLine", + "Esc": "singleSelectionTop", + "Cmd-Enter": "insertLineAfter", + "Shift-Cmd-Enter": "insertLineBefore", + "Cmd-D": "selectNextOccurrence", + "Shift-Cmd-Space": "selectScope", + "Shift-Cmd-M": "selectBetweenBrackets", + "Cmd-M": "goToBracket", + "Cmd-Ctrl-Up": "swapLineUp", + "Cmd-Ctrl-Down": "swapLineDown", + "Cmd-/": "toggleCommentIndented", + "Cmd-J": "joinLines", + "Shift-Cmd-D": "duplicateLine", + "F5": "sortLines", + "Shift-F5": "reverseSortLines", + "Cmd-F5": "sortLinesInsensitive", + "Shift-Cmd-F5": "reverseSortLinesInsensitive", + "F2": "nextBookmark", + "Shift-F2": "prevBookmark", + "Cmd-F2": "toggleBookmark", + "Shift-Cmd-F2": "clearBookmarks", + "Alt-F2": "selectBookmarks", + "Backspace": "smartBackspace", + "Cmd-K Cmd-D": "skipAndSelectNextOccurrence", + "Cmd-K Cmd-K": "delLineRight", + "Cmd-K Cmd-U": "upcaseAtCursor", + "Cmd-K Cmd-L": "downcaseAtCursor", + "Cmd-K Cmd-Space": "setSublimeMark", + "Cmd-K Cmd-A": "selectToSublimeMark", + "Cmd-K Cmd-W": "deleteToSublimeMark", + "Cmd-K Cmd-X": "swapWithSublimeMark", + "Cmd-K Cmd-Y": "sublimeYank", + "Cmd-K Cmd-C": "showInCenter", + "Cmd-K Cmd-G": "clearBookmarks", + "Cmd-K Cmd-Backspace": "delLineLeft", + "Cmd-K Cmd-1": "foldAll", + "Cmd-K Cmd-0": "unfoldAll", + "Cmd-K Cmd-J": "unfoldAll", + "Ctrl-Shift-Up": "addCursorToPrevLine", + "Ctrl-Shift-Down": "addCursorToNextLine", + "Cmd-F3": "findUnder", + "Shift-Cmd-F3": "findUnderPrevious", + "Alt-F3": "findAllUnder", + "Shift-Cmd-[": "fold", + "Shift-Cmd-]": "unfold", + "Cmd-I": "findIncremental", + "Shift-Cmd-I": "findIncrementalReverse", + "Cmd-H": "replace", + "F3": "findNext", + "Shift-F3": "findPrev", + "fallthrough": "macDefault" + }; + CodeMirror.normalizeKeyMap(keyMap.macSublime); + keyMap.pcSublime = { + "Shift-Tab": "indentLess", + "Shift-Ctrl-K": "deleteLine", + "Alt-Q": "wrapLines", + "Ctrl-T": "transposeChars", + "Alt-Left": "goSubwordLeft", + "Alt-Right": "goSubwordRight", + "Ctrl-Up": "scrollLineUp", + "Ctrl-Down": "scrollLineDown", + "Ctrl-L": "selectLine", + "Shift-Ctrl-L": "splitSelectionByLine", + "Esc": "singleSelectionTop", + "Ctrl-Enter": "insertLineAfter", + "Shift-Ctrl-Enter": "insertLineBefore", + "Ctrl-D": "selectNextOccurrence", + "Shift-Ctrl-Space": "selectScope", + "Shift-Ctrl-M": "selectBetweenBrackets", + "Ctrl-M": "goToBracket", + "Shift-Ctrl-Up": "swapLineUp", + "Shift-Ctrl-Down": "swapLineDown", + "Ctrl-/": "toggleCommentIndented", + "Ctrl-J": "joinLines", + "Shift-Ctrl-D": "duplicateLine", + "F9": "sortLines", + "Shift-F9": "reverseSortLines", + "Ctrl-F9": "sortLinesInsensitive", + "Shift-Ctrl-F9": "reverseSortLinesInsensitive", + "F2": "nextBookmark", + "Shift-F2": "prevBookmark", + "Ctrl-F2": "toggleBookmark", + "Shift-Ctrl-F2": "clearBookmarks", + "Alt-F2": "selectBookmarks", + "Backspace": "smartBackspace", + "Ctrl-K Ctrl-D": "skipAndSelectNextOccurrence", + "Ctrl-K Ctrl-K": "delLineRight", + "Ctrl-K Ctrl-U": "upcaseAtCursor", + "Ctrl-K Ctrl-L": "downcaseAtCursor", + "Ctrl-K Ctrl-Space": "setSublimeMark", + "Ctrl-K Ctrl-A": "selectToSublimeMark", + "Ctrl-K Ctrl-W": "deleteToSublimeMark", + "Ctrl-K Ctrl-X": "swapWithSublimeMark", + "Ctrl-K Ctrl-Y": "sublimeYank", + "Ctrl-K Ctrl-C": "showInCenter", + "Ctrl-K Ctrl-G": "clearBookmarks", + "Ctrl-K Ctrl-Backspace": "delLineLeft", + "Ctrl-K Ctrl-1": "foldAll", + "Ctrl-K Ctrl-0": "unfoldAll", + "Ctrl-K Ctrl-J": "unfoldAll", + "Ctrl-Alt-Up": "addCursorToPrevLine", + "Ctrl-Alt-Down": "addCursorToNextLine", + "Ctrl-F3": "findUnder", + "Shift-Ctrl-F3": "findUnderPrevious", + "Alt-F3": "findAllUnder", + "Shift-Ctrl-[": "fold", + "Shift-Ctrl-]": "unfold", + "Ctrl-I": "findIncremental", + "Shift-Ctrl-I": "findIncrementalReverse", + "Ctrl-H": "replace", + "F3": "findNext", + "Shift-F3": "findPrev", + "fallthrough": "pcDefault" + }; + CodeMirror.normalizeKeyMap(keyMap.pcSublime); + var mac = keyMap.default == keyMap.macDefault; + keyMap.sublime = mac ? keyMap.macSublime : keyMap.pcSublime; +}); + +/***/ }), + +/***/ "../../../node_modules/codemirror/lib/codemirror.js": +/*!**********************************************************!*\ + !*** ../../../node_modules/codemirror/lib/codemirror.js ***! + \**********************************************************/ +/***/ (function(module) { + +"use strict"; + + +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +// This is CodeMirror (https://codemirror.net), a code editor +// implemented in JavaScript on top of the browser's DOM. +// +// You can find some technical background for some of the code below +// at http://marijnhaverbeke.nl/blog/#cm-internals . + +(function (global, factory) { + true ? module.exports = factory() : 0; +})(void 0, function () { + 'use strict'; + + // Kludges for bugs and behavior differences that can't be feature + // detected are enabled based on userAgent etc sniffing. + var userAgent = navigator.userAgent; + var platform = navigator.platform; + var gecko = /gecko\/\d/i.test(userAgent); + var ie_upto10 = /MSIE \d/.test(userAgent); + var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent); + var edge = /Edge\/(\d+)/.exec(userAgent); + var ie = ie_upto10 || ie_11up || edge; + var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]); + var webkit = !edge && /WebKit\//.test(userAgent); + var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent); + var chrome = !edge && /Chrome\//.test(userAgent); + var presto = /Opera\//.test(userAgent); + var safari = /Apple Computer/.test(navigator.vendor); + var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent); + var phantom = /PhantomJS/.test(userAgent); + var ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2); + var android = /Android/.test(userAgent); + // This is woefully incomplete. Suggestions for alternative methods welcome. + var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent); + var mac = ios || /Mac/.test(platform); + var chromeOS = /\bCrOS\b/.test(userAgent); + var windows = /win/i.test(platform); + var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/); + if (presto_version) { + presto_version = Number(presto_version[1]); + } + if (presto_version && presto_version >= 15) { + presto = false; + webkit = true; + } + // Some browsers use the wrong event properties to signal cmd/ctrl on OS X + var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); + var captureRightClick = gecko || ie && ie_version >= 9; + function classTest(cls) { + return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); + } + var rmClass = function (node, cls) { + var current = node.className; + var match = classTest(cls).exec(current); + if (match) { + var after = current.slice(match.index + match[0].length); + node.className = current.slice(0, match.index) + (after ? match[1] + after : ""); + } + }; + function removeChildren(e) { + for (var count = e.childNodes.length; count > 0; --count) { + e.removeChild(e.firstChild); + } + return e; + } + function removeChildrenAndAdd(parent, e) { + return removeChildren(parent).appendChild(e); + } + function elt(tag, content, className, style) { + var e = document.createElement(tag); + if (className) { + e.className = className; + } + if (style) { + e.style.cssText = style; + } + if (typeof content == "string") { + e.appendChild(document.createTextNode(content)); + } else if (content) { + for (var i = 0; i < content.length; ++i) { + e.appendChild(content[i]); + } + } + return e; + } + // wrapper for elt, which removes the elt from the accessibility tree + function eltP(tag, content, className, style) { + var e = elt(tag, content, className, style); + e.setAttribute("role", "presentation"); + return e; + } + var range; + if (document.createRange) { + range = function (node, start, end, endNode) { + var r = document.createRange(); + r.setEnd(endNode || node, end); + r.setStart(node, start); + return r; + }; + } else { + range = function (node, start, end) { + var r = document.body.createTextRange(); + try { + r.moveToElementText(node.parentNode); + } catch (e) { + return r; + } + r.collapse(true); + r.moveEnd("character", end); + r.moveStart("character", start); + return r; + }; + } + function contains(parent, child) { + if (child.nodeType == 3) + // Android browser always returns false when child is a textnode + { + child = child.parentNode; + } + if (parent.contains) { + return parent.contains(child); + } + do { + if (child.nodeType == 11) { + child = child.host; + } + if (child == parent) { + return true; + } + } while (child = child.parentNode); + } + function activeElt() { + // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement. + // IE < 10 will throw when accessed while the page is loading or in an iframe. + // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable. + var activeElement; + try { + activeElement = document.activeElement; + } catch (e) { + activeElement = document.body || null; + } + while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement) { + activeElement = activeElement.shadowRoot.activeElement; + } + return activeElement; + } + function addClass(node, cls) { + var current = node.className; + if (!classTest(cls).test(current)) { + node.className += (current ? " " : "") + cls; + } + } + function joinClasses(a, b) { + var as = a.split(" "); + for (var i = 0; i < as.length; i++) { + if (as[i] && !classTest(as[i]).test(b)) { + b += " " + as[i]; + } + } + return b; + } + var selectInput = function (node) { + node.select(); + }; + if (ios) + // Mobile Safari apparently has a bug where select() is broken. + { + selectInput = function (node) { + node.selectionStart = 0; + node.selectionEnd = node.value.length; + }; + } else if (ie) + // Suppress mysterious IE10 errors + { + selectInput = function (node) { + try { + node.select(); + } catch (_e) {} + }; + } + function bind(f) { + var args = Array.prototype.slice.call(arguments, 1); + return function () { + return f.apply(null, args); + }; + } + function copyObj(obj, target, overwrite) { + if (!target) { + target = {}; + } + for (var prop in obj) { + if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop))) { + target[prop] = obj[prop]; + } + } + return target; + } + + // Counts the column offset in a string, taking tabs into account. + // Used mostly to find indentation. + function countColumn(string, end, tabSize, startIndex, startValue) { + if (end == null) { + end = string.search(/[^\s\u00a0]/); + if (end == -1) { + end = string.length; + } + } + for (var i = startIndex || 0, n = startValue || 0;;) { + var nextTab = string.indexOf("\t", i); + if (nextTab < 0 || nextTab >= end) { + return n + (end - i); + } + n += nextTab - i; + n += tabSize - n % tabSize; + i = nextTab + 1; + } + } + var Delayed = function () { + this.id = null; + this.f = null; + this.time = 0; + this.handler = bind(this.onTimeout, this); + }; + Delayed.prototype.onTimeout = function (self) { + self.id = 0; + if (self.time <= +new Date()) { + self.f(); + } else { + setTimeout(self.handler, self.time - +new Date()); + } + }; + Delayed.prototype.set = function (ms, f) { + this.f = f; + var time = +new Date() + ms; + if (!this.id || time < this.time) { + clearTimeout(this.id); + this.id = setTimeout(this.handler, ms); + this.time = time; + } + }; + function indexOf(array, elt) { + for (var i = 0; i < array.length; ++i) { + if (array[i] == elt) { + return i; + } + } + return -1; + } + + // Number of pixels added to scroller and sizer to hide scrollbar + var scrollerGap = 50; + + // Returned or thrown by various protocols to signal 'I'm not + // handling this'. + var Pass = { + toString: function () { + return "CodeMirror.Pass"; + } + }; + + // Reused option objects for setSelection & friends + var sel_dontScroll = { + scroll: false + }, + sel_mouse = { + origin: "*mouse" + }, + sel_move = { + origin: "+move" + }; + + // The inverse of countColumn -- find the offset that corresponds to + // a particular column. + function findColumn(string, goal, tabSize) { + for (var pos = 0, col = 0;;) { + var nextTab = string.indexOf("\t", pos); + if (nextTab == -1) { + nextTab = string.length; + } + var skipped = nextTab - pos; + if (nextTab == string.length || col + skipped >= goal) { + return pos + Math.min(skipped, goal - col); + } + col += nextTab - pos; + col += tabSize - col % tabSize; + pos = nextTab + 1; + if (col >= goal) { + return pos; + } + } + } + var spaceStrs = [""]; + function spaceStr(n) { + while (spaceStrs.length <= n) { + spaceStrs.push(lst(spaceStrs) + " "); + } + return spaceStrs[n]; + } + function lst(arr) { + return arr[arr.length - 1]; + } + function map(array, f) { + var out = []; + for (var i = 0; i < array.length; i++) { + out[i] = f(array[i], i); + } + return out; + } + function insertSorted(array, value, score) { + var pos = 0, + priority = score(value); + while (pos < array.length && score(array[pos]) <= priority) { + pos++; + } + array.splice(pos, 0, value); + } + function nothing() {} + function createObj(base, props) { + var inst; + if (Object.create) { + inst = Object.create(base); + } else { + nothing.prototype = base; + inst = new nothing(); + } + if (props) { + copyObj(props, inst); + } + return inst; + } + var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/; + function isWordCharBasic(ch) { + return /\w/.test(ch) || ch > "\x80" && (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)); + } + function isWordChar(ch, helper) { + if (!helper) { + return isWordCharBasic(ch); + } + if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { + return true; + } + return helper.test(ch); + } + function isEmpty(obj) { + for (var n in obj) { + if (obj.hasOwnProperty(n) && obj[n]) { + return false; + } + } + return true; + } + + // Extending unicode characters. A series of a non-extending char + + // any number of extending chars is treated as a single unit as far + // as editing and measuring is concerned. This is not fully correct, + // since some scripts/fonts/browsers also treat other configurations + // of code points as a group. + var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/; + function isExtendingChar(ch) { + return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); + } + + // Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range. + function skipExtendingChars(str, pos, dir) { + while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { + pos += dir; + } + return pos; + } + + // Returns the value from the range [`from`; `to`] that satisfies + // `pred` and is closest to `from`. Assumes that at least `to` + // satisfies `pred`. Supports `from` being greater than `to`. + function findFirst(pred, from, to) { + // At any point we are certain `to` satisfies `pred`, don't know + // whether `from` does. + var dir = from > to ? -1 : 1; + for (;;) { + if (from == to) { + return from; + } + var midF = (from + to) / 2, + mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF); + if (mid == from) { + return pred(mid) ? from : to; + } + if (pred(mid)) { + to = mid; + } else { + from = mid + dir; + } + } + } + + // BIDI HELPERS + + function iterateBidiSections(order, from, to, f) { + if (!order) { + return f(from, to, "ltr", 0); + } + var found = false; + for (var i = 0; i < order.length; ++i) { + var part = order[i]; + if (part.from < to && part.to > from || from == to && part.to == from) { + f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i); + found = true; + } + } + if (!found) { + f(from, to, "ltr"); + } + } + var bidiOther = null; + function getBidiPartAt(order, ch, sticky) { + var found; + bidiOther = null; + for (var i = 0; i < order.length; ++i) { + var cur = order[i]; + if (cur.from < ch && cur.to > ch) { + return i; + } + if (cur.to == ch) { + if (cur.from != cur.to && sticky == "before") { + found = i; + } else { + bidiOther = i; + } + } + if (cur.from == ch) { + if (cur.from != cur.to && sticky != "before") { + found = i; + } else { + bidiOther = i; + } + } + } + return found != null ? found : bidiOther; + } + + // Bidirectional ordering algorithm + // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm + // that this (partially) implements. + + // One-char codes used for character types: + // L (L): Left-to-Right + // R (R): Right-to-Left + // r (AL): Right-to-Left Arabic + // 1 (EN): European Number + // + (ES): European Number Separator + // % (ET): European Number Terminator + // n (AN): Arabic Number + // , (CS): Common Number Separator + // m (NSM): Non-Spacing Mark + // b (BN): Boundary Neutral + // s (B): Paragraph Separator + // t (S): Segment Separator + // w (WS): Whitespace + // N (ON): Other Neutrals + + // Returns null if characters are ordered as they appear + // (left-to-right), or an array of sections ({from, to, level} + // objects) in the order in which they occur visually. + var bidiOrdering = function () { + // Character types for codepoints 0 to 0xff + var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"; + // Character types for codepoints 0x600 to 0x6f9 + var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111"; + function charType(code) { + if (code <= 0xf7) { + return lowTypes.charAt(code); + } else if (0x590 <= code && code <= 0x5f4) { + return "R"; + } else if (0x600 <= code && code <= 0x6f9) { + return arabicTypes.charAt(code - 0x600); + } else if (0x6ee <= code && code <= 0x8ac) { + return "r"; + } else if (0x2000 <= code && code <= 0x200b) { + return "w"; + } else if (code == 0x200c) { + return "b"; + } else { + return "L"; + } + } + var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/; + var isNeutral = /[stwN]/, + isStrong = /[LRr]/, + countsAsLeft = /[Lb1n]/, + countsAsNum = /[1n]/; + function BidiSpan(level, from, to) { + this.level = level; + this.from = from; + this.to = to; + } + return function (str, direction) { + var outerType = direction == "ltr" ? "L" : "R"; + if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { + return false; + } + var len = str.length, + types = []; + for (var i = 0; i < len; ++i) { + types.push(charType(str.charCodeAt(i))); + } + + // W1. Examine each non-spacing mark (NSM) in the level run, and + // change the type of the NSM to the type of the previous + // character. If the NSM is at the start of the level run, it will + // get the type of sor. + for (var i$1 = 0, prev = outerType; i$1 < len; ++i$1) { + var type = types[i$1]; + if (type == "m") { + types[i$1] = prev; + } else { + prev = type; + } + } + + // W2. Search backwards from each instance of a European number + // until the first strong type (R, L, AL, or sor) is found. If an + // AL is found, change the type of the European number to Arabic + // number. + // W3. Change all ALs to R. + for (var i$2 = 0, cur = outerType; i$2 < len; ++i$2) { + var type$1 = types[i$2]; + if (type$1 == "1" && cur == "r") { + types[i$2] = "n"; + } else if (isStrong.test(type$1)) { + cur = type$1; + if (type$1 == "r") { + types[i$2] = "R"; + } + } + } + + // W4. A single European separator between two European numbers + // changes to a European number. A single common separator between + // two numbers of the same type changes to that type. + for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) { + var type$2 = types[i$3]; + if (type$2 == "+" && prev$1 == "1" && types[i$3 + 1] == "1") { + types[i$3] = "1"; + } else if (type$2 == "," && prev$1 == types[i$3 + 1] && (prev$1 == "1" || prev$1 == "n")) { + types[i$3] = prev$1; + } + prev$1 = type$2; + } + + // W5. A sequence of European terminators adjacent to European + // numbers changes to all European numbers. + // W6. Otherwise, separators and terminators change to Other + // Neutral. + for (var i$4 = 0; i$4 < len; ++i$4) { + var type$3 = types[i$4]; + if (type$3 == ",") { + types[i$4] = "N"; + } else if (type$3 == "%") { + var end = void 0; + for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {} + var replace = i$4 && types[i$4 - 1] == "!" || end < len && types[end] == "1" ? "1" : "N"; + for (var j = i$4; j < end; ++j) { + types[j] = replace; + } + i$4 = end - 1; + } + } + + // W7. Search backwards from each instance of a European number + // until the first strong type (R, L, or sor) is found. If an L is + // found, then change the type of the European number to L. + for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) { + var type$4 = types[i$5]; + if (cur$1 == "L" && type$4 == "1") { + types[i$5] = "L"; + } else if (isStrong.test(type$4)) { + cur$1 = type$4; + } + } + + // N1. A sequence of neutrals takes the direction of the + // surrounding strong text if the text on both sides has the same + // direction. European and Arabic numbers act as if they were R in + // terms of their influence on neutrals. Start-of-level-run (sor) + // and end-of-level-run (eor) are used at level run boundaries. + // N2. Any remaining neutrals take the embedding direction. + for (var i$6 = 0; i$6 < len; ++i$6) { + if (isNeutral.test(types[i$6])) { + var end$1 = void 0; + for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {} + var before = (i$6 ? types[i$6 - 1] : outerType) == "L"; + var after = (end$1 < len ? types[end$1] : outerType) == "L"; + var replace$1 = before == after ? before ? "L" : "R" : outerType; + for (var j$1 = i$6; j$1 < end$1; ++j$1) { + types[j$1] = replace$1; + } + i$6 = end$1 - 1; + } + } + + // Here we depart from the documented algorithm, in order to avoid + // building up an actual levels array. Since there are only three + // levels (0, 1, 2) in an implementation that doesn't take + // explicit embedding into account, we can build up the order on + // the fly, without following the level-based algorithm. + var order = [], + m; + for (var i$7 = 0; i$7 < len;) { + if (countsAsLeft.test(types[i$7])) { + var start = i$7; + for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {} + order.push(new BidiSpan(0, start, i$7)); + } else { + var pos = i$7, + at = order.length, + isRTL = direction == "rtl" ? 1 : 0; + for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {} + for (var j$2 = pos; j$2 < i$7;) { + if (countsAsNum.test(types[j$2])) { + if (pos < j$2) { + order.splice(at, 0, new BidiSpan(1, pos, j$2)); + at += isRTL; + } + var nstart = j$2; + for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {} + order.splice(at, 0, new BidiSpan(2, nstart, j$2)); + at += isRTL; + pos = j$2; + } else { + ++j$2; + } + } + if (pos < i$7) { + order.splice(at, 0, new BidiSpan(1, pos, i$7)); + } + } + } + if (direction == "ltr") { + if (order[0].level == 1 && (m = str.match(/^\s+/))) { + order[0].from = m[0].length; + order.unshift(new BidiSpan(0, 0, m[0].length)); + } + if (lst(order).level == 1 && (m = str.match(/\s+$/))) { + lst(order).to -= m[0].length; + order.push(new BidiSpan(0, len - m[0].length, len)); + } + } + return direction == "rtl" ? order.reverse() : order; + }; + }(); + + // Get the bidi ordering for the given line (and cache it). Returns + // false for lines that are fully left-to-right, and an array of + // BidiSpan objects otherwise. + function getOrder(line, direction) { + var order = line.order; + if (order == null) { + order = line.order = bidiOrdering(line.text, direction); + } + return order; + } + + // EVENT HANDLING + + // Lightweight event framework. on/off also work on DOM nodes, + // registering native DOM handlers. + + var noHandlers = []; + var on = function (emitter, type, f) { + if (emitter.addEventListener) { + emitter.addEventListener(type, f, false); + } else if (emitter.attachEvent) { + emitter.attachEvent("on" + type, f); + } else { + var map = emitter._handlers || (emitter._handlers = {}); + map[type] = (map[type] || noHandlers).concat(f); + } + }; + function getHandlers(emitter, type) { + return emitter._handlers && emitter._handlers[type] || noHandlers; + } + function off(emitter, type, f) { + if (emitter.removeEventListener) { + emitter.removeEventListener(type, f, false); + } else if (emitter.detachEvent) { + emitter.detachEvent("on" + type, f); + } else { + var map = emitter._handlers, + arr = map && map[type]; + if (arr) { + var index = indexOf(arr, f); + if (index > -1) { + map[type] = arr.slice(0, index).concat(arr.slice(index + 1)); + } + } + } + } + function signal(emitter, type /*, values...*/) { + var handlers = getHandlers(emitter, type); + if (!handlers.length) { + return; + } + var args = Array.prototype.slice.call(arguments, 2); + for (var i = 0; i < handlers.length; ++i) { + handlers[i].apply(null, args); + } + } + + // The DOM events that CodeMirror handles can be overridden by + // registering a (non-DOM) handler on the editor for the event name, + // and preventDefault-ing the event in that handler. + function signalDOMEvent(cm, e, override) { + if (typeof e == "string") { + e = { + type: e, + preventDefault: function () { + this.defaultPrevented = true; + } + }; + } + signal(cm, override || e.type, cm, e); + return e_defaultPrevented(e) || e.codemirrorIgnore; + } + function signalCursorActivity(cm) { + var arr = cm._handlers && cm._handlers.cursorActivity; + if (!arr) { + return; + } + var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []); + for (var i = 0; i < arr.length; ++i) { + if (indexOf(set, arr[i]) == -1) { + set.push(arr[i]); + } + } + } + function hasHandler(emitter, type) { + return getHandlers(emitter, type).length > 0; + } + + // Add on and off methods to a constructor's prototype, to make + // registering events on such objects more convenient. + function eventMixin(ctor) { + ctor.prototype.on = function (type, f) { + on(this, type, f); + }; + ctor.prototype.off = function (type, f) { + off(this, type, f); + }; + } + + // Due to the fact that we still support jurassic IE versions, some + // compatibility wrappers are needed. + + function e_preventDefault(e) { + if (e.preventDefault) { + e.preventDefault(); + } else { + e.returnValue = false; + } + } + function e_stopPropagation(e) { + if (e.stopPropagation) { + e.stopPropagation(); + } else { + e.cancelBubble = true; + } + } + function e_defaultPrevented(e) { + return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false; + } + function e_stop(e) { + e_preventDefault(e); + e_stopPropagation(e); + } + function e_target(e) { + return e.target || e.srcElement; + } + function e_button(e) { + var b = e.which; + if (b == null) { + if (e.button & 1) { + b = 1; + } else if (e.button & 2) { + b = 3; + } else if (e.button & 4) { + b = 2; + } + } + if (mac && e.ctrlKey && b == 1) { + b = 3; + } + return b; + } + + // Detect drag-and-drop + var dragAndDrop = function () { + // There is *some* kind of drag-and-drop support in IE6-8, but I + // couldn't get it to work yet. + if (ie && ie_version < 9) { + return false; + } + var div = elt('div'); + return "draggable" in div || "dragDrop" in div; + }(); + var zwspSupported; + function zeroWidthElement(measure) { + if (zwspSupported == null) { + var test = elt("span", "\u200b"); + removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])); + if (measure.firstChild.offsetHeight != 0) { + zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); + } + } + var node = zwspSupported ? elt("span", "\u200b") : elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px"); + node.setAttribute("cm-text", ""); + return node; + } + + // Feature-detect IE's crummy client rect reporting for bidi text + var badBidiRects; + function hasBadBidiRects(measure) { + if (badBidiRects != null) { + return badBidiRects; + } + var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")); + var r0 = range(txt, 0, 1).getBoundingClientRect(); + var r1 = range(txt, 1, 2).getBoundingClientRect(); + removeChildren(measure); + if (!r0 || r0.left == r0.right) { + return false; + } // Safari returns null in some cases (#2780) + return badBidiRects = r1.right - r0.right < 3; + } + + // See if "".split is the broken IE version, if so, provide an + // alternative way to split lines. + var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) { + var pos = 0, + result = [], + l = string.length; + while (pos <= l) { + var nl = string.indexOf("\n", pos); + if (nl == -1) { + nl = string.length; + } + var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl); + var rt = line.indexOf("\r"); + if (rt != -1) { + result.push(line.slice(0, rt)); + pos += rt + 1; + } else { + result.push(line); + pos = nl + 1; + } + } + return result; + } : function (string) { + return string.split(/\r\n?|\n/); + }; + var hasSelection = window.getSelection ? function (te) { + try { + return te.selectionStart != te.selectionEnd; + } catch (e) { + return false; + } + } : function (te) { + var range; + try { + range = te.ownerDocument.selection.createRange(); + } catch (e) {} + if (!range || range.parentElement() != te) { + return false; + } + return range.compareEndPoints("StartToEnd", range) != 0; + }; + var hasCopyEvent = function () { + var e = elt("div"); + if ("oncopy" in e) { + return true; + } + e.setAttribute("oncopy", "return;"); + return typeof e.oncopy == "function"; + }(); + var badZoomedRects = null; + function hasBadZoomedRects(measure) { + if (badZoomedRects != null) { + return badZoomedRects; + } + var node = removeChildrenAndAdd(measure, elt("span", "x")); + var normal = node.getBoundingClientRect(); + var fromRange = range(node, 0, 1).getBoundingClientRect(); + return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1; + } + + // Known modes, by name and by MIME + var modes = {}, + mimeModes = {}; + + // Extra arguments are stored as the mode's dependencies, which is + // used by (legacy) mechanisms like loadmode.js to automatically + // load a mode. (Preferred mechanism is the require/define calls.) + function defineMode(name, mode) { + if (arguments.length > 2) { + mode.dependencies = Array.prototype.slice.call(arguments, 2); + } + modes[name] = mode; + } + function defineMIME(mime, spec) { + mimeModes[mime] = spec; + } + + // Given a MIME type, a {name, ...options} config object, or a name + // string, return a mode config object. + function resolveMode(spec) { + if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { + spec = mimeModes[spec]; + } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { + var found = mimeModes[spec.name]; + if (typeof found == "string") { + found = { + name: found + }; + } + spec = createObj(found, spec); + spec.name = found.name; + } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) { + return resolveMode("application/xml"); + } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) { + return resolveMode("application/json"); + } + if (typeof spec == "string") { + return { + name: spec + }; + } else { + return spec || { + name: "null" + }; + } + } + + // Given a mode spec (anything that resolveMode accepts), find and + // initialize an actual mode object. + function getMode(options, spec) { + spec = resolveMode(spec); + var mfactory = modes[spec.name]; + if (!mfactory) { + return getMode(options, "text/plain"); + } + var modeObj = mfactory(options, spec); + if (modeExtensions.hasOwnProperty(spec.name)) { + var exts = modeExtensions[spec.name]; + for (var prop in exts) { + if (!exts.hasOwnProperty(prop)) { + continue; + } + if (modeObj.hasOwnProperty(prop)) { + modeObj["_" + prop] = modeObj[prop]; + } + modeObj[prop] = exts[prop]; + } + } + modeObj.name = spec.name; + if (spec.helperType) { + modeObj.helperType = spec.helperType; + } + if (spec.modeProps) { + for (var prop$1 in spec.modeProps) { + modeObj[prop$1] = spec.modeProps[prop$1]; + } + } + return modeObj; + } + + // This can be used to attach properties to mode objects from + // outside the actual mode definition. + var modeExtensions = {}; + function extendMode(mode, properties) { + var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : modeExtensions[mode] = {}; + copyObj(properties, exts); + } + function copyState(mode, state) { + if (state === true) { + return state; + } + if (mode.copyState) { + return mode.copyState(state); + } + var nstate = {}; + for (var n in state) { + var val = state[n]; + if (val instanceof Array) { + val = val.concat([]); + } + nstate[n] = val; + } + return nstate; + } + + // Given a mode and a state (for that mode), find the inner mode and + // state at the position that the state refers to. + function innerMode(mode, state) { + var info; + while (mode.innerMode) { + info = mode.innerMode(state); + if (!info || info.mode == mode) { + break; + } + state = info.state; + mode = info.mode; + } + return info || { + mode: mode, + state: state + }; + } + function startState(mode, a1, a2) { + return mode.startState ? mode.startState(a1, a2) : true; + } + + // STRING STREAM + + // Fed to the mode parsers, provides helper functions to make + // parsers more succinct. + + var StringStream = function (string, tabSize, lineOracle) { + this.pos = this.start = 0; + this.string = string; + this.tabSize = tabSize || 8; + this.lastColumnPos = this.lastColumnValue = 0; + this.lineStart = 0; + this.lineOracle = lineOracle; + }; + StringStream.prototype.eol = function () { + return this.pos >= this.string.length; + }; + StringStream.prototype.sol = function () { + return this.pos == this.lineStart; + }; + StringStream.prototype.peek = function () { + return this.string.charAt(this.pos) || undefined; + }; + StringStream.prototype.next = function () { + if (this.pos < this.string.length) { + return this.string.charAt(this.pos++); + } + }; + StringStream.prototype.eat = function (match) { + var ch = this.string.charAt(this.pos); + var ok; + if (typeof match == "string") { + ok = ch == match; + } else { + ok = ch && (match.test ? match.test(ch) : match(ch)); + } + if (ok) { + ++this.pos; + return ch; + } + }; + StringStream.prototype.eatWhile = function (match) { + var start = this.pos; + while (this.eat(match)) {} + return this.pos > start; + }; + StringStream.prototype.eatSpace = function () { + var start = this.pos; + while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { + ++this.pos; + } + return this.pos > start; + }; + StringStream.prototype.skipToEnd = function () { + this.pos = this.string.length; + }; + StringStream.prototype.skipTo = function (ch) { + var found = this.string.indexOf(ch, this.pos); + if (found > -1) { + this.pos = found; + return true; + } + }; + StringStream.prototype.backUp = function (n) { + this.pos -= n; + }; + StringStream.prototype.column = function () { + if (this.lastColumnPos < this.start) { + this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue); + this.lastColumnPos = this.start; + } + return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); + }; + StringStream.prototype.indentation = function () { + return countColumn(this.string, null, this.tabSize) - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); + }; + StringStream.prototype.match = function (pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + var cased = function (str) { + return caseInsensitive ? str.toLowerCase() : str; + }; + var substr = this.string.substr(this.pos, pattern.length); + if (cased(substr) == cased(pattern)) { + if (consume !== false) { + this.pos += pattern.length; + } + return true; + } + } else { + var match = this.string.slice(this.pos).match(pattern); + if (match && match.index > 0) { + return null; + } + if (match && consume !== false) { + this.pos += match[0].length; + } + return match; + } + }; + StringStream.prototype.current = function () { + return this.string.slice(this.start, this.pos); + }; + StringStream.prototype.hideFirstChars = function (n, inner) { + this.lineStart += n; + try { + return inner(); + } finally { + this.lineStart -= n; + } + }; + StringStream.prototype.lookAhead = function (n) { + var oracle = this.lineOracle; + return oracle && oracle.lookAhead(n); + }; + StringStream.prototype.baseToken = function () { + var oracle = this.lineOracle; + return oracle && oracle.baseToken(this.pos); + }; + + // Find the line object corresponding to the given line number. + function getLine(doc, n) { + n -= doc.first; + if (n < 0 || n >= doc.size) { + throw new Error("There is no line " + (n + doc.first) + " in the document."); + } + var chunk = doc; + while (!chunk.lines) { + for (var i = 0;; ++i) { + var child = chunk.children[i], + sz = child.chunkSize(); + if (n < sz) { + chunk = child; + break; + } + n -= sz; + } + } + return chunk.lines[n]; + } + + // Get the part of a document between two positions, as an array of + // strings. + function getBetween(doc, start, end) { + var out = [], + n = start.line; + doc.iter(start.line, end.line + 1, function (line) { + var text = line.text; + if (n == end.line) { + text = text.slice(0, end.ch); + } + if (n == start.line) { + text = text.slice(start.ch); + } + out.push(text); + ++n; + }); + return out; + } + // Get the lines between from and to, as array of strings. + function getLines(doc, from, to) { + var out = []; + doc.iter(from, to, function (line) { + out.push(line.text); + }); // iter aborts when callback returns truthy value + return out; + } + + // Update the height of a line, propagating the height change + // upwards to parent nodes. + function updateLineHeight(line, height) { + var diff = height - line.height; + if (diff) { + for (var n = line; n; n = n.parent) { + n.height += diff; + } + } + } + + // Given a line object, find its line number by walking up through + // its parent links. + function lineNo(line) { + if (line.parent == null) { + return null; + } + var cur = line.parent, + no = indexOf(cur.lines, line); + for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { + for (var i = 0;; ++i) { + if (chunk.children[i] == cur) { + break; + } + no += chunk.children[i].chunkSize(); + } + } + return no + cur.first; + } + + // Find the line at the given vertical position, using the height + // information in the document tree. + function lineAtHeight(chunk, h) { + var n = chunk.first; + outer: do { + for (var i$1 = 0; i$1 < chunk.children.length; ++i$1) { + var child = chunk.children[i$1], + ch = child.height; + if (h < ch) { + chunk = child; + continue outer; + } + h -= ch; + n += child.chunkSize(); + } + return n; + } while (!chunk.lines); + var i = 0; + for (; i < chunk.lines.length; ++i) { + var line = chunk.lines[i], + lh = line.height; + if (h < lh) { + break; + } + h -= lh; + } + return n + i; + } + function isLine(doc, l) { + return l >= doc.first && l < doc.first + doc.size; + } + function lineNumberFor(options, i) { + return String(options.lineNumberFormatter(i + options.firstLineNumber)); + } + + // A Pos instance represents a position within the text. + function Pos(line, ch, sticky) { + if (sticky === void 0) sticky = null; + if (!(this instanceof Pos)) { + return new Pos(line, ch, sticky); + } + this.line = line; + this.ch = ch; + this.sticky = sticky; + } + + // Compare two positions, return 0 if they are the same, a negative + // number when a is less, and a positive number otherwise. + function cmp(a, b) { + return a.line - b.line || a.ch - b.ch; + } + function equalCursorPos(a, b) { + return a.sticky == b.sticky && cmp(a, b) == 0; + } + function copyPos(x) { + return Pos(x.line, x.ch); + } + function maxPos(a, b) { + return cmp(a, b) < 0 ? b : a; + } + function minPos(a, b) { + return cmp(a, b) < 0 ? a : b; + } + + // Most of the external API clips given positions to make sure they + // actually exist within the document. + function clipLine(doc, n) { + return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1)); + } + function clipPos(doc, pos) { + if (pos.line < doc.first) { + return Pos(doc.first, 0); + } + var last = doc.first + doc.size - 1; + if (pos.line > last) { + return Pos(last, getLine(doc, last).text.length); + } + return clipToLen(pos, getLine(doc, pos.line).text.length); + } + function clipToLen(pos, linelen) { + var ch = pos.ch; + if (ch == null || ch > linelen) { + return Pos(pos.line, linelen); + } else if (ch < 0) { + return Pos(pos.line, 0); + } else { + return pos; + } + } + function clipPosArray(doc, array) { + var out = []; + for (var i = 0; i < array.length; i++) { + out[i] = clipPos(doc, array[i]); + } + return out; + } + var SavedContext = function (state, lookAhead) { + this.state = state; + this.lookAhead = lookAhead; + }; + var Context = function (doc, state, line, lookAhead) { + this.state = state; + this.doc = doc; + this.line = line; + this.maxLookAhead = lookAhead || 0; + this.baseTokens = null; + this.baseTokenPos = 1; + }; + Context.prototype.lookAhead = function (n) { + var line = this.doc.getLine(this.line + n); + if (line != null && n > this.maxLookAhead) { + this.maxLookAhead = n; + } + return line; + }; + Context.prototype.baseToken = function (n) { + if (!this.baseTokens) { + return null; + } + while (this.baseTokens[this.baseTokenPos] <= n) { + this.baseTokenPos += 2; + } + var type = this.baseTokens[this.baseTokenPos + 1]; + return { + type: type && type.replace(/( |^)overlay .*/, ""), + size: this.baseTokens[this.baseTokenPos] - n + }; + }; + Context.prototype.nextLine = function () { + this.line++; + if (this.maxLookAhead > 0) { + this.maxLookAhead--; + } + }; + Context.fromSaved = function (doc, saved, line) { + if (saved instanceof SavedContext) { + return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead); + } else { + return new Context(doc, copyState(doc.mode, saved), line); + } + }; + Context.prototype.save = function (copy) { + var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state; + return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state; + }; + + // Compute a style array (an array starting with a mode generation + // -- for invalidation -- followed by pairs of end positions and + // style strings), which is used to highlight the tokens on the + // line. + function highlightLine(cm, line, context, forceToEnd) { + // A styles array always starts with a number identifying the + // mode/overlays that it is based on (for easy invalidation). + var st = [cm.state.modeGen], + lineClasses = {}; + // Compute the base array of styles + runMode(cm, line.text, cm.doc.mode, context, function (end, style) { + return st.push(end, style); + }, lineClasses, forceToEnd); + var state = context.state; + + // Run overlays, adjust style array. + var loop = function (o) { + context.baseTokens = st; + var overlay = cm.state.overlays[o], + i = 1, + at = 0; + context.state = true; + runMode(cm, line.text, overlay.mode, context, function (end, style) { + var start = i; + // Ensure there's a token end at the current position, and that i points at it + while (at < end) { + var i_end = st[i]; + if (i_end > end) { + st.splice(i, 1, end, st[i + 1], i_end); + } + i += 2; + at = Math.min(end, i_end); + } + if (!style) { + return; + } + if (overlay.opaque) { + st.splice(start, i - start, end, "overlay " + style); + i = start + 2; + } else { + for (; start < i; start += 2) { + var cur = st[start + 1]; + st[start + 1] = (cur ? cur + " " : "") + "overlay " + style; + } + } + }, lineClasses); + context.state = state; + context.baseTokens = null; + context.baseTokenPos = 1; + }; + for (var o = 0; o < cm.state.overlays.length; ++o) loop(o); + return { + styles: st, + classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null + }; + } + function getLineStyles(cm, line, updateFrontier) { + if (!line.styles || line.styles[0] != cm.state.modeGen) { + var context = getContextBefore(cm, lineNo(line)); + var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state); + var result = highlightLine(cm, line, context); + if (resetState) { + context.state = resetState; + } + line.stateAfter = context.save(!resetState); + line.styles = result.styles; + if (result.classes) { + line.styleClasses = result.classes; + } else if (line.styleClasses) { + line.styleClasses = null; + } + if (updateFrontier === cm.doc.highlightFrontier) { + cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); + } + } + return line.styles; + } + function getContextBefore(cm, n, precise) { + var doc = cm.doc, + display = cm.display; + if (!doc.mode.startState) { + return new Context(doc, true, n); + } + var start = findStartLine(cm, n, precise); + var saved = start > doc.first && getLine(doc, start - 1).stateAfter; + var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start); + doc.iter(start, n, function (line) { + processLine(cm, line.text, context); + var pos = context.line; + line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null; + context.nextLine(); + }); + if (precise) { + doc.modeFrontier = context.line; + } + return context; + } + + // Lightweight form of highlight -- proceed over this line and + // update state, but don't save a style array. Used for lines that + // aren't currently visible. + function processLine(cm, text, context, startAt) { + var mode = cm.doc.mode; + var stream = new StringStream(text, cm.options.tabSize, context); + stream.start = stream.pos = startAt || 0; + if (text == "") { + callBlankLine(mode, context.state); + } + while (!stream.eol()) { + readToken(mode, stream, context.state); + stream.start = stream.pos; + } + } + function callBlankLine(mode, state) { + if (mode.blankLine) { + return mode.blankLine(state); + } + if (!mode.innerMode) { + return; + } + var inner = innerMode(mode, state); + if (inner.mode.blankLine) { + return inner.mode.blankLine(inner.state); + } + } + function readToken(mode, stream, state, inner) { + for (var i = 0; i < 10; i++) { + if (inner) { + inner[0] = innerMode(mode, state).mode; + } + var style = mode.token(stream, state); + if (stream.pos > stream.start) { + return style; + } + } + throw new Error("Mode " + mode.name + " failed to advance stream."); + } + var Token = function (stream, type, state) { + this.start = stream.start; + this.end = stream.pos; + this.string = stream.current(); + this.type = type || null; + this.state = state; + }; + + // Utility for getTokenAt and getLineTokens + function takeToken(cm, pos, precise, asArray) { + var doc = cm.doc, + mode = doc.mode, + style; + pos = clipPos(doc, pos); + var line = getLine(doc, pos.line), + context = getContextBefore(cm, pos.line, precise); + var stream = new StringStream(line.text, cm.options.tabSize, context), + tokens; + if (asArray) { + tokens = []; + } + while ((asArray || stream.pos < pos.ch) && !stream.eol()) { + stream.start = stream.pos; + style = readToken(mode, stream, context.state); + if (asArray) { + tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); + } + } + return asArray ? tokens : new Token(stream, style, context.state); + } + function extractLineClasses(type, output) { + if (type) { + for (;;) { + var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/); + if (!lineClass) { + break; + } + type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length); + var prop = lineClass[1] ? "bgClass" : "textClass"; + if (output[prop] == null) { + output[prop] = lineClass[2]; + } else if (!new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)").test(output[prop])) { + output[prop] += " " + lineClass[2]; + } + } + } + return type; + } + + // Run the given mode's parser over a line, calling f for each token. + function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) { + var flattenSpans = mode.flattenSpans; + if (flattenSpans == null) { + flattenSpans = cm.options.flattenSpans; + } + var curStart = 0, + curStyle = null; + var stream = new StringStream(text, cm.options.tabSize, context), + style; + var inner = cm.options.addModeClass && [null]; + if (text == "") { + extractLineClasses(callBlankLine(mode, context.state), lineClasses); + } + while (!stream.eol()) { + if (stream.pos > cm.options.maxHighlightLength) { + flattenSpans = false; + if (forceToEnd) { + processLine(cm, text, context, stream.pos); + } + stream.pos = text.length; + style = null; + } else { + style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses); + } + if (inner) { + var mName = inner[0].name; + if (mName) { + style = "m-" + (style ? mName + " " + style : mName); + } + } + if (!flattenSpans || curStyle != style) { + while (curStart < stream.start) { + curStart = Math.min(stream.start, curStart + 5000); + f(curStart, curStyle); + } + curStyle = style; + } + stream.start = stream.pos; + } + while (curStart < stream.pos) { + // Webkit seems to refuse to render text nodes longer than 57444 + // characters, and returns inaccurate measurements in nodes + // starting around 5000 chars. + var pos = Math.min(stream.pos, curStart + 5000); + f(pos, curStyle); + curStart = pos; + } + } + + // Finds the line to start with when starting a parse. Tries to + // find a line with a stateAfter, so that it can start with a + // valid state. If that fails, it returns the line with the + // smallest indentation, which tends to need the least context to + // parse correctly. + function findStartLine(cm, n, precise) { + var minindent, + minline, + doc = cm.doc; + var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100); + for (var search = n; search > lim; --search) { + if (search <= doc.first) { + return doc.first; + } + var line = getLine(doc, search - 1), + after = line.stateAfter; + if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier)) { + return search; + } + var indented = countColumn(line.text, null, cm.options.tabSize); + if (minline == null || minindent > indented) { + minline = search - 1; + minindent = indented; + } + } + return minline; + } + function retreatFrontier(doc, n) { + doc.modeFrontier = Math.min(doc.modeFrontier, n); + if (doc.highlightFrontier < n - 10) { + return; + } + var start = doc.first; + for (var line = n - 1; line > start; line--) { + var saved = getLine(doc, line).stateAfter; + // change is on 3 + // state on line 1 looked ahead 2 -- so saw 3 + // test 1 + 2 < 3 should cover this + if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) { + start = line + 1; + break; + } + } + doc.highlightFrontier = Math.min(doc.highlightFrontier, start); + } + + // Optimize some code when these features are not used. + var sawReadOnlySpans = false, + sawCollapsedSpans = false; + function seeReadOnlySpans() { + sawReadOnlySpans = true; + } + function seeCollapsedSpans() { + sawCollapsedSpans = true; + } + + // TEXTMARKER SPANS + + function MarkedSpan(marker, from, to) { + this.marker = marker; + this.from = from; + this.to = to; + } + + // Search an array of spans for a span matching the given marker. + function getMarkedSpanFor(spans, marker) { + if (spans) { + for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if (span.marker == marker) { + return span; + } + } + } + } + + // Remove a span from an array, returning undefined if no spans are + // left (we don't store arrays for lines without spans). + function removeMarkedSpan(spans, span) { + var r; + for (var i = 0; i < spans.length; ++i) { + if (spans[i] != span) { + (r || (r = [])).push(spans[i]); + } + } + return r; + } + + // Add a span to a line. + function addMarkedSpan(line, span, op) { + var inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet())); + if (inThisOp && line.markedSpans && inThisOp.has(line.markedSpans)) { + line.markedSpans.push(span); + } else { + line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]; + if (inThisOp) { + inThisOp.add(line.markedSpans); + } + } + span.marker.attachLine(line); + } + + // Used for the algorithm that adjusts markers for a change in the + // document. These functions cut an array of spans at a given + // character position, returning an array of remaining chunks (or + // undefined if nothing remains). + function markedSpansBefore(old, startCh, isInsert) { + var nw; + if (old) { + for (var i = 0; i < old.length; ++i) { + var span = old[i], + marker = span.marker; + var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh); + if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { + var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh); + (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)); + } + } + } + return nw; + } + function markedSpansAfter(old, endCh, isInsert) { + var nw; + if (old) { + for (var i = 0; i < old.length; ++i) { + var span = old[i], + marker = span.marker; + var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh); + if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { + var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh); + (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, span.to == null ? null : span.to - endCh)); + } + } + } + return nw; + } + + // Given a change object, compute the new set of marker spans that + // cover the line in which the change took place. Removes spans + // entirely within the change, reconnects spans belonging to the + // same marker that appear on both sides of the change, and cuts off + // spans partially within the change. Returns an array of span + // arrays with one element for each line in (after) the change. + function stretchSpansOverChange(doc, change) { + if (change.full) { + return null; + } + var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans; + var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans; + if (!oldFirst && !oldLast) { + return null; + } + var startCh = change.from.ch, + endCh = change.to.ch, + isInsert = cmp(change.from, change.to) == 0; + // Get the spans that 'stick out' on both sides + var first = markedSpansBefore(oldFirst, startCh, isInsert); + var last = markedSpansAfter(oldLast, endCh, isInsert); + + // Next, merge those two ends + var sameLine = change.text.length == 1, + offset = lst(change.text).length + (sameLine ? startCh : 0); + if (first) { + // Fix up .to properties of first + for (var i = 0; i < first.length; ++i) { + var span = first[i]; + if (span.to == null) { + var found = getMarkedSpanFor(last, span.marker); + if (!found) { + span.to = startCh; + } else if (sameLine) { + span.to = found.to == null ? null : found.to + offset; + } + } + } + } + if (last) { + // Fix up .from in last (or move them into first in case of sameLine) + for (var i$1 = 0; i$1 < last.length; ++i$1) { + var span$1 = last[i$1]; + if (span$1.to != null) { + span$1.to += offset; + } + if (span$1.from == null) { + var found$1 = getMarkedSpanFor(first, span$1.marker); + if (!found$1) { + span$1.from = offset; + if (sameLine) { + (first || (first = [])).push(span$1); + } + } + } else { + span$1.from += offset; + if (sameLine) { + (first || (first = [])).push(span$1); + } + } + } + } + // Make sure we didn't create any zero-length spans + if (first) { + first = clearEmptySpans(first); + } + if (last && last != first) { + last = clearEmptySpans(last); + } + var newMarkers = [first]; + if (!sameLine) { + // Fill gap with whole-line-spans + var gap = change.text.length - 2, + gapMarkers; + if (gap > 0 && first) { + for (var i$2 = 0; i$2 < first.length; ++i$2) { + if (first[i$2].to == null) { + (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$2].marker, null, null)); + } + } + } + for (var i$3 = 0; i$3 < gap; ++i$3) { + newMarkers.push(gapMarkers); + } + newMarkers.push(last); + } + return newMarkers; + } + + // Remove spans that are empty and don't have a clearWhenEmpty + // option of false. + function clearEmptySpans(spans) { + for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) { + spans.splice(i--, 1); + } + } + if (!spans.length) { + return null; + } + return spans; + } + + // Used to 'clip' out readOnly ranges when making a change. + function removeReadOnlyRanges(doc, from, to) { + var markers = null; + doc.iter(from.line, to.line + 1, function (line) { + if (line.markedSpans) { + for (var i = 0; i < line.markedSpans.length; ++i) { + var mark = line.markedSpans[i].marker; + if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) { + (markers || (markers = [])).push(mark); + } + } + } + }); + if (!markers) { + return null; + } + var parts = [{ + from: from, + to: to + }]; + for (var i = 0; i < markers.length; ++i) { + var mk = markers[i], + m = mk.find(0); + for (var j = 0; j < parts.length; ++j) { + var p = parts[j]; + if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { + continue; + } + var newParts = [j, 1], + dfrom = cmp(p.from, m.from), + dto = cmp(p.to, m.to); + if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) { + newParts.push({ + from: p.from, + to: m.from + }); + } + if (dto > 0 || !mk.inclusiveRight && !dto) { + newParts.push({ + from: m.to, + to: p.to + }); + } + parts.splice.apply(parts, newParts); + j += newParts.length - 3; + } + } + return parts; + } + + // Connect or disconnect spans from a line. + function detachMarkedSpans(line) { + var spans = line.markedSpans; + if (!spans) { + return; + } + for (var i = 0; i < spans.length; ++i) { + spans[i].marker.detachLine(line); + } + line.markedSpans = null; + } + function attachMarkedSpans(line, spans) { + if (!spans) { + return; + } + for (var i = 0; i < spans.length; ++i) { + spans[i].marker.attachLine(line); + } + line.markedSpans = spans; + } + + // Helpers used when computing which overlapping collapsed span + // counts as the larger one. + function extraLeft(marker) { + return marker.inclusiveLeft ? -1 : 0; + } + function extraRight(marker) { + return marker.inclusiveRight ? 1 : 0; + } + + // Returns a number indicating which of two overlapping collapsed + // spans is larger (and thus includes the other). Falls back to + // comparing ids when the spans cover exactly the same range. + function compareCollapsedMarkers(a, b) { + var lenDiff = a.lines.length - b.lines.length; + if (lenDiff != 0) { + return lenDiff; + } + var aPos = a.find(), + bPos = b.find(); + var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b); + if (fromCmp) { + return -fromCmp; + } + var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b); + if (toCmp) { + return toCmp; + } + return b.id - a.id; + } + + // Find out whether a line ends or starts in a collapsed span. If + // so, return the marker for that span. + function collapsedSpanAtSide(line, start) { + var sps = sawCollapsedSpans && line.markedSpans, + found; + if (sps) { + for (var sp = void 0, i = 0; i < sps.length; ++i) { + sp = sps[i]; + if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { + found = sp.marker; + } + } + } + return found; + } + function collapsedSpanAtStart(line) { + return collapsedSpanAtSide(line, true); + } + function collapsedSpanAtEnd(line) { + return collapsedSpanAtSide(line, false); + } + function collapsedSpanAround(line, ch) { + var sps = sawCollapsedSpans && line.markedSpans, + found; + if (sps) { + for (var i = 0; i < sps.length; ++i) { + var sp = sps[i]; + if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) && (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { + found = sp.marker; + } + } + } + return found; + } + + // Test whether there exists a collapsed span that partially + // overlaps (covers the start or end, but not both) of a new span. + // Such overlap is not allowed. + function conflictingCollapsedRange(doc, lineNo, from, to, marker) { + var line = getLine(doc, lineNo); + var sps = sawCollapsedSpans && line.markedSpans; + if (sps) { + for (var i = 0; i < sps.length; ++i) { + var sp = sps[i]; + if (!sp.marker.collapsed) { + continue; + } + var found = sp.marker.find(0); + var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker); + var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); + if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { + continue; + } + if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) || fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) { + return true; + } + } + } + } + + // A visual line is a line as drawn on the screen. Folding, for + // example, can cause multiple logical lines to appear on the same + // visual line. This finds the start of the visual line that the + // given line is part of (usually that is the line itself). + function visualLine(line) { + var merged; + while (merged = collapsedSpanAtStart(line)) { + line = merged.find(-1, true).line; + } + return line; + } + function visualLineEnd(line) { + var merged; + while (merged = collapsedSpanAtEnd(line)) { + line = merged.find(1, true).line; + } + return line; + } + + // Returns an array of logical lines that continue the visual line + // started by the argument, or undefined if there are no such lines. + function visualLineContinued(line) { + var merged, lines; + while (merged = collapsedSpanAtEnd(line)) { + line = merged.find(1, true).line; + (lines || (lines = [])).push(line); + } + return lines; + } + + // Get the line number of the start of the visual line that the + // given line number is part of. + function visualLineNo(doc, lineN) { + var line = getLine(doc, lineN), + vis = visualLine(line); + if (line == vis) { + return lineN; + } + return lineNo(vis); + } + + // Get the line number of the start of the next visual line after + // the given line. + function visualLineEndNo(doc, lineN) { + if (lineN > doc.lastLine()) { + return lineN; + } + var line = getLine(doc, lineN), + merged; + if (!lineIsHidden(doc, line)) { + return lineN; + } + while (merged = collapsedSpanAtEnd(line)) { + line = merged.find(1, true).line; + } + return lineNo(line) + 1; + } + + // Compute whether a line is hidden. Lines count as hidden when they + // are part of a visual line that starts with another line, or when + // they are entirely covered by collapsed, non-widget span. + function lineIsHidden(doc, line) { + var sps = sawCollapsedSpans && line.markedSpans; + if (sps) { + for (var sp = void 0, i = 0; i < sps.length; ++i) { + sp = sps[i]; + if (!sp.marker.collapsed) { + continue; + } + if (sp.from == null) { + return true; + } + if (sp.marker.widgetNode) { + continue; + } + if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp)) { + return true; + } + } + } + } + function lineIsHiddenInner(doc, line, span) { + if (span.to == null) { + var end = span.marker.find(1, true); + return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)); + } + if (span.marker.inclusiveRight && span.to == line.text.length) { + return true; + } + for (var sp = void 0, i = 0; i < line.markedSpans.length; ++i) { + sp = line.markedSpans[i]; + if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && (sp.to == null || sp.to != span.from) && (sp.marker.inclusiveLeft || span.marker.inclusiveRight) && lineIsHiddenInner(doc, line, sp)) { + return true; + } + } + } + + // Find the height above the given line. + function heightAtLine(lineObj) { + lineObj = visualLine(lineObj); + var h = 0, + chunk = lineObj.parent; + for (var i = 0; i < chunk.lines.length; ++i) { + var line = chunk.lines[i]; + if (line == lineObj) { + break; + } else { + h += line.height; + } + } + for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { + for (var i$1 = 0; i$1 < p.children.length; ++i$1) { + var cur = p.children[i$1]; + if (cur == chunk) { + break; + } else { + h += cur.height; + } + } + } + return h; + } + + // Compute the character length of a line, taking into account + // collapsed ranges (see markText) that might hide parts, and join + // other lines onto it. + function lineLength(line) { + if (line.height == 0) { + return 0; + } + var len = line.text.length, + merged, + cur = line; + while (merged = collapsedSpanAtStart(cur)) { + var found = merged.find(0, true); + cur = found.from.line; + len += found.from.ch - found.to.ch; + } + cur = line; + while (merged = collapsedSpanAtEnd(cur)) { + var found$1 = merged.find(0, true); + len -= cur.text.length - found$1.from.ch; + cur = found$1.to.line; + len += cur.text.length - found$1.to.ch; + } + return len; + } + + // Find the longest line in the document. + function findMaxLine(cm) { + var d = cm.display, + doc = cm.doc; + d.maxLine = getLine(doc, doc.first); + d.maxLineLength = lineLength(d.maxLine); + d.maxLineChanged = true; + doc.iter(function (line) { + var len = lineLength(line); + if (len > d.maxLineLength) { + d.maxLineLength = len; + d.maxLine = line; + } + }); + } + + // LINE DATA STRUCTURE + + // Line objects. These hold state related to a line, including + // highlighting info (the styles array). + var Line = function (text, markedSpans, estimateHeight) { + this.text = text; + attachMarkedSpans(this, markedSpans); + this.height = estimateHeight ? estimateHeight(this) : 1; + }; + Line.prototype.lineNo = function () { + return lineNo(this); + }; + eventMixin(Line); + + // Change the content (text, markers) of a line. Automatically + // invalidates cached information and tries to re-estimate the + // line's height. + function updateLine(line, text, markedSpans, estimateHeight) { + line.text = text; + if (line.stateAfter) { + line.stateAfter = null; + } + if (line.styles) { + line.styles = null; + } + if (line.order != null) { + line.order = null; + } + detachMarkedSpans(line); + attachMarkedSpans(line, markedSpans); + var estHeight = estimateHeight ? estimateHeight(line) : 1; + if (estHeight != line.height) { + updateLineHeight(line, estHeight); + } + } + + // Detach a line from the document tree and its markers. + function cleanUpLine(line) { + line.parent = null; + detachMarkedSpans(line); + } + + // Convert a style as returned by a mode (either null, or a string + // containing one or more styles) to a CSS style. This is cached, + // and also looks for line-wide styles. + var styleToClassCache = {}, + styleToClassCacheWithMode = {}; + function interpretTokenStyle(style, options) { + if (!style || /^\s*$/.test(style)) { + return null; + } + var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache; + return cache[style] || (cache[style] = style.replace(/\S+/g, "cm-$&")); + } + + // Render the DOM representation of the text of a line. Also builds + // up a 'line map', which points at the DOM nodes that represent + // specific stretches of text, and is used by the measuring code. + // The returned object contains the DOM node, this map, and + // information about line-wide styles that were set by the mode. + function buildLineContent(cm, lineView) { + // The padding-right forces the element to have a 'border', which + // is needed on Webkit to be able to get line-level bounding + // rectangles for it (in measureChar). + var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null); + var builder = { + pre: eltP("pre", [content], "CodeMirror-line"), + content: content, + col: 0, + pos: 0, + cm: cm, + trailingSpace: false, + splitSpaces: cm.getOption("lineWrapping") + }; + lineView.measure = {}; + + // Iterate over the logical lines that make up this visual line. + for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { + var line = i ? lineView.rest[i - 1] : lineView.line, + order = void 0; + builder.pos = 0; + builder.addToken = buildToken; + // Optionally wire in some hacks into the token-rendering + // algorithm, to deal with browser quirks. + if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction))) { + builder.addToken = buildTokenBadBidi(builder.addToken, order); + } + builder.map = []; + var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line); + insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate)); + if (line.styleClasses) { + if (line.styleClasses.bgClass) { + builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); + } + if (line.styleClasses.textClass) { + builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); + } + } + + // Ensure at least a single node is present, for measuring. + if (builder.map.length == 0) { + builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); + } + + // Store the map and a cache object for the current logical line + if (i == 0) { + lineView.measure.map = builder.map; + lineView.measure.cache = {}; + } else { + (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map); + (lineView.measure.caches || (lineView.measure.caches = [])).push({}); + } + } + + // See issue #2901 + if (webkit) { + var last = builder.content.lastChild; + if (/\bcm-tab\b/.test(last.className) || last.querySelector && last.querySelector(".cm-tab")) { + builder.content.className = "cm-tab-wrap-hack"; + } + } + signal(cm, "renderLine", cm, lineView.line, builder.pre); + if (builder.pre.className) { + builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); + } + return builder; + } + function defaultSpecialCharPlaceholder(ch) { + var token = elt("span", "\u2022", "cm-invalidchar"); + token.title = "\\u" + ch.charCodeAt(0).toString(16); + token.setAttribute("aria-label", token.title); + return token; + } + + // Build up the DOM representation for a single token, and add it to + // the line map. Takes care to render special characters separately. + function buildToken(builder, text, style, startStyle, endStyle, css, attributes) { + if (!text) { + return; + } + var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text; + var special = builder.cm.state.specialChars, + mustWrap = false; + var content; + if (!special.test(text)) { + builder.col += text.length; + content = document.createTextNode(displayText); + builder.map.push(builder.pos, builder.pos + text.length, content); + if (ie && ie_version < 9) { + mustWrap = true; + } + builder.pos += text.length; + } else { + content = document.createDocumentFragment(); + var pos = 0; + while (true) { + special.lastIndex = pos; + var m = special.exec(text); + var skipped = m ? m.index - pos : text.length - pos; + if (skipped) { + var txt = document.createTextNode(displayText.slice(pos, pos + skipped)); + if (ie && ie_version < 9) { + content.appendChild(elt("span", [txt])); + } else { + content.appendChild(txt); + } + builder.map.push(builder.pos, builder.pos + skipped, txt); + builder.col += skipped; + builder.pos += skipped; + } + if (!m) { + break; + } + pos += skipped + 1; + var txt$1 = void 0; + if (m[0] == "\t") { + var tabSize = builder.cm.options.tabSize, + tabWidth = tabSize - builder.col % tabSize; + txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")); + txt$1.setAttribute("role", "presentation"); + txt$1.setAttribute("cm-text", "\t"); + builder.col += tabWidth; + } else if (m[0] == "\r" || m[0] == "\n") { + txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar")); + txt$1.setAttribute("cm-text", m[0]); + builder.col += 1; + } else { + txt$1 = builder.cm.options.specialCharPlaceholder(m[0]); + txt$1.setAttribute("cm-text", m[0]); + if (ie && ie_version < 9) { + content.appendChild(elt("span", [txt$1])); + } else { + content.appendChild(txt$1); + } + builder.col += 1; + } + builder.map.push(builder.pos, builder.pos + 1, txt$1); + builder.pos++; + } + } + builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32; + if (style || startStyle || endStyle || mustWrap || css || attributes) { + var fullStyle = style || ""; + if (startStyle) { + fullStyle += startStyle; + } + if (endStyle) { + fullStyle += endStyle; + } + var token = elt("span", [content], fullStyle, css); + if (attributes) { + for (var attr in attributes) { + if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class") { + token.setAttribute(attr, attributes[attr]); + } + } + } + return builder.content.appendChild(token); + } + builder.content.appendChild(content); + } + + // Change some spaces to NBSP to prevent the browser from collapsing + // trailing spaces at the end of a line when rendering text (issue #1362). + function splitSpaces(text, trailingBefore) { + if (text.length > 1 && !/ /.test(text)) { + return text; + } + var spaceBefore = trailingBefore, + result = ""; + for (var i = 0; i < text.length; i++) { + var ch = text.charAt(i); + if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32)) { + ch = "\u00a0"; + } + result += ch; + spaceBefore = ch == " "; + } + return result; + } + + // Work around nonsense dimensions being reported for stretches of + // right-to-left text. + function buildTokenBadBidi(inner, order) { + return function (builder, text, style, startStyle, endStyle, css, attributes) { + style = style ? style + " cm-force-border" : "cm-force-border"; + var start = builder.pos, + end = start + text.length; + for (;;) { + // Find the part that overlaps with the start of this text + var part = void 0; + for (var i = 0; i < order.length; i++) { + part = order[i]; + if (part.to > start && part.from <= start) { + break; + } + } + if (part.to >= end) { + return inner(builder, text, style, startStyle, endStyle, css, attributes); + } + inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes); + startStyle = null; + text = text.slice(part.to - start); + start = part.to; + } + }; + } + function buildCollapsedSpan(builder, size, marker, ignoreWidget) { + var widget = !ignoreWidget && marker.widgetNode; + if (widget) { + builder.map.push(builder.pos, builder.pos + size, widget); + } + if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) { + if (!widget) { + widget = builder.content.appendChild(document.createElement("span")); + } + widget.setAttribute("cm-marker", marker.id); + } + if (widget) { + builder.cm.display.input.setUneditable(widget); + builder.content.appendChild(widget); + } + builder.pos += size; + builder.trailingSpace = false; + } + + // Outputs a number of spans to make up a line, taking highlighting + // and marked text into account. + function insertLineContent(line, builder, styles) { + var spans = line.markedSpans, + allText = line.text, + at = 0; + if (!spans) { + for (var i$1 = 1; i$1 < styles.length; i$1 += 2) { + builder.addToken(builder, allText.slice(at, at = styles[i$1]), interpretTokenStyle(styles[i$1 + 1], builder.cm.options)); + } + return; + } + var len = allText.length, + pos = 0, + i = 1, + text = "", + style, + css; + var nextChange = 0, + spanStyle, + spanEndStyle, + spanStartStyle, + collapsed, + attributes; + for (;;) { + if (nextChange == pos) { + // Update current marker set + spanStyle = spanEndStyle = spanStartStyle = css = ""; + attributes = null; + collapsed = null; + nextChange = Infinity; + var foundBookmarks = [], + endStyles = void 0; + for (var j = 0; j < spans.length; ++j) { + var sp = spans[j], + m = sp.marker; + if (m.type == "bookmark" && sp.from == pos && m.widgetNode) { + foundBookmarks.push(m); + } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) { + if (sp.to != null && sp.to != pos && nextChange > sp.to) { + nextChange = sp.to; + spanEndStyle = ""; + } + if (m.className) { + spanStyle += " " + m.className; + } + if (m.css) { + css = (css ? css + ";" : "") + m.css; + } + if (m.startStyle && sp.from == pos) { + spanStartStyle += " " + m.startStyle; + } + if (m.endStyle && sp.to == nextChange) { + (endStyles || (endStyles = [])).push(m.endStyle, sp.to); + } + // support for the old title property + // https://github.com/codemirror/CodeMirror/pull/5673 + if (m.title) { + (attributes || (attributes = {})).title = m.title; + } + if (m.attributes) { + for (var attr in m.attributes) { + (attributes || (attributes = {}))[attr] = m.attributes[attr]; + } + } + if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0)) { + collapsed = sp; + } + } else if (sp.from > pos && nextChange > sp.from) { + nextChange = sp.from; + } + } + if (endStyles) { + for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2) { + if (endStyles[j$1 + 1] == nextChange) { + spanEndStyle += " " + endStyles[j$1]; + } + } + } + if (!collapsed || collapsed.from == pos) { + for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2) { + buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); + } + } + if (collapsed && (collapsed.from || 0) == pos) { + buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, collapsed.marker, collapsed.from == null); + if (collapsed.to == null) { + return; + } + if (collapsed.to == pos) { + collapsed = false; + } + } + } + if (pos >= len) { + break; + } + var upto = Math.min(len, nextChange); + while (true) { + if (text) { + var end = pos + text.length; + if (!collapsed) { + var tokenText = end > upto ? text.slice(0, upto - pos) : text; + builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes); + } + if (end >= upto) { + text = text.slice(upto - pos); + pos = upto; + break; + } + pos = end; + spanStartStyle = ""; + } + text = allText.slice(at, at = styles[i++]); + style = interpretTokenStyle(styles[i++], builder.cm.options); + } + } + } + + // These objects are used to represent the visible (currently drawn) + // part of the document. A LineView may correspond to multiple + // logical lines, if those are connected by collapsed ranges. + function LineView(doc, line, lineN) { + // The starting line + this.line = line; + // Continuing lines, if any + this.rest = visualLineContinued(line); + // Number of logical lines in this visual line + this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1; + this.node = this.text = null; + this.hidden = lineIsHidden(doc, line); + } + + // Create a range of LineView objects for the given lines. + function buildViewArray(cm, from, to) { + var array = [], + nextPos; + for (var pos = from; pos < to; pos = nextPos) { + var view = new LineView(cm.doc, getLine(cm.doc, pos), pos); + nextPos = pos + view.size; + array.push(view); + } + return array; + } + var operationGroup = null; + function pushOperation(op) { + if (operationGroup) { + operationGroup.ops.push(op); + } else { + op.ownsGroup = operationGroup = { + ops: [op], + delayedCallbacks: [] + }; + } + } + function fireCallbacksForOps(group) { + // Calls delayed callbacks and cursorActivity handlers until no + // new ones appear + var callbacks = group.delayedCallbacks, + i = 0; + do { + for (; i < callbacks.length; i++) { + callbacks[i].call(null); + } + for (var j = 0; j < group.ops.length; j++) { + var op = group.ops[j]; + if (op.cursorActivityHandlers) { + while (op.cursorActivityCalled < op.cursorActivityHandlers.length) { + op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); + } + } + } + } while (i < callbacks.length); + } + function finishOperation(op, endCb) { + var group = op.ownsGroup; + if (!group) { + return; + } + try { + fireCallbacksForOps(group); + } finally { + operationGroup = null; + endCb(group); + } + } + var orphanDelayedCallbacks = null; + + // Often, we want to signal events at a point where we are in the + // middle of some work, but don't want the handler to start calling + // other methods on the editor, which might be in an inconsistent + // state or simply not expect any other events to happen. + // signalLater looks whether there are any handlers, and schedules + // them to be executed when the last operation ends, or, if no + // operation is active, when a timeout fires. + function signalLater(emitter, type /*, values...*/) { + var arr = getHandlers(emitter, type); + if (!arr.length) { + return; + } + var args = Array.prototype.slice.call(arguments, 2), + list; + if (operationGroup) { + list = operationGroup.delayedCallbacks; + } else if (orphanDelayedCallbacks) { + list = orphanDelayedCallbacks; + } else { + list = orphanDelayedCallbacks = []; + setTimeout(fireOrphanDelayed, 0); + } + var loop = function (i) { + list.push(function () { + return arr[i].apply(null, args); + }); + }; + for (var i = 0; i < arr.length; ++i) loop(i); + } + function fireOrphanDelayed() { + var delayed = orphanDelayedCallbacks; + orphanDelayedCallbacks = null; + for (var i = 0; i < delayed.length; ++i) { + delayed[i](); + } + } + + // When an aspect of a line changes, a string is added to + // lineView.changes. This updates the relevant part of the line's + // DOM structure. + function updateLineForChanges(cm, lineView, lineN, dims) { + for (var j = 0; j < lineView.changes.length; j++) { + var type = lineView.changes[j]; + if (type == "text") { + updateLineText(cm, lineView); + } else if (type == "gutter") { + updateLineGutter(cm, lineView, lineN, dims); + } else if (type == "class") { + updateLineClasses(cm, lineView); + } else if (type == "widget") { + updateLineWidgets(cm, lineView, dims); + } + } + lineView.changes = null; + } + + // Lines with gutter elements, widgets or a background class need to + // be wrapped, and have the extra elements added to the wrapper div + function ensureLineWrapped(lineView) { + if (lineView.node == lineView.text) { + lineView.node = elt("div", null, null, "position: relative"); + if (lineView.text.parentNode) { + lineView.text.parentNode.replaceChild(lineView.node, lineView.text); + } + lineView.node.appendChild(lineView.text); + if (ie && ie_version < 8) { + lineView.node.style.zIndex = 2; + } + } + return lineView.node; + } + function updateLineBackground(cm, lineView) { + var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass; + if (cls) { + cls += " CodeMirror-linebackground"; + } + if (lineView.background) { + if (cls) { + lineView.background.className = cls; + } else { + lineView.background.parentNode.removeChild(lineView.background); + lineView.background = null; + } + } else if (cls) { + var wrap = ensureLineWrapped(lineView); + lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild); + cm.display.input.setUneditable(lineView.background); + } + } + + // Wrapper around buildLineContent which will reuse the structure + // in display.externalMeasured when possible. + function getLineContent(cm, lineView) { + var ext = cm.display.externalMeasured; + if (ext && ext.line == lineView.line) { + cm.display.externalMeasured = null; + lineView.measure = ext.measure; + return ext.built; + } + return buildLineContent(cm, lineView); + } + + // Redraw the line's text. Interacts with the background and text + // classes because the mode may output tokens that influence these + // classes. + function updateLineText(cm, lineView) { + var cls = lineView.text.className; + var built = getLineContent(cm, lineView); + if (lineView.text == lineView.node) { + lineView.node = built.pre; + } + lineView.text.parentNode.replaceChild(built.pre, lineView.text); + lineView.text = built.pre; + if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) { + lineView.bgClass = built.bgClass; + lineView.textClass = built.textClass; + updateLineClasses(cm, lineView); + } else if (cls) { + lineView.text.className = cls; + } + } + function updateLineClasses(cm, lineView) { + updateLineBackground(cm, lineView); + if (lineView.line.wrapClass) { + ensureLineWrapped(lineView).className = lineView.line.wrapClass; + } else if (lineView.node != lineView.text) { + lineView.node.className = ""; + } + var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass; + lineView.text.className = textClass || ""; + } + function updateLineGutter(cm, lineView, lineN, dims) { + if (lineView.gutter) { + lineView.node.removeChild(lineView.gutter); + lineView.gutter = null; + } + if (lineView.gutterBackground) { + lineView.node.removeChild(lineView.gutterBackground); + lineView.gutterBackground = null; + } + if (lineView.line.gutterClass) { + var wrap = ensureLineWrapped(lineView); + lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass, "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + dims.gutterTotalWidth + "px"); + cm.display.input.setUneditable(lineView.gutterBackground); + wrap.insertBefore(lineView.gutterBackground, lineView.text); + } + var markers = lineView.line.gutterMarkers; + if (cm.options.lineNumbers || markers) { + var wrap$1 = ensureLineWrapped(lineView); + var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"); + gutterWrap.setAttribute("aria-hidden", "true"); + cm.display.input.setUneditable(gutterWrap); + wrap$1.insertBefore(gutterWrap, lineView.text); + if (lineView.line.gutterClass) { + gutterWrap.className += " " + lineView.line.gutterClass; + } + if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"])) { + lineView.lineNumber = gutterWrap.appendChild(elt("div", lineNumberFor(cm.options, lineN), "CodeMirror-linenumber CodeMirror-gutter-elt", "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: " + cm.display.lineNumInnerWidth + "px")); + } + if (markers) { + for (var k = 0; k < cm.display.gutterSpecs.length; ++k) { + var id = cm.display.gutterSpecs[k].className, + found = markers.hasOwnProperty(id) && markers[id]; + if (found) { + gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " + dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px")); + } + } + } + } + } + function updateLineWidgets(cm, lineView, dims) { + if (lineView.alignable) { + lineView.alignable = null; + } + var isWidget = classTest("CodeMirror-linewidget"); + for (var node = lineView.node.firstChild, next = void 0; node; node = next) { + next = node.nextSibling; + if (isWidget.test(node.className)) { + lineView.node.removeChild(node); + } + } + insertLineWidgets(cm, lineView, dims); + } + + // Build a line's DOM representation from scratch + function buildLineElement(cm, lineView, lineN, dims) { + var built = getLineContent(cm, lineView); + lineView.text = lineView.node = built.pre; + if (built.bgClass) { + lineView.bgClass = built.bgClass; + } + if (built.textClass) { + lineView.textClass = built.textClass; + } + updateLineClasses(cm, lineView); + updateLineGutter(cm, lineView, lineN, dims); + insertLineWidgets(cm, lineView, dims); + return lineView.node; + } + + // A lineView may contain multiple logical lines (when merged by + // collapsed spans). The widgets for all of them need to be drawn. + function insertLineWidgets(cm, lineView, dims) { + insertLineWidgetsFor(cm, lineView.line, lineView, dims, true); + if (lineView.rest) { + for (var i = 0; i < lineView.rest.length; i++) { + insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false); + } + } + } + function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { + if (!line.widgets) { + return; + } + var wrap = ensureLineWrapped(lineView); + for (var i = 0, ws = line.widgets; i < ws.length; ++i) { + var widget = ws[i], + node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : "")); + if (!widget.handleMouseEvents) { + node.setAttribute("cm-ignore-events", "true"); + } + positionLineWidget(widget, node, lineView, dims); + cm.display.input.setUneditable(node); + if (allowAbove && widget.above) { + wrap.insertBefore(node, lineView.gutter || lineView.text); + } else { + wrap.appendChild(node); + } + signalLater(widget, "redraw"); + } + } + function positionLineWidget(widget, node, lineView, dims) { + if (widget.noHScroll) { + (lineView.alignable || (lineView.alignable = [])).push(node); + var width = dims.wrapperWidth; + node.style.left = dims.fixedPos + "px"; + if (!widget.coverGutter) { + width -= dims.gutterTotalWidth; + node.style.paddingLeft = dims.gutterTotalWidth + "px"; + } + node.style.width = width + "px"; + } + if (widget.coverGutter) { + node.style.zIndex = 5; + node.style.position = "relative"; + if (!widget.noHScroll) { + node.style.marginLeft = -dims.gutterTotalWidth + "px"; + } + } + } + function widgetHeight(widget) { + if (widget.height != null) { + return widget.height; + } + var cm = widget.doc.cm; + if (!cm) { + return 0; + } + if (!contains(document.body, widget.node)) { + var parentStyle = "position: relative;"; + if (widget.coverGutter) { + parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; + } + if (widget.noHScroll) { + parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; + } + removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle)); + } + return widget.height = widget.node.parentNode.offsetHeight; + } + + // Return true when the given mouse event happened in a widget + function eventInWidget(display, e) { + for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { + if (!n || n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true" || n.parentNode == display.sizer && n != display.mover) { + return true; + } + } + } + + // POSITION MEASUREMENT + + function paddingTop(display) { + return display.lineSpace.offsetTop; + } + function paddingVert(display) { + return display.mover.offsetHeight - display.lineSpace.offsetHeight; + } + function paddingH(display) { + if (display.cachedPaddingH) { + return display.cachedPaddingH; + } + var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like")); + var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle; + var data = { + left: parseInt(style.paddingLeft), + right: parseInt(style.paddingRight) + }; + if (!isNaN(data.left) && !isNaN(data.right)) { + display.cachedPaddingH = data; + } + return data; + } + function scrollGap(cm) { + return scrollerGap - cm.display.nativeBarWidth; + } + function displayWidth(cm) { + return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth; + } + function displayHeight(cm) { + return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight; + } + + // Ensure the lineView.wrapping.heights array is populated. This is + // an array of bottom offsets for the lines that make up a drawn + // line. When lineWrapping is on, there might be more than one + // height. + function ensureLineHeights(cm, lineView, rect) { + var wrapping = cm.options.lineWrapping; + var curWidth = wrapping && displayWidth(cm); + if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { + var heights = lineView.measure.heights = []; + if (wrapping) { + lineView.measure.width = curWidth; + var rects = lineView.text.firstChild.getClientRects(); + for (var i = 0; i < rects.length - 1; i++) { + var cur = rects[i], + next = rects[i + 1]; + if (Math.abs(cur.bottom - next.bottom) > 2) { + heights.push((cur.bottom + next.top) / 2 - rect.top); + } + } + } + heights.push(rect.bottom - rect.top); + } + } + + // Find a line map (mapping character offsets to text nodes) and a + // measurement cache for the given line number. (A line view might + // contain multiple lines when collapsed ranges are present.) + function mapFromLineView(lineView, line, lineN) { + if (lineView.line == line) { + return { + map: lineView.measure.map, + cache: lineView.measure.cache + }; + } + if (lineView.rest) { + for (var i = 0; i < lineView.rest.length; i++) { + if (lineView.rest[i] == line) { + return { + map: lineView.measure.maps[i], + cache: lineView.measure.caches[i] + }; + } + } + for (var i$1 = 0; i$1 < lineView.rest.length; i$1++) { + if (lineNo(lineView.rest[i$1]) > lineN) { + return { + map: lineView.measure.maps[i$1], + cache: lineView.measure.caches[i$1], + before: true + }; + } + } + } + } + + // Render a line into the hidden node display.externalMeasured. Used + // when measurement is needed for a line that's not in the viewport. + function updateExternalMeasurement(cm, line) { + line = visualLine(line); + var lineN = lineNo(line); + var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN); + view.lineN = lineN; + var built = view.built = buildLineContent(cm, view); + view.text = built.pre; + removeChildrenAndAdd(cm.display.lineMeasure, built.pre); + return view; + } + + // Get a {top, bottom, left, right} box (in line-local coordinates) + // for a given character. + function measureChar(cm, line, ch, bias) { + return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias); + } + + // Find a line view that corresponds to the given line number. + function findViewForLine(cm, lineN) { + if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) { + return cm.display.view[findViewIndex(cm, lineN)]; + } + var ext = cm.display.externalMeasured; + if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) { + return ext; + } + } + + // Measurement can be split in two steps, the set-up work that + // applies to the whole line, and the measurement of the actual + // character. Functions like coordsChar, that need to do a lot of + // measurements in a row, can thus ensure that the set-up work is + // only done once. + function prepareMeasureForLine(cm, line) { + var lineN = lineNo(line); + var view = findViewForLine(cm, lineN); + if (view && !view.text) { + view = null; + } else if (view && view.changes) { + updateLineForChanges(cm, view, lineN, getDimensions(cm)); + cm.curOp.forceUpdate = true; + } + if (!view) { + view = updateExternalMeasurement(cm, line); + } + var info = mapFromLineView(view, line, lineN); + return { + line: line, + view: view, + rect: null, + map: info.map, + cache: info.cache, + before: info.before, + hasHeights: false + }; + } + + // Given a prepared measurement object, measures the position of an + // actual character (or fetches it from the cache). + function measureCharPrepared(cm, prepared, ch, bias, varHeight) { + if (prepared.before) { + ch = -1; + } + var key = ch + (bias || ""), + found; + if (prepared.cache.hasOwnProperty(key)) { + found = prepared.cache[key]; + } else { + if (!prepared.rect) { + prepared.rect = prepared.view.text.getBoundingClientRect(); + } + if (!prepared.hasHeights) { + ensureLineHeights(cm, prepared.view, prepared.rect); + prepared.hasHeights = true; + } + found = measureCharInner(cm, prepared, ch, bias); + if (!found.bogus) { + prepared.cache[key] = found; + } + } + return { + left: found.left, + right: found.right, + top: varHeight ? found.rtop : found.top, + bottom: varHeight ? found.rbottom : found.bottom + }; + } + var nullRect = { + left: 0, + right: 0, + top: 0, + bottom: 0 + }; + function nodeAndOffsetInLineMap(map, ch, bias) { + var node, start, end, collapse, mStart, mEnd; + // First, search the line map for the text node corresponding to, + // or closest to, the target character. + for (var i = 0; i < map.length; i += 3) { + mStart = map[i]; + mEnd = map[i + 1]; + if (ch < mStart) { + start = 0; + end = 1; + collapse = "left"; + } else if (ch < mEnd) { + start = ch - mStart; + end = start + 1; + } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) { + end = mEnd - mStart; + start = end - 1; + if (ch >= mEnd) { + collapse = "right"; + } + } + if (start != null) { + node = map[i + 2]; + if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")) { + collapse = bias; + } + if (bias == "left" && start == 0) { + while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) { + node = map[(i -= 3) + 2]; + collapse = "left"; + } + } + if (bias == "right" && start == mEnd - mStart) { + while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) { + node = map[(i += 3) + 2]; + collapse = "right"; + } + } + break; + } + } + return { + node: node, + start: start, + end: end, + collapse: collapse, + coverStart: mStart, + coverEnd: mEnd + }; + } + function getUsefulRect(rects, bias) { + var rect = nullRect; + if (bias == "left") { + for (var i = 0; i < rects.length; i++) { + if ((rect = rects[i]).left != rect.right) { + break; + } + } + } else { + for (var i$1 = rects.length - 1; i$1 >= 0; i$1--) { + if ((rect = rects[i$1]).left != rect.right) { + break; + } + } + } + return rect; + } + function measureCharInner(cm, prepared, ch, bias) { + var place = nodeAndOffsetInLineMap(prepared.map, ch, bias); + var node = place.node, + start = place.start, + end = place.end, + collapse = place.collapse; + var rect; + if (node.nodeType == 3) { + // If it is a text node, use a range to retrieve the coordinates. + for (var i$1 = 0; i$1 < 4; i$1++) { + // Retry a maximum of 4 times when nonsense rectangles are returned + while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { + --start; + } + while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { + ++end; + } + if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) { + rect = node.parentNode.getBoundingClientRect(); + } else { + rect = getUsefulRect(range(node, start, end).getClientRects(), bias); + } + if (rect.left || rect.right || start == 0) { + break; + } + end = start; + start = start - 1; + collapse = "right"; + } + if (ie && ie_version < 11) { + rect = maybeUpdateRectForZooming(cm.display.measure, rect); + } + } else { + // If it is a widget, simply get the box for the whole widget. + if (start > 0) { + collapse = bias = "right"; + } + var rects; + if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) { + rect = rects[bias == "right" ? rects.length - 1 : 0]; + } else { + rect = node.getBoundingClientRect(); + } + } + if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { + var rSpan = node.parentNode.getClientRects()[0]; + if (rSpan) { + rect = { + left: rSpan.left, + right: rSpan.left + charWidth(cm.display), + top: rSpan.top, + bottom: rSpan.bottom + }; + } else { + rect = nullRect; + } + } + var rtop = rect.top - prepared.rect.top, + rbot = rect.bottom - prepared.rect.top; + var mid = (rtop + rbot) / 2; + var heights = prepared.view.measure.heights; + var i = 0; + for (; i < heights.length - 1; i++) { + if (mid < heights[i]) { + break; + } + } + var top = i ? heights[i - 1] : 0, + bot = heights[i]; + var result = { + left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, + right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, + top: top, + bottom: bot + }; + if (!rect.left && !rect.right) { + result.bogus = true; + } + if (!cm.options.singleCursorHeightPerLine) { + result.rtop = rtop; + result.rbottom = rbot; + } + return result; + } + + // Work around problem with bounding client rects on ranges being + // returned incorrectly when zoomed on IE10 and below. + function maybeUpdateRectForZooming(measure, rect) { + if (!window.screen || screen.logicalXDPI == null || screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) { + return rect; + } + var scaleX = screen.logicalXDPI / screen.deviceXDPI; + var scaleY = screen.logicalYDPI / screen.deviceYDPI; + return { + left: rect.left * scaleX, + right: rect.right * scaleX, + top: rect.top * scaleY, + bottom: rect.bottom * scaleY + }; + } + function clearLineMeasurementCacheFor(lineView) { + if (lineView.measure) { + lineView.measure.cache = {}; + lineView.measure.heights = null; + if (lineView.rest) { + for (var i = 0; i < lineView.rest.length; i++) { + lineView.measure.caches[i] = {}; + } + } + } + } + function clearLineMeasurementCache(cm) { + cm.display.externalMeasure = null; + removeChildren(cm.display.lineMeasure); + for (var i = 0; i < cm.display.view.length; i++) { + clearLineMeasurementCacheFor(cm.display.view[i]); + } + } + function clearCaches(cm) { + clearLineMeasurementCache(cm); + cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null; + if (!cm.options.lineWrapping) { + cm.display.maxLineChanged = true; + } + cm.display.lineNumChars = null; + } + function pageScrollX() { + // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206 + // which causes page_Offset and bounding client rects to use + // different reference viewports and invalidate our calculations. + if (chrome && android) { + return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)); + } + return window.pageXOffset || (document.documentElement || document.body).scrollLeft; + } + function pageScrollY() { + if (chrome && android) { + return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)); + } + return window.pageYOffset || (document.documentElement || document.body).scrollTop; + } + function widgetTopHeight(lineObj) { + var ref = visualLine(lineObj); + var widgets = ref.widgets; + var height = 0; + if (widgets) { + for (var i = 0; i < widgets.length; ++i) { + if (widgets[i].above) { + height += widgetHeight(widgets[i]); + } + } + } + return height; + } + + // Converts a {top, bottom, left, right} box from line-local + // coordinates into another coordinate system. Context may be one of + // "line", "div" (display.lineDiv), "local"./null (editor), "window", + // or "page". + function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) { + if (!includeWidgets) { + var height = widgetTopHeight(lineObj); + rect.top += height; + rect.bottom += height; + } + if (context == "line") { + return rect; + } + if (!context) { + context = "local"; + } + var yOff = heightAtLine(lineObj); + if (context == "local") { + yOff += paddingTop(cm.display); + } else { + yOff -= cm.display.viewOffset; + } + if (context == "page" || context == "window") { + var lOff = cm.display.lineSpace.getBoundingClientRect(); + yOff += lOff.top + (context == "window" ? 0 : pageScrollY()); + var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()); + rect.left += xOff; + rect.right += xOff; + } + rect.top += yOff; + rect.bottom += yOff; + return rect; + } + + // Coverts a box from "div" coords to another coordinate system. + // Context may be "window", "page", "div", or "local"./null. + function fromCoordSystem(cm, coords, context) { + if (context == "div") { + return coords; + } + var left = coords.left, + top = coords.top; + // First move into "page" coordinate system + if (context == "page") { + left -= pageScrollX(); + top -= pageScrollY(); + } else if (context == "local" || !context) { + var localBox = cm.display.sizer.getBoundingClientRect(); + left += localBox.left; + top += localBox.top; + } + var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect(); + return { + left: left - lineSpaceBox.left, + top: top - lineSpaceBox.top + }; + } + function charCoords(cm, pos, context, lineObj, bias) { + if (!lineObj) { + lineObj = getLine(cm.doc, pos.line); + } + return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context); + } + + // Returns a box for a given cursor position, which may have an + // 'other' property containing the position of the secondary cursor + // on a bidi boundary. + // A cursor Pos(line, char, "before") is on the same visual line as `char - 1` + // and after `char - 1` in writing order of `char - 1` + // A cursor Pos(line, char, "after") is on the same visual line as `char` + // and before `char` in writing order of `char` + // Examples (upper-case letters are RTL, lower-case are LTR): + // Pos(0, 1, ...) + // before after + // ab a|b a|b + // aB a|B aB| + // Ab |Ab A|b + // AB B|A B|A + // Every position after the last character on a line is considered to stick + // to the last character on the line. + function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) { + lineObj = lineObj || getLine(cm.doc, pos.line); + if (!preparedMeasure) { + preparedMeasure = prepareMeasureForLine(cm, lineObj); + } + function get(ch, right) { + var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight); + if (right) { + m.left = m.right; + } else { + m.right = m.left; + } + return intoCoordSystem(cm, lineObj, m, context); + } + var order = getOrder(lineObj, cm.doc.direction), + ch = pos.ch, + sticky = pos.sticky; + if (ch >= lineObj.text.length) { + ch = lineObj.text.length; + sticky = "before"; + } else if (ch <= 0) { + ch = 0; + sticky = "after"; + } + if (!order) { + return get(sticky == "before" ? ch - 1 : ch, sticky == "before"); + } + function getBidi(ch, partPos, invert) { + var part = order[partPos], + right = part.level == 1; + return get(invert ? ch - 1 : ch, right != invert); + } + var partPos = getBidiPartAt(order, ch, sticky); + var other = bidiOther; + var val = getBidi(ch, partPos, sticky == "before"); + if (other != null) { + val.other = getBidi(ch, other, sticky != "before"); + } + return val; + } + + // Used to cheaply estimate the coordinates for a position. Used for + // intermediate scroll updates. + function estimateCoords(cm, pos) { + var left = 0; + pos = clipPos(cm.doc, pos); + if (!cm.options.lineWrapping) { + left = charWidth(cm.display) * pos.ch; + } + var lineObj = getLine(cm.doc, pos.line); + var top = heightAtLine(lineObj) + paddingTop(cm.display); + return { + left: left, + right: left, + top: top, + bottom: top + lineObj.height + }; + } + + // Positions returned by coordsChar contain some extra information. + // xRel is the relative x position of the input coordinates compared + // to the found position (so xRel > 0 means the coordinates are to + // the right of the character position, for example). When outside + // is true, that means the coordinates lie outside the line's + // vertical range. + function PosWithInfo(line, ch, sticky, outside, xRel) { + var pos = Pos(line, ch, sticky); + pos.xRel = xRel; + if (outside) { + pos.outside = outside; + } + return pos; + } + + // Compute the character position closest to the given coordinates. + // Input must be lineSpace-local ("div" coordinate system). + function coordsChar(cm, x, y) { + var doc = cm.doc; + y += cm.display.viewOffset; + if (y < 0) { + return PosWithInfo(doc.first, 0, null, -1, -1); + } + var lineN = lineAtHeight(doc, y), + last = doc.first + doc.size - 1; + if (lineN > last) { + return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1); + } + if (x < 0) { + x = 0; + } + var lineObj = getLine(doc, lineN); + for (;;) { + var found = coordsCharInner(cm, lineObj, lineN, x, y); + var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0)); + if (!collapsed) { + return found; + } + var rangeEnd = collapsed.find(1); + if (rangeEnd.line == lineN) { + return rangeEnd; + } + lineObj = getLine(doc, lineN = rangeEnd.line); + } + } + function wrappedLineExtent(cm, lineObj, preparedMeasure, y) { + y -= widgetTopHeight(lineObj); + var end = lineObj.text.length; + var begin = findFirst(function (ch) { + return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; + }, end, 0); + end = findFirst(function (ch) { + return measureCharPrepared(cm, preparedMeasure, ch).top > y; + }, begin, end); + return { + begin: begin, + end: end + }; + } + function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) { + if (!preparedMeasure) { + preparedMeasure = prepareMeasureForLine(cm, lineObj); + } + var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top; + return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop); + } + + // Returns true if the given side of a box is after the given + // coordinates, in top-to-bottom, left-to-right order. + function boxIsAfter(box, x, y, left) { + return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x; + } + function coordsCharInner(cm, lineObj, lineNo, x, y) { + // Move y into line-local coordinate space + y -= heightAtLine(lineObj); + var preparedMeasure = prepareMeasureForLine(cm, lineObj); + // When directly calling `measureCharPrepared`, we have to adjust + // for the widgets at this line. + var widgetHeight = widgetTopHeight(lineObj); + var begin = 0, + end = lineObj.text.length, + ltr = true; + var order = getOrder(lineObj, cm.doc.direction); + // If the line isn't plain left-to-right text, first figure out + // which bidi section the coordinates fall into. + if (order) { + var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)(cm, lineObj, lineNo, preparedMeasure, order, x, y); + ltr = part.level != 1; + // The awkward -1 offsets are needed because findFirst (called + // on these below) will treat its first bound as inclusive, + // second as exclusive, but we want to actually address the + // characters in the part's range + begin = ltr ? part.from : part.to - 1; + end = ltr ? part.to : part.from - 1; + } + + // A binary search to find the first character whose bounding box + // starts after the coordinates. If we run across any whose box wrap + // the coordinates, store that. + var chAround = null, + boxAround = null; + var ch = findFirst(function (ch) { + var box = measureCharPrepared(cm, preparedMeasure, ch); + box.top += widgetHeight; + box.bottom += widgetHeight; + if (!boxIsAfter(box, x, y, false)) { + return false; + } + if (box.top <= y && box.left <= x) { + chAround = ch; + boxAround = box; + } + return true; + }, begin, end); + var baseX, + sticky, + outside = false; + // If a box around the coordinates was found, use that + if (boxAround) { + // Distinguish coordinates nearer to the left or right side of the box + var atLeft = x - boxAround.left < boxAround.right - x, + atStart = atLeft == ltr; + ch = chAround + (atStart ? 0 : 1); + sticky = atStart ? "after" : "before"; + baseX = atLeft ? boxAround.left : boxAround.right; + } else { + // (Adjust for extended bound, if necessary.) + if (!ltr && (ch == end || ch == begin)) { + ch++; + } + // To determine which side to associate with, get the box to the + // left of the character and compare it's vertical position to the + // coordinates + sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" : measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y == ltr ? "after" : "before"; + // Now get accurate coordinates for this place, in order to get a + // base X position + var coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure); + baseX = coords.left; + outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0; + } + ch = skipExtendingChars(lineObj.text, ch, 1); + return PosWithInfo(lineNo, ch, sticky, outside, x - baseX); + } + function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) { + // Bidi parts are sorted left-to-right, and in a non-line-wrapping + // situation, we can take this ordering to correspond to the visual + // ordering. This finds the first part whose end is after the given + // coordinates. + var index = findFirst(function (i) { + var part = order[i], + ltr = part.level != 1; + return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"), "line", lineObj, preparedMeasure), x, y, true); + }, 0, order.length - 1); + var part = order[index]; + // If this isn't the first part, the part's start is also after + // the coordinates, and the coordinates aren't on the same line as + // that start, move one part back. + if (index > 0) { + var ltr = part.level != 1; + var start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"), "line", lineObj, preparedMeasure); + if (boxIsAfter(start, x, y, true) && start.top > y) { + part = order[index - 1]; + } + } + return part; + } + function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) { + // In a wrapped line, rtl text on wrapping boundaries can do things + // that don't correspond to the ordering in our `order` array at + // all, so a binary search doesn't work, and we want to return a + // part that only spans one line so that the binary search in + // coordsCharInner is safe. As such, we first find the extent of the + // wrapped line, and then do a flat search in which we discard any + // spans that aren't on the line. + var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y); + var begin = ref.begin; + var end = ref.end; + if (/\s/.test(lineObj.text.charAt(end - 1))) { + end--; + } + var part = null, + closestDist = null; + for (var i = 0; i < order.length; i++) { + var p = order[i]; + if (p.from >= end || p.to <= begin) { + continue; + } + var ltr = p.level != 1; + var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right; + // Weigh against spans ending before this, so that they are only + // picked if nothing ends after + var dist = endX < x ? x - endX + 1e9 : endX - x; + if (!part || closestDist > dist) { + part = p; + closestDist = dist; + } + } + if (!part) { + part = order[order.length - 1]; + } + // Clip the part to the wrapped line. + if (part.from < begin) { + part = { + from: begin, + to: part.to, + level: part.level + }; + } + if (part.to > end) { + part = { + from: part.from, + to: end, + level: part.level + }; + } + return part; + } + var measureText; + // Compute the default text height. + function textHeight(display) { + if (display.cachedTextHeight != null) { + return display.cachedTextHeight; + } + if (measureText == null) { + measureText = elt("pre", null, "CodeMirror-line-like"); + // Measure a bunch of lines, for browsers that compute + // fractional heights. + for (var i = 0; i < 49; ++i) { + measureText.appendChild(document.createTextNode("x")); + measureText.appendChild(elt("br")); + } + measureText.appendChild(document.createTextNode("x")); + } + removeChildrenAndAdd(display.measure, measureText); + var height = measureText.offsetHeight / 50; + if (height > 3) { + display.cachedTextHeight = height; + } + removeChildren(display.measure); + return height || 1; + } + + // Compute the default character width. + function charWidth(display) { + if (display.cachedCharWidth != null) { + return display.cachedCharWidth; + } + var anchor = elt("span", "xxxxxxxxxx"); + var pre = elt("pre", [anchor], "CodeMirror-line-like"); + removeChildrenAndAdd(display.measure, pre); + var rect = anchor.getBoundingClientRect(), + width = (rect.right - rect.left) / 10; + if (width > 2) { + display.cachedCharWidth = width; + } + return width || 10; + } + + // Do a bulk-read of the DOM positions and sizes needed to draw the + // view, so that we don't interleave reading and writing to the DOM. + function getDimensions(cm) { + var d = cm.display, + left = {}, + width = {}; + var gutterLeft = d.gutters.clientLeft; + for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { + var id = cm.display.gutterSpecs[i].className; + left[id] = n.offsetLeft + n.clientLeft + gutterLeft; + width[id] = n.clientWidth; + } + return { + fixedPos: compensateForHScroll(d), + gutterTotalWidth: d.gutters.offsetWidth, + gutterLeft: left, + gutterWidth: width, + wrapperWidth: d.wrapper.clientWidth + }; + } + + // Computes display.scroller.scrollLeft + display.gutters.offsetWidth, + // but using getBoundingClientRect to get a sub-pixel-accurate + // result. + function compensateForHScroll(display) { + return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left; + } + + // Returns a function that estimates the height of a line, to use as + // first approximation until the line becomes visible (and is thus + // properly measurable). + function estimateHeight(cm) { + var th = textHeight(cm.display), + wrapping = cm.options.lineWrapping; + var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3); + return function (line) { + if (lineIsHidden(cm.doc, line)) { + return 0; + } + var widgetsHeight = 0; + if (line.widgets) { + for (var i = 0; i < line.widgets.length; i++) { + if (line.widgets[i].height) { + widgetsHeight += line.widgets[i].height; + } + } + } + if (wrapping) { + return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th; + } else { + return widgetsHeight + th; + } + }; + } + function estimateLineHeights(cm) { + var doc = cm.doc, + est = estimateHeight(cm); + doc.iter(function (line) { + var estHeight = est(line); + if (estHeight != line.height) { + updateLineHeight(line, estHeight); + } + }); + } + + // Given a mouse event, find the corresponding position. If liberal + // is false, it checks whether a gutter or scrollbar was clicked, + // and returns null if it was. forRect is used by rectangular + // selections, and tries to estimate a character position even for + // coordinates beyond the right of the text. + function posFromMouse(cm, e, liberal, forRect) { + var display = cm.display; + if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { + return null; + } + var x, + y, + space = display.lineSpace.getBoundingClientRect(); + // Fails unpredictably on IE[67] when mouse is dragged around quickly. + try { + x = e.clientX - space.left; + y = e.clientY - space.top; + } catch (e$1) { + return null; + } + var coords = coordsChar(cm, x, y), + line; + if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { + var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length; + coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)); + } + return coords; + } + + // Find the view element corresponding to a given line. Return null + // when the line isn't visible. + function findViewIndex(cm, n) { + if (n >= cm.display.viewTo) { + return null; + } + n -= cm.display.viewFrom; + if (n < 0) { + return null; + } + var view = cm.display.view; + for (var i = 0; i < view.length; i++) { + n -= view[i].size; + if (n < 0) { + return i; + } + } + } + + // Updates the display.view data structure for a given change to the + // document. From and to are in pre-change coordinates. Lendiff is + // the amount of lines added or subtracted by the change. This is + // used for changes that span multiple lines, or change the way + // lines are divided into visual lines. regLineChange (below) + // registers single-line changes. + function regChange(cm, from, to, lendiff) { + if (from == null) { + from = cm.doc.first; + } + if (to == null) { + to = cm.doc.first + cm.doc.size; + } + if (!lendiff) { + lendiff = 0; + } + var display = cm.display; + if (lendiff && to < display.viewTo && (display.updateLineNumbers == null || display.updateLineNumbers > from)) { + display.updateLineNumbers = from; + } + cm.curOp.viewChanged = true; + if (from >= display.viewTo) { + // Change after + if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo) { + resetView(cm); + } + } else if (to <= display.viewFrom) { + // Change before + if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) { + resetView(cm); + } else { + display.viewFrom += lendiff; + display.viewTo += lendiff; + } + } else if (from <= display.viewFrom && to >= display.viewTo) { + // Full overlap + resetView(cm); + } else if (from <= display.viewFrom) { + // Top overlap + var cut = viewCuttingPoint(cm, to, to + lendiff, 1); + if (cut) { + display.view = display.view.slice(cut.index); + display.viewFrom = cut.lineN; + display.viewTo += lendiff; + } else { + resetView(cm); + } + } else if (to >= display.viewTo) { + // Bottom overlap + var cut$1 = viewCuttingPoint(cm, from, from, -1); + if (cut$1) { + display.view = display.view.slice(0, cut$1.index); + display.viewTo = cut$1.lineN; + } else { + resetView(cm); + } + } else { + // Gap in the middle + var cutTop = viewCuttingPoint(cm, from, from, -1); + var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1); + if (cutTop && cutBot) { + display.view = display.view.slice(0, cutTop.index).concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)).concat(display.view.slice(cutBot.index)); + display.viewTo += lendiff; + } else { + resetView(cm); + } + } + var ext = display.externalMeasured; + if (ext) { + if (to < ext.lineN) { + ext.lineN += lendiff; + } else if (from < ext.lineN + ext.size) { + display.externalMeasured = null; + } + } + } + + // Register a change to a single line. Type must be one of "text", + // "gutter", "class", "widget" + function regLineChange(cm, line, type) { + cm.curOp.viewChanged = true; + var display = cm.display, + ext = cm.display.externalMeasured; + if (ext && line >= ext.lineN && line < ext.lineN + ext.size) { + display.externalMeasured = null; + } + if (line < display.viewFrom || line >= display.viewTo) { + return; + } + var lineView = display.view[findViewIndex(cm, line)]; + if (lineView.node == null) { + return; + } + var arr = lineView.changes || (lineView.changes = []); + if (indexOf(arr, type) == -1) { + arr.push(type); + } + } + + // Clear the view. + function resetView(cm) { + cm.display.viewFrom = cm.display.viewTo = cm.doc.first; + cm.display.view = []; + cm.display.viewOffset = 0; + } + function viewCuttingPoint(cm, oldN, newN, dir) { + var index = findViewIndex(cm, oldN), + diff, + view = cm.display.view; + if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) { + return { + index: index, + lineN: newN + }; + } + var n = cm.display.viewFrom; + for (var i = 0; i < index; i++) { + n += view[i].size; + } + if (n != oldN) { + if (dir > 0) { + if (index == view.length - 1) { + return null; + } + diff = n + view[index].size - oldN; + index++; + } else { + diff = n - oldN; + } + oldN += diff; + newN += diff; + } + while (visualLineNo(cm.doc, newN) != newN) { + if (index == (dir < 0 ? 0 : view.length - 1)) { + return null; + } + newN += dir * view[index - (dir < 0 ? 1 : 0)].size; + index += dir; + } + return { + index: index, + lineN: newN + }; + } + + // Force the view to cover a given range, adding empty view element + // or clipping off existing ones as needed. + function adjustView(cm, from, to) { + var display = cm.display, + view = display.view; + if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { + display.view = buildViewArray(cm, from, to); + display.viewFrom = from; + } else { + if (display.viewFrom > from) { + display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); + } else if (display.viewFrom < from) { + display.view = display.view.slice(findViewIndex(cm, from)); + } + display.viewFrom = from; + if (display.viewTo < to) { + display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); + } else if (display.viewTo > to) { + display.view = display.view.slice(0, findViewIndex(cm, to)); + } + } + display.viewTo = to; + } + + // Count the number of lines in the view whose DOM representation is + // out of date (or nonexistent). + function countDirtyView(cm) { + var view = cm.display.view, + dirty = 0; + for (var i = 0; i < view.length; i++) { + var lineView = view[i]; + if (!lineView.hidden && (!lineView.node || lineView.changes)) { + ++dirty; + } + } + return dirty; + } + function updateSelection(cm) { + cm.display.input.showSelection(cm.display.input.prepareSelection()); + } + function prepareSelection(cm, primary) { + if (primary === void 0) primary = true; + var doc = cm.doc, + result = {}; + var curFragment = result.cursors = document.createDocumentFragment(); + var selFragment = result.selection = document.createDocumentFragment(); + var customCursor = cm.options.$customCursor; + if (customCursor) { + primary = true; + } + for (var i = 0; i < doc.sel.ranges.length; i++) { + if (!primary && i == doc.sel.primIndex) { + continue; + } + var range = doc.sel.ranges[i]; + if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) { + continue; + } + var collapsed = range.empty(); + if (customCursor) { + var head = customCursor(cm, range); + if (head) { + drawSelectionCursor(cm, head, curFragment); + } + } else if (collapsed || cm.options.showCursorWhenSelecting) { + drawSelectionCursor(cm, range.head, curFragment); + } + if (!collapsed) { + drawSelectionRange(cm, range, selFragment); + } + } + return result; + } + + // Draws a cursor for the given range + function drawSelectionCursor(cm, head, output) { + var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine); + var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")); + cursor.style.left = pos.left + "px"; + cursor.style.top = pos.top + "px"; + cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"; + if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) { + var charPos = charCoords(cm, head, "div", null, null); + var width = charPos.right - charPos.left; + cursor.style.width = (width > 0 ? width : cm.defaultCharWidth()) + "px"; + } + if (pos.other) { + // Secondary cursor, shown when on a 'jump' in bi-directional text + var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")); + otherCursor.style.display = ""; + otherCursor.style.left = pos.other.left + "px"; + otherCursor.style.top = pos.other.top + "px"; + otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"; + } + } + function cmpCoords(a, b) { + return a.top - b.top || a.left - b.left; + } + + // Draws the given range as a highlighted selection + function drawSelectionRange(cm, range, output) { + var display = cm.display, + doc = cm.doc; + var fragment = document.createDocumentFragment(); + var padding = paddingH(cm.display), + leftSide = padding.left; + var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right; + var docLTR = doc.direction == "ltr"; + function add(left, top, width, bottom) { + if (top < 0) { + top = 0; + } + top = Math.round(top); + bottom = Math.round(bottom); + fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left + "px;\n top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n height: " + (bottom - top) + "px")); + } + function drawForLine(line, fromArg, toArg) { + var lineObj = getLine(doc, line); + var lineLen = lineObj.text.length; + var start, end; + function coords(ch, bias) { + return charCoords(cm, Pos(line, ch), "div", lineObj, bias); + } + function wrapX(pos, dir, side) { + var extent = wrappedLineExtentChar(cm, lineObj, null, pos); + var prop = dir == "ltr" == (side == "after") ? "left" : "right"; + var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1); + return coords(ch, prop)[prop]; + } + var order = getOrder(lineObj, doc.direction); + iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i) { + var ltr = dir == "ltr"; + var fromPos = coords(from, ltr ? "left" : "right"); + var toPos = coords(to - 1, ltr ? "right" : "left"); + var openStart = fromArg == null && from == 0, + openEnd = toArg == null && to == lineLen; + var first = i == 0, + last = !order || i == order.length - 1; + if (toPos.top - fromPos.top <= 3) { + // Single line + var openLeft = (docLTR ? openStart : openEnd) && first; + var openRight = (docLTR ? openEnd : openStart) && last; + var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left; + var right = openRight ? rightSide : (ltr ? toPos : fromPos).right; + add(left, fromPos.top, right - left, fromPos.bottom); + } else { + // Multiple lines + var topLeft, topRight, botLeft, botRight; + if (ltr) { + topLeft = docLTR && openStart && first ? leftSide : fromPos.left; + topRight = docLTR ? rightSide : wrapX(from, dir, "before"); + botLeft = docLTR ? leftSide : wrapX(to, dir, "after"); + botRight = docLTR && openEnd && last ? rightSide : toPos.right; + } else { + topLeft = !docLTR ? leftSide : wrapX(from, dir, "before"); + topRight = !docLTR && openStart && first ? rightSide : fromPos.right; + botLeft = !docLTR && openEnd && last ? leftSide : toPos.left; + botRight = !docLTR ? rightSide : wrapX(to, dir, "after"); + } + add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom); + if (fromPos.bottom < toPos.top) { + add(leftSide, fromPos.bottom, null, toPos.top); + } + add(botLeft, toPos.top, botRight - botLeft, toPos.bottom); + } + if (!start || cmpCoords(fromPos, start) < 0) { + start = fromPos; + } + if (cmpCoords(toPos, start) < 0) { + start = toPos; + } + if (!end || cmpCoords(fromPos, end) < 0) { + end = fromPos; + } + if (cmpCoords(toPos, end) < 0) { + end = toPos; + } + }); + return { + start: start, + end: end + }; + } + var sFrom = range.from(), + sTo = range.to(); + if (sFrom.line == sTo.line) { + drawForLine(sFrom.line, sFrom.ch, sTo.ch); + } else { + var fromLine = getLine(doc, sFrom.line), + toLine = getLine(doc, sTo.line); + var singleVLine = visualLine(fromLine) == visualLine(toLine); + var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end; + var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start; + if (singleVLine) { + if (leftEnd.top < rightStart.top - 2) { + add(leftEnd.right, leftEnd.top, null, leftEnd.bottom); + add(leftSide, rightStart.top, rightStart.left, rightStart.bottom); + } else { + add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom); + } + } + if (leftEnd.bottom < rightStart.top) { + add(leftSide, leftEnd.bottom, null, rightStart.top); + } + } + output.appendChild(fragment); + } + + // Cursor-blinking + function restartBlink(cm) { + if (!cm.state.focused) { + return; + } + var display = cm.display; + clearInterval(display.blinker); + var on = true; + display.cursorDiv.style.visibility = ""; + if (cm.options.cursorBlinkRate > 0) { + display.blinker = setInterval(function () { + if (!cm.hasFocus()) { + onBlur(cm); + } + display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; + }, cm.options.cursorBlinkRate); + } else if (cm.options.cursorBlinkRate < 0) { + display.cursorDiv.style.visibility = "hidden"; + } + } + function ensureFocus(cm) { + if (!cm.hasFocus()) { + cm.display.input.focus(); + if (!cm.state.focused) { + onFocus(cm); + } + } + } + function delayBlurEvent(cm) { + cm.state.delayingBlurEvent = true; + setTimeout(function () { + if (cm.state.delayingBlurEvent) { + cm.state.delayingBlurEvent = false; + if (cm.state.focused) { + onBlur(cm); + } + } + }, 100); + } + function onFocus(cm, e) { + if (cm.state.delayingBlurEvent && !cm.state.draggingText) { + cm.state.delayingBlurEvent = false; + } + if (cm.options.readOnly == "nocursor") { + return; + } + if (!cm.state.focused) { + signal(cm, "focus", cm, e); + cm.state.focused = true; + addClass(cm.display.wrapper, "CodeMirror-focused"); + // This test prevents this from firing when a context + // menu is closed (since the input reset would kill the + // select-all detection hack) + if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) { + cm.display.input.reset(); + if (webkit) { + setTimeout(function () { + return cm.display.input.reset(true); + }, 20); + } // Issue #1730 + } + cm.display.input.receivedFocus(); + } + restartBlink(cm); + } + function onBlur(cm, e) { + if (cm.state.delayingBlurEvent) { + return; + } + if (cm.state.focused) { + signal(cm, "blur", cm, e); + cm.state.focused = false; + rmClass(cm.display.wrapper, "CodeMirror-focused"); + } + clearInterval(cm.display.blinker); + setTimeout(function () { + if (!cm.state.focused) { + cm.display.shift = false; + } + }, 150); + } + + // Read the actual heights of the rendered lines, and update their + // stored heights to match. + function updateHeightsInViewport(cm) { + var display = cm.display; + var prevBottom = display.lineDiv.offsetTop; + var viewTop = Math.max(0, display.scroller.getBoundingClientRect().top); + var oldHeight = display.lineDiv.getBoundingClientRect().top; + var mustScroll = 0; + for (var i = 0; i < display.view.length; i++) { + var cur = display.view[i], + wrapping = cm.options.lineWrapping; + var height = void 0, + width = 0; + if (cur.hidden) { + continue; + } + oldHeight += cur.line.height; + if (ie && ie_version < 8) { + var bot = cur.node.offsetTop + cur.node.offsetHeight; + height = bot - prevBottom; + prevBottom = bot; + } else { + var box = cur.node.getBoundingClientRect(); + height = box.bottom - box.top; + // Check that lines don't extend past the right of the current + // editor width + if (!wrapping && cur.text.firstChild) { + width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; + } + } + var diff = cur.line.height - height; + if (diff > .005 || diff < -.005) { + if (oldHeight < viewTop) { + mustScroll -= diff; + } + updateLineHeight(cur.line, height); + updateWidgetHeight(cur.line); + if (cur.rest) { + for (var j = 0; j < cur.rest.length; j++) { + updateWidgetHeight(cur.rest[j]); + } + } + } + if (width > cm.display.sizerWidth) { + var chWidth = Math.ceil(width / charWidth(cm.display)); + if (chWidth > cm.display.maxLineLength) { + cm.display.maxLineLength = chWidth; + cm.display.maxLine = cur.line; + cm.display.maxLineChanged = true; + } + } + } + if (Math.abs(mustScroll) > 2) { + display.scroller.scrollTop += mustScroll; + } + } + + // Read and store the height of line widgets associated with the + // given line. + function updateWidgetHeight(line) { + if (line.widgets) { + for (var i = 0; i < line.widgets.length; ++i) { + var w = line.widgets[i], + parent = w.node.parentNode; + if (parent) { + w.height = parent.offsetHeight; + } + } + } + } + + // Compute the lines that are visible in a given viewport (defaults + // the the current scroll position). viewport may contain top, + // height, and ensure (see op.scrollToPos) properties. + function visibleLines(display, doc, viewport) { + var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; + top = Math.floor(top - paddingTop(display)); + var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight; + var from = lineAtHeight(doc, top), + to = lineAtHeight(doc, bottom); + // Ensure is a {from: {line, ch}, to: {line, ch}} object, and + // forces those lines into the viewport (if possible). + if (viewport && viewport.ensure) { + var ensureFrom = viewport.ensure.from.line, + ensureTo = viewport.ensure.to.line; + if (ensureFrom < from) { + from = ensureFrom; + to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight); + } else if (Math.min(ensureTo, doc.lastLine()) >= to) { + from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); + to = ensureTo; + } + } + return { + from: from, + to: Math.max(to, from + 1) + }; + } + + // SCROLLING THINGS INTO VIEW + + // If an editor sits on the top or bottom of the window, partially + // scrolled out of view, this ensures that the cursor is visible. + function maybeScrollWindow(cm, rect) { + if (signalDOMEvent(cm, "scrollCursorIntoView")) { + return; + } + var display = cm.display, + box = display.sizer.getBoundingClientRect(), + doScroll = null; + if (rect.top + box.top < 0) { + doScroll = true; + } else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { + doScroll = false; + } + if (doScroll != null && !phantom) { + var scrollNode = elt("div", "\u200b", null, "position: absolute;\n top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + rect.left + "px; width: " + Math.max(2, rect.right - rect.left) + "px;"); + cm.display.lineSpace.appendChild(scrollNode); + scrollNode.scrollIntoView(doScroll); + cm.display.lineSpace.removeChild(scrollNode); + } + } + + // Scroll a given position into view (immediately), verifying that + // it actually became visible (as line heights are accurately + // measured, the position of something may 'drift' during drawing). + function scrollPosIntoView(cm, pos, end, margin) { + if (margin == null) { + margin = 0; + } + var rect; + if (!cm.options.lineWrapping && pos == end) { + // Set pos and end to the cursor positions around the character pos sticks to + // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch + // If pos == Pos(_, 0, "before"), pos and end are unchanged + end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos; + pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos; + } + for (var limit = 0; limit < 5; limit++) { + var changed = false; + var coords = cursorCoords(cm, pos); + var endCoords = !end || end == pos ? coords : cursorCoords(cm, end); + rect = { + left: Math.min(coords.left, endCoords.left), + top: Math.min(coords.top, endCoords.top) - margin, + right: Math.max(coords.left, endCoords.left), + bottom: Math.max(coords.bottom, endCoords.bottom) + margin + }; + var scrollPos = calculateScrollPos(cm, rect); + var startTop = cm.doc.scrollTop, + startLeft = cm.doc.scrollLeft; + if (scrollPos.scrollTop != null) { + updateScrollTop(cm, scrollPos.scrollTop); + if (Math.abs(cm.doc.scrollTop - startTop) > 1) { + changed = true; + } + } + if (scrollPos.scrollLeft != null) { + setScrollLeft(cm, scrollPos.scrollLeft); + if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { + changed = true; + } + } + if (!changed) { + break; + } + } + return rect; + } + + // Scroll a given set of coordinates into view (immediately). + function scrollIntoView(cm, rect) { + var scrollPos = calculateScrollPos(cm, rect); + if (scrollPos.scrollTop != null) { + updateScrollTop(cm, scrollPos.scrollTop); + } + if (scrollPos.scrollLeft != null) { + setScrollLeft(cm, scrollPos.scrollLeft); + } + } + + // Calculate a new scroll position needed to scroll the given + // rectangle into view. Returns an object with scrollTop and + // scrollLeft properties. When these are undefined, the + // vertical/horizontal position does not need to be adjusted. + function calculateScrollPos(cm, rect) { + var display = cm.display, + snapMargin = textHeight(cm.display); + if (rect.top < 0) { + rect.top = 0; + } + var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop; + var screen = displayHeight(cm), + result = {}; + if (rect.bottom - rect.top > screen) { + rect.bottom = rect.top + screen; + } + var docBottom = cm.doc.height + paddingVert(display); + var atTop = rect.top < snapMargin, + atBottom = rect.bottom > docBottom - snapMargin; + if (rect.top < screentop) { + result.scrollTop = atTop ? 0 : rect.top; + } else if (rect.bottom > screentop + screen) { + var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen); + if (newTop != screentop) { + result.scrollTop = newTop; + } + } + var gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth; + var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace; + var screenw = displayWidth(cm) - display.gutters.offsetWidth; + var tooWide = rect.right - rect.left > screenw; + if (tooWide) { + rect.right = rect.left + screenw; + } + if (rect.left < 10) { + result.scrollLeft = 0; + } else if (rect.left < screenleft) { + result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10)); + } else if (rect.right > screenw + screenleft - 3) { + result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; + } + return result; + } + + // Store a relative adjustment to the scroll position in the current + // operation (to be applied when the operation finishes). + function addToScrollTop(cm, top) { + if (top == null) { + return; + } + resolveScrollToPos(cm); + cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; + } + + // Make sure that at the end of the operation the current cursor is + // shown. + function ensureCursorVisible(cm) { + resolveScrollToPos(cm); + var cur = cm.getCursor(); + cm.curOp.scrollToPos = { + from: cur, + to: cur, + margin: cm.options.cursorScrollMargin + }; + } + function scrollToCoords(cm, x, y) { + if (x != null || y != null) { + resolveScrollToPos(cm); + } + if (x != null) { + cm.curOp.scrollLeft = x; + } + if (y != null) { + cm.curOp.scrollTop = y; + } + } + function scrollToRange(cm, range) { + resolveScrollToPos(cm); + cm.curOp.scrollToPos = range; + } + + // When an operation has its scrollToPos property set, and another + // scroll action is applied before the end of the operation, this + // 'simulates' scrolling that position into view in a cheap way, so + // that the effect of intermediate scroll commands is not ignored. + function resolveScrollToPos(cm) { + var range = cm.curOp.scrollToPos; + if (range) { + cm.curOp.scrollToPos = null; + var from = estimateCoords(cm, range.from), + to = estimateCoords(cm, range.to); + scrollToCoordsRange(cm, from, to, range.margin); + } + } + function scrollToCoordsRange(cm, from, to, margin) { + var sPos = calculateScrollPos(cm, { + left: Math.min(from.left, to.left), + top: Math.min(from.top, to.top) - margin, + right: Math.max(from.right, to.right), + bottom: Math.max(from.bottom, to.bottom) + margin + }); + scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop); + } + + // Sync the scrollable area and scrollbars, ensure the viewport + // covers the visible area. + function updateScrollTop(cm, val) { + if (Math.abs(cm.doc.scrollTop - val) < 2) { + return; + } + if (!gecko) { + updateDisplaySimple(cm, { + top: val + }); + } + setScrollTop(cm, val, true); + if (gecko) { + updateDisplaySimple(cm); + } + startWorker(cm, 100); + } + function setScrollTop(cm, val, forceScroll) { + val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)); + if (cm.display.scroller.scrollTop == val && !forceScroll) { + return; + } + cm.doc.scrollTop = val; + cm.display.scrollbars.setScrollTop(val); + if (cm.display.scroller.scrollTop != val) { + cm.display.scroller.scrollTop = val; + } + } + + // Sync scroller and scrollbar, ensure the gutter elements are + // aligned. + function setScrollLeft(cm, val, isScroller, forceScroll) { + val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)); + if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { + return; + } + cm.doc.scrollLeft = val; + alignHorizontally(cm); + if (cm.display.scroller.scrollLeft != val) { + cm.display.scroller.scrollLeft = val; + } + cm.display.scrollbars.setScrollLeft(val); + } + + // SCROLLBARS + + // Prepare DOM reads needed to update the scrollbars. Done in one + // shot to minimize update/measure roundtrips. + function measureForScrollbars(cm) { + var d = cm.display, + gutterW = d.gutters.offsetWidth; + var docH = Math.round(cm.doc.height + paddingVert(cm.display)); + return { + clientHeight: d.scroller.clientHeight, + viewHeight: d.wrapper.clientHeight, + scrollWidth: d.scroller.scrollWidth, + clientWidth: d.scroller.clientWidth, + viewWidth: d.wrapper.clientWidth, + barLeft: cm.options.fixedGutter ? gutterW : 0, + docHeight: docH, + scrollHeight: docH + scrollGap(cm) + d.barHeight, + nativeBarWidth: d.nativeBarWidth, + gutterWidth: gutterW + }; + } + var NativeScrollbars = function (place, scroll, cm) { + this.cm = cm; + var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar"); + var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar"); + vert.tabIndex = horiz.tabIndex = -1; + place(vert); + place(horiz); + on(vert, "scroll", function () { + if (vert.clientHeight) { + scroll(vert.scrollTop, "vertical"); + } + }); + on(horiz, "scroll", function () { + if (horiz.clientWidth) { + scroll(horiz.scrollLeft, "horizontal"); + } + }); + this.checkedZeroWidth = false; + // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8). + if (ie && ie_version < 8) { + this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; + } + }; + NativeScrollbars.prototype.update = function (measure) { + var needsH = measure.scrollWidth > measure.clientWidth + 1; + var needsV = measure.scrollHeight > measure.clientHeight + 1; + var sWidth = measure.nativeBarWidth; + if (needsV) { + this.vert.style.display = "block"; + this.vert.style.bottom = needsH ? sWidth + "px" : "0"; + var totalHeight = measure.viewHeight - (needsH ? sWidth : 0); + // A bug in IE8 can cause this value to be negative, so guard it. + this.vert.firstChild.style.height = Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"; + } else { + this.vert.scrollTop = 0; + this.vert.style.display = ""; + this.vert.firstChild.style.height = "0"; + } + if (needsH) { + this.horiz.style.display = "block"; + this.horiz.style.right = needsV ? sWidth + "px" : "0"; + this.horiz.style.left = measure.barLeft + "px"; + var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0); + this.horiz.firstChild.style.width = Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px"; + } else { + this.horiz.style.display = ""; + this.horiz.firstChild.style.width = "0"; + } + if (!this.checkedZeroWidth && measure.clientHeight > 0) { + if (sWidth == 0) { + this.zeroWidthHack(); + } + this.checkedZeroWidth = true; + } + return { + right: needsV ? sWidth : 0, + bottom: needsH ? sWidth : 0 + }; + }; + NativeScrollbars.prototype.setScrollLeft = function (pos) { + if (this.horiz.scrollLeft != pos) { + this.horiz.scrollLeft = pos; + } + if (this.disableHoriz) { + this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); + } + }; + NativeScrollbars.prototype.setScrollTop = function (pos) { + if (this.vert.scrollTop != pos) { + this.vert.scrollTop = pos; + } + if (this.disableVert) { + this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); + } + }; + NativeScrollbars.prototype.zeroWidthHack = function () { + var w = mac && !mac_geMountainLion ? "12px" : "18px"; + this.horiz.style.height = this.vert.style.width = w; + this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"; + this.disableHoriz = new Delayed(); + this.disableVert = new Delayed(); + }; + NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) { + bar.style.pointerEvents = "auto"; + function maybeDisable() { + // To find out whether the scrollbar is still visible, we + // check whether the element under the pixel in the bottom + // right corner of the scrollbar box is the scrollbar box + // itself (when the bar is still visible) or its filler child + // (when the bar is hidden). If it is still visible, we keep + // it enabled, if it's hidden, we disable pointer events. + var box = bar.getBoundingClientRect(); + var elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2) : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1); + if (elt != bar) { + bar.style.pointerEvents = "none"; + } else { + delay.set(1000, maybeDisable); + } + } + delay.set(1000, maybeDisable); + }; + NativeScrollbars.prototype.clear = function () { + var parent = this.horiz.parentNode; + parent.removeChild(this.horiz); + parent.removeChild(this.vert); + }; + var NullScrollbars = function () {}; + NullScrollbars.prototype.update = function () { + return { + bottom: 0, + right: 0 + }; + }; + NullScrollbars.prototype.setScrollLeft = function () {}; + NullScrollbars.prototype.setScrollTop = function () {}; + NullScrollbars.prototype.clear = function () {}; + function updateScrollbars(cm, measure) { + if (!measure) { + measure = measureForScrollbars(cm); + } + var startWidth = cm.display.barWidth, + startHeight = cm.display.barHeight; + updateScrollbarsInner(cm, measure); + for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) { + if (startWidth != cm.display.barWidth && cm.options.lineWrapping) { + updateHeightsInViewport(cm); + } + updateScrollbarsInner(cm, measureForScrollbars(cm)); + startWidth = cm.display.barWidth; + startHeight = cm.display.barHeight; + } + } + + // Re-synchronize the fake scrollbars with the actual size of the + // content. + function updateScrollbarsInner(cm, measure) { + var d = cm.display; + var sizes = d.scrollbars.update(measure); + d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"; + d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"; + d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"; + if (sizes.right && sizes.bottom) { + d.scrollbarFiller.style.display = "block"; + d.scrollbarFiller.style.height = sizes.bottom + "px"; + d.scrollbarFiller.style.width = sizes.right + "px"; + } else { + d.scrollbarFiller.style.display = ""; + } + if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) { + d.gutterFiller.style.display = "block"; + d.gutterFiller.style.height = sizes.bottom + "px"; + d.gutterFiller.style.width = measure.gutterWidth + "px"; + } else { + d.gutterFiller.style.display = ""; + } + } + var scrollbarModel = { + "native": NativeScrollbars, + "null": NullScrollbars + }; + function initScrollbars(cm) { + if (cm.display.scrollbars) { + cm.display.scrollbars.clear(); + if (cm.display.scrollbars.addClass) { + rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); + } + } + cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) { + cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller); + // Prevent clicks in the scrollbars from killing focus + on(node, "mousedown", function () { + if (cm.state.focused) { + setTimeout(function () { + return cm.display.input.focus(); + }, 0); + } + }); + node.setAttribute("cm-not-content", "true"); + }, function (pos, axis) { + if (axis == "horizontal") { + setScrollLeft(cm, pos); + } else { + updateScrollTop(cm, pos); + } + }, cm); + if (cm.display.scrollbars.addClass) { + addClass(cm.display.wrapper, cm.display.scrollbars.addClass); + } + } + + // Operations are used to wrap a series of changes to the editor + // state in such a way that each change won't have to update the + // cursor and display (which would be awkward, slow, and + // error-prone). Instead, display updates are batched and then all + // combined and executed at once. + + var nextOpId = 0; + // Start a new operation. + function startOperation(cm) { + cm.curOp = { + cm: cm, + viewChanged: false, + // Flag that indicates that lines might need to be redrawn + startHeight: cm.doc.height, + // Used to detect need to update scrollbar + forceUpdate: false, + // Used to force a redraw + updateInput: 0, + // Whether to reset the input textarea + typing: false, + // Whether this reset should be careful to leave existing text (for compositing) + changeObjs: null, + // Accumulated changes, for firing change events + cursorActivityHandlers: null, + // Set of handlers to fire cursorActivity on + cursorActivityCalled: 0, + // Tracks which cursorActivity handlers have been called already + selectionChanged: false, + // Whether the selection needs to be redrawn + updateMaxLine: false, + // Set when the widest line needs to be determined anew + scrollLeft: null, + scrollTop: null, + // Intermediate scroll position, not pushed to DOM yet + scrollToPos: null, + // Used to scroll to a specific position + focus: false, + id: ++nextOpId, + // Unique ID + markArrays: null // Used by addMarkedSpan + }; + pushOperation(cm.curOp); + } + + // Finish an operation, updating the display and signalling delayed events + function endOperation(cm) { + var op = cm.curOp; + if (op) { + finishOperation(op, function (group) { + for (var i = 0; i < group.ops.length; i++) { + group.ops[i].cm.curOp = null; + } + endOperations(group); + }); + } + } + + // The DOM updates done when an operation finishes are batched so + // that the minimum number of relayouts are required. + function endOperations(group) { + var ops = group.ops; + for (var i = 0; i < ops.length; i++) + // Read DOM + { + endOperation_R1(ops[i]); + } + for (var i$1 = 0; i$1 < ops.length; i$1++) + // Write DOM (maybe) + { + endOperation_W1(ops[i$1]); + } + for (var i$2 = 0; i$2 < ops.length; i$2++) + // Read DOM + { + endOperation_R2(ops[i$2]); + } + for (var i$3 = 0; i$3 < ops.length; i$3++) + // Write DOM (maybe) + { + endOperation_W2(ops[i$3]); + } + for (var i$4 = 0; i$4 < ops.length; i$4++) + // Read DOM + { + endOperation_finish(ops[i$4]); + } + } + function endOperation_R1(op) { + var cm = op.cm, + display = cm.display; + maybeClipScrollbars(cm); + if (op.updateMaxLine) { + findMaxLine(cm); + } + op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null || op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom || op.scrollToPos.to.line >= display.viewTo) || display.maxLineChanged && cm.options.lineWrapping; + op.update = op.mustUpdate && new DisplayUpdate(cm, op.mustUpdate && { + top: op.scrollTop, + ensure: op.scrollToPos + }, op.forceUpdate); + } + function endOperation_W1(op) { + op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update); + } + function endOperation_R2(op) { + var cm = op.cm, + display = cm.display; + if (op.updatedDisplay) { + updateHeightsInViewport(cm); + } + op.barMeasure = measureForScrollbars(cm); + + // If the max line changed since it was last measured, measure it, + // and ensure the document's width matches it. + // updateDisplay_W2 will use these properties to do the actual resizing + if (display.maxLineChanged && !cm.options.lineWrapping) { + op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3; + cm.display.sizerWidth = op.adjustWidthTo; + op.barMeasure.scrollWidth = Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth); + op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm)); + } + if (op.updatedDisplay || op.selectionChanged) { + op.preparedSelection = display.input.prepareSelection(); + } + } + function endOperation_W2(op) { + var cm = op.cm; + if (op.adjustWidthTo != null) { + cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"; + if (op.maxScrollLeft < cm.doc.scrollLeft) { + setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); + } + cm.display.maxLineChanged = false; + } + var takeFocus = op.focus && op.focus == activeElt(); + if (op.preparedSelection) { + cm.display.input.showSelection(op.preparedSelection, takeFocus); + } + if (op.updatedDisplay || op.startHeight != cm.doc.height) { + updateScrollbars(cm, op.barMeasure); + } + if (op.updatedDisplay) { + setDocumentHeight(cm, op.barMeasure); + } + if (op.selectionChanged) { + restartBlink(cm); + } + if (cm.state.focused && op.updateInput) { + cm.display.input.reset(op.typing); + } + if (takeFocus) { + ensureFocus(op.cm); + } + } + function endOperation_finish(op) { + var cm = op.cm, + display = cm.display, + doc = cm.doc; + if (op.updatedDisplay) { + postUpdateDisplay(cm, op.update); + } + + // Abort mouse wheel delta measurement, when scrolling explicitly + if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos)) { + display.wheelStartX = display.wheelStartY = null; + } + + // Propagate the scroll position to the actual DOM scroller + if (op.scrollTop != null) { + setScrollTop(cm, op.scrollTop, op.forceScroll); + } + if (op.scrollLeft != null) { + setScrollLeft(cm, op.scrollLeft, true, true); + } + // If we need to scroll a specific position into view, do so. + if (op.scrollToPos) { + var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin); + maybeScrollWindow(cm, rect); + } + + // Fire events for markers that are hidden/unidden by editing or + // undoing + var hidden = op.maybeHiddenMarkers, + unhidden = op.maybeUnhiddenMarkers; + if (hidden) { + for (var i = 0; i < hidden.length; ++i) { + if (!hidden[i].lines.length) { + signal(hidden[i], "hide"); + } + } + } + if (unhidden) { + for (var i$1 = 0; i$1 < unhidden.length; ++i$1) { + if (unhidden[i$1].lines.length) { + signal(unhidden[i$1], "unhide"); + } + } + } + if (display.wrapper.offsetHeight) { + doc.scrollTop = cm.display.scroller.scrollTop; + } + + // Fire change events, and delayed event handlers + if (op.changeObjs) { + signal(cm, "changes", cm, op.changeObjs); + } + if (op.update) { + op.update.finish(); + } + } + + // Run the given function in an operation + function runInOp(cm, f) { + if (cm.curOp) { + return f(); + } + startOperation(cm); + try { + return f(); + } finally { + endOperation(cm); + } + } + // Wraps a function in an operation. Returns the wrapped function. + function operation(cm, f) { + return function () { + if (cm.curOp) { + return f.apply(cm, arguments); + } + startOperation(cm); + try { + return f.apply(cm, arguments); + } finally { + endOperation(cm); + } + }; + } + // Used to add methods to editor and doc instances, wrapping them in + // operations. + function methodOp(f) { + return function () { + if (this.curOp) { + return f.apply(this, arguments); + } + startOperation(this); + try { + return f.apply(this, arguments); + } finally { + endOperation(this); + } + }; + } + function docMethodOp(f) { + return function () { + var cm = this.cm; + if (!cm || cm.curOp) { + return f.apply(this, arguments); + } + startOperation(cm); + try { + return f.apply(this, arguments); + } finally { + endOperation(cm); + } + }; + } + + // HIGHLIGHT WORKER + + function startWorker(cm, time) { + if (cm.doc.highlightFrontier < cm.display.viewTo) { + cm.state.highlight.set(time, bind(highlightWorker, cm)); + } + } + function highlightWorker(cm) { + var doc = cm.doc; + if (doc.highlightFrontier >= cm.display.viewTo) { + return; + } + var end = +new Date() + cm.options.workTime; + var context = getContextBefore(cm, doc.highlightFrontier); + var changedLines = []; + doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) { + if (context.line >= cm.display.viewFrom) { + // Visible + var oldStyles = line.styles; + var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null; + var highlighted = highlightLine(cm, line, context, true); + if (resetState) { + context.state = resetState; + } + line.styles = highlighted.styles; + var oldCls = line.styleClasses, + newCls = highlighted.classes; + if (newCls) { + line.styleClasses = newCls; + } else if (oldCls) { + line.styleClasses = null; + } + var ischange = !oldStyles || oldStyles.length != line.styles.length || oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass); + for (var i = 0; !ischange && i < oldStyles.length; ++i) { + ischange = oldStyles[i] != line.styles[i]; + } + if (ischange) { + changedLines.push(context.line); + } + line.stateAfter = context.save(); + context.nextLine(); + } else { + if (line.text.length <= cm.options.maxHighlightLength) { + processLine(cm, line.text, context); + } + line.stateAfter = context.line % 5 == 0 ? context.save() : null; + context.nextLine(); + } + if (+new Date() > end) { + startWorker(cm, cm.options.workDelay); + return true; + } + }); + doc.highlightFrontier = context.line; + doc.modeFrontier = Math.max(doc.modeFrontier, context.line); + if (changedLines.length) { + runInOp(cm, function () { + for (var i = 0; i < changedLines.length; i++) { + regLineChange(cm, changedLines[i], "text"); + } + }); + } + } + + // DISPLAY DRAWING + + var DisplayUpdate = function (cm, viewport, force) { + var display = cm.display; + this.viewport = viewport; + // Store some values that we'll need later (but don't want to force a relayout for) + this.visible = visibleLines(display, cm.doc, viewport); + this.editorIsHidden = !display.wrapper.offsetWidth; + this.wrapperHeight = display.wrapper.clientHeight; + this.wrapperWidth = display.wrapper.clientWidth; + this.oldDisplayWidth = displayWidth(cm); + this.force = force; + this.dims = getDimensions(cm); + this.events = []; + }; + DisplayUpdate.prototype.signal = function (emitter, type) { + if (hasHandler(emitter, type)) { + this.events.push(arguments); + } + }; + DisplayUpdate.prototype.finish = function () { + for (var i = 0; i < this.events.length; i++) { + signal.apply(null, this.events[i]); + } + }; + function maybeClipScrollbars(cm) { + var display = cm.display; + if (!display.scrollbarsClipped && display.scroller.offsetWidth) { + display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth; + display.heightForcer.style.height = scrollGap(cm) + "px"; + display.sizer.style.marginBottom = -display.nativeBarWidth + "px"; + display.sizer.style.borderRightWidth = scrollGap(cm) + "px"; + display.scrollbarsClipped = true; + } + } + function selectionSnapshot(cm) { + if (cm.hasFocus()) { + return null; + } + var active = activeElt(); + if (!active || !contains(cm.display.lineDiv, active)) { + return null; + } + var result = { + activeElt: active + }; + if (window.getSelection) { + var sel = window.getSelection(); + if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) { + result.anchorNode = sel.anchorNode; + result.anchorOffset = sel.anchorOffset; + result.focusNode = sel.focusNode; + result.focusOffset = sel.focusOffset; + } + } + return result; + } + function restoreSelection(snapshot) { + if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { + return; + } + snapshot.activeElt.focus(); + if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) && snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) { + var sel = window.getSelection(), + range = document.createRange(); + range.setEnd(snapshot.anchorNode, snapshot.anchorOffset); + range.collapse(false); + sel.removeAllRanges(); + sel.addRange(range); + sel.extend(snapshot.focusNode, snapshot.focusOffset); + } + } + + // Does the actual updating of the line display. Bails out + // (returning false) when there is nothing to be done and forced is + // false. + function updateDisplayIfNeeded(cm, update) { + var display = cm.display, + doc = cm.doc; + if (update.editorIsHidden) { + resetView(cm); + return false; + } + + // Bail out if the visible area is already rendered and nothing changed. + if (!update.force && update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo && (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) && display.renderedView == display.view && countDirtyView(cm) == 0) { + return false; + } + if (maybeUpdateLineNumberWidth(cm)) { + resetView(cm); + update.dims = getDimensions(cm); + } + + // Compute a suitable new viewport (from & to) + var end = doc.first + doc.size; + var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first); + var to = Math.min(end, update.visible.to + cm.options.viewportMargin); + if (display.viewFrom < from && from - display.viewFrom < 20) { + from = Math.max(doc.first, display.viewFrom); + } + if (display.viewTo > to && display.viewTo - to < 20) { + to = Math.min(end, display.viewTo); + } + if (sawCollapsedSpans) { + from = visualLineNo(cm.doc, from); + to = visualLineEndNo(cm.doc, to); + } + var different = from != display.viewFrom || to != display.viewTo || display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth; + adjustView(cm, from, to); + display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom)); + // Position the mover div to align with the current scroll position + cm.display.mover.style.top = display.viewOffset + "px"; + var toUpdate = countDirtyView(cm); + if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view && (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) { + return false; + } + + // For big changes, we hide the enclosing element during the + // update, since that speeds up the operations on most browsers. + var selSnapshot = selectionSnapshot(cm); + if (toUpdate > 4) { + display.lineDiv.style.display = "none"; + } + patchDisplay(cm, display.updateLineNumbers, update.dims); + if (toUpdate > 4) { + display.lineDiv.style.display = ""; + } + display.renderedView = display.view; + // There might have been a widget with a focused element that got + // hidden or updated, if so re-focus it. + restoreSelection(selSnapshot); + + // Prevent selection and cursors from interfering with the scroll + // width and height. + removeChildren(display.cursorDiv); + removeChildren(display.selectionDiv); + display.gutters.style.height = display.sizer.style.minHeight = 0; + if (different) { + display.lastWrapHeight = update.wrapperHeight; + display.lastWrapWidth = update.wrapperWidth; + startWorker(cm, 400); + } + display.updateLineNumbers = null; + return true; + } + function postUpdateDisplay(cm, update) { + var viewport = update.viewport; + for (var first = true;; first = false) { + if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) { + // Clip forced viewport to actual scrollable area. + if (viewport && viewport.top != null) { + viewport = { + top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top) + }; + } + // Updated line heights might result in the drawn area not + // actually covering the viewport. Keep looping until it does. + update.visible = visibleLines(cm.display, cm.doc, viewport); + if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo) { + break; + } + } else if (first) { + update.visible = visibleLines(cm.display, cm.doc, viewport); + } + if (!updateDisplayIfNeeded(cm, update)) { + break; + } + updateHeightsInViewport(cm); + var barMeasure = measureForScrollbars(cm); + updateSelection(cm); + updateScrollbars(cm, barMeasure); + setDocumentHeight(cm, barMeasure); + update.force = false; + } + update.signal(cm, "update", cm); + if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) { + update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo); + cm.display.reportedViewFrom = cm.display.viewFrom; + cm.display.reportedViewTo = cm.display.viewTo; + } + } + function updateDisplaySimple(cm, viewport) { + var update = new DisplayUpdate(cm, viewport); + if (updateDisplayIfNeeded(cm, update)) { + updateHeightsInViewport(cm); + postUpdateDisplay(cm, update); + var barMeasure = measureForScrollbars(cm); + updateSelection(cm); + updateScrollbars(cm, barMeasure); + setDocumentHeight(cm, barMeasure); + update.finish(); + } + } + + // Sync the actual display DOM structure with display.view, removing + // nodes for lines that are no longer in view, and creating the ones + // that are not there yet, and updating the ones that are out of + // date. + function patchDisplay(cm, updateNumbersFrom, dims) { + var display = cm.display, + lineNumbers = cm.options.lineNumbers; + var container = display.lineDiv, + cur = container.firstChild; + function rm(node) { + var next = node.nextSibling; + // Works around a throw-scroll bug in OS X Webkit + if (webkit && mac && cm.display.currentWheelTarget == node) { + node.style.display = "none"; + } else { + node.parentNode.removeChild(node); + } + return next; + } + var view = display.view, + lineN = display.viewFrom; + // Loop over the elements in the view, syncing cur (the DOM nodes + // in display.lineDiv) with the view as we go. + for (var i = 0; i < view.length; i++) { + var lineView = view[i]; + if (lineView.hidden) ;else if (!lineView.node || lineView.node.parentNode != container) { + // Not drawn yet + var node = buildLineElement(cm, lineView, lineN, dims); + container.insertBefore(node, cur); + } else { + // Already drawn + while (cur != lineView.node) { + cur = rm(cur); + } + var updateNumber = lineNumbers && updateNumbersFrom != null && updateNumbersFrom <= lineN && lineView.lineNumber; + if (lineView.changes) { + if (indexOf(lineView.changes, "gutter") > -1) { + updateNumber = false; + } + updateLineForChanges(cm, lineView, lineN, dims); + } + if (updateNumber) { + removeChildren(lineView.lineNumber); + lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN))); + } + cur = lineView.node.nextSibling; + } + lineN += lineView.size; + } + while (cur) { + cur = rm(cur); + } + } + function updateGutterSpace(display) { + var width = display.gutters.offsetWidth; + display.sizer.style.marginLeft = width + "px"; + // Send an event to consumers responding to changes in gutter width. + signalLater(display, "gutterChanged", display); + } + function setDocumentHeight(cm, measure) { + cm.display.sizer.style.minHeight = measure.docHeight + "px"; + cm.display.heightForcer.style.top = measure.docHeight + "px"; + cm.display.gutters.style.height = measure.docHeight + cm.display.barHeight + scrollGap(cm) + "px"; + } + + // Re-align line numbers and gutter marks to compensate for + // horizontal scrolling. + function alignHorizontally(cm) { + var display = cm.display, + view = display.view; + if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { + return; + } + var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft; + var gutterW = display.gutters.offsetWidth, + left = comp + "px"; + for (var i = 0; i < view.length; i++) { + if (!view[i].hidden) { + if (cm.options.fixedGutter) { + if (view[i].gutter) { + view[i].gutter.style.left = left; + } + if (view[i].gutterBackground) { + view[i].gutterBackground.style.left = left; + } + } + var align = view[i].alignable; + if (align) { + for (var j = 0; j < align.length; j++) { + align[j].style.left = left; + } + } + } + } + if (cm.options.fixedGutter) { + display.gutters.style.left = comp + gutterW + "px"; + } + } + + // Used to ensure that the line number gutter is still the right + // size for the current document size. Returns true when an update + // is needed. + function maybeUpdateLineNumberWidth(cm) { + if (!cm.options.lineNumbers) { + return false; + } + var doc = cm.doc, + last = lineNumberFor(cm.options, doc.first + doc.size - 1), + display = cm.display; + if (last.length != display.lineNumChars) { + var test = display.measure.appendChild(elt("div", [elt("div", last)], "CodeMirror-linenumber CodeMirror-gutter-elt")); + var innerW = test.firstChild.offsetWidth, + padding = test.offsetWidth - innerW; + display.lineGutter.style.width = ""; + display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1; + display.lineNumWidth = display.lineNumInnerWidth + padding; + display.lineNumChars = display.lineNumInnerWidth ? last.length : -1; + display.lineGutter.style.width = display.lineNumWidth + "px"; + updateGutterSpace(cm.display); + return true; + } + return false; + } + function getGutters(gutters, lineNumbers) { + var result = [], + sawLineNumbers = false; + for (var i = 0; i < gutters.length; i++) { + var name = gutters[i], + style = null; + if (typeof name != "string") { + style = name.style; + name = name.className; + } + if (name == "CodeMirror-linenumbers") { + if (!lineNumbers) { + continue; + } else { + sawLineNumbers = true; + } + } + result.push({ + className: name, + style: style + }); + } + if (lineNumbers && !sawLineNumbers) { + result.push({ + className: "CodeMirror-linenumbers", + style: null + }); + } + return result; + } + + // Rebuild the gutter elements, ensure the margin to the left of the + // code matches their width. + function renderGutters(display) { + var gutters = display.gutters, + specs = display.gutterSpecs; + removeChildren(gutters); + display.lineGutter = null; + for (var i = 0; i < specs.length; ++i) { + var ref = specs[i]; + var className = ref.className; + var style = ref.style; + var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className)); + if (style) { + gElt.style.cssText = style; + } + if (className == "CodeMirror-linenumbers") { + display.lineGutter = gElt; + gElt.style.width = (display.lineNumWidth || 1) + "px"; + } + } + gutters.style.display = specs.length ? "" : "none"; + updateGutterSpace(display); + } + function updateGutters(cm) { + renderGutters(cm.display); + regChange(cm); + alignHorizontally(cm); + } + + // The display handles the DOM integration, both for input reading + // and content drawing. It holds references to DOM nodes and + // display-related state. + + function Display(place, doc, input, options) { + var d = this; + this.input = input; + + // Covers bottom-right square when both scrollbars are present. + d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler"); + d.scrollbarFiller.setAttribute("cm-not-content", "true"); + // Covers bottom of gutter when coverGutterNextToScrollbar is on + // and h scrollbar is present. + d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler"); + d.gutterFiller.setAttribute("cm-not-content", "true"); + // Will contain the actual code, positioned to cover the viewport. + d.lineDiv = eltP("div", null, "CodeMirror-code"); + // Elements are added to these to represent selection and cursors. + d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1"); + d.cursorDiv = elt("div", null, "CodeMirror-cursors"); + // A visibility: hidden element used to find the size of things. + d.measure = elt("div", null, "CodeMirror-measure"); + // When lines outside of the viewport are measured, they are drawn in this. + d.lineMeasure = elt("div", null, "CodeMirror-measure"); + // Wraps everything that needs to exist inside the vertically-padded coordinate system + d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv], null, "position: relative; outline: none"); + var lines = eltP("div", [d.lineSpace], "CodeMirror-lines"); + // Moved around its parent to cover visible view. + d.mover = elt("div", [lines], null, "position: relative"); + // Set to the height of the document, allowing scrolling. + d.sizer = elt("div", [d.mover], "CodeMirror-sizer"); + d.sizerWidth = null; + // Behavior of elts with overflow: auto and padding is + // inconsistent across browsers. This is used to ensure the + // scrollable area is big enough. + d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;"); + // Will contain the gutters, if any. + d.gutters = elt("div", null, "CodeMirror-gutters"); + d.lineGutter = null; + // Actual scrollable element. + d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll"); + d.scroller.setAttribute("tabIndex", "-1"); + // The element in which the editor lives. + d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror"); + + // This attribute is respected by automatic translation systems such as Google Translate, + // and may also be respected by tools used by human translators. + d.wrapper.setAttribute('translate', 'no'); + + // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported) + if (ie && ie_version < 8) { + d.gutters.style.zIndex = -1; + d.scroller.style.paddingRight = 0; + } + if (!webkit && !(gecko && mobile)) { + d.scroller.draggable = true; + } + if (place) { + if (place.appendChild) { + place.appendChild(d.wrapper); + } else { + place(d.wrapper); + } + } + + // Current rendered range (may be bigger than the view window). + d.viewFrom = d.viewTo = doc.first; + d.reportedViewFrom = d.reportedViewTo = doc.first; + // Information about the rendered lines. + d.view = []; + d.renderedView = null; + // Holds info about a single rendered line when it was rendered + // for measurement, while not in view. + d.externalMeasured = null; + // Empty space (in pixels) above the view + d.viewOffset = 0; + d.lastWrapHeight = d.lastWrapWidth = 0; + d.updateLineNumbers = null; + d.nativeBarWidth = d.barHeight = d.barWidth = 0; + d.scrollbarsClipped = false; + + // Used to only resize the line number gutter when necessary (when + // the amount of lines crosses a boundary that makes its width change) + d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null; + // Set to true when a non-horizontal-scrolling line widget is + // added. As an optimization, line widget aligning is skipped when + // this is false. + d.alignWidgets = false; + d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; + + // Tracks the maximum line length so that the horizontal scrollbar + // can be kept static when scrolling. + d.maxLine = null; + d.maxLineLength = 0; + d.maxLineChanged = false; + + // Used for measuring wheel scrolling granularity + d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null; + + // True when shift is held down. + d.shift = false; + + // Used to track whether anything happened since the context menu + // was opened. + d.selForContextMenu = null; + d.activeTouch = null; + d.gutterSpecs = getGutters(options.gutters, options.lineNumbers); + renderGutters(d); + input.init(d); + } + + // Since the delta values reported on mouse wheel events are + // unstandardized between browsers and even browser versions, and + // generally horribly unpredictable, this code starts by measuring + // the scroll effect that the first few mouse wheel events have, + // and, from that, detects the way it can convert deltas to pixel + // offsets afterwards. + // + // The reason we want to know the amount a wheel event will scroll + // is that it gives us a chance to update the display before the + // actual scrolling happens, reducing flickering. + + var wheelSamples = 0, + wheelPixelsPerUnit = null; + // Fill in a browser-detected starting value on browsers where we + // know one. These don't have to be accurate -- the result of them + // being wrong would just be a slight flicker on the first wheel + // scroll (if it is large enough). + if (ie) { + wheelPixelsPerUnit = -.53; + } else if (gecko) { + wheelPixelsPerUnit = 15; + } else if (chrome) { + wheelPixelsPerUnit = -.7; + } else if (safari) { + wheelPixelsPerUnit = -1 / 3; + } + function wheelEventDelta(e) { + var dx = e.wheelDeltaX, + dy = e.wheelDeltaY; + if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { + dx = e.detail; + } + if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { + dy = e.detail; + } else if (dy == null) { + dy = e.wheelDelta; + } + return { + x: dx, + y: dy + }; + } + function wheelEventPixels(e) { + var delta = wheelEventDelta(e); + delta.x *= wheelPixelsPerUnit; + delta.y *= wheelPixelsPerUnit; + return delta; + } + function onScrollWheel(cm, e) { + var delta = wheelEventDelta(e), + dx = delta.x, + dy = delta.y; + var pixelsPerUnit = wheelPixelsPerUnit; + if (e.deltaMode === 0) { + dx = e.deltaX; + dy = e.deltaY; + pixelsPerUnit = 1; + } + var display = cm.display, + scroll = display.scroller; + // Quit if there's nothing to scroll here + var canScrollX = scroll.scrollWidth > scroll.clientWidth; + var canScrollY = scroll.scrollHeight > scroll.clientHeight; + if (!(dx && canScrollX || dy && canScrollY)) { + return; + } + + // Webkit browsers on OS X abort momentum scrolls when the target + // of the scroll event is removed from the scrollable element. + // This hack (see related code in patchDisplay) makes sure the + // element is kept around. + if (dy && mac && webkit) { + outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { + for (var i = 0; i < view.length; i++) { + if (view[i].node == cur) { + cm.display.currentWheelTarget = cur; + break outer; + } + } + } + } + + // On some browsers, horizontal scrolling will cause redraws to + // happen before the gutter has been realigned, causing it to + // wriggle around in a most unseemly way. When we have an + // estimated pixels/delta value, we just handle horizontal + // scrolling entirely here. It'll be slightly off from native, but + // better than glitching out. + if (dx && !gecko && !presto && pixelsPerUnit != null) { + if (dy && canScrollY) { + updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * pixelsPerUnit)); + } + setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * pixelsPerUnit)); + // Only prevent default scrolling if vertical scrolling is + // actually possible. Otherwise, it causes vertical scroll + // jitter on OSX trackpads when deltaX is small and deltaY + // is large (issue #3579) + if (!dy || dy && canScrollY) { + e_preventDefault(e); + } + display.wheelStartX = null; // Abort measurement, if in progress + return; + } + + // 'Project' the visible viewport to cover the area that is being + // scrolled into view (if we know enough to estimate it). + if (dy && pixelsPerUnit != null) { + var pixels = dy * pixelsPerUnit; + var top = cm.doc.scrollTop, + bot = top + display.wrapper.clientHeight; + if (pixels < 0) { + top = Math.max(0, top + pixels - 50); + } else { + bot = Math.min(cm.doc.height, bot + pixels + 50); + } + updateDisplaySimple(cm, { + top: top, + bottom: bot + }); + } + if (wheelSamples < 20 && e.deltaMode !== 0) { + if (display.wheelStartX == null) { + display.wheelStartX = scroll.scrollLeft; + display.wheelStartY = scroll.scrollTop; + display.wheelDX = dx; + display.wheelDY = dy; + setTimeout(function () { + if (display.wheelStartX == null) { + return; + } + var movedX = scroll.scrollLeft - display.wheelStartX; + var movedY = scroll.scrollTop - display.wheelStartY; + var sample = movedY && display.wheelDY && movedY / display.wheelDY || movedX && display.wheelDX && movedX / display.wheelDX; + display.wheelStartX = display.wheelStartY = null; + if (!sample) { + return; + } + wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1); + ++wheelSamples; + }, 200); + } else { + display.wheelDX += dx; + display.wheelDY += dy; + } + } + } + + // Selection objects are immutable. A new one is created every time + // the selection changes. A selection is one or more non-overlapping + // (and non-touching) ranges, sorted, and an integer that indicates + // which one is the primary selection (the one that's scrolled into + // view, that getCursor returns, etc). + var Selection = function (ranges, primIndex) { + this.ranges = ranges; + this.primIndex = primIndex; + }; + Selection.prototype.primary = function () { + return this.ranges[this.primIndex]; + }; + Selection.prototype.equals = function (other) { + if (other == this) { + return true; + } + if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { + return false; + } + for (var i = 0; i < this.ranges.length; i++) { + var here = this.ranges[i], + there = other.ranges[i]; + if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { + return false; + } + } + return true; + }; + Selection.prototype.deepCopy = function () { + var out = []; + for (var i = 0; i < this.ranges.length; i++) { + out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); + } + return new Selection(out, this.primIndex); + }; + Selection.prototype.somethingSelected = function () { + for (var i = 0; i < this.ranges.length; i++) { + if (!this.ranges[i].empty()) { + return true; + } + } + return false; + }; + Selection.prototype.contains = function (pos, end) { + if (!end) { + end = pos; + } + for (var i = 0; i < this.ranges.length; i++) { + var range = this.ranges[i]; + if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0) { + return i; + } + } + return -1; + }; + var Range = function (anchor, head) { + this.anchor = anchor; + this.head = head; + }; + Range.prototype.from = function () { + return minPos(this.anchor, this.head); + }; + Range.prototype.to = function () { + return maxPos(this.anchor, this.head); + }; + Range.prototype.empty = function () { + return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch; + }; + + // Take an unsorted, potentially overlapping set of ranges, and + // build a selection out of it. 'Consumes' ranges array (modifying + // it). + function normalizeSelection(cm, ranges, primIndex) { + var mayTouch = cm && cm.options.selectionsMayTouch; + var prim = ranges[primIndex]; + ranges.sort(function (a, b) { + return cmp(a.from(), b.from()); + }); + primIndex = indexOf(ranges, prim); + for (var i = 1; i < ranges.length; i++) { + var cur = ranges[i], + prev = ranges[i - 1]; + var diff = cmp(prev.to(), cur.from()); + if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) { + var from = minPos(prev.from(), cur.from()), + to = maxPos(prev.to(), cur.to()); + var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head; + if (i <= primIndex) { + --primIndex; + } + ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to)); + } + } + return new Selection(ranges, primIndex); + } + function simpleSelection(anchor, head) { + return new Selection([new Range(anchor, head || anchor)], 0); + } + + // Compute the position of the end of a change (its 'to' property + // refers to the pre-change end). + function changeEnd(change) { + if (!change.text) { + return change.to; + } + return Pos(change.from.line + change.text.length - 1, lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0)); + } + + // Adjust a position to refer to the post-change position of the + // same text, or the end of the change if the change covers it. + function adjustForChange(pos, change) { + if (cmp(pos, change.from) < 0) { + return pos; + } + if (cmp(pos, change.to) <= 0) { + return changeEnd(change); + } + var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, + ch = pos.ch; + if (pos.line == change.to.line) { + ch += changeEnd(change).ch - change.to.ch; + } + return Pos(line, ch); + } + function computeSelAfterChange(doc, change) { + var out = []; + for (var i = 0; i < doc.sel.ranges.length; i++) { + var range = doc.sel.ranges[i]; + out.push(new Range(adjustForChange(range.anchor, change), adjustForChange(range.head, change))); + } + return normalizeSelection(doc.cm, out, doc.sel.primIndex); + } + function offsetPos(pos, old, nw) { + if (pos.line == old.line) { + return Pos(nw.line, pos.ch - old.ch + nw.ch); + } else { + return Pos(nw.line + (pos.line - old.line), pos.ch); + } + } + + // Used by replaceSelections to allow moving the selection to the + // start or around the replaced test. Hint may be "start" or "around". + function computeReplacedSel(doc, changes, hint) { + var out = []; + var oldPrev = Pos(doc.first, 0), + newPrev = oldPrev; + for (var i = 0; i < changes.length; i++) { + var change = changes[i]; + var from = offsetPos(change.from, oldPrev, newPrev); + var to = offsetPos(changeEnd(change), oldPrev, newPrev); + oldPrev = change.to; + newPrev = to; + if (hint == "around") { + var range = doc.sel.ranges[i], + inv = cmp(range.head, range.anchor) < 0; + out[i] = new Range(inv ? to : from, inv ? from : to); + } else { + out[i] = new Range(from, from); + } + } + return new Selection(out, doc.sel.primIndex); + } + + // Used to get the editor into a consistent state again when options change. + + function loadMode(cm) { + cm.doc.mode = getMode(cm.options, cm.doc.modeOption); + resetModeState(cm); + } + function resetModeState(cm) { + cm.doc.iter(function (line) { + if (line.stateAfter) { + line.stateAfter = null; + } + if (line.styles) { + line.styles = null; + } + }); + cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first; + startWorker(cm, 100); + cm.state.modeGen++; + if (cm.curOp) { + regChange(cm); + } + } + + // DOCUMENT DATA STRUCTURE + + // By default, updates that start and end at the beginning of a line + // are treated specially, in order to make the association of line + // widgets and marker elements with the text behave more intuitive. + function isWholeLineUpdate(doc, change) { + return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" && (!doc.cm || doc.cm.options.wholeLineUpdateBefore); + } + + // Perform a change on the document data structure. + function updateDoc(doc, change, markedSpans, estimateHeight) { + function spansFor(n) { + return markedSpans ? markedSpans[n] : null; + } + function update(line, text, spans) { + updateLine(line, text, spans, estimateHeight); + signalLater(line, "change", line, change); + } + function linesFor(start, end) { + var result = []; + for (var i = start; i < end; ++i) { + result.push(new Line(text[i], spansFor(i), estimateHeight)); + } + return result; + } + var from = change.from, + to = change.to, + text = change.text; + var firstLine = getLine(doc, from.line), + lastLine = getLine(doc, to.line); + var lastText = lst(text), + lastSpans = spansFor(text.length - 1), + nlines = to.line - from.line; + + // Adjust the line structure + if (change.full) { + doc.insert(0, linesFor(0, text.length)); + doc.remove(text.length, doc.size - text.length); + } else if (isWholeLineUpdate(doc, change)) { + // This is a whole-line replace. Treated specially to make + // sure line objects move the way they are supposed to. + var added = linesFor(0, text.length - 1); + update(lastLine, lastLine.text, lastSpans); + if (nlines) { + doc.remove(from.line, nlines); + } + if (added.length) { + doc.insert(from.line, added); + } + } else if (firstLine == lastLine) { + if (text.length == 1) { + update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans); + } else { + var added$1 = linesFor(1, text.length - 1); + added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight)); + update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); + doc.insert(from.line + 1, added$1); + } + } else if (text.length == 1) { + update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0)); + doc.remove(from.line + 1, nlines); + } else { + update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); + update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans); + var added$2 = linesFor(1, text.length - 1); + if (nlines > 1) { + doc.remove(from.line + 1, nlines - 1); + } + doc.insert(from.line + 1, added$2); + } + signalLater(doc, "change", doc, change); + } + + // Call f for all linked documents. + function linkedDocs(doc, f, sharedHistOnly) { + function propagate(doc, skip, sharedHist) { + if (doc.linked) { + for (var i = 0; i < doc.linked.length; ++i) { + var rel = doc.linked[i]; + if (rel.doc == skip) { + continue; + } + var shared = sharedHist && rel.sharedHist; + if (sharedHistOnly && !shared) { + continue; + } + f(rel.doc, shared); + propagate(rel.doc, doc, shared); + } + } + } + propagate(doc, null, true); + } + + // Attach a document to an editor. + function attachDoc(cm, doc) { + if (doc.cm) { + throw new Error("This document is already in use."); + } + cm.doc = doc; + doc.cm = cm; + estimateLineHeights(cm); + loadMode(cm); + setDirectionClass(cm); + cm.options.direction = doc.direction; + if (!cm.options.lineWrapping) { + findMaxLine(cm); + } + cm.options.mode = doc.modeOption; + regChange(cm); + } + function setDirectionClass(cm) { + (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl"); + } + function directionChanged(cm) { + runInOp(cm, function () { + setDirectionClass(cm); + regChange(cm); + }); + } + function History(prev) { + // Arrays of change events and selections. Doing something adds an + // event to done and clears undo. Undoing moves events from done + // to undone, redoing moves them in the other direction. + this.done = []; + this.undone = []; + this.undoDepth = prev ? prev.undoDepth : Infinity; + // Used to track when changes can be merged into a single undo + // event + this.lastModTime = this.lastSelTime = 0; + this.lastOp = this.lastSelOp = null; + this.lastOrigin = this.lastSelOrigin = null; + // Used by the isClean() method + this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1; + } + + // Create a history change event from an updateDoc-style change + // object. + function historyChangeFromChange(doc, change) { + var histChange = { + from: copyPos(change.from), + to: changeEnd(change), + text: getBetween(doc, change.from, change.to) + }; + attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); + linkedDocs(doc, function (doc) { + return attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); + }, true); + return histChange; + } + + // Pop all selection events off the end of a history array. Stop at + // a change event. + function clearSelectionEvents(array) { + while (array.length) { + var last = lst(array); + if (last.ranges) { + array.pop(); + } else { + break; + } + } + } + + // Find the top change event in the history. Pop off selection + // events that are in the way. + function lastChangeEvent(hist, force) { + if (force) { + clearSelectionEvents(hist.done); + return lst(hist.done); + } else if (hist.done.length && !lst(hist.done).ranges) { + return lst(hist.done); + } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) { + hist.done.pop(); + return lst(hist.done); + } + } + + // Register a change in the history. Merges changes that are within + // a single operation, or are close together with an origin that + // allows merging (starting with "+") into a single event. + function addChangeToHistory(doc, change, selAfter, opId) { + var hist = doc.history; + hist.undone.length = 0; + var time = +new Date(), + cur; + var last; + if ((hist.lastOp == opId || hist.lastOrigin == change.origin && change.origin && (change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500) || change.origin.charAt(0) == "*")) && (cur = lastChangeEvent(hist, hist.lastOp == opId))) { + // Merge this change into the last event + last = lst(cur.changes); + if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { + // Optimized case for simple insertion -- don't want to add + // new changesets for every character typed + last.to = changeEnd(change); + } else { + // Add new sub-event + cur.changes.push(historyChangeFromChange(doc, change)); + } + } else { + // Can not be merged, start a new event. + var before = lst(hist.done); + if (!before || !before.ranges) { + pushSelectionToHistory(doc.sel, hist.done); + } + cur = { + changes: [historyChangeFromChange(doc, change)], + generation: hist.generation + }; + hist.done.push(cur); + while (hist.done.length > hist.undoDepth) { + hist.done.shift(); + if (!hist.done[0].ranges) { + hist.done.shift(); + } + } + } + hist.done.push(selAfter); + hist.generation = ++hist.maxGeneration; + hist.lastModTime = hist.lastSelTime = time; + hist.lastOp = hist.lastSelOp = opId; + hist.lastOrigin = hist.lastSelOrigin = change.origin; + if (!last) { + signal(doc, "historyAdded"); + } + } + function selectionEventCanBeMerged(doc, origin, prev, sel) { + var ch = origin.charAt(0); + return ch == "*" || ch == "+" && prev.ranges.length == sel.ranges.length && prev.somethingSelected() == sel.somethingSelected() && new Date() - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500); + } + + // Called whenever the selection changes, sets the new selection as + // the pending selection in the history, and pushes the old pending + // selection into the 'done' array when it was significantly + // different (in number of selected ranges, emptiness, or time). + function addSelectionToHistory(doc, sel, opId, options) { + var hist = doc.history, + origin = options && options.origin; + + // A new event is started when the previous origin does not match + // the current, or the origins don't allow matching. Origins + // starting with * are always merged, those starting with + are + // merged when similar and close together in time. + if (opId == hist.lastSelOp || origin && hist.lastSelOrigin == origin && (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin || selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))) { + hist.done[hist.done.length - 1] = sel; + } else { + pushSelectionToHistory(sel, hist.done); + } + hist.lastSelTime = +new Date(); + hist.lastSelOrigin = origin; + hist.lastSelOp = opId; + if (options && options.clearRedo !== false) { + clearSelectionEvents(hist.undone); + } + } + function pushSelectionToHistory(sel, dest) { + var top = lst(dest); + if (!(top && top.ranges && top.equals(sel))) { + dest.push(sel); + } + } + + // Used to store marked span information in the history. + function attachLocalSpans(doc, change, from, to) { + var existing = change["spans_" + doc.id], + n = 0; + doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) { + if (line.markedSpans) { + (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; + } + ++n; + }); + } + + // When un/re-doing restores text containing marked spans, those + // that have been explicitly cleared should not be restored. + function removeClearedSpans(spans) { + if (!spans) { + return null; + } + var out; + for (var i = 0; i < spans.length; ++i) { + if (spans[i].marker.explicitlyCleared) { + if (!out) { + out = spans.slice(0, i); + } + } else if (out) { + out.push(spans[i]); + } + } + return !out ? spans : out.length ? out : null; + } + + // Retrieve and filter the old marked spans stored in a change event. + function getOldSpans(doc, change) { + var found = change["spans_" + doc.id]; + if (!found) { + return null; + } + var nw = []; + for (var i = 0; i < change.text.length; ++i) { + nw.push(removeClearedSpans(found[i])); + } + return nw; + } + + // Used for un/re-doing changes from the history. Combines the + // result of computing the existing spans with the set of spans that + // existed in the history (so that deleting around a span and then + // undoing brings back the span). + function mergeOldSpans(doc, change) { + var old = getOldSpans(doc, change); + var stretched = stretchSpansOverChange(doc, change); + if (!old) { + return stretched; + } + if (!stretched) { + return old; + } + for (var i = 0; i < old.length; ++i) { + var oldCur = old[i], + stretchCur = stretched[i]; + if (oldCur && stretchCur) { + spans: for (var j = 0; j < stretchCur.length; ++j) { + var span = stretchCur[j]; + for (var k = 0; k < oldCur.length; ++k) { + if (oldCur[k].marker == span.marker) { + continue spans; + } + } + oldCur.push(span); + } + } else if (stretchCur) { + old[i] = stretchCur; + } + } + return old; + } + + // Used both to provide a JSON-safe object in .getHistory, and, when + // detaching a document, to split the history in two + function copyHistoryArray(events, newGroup, instantiateSel) { + var copy = []; + for (var i = 0; i < events.length; ++i) { + var event = events[i]; + if (event.ranges) { + copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event); + continue; + } + var changes = event.changes, + newChanges = []; + copy.push({ + changes: newChanges + }); + for (var j = 0; j < changes.length; ++j) { + var change = changes[j], + m = void 0; + newChanges.push({ + from: change.from, + to: change.to, + text: change.text + }); + if (newGroup) { + for (var prop in change) { + if (m = prop.match(/^spans_(\d+)$/)) { + if (indexOf(newGroup, Number(m[1])) > -1) { + lst(newChanges)[prop] = change[prop]; + delete change[prop]; + } + } + } + } + } + } + return copy; + } + + // The 'scroll' parameter given to many of these indicated whether + // the new cursor position should be scrolled into view after + // modifying the selection. + + // If shift is held or the extend flag is set, extends a range to + // include a given position (and optionally a second position). + // Otherwise, simply returns the range between the given positions. + // Used for cursor motion and such. + function extendRange(range, head, other, extend) { + if (extend) { + var anchor = range.anchor; + if (other) { + var posBefore = cmp(head, anchor) < 0; + if (posBefore != cmp(other, anchor) < 0) { + anchor = head; + head = other; + } else if (posBefore != cmp(head, other) < 0) { + head = other; + } + } + return new Range(anchor, head); + } else { + return new Range(other || head, head); + } + } + + // Extend the primary selection range, discard the rest. + function extendSelection(doc, head, other, options, extend) { + if (extend == null) { + extend = doc.cm && (doc.cm.display.shift || doc.extend); + } + setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options); + } + + // Extend all selections (pos is an array of selections with length + // equal the number of selections) + function extendSelections(doc, heads, options) { + var out = []; + var extend = doc.cm && (doc.cm.display.shift || doc.extend); + for (var i = 0; i < doc.sel.ranges.length; i++) { + out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend); + } + var newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex); + setSelection(doc, newSel, options); + } + + // Updates a single range in the selection. + function replaceOneSelection(doc, i, range, options) { + var ranges = doc.sel.ranges.slice(0); + ranges[i] = range; + setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options); + } + + // Reset the selection to a single range. + function setSimpleSelection(doc, anchor, head, options) { + setSelection(doc, simpleSelection(anchor, head), options); + } + + // Give beforeSelectionChange handlers a change to influence a + // selection update. + function filterSelectionChange(doc, sel, options) { + var obj = { + ranges: sel.ranges, + update: function (ranges) { + this.ranges = []; + for (var i = 0; i < ranges.length; i++) { + this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor), clipPos(doc, ranges[i].head)); + } + }, + origin: options && options.origin + }; + signal(doc, "beforeSelectionChange", doc, obj); + if (doc.cm) { + signal(doc.cm, "beforeSelectionChange", doc.cm, obj); + } + if (obj.ranges != sel.ranges) { + return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1); + } else { + return sel; + } + } + function setSelectionReplaceHistory(doc, sel, options) { + var done = doc.history.done, + last = lst(done); + if (last && last.ranges) { + done[done.length - 1] = sel; + setSelectionNoUndo(doc, sel, options); + } else { + setSelection(doc, sel, options); + } + } + + // Set a new selection. + function setSelection(doc, sel, options) { + setSelectionNoUndo(doc, sel, options); + addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options); + } + function setSelectionNoUndo(doc, sel, options) { + if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) { + sel = filterSelectionChange(doc, sel, options); + } + var bias = options && options.bias || (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1); + setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)); + if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor") { + ensureCursorVisible(doc.cm); + } + } + function setSelectionInner(doc, sel) { + if (sel.equals(doc.sel)) { + return; + } + doc.sel = sel; + if (doc.cm) { + doc.cm.curOp.updateInput = 1; + doc.cm.curOp.selectionChanged = true; + signalCursorActivity(doc.cm); + } + signalLater(doc, "cursorActivity", doc); + } + + // Verify that the selection does not partially select any atomic + // marked ranges. + function reCheckSelection(doc) { + setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false)); + } + + // Return a selection that does not partially select any atomic + // ranges. + function skipAtomicInSelection(doc, sel, bias, mayClear) { + var out; + for (var i = 0; i < sel.ranges.length; i++) { + var range = sel.ranges[i]; + var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]; + var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear); + var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear); + if (out || newAnchor != range.anchor || newHead != range.head) { + if (!out) { + out = sel.ranges.slice(0, i); + } + out[i] = new Range(newAnchor, newHead); + } + } + return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel; + } + function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { + var line = getLine(doc, pos.line); + if (line.markedSpans) { + for (var i = 0; i < line.markedSpans.length; ++i) { + var sp = line.markedSpans[i], + m = sp.marker; + + // Determine if we should prevent the cursor being placed to the left/right of an atomic marker + // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it + // is with selectLeft/Right + var preventCursorLeft = "selectLeft" in m ? !m.selectLeft : m.inclusiveLeft; + var preventCursorRight = "selectRight" in m ? !m.selectRight : m.inclusiveRight; + if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) && (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) { + if (mayClear) { + signal(m, "beforeCursorEnter"); + if (m.explicitlyCleared) { + if (!line.markedSpans) { + break; + } else { + --i; + continue; + } + } + } + if (!m.atomic) { + continue; + } + if (oldPos) { + var near = m.find(dir < 0 ? 1 : -1), + diff = void 0; + if (dir < 0 ? preventCursorRight : preventCursorLeft) { + near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); + } + if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0)) { + return skipAtomicInner(doc, near, pos, dir, mayClear); + } + } + var far = m.find(dir < 0 ? -1 : 1); + if (dir < 0 ? preventCursorLeft : preventCursorRight) { + far = movePos(doc, far, dir, far.line == pos.line ? line : null); + } + return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null; + } + } + } + return pos; + } + + // Ensure a given position is not inside an atomic range. + function skipAtomic(doc, pos, oldPos, bias, mayClear) { + var dir = bias || 1; + var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || !mayClear && skipAtomicInner(doc, pos, oldPos, dir, true) || skipAtomicInner(doc, pos, oldPos, -dir, mayClear) || !mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true); + if (!found) { + doc.cantEdit = true; + return Pos(doc.first, 0); + } + return found; + } + function movePos(doc, pos, dir, line) { + if (dir < 0 && pos.ch == 0) { + if (pos.line > doc.first) { + return clipPos(doc, Pos(pos.line - 1)); + } else { + return null; + } + } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) { + if (pos.line < doc.first + doc.size - 1) { + return Pos(pos.line + 1, 0); + } else { + return null; + } + } else { + return new Pos(pos.line, pos.ch + dir); + } + } + function selectAll(cm) { + cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll); + } + + // UPDATING + + // Allow "beforeChange" event handlers to influence a change + function filterChange(doc, change, update) { + var obj = { + canceled: false, + from: change.from, + to: change.to, + text: change.text, + origin: change.origin, + cancel: function () { + return obj.canceled = true; + } + }; + if (update) { + obj.update = function (from, to, text, origin) { + if (from) { + obj.from = clipPos(doc, from); + } + if (to) { + obj.to = clipPos(doc, to); + } + if (text) { + obj.text = text; + } + if (origin !== undefined) { + obj.origin = origin; + } + }; + } + signal(doc, "beforeChange", doc, obj); + if (doc.cm) { + signal(doc.cm, "beforeChange", doc.cm, obj); + } + if (obj.canceled) { + if (doc.cm) { + doc.cm.curOp.updateInput = 2; + } + return null; + } + return { + from: obj.from, + to: obj.to, + text: obj.text, + origin: obj.origin + }; + } + + // Apply a change to a document, and add it to the document's + // history, and propagating it to all linked documents. + function makeChange(doc, change, ignoreReadOnly) { + if (doc.cm) { + if (!doc.cm.curOp) { + return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly); + } + if (doc.cm.state.suppressEdits) { + return; + } + } + if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) { + change = filterChange(doc, change, true); + if (!change) { + return; + } + } + + // Possibly split or suppress the update based on the presence + // of read-only spans in its range. + var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to); + if (split) { + for (var i = split.length - 1; i >= 0; --i) { + makeChangeInner(doc, { + from: split[i].from, + to: split[i].to, + text: i ? [""] : change.text, + origin: change.origin + }); + } + } else { + makeChangeInner(doc, change); + } + } + function makeChangeInner(doc, change) { + if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { + return; + } + var selAfter = computeSelAfterChange(doc, change); + addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN); + makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)); + var rebased = []; + linkedDocs(doc, function (doc, sharedHist) { + if (!sharedHist && indexOf(rebased, doc.history) == -1) { + rebaseHist(doc.history, change); + rebased.push(doc.history); + } + makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change)); + }); + } + + // Revert a change stored in a document's history. + function makeChangeFromHistory(doc, type, allowSelectionOnly) { + var suppress = doc.cm && doc.cm.state.suppressEdits; + if (suppress && !allowSelectionOnly) { + return; + } + var hist = doc.history, + event, + selAfter = doc.sel; + var source = type == "undo" ? hist.done : hist.undone, + dest = type == "undo" ? hist.undone : hist.done; + + // Verify that there is a useable event (so that ctrl-z won't + // needlessly clear selection events) + var i = 0; + for (; i < source.length; i++) { + event = source[i]; + if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) { + break; + } + } + if (i == source.length) { + return; + } + hist.lastOrigin = hist.lastSelOrigin = null; + for (;;) { + event = source.pop(); + if (event.ranges) { + pushSelectionToHistory(event, dest); + if (allowSelectionOnly && !event.equals(doc.sel)) { + setSelection(doc, event, { + clearRedo: false + }); + return; + } + selAfter = event; + } else if (suppress) { + source.push(event); + return; + } else { + break; + } + } + + // Build up a reverse change object to add to the opposite history + // stack (redo when undoing, and vice versa). + var antiChanges = []; + pushSelectionToHistory(selAfter, dest); + dest.push({ + changes: antiChanges, + generation: hist.generation + }); + hist.generation = event.generation || ++hist.maxGeneration; + var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange"); + var loop = function (i) { + var change = event.changes[i]; + change.origin = type; + if (filter && !filterChange(doc, change, false)) { + source.length = 0; + return {}; + } + antiChanges.push(historyChangeFromChange(doc, change)); + var after = i ? computeSelAfterChange(doc, change) : lst(source); + makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)); + if (!i && doc.cm) { + doc.cm.scrollIntoView({ + from: change.from, + to: changeEnd(change) + }); + } + var rebased = []; + + // Propagate to the linked documents + linkedDocs(doc, function (doc, sharedHist) { + if (!sharedHist && indexOf(rebased, doc.history) == -1) { + rebaseHist(doc.history, change); + rebased.push(doc.history); + } + makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change)); + }); + }; + for (var i$1 = event.changes.length - 1; i$1 >= 0; --i$1) { + var returned = loop(i$1); + if (returned) return returned.v; + } + } + + // Sub-views need their line numbers shifted when text is added + // above or below them in the parent document. + function shiftDoc(doc, distance) { + if (distance == 0) { + return; + } + doc.first += distance; + doc.sel = new Selection(map(doc.sel.ranges, function (range) { + return new Range(Pos(range.anchor.line + distance, range.anchor.ch), Pos(range.head.line + distance, range.head.ch)); + }), doc.sel.primIndex); + if (doc.cm) { + regChange(doc.cm, doc.first, doc.first - distance, distance); + for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) { + regLineChange(doc.cm, l, "gutter"); + } + } + } + + // More lower-level change function, handling only a single document + // (not linked ones). + function makeChangeSingleDoc(doc, change, selAfter, spans) { + if (doc.cm && !doc.cm.curOp) { + return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans); + } + if (change.to.line < doc.first) { + shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line)); + return; + } + if (change.from.line > doc.lastLine()) { + return; + } + + // Clip the change to the size of this doc + if (change.from.line < doc.first) { + var shift = change.text.length - 1 - (doc.first - change.from.line); + shiftDoc(doc, shift); + change = { + from: Pos(doc.first, 0), + to: Pos(change.to.line + shift, change.to.ch), + text: [lst(change.text)], + origin: change.origin + }; + } + var last = doc.lastLine(); + if (change.to.line > last) { + change = { + from: change.from, + to: Pos(last, getLine(doc, last).text.length), + text: [change.text[0]], + origin: change.origin + }; + } + change.removed = getBetween(doc, change.from, change.to); + if (!selAfter) { + selAfter = computeSelAfterChange(doc, change); + } + if (doc.cm) { + makeChangeSingleDocInEditor(doc.cm, change, spans); + } else { + updateDoc(doc, change, spans); + } + setSelectionNoUndo(doc, selAfter, sel_dontScroll); + if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0))) { + doc.cantEdit = false; + } + } + + // Handle the interaction of a change to a document with the editor + // that this document is part of. + function makeChangeSingleDocInEditor(cm, change, spans) { + var doc = cm.doc, + display = cm.display, + from = change.from, + to = change.to; + var recomputeMaxLength = false, + checkWidthStart = from.line; + if (!cm.options.lineWrapping) { + checkWidthStart = lineNo(visualLine(getLine(doc, from.line))); + doc.iter(checkWidthStart, to.line + 1, function (line) { + if (line == display.maxLine) { + recomputeMaxLength = true; + return true; + } + }); + } + if (doc.sel.contains(change.from, change.to) > -1) { + signalCursorActivity(cm); + } + updateDoc(doc, change, spans, estimateHeight(cm)); + if (!cm.options.lineWrapping) { + doc.iter(checkWidthStart, from.line + change.text.length, function (line) { + var len = lineLength(line); + if (len > display.maxLineLength) { + display.maxLine = line; + display.maxLineLength = len; + display.maxLineChanged = true; + recomputeMaxLength = false; + } + }); + if (recomputeMaxLength) { + cm.curOp.updateMaxLine = true; + } + } + retreatFrontier(doc, from.line); + startWorker(cm, 400); + var lendiff = change.text.length - (to.line - from.line) - 1; + // Remember that these lines changed, for updating the display + if (change.full) { + regChange(cm); + } else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change)) { + regLineChange(cm, from.line, "text"); + } else { + regChange(cm, from.line, to.line + 1, lendiff); + } + var changesHandler = hasHandler(cm, "changes"), + changeHandler = hasHandler(cm, "change"); + if (changeHandler || changesHandler) { + var obj = { + from: from, + to: to, + text: change.text, + removed: change.removed, + origin: change.origin + }; + if (changeHandler) { + signalLater(cm, "change", cm, obj); + } + if (changesHandler) { + (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); + } + } + cm.display.selForContextMenu = null; + } + function replaceRange(doc, code, from, to, origin) { + var assign; + if (!to) { + to = from; + } + if (cmp(to, from) < 0) { + assign = [to, from], from = assign[0], to = assign[1]; + } + if (typeof code == "string") { + code = doc.splitLines(code); + } + makeChange(doc, { + from: from, + to: to, + text: code, + origin: origin + }); + } + + // Rebasing/resetting history to deal with externally-sourced changes + + function rebaseHistSelSingle(pos, from, to, diff) { + if (to < pos.line) { + pos.line += diff; + } else if (from < pos.line) { + pos.line = from; + pos.ch = 0; + } + } + + // Tries to rebase an array of history events given a change in the + // document. If the change touches the same lines as the event, the + // event, and everything 'behind' it, is discarded. If the change is + // before the event, the event's positions are updated. Uses a + // copy-on-write scheme for the positions, to avoid having to + // reallocate them all on every rebase, but also avoid problems with + // shared position objects being unsafely updated. + function rebaseHistArray(array, from, to, diff) { + for (var i = 0; i < array.length; ++i) { + var sub = array[i], + ok = true; + if (sub.ranges) { + if (!sub.copied) { + sub = array[i] = sub.deepCopy(); + sub.copied = true; + } + for (var j = 0; j < sub.ranges.length; j++) { + rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff); + rebaseHistSelSingle(sub.ranges[j].head, from, to, diff); + } + continue; + } + for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) { + var cur = sub.changes[j$1]; + if (to < cur.from.line) { + cur.from = Pos(cur.from.line + diff, cur.from.ch); + cur.to = Pos(cur.to.line + diff, cur.to.ch); + } else if (from <= cur.to.line) { + ok = false; + break; + } + } + if (!ok) { + array.splice(0, i + 1); + i = 0; + } + } + } + function rebaseHist(hist, change) { + var from = change.from.line, + to = change.to.line, + diff = change.text.length - (to - from) - 1; + rebaseHistArray(hist.done, from, to, diff); + rebaseHistArray(hist.undone, from, to, diff); + } + + // Utility for applying a change to a line by handle or number, + // returning the number and optionally registering the line as + // changed. + function changeLine(doc, handle, changeType, op) { + var no = handle, + line = handle; + if (typeof handle == "number") { + line = getLine(doc, clipLine(doc, handle)); + } else { + no = lineNo(handle); + } + if (no == null) { + return null; + } + if (op(line, no) && doc.cm) { + regLineChange(doc.cm, no, changeType); + } + return line; + } + + // The document is represented as a BTree consisting of leaves, with + // chunk of lines in them, and branches, with up to ten leaves or + // other branch nodes below them. The top node is always a branch + // node, and is the document object itself (meaning it has + // additional methods and properties). + // + // All nodes have parent links. The tree is used both to go from + // line numbers to line objects, and to go from objects to numbers. + // It also indexes by height, and is used to convert between height + // and line object, and to find the total height of the document. + // + // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html + + function LeafChunk(lines) { + this.lines = lines; + this.parent = null; + var height = 0; + for (var i = 0; i < lines.length; ++i) { + lines[i].parent = this; + height += lines[i].height; + } + this.height = height; + } + LeafChunk.prototype = { + chunkSize: function () { + return this.lines.length; + }, + // Remove the n lines at offset 'at'. + removeInner: function (at, n) { + for (var i = at, e = at + n; i < e; ++i) { + var line = this.lines[i]; + this.height -= line.height; + cleanUpLine(line); + signalLater(line, "delete"); + } + this.lines.splice(at, n); + }, + // Helper used to collapse a small branch into a single leaf. + collapse: function (lines) { + lines.push.apply(lines, this.lines); + }, + // Insert the given array of lines at offset 'at', count them as + // having the given height. + insertInner: function (at, lines, height) { + this.height += height; + this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)); + for (var i = 0; i < lines.length; ++i) { + lines[i].parent = this; + } + }, + // Used to iterate over a part of the tree. + iterN: function (at, n, op) { + for (var e = at + n; at < e; ++at) { + if (op(this.lines[at])) { + return true; + } + } + } + }; + function BranchChunk(children) { + this.children = children; + var size = 0, + height = 0; + for (var i = 0; i < children.length; ++i) { + var ch = children[i]; + size += ch.chunkSize(); + height += ch.height; + ch.parent = this; + } + this.size = size; + this.height = height; + this.parent = null; + } + BranchChunk.prototype = { + chunkSize: function () { + return this.size; + }, + removeInner: function (at, n) { + this.size -= n; + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], + sz = child.chunkSize(); + if (at < sz) { + var rm = Math.min(n, sz - at), + oldHeight = child.height; + child.removeInner(at, rm); + this.height -= oldHeight - child.height; + if (sz == rm) { + this.children.splice(i--, 1); + child.parent = null; + } + if ((n -= rm) == 0) { + break; + } + at = 0; + } else { + at -= sz; + } + } + // If the result is smaller than 25 lines, ensure that it is a + // single leaf node. + if (this.size - n < 25 && (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { + var lines = []; + this.collapse(lines); + this.children = [new LeafChunk(lines)]; + this.children[0].parent = this; + } + }, + collapse: function (lines) { + for (var i = 0; i < this.children.length; ++i) { + this.children[i].collapse(lines); + } + }, + insertInner: function (at, lines, height) { + this.size += lines.length; + this.height += height; + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], + sz = child.chunkSize(); + if (at <= sz) { + child.insertInner(at, lines, height); + if (child.lines && child.lines.length > 50) { + // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced. + // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest. + var remaining = child.lines.length % 25 + 25; + for (var pos = remaining; pos < child.lines.length;) { + var leaf = new LeafChunk(child.lines.slice(pos, pos += 25)); + child.height -= leaf.height; + this.children.splice(++i, 0, leaf); + leaf.parent = this; + } + child.lines = child.lines.slice(0, remaining); + this.maybeSpill(); + } + break; + } + at -= sz; + } + }, + // When a node has grown, check whether it should be split. + maybeSpill: function () { + if (this.children.length <= 10) { + return; + } + var me = this; + do { + var spilled = me.children.splice(me.children.length - 5, 5); + var sibling = new BranchChunk(spilled); + if (!me.parent) { + // Become the parent node + var copy = new BranchChunk(me.children); + copy.parent = me; + me.children = [copy, sibling]; + me = copy; + } else { + me.size -= sibling.size; + me.height -= sibling.height; + var myIndex = indexOf(me.parent.children, me); + me.parent.children.splice(myIndex + 1, 0, sibling); + } + sibling.parent = me.parent; + } while (me.children.length > 10); + me.parent.maybeSpill(); + }, + iterN: function (at, n, op) { + for (var i = 0; i < this.children.length; ++i) { + var child = this.children[i], + sz = child.chunkSize(); + if (at < sz) { + var used = Math.min(n, sz - at); + if (child.iterN(at, used, op)) { + return true; + } + if ((n -= used) == 0) { + break; + } + at = 0; + } else { + at -= sz; + } + } + } + }; + + // Line widgets are block elements displayed above or below a line. + + var LineWidget = function (doc, node, options) { + if (options) { + for (var opt in options) { + if (options.hasOwnProperty(opt)) { + this[opt] = options[opt]; + } + } + } + this.doc = doc; + this.node = node; + }; + LineWidget.prototype.clear = function () { + var cm = this.doc.cm, + ws = this.line.widgets, + line = this.line, + no = lineNo(line); + if (no == null || !ws) { + return; + } + for (var i = 0; i < ws.length; ++i) { + if (ws[i] == this) { + ws.splice(i--, 1); + } + } + if (!ws.length) { + line.widgets = null; + } + var height = widgetHeight(this); + updateLineHeight(line, Math.max(0, line.height - height)); + if (cm) { + runInOp(cm, function () { + adjustScrollWhenAboveVisible(cm, line, -height); + regLineChange(cm, no, "widget"); + }); + signalLater(cm, "lineWidgetCleared", cm, this, no); + } + }; + LineWidget.prototype.changed = function () { + var this$1 = this; + var oldH = this.height, + cm = this.doc.cm, + line = this.line; + this.height = null; + var diff = widgetHeight(this) - oldH; + if (!diff) { + return; + } + if (!lineIsHidden(this.doc, line)) { + updateLineHeight(line, line.height + diff); + } + if (cm) { + runInOp(cm, function () { + cm.curOp.forceUpdate = true; + adjustScrollWhenAboveVisible(cm, line, diff); + signalLater(cm, "lineWidgetChanged", cm, this$1, lineNo(line)); + }); + } + }; + eventMixin(LineWidget); + function adjustScrollWhenAboveVisible(cm, line, diff) { + if (heightAtLine(line) < (cm.curOp && cm.curOp.scrollTop || cm.doc.scrollTop)) { + addToScrollTop(cm, diff); + } + } + function addLineWidget(doc, handle, node, options) { + var widget = new LineWidget(doc, node, options); + var cm = doc.cm; + if (cm && widget.noHScroll) { + cm.display.alignWidgets = true; + } + changeLine(doc, handle, "widget", function (line) { + var widgets = line.widgets || (line.widgets = []); + if (widget.insertAt == null) { + widgets.push(widget); + } else { + widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget); + } + widget.line = line; + if (cm && !lineIsHidden(doc, line)) { + var aboveVisible = heightAtLine(line) < doc.scrollTop; + updateLineHeight(line, line.height + widgetHeight(widget)); + if (aboveVisible) { + addToScrollTop(cm, widget.height); + } + cm.curOp.forceUpdate = true; + } + return true; + }); + if (cm) { + signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); + } + return widget; + } + + // TEXTMARKERS + + // Created with markText and setBookmark methods. A TextMarker is a + // handle that can be used to clear or find a marked position in the + // document. Line objects hold arrays (markedSpans) containing + // {from, to, marker} object pointing to such marker objects, and + // indicating that such a marker is present on that line. Multiple + // lines may point to the same marker when it spans across lines. + // The spans will have null for their from/to properties when the + // marker continues beyond the start/end of the line. Markers have + // links back to the lines they currently touch. + + // Collapsed markers have unique ids, in order to be able to order + // them, which is needed for uniquely determining an outer marker + // when they overlap (they may nest, but not partially overlap). + var nextMarkerId = 0; + var TextMarker = function (doc, type) { + this.lines = []; + this.type = type; + this.doc = doc; + this.id = ++nextMarkerId; + }; + + // Clear the marker. + TextMarker.prototype.clear = function () { + if (this.explicitlyCleared) { + return; + } + var cm = this.doc.cm, + withOp = cm && !cm.curOp; + if (withOp) { + startOperation(cm); + } + if (hasHandler(this, "clear")) { + var found = this.find(); + if (found) { + signalLater(this, "clear", found.from, found.to); + } + } + var min = null, + max = null; + for (var i = 0; i < this.lines.length; ++i) { + var line = this.lines[i]; + var span = getMarkedSpanFor(line.markedSpans, this); + if (cm && !this.collapsed) { + regLineChange(cm, lineNo(line), "text"); + } else if (cm) { + if (span.to != null) { + max = lineNo(line); + } + if (span.from != null) { + min = lineNo(line); + } + } + line.markedSpans = removeMarkedSpan(line.markedSpans, span); + if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) { + updateLineHeight(line, textHeight(cm.display)); + } + } + if (cm && this.collapsed && !cm.options.lineWrapping) { + for (var i$1 = 0; i$1 < this.lines.length; ++i$1) { + var visual = visualLine(this.lines[i$1]), + len = lineLength(visual); + if (len > cm.display.maxLineLength) { + cm.display.maxLine = visual; + cm.display.maxLineLength = len; + cm.display.maxLineChanged = true; + } + } + } + if (min != null && cm && this.collapsed) { + regChange(cm, min, max + 1); + } + this.lines.length = 0; + this.explicitlyCleared = true; + if (this.atomic && this.doc.cantEdit) { + this.doc.cantEdit = false; + if (cm) { + reCheckSelection(cm.doc); + } + } + if (cm) { + signalLater(cm, "markerCleared", cm, this, min, max); + } + if (withOp) { + endOperation(cm); + } + if (this.parent) { + this.parent.clear(); + } + }; + + // Find the position of the marker in the document. Returns a {from, + // to} object by default. Side can be passed to get a specific side + // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the + // Pos objects returned contain a line object, rather than a line + // number (used to prevent looking up the same line twice). + TextMarker.prototype.find = function (side, lineObj) { + if (side == null && this.type == "bookmark") { + side = 1; + } + var from, to; + for (var i = 0; i < this.lines.length; ++i) { + var line = this.lines[i]; + var span = getMarkedSpanFor(line.markedSpans, this); + if (span.from != null) { + from = Pos(lineObj ? line : lineNo(line), span.from); + if (side == -1) { + return from; + } + } + if (span.to != null) { + to = Pos(lineObj ? line : lineNo(line), span.to); + if (side == 1) { + return to; + } + } + } + return from && { + from: from, + to: to + }; + }; + + // Signals that the marker's widget changed, and surrounding layout + // should be recomputed. + TextMarker.prototype.changed = function () { + var this$1 = this; + var pos = this.find(-1, true), + widget = this, + cm = this.doc.cm; + if (!pos || !cm) { + return; + } + runInOp(cm, function () { + var line = pos.line, + lineN = lineNo(pos.line); + var view = findViewForLine(cm, lineN); + if (view) { + clearLineMeasurementCacheFor(view); + cm.curOp.selectionChanged = cm.curOp.forceUpdate = true; + } + cm.curOp.updateMaxLine = true; + if (!lineIsHidden(widget.doc, line) && widget.height != null) { + var oldHeight = widget.height; + widget.height = null; + var dHeight = widgetHeight(widget) - oldHeight; + if (dHeight) { + updateLineHeight(line, line.height + dHeight); + } + } + signalLater(cm, "markerChanged", cm, this$1); + }); + }; + TextMarker.prototype.attachLine = function (line) { + if (!this.lines.length && this.doc.cm) { + var op = this.doc.cm.curOp; + if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) { + (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); + } + } + this.lines.push(line); + }; + TextMarker.prototype.detachLine = function (line) { + this.lines.splice(indexOf(this.lines, line), 1); + if (!this.lines.length && this.doc.cm) { + var op = this.doc.cm.curOp; + (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this); + } + }; + eventMixin(TextMarker); + + // Create a marker, wire it up to the right lines, and + function markText(doc, from, to, options, type) { + // Shared markers (across linked documents) are handled separately + // (markTextShared will call out to this again, once per + // document). + if (options && options.shared) { + return markTextShared(doc, from, to, options, type); + } + // Ensure we are in an operation. + if (doc.cm && !doc.cm.curOp) { + return operation(doc.cm, markText)(doc, from, to, options, type); + } + var marker = new TextMarker(doc, type), + diff = cmp(from, to); + if (options) { + copyObj(options, marker, false); + } + // Don't connect empty markers unless clearWhenEmpty is false + if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) { + return marker; + } + if (marker.replacedWith) { + // Showing up as a widget implies collapsed (widget replaces text) + marker.collapsed = true; + marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget"); + if (!options.handleMouseEvents) { + marker.widgetNode.setAttribute("cm-ignore-events", "true"); + } + if (options.insertLeft) { + marker.widgetNode.insertLeft = true; + } + } + if (marker.collapsed) { + if (conflictingCollapsedRange(doc, from.line, from, to, marker) || from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) { + throw new Error("Inserting collapsed marker partially overlapping an existing one"); + } + seeCollapsedSpans(); + } + if (marker.addToHistory) { + addChangeToHistory(doc, { + from: from, + to: to, + origin: "markText" + }, doc.sel, NaN); + } + var curLine = from.line, + cm = doc.cm, + updateMaxLine; + doc.iter(curLine, to.line + 1, function (line) { + if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) { + updateMaxLine = true; + } + if (marker.collapsed && curLine != from.line) { + updateLineHeight(line, 0); + } + addMarkedSpan(line, new MarkedSpan(marker, curLine == from.line ? from.ch : null, curLine == to.line ? to.ch : null), doc.cm && doc.cm.curOp); + ++curLine; + }); + // lineIsHidden depends on the presence of the spans, so needs a second pass + if (marker.collapsed) { + doc.iter(from.line, to.line + 1, function (line) { + if (lineIsHidden(doc, line)) { + updateLineHeight(line, 0); + } + }); + } + if (marker.clearOnEnter) { + on(marker, "beforeCursorEnter", function () { + return marker.clear(); + }); + } + if (marker.readOnly) { + seeReadOnlySpans(); + if (doc.history.done.length || doc.history.undone.length) { + doc.clearHistory(); + } + } + if (marker.collapsed) { + marker.id = ++nextMarkerId; + marker.atomic = true; + } + if (cm) { + // Sync editor state + if (updateMaxLine) { + cm.curOp.updateMaxLine = true; + } + if (marker.collapsed) { + regChange(cm, from.line, to.line + 1); + } else if (marker.className || marker.startStyle || marker.endStyle || marker.css || marker.attributes || marker.title) { + for (var i = from.line; i <= to.line; i++) { + regLineChange(cm, i, "text"); + } + } + if (marker.atomic) { + reCheckSelection(cm.doc); + } + signalLater(cm, "markerAdded", cm, marker); + } + return marker; + } + + // SHARED TEXTMARKERS + + // A shared marker spans multiple linked documents. It is + // implemented as a meta-marker-object controlling multiple normal + // markers. + var SharedTextMarker = function (markers, primary) { + this.markers = markers; + this.primary = primary; + for (var i = 0; i < markers.length; ++i) { + markers[i].parent = this; + } + }; + SharedTextMarker.prototype.clear = function () { + if (this.explicitlyCleared) { + return; + } + this.explicitlyCleared = true; + for (var i = 0; i < this.markers.length; ++i) { + this.markers[i].clear(); + } + signalLater(this, "clear"); + }; + SharedTextMarker.prototype.find = function (side, lineObj) { + return this.primary.find(side, lineObj); + }; + eventMixin(SharedTextMarker); + function markTextShared(doc, from, to, options, type) { + options = copyObj(options); + options.shared = false; + var markers = [markText(doc, from, to, options, type)], + primary = markers[0]; + var widget = options.widgetNode; + linkedDocs(doc, function (doc) { + if (widget) { + options.widgetNode = widget.cloneNode(true); + } + markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type)); + for (var i = 0; i < doc.linked.length; ++i) { + if (doc.linked[i].isParent) { + return; + } + } + primary = lst(markers); + }); + return new SharedTextMarker(markers, primary); + } + function findSharedMarkers(doc) { + return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { + return m.parent; + }); + } + function copySharedMarkers(doc, markers) { + for (var i = 0; i < markers.length; i++) { + var marker = markers[i], + pos = marker.find(); + var mFrom = doc.clipPos(pos.from), + mTo = doc.clipPos(pos.to); + if (cmp(mFrom, mTo)) { + var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type); + marker.markers.push(subMark); + subMark.parent = marker; + } + } + } + function detachSharedMarkers(markers) { + var loop = function (i) { + var marker = markers[i], + linked = [marker.primary.doc]; + linkedDocs(marker.primary.doc, function (d) { + return linked.push(d); + }); + for (var j = 0; j < marker.markers.length; j++) { + var subMarker = marker.markers[j]; + if (indexOf(linked, subMarker.doc) == -1) { + subMarker.parent = null; + marker.markers.splice(j--, 1); + } + } + }; + for (var i = 0; i < markers.length; i++) loop(i); + } + var nextDocId = 0; + var Doc = function (text, mode, firstLine, lineSep, direction) { + if (!(this instanceof Doc)) { + return new Doc(text, mode, firstLine, lineSep, direction); + } + if (firstLine == null) { + firstLine = 0; + } + BranchChunk.call(this, [new LeafChunk([new Line("", null)])]); + this.first = firstLine; + this.scrollTop = this.scrollLeft = 0; + this.cantEdit = false; + this.cleanGeneration = 1; + this.modeFrontier = this.highlightFrontier = firstLine; + var start = Pos(firstLine, 0); + this.sel = simpleSelection(start); + this.history = new History(null); + this.id = ++nextDocId; + this.modeOption = mode; + this.lineSep = lineSep; + this.direction = direction == "rtl" ? "rtl" : "ltr"; + this.extend = false; + if (typeof text == "string") { + text = this.splitLines(text); + } + updateDoc(this, { + from: start, + to: start, + text: text + }); + setSelection(this, simpleSelection(start), sel_dontScroll); + }; + Doc.prototype = createObj(BranchChunk.prototype, { + constructor: Doc, + // Iterate over the document. Supports two forms -- with only one + // argument, it calls that for each line in the document. With + // three, it iterates over the range given by the first two (with + // the second being non-inclusive). + iter: function (from, to, op) { + if (op) { + this.iterN(from - this.first, to - from, op); + } else { + this.iterN(this.first, this.first + this.size, from); + } + }, + // Non-public interface for adding and removing lines. + insert: function (at, lines) { + var height = 0; + for (var i = 0; i < lines.length; ++i) { + height += lines[i].height; + } + this.insertInner(at - this.first, lines, height); + }, + remove: function (at, n) { + this.removeInner(at - this.first, n); + }, + // From here, the methods are part of the public interface. Most + // are also available from CodeMirror (editor) instances. + + getValue: function (lineSep) { + var lines = getLines(this, this.first, this.first + this.size); + if (lineSep === false) { + return lines; + } + return lines.join(lineSep || this.lineSeparator()); + }, + setValue: docMethodOp(function (code) { + var top = Pos(this.first, 0), + last = this.first + this.size - 1; + makeChange(this, { + from: top, + to: Pos(last, getLine(this, last).text.length), + text: this.splitLines(code), + origin: "setValue", + full: true + }, true); + if (this.cm) { + scrollToCoords(this.cm, 0, 0); + } + setSelection(this, simpleSelection(top), sel_dontScroll); + }), + replaceRange: function (code, from, to, origin) { + from = clipPos(this, from); + to = to ? clipPos(this, to) : from; + replaceRange(this, code, from, to, origin); + }, + getRange: function (from, to, lineSep) { + var lines = getBetween(this, clipPos(this, from), clipPos(this, to)); + if (lineSep === false) { + return lines; + } + if (lineSep === '') { + return lines.join(''); + } + return lines.join(lineSep || this.lineSeparator()); + }, + getLine: function (line) { + var l = this.getLineHandle(line); + return l && l.text; + }, + getLineHandle: function (line) { + if (isLine(this, line)) { + return getLine(this, line); + } + }, + getLineNumber: function (line) { + return lineNo(line); + }, + getLineHandleVisualStart: function (line) { + if (typeof line == "number") { + line = getLine(this, line); + } + return visualLine(line); + }, + lineCount: function () { + return this.size; + }, + firstLine: function () { + return this.first; + }, + lastLine: function () { + return this.first + this.size - 1; + }, + clipPos: function (pos) { + return clipPos(this, pos); + }, + getCursor: function (start) { + var range = this.sel.primary(), + pos; + if (start == null || start == "head") { + pos = range.head; + } else if (start == "anchor") { + pos = range.anchor; + } else if (start == "end" || start == "to" || start === false) { + pos = range.to(); + } else { + pos = range.from(); + } + return pos; + }, + listSelections: function () { + return this.sel.ranges; + }, + somethingSelected: function () { + return this.sel.somethingSelected(); + }, + setCursor: docMethodOp(function (line, ch, options) { + setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options); + }), + setSelection: docMethodOp(function (anchor, head, options) { + setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options); + }), + extendSelection: docMethodOp(function (head, other, options) { + extendSelection(this, clipPos(this, head), other && clipPos(this, other), options); + }), + extendSelections: docMethodOp(function (heads, options) { + extendSelections(this, clipPosArray(this, heads), options); + }), + extendSelectionsBy: docMethodOp(function (f, options) { + var heads = map(this.sel.ranges, f); + extendSelections(this, clipPosArray(this, heads), options); + }), + setSelections: docMethodOp(function (ranges, primary, options) { + if (!ranges.length) { + return; + } + var out = []; + for (var i = 0; i < ranges.length; i++) { + out[i] = new Range(clipPos(this, ranges[i].anchor), clipPos(this, ranges[i].head || ranges[i].anchor)); + } + if (primary == null) { + primary = Math.min(ranges.length - 1, this.sel.primIndex); + } + setSelection(this, normalizeSelection(this.cm, out, primary), options); + }), + addSelection: docMethodOp(function (anchor, head, options) { + var ranges = this.sel.ranges.slice(0); + ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))); + setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options); + }), + getSelection: function (lineSep) { + var ranges = this.sel.ranges, + lines; + for (var i = 0; i < ranges.length; i++) { + var sel = getBetween(this, ranges[i].from(), ranges[i].to()); + lines = lines ? lines.concat(sel) : sel; + } + if (lineSep === false) { + return lines; + } else { + return lines.join(lineSep || this.lineSeparator()); + } + }, + getSelections: function (lineSep) { + var parts = [], + ranges = this.sel.ranges; + for (var i = 0; i < ranges.length; i++) { + var sel = getBetween(this, ranges[i].from(), ranges[i].to()); + if (lineSep !== false) { + sel = sel.join(lineSep || this.lineSeparator()); + } + parts[i] = sel; + } + return parts; + }, + replaceSelection: function (code, collapse, origin) { + var dup = []; + for (var i = 0; i < this.sel.ranges.length; i++) { + dup[i] = code; + } + this.replaceSelections(dup, collapse, origin || "+input"); + }, + replaceSelections: docMethodOp(function (code, collapse, origin) { + var changes = [], + sel = this.sel; + for (var i = 0; i < sel.ranges.length; i++) { + var range = sel.ranges[i]; + changes[i] = { + from: range.from(), + to: range.to(), + text: this.splitLines(code[i]), + origin: origin + }; + } + var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse); + for (var i$1 = changes.length - 1; i$1 >= 0; i$1--) { + makeChange(this, changes[i$1]); + } + if (newSel) { + setSelectionReplaceHistory(this, newSel); + } else if (this.cm) { + ensureCursorVisible(this.cm); + } + }), + undo: docMethodOp(function () { + makeChangeFromHistory(this, "undo"); + }), + redo: docMethodOp(function () { + makeChangeFromHistory(this, "redo"); + }), + undoSelection: docMethodOp(function () { + makeChangeFromHistory(this, "undo", true); + }), + redoSelection: docMethodOp(function () { + makeChangeFromHistory(this, "redo", true); + }), + setExtending: function (val) { + this.extend = val; + }, + getExtending: function () { + return this.extend; + }, + historySize: function () { + var hist = this.history, + done = 0, + undone = 0; + for (var i = 0; i < hist.done.length; i++) { + if (!hist.done[i].ranges) { + ++done; + } + } + for (var i$1 = 0; i$1 < hist.undone.length; i$1++) { + if (!hist.undone[i$1].ranges) { + ++undone; + } + } + return { + undo: done, + redo: undone + }; + }, + clearHistory: function () { + var this$1 = this; + this.history = new History(this.history); + linkedDocs(this, function (doc) { + return doc.history = this$1.history; + }, true); + }, + markClean: function () { + this.cleanGeneration = this.changeGeneration(true); + }, + changeGeneration: function (forceSplit) { + if (forceSplit) { + this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; + } + return this.history.generation; + }, + isClean: function (gen) { + return this.history.generation == (gen || this.cleanGeneration); + }, + getHistory: function () { + return { + done: copyHistoryArray(this.history.done), + undone: copyHistoryArray(this.history.undone) + }; + }, + setHistory: function (histData) { + var hist = this.history = new History(this.history); + hist.done = copyHistoryArray(histData.done.slice(0), null, true); + hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); + }, + setGutterMarker: docMethodOp(function (line, gutterID, value) { + return changeLine(this, line, "gutter", function (line) { + var markers = line.gutterMarkers || (line.gutterMarkers = {}); + markers[gutterID] = value; + if (!value && isEmpty(markers)) { + line.gutterMarkers = null; + } + return true; + }); + }), + clearGutter: docMethodOp(function (gutterID) { + var this$1 = this; + this.iter(function (line) { + if (line.gutterMarkers && line.gutterMarkers[gutterID]) { + changeLine(this$1, line, "gutter", function () { + line.gutterMarkers[gutterID] = null; + if (isEmpty(line.gutterMarkers)) { + line.gutterMarkers = null; + } + return true; + }); + } + }); + }), + lineInfo: function (line) { + var n; + if (typeof line == "number") { + if (!isLine(this, line)) { + return null; + } + n = line; + line = getLine(this, line); + if (!line) { + return null; + } + } else { + n = lineNo(line); + if (n == null) { + return null; + } + } + return { + line: n, + handle: line, + text: line.text, + gutterMarkers: line.gutterMarkers, + textClass: line.textClass, + bgClass: line.bgClass, + wrapClass: line.wrapClass, + widgets: line.widgets + }; + }, + addLineClass: docMethodOp(function (handle, where, cls) { + return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { + var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass"; + if (!line[prop]) { + line[prop] = cls; + } else if (classTest(cls).test(line[prop])) { + return false; + } else { + line[prop] += " " + cls; + } + return true; + }); + }), + removeLineClass: docMethodOp(function (handle, where, cls) { + return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { + var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass"; + var cur = line[prop]; + if (!cur) { + return false; + } else if (cls == null) { + line[prop] = null; + } else { + var found = cur.match(classTest(cls)); + if (!found) { + return false; + } + var end = found.index + found[0].length; + line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null; + } + return true; + }); + }), + addLineWidget: docMethodOp(function (handle, node, options) { + return addLineWidget(this, handle, node, options); + }), + removeLineWidget: function (widget) { + widget.clear(); + }, + markText: function (from, to, options) { + return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range"); + }, + setBookmark: function (pos, options) { + var realOpts = { + replacedWith: options && (options.nodeType == null ? options.widget : options), + insertLeft: options && options.insertLeft, + clearWhenEmpty: false, + shared: options && options.shared, + handleMouseEvents: options && options.handleMouseEvents + }; + pos = clipPos(this, pos); + return markText(this, pos, pos, realOpts, "bookmark"); + }, + findMarksAt: function (pos) { + pos = clipPos(this, pos); + var markers = [], + spans = getLine(this, pos.line).markedSpans; + if (spans) { + for (var i = 0; i < spans.length; ++i) { + var span = spans[i]; + if ((span.from == null || span.from <= pos.ch) && (span.to == null || span.to >= pos.ch)) { + markers.push(span.marker.parent || span.marker); + } + } + } + return markers; + }, + findMarks: function (from, to, filter) { + from = clipPos(this, from); + to = clipPos(this, to); + var found = [], + lineNo = from.line; + this.iter(from.line, to.line + 1, function (line) { + var spans = line.markedSpans; + if (spans) { + for (var i = 0; i < spans.length; i++) { + var span = spans[i]; + if (!(span.to != null && lineNo == from.line && from.ch >= span.to || span.from == null && lineNo != from.line || span.from != null && lineNo == to.line && span.from >= to.ch) && (!filter || filter(span.marker))) { + found.push(span.marker.parent || span.marker); + } + } + } + ++lineNo; + }); + return found; + }, + getAllMarks: function () { + var markers = []; + this.iter(function (line) { + var sps = line.markedSpans; + if (sps) { + for (var i = 0; i < sps.length; ++i) { + if (sps[i].from != null) { + markers.push(sps[i].marker); + } + } + } + }); + return markers; + }, + posFromIndex: function (off) { + var ch, + lineNo = this.first, + sepSize = this.lineSeparator().length; + this.iter(function (line) { + var sz = line.text.length + sepSize; + if (sz > off) { + ch = off; + return true; + } + off -= sz; + ++lineNo; + }); + return clipPos(this, Pos(lineNo, ch)); + }, + indexFromPos: function (coords) { + coords = clipPos(this, coords); + var index = coords.ch; + if (coords.line < this.first || coords.ch < 0) { + return 0; + } + var sepSize = this.lineSeparator().length; + this.iter(this.first, coords.line, function (line) { + // iter aborts when callback returns a truthy value + index += line.text.length + sepSize; + }); + return index; + }, + copy: function (copyHistory) { + var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first, this.lineSep, this.direction); + doc.scrollTop = this.scrollTop; + doc.scrollLeft = this.scrollLeft; + doc.sel = this.sel; + doc.extend = false; + if (copyHistory) { + doc.history.undoDepth = this.history.undoDepth; + doc.setHistory(this.getHistory()); + } + return doc; + }, + linkedDoc: function (options) { + if (!options) { + options = {}; + } + var from = this.first, + to = this.first + this.size; + if (options.from != null && options.from > from) { + from = options.from; + } + if (options.to != null && options.to < to) { + to = options.to; + } + var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction); + if (options.sharedHist) { + copy.history = this.history; + } + (this.linked || (this.linked = [])).push({ + doc: copy, + sharedHist: options.sharedHist + }); + copy.linked = [{ + doc: this, + isParent: true, + sharedHist: options.sharedHist + }]; + copySharedMarkers(copy, findSharedMarkers(this)); + return copy; + }, + unlinkDoc: function (other) { + if (other instanceof CodeMirror) { + other = other.doc; + } + if (this.linked) { + for (var i = 0; i < this.linked.length; ++i) { + var link = this.linked[i]; + if (link.doc != other) { + continue; + } + this.linked.splice(i, 1); + other.unlinkDoc(this); + detachSharedMarkers(findSharedMarkers(this)); + break; + } + } + // If the histories were shared, split them again + if (other.history == this.history) { + var splitIds = [other.id]; + linkedDocs(other, function (doc) { + return splitIds.push(doc.id); + }, true); + other.history = new History(null); + other.history.done = copyHistoryArray(this.history.done, splitIds); + other.history.undone = copyHistoryArray(this.history.undone, splitIds); + } + }, + iterLinkedDocs: function (f) { + linkedDocs(this, f); + }, + getMode: function () { + return this.mode; + }, + getEditor: function () { + return this.cm; + }, + splitLines: function (str) { + if (this.lineSep) { + return str.split(this.lineSep); + } + return splitLinesAuto(str); + }, + lineSeparator: function () { + return this.lineSep || "\n"; + }, + setDirection: docMethodOp(function (dir) { + if (dir != "rtl") { + dir = "ltr"; + } + if (dir == this.direction) { + return; + } + this.direction = dir; + this.iter(function (line) { + return line.order = null; + }); + if (this.cm) { + directionChanged(this.cm); + } + }) + }); + + // Public alias. + Doc.prototype.eachLine = Doc.prototype.iter; + + // Kludge to work around strange IE behavior where it'll sometimes + // re-fire a series of drag-related events right after the drop (#1551) + var lastDrop = 0; + function onDrop(e) { + var cm = this; + clearDragCursor(cm); + if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { + return; + } + e_preventDefault(e); + if (ie) { + lastDrop = +new Date(); + } + var pos = posFromMouse(cm, e, true), + files = e.dataTransfer.files; + if (!pos || cm.isReadOnly()) { + return; + } + // Might be a file drop, in which case we simply extract the text + // and insert it. + if (files && files.length && window.FileReader && window.File) { + var n = files.length, + text = Array(n), + read = 0; + var markAsReadAndPasteIfAllFilesAreRead = function () { + if (++read == n) { + operation(cm, function () { + pos = clipPos(cm.doc, pos); + var change = { + from: pos, + to: pos, + text: cm.doc.splitLines(text.filter(function (t) { + return t != null; + }).join(cm.doc.lineSeparator())), + origin: "paste" + }; + makeChange(cm.doc, change); + setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change)))); + })(); + } + }; + var readTextFromFile = function (file, i) { + if (cm.options.allowDropFileTypes && indexOf(cm.options.allowDropFileTypes, file.type) == -1) { + markAsReadAndPasteIfAllFilesAreRead(); + return; + } + var reader = new FileReader(); + reader.onerror = function () { + return markAsReadAndPasteIfAllFilesAreRead(); + }; + reader.onload = function () { + var content = reader.result; + if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { + markAsReadAndPasteIfAllFilesAreRead(); + return; + } + text[i] = content; + markAsReadAndPasteIfAllFilesAreRead(); + }; + reader.readAsText(file); + }; + for (var i = 0; i < files.length; i++) { + readTextFromFile(files[i], i); + } + } else { + // Normal drop + // Don't do a replace if the drop happened inside of the selected text. + if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { + cm.state.draggingText(e); + // Ensure the editor is re-focused + setTimeout(function () { + return cm.display.input.focus(); + }, 20); + return; + } + try { + var text$1 = e.dataTransfer.getData("Text"); + if (text$1) { + var selected; + if (cm.state.draggingText && !cm.state.draggingText.copy) { + selected = cm.listSelections(); + } + setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)); + if (selected) { + for (var i$1 = 0; i$1 < selected.length; ++i$1) { + replaceRange(cm.doc, "", selected[i$1].anchor, selected[i$1].head, "drag"); + } + } + cm.replaceSelection(text$1, "around", "paste"); + cm.display.input.focus(); + } + } catch (e$1) {} + } + } + function onDragStart(cm, e) { + if (ie && (!cm.state.draggingText || +new Date() - lastDrop < 100)) { + e_stop(e); + return; + } + if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { + return; + } + e.dataTransfer.setData("Text", cm.getSelection()); + e.dataTransfer.effectAllowed = "copyMove"; + + // Use dummy image instead of default browsers image. + // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there. + if (e.dataTransfer.setDragImage && !safari) { + var img = elt("img", null, null, "position: fixed; left: 0; top: 0;"); + img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; + if (presto) { + img.width = img.height = 1; + cm.display.wrapper.appendChild(img); + // Force a relayout, or Opera won't use our image for some obscure reason + img._top = img.offsetTop; + } + e.dataTransfer.setDragImage(img, 0, 0); + if (presto) { + img.parentNode.removeChild(img); + } + } + } + function onDragOver(cm, e) { + var pos = posFromMouse(cm, e); + if (!pos) { + return; + } + var frag = document.createDocumentFragment(); + drawSelectionCursor(cm, pos, frag); + if (!cm.display.dragCursor) { + cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors"); + cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv); + } + removeChildrenAndAdd(cm.display.dragCursor, frag); + } + function clearDragCursor(cm) { + if (cm.display.dragCursor) { + cm.display.lineSpace.removeChild(cm.display.dragCursor); + cm.display.dragCursor = null; + } + } + + // These must be handled carefully, because naively registering a + // handler for each editor will cause the editors to never be + // garbage collected. + + function forEachCodeMirror(f) { + if (!document.getElementsByClassName) { + return; + } + var byClass = document.getElementsByClassName("CodeMirror"), + editors = []; + for (var i = 0; i < byClass.length; i++) { + var cm = byClass[i].CodeMirror; + if (cm) { + editors.push(cm); + } + } + if (editors.length) { + editors[0].operation(function () { + for (var i = 0; i < editors.length; i++) { + f(editors[i]); + } + }); + } + } + var globalsRegistered = false; + function ensureGlobalHandlers() { + if (globalsRegistered) { + return; + } + registerGlobalHandlers(); + globalsRegistered = true; + } + function registerGlobalHandlers() { + // When the window resizes, we need to refresh active editors. + var resizeTimer; + on(window, "resize", function () { + if (resizeTimer == null) { + resizeTimer = setTimeout(function () { + resizeTimer = null; + forEachCodeMirror(onResize); + }, 100); + } + }); + // When the window loses focus, we want to show the editor as blurred + on(window, "blur", function () { + return forEachCodeMirror(onBlur); + }); + } + // Called when the window resizes + function onResize(cm) { + var d = cm.display; + // Might be a text scaling operation, clear size caches. + d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; + d.scrollbarsClipped = false; + cm.setSize(); + } + var keyNames = { + 3: "Pause", + 8: "Backspace", + 9: "Tab", + 13: "Enter", + 16: "Shift", + 17: "Ctrl", + 18: "Alt", + 19: "Pause", + 20: "CapsLock", + 27: "Esc", + 32: "Space", + 33: "PageUp", + 34: "PageDown", + 35: "End", + 36: "Home", + 37: "Left", + 38: "Up", + 39: "Right", + 40: "Down", + 44: "PrintScrn", + 45: "Insert", + 46: "Delete", + 59: ";", + 61: "=", + 91: "Mod", + 92: "Mod", + 93: "Mod", + 106: "*", + 107: "=", + 109: "-", + 110: ".", + 111: "/", + 145: "ScrollLock", + 173: "-", + 186: ";", + 187: "=", + 188: ",", + 189: "-", + 190: ".", + 191: "/", + 192: "`", + 219: "[", + 220: "\\", + 221: "]", + 222: "'", + 224: "Mod", + 63232: "Up", + 63233: "Down", + 63234: "Left", + 63235: "Right", + 63272: "Delete", + 63273: "Home", + 63275: "End", + 63276: "PageUp", + 63277: "PageDown", + 63302: "Insert" + }; + + // Number keys + for (var i = 0; i < 10; i++) { + keyNames[i + 48] = keyNames[i + 96] = String(i); + } + // Alphabetic keys + for (var i$1 = 65; i$1 <= 90; i$1++) { + keyNames[i$1] = String.fromCharCode(i$1); + } + // Function keys + for (var i$2 = 1; i$2 <= 12; i$2++) { + keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; + } + var keyMap = {}; + keyMap.basic = { + "Left": "goCharLeft", + "Right": "goCharRight", + "Up": "goLineUp", + "Down": "goLineDown", + "End": "goLineEnd", + "Home": "goLineStartSmart", + "PageUp": "goPageUp", + "PageDown": "goPageDown", + "Delete": "delCharAfter", + "Backspace": "delCharBefore", + "Shift-Backspace": "delCharBefore", + "Tab": "defaultTab", + "Shift-Tab": "indentAuto", + "Enter": "newlineAndIndent", + "Insert": "toggleOverwrite", + "Esc": "singleSelection" + }; + // Note that the save and find-related commands aren't defined by + // default. User code or addons can define them. Unknown commands + // are simply ignored. + keyMap.pcDefault = { + "Ctrl-A": "selectAll", + "Ctrl-D": "deleteLine", + "Ctrl-Z": "undo", + "Shift-Ctrl-Z": "redo", + "Ctrl-Y": "redo", + "Ctrl-Home": "goDocStart", + "Ctrl-End": "goDocEnd", + "Ctrl-Up": "goLineUp", + "Ctrl-Down": "goLineDown", + "Ctrl-Left": "goGroupLeft", + "Ctrl-Right": "goGroupRight", + "Alt-Left": "goLineStart", + "Alt-Right": "goLineEnd", + "Ctrl-Backspace": "delGroupBefore", + "Ctrl-Delete": "delGroupAfter", + "Ctrl-S": "save", + "Ctrl-F": "find", + "Ctrl-G": "findNext", + "Shift-Ctrl-G": "findPrev", + "Shift-Ctrl-F": "replace", + "Shift-Ctrl-R": "replaceAll", + "Ctrl-[": "indentLess", + "Ctrl-]": "indentMore", + "Ctrl-U": "undoSelection", + "Shift-Ctrl-U": "redoSelection", + "Alt-U": "redoSelection", + "fallthrough": "basic" + }; + // Very basic readline/emacs-style bindings, which are standard on Mac. + keyMap.emacsy = { + "Ctrl-F": "goCharRight", + "Ctrl-B": "goCharLeft", + "Ctrl-P": "goLineUp", + "Ctrl-N": "goLineDown", + "Ctrl-A": "goLineStart", + "Ctrl-E": "goLineEnd", + "Ctrl-V": "goPageDown", + "Shift-Ctrl-V": "goPageUp", + "Ctrl-D": "delCharAfter", + "Ctrl-H": "delCharBefore", + "Alt-Backspace": "delWordBefore", + "Ctrl-K": "killLine", + "Ctrl-T": "transposeChars", + "Ctrl-O": "openLine" + }; + keyMap.macDefault = { + "Cmd-A": "selectAll", + "Cmd-D": "deleteLine", + "Cmd-Z": "undo", + "Shift-Cmd-Z": "redo", + "Cmd-Y": "redo", + "Cmd-Home": "goDocStart", + "Cmd-Up": "goDocStart", + "Cmd-End": "goDocEnd", + "Cmd-Down": "goDocEnd", + "Alt-Left": "goGroupLeft", + "Alt-Right": "goGroupRight", + "Cmd-Left": "goLineLeft", + "Cmd-Right": "goLineRight", + "Alt-Backspace": "delGroupBefore", + "Ctrl-Alt-Backspace": "delGroupAfter", + "Alt-Delete": "delGroupAfter", + "Cmd-S": "save", + "Cmd-F": "find", + "Cmd-G": "findNext", + "Shift-Cmd-G": "findPrev", + "Cmd-Alt-F": "replace", + "Shift-Cmd-Alt-F": "replaceAll", + "Cmd-[": "indentLess", + "Cmd-]": "indentMore", + "Cmd-Backspace": "delWrappedLineLeft", + "Cmd-Delete": "delWrappedLineRight", + "Cmd-U": "undoSelection", + "Shift-Cmd-U": "redoSelection", + "Ctrl-Up": "goDocStart", + "Ctrl-Down": "goDocEnd", + "fallthrough": ["basic", "emacsy"] + }; + keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault; + + // KEYMAP DISPATCH + + function normalizeKeyName(name) { + var parts = name.split(/-(?!$)/); + name = parts[parts.length - 1]; + var alt, ctrl, shift, cmd; + for (var i = 0; i < parts.length - 1; i++) { + var mod = parts[i]; + if (/^(cmd|meta|m)$/i.test(mod)) { + cmd = true; + } else if (/^a(lt)?$/i.test(mod)) { + alt = true; + } else if (/^(c|ctrl|control)$/i.test(mod)) { + ctrl = true; + } else if (/^s(hift)?$/i.test(mod)) { + shift = true; + } else { + throw new Error("Unrecognized modifier name: " + mod); + } + } + if (alt) { + name = "Alt-" + name; + } + if (ctrl) { + name = "Ctrl-" + name; + } + if (cmd) { + name = "Cmd-" + name; + } + if (shift) { + name = "Shift-" + name; + } + return name; + } + + // This is a kludge to keep keymaps mostly working as raw objects + // (backwards compatibility) while at the same time support features + // like normalization and multi-stroke key bindings. It compiles a + // new normalized keymap, and then updates the old object to reflect + // this. + function normalizeKeyMap(keymap) { + var copy = {}; + for (var keyname in keymap) { + if (keymap.hasOwnProperty(keyname)) { + var value = keymap[keyname]; + if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { + continue; + } + if (value == "...") { + delete keymap[keyname]; + continue; + } + var keys = map(keyname.split(" "), normalizeKeyName); + for (var i = 0; i < keys.length; i++) { + var val = void 0, + name = void 0; + if (i == keys.length - 1) { + name = keys.join(" "); + val = value; + } else { + name = keys.slice(0, i + 1).join(" "); + val = "..."; + } + var prev = copy[name]; + if (!prev) { + copy[name] = val; + } else if (prev != val) { + throw new Error("Inconsistent bindings for " + name); + } + } + delete keymap[keyname]; + } + } + for (var prop in copy) { + keymap[prop] = copy[prop]; + } + return keymap; + } + function lookupKey(key, map, handle, context) { + map = getKeyMap(map); + var found = map.call ? map.call(key, context) : map[key]; + if (found === false) { + return "nothing"; + } + if (found === "...") { + return "multi"; + } + if (found != null && handle(found)) { + return "handled"; + } + if (map.fallthrough) { + if (Object.prototype.toString.call(map.fallthrough) != "[object Array]") { + return lookupKey(key, map.fallthrough, handle, context); + } + for (var i = 0; i < map.fallthrough.length; i++) { + var result = lookupKey(key, map.fallthrough[i], handle, context); + if (result) { + return result; + } + } + } + } + + // Modifier key presses don't count as 'real' key presses for the + // purpose of keymap fallthrough. + function isModifierKey(value) { + var name = typeof value == "string" ? value : keyNames[value.keyCode]; + return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"; + } + function addModifierNames(name, event, noShift) { + var base = name; + if (event.altKey && base != "Alt") { + name = "Alt-" + name; + } + if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { + name = "Ctrl-" + name; + } + if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") { + name = "Cmd-" + name; + } + if (!noShift && event.shiftKey && base != "Shift") { + name = "Shift-" + name; + } + return name; + } + + // Look up the name of a key as indicated by an event object. + function keyName(event, noShift) { + if (presto && event.keyCode == 34 && event["char"]) { + return false; + } + var name = keyNames[event.keyCode]; + if (name == null || event.altGraphKey) { + return false; + } + // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause, + // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+) + if (event.keyCode == 3 && event.code) { + name = event.code; + } + return addModifierNames(name, event, noShift); + } + function getKeyMap(val) { + return typeof val == "string" ? keyMap[val] : val; + } + + // Helper for deleting text near the selection(s), used to implement + // backspace, delete, and similar functionality. + function deleteNearSelection(cm, compute) { + var ranges = cm.doc.sel.ranges, + kill = []; + // Build up a set of ranges to kill first, merging overlapping + // ranges. + for (var i = 0; i < ranges.length; i++) { + var toKill = compute(ranges[i]); + while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { + var replaced = kill.pop(); + if (cmp(replaced.from, toKill.from) < 0) { + toKill.from = replaced.from; + break; + } + } + kill.push(toKill); + } + // Next, remove those actual ranges. + runInOp(cm, function () { + for (var i = kill.length - 1; i >= 0; i--) { + replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); + } + ensureCursorVisible(cm); + }); + } + function moveCharLogically(line, ch, dir) { + var target = skipExtendingChars(line.text, ch + dir, dir); + return target < 0 || target > line.text.length ? null : target; + } + function moveLogically(line, start, dir) { + var ch = moveCharLogically(line, start.ch, dir); + return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before"); + } + function endOfLine(visually, cm, lineObj, lineNo, dir) { + if (visually) { + if (cm.doc.direction == "rtl") { + dir = -dir; + } + var order = getOrder(lineObj, cm.doc.direction); + if (order) { + var part = dir < 0 ? lst(order) : order[0]; + var moveInStorageOrder = dir < 0 == (part.level == 1); + var sticky = moveInStorageOrder ? "after" : "before"; + var ch; + // With a wrapped rtl chunk (possibly spanning multiple bidi parts), + // it could be that the last bidi part is not on the last visual line, + // since visual lines contain content order-consecutive chunks. + // Thus, in rtl, we are looking for the first (content-order) character + // in the rtl chunk that is on the last line (that is, the same line + // as the last (content-order) character). + if (part.level > 0 || cm.doc.direction == "rtl") { + var prep = prepareMeasureForLine(cm, lineObj); + ch = dir < 0 ? lineObj.text.length - 1 : 0; + var targetTop = measureCharPrepared(cm, prep, ch).top; + ch = findFirst(function (ch) { + return measureCharPrepared(cm, prep, ch).top == targetTop; + }, dir < 0 == (part.level == 1) ? part.from : part.to - 1, ch); + if (sticky == "before") { + ch = moveCharLogically(lineObj, ch, 1); + } + } else { + ch = dir < 0 ? part.to : part.from; + } + return new Pos(lineNo, ch, sticky); + } + } + return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after"); + } + function moveVisually(cm, line, start, dir) { + var bidi = getOrder(line, cm.doc.direction); + if (!bidi) { + return moveLogically(line, start, dir); + } + if (start.ch >= line.text.length) { + start.ch = line.text.length; + start.sticky = "before"; + } else if (start.ch <= 0) { + start.ch = 0; + start.sticky = "after"; + } + var partPos = getBidiPartAt(bidi, start.ch, start.sticky), + part = bidi[partPos]; + if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) { + // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines, + // nothing interesting happens. + return moveLogically(line, start, dir); + } + var mv = function (pos, dir) { + return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir); + }; + var prep; + var getWrappedLineExtent = function (ch) { + if (!cm.options.lineWrapping) { + return { + begin: 0, + end: line.text.length + }; + } + prep = prep || prepareMeasureForLine(cm, line); + return wrappedLineExtentChar(cm, line, prep, ch); + }; + var wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch); + if (cm.doc.direction == "rtl" || part.level == 1) { + var moveInStorageOrder = part.level == 1 == dir < 0; + var ch = mv(start, moveInStorageOrder ? 1 : -1); + if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) { + // Case 2: We move within an rtl part or in an rtl editor on the same visual line + var sticky = moveInStorageOrder ? "before" : "after"; + return new Pos(start.line, ch, sticky); + } + } + + // Case 3: Could not move within this bidi part in this visual line, so leave + // the current bidi part + + var searchInVisualLine = function (partPos, dir, wrappedLineExtent) { + var getRes = function (ch, moveInStorageOrder) { + return moveInStorageOrder ? new Pos(start.line, mv(ch, 1), "before") : new Pos(start.line, ch, "after"); + }; + for (; partPos >= 0 && partPos < bidi.length; partPos += dir) { + var part = bidi[partPos]; + var moveInStorageOrder = dir > 0 == (part.level != 1); + var ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1); + if (part.from <= ch && ch < part.to) { + return getRes(ch, moveInStorageOrder); + } + ch = moveInStorageOrder ? part.from : mv(part.to, -1); + if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) { + return getRes(ch, moveInStorageOrder); + } + } + }; + + // Case 3a: Look for other bidi parts on the same visual line + var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent); + if (res) { + return res; + } + + // Case 3b: Look for other bidi parts on the next visual line + var nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1); + if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) { + res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh)); + if (res) { + return res; + } + } + + // Case 4: Nowhere to move + return null; + } + + // Commands are parameter-less actions that can be performed on an + // editor, mostly used for keybindings. + var commands = { + selectAll: selectAll, + singleSelection: function (cm) { + return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); + }, + killLine: function (cm) { + return deleteNearSelection(cm, function (range) { + if (range.empty()) { + var len = getLine(cm.doc, range.head.line).text.length; + if (range.head.ch == len && range.head.line < cm.lastLine()) { + return { + from: range.head, + to: Pos(range.head.line + 1, 0) + }; + } else { + return { + from: range.head, + to: Pos(range.head.line, len) + }; + } + } else { + return { + from: range.from(), + to: range.to() + }; + } + }); + }, + deleteLine: function (cm) { + return deleteNearSelection(cm, function (range) { + return { + from: Pos(range.from().line, 0), + to: clipPos(cm.doc, Pos(range.to().line + 1, 0)) + }; + }); + }, + delLineLeft: function (cm) { + return deleteNearSelection(cm, function (range) { + return { + from: Pos(range.from().line, 0), + to: range.from() + }; + }); + }, + delWrappedLineLeft: function (cm) { + return deleteNearSelection(cm, function (range) { + var top = cm.charCoords(range.head, "div").top + 5; + var leftPos = cm.coordsChar({ + left: 0, + top: top + }, "div"); + return { + from: leftPos, + to: range.from() + }; + }); + }, + delWrappedLineRight: function (cm) { + return deleteNearSelection(cm, function (range) { + var top = cm.charCoords(range.head, "div").top + 5; + var rightPos = cm.coordsChar({ + left: cm.display.lineDiv.offsetWidth + 100, + top: top + }, "div"); + return { + from: range.from(), + to: rightPos + }; + }); + }, + undo: function (cm) { + return cm.undo(); + }, + redo: function (cm) { + return cm.redo(); + }, + undoSelection: function (cm) { + return cm.undoSelection(); + }, + redoSelection: function (cm) { + return cm.redoSelection(); + }, + goDocStart: function (cm) { + return cm.extendSelection(Pos(cm.firstLine(), 0)); + }, + goDocEnd: function (cm) { + return cm.extendSelection(Pos(cm.lastLine())); + }, + goLineStart: function (cm) { + return cm.extendSelectionsBy(function (range) { + return lineStart(cm, range.head.line); + }, { + origin: "+move", + bias: 1 + }); + }, + goLineStartSmart: function (cm) { + return cm.extendSelectionsBy(function (range) { + return lineStartSmart(cm, range.head); + }, { + origin: "+move", + bias: 1 + }); + }, + goLineEnd: function (cm) { + return cm.extendSelectionsBy(function (range) { + return lineEnd(cm, range.head.line); + }, { + origin: "+move", + bias: -1 + }); + }, + goLineRight: function (cm) { + return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + return cm.coordsChar({ + left: cm.display.lineDiv.offsetWidth + 100, + top: top + }, "div"); + }, sel_move); + }, + goLineLeft: function (cm) { + return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + return cm.coordsChar({ + left: 0, + top: top + }, "div"); + }, sel_move); + }, + goLineLeftSmart: function (cm) { + return cm.extendSelectionsBy(function (range) { + var top = cm.cursorCoords(range.head, "div").top + 5; + var pos = cm.coordsChar({ + left: 0, + top: top + }, "div"); + if (pos.ch < cm.getLine(pos.line).search(/\S/)) { + return lineStartSmart(cm, range.head); + } + return pos; + }, sel_move); + }, + goLineUp: function (cm) { + return cm.moveV(-1, "line"); + }, + goLineDown: function (cm) { + return cm.moveV(1, "line"); + }, + goPageUp: function (cm) { + return cm.moveV(-1, "page"); + }, + goPageDown: function (cm) { + return cm.moveV(1, "page"); + }, + goCharLeft: function (cm) { + return cm.moveH(-1, "char"); + }, + goCharRight: function (cm) { + return cm.moveH(1, "char"); + }, + goColumnLeft: function (cm) { + return cm.moveH(-1, "column"); + }, + goColumnRight: function (cm) { + return cm.moveH(1, "column"); + }, + goWordLeft: function (cm) { + return cm.moveH(-1, "word"); + }, + goGroupRight: function (cm) { + return cm.moveH(1, "group"); + }, + goGroupLeft: function (cm) { + return cm.moveH(-1, "group"); + }, + goWordRight: function (cm) { + return cm.moveH(1, "word"); + }, + delCharBefore: function (cm) { + return cm.deleteH(-1, "codepoint"); + }, + delCharAfter: function (cm) { + return cm.deleteH(1, "char"); + }, + delWordBefore: function (cm) { + return cm.deleteH(-1, "word"); + }, + delWordAfter: function (cm) { + return cm.deleteH(1, "word"); + }, + delGroupBefore: function (cm) { + return cm.deleteH(-1, "group"); + }, + delGroupAfter: function (cm) { + return cm.deleteH(1, "group"); + }, + indentAuto: function (cm) { + return cm.indentSelection("smart"); + }, + indentMore: function (cm) { + return cm.indentSelection("add"); + }, + indentLess: function (cm) { + return cm.indentSelection("subtract"); + }, + insertTab: function (cm) { + return cm.replaceSelection("\t"); + }, + insertSoftTab: function (cm) { + var spaces = [], + ranges = cm.listSelections(), + tabSize = cm.options.tabSize; + for (var i = 0; i < ranges.length; i++) { + var pos = ranges[i].from(); + var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize); + spaces.push(spaceStr(tabSize - col % tabSize)); + } + cm.replaceSelections(spaces); + }, + defaultTab: function (cm) { + if (cm.somethingSelected()) { + cm.indentSelection("add"); + } else { + cm.execCommand("insertTab"); + } + }, + // Swap the two chars left and right of each selection's head. + // Move cursor behind the two swapped characters afterwards. + // + // Doesn't consider line feeds a character. + // Doesn't scan more than one line above to find a character. + // Doesn't do anything on an empty line. + // Doesn't do anything with non-empty selections. + transposeChars: function (cm) { + return runInOp(cm, function () { + var ranges = cm.listSelections(), + newSel = []; + for (var i = 0; i < ranges.length; i++) { + if (!ranges[i].empty()) { + continue; + } + var cur = ranges[i].head, + line = getLine(cm.doc, cur.line).text; + if (line) { + if (cur.ch == line.length) { + cur = new Pos(cur.line, cur.ch - 1); + } + if (cur.ch > 0) { + cur = new Pos(cur.line, cur.ch + 1); + cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), Pos(cur.line, cur.ch - 2), cur, "+transpose"); + } else if (cur.line > cm.doc.first) { + var prev = getLine(cm.doc, cur.line - 1).text; + if (prev) { + cur = new Pos(cur.line, 1); + cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() + prev.charAt(prev.length - 1), Pos(cur.line - 1, prev.length - 1), cur, "+transpose"); + } + } + } + newSel.push(new Range(cur, cur)); + } + cm.setSelections(newSel); + }); + }, + newlineAndIndent: function (cm) { + return runInOp(cm, function () { + var sels = cm.listSelections(); + for (var i = sels.length - 1; i >= 0; i--) { + cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input"); + } + sels = cm.listSelections(); + for (var i$1 = 0; i$1 < sels.length; i$1++) { + cm.indentLine(sels[i$1].from().line, null, true); + } + ensureCursorVisible(cm); + }); + }, + openLine: function (cm) { + return cm.replaceSelection("\n", "start"); + }, + toggleOverwrite: function (cm) { + return cm.toggleOverwrite(); + } + }; + function lineStart(cm, lineN) { + var line = getLine(cm.doc, lineN); + var visual = visualLine(line); + if (visual != line) { + lineN = lineNo(visual); + } + return endOfLine(true, cm, visual, lineN, 1); + } + function lineEnd(cm, lineN) { + var line = getLine(cm.doc, lineN); + var visual = visualLineEnd(line); + if (visual != line) { + lineN = lineNo(visual); + } + return endOfLine(true, cm, line, lineN, -1); + } + function lineStartSmart(cm, pos) { + var start = lineStart(cm, pos.line); + var line = getLine(cm.doc, start.line); + var order = getOrder(line, cm.doc.direction); + if (!order || order[0].level == 0) { + var firstNonWS = Math.max(start.ch, line.text.search(/\S/)); + var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch; + return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky); + } + return start; + } + + // Run a handler that was bound to a key. + function doHandleBinding(cm, bound, dropShift) { + if (typeof bound == "string") { + bound = commands[bound]; + if (!bound) { + return false; + } + } + // Ensure previous input has been read, so that the handler sees a + // consistent view of the document + cm.display.input.ensurePolled(); + var prevShift = cm.display.shift, + done = false; + try { + if (cm.isReadOnly()) { + cm.state.suppressEdits = true; + } + if (dropShift) { + cm.display.shift = false; + } + done = bound(cm) != Pass; + } finally { + cm.display.shift = prevShift; + cm.state.suppressEdits = false; + } + return done; + } + function lookupKeyForEditor(cm, name, handle) { + for (var i = 0; i < cm.state.keyMaps.length; i++) { + var result = lookupKey(name, cm.state.keyMaps[i], handle, cm); + if (result) { + return result; + } + } + return cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm) || lookupKey(name, cm.options.keyMap, handle, cm); + } + + // Note that, despite the name, this function is also used to check + // for bound mouse clicks. + + var stopSeq = new Delayed(); + function dispatchKey(cm, name, e, handle) { + var seq = cm.state.keySeq; + if (seq) { + if (isModifierKey(name)) { + return "handled"; + } + if (/\'$/.test(name)) { + cm.state.keySeq = null; + } else { + stopSeq.set(50, function () { + if (cm.state.keySeq == seq) { + cm.state.keySeq = null; + cm.display.input.reset(); + } + }); + } + if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { + return true; + } + } + return dispatchKeyInner(cm, name, e, handle); + } + function dispatchKeyInner(cm, name, e, handle) { + var result = lookupKeyForEditor(cm, name, handle); + if (result == "multi") { + cm.state.keySeq = name; + } + if (result == "handled") { + signalLater(cm, "keyHandled", cm, name, e); + } + if (result == "handled" || result == "multi") { + e_preventDefault(e); + restartBlink(cm); + } + return !!result; + } + + // Handle a key from the keydown event. + function handleKeyBinding(cm, e) { + var name = keyName(e, true); + if (!name) { + return false; + } + if (e.shiftKey && !cm.state.keySeq) { + // First try to resolve full name (including 'Shift-'). Failing + // that, see if there is a cursor-motion command (starting with + // 'go') bound to the keyname without 'Shift-'. + return dispatchKey(cm, "Shift-" + name, e, function (b) { + return doHandleBinding(cm, b, true); + }) || dispatchKey(cm, name, e, function (b) { + if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion) { + return doHandleBinding(cm, b); + } + }); + } else { + return dispatchKey(cm, name, e, function (b) { + return doHandleBinding(cm, b); + }); + } + } + + // Handle a key from the keypress event + function handleCharBinding(cm, e, ch) { + return dispatchKey(cm, "'" + ch + "'", e, function (b) { + return doHandleBinding(cm, b, true); + }); + } + var lastStoppedKey = null; + function onKeyDown(e) { + var cm = this; + if (e.target && e.target != cm.display.input.getField()) { + return; + } + cm.curOp.focus = activeElt(); + if (signalDOMEvent(cm, e)) { + return; + } + // IE does strange things with escape. + if (ie && ie_version < 11 && e.keyCode == 27) { + e.returnValue = false; + } + var code = e.keyCode; + cm.display.shift = code == 16 || e.shiftKey; + var handled = handleKeyBinding(cm, e); + if (presto) { + lastStoppedKey = handled ? code : null; + // Opera has no cut event... we try to at least catch the key combo + if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)) { + cm.replaceSelection("", null, "cut"); + } + } + if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand) { + document.execCommand("cut"); + } + + // Turn mouse into crosshair when Alt is held on Mac. + if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className)) { + showCrossHair(cm); + } + } + function showCrossHair(cm) { + var lineDiv = cm.display.lineDiv; + addClass(lineDiv, "CodeMirror-crosshair"); + function up(e) { + if (e.keyCode == 18 || !e.altKey) { + rmClass(lineDiv, "CodeMirror-crosshair"); + off(document, "keyup", up); + off(document, "mouseover", up); + } + } + on(document, "keyup", up); + on(document, "mouseover", up); + } + function onKeyUp(e) { + if (e.keyCode == 16) { + this.doc.sel.shift = false; + } + signalDOMEvent(this, e); + } + function onKeyPress(e) { + var cm = this; + if (e.target && e.target != cm.display.input.getField()) { + return; + } + if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { + return; + } + var keyCode = e.keyCode, + charCode = e.charCode; + if (presto && keyCode == lastStoppedKey) { + lastStoppedKey = null; + e_preventDefault(e); + return; + } + if (presto && (!e.which || e.which < 10) && handleKeyBinding(cm, e)) { + return; + } + var ch = String.fromCharCode(charCode == null ? keyCode : charCode); + // Some browsers fire keypress events for backspace + if (ch == "\x08") { + return; + } + if (handleCharBinding(cm, e, ch)) { + return; + } + cm.display.input.onKeyPress(e); + } + var DOUBLECLICK_DELAY = 400; + var PastClick = function (time, pos, button) { + this.time = time; + this.pos = pos; + this.button = button; + }; + PastClick.prototype.compare = function (time, pos, button) { + return this.time + DOUBLECLICK_DELAY > time && cmp(pos, this.pos) == 0 && button == this.button; + }; + var lastClick, lastDoubleClick; + function clickRepeat(pos, button) { + var now = +new Date(); + if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) { + lastClick = lastDoubleClick = null; + return "triple"; + } else if (lastClick && lastClick.compare(now, pos, button)) { + lastDoubleClick = new PastClick(now, pos, button); + lastClick = null; + return "double"; + } else { + lastClick = new PastClick(now, pos, button); + lastDoubleClick = null; + return "single"; + } + } + + // A mouse down can be a single click, double click, triple click, + // start of selection drag, start of text drag, new cursor + // (ctrl-click), rectangle drag (alt-drag), or xwin + // middle-click-paste. Or it might be a click on something we should + // not interfere with, such as a scrollbar or widget. + function onMouseDown(e) { + var cm = this, + display = cm.display; + if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { + return; + } + display.input.ensurePolled(); + display.shift = e.shiftKey; + if (eventInWidget(display, e)) { + if (!webkit) { + // Briefly turn off draggability, to allow widgets to do + // normal dragging things. + display.scroller.draggable = false; + setTimeout(function () { + return display.scroller.draggable = true; + }, 100); + } + return; + } + if (clickInGutter(cm, e)) { + return; + } + var pos = posFromMouse(cm, e), + button = e_button(e), + repeat = pos ? clickRepeat(pos, button) : "single"; + window.focus(); + + // #3261: make sure, that we're not starting a second selection + if (button == 1 && cm.state.selectingText) { + cm.state.selectingText(e); + } + if (pos && handleMappedButton(cm, button, pos, repeat, e)) { + return; + } + if (button == 1) { + if (pos) { + leftButtonDown(cm, pos, repeat, e); + } else if (e_target(e) == display.scroller) { + e_preventDefault(e); + } + } else if (button == 2) { + if (pos) { + extendSelection(cm.doc, pos); + } + setTimeout(function () { + return display.input.focus(); + }, 20); + } else if (button == 3) { + if (captureRightClick) { + cm.display.input.onContextMenu(e); + } else { + delayBlurEvent(cm); + } + } + } + function handleMappedButton(cm, button, pos, repeat, event) { + var name = "Click"; + if (repeat == "double") { + name = "Double" + name; + } else if (repeat == "triple") { + name = "Triple" + name; + } + name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name; + return dispatchKey(cm, addModifierNames(name, event), event, function (bound) { + if (typeof bound == "string") { + bound = commands[bound]; + } + if (!bound) { + return false; + } + var done = false; + try { + if (cm.isReadOnly()) { + cm.state.suppressEdits = true; + } + done = bound(cm, pos) != Pass; + } finally { + cm.state.suppressEdits = false; + } + return done; + }); + } + function configureMouse(cm, repeat, event) { + var option = cm.getOption("configureMouse"); + var value = option ? option(cm, repeat, event) : {}; + if (value.unit == null) { + var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey; + value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line"; + } + if (value.extend == null || cm.doc.extend) { + value.extend = cm.doc.extend || event.shiftKey; + } + if (value.addNew == null) { + value.addNew = mac ? event.metaKey : event.ctrlKey; + } + if (value.moveOnDrag == null) { + value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); + } + return value; + } + function leftButtonDown(cm, pos, repeat, event) { + if (ie) { + setTimeout(bind(ensureFocus, cm), 0); + } else { + cm.curOp.focus = activeElt(); + } + var behavior = configureMouse(cm, repeat, event); + var sel = cm.doc.sel, + contained; + if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() && repeat == "single" && (contained = sel.contains(pos)) > -1 && (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) && (cmp(contained.to(), pos) > 0 || pos.xRel < 0)) { + leftButtonStartDrag(cm, event, pos, behavior); + } else { + leftButtonSelect(cm, event, pos, behavior); + } + } + + // Start a text drag. When it ends, see if any dragging actually + // happen, and treat as a click if it didn't. + function leftButtonStartDrag(cm, event, pos, behavior) { + var display = cm.display, + moved = false; + var dragEnd = operation(cm, function (e) { + if (webkit) { + display.scroller.draggable = false; + } + cm.state.draggingText = false; + if (cm.state.delayingBlurEvent) { + if (cm.hasFocus()) { + cm.state.delayingBlurEvent = false; + } else { + delayBlurEvent(cm); + } + } + off(display.wrapper.ownerDocument, "mouseup", dragEnd); + off(display.wrapper.ownerDocument, "mousemove", mouseMove); + off(display.scroller, "dragstart", dragStart); + off(display.scroller, "drop", dragEnd); + if (!moved) { + e_preventDefault(e); + if (!behavior.addNew) { + extendSelection(cm.doc, pos, null, null, behavior.extend); + } + // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081) + if (webkit && !safari || ie && ie_version == 9) { + setTimeout(function () { + display.wrapper.ownerDocument.body.focus({ + preventScroll: true + }); + display.input.focus(); + }, 20); + } else { + display.input.focus(); + } + } + }); + var mouseMove = function (e2) { + moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10; + }; + var dragStart = function () { + return moved = true; + }; + // Let the drag handler handle this. + if (webkit) { + display.scroller.draggable = true; + } + cm.state.draggingText = dragEnd; + dragEnd.copy = !behavior.moveOnDrag; + on(display.wrapper.ownerDocument, "mouseup", dragEnd); + on(display.wrapper.ownerDocument, "mousemove", mouseMove); + on(display.scroller, "dragstart", dragStart); + on(display.scroller, "drop", dragEnd); + cm.state.delayingBlurEvent = true; + setTimeout(function () { + return display.input.focus(); + }, 20); + // IE's approach to draggable + if (display.scroller.dragDrop) { + display.scroller.dragDrop(); + } + } + function rangeForUnit(cm, pos, unit) { + if (unit == "char") { + return new Range(pos, pos); + } + if (unit == "word") { + return cm.findWordAt(pos); + } + if (unit == "line") { + return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); + } + var result = unit(cm, pos); + return new Range(result.from, result.to); + } + + // Normal selection, as opposed to text dragging. + function leftButtonSelect(cm, event, start, behavior) { + if (ie) { + delayBlurEvent(cm); + } + var display = cm.display, + doc = cm.doc; + e_preventDefault(event); + var ourRange, + ourIndex, + startSel = doc.sel, + ranges = startSel.ranges; + if (behavior.addNew && !behavior.extend) { + ourIndex = doc.sel.contains(start); + if (ourIndex > -1) { + ourRange = ranges[ourIndex]; + } else { + ourRange = new Range(start, start); + } + } else { + ourRange = doc.sel.primary(); + ourIndex = doc.sel.primIndex; + } + if (behavior.unit == "rectangle") { + if (!behavior.addNew) { + ourRange = new Range(start, start); + } + start = posFromMouse(cm, event, true, true); + ourIndex = -1; + } else { + var range = rangeForUnit(cm, start, behavior.unit); + if (behavior.extend) { + ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend); + } else { + ourRange = range; + } + } + if (!behavior.addNew) { + ourIndex = 0; + setSelection(doc, new Selection([ourRange], 0), sel_mouse); + startSel = doc.sel; + } else if (ourIndex == -1) { + ourIndex = ranges.length; + setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex), { + scroll: false, + origin: "*mouse" + }); + } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) { + setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0), { + scroll: false, + origin: "*mouse" + }); + startSel = doc.sel; + } else { + replaceOneSelection(doc, ourIndex, ourRange, sel_mouse); + } + var lastPos = start; + function extendTo(pos) { + if (cmp(lastPos, pos) == 0) { + return; + } + lastPos = pos; + if (behavior.unit == "rectangle") { + var ranges = [], + tabSize = cm.options.tabSize; + var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize); + var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize); + var left = Math.min(startCol, posCol), + right = Math.max(startCol, posCol); + for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); line <= end; line++) { + var text = getLine(doc, line).text, + leftPos = findColumn(text, left, tabSize); + if (left == right) { + ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); + } else if (text.length > leftPos) { + ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); + } + } + if (!ranges.length) { + ranges.push(new Range(start, start)); + } + setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), { + origin: "*mouse", + scroll: false + }); + cm.scrollIntoView(pos); + } else { + var oldRange = ourRange; + var range = rangeForUnit(cm, pos, behavior.unit); + var anchor = oldRange.anchor, + head; + if (cmp(range.anchor, anchor) > 0) { + head = range.head; + anchor = minPos(oldRange.from(), range.anchor); + } else { + head = range.anchor; + anchor = maxPos(oldRange.to(), range.head); + } + var ranges$1 = startSel.ranges.slice(0); + ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head)); + setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse); + } + } + var editorSize = display.wrapper.getBoundingClientRect(); + // Used to ensure timeout re-tries don't fire when another extend + // happened in the meantime (clearTimeout isn't reliable -- at + // least on Chrome, the timeouts still happen even when cleared, + // if the clear happens after their scheduled firing time). + var counter = 0; + function extend(e) { + var curCount = ++counter; + var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle"); + if (!cur) { + return; + } + if (cmp(cur, lastPos) != 0) { + cm.curOp.focus = activeElt(); + extendTo(cur); + var visible = visibleLines(display, doc); + if (cur.line >= visible.to || cur.line < visible.from) { + setTimeout(operation(cm, function () { + if (counter == curCount) { + extend(e); + } + }), 150); + } + } else { + var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0; + if (outside) { + setTimeout(operation(cm, function () { + if (counter != curCount) { + return; + } + display.scroller.scrollTop += outside; + extend(e); + }), 50); + } + } + } + function done(e) { + cm.state.selectingText = false; + counter = Infinity; + // If e is null or undefined we interpret this as someone trying + // to explicitly cancel the selection rather than the user + // letting go of the mouse button. + if (e) { + e_preventDefault(e); + display.input.focus(); + } + off(display.wrapper.ownerDocument, "mousemove", move); + off(display.wrapper.ownerDocument, "mouseup", up); + doc.history.lastSelOrigin = null; + } + var move = operation(cm, function (e) { + if (e.buttons === 0 || !e_button(e)) { + done(e); + } else { + extend(e); + } + }); + var up = operation(cm, done); + cm.state.selectingText = up; + on(display.wrapper.ownerDocument, "mousemove", move); + on(display.wrapper.ownerDocument, "mouseup", up); + } + + // Used when mouse-selecting to adjust the anchor to the proper side + // of a bidi jump depending on the visual position of the head. + function bidiSimplify(cm, range) { + var anchor = range.anchor; + var head = range.head; + var anchorLine = getLine(cm.doc, anchor.line); + if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { + return range; + } + var order = getOrder(anchorLine); + if (!order) { + return range; + } + var index = getBidiPartAt(order, anchor.ch, anchor.sticky), + part = order[index]; + if (part.from != anchor.ch && part.to != anchor.ch) { + return range; + } + var boundary = index + (part.from == anchor.ch == (part.level != 1) ? 0 : 1); + if (boundary == 0 || boundary == order.length) { + return range; + } + + // Compute the relative visual position of the head compared to the + // anchor (<0 is to the left, >0 to the right) + var leftSide; + if (head.line != anchor.line) { + leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0; + } else { + var headIndex = getBidiPartAt(order, head.ch, head.sticky); + var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1); + if (headIndex == boundary - 1 || headIndex == boundary) { + leftSide = dir < 0; + } else { + leftSide = dir > 0; + } + } + var usePart = order[boundary + (leftSide ? -1 : 0)]; + var from = leftSide == (usePart.level == 1); + var ch = from ? usePart.from : usePart.to, + sticky = from ? "after" : "before"; + return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head); + } + + // Determines whether an event happened in the gutter, and fires the + // handlers for the corresponding event. + function gutterEvent(cm, e, type, prevent) { + var mX, mY; + if (e.touches) { + mX = e.touches[0].clientX; + mY = e.touches[0].clientY; + } else { + try { + mX = e.clientX; + mY = e.clientY; + } catch (e$1) { + return false; + } + } + if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { + return false; + } + if (prevent) { + e_preventDefault(e); + } + var display = cm.display; + var lineBox = display.lineDiv.getBoundingClientRect(); + if (mY > lineBox.bottom || !hasHandler(cm, type)) { + return e_defaultPrevented(e); + } + mY -= lineBox.top - display.viewOffset; + for (var i = 0; i < cm.display.gutterSpecs.length; ++i) { + var g = display.gutters.childNodes[i]; + if (g && g.getBoundingClientRect().right >= mX) { + var line = lineAtHeight(cm.doc, mY); + var gutter = cm.display.gutterSpecs[i]; + signal(cm, type, cm, line, gutter.className, e); + return e_defaultPrevented(e); + } + } + } + function clickInGutter(cm, e) { + return gutterEvent(cm, e, "gutterClick", true); + } + + // CONTEXT MENU HANDLING + + // To make the context menu work, we need to briefly unhide the + // textarea (making it as unobtrusive as possible) to let the + // right-click take effect on it. + function onContextMenu(cm, e) { + if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { + return; + } + if (signalDOMEvent(cm, e, "contextmenu")) { + return; + } + if (!captureRightClick) { + cm.display.input.onContextMenu(e); + } + } + function contextMenuInGutter(cm, e) { + if (!hasHandler(cm, "gutterContextMenu")) { + return false; + } + return gutterEvent(cm, e, "gutterContextMenu", false); + } + function themeChanged(cm) { + cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") + cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-"); + clearCaches(cm); + } + var Init = { + toString: function () { + return "CodeMirror.Init"; + } + }; + var defaults = {}; + var optionHandlers = {}; + function defineOptions(CodeMirror) { + var optionHandlers = CodeMirror.optionHandlers; + function option(name, deflt, handle, notOnInit) { + CodeMirror.defaults[name] = deflt; + if (handle) { + optionHandlers[name] = notOnInit ? function (cm, val, old) { + if (old != Init) { + handle(cm, val, old); + } + } : handle; + } + } + CodeMirror.defineOption = option; + + // Passed to option handlers when there is no old value. + CodeMirror.Init = Init; + + // These two are, on init, called from the constructor because they + // have to be initialized before the editor can start at all. + option("value", "", function (cm, val) { + return cm.setValue(val); + }, true); + option("mode", null, function (cm, val) { + cm.doc.modeOption = val; + loadMode(cm); + }, true); + option("indentUnit", 2, loadMode, true); + option("indentWithTabs", false); + option("smartIndent", true); + option("tabSize", 4, function (cm) { + resetModeState(cm); + clearCaches(cm); + regChange(cm); + }, true); + option("lineSeparator", null, function (cm, val) { + cm.doc.lineSep = val; + if (!val) { + return; + } + var newBreaks = [], + lineNo = cm.doc.first; + cm.doc.iter(function (line) { + for (var pos = 0;;) { + var found = line.text.indexOf(val, pos); + if (found == -1) { + break; + } + pos = found + val.length; + newBreaks.push(Pos(lineNo, found)); + } + lineNo++; + }); + for (var i = newBreaks.length - 1; i >= 0; i--) { + replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); + } + }); + option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { + cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); + if (old != Init) { + cm.refresh(); + } + }); + option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { + return cm.refresh(); + }, true); + option("electricChars", true); + option("inputStyle", mobile ? "contenteditable" : "textarea", function () { + throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME + }, true); + option("spellcheck", false, function (cm, val) { + return cm.getInputField().spellcheck = val; + }, true); + option("autocorrect", false, function (cm, val) { + return cm.getInputField().autocorrect = val; + }, true); + option("autocapitalize", false, function (cm, val) { + return cm.getInputField().autocapitalize = val; + }, true); + option("rtlMoveVisually", !windows); + option("wholeLineUpdateBefore", true); + option("theme", "default", function (cm) { + themeChanged(cm); + updateGutters(cm); + }, true); + option("keyMap", "default", function (cm, val, old) { + var next = getKeyMap(val); + var prev = old != Init && getKeyMap(old); + if (prev && prev.detach) { + prev.detach(cm, next); + } + if (next.attach) { + next.attach(cm, prev || null); + } + }); + option("extraKeys", null); + option("configureMouse", null); + option("lineWrapping", false, wrappingChanged, true); + option("gutters", [], function (cm, val) { + cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers); + updateGutters(cm); + }, true); + option("fixedGutter", true, function (cm, val) { + cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"; + cm.refresh(); + }, true); + option("coverGutterNextToScrollbar", false, function (cm) { + return updateScrollbars(cm); + }, true); + option("scrollbarStyle", "native", function (cm) { + initScrollbars(cm); + updateScrollbars(cm); + cm.display.scrollbars.setScrollTop(cm.doc.scrollTop); + cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft); + }, true); + option("lineNumbers", false, function (cm, val) { + cm.display.gutterSpecs = getGutters(cm.options.gutters, val); + updateGutters(cm); + }, true); + option("firstLineNumber", 1, updateGutters, true); + option("lineNumberFormatter", function (integer) { + return integer; + }, updateGutters, true); + option("showCursorWhenSelecting", false, updateSelection, true); + option("resetSelectionOnContextMenu", true); + option("lineWiseCopyCut", true); + option("pasteLinesPerSelection", true); + option("selectionsMayTouch", false); + option("readOnly", false, function (cm, val) { + if (val == "nocursor") { + onBlur(cm); + cm.display.input.blur(); + } + cm.display.input.readOnlyChanged(val); + }); + option("screenReaderLabel", null, function (cm, val) { + val = val === '' ? null : val; + cm.display.input.screenReaderLabelChanged(val); + }); + option("disableInput", false, function (cm, val) { + if (!val) { + cm.display.input.reset(); + } + }, true); + option("dragDrop", true, dragDropChanged); + option("allowDropFileTypes", null); + option("cursorBlinkRate", 530); + option("cursorScrollMargin", 0); + option("cursorHeight", 1, updateSelection, true); + option("singleCursorHeightPerLine", true, updateSelection, true); + option("workTime", 100); + option("workDelay", 100); + option("flattenSpans", true, resetModeState, true); + option("addModeClass", false, resetModeState, true); + option("pollInterval", 100); + option("undoDepth", 200, function (cm, val) { + return cm.doc.history.undoDepth = val; + }); + option("historyEventDelay", 1250); + option("viewportMargin", 10, function (cm) { + return cm.refresh(); + }, true); + option("maxHighlightLength", 10000, resetModeState, true); + option("moveInputWithCursor", true, function (cm, val) { + if (!val) { + cm.display.input.resetPosition(); + } + }); + option("tabindex", null, function (cm, val) { + return cm.display.input.getField().tabIndex = val || ""; + }); + option("autofocus", null); + option("direction", "ltr", function (cm, val) { + return cm.doc.setDirection(val); + }, true); + option("phrases", null); + } + function dragDropChanged(cm, value, old) { + var wasOn = old && old != Init; + if (!value != !wasOn) { + var funcs = cm.display.dragFunctions; + var toggle = value ? on : off; + toggle(cm.display.scroller, "dragstart", funcs.start); + toggle(cm.display.scroller, "dragenter", funcs.enter); + toggle(cm.display.scroller, "dragover", funcs.over); + toggle(cm.display.scroller, "dragleave", funcs.leave); + toggle(cm.display.scroller, "drop", funcs.drop); + } + } + function wrappingChanged(cm) { + if (cm.options.lineWrapping) { + addClass(cm.display.wrapper, "CodeMirror-wrap"); + cm.display.sizer.style.minWidth = ""; + cm.display.sizerWidth = null; + } else { + rmClass(cm.display.wrapper, "CodeMirror-wrap"); + findMaxLine(cm); + } + estimateLineHeights(cm); + regChange(cm); + clearCaches(cm); + setTimeout(function () { + return updateScrollbars(cm); + }, 100); + } + + // A CodeMirror instance represents an editor. This is the object + // that user code is usually dealing with. + + function CodeMirror(place, options) { + var this$1 = this; + if (!(this instanceof CodeMirror)) { + return new CodeMirror(place, options); + } + this.options = options = options ? copyObj(options) : {}; + // Determine effective options based on given values and defaults. + copyObj(defaults, options, false); + var doc = options.value; + if (typeof doc == "string") { + doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); + } else if (options.mode) { + doc.modeOption = options.mode; + } + this.doc = doc; + var input = new CodeMirror.inputStyles[options.inputStyle](this); + var display = this.display = new Display(place, doc, input, options); + display.wrapper.CodeMirror = this; + themeChanged(this); + if (options.lineWrapping) { + this.display.wrapper.className += " CodeMirror-wrap"; + } + initScrollbars(this); + this.state = { + keyMaps: [], + // stores maps added by addKeyMap + overlays: [], + // highlighting overlays, as added by addOverlay + modeGen: 0, + // bumped when mode/overlay changes, used to invalidate highlighting info + overwrite: false, + delayingBlurEvent: false, + focused: false, + suppressEdits: false, + // used to disable editing during key handlers when in readOnly mode + pasteIncoming: -1, + cutIncoming: -1, + // help recognize paste/cut edits in input.poll + selectingText: false, + draggingText: false, + highlight: new Delayed(), + // stores highlight worker timeout + keySeq: null, + // Unfinished key sequence + specialChars: null + }; + if (options.autofocus && !mobile) { + display.input.focus(); + } + + // Override magic textarea content restore that IE sometimes does + // on our hidden textarea on reload + if (ie && ie_version < 11) { + setTimeout(function () { + return this$1.display.input.reset(true); + }, 20); + } + registerEventHandlers(this); + ensureGlobalHandlers(); + startOperation(this); + this.curOp.forceUpdate = true; + attachDoc(this, doc); + if (options.autofocus && !mobile || this.hasFocus()) { + setTimeout(function () { + if (this$1.hasFocus() && !this$1.state.focused) { + onFocus(this$1); + } + }, 20); + } else { + onBlur(this); + } + for (var opt in optionHandlers) { + if (optionHandlers.hasOwnProperty(opt)) { + optionHandlers[opt](this, options[opt], Init); + } + } + maybeUpdateLineNumberWidth(this); + if (options.finishInit) { + options.finishInit(this); + } + for (var i = 0; i < initHooks.length; ++i) { + initHooks[i](this); + } + endOperation(this); + // Suppress optimizelegibility in Webkit, since it breaks text + // measuring on line wrapping boundaries. + if (webkit && options.lineWrapping && getComputedStyle(display.lineDiv).textRendering == "optimizelegibility") { + display.lineDiv.style.textRendering = "auto"; + } + } + + // The default configuration options. + CodeMirror.defaults = defaults; + // Functions to run when options are changed. + CodeMirror.optionHandlers = optionHandlers; + + // Attach the necessary event handlers when initializing the editor + function registerEventHandlers(cm) { + var d = cm.display; + on(d.scroller, "mousedown", operation(cm, onMouseDown)); + // Older IE's will not fire a second mousedown for a double click + if (ie && ie_version < 11) { + on(d.scroller, "dblclick", operation(cm, function (e) { + if (signalDOMEvent(cm, e)) { + return; + } + var pos = posFromMouse(cm, e); + if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { + return; + } + e_preventDefault(e); + var word = cm.findWordAt(pos); + extendSelection(cm.doc, word.anchor, word.head); + })); + } else { + on(d.scroller, "dblclick", function (e) { + return signalDOMEvent(cm, e) || e_preventDefault(e); + }); + } + // Some browsers fire contextmenu *after* opening the menu, at + // which point we can't mess with it anymore. Context menu is + // handled in onMouseDown for these browsers. + on(d.scroller, "contextmenu", function (e) { + return onContextMenu(cm, e); + }); + on(d.input.getField(), "contextmenu", function (e) { + if (!d.scroller.contains(e.target)) { + onContextMenu(cm, e); + } + }); + + // Used to suppress mouse event handling when a touch happens + var touchFinished, + prevTouch = { + end: 0 + }; + function finishTouch() { + if (d.activeTouch) { + touchFinished = setTimeout(function () { + return d.activeTouch = null; + }, 1000); + prevTouch = d.activeTouch; + prevTouch.end = +new Date(); + } + } + function isMouseLikeTouchEvent(e) { + if (e.touches.length != 1) { + return false; + } + var touch = e.touches[0]; + return touch.radiusX <= 1 && touch.radiusY <= 1; + } + function farAway(touch, other) { + if (other.left == null) { + return true; + } + var dx = other.left - touch.left, + dy = other.top - touch.top; + return dx * dx + dy * dy > 20 * 20; + } + on(d.scroller, "touchstart", function (e) { + if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) { + d.input.ensurePolled(); + clearTimeout(touchFinished); + var now = +new Date(); + d.activeTouch = { + start: now, + moved: false, + prev: now - prevTouch.end <= 300 ? prevTouch : null + }; + if (e.touches.length == 1) { + d.activeTouch.left = e.touches[0].pageX; + d.activeTouch.top = e.touches[0].pageY; + } + } + }); + on(d.scroller, "touchmove", function () { + if (d.activeTouch) { + d.activeTouch.moved = true; + } + }); + on(d.scroller, "touchend", function (e) { + var touch = d.activeTouch; + if (touch && !eventInWidget(d, e) && touch.left != null && !touch.moved && new Date() - touch.start < 300) { + var pos = cm.coordsChar(d.activeTouch, "page"), + range; + if (!touch.prev || farAway(touch, touch.prev)) + // Single tap + { + range = new Range(pos, pos); + } else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) + // Double tap + { + range = cm.findWordAt(pos); + } else + // Triple tap + { + range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); + } + cm.setSelection(range.anchor, range.head); + cm.focus(); + e_preventDefault(e); + } + finishTouch(); + }); + on(d.scroller, "touchcancel", finishTouch); + + // Sync scrolling between fake scrollbars and real scrollable + // area, ensure viewport is updated when scrolling. + on(d.scroller, "scroll", function () { + if (d.scroller.clientHeight) { + updateScrollTop(cm, d.scroller.scrollTop); + setScrollLeft(cm, d.scroller.scrollLeft, true); + signal(cm, "scroll", cm); + } + }); + + // Listen to wheel events in order to try and update the viewport on time. + on(d.scroller, "mousewheel", function (e) { + return onScrollWheel(cm, e); + }); + on(d.scroller, "DOMMouseScroll", function (e) { + return onScrollWheel(cm, e); + }); + + // Prevent wrapper from ever scrolling + on(d.wrapper, "scroll", function () { + return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; + }); + d.dragFunctions = { + enter: function (e) { + if (!signalDOMEvent(cm, e)) { + e_stop(e); + } + }, + over: function (e) { + if (!signalDOMEvent(cm, e)) { + onDragOver(cm, e); + e_stop(e); + } + }, + start: function (e) { + return onDragStart(cm, e); + }, + drop: operation(cm, onDrop), + leave: function (e) { + if (!signalDOMEvent(cm, e)) { + clearDragCursor(cm); + } + } + }; + var inp = d.input.getField(); + on(inp, "keyup", function (e) { + return onKeyUp.call(cm, e); + }); + on(inp, "keydown", operation(cm, onKeyDown)); + on(inp, "keypress", operation(cm, onKeyPress)); + on(inp, "focus", function (e) { + return onFocus(cm, e); + }); + on(inp, "blur", function (e) { + return onBlur(cm, e); + }); + } + var initHooks = []; + CodeMirror.defineInitHook = function (f) { + return initHooks.push(f); + }; + + // Indent the given line. The how parameter can be "smart", + // "add"/null, "subtract", or "prev". When aggressive is false + // (typically set to true for forced single-line indents), empty + // lines are not indented, and places where the mode returns Pass + // are left alone. + function indentLine(cm, n, how, aggressive) { + var doc = cm.doc, + state; + if (how == null) { + how = "add"; + } + if (how == "smart") { + // Fall back to "prev" when the mode doesn't have an indentation + // method. + if (!doc.mode.indent) { + how = "prev"; + } else { + state = getContextBefore(cm, n).state; + } + } + var tabSize = cm.options.tabSize; + var line = getLine(doc, n), + curSpace = countColumn(line.text, null, tabSize); + if (line.stateAfter) { + line.stateAfter = null; + } + var curSpaceString = line.text.match(/^\s*/)[0], + indentation; + if (!aggressive && !/\S/.test(line.text)) { + indentation = 0; + how = "not"; + } else if (how == "smart") { + indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text); + if (indentation == Pass || indentation > 150) { + if (!aggressive) { + return; + } + how = "prev"; + } + } + if (how == "prev") { + if (n > doc.first) { + indentation = countColumn(getLine(doc, n - 1).text, null, tabSize); + } else { + indentation = 0; + } + } else if (how == "add") { + indentation = curSpace + cm.options.indentUnit; + } else if (how == "subtract") { + indentation = curSpace - cm.options.indentUnit; + } else if (typeof how == "number") { + indentation = curSpace + how; + } + indentation = Math.max(0, indentation); + var indentString = "", + pos = 0; + if (cm.options.indentWithTabs) { + for (var i = Math.floor(indentation / tabSize); i; --i) { + pos += tabSize; + indentString += "\t"; + } + } + if (pos < indentation) { + indentString += spaceStr(indentation - pos); + } + if (indentString != curSpaceString) { + replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input"); + line.stateAfter = null; + return true; + } else { + // Ensure that, if the cursor was in the whitespace at the start + // of the line, it is moved to the end of that space. + for (var i$1 = 0; i$1 < doc.sel.ranges.length; i$1++) { + var range = doc.sel.ranges[i$1]; + if (range.head.line == n && range.head.ch < curSpaceString.length) { + var pos$1 = Pos(n, curSpaceString.length); + replaceOneSelection(doc, i$1, new Range(pos$1, pos$1)); + break; + } + } + } + } + + // This will be set to a {lineWise: bool, text: [string]} object, so + // that, when pasting, we know what kind of selections the copied + // text was made out of. + var lastCopied = null; + function setLastCopied(newLastCopied) { + lastCopied = newLastCopied; + } + function applyTextInput(cm, inserted, deleted, sel, origin) { + var doc = cm.doc; + cm.display.shift = false; + if (!sel) { + sel = doc.sel; + } + var recent = +new Date() - 200; + var paste = origin == "paste" || cm.state.pasteIncoming > recent; + var textLines = splitLinesAuto(inserted), + multiPaste = null; + // When pasting N lines into N selections, insert one line per selection + if (paste && sel.ranges.length > 1) { + if (lastCopied && lastCopied.text.join("\n") == inserted) { + if (sel.ranges.length % lastCopied.text.length == 0) { + multiPaste = []; + for (var i = 0; i < lastCopied.text.length; i++) { + multiPaste.push(doc.splitLines(lastCopied.text[i])); + } + } + } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) { + multiPaste = map(textLines, function (l) { + return [l]; + }); + } + } + var updateInput = cm.curOp.updateInput; + // Normal behavior is to insert the new text into every selection + for (var i$1 = sel.ranges.length - 1; i$1 >= 0; i$1--) { + var range = sel.ranges[i$1]; + var from = range.from(), + to = range.to(); + if (range.empty()) { + if (deleted && deleted > 0) + // Handle deletion + { + from = Pos(from.line, from.ch - deleted); + } else if (cm.state.overwrite && !paste) + // Handle overwrite + { + to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); + } else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n")) { + from = to = Pos(from.line, 0); + } + } + var changeEvent = { + from: from, + to: to, + text: multiPaste ? multiPaste[i$1 % multiPaste.length] : textLines, + origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input") + }; + makeChange(cm.doc, changeEvent); + signalLater(cm, "inputRead", cm, changeEvent); + } + if (inserted && !paste) { + triggerElectric(cm, inserted); + } + ensureCursorVisible(cm); + if (cm.curOp.updateInput < 2) { + cm.curOp.updateInput = updateInput; + } + cm.curOp.typing = true; + cm.state.pasteIncoming = cm.state.cutIncoming = -1; + } + function handlePaste(e, cm) { + var pasted = e.clipboardData && e.clipboardData.getData("Text"); + if (pasted) { + e.preventDefault(); + if (!cm.isReadOnly() && !cm.options.disableInput) { + runInOp(cm, function () { + return applyTextInput(cm, pasted, 0, null, "paste"); + }); + } + return true; + } + } + function triggerElectric(cm, inserted) { + // When an 'electric' character is inserted, immediately trigger a reindent + if (!cm.options.electricChars || !cm.options.smartIndent) { + return; + } + var sel = cm.doc.sel; + for (var i = sel.ranges.length - 1; i >= 0; i--) { + var range = sel.ranges[i]; + if (range.head.ch > 100 || i && sel.ranges[i - 1].head.line == range.head.line) { + continue; + } + var mode = cm.getModeAt(range.head); + var indented = false; + if (mode.electricChars) { + for (var j = 0; j < mode.electricChars.length; j++) { + if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { + indented = indentLine(cm, range.head.line, "smart"); + break; + } + } + } else if (mode.electricInput) { + if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch))) { + indented = indentLine(cm, range.head.line, "smart"); + } + } + if (indented) { + signalLater(cm, "electricInput", cm, range.head.line); + } + } + } + function copyableRanges(cm) { + var text = [], + ranges = []; + for (var i = 0; i < cm.doc.sel.ranges.length; i++) { + var line = cm.doc.sel.ranges[i].head.line; + var lineRange = { + anchor: Pos(line, 0), + head: Pos(line + 1, 0) + }; + ranges.push(lineRange); + text.push(cm.getRange(lineRange.anchor, lineRange.head)); + } + return { + text: text, + ranges: ranges + }; + } + function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) { + field.setAttribute("autocorrect", autocorrect ? "" : "off"); + field.setAttribute("autocapitalize", autocapitalize ? "" : "off"); + field.setAttribute("spellcheck", !!spellcheck); + } + function hiddenTextarea() { + var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none"); + var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;"); + // The textarea is kept positioned near the cursor to prevent the + // fact that it'll be scrolled into view on input from scrolling + // our fake cursor out of view. On webkit, when wrap=off, paste is + // very slow. So make the area wide instead. + if (webkit) { + te.style.width = "1000px"; + } else { + te.setAttribute("wrap", "off"); + } + // If border: 0; -- iOS fails to open keyboard (issue #1287) + if (ios) { + te.style.border = "1px solid black"; + } + disableBrowserMagic(te); + return div; + } + + // The publicly visible API. Note that methodOp(f) means + // 'wrap f in an operation, performed on its `this` parameter'. + + // This is not the complete set of editor methods. Most of the + // methods defined on the Doc type are also injected into + // CodeMirror.prototype, for backwards compatibility and + // convenience. + + function addEditorMethods(CodeMirror) { + var optionHandlers = CodeMirror.optionHandlers; + var helpers = CodeMirror.helpers = {}; + CodeMirror.prototype = { + constructor: CodeMirror, + focus: function () { + window.focus(); + this.display.input.focus(); + }, + setOption: function (option, value) { + var options = this.options, + old = options[option]; + if (options[option] == value && option != "mode") { + return; + } + options[option] = value; + if (optionHandlers.hasOwnProperty(option)) { + operation(this, optionHandlers[option])(this, value, old); + } + signal(this, "optionChange", this, option); + }, + getOption: function (option) { + return this.options[option]; + }, + getDoc: function () { + return this.doc; + }, + addKeyMap: function (map, bottom) { + this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map)); + }, + removeKeyMap: function (map) { + var maps = this.state.keyMaps; + for (var i = 0; i < maps.length; ++i) { + if (maps[i] == map || maps[i].name == map) { + maps.splice(i, 1); + return true; + } + } + }, + addOverlay: methodOp(function (spec, options) { + var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec); + if (mode.startState) { + throw new Error("Overlays may not be stateful."); + } + insertSorted(this.state.overlays, { + mode: mode, + modeSpec: spec, + opaque: options && options.opaque, + priority: options && options.priority || 0 + }, function (overlay) { + return overlay.priority; + }); + this.state.modeGen++; + regChange(this); + }), + removeOverlay: methodOp(function (spec) { + var overlays = this.state.overlays; + for (var i = 0; i < overlays.length; ++i) { + var cur = overlays[i].modeSpec; + if (cur == spec || typeof spec == "string" && cur.name == spec) { + overlays.splice(i, 1); + this.state.modeGen++; + regChange(this); + return; + } + } + }), + indentLine: methodOp(function (n, dir, aggressive) { + if (typeof dir != "string" && typeof dir != "number") { + if (dir == null) { + dir = this.options.smartIndent ? "smart" : "prev"; + } else { + dir = dir ? "add" : "subtract"; + } + } + if (isLine(this.doc, n)) { + indentLine(this, n, dir, aggressive); + } + }), + indentSelection: methodOp(function (how) { + var ranges = this.doc.sel.ranges, + end = -1; + for (var i = 0; i < ranges.length; i++) { + var range = ranges[i]; + if (!range.empty()) { + var from = range.from(), + to = range.to(); + var start = Math.max(end, from.line); + end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1; + for (var j = start; j < end; ++j) { + indentLine(this, j, how); + } + var newRanges = this.doc.sel.ranges; + if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0) { + replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); + } + } else if (range.head.line > end) { + indentLine(this, range.head.line, how, true); + end = range.head.line; + if (i == this.doc.sel.primIndex) { + ensureCursorVisible(this); + } + } + } + }), + // Fetch the parser token for a given character. Useful for hacks + // that want to inspect the mode state (say, for completion). + getTokenAt: function (pos, precise) { + return takeToken(this, pos, precise); + }, + getLineTokens: function (line, precise) { + return takeToken(this, Pos(line), precise, true); + }, + getTokenTypeAt: function (pos) { + pos = clipPos(this.doc, pos); + var styles = getLineStyles(this, getLine(this.doc, pos.line)); + var before = 0, + after = (styles.length - 1) / 2, + ch = pos.ch; + var type; + if (ch == 0) { + type = styles[2]; + } else { + for (;;) { + var mid = before + after >> 1; + if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { + after = mid; + } else if (styles[mid * 2 + 1] < ch) { + before = mid + 1; + } else { + type = styles[mid * 2 + 2]; + break; + } + } + } + var cut = type ? type.indexOf("overlay ") : -1; + return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1); + }, + getModeAt: function (pos) { + var mode = this.doc.mode; + if (!mode.innerMode) { + return mode; + } + return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode; + }, + getHelper: function (pos, type) { + return this.getHelpers(pos, type)[0]; + }, + getHelpers: function (pos, type) { + var found = []; + if (!helpers.hasOwnProperty(type)) { + return found; + } + var help = helpers[type], + mode = this.getModeAt(pos); + if (typeof mode[type] == "string") { + if (help[mode[type]]) { + found.push(help[mode[type]]); + } + } else if (mode[type]) { + for (var i = 0; i < mode[type].length; i++) { + var val = help[mode[type][i]]; + if (val) { + found.push(val); + } + } + } else if (mode.helperType && help[mode.helperType]) { + found.push(help[mode.helperType]); + } else if (help[mode.name]) { + found.push(help[mode.name]); + } + for (var i$1 = 0; i$1 < help._global.length; i$1++) { + var cur = help._global[i$1]; + if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) { + found.push(cur.val); + } + } + return found; + }, + getStateAfter: function (line, precise) { + var doc = this.doc; + line = clipLine(doc, line == null ? doc.first + doc.size - 1 : line); + return getContextBefore(this, line + 1, precise).state; + }, + cursorCoords: function (start, mode) { + var pos, + range = this.doc.sel.primary(); + if (start == null) { + pos = range.head; + } else if (typeof start == "object") { + pos = clipPos(this.doc, start); + } else { + pos = start ? range.from() : range.to(); + } + return cursorCoords(this, pos, mode || "page"); + }, + charCoords: function (pos, mode) { + return charCoords(this, clipPos(this.doc, pos), mode || "page"); + }, + coordsChar: function (coords, mode) { + coords = fromCoordSystem(this, coords, mode || "page"); + return coordsChar(this, coords.left, coords.top); + }, + lineAtHeight: function (height, mode) { + height = fromCoordSystem(this, { + top: height, + left: 0 + }, mode || "page").top; + return lineAtHeight(this.doc, height + this.display.viewOffset); + }, + heightAtLine: function (line, mode, includeWidgets) { + var end = false, + lineObj; + if (typeof line == "number") { + var last = this.doc.first + this.doc.size - 1; + if (line < this.doc.first) { + line = this.doc.first; + } else if (line > last) { + line = last; + end = true; + } + lineObj = getLine(this.doc, line); + } else { + lineObj = line; + } + return intoCoordSystem(this, lineObj, { + top: 0, + left: 0 + }, mode || "page", includeWidgets || end).top + (end ? this.doc.height - heightAtLine(lineObj) : 0); + }, + defaultTextHeight: function () { + return textHeight(this.display); + }, + defaultCharWidth: function () { + return charWidth(this.display); + }, + getViewport: function () { + return { + from: this.display.viewFrom, + to: this.display.viewTo + }; + }, + addWidget: function (pos, node, scroll, vert, horiz) { + var display = this.display; + pos = cursorCoords(this, clipPos(this.doc, pos)); + var top = pos.bottom, + left = pos.left; + node.style.position = "absolute"; + node.setAttribute("cm-ignore-events", "true"); + this.display.input.setUneditable(node); + display.sizer.appendChild(node); + if (vert == "over") { + top = pos.top; + } else if (vert == "above" || vert == "near") { + var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), + hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth); + // Default to positioning above (if specified and possible); otherwise default to positioning below + if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) { + top = pos.top - node.offsetHeight; + } else if (pos.bottom + node.offsetHeight <= vspace) { + top = pos.bottom; + } + if (left + node.offsetWidth > hspace) { + left = hspace - node.offsetWidth; + } + } + node.style.top = top + "px"; + node.style.left = node.style.right = ""; + if (horiz == "right") { + left = display.sizer.clientWidth - node.offsetWidth; + node.style.right = "0px"; + } else { + if (horiz == "left") { + left = 0; + } else if (horiz == "middle") { + left = (display.sizer.clientWidth - node.offsetWidth) / 2; + } + node.style.left = left + "px"; + } + if (scroll) { + scrollIntoView(this, { + left: left, + top: top, + right: left + node.offsetWidth, + bottom: top + node.offsetHeight + }); + } + }, + triggerOnKeyDown: methodOp(onKeyDown), + triggerOnKeyPress: methodOp(onKeyPress), + triggerOnKeyUp: onKeyUp, + triggerOnMouseDown: methodOp(onMouseDown), + execCommand: function (cmd) { + if (commands.hasOwnProperty(cmd)) { + return commands[cmd].call(null, this); + } + }, + triggerElectric: methodOp(function (text) { + triggerElectric(this, text); + }), + findPosH: function (from, amount, unit, visually) { + var dir = 1; + if (amount < 0) { + dir = -1; + amount = -amount; + } + var cur = clipPos(this.doc, from); + for (var i = 0; i < amount; ++i) { + cur = findPosH(this.doc, cur, dir, unit, visually); + if (cur.hitSide) { + break; + } + } + return cur; + }, + moveH: methodOp(function (dir, unit) { + var this$1 = this; + this.extendSelectionsBy(function (range) { + if (this$1.display.shift || this$1.doc.extend || range.empty()) { + return findPosH(this$1.doc, range.head, dir, unit, this$1.options.rtlMoveVisually); + } else { + return dir < 0 ? range.from() : range.to(); + } + }, sel_move); + }), + deleteH: methodOp(function (dir, unit) { + var sel = this.doc.sel, + doc = this.doc; + if (sel.somethingSelected()) { + doc.replaceSelection("", null, "+delete"); + } else { + deleteNearSelection(this, function (range) { + var other = findPosH(doc, range.head, dir, unit, false); + return dir < 0 ? { + from: other, + to: range.head + } : { + from: range.head, + to: other + }; + }); + } + }), + findPosV: function (from, amount, unit, goalColumn) { + var dir = 1, + x = goalColumn; + if (amount < 0) { + dir = -1; + amount = -amount; + } + var cur = clipPos(this.doc, from); + for (var i = 0; i < amount; ++i) { + var coords = cursorCoords(this, cur, "div"); + if (x == null) { + x = coords.left; + } else { + coords.left = x; + } + cur = findPosV(this, coords, dir, unit); + if (cur.hitSide) { + break; + } + } + return cur; + }, + moveV: methodOp(function (dir, unit) { + var this$1 = this; + var doc = this.doc, + goals = []; + var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected(); + doc.extendSelectionsBy(function (range) { + if (collapse) { + return dir < 0 ? range.from() : range.to(); + } + var headPos = cursorCoords(this$1, range.head, "div"); + if (range.goalColumn != null) { + headPos.left = range.goalColumn; + } + goals.push(headPos.left); + var pos = findPosV(this$1, headPos, dir, unit); + if (unit == "page" && range == doc.sel.primary()) { + addToScrollTop(this$1, charCoords(this$1, pos, "div").top - headPos.top); + } + return pos; + }, sel_move); + if (goals.length) { + for (var i = 0; i < doc.sel.ranges.length; i++) { + doc.sel.ranges[i].goalColumn = goals[i]; + } + } + }), + // Find the word at the given position (as returned by coordsChar). + findWordAt: function (pos) { + var doc = this.doc, + line = getLine(doc, pos.line).text; + var start = pos.ch, + end = pos.ch; + if (line) { + var helper = this.getHelper(pos, "wordChars"); + if ((pos.sticky == "before" || end == line.length) && start) { + --start; + } else { + ++end; + } + var startChar = line.charAt(start); + var check = isWordChar(startChar, helper) ? function (ch) { + return isWordChar(ch, helper); + } : /\s/.test(startChar) ? function (ch) { + return /\s/.test(ch); + } : function (ch) { + return !/\s/.test(ch) && !isWordChar(ch); + }; + while (start > 0 && check(line.charAt(start - 1))) { + --start; + } + while (end < line.length && check(line.charAt(end))) { + ++end; + } + } + return new Range(Pos(pos.line, start), Pos(pos.line, end)); + }, + toggleOverwrite: function (value) { + if (value != null && value == this.state.overwrite) { + return; + } + if (this.state.overwrite = !this.state.overwrite) { + addClass(this.display.cursorDiv, "CodeMirror-overwrite"); + } else { + rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); + } + signal(this, "overwriteToggle", this, this.state.overwrite); + }, + hasFocus: function () { + return this.display.input.getField() == activeElt(); + }, + isReadOnly: function () { + return !!(this.options.readOnly || this.doc.cantEdit); + }, + scrollTo: methodOp(function (x, y) { + scrollToCoords(this, x, y); + }), + getScrollInfo: function () { + var scroller = this.display.scroller; + return { + left: scroller.scrollLeft, + top: scroller.scrollTop, + height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight, + width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth, + clientHeight: displayHeight(this), + clientWidth: displayWidth(this) + }; + }, + scrollIntoView: methodOp(function (range, margin) { + if (range == null) { + range = { + from: this.doc.sel.primary().head, + to: null + }; + if (margin == null) { + margin = this.options.cursorScrollMargin; + } + } else if (typeof range == "number") { + range = { + from: Pos(range, 0), + to: null + }; + } else if (range.from == null) { + range = { + from: range, + to: null + }; + } + if (!range.to) { + range.to = range.from; + } + range.margin = margin || 0; + if (range.from.line != null) { + scrollToRange(this, range); + } else { + scrollToCoordsRange(this, range.from, range.to, range.margin); + } + }), + setSize: methodOp(function (width, height) { + var this$1 = this; + var interpret = function (val) { + return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; + }; + if (width != null) { + this.display.wrapper.style.width = interpret(width); + } + if (height != null) { + this.display.wrapper.style.height = interpret(height); + } + if (this.options.lineWrapping) { + clearLineMeasurementCache(this); + } + var lineNo = this.display.viewFrom; + this.doc.iter(lineNo, this.display.viewTo, function (line) { + if (line.widgets) { + for (var i = 0; i < line.widgets.length; i++) { + if (line.widgets[i].noHScroll) { + regLineChange(this$1, lineNo, "widget"); + break; + } + } + } + ++lineNo; + }); + this.curOp.forceUpdate = true; + signal(this, "refresh", this); + }), + operation: function (f) { + return runInOp(this, f); + }, + startOperation: function () { + return startOperation(this); + }, + endOperation: function () { + return endOperation(this); + }, + refresh: methodOp(function () { + var oldHeight = this.display.cachedTextHeight; + regChange(this); + this.curOp.forceUpdate = true; + clearCaches(this); + scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop); + updateGutterSpace(this.display); + if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping) { + estimateLineHeights(this); + } + signal(this, "refresh", this); + }), + swapDoc: methodOp(function (doc) { + var old = this.doc; + old.cm = null; + // Cancel the current text selection if any (#5821) + if (this.state.selectingText) { + this.state.selectingText(); + } + attachDoc(this, doc); + clearCaches(this); + this.display.input.reset(); + scrollToCoords(this, doc.scrollLeft, doc.scrollTop); + this.curOp.forceScroll = true; + signalLater(this, "swapDoc", this, old); + return old; + }), + phrase: function (phraseText) { + var phrases = this.options.phrases; + return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText; + }, + getInputField: function () { + return this.display.input.getField(); + }, + getWrapperElement: function () { + return this.display.wrapper; + }, + getScrollerElement: function () { + return this.display.scroller; + }, + getGutterElement: function () { + return this.display.gutters; + } + }; + eventMixin(CodeMirror); + CodeMirror.registerHelper = function (type, name, value) { + if (!helpers.hasOwnProperty(type)) { + helpers[type] = CodeMirror[type] = { + _global: [] + }; + } + helpers[type][name] = value; + }; + CodeMirror.registerGlobalHelper = function (type, name, predicate, value) { + CodeMirror.registerHelper(type, name, value); + helpers[type]._global.push({ + pred: predicate, + val: value + }); + }; + } + + // Used for horizontal relative motion. Dir is -1 or 1 (left or + // right), unit can be "codepoint", "char", "column" (like char, but + // doesn't cross line boundaries), "word" (across next word), or + // "group" (to the start of next group of word or + // non-word-non-whitespace chars). The visually param controls + // whether, in right-to-left text, direction 1 means to move towards + // the next index in the string, or towards the character to the right + // of the current position. The resulting position will have a + // hitSide=true property if it reached the end of the document. + function findPosH(doc, pos, dir, unit, visually) { + var oldPos = pos; + var origDir = dir; + var lineObj = getLine(doc, pos.line); + var lineDir = visually && doc.direction == "rtl" ? -dir : dir; + function findNextLine() { + var l = pos.line + lineDir; + if (l < doc.first || l >= doc.first + doc.size) { + return false; + } + pos = new Pos(l, pos.ch, pos.sticky); + return lineObj = getLine(doc, l); + } + function moveOnce(boundToLine) { + var next; + if (unit == "codepoint") { + var ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1)); + if (isNaN(ch)) { + next = null; + } else { + var astral = dir > 0 ? ch >= 0xD800 && ch < 0xDC00 : ch >= 0xDC00 && ch < 0xDFFF; + next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir); + } + } else if (visually) { + next = moveVisually(doc.cm, lineObj, pos, dir); + } else { + next = moveLogically(lineObj, pos, dir); + } + if (next == null) { + if (!boundToLine && findNextLine()) { + pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); + } else { + return false; + } + } else { + pos = next; + } + return true; + } + if (unit == "char" || unit == "codepoint") { + moveOnce(); + } else if (unit == "column") { + moveOnce(true); + } else if (unit == "word" || unit == "group") { + var sawType = null, + group = unit == "group"; + var helper = doc.cm && doc.cm.getHelper(pos, "wordChars"); + for (var first = true;; first = false) { + if (dir < 0 && !moveOnce(!first)) { + break; + } + var cur = lineObj.text.charAt(pos.ch) || "\n"; + var type = isWordChar(cur, helper) ? "w" : group && cur == "\n" ? "n" : !group || /\s/.test(cur) ? null : "p"; + if (group && !first && !type) { + type = "s"; + } + if (sawType && sawType != type) { + if (dir < 0) { + dir = 1; + moveOnce(); + pos.sticky = "after"; + } + break; + } + if (type) { + sawType = type; + } + if (dir > 0 && !moveOnce(!first)) { + break; + } + } + } + var result = skipAtomic(doc, pos, oldPos, origDir, true); + if (equalCursorPos(oldPos, result)) { + result.hitSide = true; + } + return result; + } + + // For relative vertical movement. Dir may be -1 or 1. Unit can be + // "page" or "line". The resulting position will have a hitSide=true + // property if it reached the end of the document. + function findPosV(cm, pos, dir, unit) { + var doc = cm.doc, + x = pos.left, + y; + if (unit == "page") { + var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight); + var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3); + y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount; + } else if (unit == "line") { + y = dir > 0 ? pos.bottom + 3 : pos.top - 3; + } + var target; + for (;;) { + target = coordsChar(cm, x, y); + if (!target.outside) { + break; + } + if (dir < 0 ? y <= 0 : y >= doc.height) { + target.hitSide = true; + break; + } + y += dir * 5; + } + return target; + } + + // CONTENTEDITABLE INPUT STYLE + + var ContentEditableInput = function (cm) { + this.cm = cm; + this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null; + this.polling = new Delayed(); + this.composing = null; + this.gracePeriod = false; + this.readDOMTimeout = null; + }; + ContentEditableInput.prototype.init = function (display) { + var this$1 = this; + var input = this, + cm = input.cm; + var div = input.div = display.lineDiv; + div.contentEditable = true; + disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize); + function belongsToInput(e) { + for (var t = e.target; t; t = t.parentNode) { + if (t == div) { + return true; + } + if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { + break; + } + } + return false; + } + on(div, "paste", function (e) { + if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { + return; + } + // IE doesn't fire input events, so we schedule a read for the pasted content in this way + if (ie_version <= 11) { + setTimeout(operation(cm, function () { + return this$1.updateFromDOM(); + }), 20); + } + }); + on(div, "compositionstart", function (e) { + this$1.composing = { + data: e.data, + done: false + }; + }); + on(div, "compositionupdate", function (e) { + if (!this$1.composing) { + this$1.composing = { + data: e.data, + done: false + }; + } + }); + on(div, "compositionend", function (e) { + if (this$1.composing) { + if (e.data != this$1.composing.data) { + this$1.readFromDOMSoon(); + } + this$1.composing.done = true; + } + }); + on(div, "touchstart", function () { + return input.forceCompositionEnd(); + }); + on(div, "input", function () { + if (!this$1.composing) { + this$1.readFromDOMSoon(); + } + }); + function onCopyCut(e) { + if (!belongsToInput(e) || signalDOMEvent(cm, e)) { + return; + } + if (cm.somethingSelected()) { + setLastCopied({ + lineWise: false, + text: cm.getSelections() + }); + if (e.type == "cut") { + cm.replaceSelection("", null, "cut"); + } + } else if (!cm.options.lineWiseCopyCut) { + return; + } else { + var ranges = copyableRanges(cm); + setLastCopied({ + lineWise: true, + text: ranges.text + }); + if (e.type == "cut") { + cm.operation(function () { + cm.setSelections(ranges.ranges, 0, sel_dontScroll); + cm.replaceSelection("", null, "cut"); + }); + } + } + if (e.clipboardData) { + e.clipboardData.clearData(); + var content = lastCopied.text.join("\n"); + // iOS exposes the clipboard API, but seems to discard content inserted into it + e.clipboardData.setData("Text", content); + if (e.clipboardData.getData("Text") == content) { + e.preventDefault(); + return; + } + } + // Old-fashioned briefly-focus-a-textarea hack + var kludge = hiddenTextarea(), + te = kludge.firstChild; + cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild); + te.value = lastCopied.text.join("\n"); + var hadFocus = activeElt(); + selectInput(te); + setTimeout(function () { + cm.display.lineSpace.removeChild(kludge); + hadFocus.focus(); + if (hadFocus == div) { + input.showPrimarySelection(); + } + }, 50); + } + on(div, "copy", onCopyCut); + on(div, "cut", onCopyCut); + }; + ContentEditableInput.prototype.screenReaderLabelChanged = function (label) { + // Label for screenreaders, accessibility + if (label) { + this.div.setAttribute('aria-label', label); + } else { + this.div.removeAttribute('aria-label'); + } + }; + ContentEditableInput.prototype.prepareSelection = function () { + var result = prepareSelection(this.cm, false); + result.focus = activeElt() == this.div; + return result; + }; + ContentEditableInput.prototype.showSelection = function (info, takeFocus) { + if (!info || !this.cm.display.view.length) { + return; + } + if (info.focus || takeFocus) { + this.showPrimarySelection(); + } + this.showMultipleSelections(info); + }; + ContentEditableInput.prototype.getSelection = function () { + return this.cm.display.wrapper.ownerDocument.getSelection(); + }; + ContentEditableInput.prototype.showPrimarySelection = function () { + var sel = this.getSelection(), + cm = this.cm, + prim = cm.doc.sel.primary(); + var from = prim.from(), + to = prim.to(); + if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) { + sel.removeAllRanges(); + return; + } + var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); + var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset); + if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad && cmp(minPos(curAnchor, curFocus), from) == 0 && cmp(maxPos(curAnchor, curFocus), to) == 0) { + return; + } + var view = cm.display.view; + var start = from.line >= cm.display.viewFrom && posToDOM(cm, from) || { + node: view[0].measure.map[2], + offset: 0 + }; + var end = to.line < cm.display.viewTo && posToDOM(cm, to); + if (!end) { + var measure = view[view.length - 1].measure; + var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map; + end = { + node: map[map.length - 1], + offset: map[map.length - 2] - map[map.length - 3] + }; + } + if (!start || !end) { + sel.removeAllRanges(); + return; + } + var old = sel.rangeCount && sel.getRangeAt(0), + rng; + try { + rng = range(start.node, start.offset, end.offset, end.node); + } catch (e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible + if (rng) { + if (!gecko && cm.state.focused) { + sel.collapse(start.node, start.offset); + if (!rng.collapsed) { + sel.removeAllRanges(); + sel.addRange(rng); + } + } else { + sel.removeAllRanges(); + sel.addRange(rng); + } + if (old && sel.anchorNode == null) { + sel.addRange(old); + } else if (gecko) { + this.startGracePeriod(); + } + } + this.rememberSelection(); + }; + ContentEditableInput.prototype.startGracePeriod = function () { + var this$1 = this; + clearTimeout(this.gracePeriod); + this.gracePeriod = setTimeout(function () { + this$1.gracePeriod = false; + if (this$1.selectionChanged()) { + this$1.cm.operation(function () { + return this$1.cm.curOp.selectionChanged = true; + }); + } + }, 20); + }; + ContentEditableInput.prototype.showMultipleSelections = function (info) { + removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors); + removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection); + }; + ContentEditableInput.prototype.rememberSelection = function () { + var sel = this.getSelection(); + this.lastAnchorNode = sel.anchorNode; + this.lastAnchorOffset = sel.anchorOffset; + this.lastFocusNode = sel.focusNode; + this.lastFocusOffset = sel.focusOffset; + }; + ContentEditableInput.prototype.selectionInEditor = function () { + var sel = this.getSelection(); + if (!sel.rangeCount) { + return false; + } + var node = sel.getRangeAt(0).commonAncestorContainer; + return contains(this.div, node); + }; + ContentEditableInput.prototype.focus = function () { + if (this.cm.options.readOnly != "nocursor") { + if (!this.selectionInEditor() || activeElt() != this.div) { + this.showSelection(this.prepareSelection(), true); + } + this.div.focus(); + } + }; + ContentEditableInput.prototype.blur = function () { + this.div.blur(); + }; + ContentEditableInput.prototype.getField = function () { + return this.div; + }; + ContentEditableInput.prototype.supportsTouch = function () { + return true; + }; + ContentEditableInput.prototype.receivedFocus = function () { + var this$1 = this; + var input = this; + if (this.selectionInEditor()) { + setTimeout(function () { + return this$1.pollSelection(); + }, 20); + } else { + runInOp(this.cm, function () { + return input.cm.curOp.selectionChanged = true; + }); + } + function poll() { + if (input.cm.state.focused) { + input.pollSelection(); + input.polling.set(input.cm.options.pollInterval, poll); + } + } + this.polling.set(this.cm.options.pollInterval, poll); + }; + ContentEditableInput.prototype.selectionChanged = function () { + var sel = this.getSelection(); + return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset || sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset; + }; + ContentEditableInput.prototype.pollSelection = function () { + if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { + return; + } + var sel = this.getSelection(), + cm = this.cm; + // On Android Chrome (version 56, at least), backspacing into an + // uneditable block element will put the cursor in that element, + // and then, because it's not editable, hide the virtual keyboard. + // Because Android doesn't allow us to actually detect backspace + // presses in a sane way, this code checks for when that happens + // and simulates a backspace press in this case. + if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) { + this.cm.triggerOnKeyDown({ + type: "keydown", + keyCode: 8, + preventDefault: Math.abs + }); + this.blur(); + this.focus(); + return; + } + if (this.composing) { + return; + } + this.rememberSelection(); + var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); + var head = domToPos(cm, sel.focusNode, sel.focusOffset); + if (anchor && head) { + runInOp(cm, function () { + setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll); + if (anchor.bad || head.bad) { + cm.curOp.selectionChanged = true; + } + }); + } + }; + ContentEditableInput.prototype.pollContent = function () { + if (this.readDOMTimeout != null) { + clearTimeout(this.readDOMTimeout); + this.readDOMTimeout = null; + } + var cm = this.cm, + display = cm.display, + sel = cm.doc.sel.primary(); + var from = sel.from(), + to = sel.to(); + if (from.ch == 0 && from.line > cm.firstLine()) { + from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); + } + if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine()) { + to = Pos(to.line + 1, 0); + } + if (from.line < display.viewFrom || to.line > display.viewTo - 1) { + return false; + } + var fromIndex, fromLine, fromNode; + if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { + fromLine = lineNo(display.view[0].line); + fromNode = display.view[0].node; + } else { + fromLine = lineNo(display.view[fromIndex].line); + fromNode = display.view[fromIndex - 1].node.nextSibling; + } + var toIndex = findViewIndex(cm, to.line); + var toLine, toNode; + if (toIndex == display.view.length - 1) { + toLine = display.viewTo - 1; + toNode = display.lineDiv.lastChild; + } else { + toLine = lineNo(display.view[toIndex + 1].line) - 1; + toNode = display.view[toIndex + 1].node.previousSibling; + } + if (!fromNode) { + return false; + } + var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)); + var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)); + while (newText.length > 1 && oldText.length > 1) { + if (lst(newText) == lst(oldText)) { + newText.pop(); + oldText.pop(); + toLine--; + } else if (newText[0] == oldText[0]) { + newText.shift(); + oldText.shift(); + fromLine++; + } else { + break; + } + } + var cutFront = 0, + cutEnd = 0; + var newTop = newText[0], + oldTop = oldText[0], + maxCutFront = Math.min(newTop.length, oldTop.length); + while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront)) { + ++cutFront; + } + var newBot = lst(newText), + oldBot = lst(oldText); + var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), oldBot.length - (oldText.length == 1 ? cutFront : 0)); + while (cutEnd < maxCutEnd && newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) { + ++cutEnd; + } + // Try to move start of change to start of selection if ambiguous + if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) { + while (cutFront && cutFront > from.ch && newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) { + cutFront--; + cutEnd++; + } + } + newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, ""); + newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, ""); + var chFrom = Pos(fromLine, cutFront); + var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0); + if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) { + replaceRange(cm.doc, newText, chFrom, chTo, "+input"); + return true; + } + }; + ContentEditableInput.prototype.ensurePolled = function () { + this.forceCompositionEnd(); + }; + ContentEditableInput.prototype.reset = function () { + this.forceCompositionEnd(); + }; + ContentEditableInput.prototype.forceCompositionEnd = function () { + if (!this.composing) { + return; + } + clearTimeout(this.readDOMTimeout); + this.composing = null; + this.updateFromDOM(); + this.div.blur(); + this.div.focus(); + }; + ContentEditableInput.prototype.readFromDOMSoon = function () { + var this$1 = this; + if (this.readDOMTimeout != null) { + return; + } + this.readDOMTimeout = setTimeout(function () { + this$1.readDOMTimeout = null; + if (this$1.composing) { + if (this$1.composing.done) { + this$1.composing = null; + } else { + return; + } + } + this$1.updateFromDOM(); + }, 80); + }; + ContentEditableInput.prototype.updateFromDOM = function () { + var this$1 = this; + if (this.cm.isReadOnly() || !this.pollContent()) { + runInOp(this.cm, function () { + return regChange(this$1.cm); + }); + } + }; + ContentEditableInput.prototype.setUneditable = function (node) { + node.contentEditable = "false"; + }; + ContentEditableInput.prototype.onKeyPress = function (e) { + if (e.charCode == 0 || this.composing) { + return; + } + e.preventDefault(); + if (!this.cm.isReadOnly()) { + operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); + } + }; + ContentEditableInput.prototype.readOnlyChanged = function (val) { + this.div.contentEditable = String(val != "nocursor"); + }; + ContentEditableInput.prototype.onContextMenu = function () {}; + ContentEditableInput.prototype.resetPosition = function () {}; + ContentEditableInput.prototype.needsContentAttribute = true; + function posToDOM(cm, pos) { + var view = findViewForLine(cm, pos.line); + if (!view || view.hidden) { + return null; + } + var line = getLine(cm.doc, pos.line); + var info = mapFromLineView(view, line, pos.line); + var order = getOrder(line, cm.doc.direction), + side = "left"; + if (order) { + var partPos = getBidiPartAt(order, pos.ch); + side = partPos % 2 ? "right" : "left"; + } + var result = nodeAndOffsetInLineMap(info.map, pos.ch, side); + result.offset = result.collapse == "right" ? result.end : result.start; + return result; + } + function isInGutter(node) { + for (var scan = node; scan; scan = scan.parentNode) { + if (/CodeMirror-gutter-wrapper/.test(scan.className)) { + return true; + } + } + return false; + } + function badPos(pos, bad) { + if (bad) { + pos.bad = true; + } + return pos; + } + function domTextBetween(cm, from, to, fromLine, toLine) { + var text = "", + closing = false, + lineSep = cm.doc.lineSeparator(), + extraLinebreak = false; + function recognizeMarker(id) { + return function (marker) { + return marker.id == id; + }; + } + function close() { + if (closing) { + text += lineSep; + if (extraLinebreak) { + text += lineSep; + } + closing = extraLinebreak = false; + } + } + function addText(str) { + if (str) { + close(); + text += str; + } + } + function walk(node) { + if (node.nodeType == 1) { + var cmText = node.getAttribute("cm-text"); + if (cmText) { + addText(cmText); + return; + } + var markerID = node.getAttribute("cm-marker"), + range; + if (markerID) { + var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)); + if (found.length && (range = found[0].find(0))) { + addText(getBetween(cm.doc, range.from, range.to).join(lineSep)); + } + return; + } + if (node.getAttribute("contenteditable") == "false") { + return; + } + var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName); + if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { + return; + } + if (isBlock) { + close(); + } + for (var i = 0; i < node.childNodes.length; i++) { + walk(node.childNodes[i]); + } + if (/^(pre|p)$/i.test(node.nodeName)) { + extraLinebreak = true; + } + if (isBlock) { + closing = true; + } + } else if (node.nodeType == 3) { + addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " ")); + } + } + for (;;) { + walk(from); + if (from == to) { + break; + } + from = from.nextSibling; + extraLinebreak = false; + } + return text; + } + function domToPos(cm, node, offset) { + var lineNode; + if (node == cm.display.lineDiv) { + lineNode = cm.display.lineDiv.childNodes[offset]; + if (!lineNode) { + return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true); + } + node = null; + offset = 0; + } else { + for (lineNode = node;; lineNode = lineNode.parentNode) { + if (!lineNode || lineNode == cm.display.lineDiv) { + return null; + } + if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { + break; + } + } + } + for (var i = 0; i < cm.display.view.length; i++) { + var lineView = cm.display.view[i]; + if (lineView.node == lineNode) { + return locateNodeInLineView(lineView, node, offset); + } + } + } + function locateNodeInLineView(lineView, node, offset) { + var wrapper = lineView.text.firstChild, + bad = false; + if (!node || !contains(wrapper, node)) { + return badPos(Pos(lineNo(lineView.line), 0), true); + } + if (node == wrapper) { + bad = true; + node = wrapper.childNodes[offset]; + offset = 0; + if (!node) { + var line = lineView.rest ? lst(lineView.rest) : lineView.line; + return badPos(Pos(lineNo(line), line.text.length), bad); + } + } + var textNode = node.nodeType == 3 ? node : null, + topNode = node; + if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) { + textNode = node.firstChild; + if (offset) { + offset = textNode.nodeValue.length; + } + } + while (topNode.parentNode != wrapper) { + topNode = topNode.parentNode; + } + var measure = lineView.measure, + maps = measure.maps; + function find(textNode, topNode, offset) { + for (var i = -1; i < (maps ? maps.length : 0); i++) { + var map = i < 0 ? measure.map : maps[i]; + for (var j = 0; j < map.length; j += 3) { + var curNode = map[j + 2]; + if (curNode == textNode || curNode == topNode) { + var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]); + var ch = map[j] + offset; + if (offset < 0 || curNode != textNode) { + ch = map[j + (offset ? 1 : 0)]; + } + return Pos(line, ch); + } + } + } + } + var found = find(textNode, topNode, offset); + if (found) { + return badPos(found, bad); + } + + // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems + for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { + found = find(after, after.firstChild, 0); + if (found) { + return badPos(Pos(found.line, found.ch - dist), bad); + } else { + dist += after.textContent.length; + } + } + for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) { + found = find(before, before.firstChild, -1); + if (found) { + return badPos(Pos(found.line, found.ch + dist$1), bad); + } else { + dist$1 += before.textContent.length; + } + } + } + + // TEXTAREA INPUT STYLE + + var TextareaInput = function (cm) { + this.cm = cm; + // See input.poll and input.reset + this.prevInput = ""; + + // Flag that indicates whether we expect input to appear real soon + // now (after some event like 'keypress' or 'input') and are + // polling intensively. + this.pollingFast = false; + // Self-resetting timeout for the poller + this.polling = new Delayed(); + // Used to work around IE issue with selection being forgotten when focus moves away from textarea + this.hasSelection = false; + this.composing = null; + }; + TextareaInput.prototype.init = function (display) { + var this$1 = this; + var input = this, + cm = this.cm; + this.createField(display); + var te = this.textarea; + display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild); + + // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore) + if (ios) { + te.style.width = "0px"; + } + on(te, "input", function () { + if (ie && ie_version >= 9 && this$1.hasSelection) { + this$1.hasSelection = null; + } + input.poll(); + }); + on(te, "paste", function (e) { + if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { + return; + } + cm.state.pasteIncoming = +new Date(); + input.fastPoll(); + }); + function prepareCopyCut(e) { + if (signalDOMEvent(cm, e)) { + return; + } + if (cm.somethingSelected()) { + setLastCopied({ + lineWise: false, + text: cm.getSelections() + }); + } else if (!cm.options.lineWiseCopyCut) { + return; + } else { + var ranges = copyableRanges(cm); + setLastCopied({ + lineWise: true, + text: ranges.text + }); + if (e.type == "cut") { + cm.setSelections(ranges.ranges, null, sel_dontScroll); + } else { + input.prevInput = ""; + te.value = ranges.text.join("\n"); + selectInput(te); + } + } + if (e.type == "cut") { + cm.state.cutIncoming = +new Date(); + } + } + on(te, "cut", prepareCopyCut); + on(te, "copy", prepareCopyCut); + on(display.scroller, "paste", function (e) { + if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { + return; + } + if (!te.dispatchEvent) { + cm.state.pasteIncoming = +new Date(); + input.focus(); + return; + } + + // Pass the `paste` event to the textarea so it's handled by its event listener. + var event = new Event("paste"); + event.clipboardData = e.clipboardData; + te.dispatchEvent(event); + }); + + // Prevent normal selection in the editor (we handle our own) + on(display.lineSpace, "selectstart", function (e) { + if (!eventInWidget(display, e)) { + e_preventDefault(e); + } + }); + on(te, "compositionstart", function () { + var start = cm.getCursor("from"); + if (input.composing) { + input.composing.range.clear(); + } + input.composing = { + start: start, + range: cm.markText(start, cm.getCursor("to"), { + className: "CodeMirror-composing" + }) + }; + }); + on(te, "compositionend", function () { + if (input.composing) { + input.poll(); + input.composing.range.clear(); + input.composing = null; + } + }); + }; + TextareaInput.prototype.createField = function (_display) { + // Wraps and hides input textarea + this.wrapper = hiddenTextarea(); + // The semihidden textarea that is focused when the editor is + // focused, and receives input. + this.textarea = this.wrapper.firstChild; + }; + TextareaInput.prototype.screenReaderLabelChanged = function (label) { + // Label for screenreaders, accessibility + if (label) { + this.textarea.setAttribute('aria-label', label); + } else { + this.textarea.removeAttribute('aria-label'); + } + }; + TextareaInput.prototype.prepareSelection = function () { + // Redraw the selection and/or cursor + var cm = this.cm, + display = cm.display, + doc = cm.doc; + var result = prepareSelection(cm); + + // Move the hidden textarea near the cursor to prevent scrolling artifacts + if (cm.options.moveInputWithCursor) { + var headPos = cursorCoords(cm, doc.sel.primary().head, "div"); + var wrapOff = display.wrapper.getBoundingClientRect(), + lineOff = display.lineDiv.getBoundingClientRect(); + result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, headPos.top + lineOff.top - wrapOff.top)); + result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, headPos.left + lineOff.left - wrapOff.left)); + } + return result; + }; + TextareaInput.prototype.showSelection = function (drawn) { + var cm = this.cm, + display = cm.display; + removeChildrenAndAdd(display.cursorDiv, drawn.cursors); + removeChildrenAndAdd(display.selectionDiv, drawn.selection); + if (drawn.teTop != null) { + this.wrapper.style.top = drawn.teTop + "px"; + this.wrapper.style.left = drawn.teLeft + "px"; + } + }; + + // Reset the input to correspond to the selection (or to be empty, + // when not typing and nothing is selected) + TextareaInput.prototype.reset = function (typing) { + if (this.contextMenuPending || this.composing) { + return; + } + var cm = this.cm; + if (cm.somethingSelected()) { + this.prevInput = ""; + var content = cm.getSelection(); + this.textarea.value = content; + if (cm.state.focused) { + selectInput(this.textarea); + } + if (ie && ie_version >= 9) { + this.hasSelection = content; + } + } else if (!typing) { + this.prevInput = this.textarea.value = ""; + if (ie && ie_version >= 9) { + this.hasSelection = null; + } + } + }; + TextareaInput.prototype.getField = function () { + return this.textarea; + }; + TextareaInput.prototype.supportsTouch = function () { + return false; + }; + TextareaInput.prototype.focus = function () { + if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) { + try { + this.textarea.focus(); + } catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM + } + }; + TextareaInput.prototype.blur = function () { + this.textarea.blur(); + }; + TextareaInput.prototype.resetPosition = function () { + this.wrapper.style.top = this.wrapper.style.left = 0; + }; + TextareaInput.prototype.receivedFocus = function () { + this.slowPoll(); + }; + + // Poll for input changes, using the normal rate of polling. This + // runs as long as the editor is focused. + TextareaInput.prototype.slowPoll = function () { + var this$1 = this; + if (this.pollingFast) { + return; + } + this.polling.set(this.cm.options.pollInterval, function () { + this$1.poll(); + if (this$1.cm.state.focused) { + this$1.slowPoll(); + } + }); + }; + + // When an event has just come in that is likely to add or change + // something in the input textarea, we poll faster, to ensure that + // the change appears on the screen quickly. + TextareaInput.prototype.fastPoll = function () { + var missed = false, + input = this; + input.pollingFast = true; + function p() { + var changed = input.poll(); + if (!changed && !missed) { + missed = true; + input.polling.set(60, p); + } else { + input.pollingFast = false; + input.slowPoll(); + } + } + input.polling.set(20, p); + }; + + // Read input from the textarea, and update the document to match. + // When something is selected, it is present in the textarea, and + // selected (unless it is huge, in which case a placeholder is + // used). When nothing is selected, the cursor sits after previously + // seen text (can be empty), which is stored in prevInput (we must + // not reset the textarea when typing, because that breaks IME). + TextareaInput.prototype.poll = function () { + var this$1 = this; + var cm = this.cm, + input = this.textarea, + prevInput = this.prevInput; + // Since this is called a *lot*, try to bail out as cheaply as + // possible when it is clear that nothing happened. hasSelection + // will be the case when there is a lot of text in the textarea, + // in which case reading its value would be expensive. + if (this.contextMenuPending || !cm.state.focused || hasSelection(input) && !prevInput && !this.composing || cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) { + return false; + } + var text = input.value; + // If nothing changed, bail. + if (text == prevInput && !cm.somethingSelected()) { + return false; + } + // Work around nonsensical selection resetting in IE9/10, and + // inexplicable appearance of private area unicode characters on + // some key combos in Mac (#2689). + if (ie && ie_version >= 9 && this.hasSelection === text || mac && /[\uf700-\uf7ff]/.test(text)) { + cm.display.input.reset(); + return false; + } + if (cm.doc.sel == cm.display.selForContextMenu) { + var first = text.charCodeAt(0); + if (first == 0x200b && !prevInput) { + prevInput = "\u200b"; + } + if (first == 0x21da) { + this.reset(); + return this.cm.execCommand("undo"); + } + } + // Find the part of the input that is actually new + var same = 0, + l = Math.min(prevInput.length, text.length); + while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { + ++same; + } + runInOp(cm, function () { + applyTextInput(cm, text.slice(same), prevInput.length - same, null, this$1.composing ? "*compose" : null); + + // Don't leave long text in the textarea, since it makes further polling slow + if (text.length > 1000 || text.indexOf("\n") > -1) { + input.value = this$1.prevInput = ""; + } else { + this$1.prevInput = text; + } + if (this$1.composing) { + this$1.composing.range.clear(); + this$1.composing.range = cm.markText(this$1.composing.start, cm.getCursor("to"), { + className: "CodeMirror-composing" + }); + } + }); + return true; + }; + TextareaInput.prototype.ensurePolled = function () { + if (this.pollingFast && this.poll()) { + this.pollingFast = false; + } + }; + TextareaInput.prototype.onKeyPress = function () { + if (ie && ie_version >= 9) { + this.hasSelection = null; + } + this.fastPoll(); + }; + TextareaInput.prototype.onContextMenu = function (e) { + var input = this, + cm = input.cm, + display = cm.display, + te = input.textarea; + if (input.contextMenuPending) { + input.contextMenuPending(); + } + var pos = posFromMouse(cm, e), + scrollPos = display.scroller.scrollTop; + if (!pos || presto) { + return; + } // Opera is difficult. + + // Reset the current text selection only if the click is done outside of the selection + // and 'resetSelectionOnContextMenu' option is true. + var reset = cm.options.resetSelectionOnContextMenu; + if (reset && cm.doc.sel.contains(pos) == -1) { + operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); + } + var oldCSS = te.style.cssText, + oldWrapperCSS = input.wrapper.style.cssText; + var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect(); + input.wrapper.style.cssText = "position: static"; + te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; + var oldScrollY; + if (webkit) { + oldScrollY = window.scrollY; + } // Work around Chrome issue (#2712) + display.input.focus(); + if (webkit) { + window.scrollTo(null, oldScrollY); + } + display.input.reset(); + // Adds "Select all" to context menu in FF + if (!cm.somethingSelected()) { + te.value = input.prevInput = " "; + } + input.contextMenuPending = rehide; + display.selForContextMenu = cm.doc.sel; + clearTimeout(display.detectingSelectAll); + + // Select-all will be greyed out if there's nothing to select, so + // this adds a zero-width space so that we can later check whether + // it got selected. + function prepareSelectAllHack() { + if (te.selectionStart != null) { + var selected = cm.somethingSelected(); + var extval = "\u200b" + (selected ? te.value : ""); + te.value = "\u21da"; // Used to catch context-menu undo + te.value = extval; + input.prevInput = selected ? "" : "\u200b"; + te.selectionStart = 1; + te.selectionEnd = extval.length; + // Re-set this, in case some other handler touched the + // selection in the meantime. + display.selForContextMenu = cm.doc.sel; + } + } + function rehide() { + if (input.contextMenuPending != rehide) { + return; + } + input.contextMenuPending = false; + input.wrapper.style.cssText = oldWrapperCSS; + te.style.cssText = oldCSS; + if (ie && ie_version < 9) { + display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); + } + + // Try to detect the user choosing select-all + if (te.selectionStart != null) { + if (!ie || ie && ie_version < 9) { + prepareSelectAllHack(); + } + var i = 0, + poll = function () { + if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && te.selectionEnd > 0 && input.prevInput == "\u200b") { + operation(cm, selectAll)(cm); + } else if (i++ < 10) { + display.detectingSelectAll = setTimeout(poll, 500); + } else { + display.selForContextMenu = null; + display.input.reset(); + } + }; + display.detectingSelectAll = setTimeout(poll, 200); + } + } + if (ie && ie_version >= 9) { + prepareSelectAllHack(); + } + if (captureRightClick) { + e_stop(e); + var mouseup = function () { + off(window, "mouseup", mouseup); + setTimeout(rehide, 20); + }; + on(window, "mouseup", mouseup); + } else { + setTimeout(rehide, 50); + } + }; + TextareaInput.prototype.readOnlyChanged = function (val) { + if (!val) { + this.reset(); + } + this.textarea.disabled = val == "nocursor"; + this.textarea.readOnly = !!val; + }; + TextareaInput.prototype.setUneditable = function () {}; + TextareaInput.prototype.needsContentAttribute = false; + function fromTextArea(textarea, options) { + options = options ? copyObj(options) : {}; + options.value = textarea.value; + if (!options.tabindex && textarea.tabIndex) { + options.tabindex = textarea.tabIndex; + } + if (!options.placeholder && textarea.placeholder) { + options.placeholder = textarea.placeholder; + } + // Set autofocus to true if this textarea is focused, or if it has + // autofocus and no other element is focused. + if (options.autofocus == null) { + var hasFocus = activeElt(); + options.autofocus = hasFocus == textarea || textarea.getAttribute("autofocus") != null && hasFocus == document.body; + } + function save() { + textarea.value = cm.getValue(); + } + var realSubmit; + if (textarea.form) { + on(textarea.form, "submit", save); + // Deplorable hack to make the submit method do the right thing. + if (!options.leaveSubmitMethodAlone) { + var form = textarea.form; + realSubmit = form.submit; + try { + var wrappedSubmit = form.submit = function () { + save(); + form.submit = realSubmit; + form.submit(); + form.submit = wrappedSubmit; + }; + } catch (e) {} + } + } + options.finishInit = function (cm) { + cm.save = save; + cm.getTextArea = function () { + return textarea; + }; + cm.toTextArea = function () { + cm.toTextArea = isNaN; // Prevent this from being ran twice + save(); + textarea.parentNode.removeChild(cm.getWrapperElement()); + textarea.style.display = ""; + if (textarea.form) { + off(textarea.form, "submit", save); + if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function") { + textarea.form.submit = realSubmit; + } + } + }; + }; + textarea.style.display = "none"; + var cm = CodeMirror(function (node) { + return textarea.parentNode.insertBefore(node, textarea.nextSibling); + }, options); + return cm; + } + function addLegacyProps(CodeMirror) { + CodeMirror.off = off; + CodeMirror.on = on; + CodeMirror.wheelEventPixels = wheelEventPixels; + CodeMirror.Doc = Doc; + CodeMirror.splitLines = splitLinesAuto; + CodeMirror.countColumn = countColumn; + CodeMirror.findColumn = findColumn; + CodeMirror.isWordChar = isWordCharBasic; + CodeMirror.Pass = Pass; + CodeMirror.signal = signal; + CodeMirror.Line = Line; + CodeMirror.changeEnd = changeEnd; + CodeMirror.scrollbarModel = scrollbarModel; + CodeMirror.Pos = Pos; + CodeMirror.cmpPos = cmp; + CodeMirror.modes = modes; + CodeMirror.mimeModes = mimeModes; + CodeMirror.resolveMode = resolveMode; + CodeMirror.getMode = getMode; + CodeMirror.modeExtensions = modeExtensions; + CodeMirror.extendMode = extendMode; + CodeMirror.copyState = copyState; + CodeMirror.startState = startState; + CodeMirror.innerMode = innerMode; + CodeMirror.commands = commands; + CodeMirror.keyMap = keyMap; + CodeMirror.keyName = keyName; + CodeMirror.isModifierKey = isModifierKey; + CodeMirror.lookupKey = lookupKey; + CodeMirror.normalizeKeyMap = normalizeKeyMap; + CodeMirror.StringStream = StringStream; + CodeMirror.SharedTextMarker = SharedTextMarker; + CodeMirror.TextMarker = TextMarker; + CodeMirror.LineWidget = LineWidget; + CodeMirror.e_preventDefault = e_preventDefault; + CodeMirror.e_stopPropagation = e_stopPropagation; + CodeMirror.e_stop = e_stop; + CodeMirror.addClass = addClass; + CodeMirror.contains = contains; + CodeMirror.rmClass = rmClass; + CodeMirror.keyNames = keyNames; + } + + // EDITOR CONSTRUCTOR + + defineOptions(CodeMirror); + addEditorMethods(CodeMirror); + + // Set up methods on CodeMirror's prototype to redirect to the editor's document. + var dontDelegate = "iter insert remove copy getEditor constructor".split(" "); + for (var prop in Doc.prototype) { + if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) { + CodeMirror.prototype[prop] = function (method) { + return function () { + return method.apply(this.doc, arguments); + }; + }(Doc.prototype[prop]); + } + } + eventMixin(Doc); + CodeMirror.inputStyles = { + "textarea": TextareaInput, + "contenteditable": ContentEditableInput + }; + + // Extra arguments are stored as the mode's dependencies, which is + // used by (legacy) mechanisms like loadmode.js to automatically + // load a mode. (Preferred mechanism is the require/define calls.) + CodeMirror.defineMode = function (name /*, mode, …*/) { + if (!CodeMirror.defaults.mode && name != "null") { + CodeMirror.defaults.mode = name; + } + defineMode.apply(this, arguments); + }; + CodeMirror.defineMIME = defineMIME; + + // Minimal default mode. + CodeMirror.defineMode("null", function () { + return { + token: function (stream) { + return stream.skipToEnd(); + } + }; + }); + CodeMirror.defineMIME("text/plain", "null"); + + // EXTENSIONS + + CodeMirror.defineExtension = function (name, func) { + CodeMirror.prototype[name] = func; + }; + CodeMirror.defineDocExtension = function (name, func) { + Doc.prototype[name] = func; + }; + CodeMirror.fromTextArea = fromTextArea; + addLegacyProps(CodeMirror); + CodeMirror.version = "5.65.3"; + return CodeMirror; +}); + +/***/ }), + +/***/ "../../../node_modules/codemirror/mode/javascript/javascript.js": +/*!**********************************************************************!*\ + !*** ../../../node_modules/codemirror/mode/javascript/javascript.js ***! + \**********************************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/LICENSE + +(function (mod) { + if (true) + // CommonJS + mod(__webpack_require__(/*! ../../lib/codemirror */ "../../../node_modules/codemirror/lib/codemirror.js"));else {} +})(function (CodeMirror) { + "use strict"; + + CodeMirror.defineMode("javascript", function (config, parserConfig) { + var indentUnit = config.indentUnit; + var statementIndent = parserConfig.statementIndent; + var jsonldMode = parserConfig.jsonld; + var jsonMode = parserConfig.json || jsonldMode; + var trackScope = parserConfig.trackScope !== false; + var isTS = parserConfig.typescript; + var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/; + + // Tokenizer + + var keywords = function () { + function kw(type) { + return { + type: type, + style: "keyword" + }; + } + var A = kw("keyword a"), + B = kw("keyword b"), + C = kw("keyword c"), + D = kw("keyword d"); + var operator = kw("operator"), + atom = { + type: "atom", + style: "atom" + }; + return { + "if": kw("if"), + "while": A, + "with": A, + "else": B, + "do": B, + "try": B, + "finally": B, + "return": D, + "break": D, + "continue": D, + "new": kw("new"), + "delete": C, + "void": C, + "throw": C, + "debugger": kw("debugger"), + "var": kw("var"), + "const": kw("var"), + "let": kw("var"), + "function": kw("function"), + "catch": kw("catch"), + "for": kw("for"), + "switch": kw("switch"), + "case": kw("case"), + "default": kw("default"), + "in": operator, + "typeof": operator, + "instanceof": operator, + "true": atom, + "false": atom, + "null": atom, + "undefined": atom, + "NaN": atom, + "Infinity": atom, + "this": kw("this"), + "class": kw("class"), + "super": kw("atom"), + "yield": C, + "export": kw("export"), + "import": kw("import"), + "extends": C, + "await": C + }; + }(); + var isOperatorChar = /[+\-*&%=<>!?|~^@]/; + var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/; + function readRegexp(stream) { + var escaped = false, + next, + inSet = false; + while ((next = stream.next()) != null) { + if (!escaped) { + if (next == "/" && !inSet) return; + if (next == "[") inSet = true;else if (inSet && next == "]") inSet = false; + } + escaped = !escaped && next == "\\"; + } + } + + // Used as scratch variables to communicate multiple values without + // consing up tons of objects. + var type, content; + function ret(tp, style, cont) { + type = tp; + content = cont; + return style; + } + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"' || ch == "'") { + state.tokenize = tokenString(ch); + return state.tokenize(stream, state); + } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) { + return ret("number", "number"); + } else if (ch == "." && stream.match("..")) { + return ret("spread", "meta"); + } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) { + return ret(ch); + } else if (ch == "=" && stream.eat(">")) { + return ret("=>", "operator"); + } else if (ch == "0" && stream.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/)) { + return ret("number", "number"); + } else if (/\d/.test(ch)) { + stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/); + return ret("number", "number"); + } else if (ch == "/") { + if (stream.eat("*")) { + state.tokenize = tokenComment; + return tokenComment(stream, state); + } else if (stream.eat("/")) { + stream.skipToEnd(); + return ret("comment", "comment"); + } else if (expressionAllowed(stream, state, 1)) { + readRegexp(stream); + stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/); + return ret("regexp", "string-2"); + } else { + stream.eat("="); + return ret("operator", "operator", stream.current()); + } + } else if (ch == "`") { + state.tokenize = tokenQuasi; + return tokenQuasi(stream, state); + } else if (ch == "#" && stream.peek() == "!") { + stream.skipToEnd(); + return ret("meta", "meta"); + } else if (ch == "#" && stream.eatWhile(wordRE)) { + return ret("variable", "property"); + } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->") && !/\S/.test(stream.string.slice(0, stream.start))) { + stream.skipToEnd(); + return ret("comment", "comment"); + } else if (isOperatorChar.test(ch)) { + if (ch != ">" || !state.lexical || state.lexical.type != ">") { + if (stream.eat("=")) { + if (ch == "!" || ch == "=") stream.eat("="); + } else if (/[<>*+\-|&?]/.test(ch)) { + stream.eat(ch); + if (ch == ">") stream.eat(ch); + } + } + if (ch == "?" && stream.eat(".")) return ret("."); + return ret("operator", "operator", stream.current()); + } else if (wordRE.test(ch)) { + stream.eatWhile(wordRE); + var word = stream.current(); + if (state.lastType != ".") { + if (keywords.propertyIsEnumerable(word)) { + var kw = keywords[word]; + return ret(kw.type, kw.style, word); + } + if (word == "async" && stream.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/, false)) return ret("async", "keyword", word); + } + return ret("variable", "variable", word); + } + } + function tokenString(quote) { + return function (stream, state) { + var escaped = false, + next; + if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)) { + state.tokenize = tokenBase; + return ret("jsonld-keyword", "meta"); + } + while ((next = stream.next()) != null) { + if (next == quote && !escaped) break; + escaped = !escaped && next == "\\"; + } + if (!escaped) state.tokenize = tokenBase; + return ret("string", "string"); + }; + } + function tokenComment(stream, state) { + var maybeEnd = false, + ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = tokenBase; + break; + } + maybeEnd = ch == "*"; + } + return ret("comment", "comment"); + } + function tokenQuasi(stream, state) { + var escaped = false, + next; + while ((next = stream.next()) != null) { + if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) { + state.tokenize = tokenBase; + break; + } + escaped = !escaped && next == "\\"; + } + return ret("quasi", "string-2", stream.current()); + } + var brackets = "([{}])"; + // This is a crude lookahead trick to try and notice that we're + // parsing the argument patterns for a fat-arrow function before we + // actually hit the arrow token. It only works if the arrow is on + // the same line as the arguments and there's no strange noise + // (comments) in between. Fallback is to only notice when we hit the + // arrow, and not declare the arguments as locals for the arrow + // body. + function findFatArrow(stream, state) { + if (state.fatArrowAt) state.fatArrowAt = null; + var arrow = stream.string.indexOf("=>", stream.start); + if (arrow < 0) return; + if (isTS) { + // Try to skip TypeScript return type declarations after the arguments + var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow)); + if (m) arrow = m.index; + } + var depth = 0, + sawSomething = false; + for (var pos = arrow - 1; pos >= 0; --pos) { + var ch = stream.string.charAt(pos); + var bracket = brackets.indexOf(ch); + if (bracket >= 0 && bracket < 3) { + if (!depth) { + ++pos; + break; + } + if (--depth == 0) { + if (ch == "(") sawSomething = true; + break; + } + } else if (bracket >= 3 && bracket < 6) { + ++depth; + } else if (wordRE.test(ch)) { + sawSomething = true; + } else if (/["'\/`]/.test(ch)) { + for (;; --pos) { + if (pos == 0) return; + var next = stream.string.charAt(pos - 1); + if (next == ch && stream.string.charAt(pos - 2) != "\\") { + pos--; + break; + } + } + } else if (sawSomething && !depth) { + ++pos; + break; + } + } + if (sawSomething && !depth) state.fatArrowAt = pos; + } + + // Parser + + var atomicTypes = { + "atom": true, + "number": true, + "variable": true, + "string": true, + "regexp": true, + "this": true, + "import": true, + "jsonld-keyword": true + }; + function JSLexical(indented, column, type, align, prev, info) { + this.indented = indented; + this.column = column; + this.type = type; + this.prev = prev; + this.info = info; + if (align != null) this.align = align; + } + function inScope(state, varname) { + if (!trackScope) return false; + for (var v = state.localVars; v; v = v.next) if (v.name == varname) return true; + for (var cx = state.context; cx; cx = cx.prev) { + for (var v = cx.vars; v; v = v.next) if (v.name == varname) return true; + } + } + function parseJS(state, style, type, content, stream) { + var cc = state.cc; + // Communicate our context to the combinators. + // (Less wasteful than consing up a hundred closures on every call.) + cx.state = state; + cx.stream = stream; + cx.marked = null, cx.cc = cc; + cx.style = style; + if (!state.lexical.hasOwnProperty("align")) state.lexical.align = true; + while (true) { + var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; + if (combinator(type, content)) { + while (cc.length && cc[cc.length - 1].lex) cc.pop()(); + if (cx.marked) return cx.marked; + if (type == "variable" && inScope(state, content)) return "variable-2"; + return style; + } + } + } + + // Combinator utils + + var cx = { + state: null, + column: null, + marked: null, + cc: null + }; + function pass() { + for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); + } + function cont() { + pass.apply(null, arguments); + return true; + } + function inList(name, list) { + for (var v = list; v; v = v.next) if (v.name == name) return true; + return false; + } + function register(varname) { + var state = cx.state; + cx.marked = "def"; + if (!trackScope) return; + if (state.context) { + if (state.lexical.info == "var" && state.context && state.context.block) { + // FIXME function decls are also not block scoped + var newContext = registerVarScoped(varname, state.context); + if (newContext != null) { + state.context = newContext; + return; + } + } else if (!inList(varname, state.localVars)) { + state.localVars = new Var(varname, state.localVars); + return; + } + } + // Fall through means this is global + if (parserConfig.globalVars && !inList(varname, state.globalVars)) state.globalVars = new Var(varname, state.globalVars); + } + function registerVarScoped(varname, context) { + if (!context) { + return null; + } else if (context.block) { + var inner = registerVarScoped(varname, context.prev); + if (!inner) return null; + if (inner == context.prev) return context; + return new Context(inner, context.vars, true); + } else if (inList(varname, context.vars)) { + return context; + } else { + return new Context(context.prev, new Var(varname, context.vars), false); + } + } + function isModifier(name) { + return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"; + } + + // Combinators + + function Context(prev, vars, block) { + this.prev = prev; + this.vars = vars; + this.block = block; + } + function Var(name, next) { + this.name = name; + this.next = next; + } + var defaultVars = new Var("this", new Var("arguments", null)); + function pushcontext() { + cx.state.context = new Context(cx.state.context, cx.state.localVars, false); + cx.state.localVars = defaultVars; + } + function pushblockcontext() { + cx.state.context = new Context(cx.state.context, cx.state.localVars, true); + cx.state.localVars = null; + } + pushcontext.lex = pushblockcontext.lex = true; + function popcontext() { + cx.state.localVars = cx.state.context.vars; + cx.state.context = cx.state.context.prev; + } + popcontext.lex = true; + function pushlex(type, info) { + var result = function () { + var state = cx.state, + indent = state.indented; + if (state.lexical.type == "stat") indent = state.lexical.indented;else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev) indent = outer.indented; + state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info); + }; + result.lex = true; + return result; + } + function poplex() { + var state = cx.state; + if (state.lexical.prev) { + if (state.lexical.type == ")") state.indented = state.lexical.indented; + state.lexical = state.lexical.prev; + } + } + poplex.lex = true; + function expect(wanted) { + function exp(type) { + if (type == wanted) return cont();else if (wanted == ";" || type == "}" || type == ")" || type == "]") return pass();else return cont(exp); + } + ; + return exp; + } + function statement(type, value) { + if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex); + if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex); + if (type == "keyword b") return cont(pushlex("form"), statement, poplex); + if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex); + if (type == "debugger") return cont(expect(";")); + if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext); + if (type == ";") return cont(); + if (type == "if") { + if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex) cx.state.cc.pop()(); + return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse); + } + if (type == "function") return cont(functiondef); + if (type == "for") return cont(pushlex("form"), pushblockcontext, forspec, statement, popcontext, poplex); + if (type == "class" || isTS && value == "interface") { + cx.marked = "keyword"; + return cont(pushlex("form", type == "class" ? type : value), className, poplex); + } + if (type == "variable") { + if (isTS && value == "declare") { + cx.marked = "keyword"; + return cont(statement); + } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) { + cx.marked = "keyword"; + if (value == "enum") return cont(enumdef);else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";"));else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex); + } else if (isTS && value == "namespace") { + cx.marked = "keyword"; + return cont(pushlex("form"), expression, statement, poplex); + } else if (isTS && value == "abstract") { + cx.marked = "keyword"; + return cont(statement); + } else { + return cont(pushlex("stat"), maybelabel); + } + } + if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext, block, poplex, poplex, popcontext); + if (type == "case") return cont(expression, expect(":")); + if (type == "default") return cont(expect(":")); + if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext); + if (type == "export") return cont(pushlex("stat"), afterExport, poplex); + if (type == "import") return cont(pushlex("stat"), afterImport, poplex); + if (type == "async") return cont(statement); + if (value == "@") return cont(expression, statement); + return pass(pushlex("stat"), expression, expect(";"), poplex); + } + function maybeCatchBinding(type) { + if (type == "(") return cont(funarg, expect(")")); + } + function expression(type, value) { + return expressionInner(type, value, false); + } + function expressionNoComma(type, value) { + return expressionInner(type, value, true); + } + function parenExpr(type) { + if (type != "(") return pass(); + return cont(pushlex(")"), maybeexpression, expect(")"), poplex); + } + function expressionInner(type, value, noComma) { + if (cx.state.fatArrowAt == cx.stream.start) { + var body = noComma ? arrowBodyNoComma : arrowBody; + if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext); + } + var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma; + if (atomicTypes.hasOwnProperty(type)) return cont(maybeop); + if (type == "function") return cont(functiondef, maybeop); + if (type == "class" || isTS && value == "interface") { + cx.marked = "keyword"; + return cont(pushlex("form"), classExpression, poplex); + } + if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression); + if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop); + if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression); + if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop); + if (type == "{") return contCommasep(objprop, "}", null, maybeop); + if (type == "quasi") return pass(quasi, maybeop); + if (type == "new") return cont(maybeTarget(noComma)); + return cont(); + } + function maybeexpression(type) { + if (type.match(/[;\}\)\],]/)) return pass(); + return pass(expression); + } + function maybeoperatorComma(type, value) { + if (type == ",") return cont(maybeexpression); + return maybeoperatorNoComma(type, value, false); + } + function maybeoperatorNoComma(type, value, noComma) { + var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma; + var expr = noComma == false ? expression : expressionNoComma; + if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext); + if (type == "operator") { + if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me); + if (isTS && value == "<" && cx.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/, false)) return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me); + if (value == "?") return cont(expression, expect(":"), expr); + return cont(expr); + } + if (type == "quasi") { + return pass(quasi, me); + } + if (type == ";") return; + if (type == "(") return contCommasep(expressionNoComma, ")", "call", me); + if (type == ".") return cont(property, me); + if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me); + if (isTS && value == "as") { + cx.marked = "keyword"; + return cont(typeexpr, me); + } + if (type == "regexp") { + cx.state.lastType = cx.marked = "operator"; + cx.stream.backUp(cx.stream.pos - cx.stream.start - 1); + return cont(expr); + } + } + function quasi(type, value) { + if (type != "quasi") return pass(); + if (value.slice(value.length - 2) != "${") return cont(quasi); + return cont(maybeexpression, continueQuasi); + } + function continueQuasi(type) { + if (type == "}") { + cx.marked = "string-2"; + cx.state.tokenize = tokenQuasi; + return cont(quasi); + } + } + function arrowBody(type) { + findFatArrow(cx.stream, cx.state); + return pass(type == "{" ? statement : expression); + } + function arrowBodyNoComma(type) { + findFatArrow(cx.stream, cx.state); + return pass(type == "{" ? statement : expressionNoComma); + } + function maybeTarget(noComma) { + return function (type) { + if (type == ".") return cont(noComma ? targetNoComma : target);else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma);else return pass(noComma ? expressionNoComma : expression); + }; + } + function target(_, value) { + if (value == "target") { + cx.marked = "keyword"; + return cont(maybeoperatorComma); + } + } + function targetNoComma(_, value) { + if (value == "target") { + cx.marked = "keyword"; + return cont(maybeoperatorNoComma); + } + } + function maybelabel(type) { + if (type == ":") return cont(poplex, statement); + return pass(maybeoperatorComma, expect(";"), poplex); + } + function property(type) { + if (type == "variable") { + cx.marked = "property"; + return cont(); + } + } + function objprop(type, value) { + if (type == "async") { + cx.marked = "property"; + return cont(objprop); + } else if (type == "variable" || cx.style == "keyword") { + cx.marked = "property"; + if (value == "get" || value == "set") return cont(getterSetter); + var m; // Work around fat-arrow-detection complication for detecting typescript typed arrow params + if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false))) cx.state.fatArrowAt = cx.stream.pos + m[0].length; + return cont(afterprop); + } else if (type == "number" || type == "string") { + cx.marked = jsonldMode ? "property" : cx.style + " property"; + return cont(afterprop); + } else if (type == "jsonld-keyword") { + return cont(afterprop); + } else if (isTS && isModifier(value)) { + cx.marked = "keyword"; + return cont(objprop); + } else if (type == "[") { + return cont(expression, maybetype, expect("]"), afterprop); + } else if (type == "spread") { + return cont(expressionNoComma, afterprop); + } else if (value == "*") { + cx.marked = "keyword"; + return cont(objprop); + } else if (type == ":") { + return pass(afterprop); + } + } + function getterSetter(type) { + if (type != "variable") return pass(afterprop); + cx.marked = "property"; + return cont(functiondef); + } + function afterprop(type) { + if (type == ":") return cont(expressionNoComma); + if (type == "(") return pass(functiondef); + } + function commasep(what, end, sep) { + function proceed(type, value) { + if (sep ? sep.indexOf(type) > -1 : type == ",") { + var lex = cx.state.lexical; + if (lex.info == "call") lex.pos = (lex.pos || 0) + 1; + return cont(function (type, value) { + if (type == end || value == end) return pass(); + return pass(what); + }, proceed); + } + if (type == end || value == end) return cont(); + if (sep && sep.indexOf(";") > -1) return pass(what); + return cont(expect(end)); + } + return function (type, value) { + if (type == end || value == end) return cont(); + return pass(what, proceed); + }; + } + function contCommasep(what, end, info) { + for (var i = 3; i < arguments.length; i++) cx.cc.push(arguments[i]); + return cont(pushlex(end, info), commasep(what, end), poplex); + } + function block(type) { + if (type == "}") return cont(); + return pass(statement, block); + } + function maybetype(type, value) { + if (isTS) { + if (type == ":") return cont(typeexpr); + if (value == "?") return cont(maybetype); + } + } + function maybetypeOrIn(type, value) { + if (isTS && (type == ":" || value == "in")) return cont(typeexpr); + } + function mayberettype(type) { + if (isTS && type == ":") { + if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr);else return cont(typeexpr); + } + } + function isKW(_, value) { + if (value == "is") { + cx.marked = "keyword"; + return cont(); + } + } + function typeexpr(type, value) { + if (value == "keyof" || value == "typeof" || value == "infer" || value == "readonly") { + cx.marked = "keyword"; + return cont(value == "typeof" ? expressionNoComma : typeexpr); + } + if (type == "variable" || value == "void") { + cx.marked = "type"; + return cont(afterType); + } + if (value == "|" || value == "&") return cont(typeexpr); + if (type == "string" || type == "number" || type == "atom") return cont(afterType); + if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType); + if (type == "{") return cont(pushlex("}"), typeprops, poplex, afterType); + if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType); + if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr); + if (type == "quasi") { + return pass(quasiType, afterType); + } + } + function maybeReturnType(type) { + if (type == "=>") return cont(typeexpr); + } + function typeprops(type) { + if (type.match(/[\}\)\]]/)) return cont(); + if (type == "," || type == ";") return cont(typeprops); + return pass(typeprop, typeprops); + } + function typeprop(type, value) { + if (type == "variable" || cx.style == "keyword") { + cx.marked = "property"; + return cont(typeprop); + } else if (value == "?" || type == "number" || type == "string") { + return cont(typeprop); + } else if (type == ":") { + return cont(typeexpr); + } else if (type == "[") { + return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop); + } else if (type == "(") { + return pass(functiondecl, typeprop); + } else if (!type.match(/[;\}\)\],]/)) { + return cont(); + } + } + function quasiType(type, value) { + if (type != "quasi") return pass(); + if (value.slice(value.length - 2) != "${") return cont(quasiType); + return cont(typeexpr, continueQuasiType); + } + function continueQuasiType(type) { + if (type == "}") { + cx.marked = "string-2"; + cx.state.tokenize = tokenQuasi; + return cont(quasiType); + } + } + function typearg(type, value) { + if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg); + if (type == ":") return cont(typeexpr); + if (type == "spread") return cont(typearg); + return pass(typeexpr); + } + function afterType(type, value) { + if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType); + if (value == "|" || type == "." || value == "&") return cont(typeexpr); + if (type == "[") return cont(typeexpr, expect("]"), afterType); + if (value == "extends" || value == "implements") { + cx.marked = "keyword"; + return cont(typeexpr); + } + if (value == "?") return cont(typeexpr, expect(":"), typeexpr); + } + function maybeTypeArgs(_, value) { + if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType); + } + function typeparam() { + return pass(typeexpr, maybeTypeDefault); + } + function maybeTypeDefault(_, value) { + if (value == "=") return cont(typeexpr); + } + function vardef(_, value) { + if (value == "enum") { + cx.marked = "keyword"; + return cont(enumdef); + } + return pass(pattern, maybetype, maybeAssign, vardefCont); + } + function pattern(type, value) { + if (isTS && isModifier(value)) { + cx.marked = "keyword"; + return cont(pattern); + } + if (type == "variable") { + register(value); + return cont(); + } + if (type == "spread") return cont(pattern); + if (type == "[") return contCommasep(eltpattern, "]"); + if (type == "{") return contCommasep(proppattern, "}"); + } + function proppattern(type, value) { + if (type == "variable" && !cx.stream.match(/^\s*:/, false)) { + register(value); + return cont(maybeAssign); + } + if (type == "variable") cx.marked = "property"; + if (type == "spread") return cont(pattern); + if (type == "}") return pass(); + if (type == "[") return cont(expression, expect(']'), expect(':'), proppattern); + return cont(expect(":"), pattern, maybeAssign); + } + function eltpattern() { + return pass(pattern, maybeAssign); + } + function maybeAssign(_type, value) { + if (value == "=") return cont(expressionNoComma); + } + function vardefCont(type) { + if (type == ",") return cont(vardef); + } + function maybeelse(type, value) { + if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex); + } + function forspec(type, value) { + if (value == "await") return cont(forspec); + if (type == "(") return cont(pushlex(")"), forspec1, poplex); + } + function forspec1(type) { + if (type == "var") return cont(vardef, forspec2); + if (type == "variable") return cont(forspec2); + return pass(forspec2); + } + function forspec2(type, value) { + if (type == ")") return cont(); + if (type == ";") return cont(forspec2); + if (value == "in" || value == "of") { + cx.marked = "keyword"; + return cont(expression, forspec2); + } + return pass(expression, forspec2); + } + function functiondef(type, value) { + if (value == "*") { + cx.marked = "keyword"; + return cont(functiondef); + } + if (type == "variable") { + register(value); + return cont(functiondef); + } + if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext); + if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef); + } + function functiondecl(type, value) { + if (value == "*") { + cx.marked = "keyword"; + return cont(functiondecl); + } + if (type == "variable") { + register(value); + return cont(functiondecl); + } + if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext); + if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl); + } + function typename(type, value) { + if (type == "keyword" || type == "variable") { + cx.marked = "type"; + return cont(typename); + } else if (value == "<") { + return cont(pushlex(">"), commasep(typeparam, ">"), poplex); + } + } + function funarg(type, value) { + if (value == "@") cont(expression, funarg); + if (type == "spread") return cont(funarg); + if (isTS && isModifier(value)) { + cx.marked = "keyword"; + return cont(funarg); + } + if (isTS && type == "this") return cont(maybetype, maybeAssign); + return pass(pattern, maybetype, maybeAssign); + } + function classExpression(type, value) { + // Class expressions may have an optional name. + if (type == "variable") return className(type, value); + return classNameAfter(type, value); + } + function className(type, value) { + if (type == "variable") { + register(value); + return cont(classNameAfter); + } + } + function classNameAfter(type, value) { + if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter); + if (value == "extends" || value == "implements" || isTS && type == ",") { + if (value == "implements") cx.marked = "keyword"; + return cont(isTS ? typeexpr : expression, classNameAfter); + } + if (type == "{") return cont(pushlex("}"), classBody, poplex); + } + function classBody(type, value) { + if (type == "async" || type == "variable" && (value == "static" || value == "get" || value == "set" || isTS && isModifier(value)) && cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) { + cx.marked = "keyword"; + return cont(classBody); + } + if (type == "variable" || cx.style == "keyword") { + cx.marked = "property"; + return cont(classfield, classBody); + } + if (type == "number" || type == "string") return cont(classfield, classBody); + if (type == "[") return cont(expression, maybetype, expect("]"), classfield, classBody); + if (value == "*") { + cx.marked = "keyword"; + return cont(classBody); + } + if (isTS && type == "(") return pass(functiondecl, classBody); + if (type == ";" || type == ",") return cont(classBody); + if (type == "}") return cont(); + if (value == "@") return cont(expression, classBody); + } + function classfield(type, value) { + if (value == "!") return cont(classfield); + if (value == "?") return cont(classfield); + if (type == ":") return cont(typeexpr, maybeAssign); + if (value == "=") return cont(expressionNoComma); + var context = cx.state.lexical.prev, + isInterface = context && context.info == "interface"; + return pass(isInterface ? functiondecl : functiondef); + } + function afterExport(type, value) { + if (value == "*") { + cx.marked = "keyword"; + return cont(maybeFrom, expect(";")); + } + if (value == "default") { + cx.marked = "keyword"; + return cont(expression, expect(";")); + } + if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";")); + return pass(statement); + } + function exportField(type, value) { + if (value == "as") { + cx.marked = "keyword"; + return cont(expect("variable")); + } + if (type == "variable") return pass(expressionNoComma, exportField); + } + function afterImport(type) { + if (type == "string") return cont(); + if (type == "(") return pass(expression); + if (type == ".") return pass(maybeoperatorComma); + return pass(importSpec, maybeMoreImports, maybeFrom); + } + function importSpec(type, value) { + if (type == "{") return contCommasep(importSpec, "}"); + if (type == "variable") register(value); + if (value == "*") cx.marked = "keyword"; + return cont(maybeAs); + } + function maybeMoreImports(type) { + if (type == ",") return cont(importSpec, maybeMoreImports); + } + function maybeAs(_type, value) { + if (value == "as") { + cx.marked = "keyword"; + return cont(importSpec); + } + } + function maybeFrom(_type, value) { + if (value == "from") { + cx.marked = "keyword"; + return cont(expression); + } + } + function arrayLiteral(type) { + if (type == "]") return cont(); + return pass(commasep(expressionNoComma, "]")); + } + function enumdef() { + return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex); + } + function enummember() { + return pass(pattern, maybeAssign); + } + function isContinuedStatement(state, textAfter) { + return state.lastType == "operator" || state.lastType == "," || isOperatorChar.test(textAfter.charAt(0)) || /[,.]/.test(textAfter.charAt(0)); + } + function expressionAllowed(stream, state, backUp) { + return state.tokenize == tokenBase && /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) || state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))); + } + + // Interface + + return { + startState: function (basecolumn) { + var state = { + tokenize: tokenBase, + lastType: "sof", + cc: [], + lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), + localVars: parserConfig.localVars, + context: parserConfig.localVars && new Context(null, null, false), + indented: basecolumn || 0 + }; + if (parserConfig.globalVars && typeof parserConfig.globalVars == "object") state.globalVars = parserConfig.globalVars; + return state; + }, + token: function (stream, state) { + if (stream.sol()) { + if (!state.lexical.hasOwnProperty("align")) state.lexical.align = false; + state.indented = stream.indentation(); + findFatArrow(stream, state); + } + if (state.tokenize != tokenComment && stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type; + return parseJS(state, style, type, content, stream); + }, + indent: function (state, textAfter) { + if (state.tokenize == tokenComment || state.tokenize == tokenQuasi) return CodeMirror.Pass; + if (state.tokenize != tokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), + lexical = state.lexical, + top; + // Kludge to prevent 'maybelse' from blocking lexical scope pops + if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) { + var c = state.cc[i]; + if (c == poplex) lexical = lexical.prev;else if (c != maybeelse && c != popcontext) break; + } + while ((lexical.type == "stat" || lexical.type == "form") && (firstChar == "}" || (top = state.cc[state.cc.length - 1]) && (top == maybeoperatorComma || top == maybeoperatorNoComma) && !/^[,\.=+\-*:?[\(]/.test(textAfter))) lexical = lexical.prev; + if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat") lexical = lexical.prev; + var type = lexical.type, + closing = firstChar == type; + if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);else if (type == "form" && firstChar == "{") return lexical.indented;else if (type == "form") return lexical.indented + indentUnit;else if (type == "stat") return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false) return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);else if (lexical.align) return lexical.column + (closing ? 0 : 1);else return lexical.indented + (closing ? 0 : indentUnit); + }, + electricInput: /^\s*(?:case .*?:|default:|\{|\})$/, + blockCommentStart: jsonMode ? null : "/*", + blockCommentEnd: jsonMode ? null : "*/", + blockCommentContinue: jsonMode ? null : " * ", + lineComment: jsonMode ? null : "//", + fold: "brace", + closeBrackets: "()[]{}''\"\"``", + helperType: jsonMode ? "json" : "javascript", + jsonldMode: jsonldMode, + jsonMode: jsonMode, + expressionAllowed: expressionAllowed, + skipExpression: function (state) { + parseJS(state, "atom", "atom", "true", new CodeMirror.StringStream("", 2, null)); + } + }; + }); + CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/); + CodeMirror.defineMIME("text/javascript", "javascript"); + CodeMirror.defineMIME("text/ecmascript", "javascript"); + CodeMirror.defineMIME("application/javascript", "javascript"); + CodeMirror.defineMIME("application/x-javascript", "javascript"); + CodeMirror.defineMIME("application/ecmascript", "javascript"); + CodeMirror.defineMIME("application/json", { + name: "javascript", + json: true + }); + CodeMirror.defineMIME("application/x-json", { + name: "javascript", + json: true + }); + CodeMirror.defineMIME("application/manifest+json", { + name: "javascript", + json: true + }); + CodeMirror.defineMIME("application/ld+json", { + name: "javascript", + jsonld: true + }); + CodeMirror.defineMIME("text/typescript", { + name: "javascript", + typescript: true + }); + CodeMirror.defineMIME("application/typescript", { + name: "javascript", + typescript: true + }); +}); + +/***/ }), + /***/ "../../../node_modules/copy-to-clipboard/index.js": /*!********************************************************!*\ !*** ../../../node_modules/copy-to-clipboard/index.js ***! \********************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; var deselectCurrent = __webpack_require__(/*! toggle-selection */ "../../../node_modules/toggle-selection/index.js"); @@ -11488,6 +28739,7 @@ module.exports = copy; \***********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -11504,6 +28756,7 @@ const isNode = exports.isNode = false; \****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) { @@ -12065,6 +29318,7 @@ exports.decodeXML = decodeXML; \**************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; // Adapted from https://github.com/mathiasbynens/he/blob/36afe179392226cf1b6ccdb16ebbb7a5a844d93a/src/he.js#L106-L134 @@ -12124,6 +29378,7 @@ exports["default"] = decodeCodePoint; \****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; var __importDefault = void 0 && (void 0).__importDefault || function (mod) { @@ -12209,6 +29464,7 @@ function encodeHTMLTrieRe(regExp, str) { \****************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -12322,6 +29578,7 @@ exports.escapeText = getEscaper(/[&<>\u00A0]/g, new Map([[38, "&"], [60, "&l \************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; // Generated using scripts/write-decode-map.ts @@ -12342,6 +29599,7 @@ exports["default"] = new Uint16Array( \***********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; // Generated using scripts/write-decode-map.ts @@ -12362,6 +29620,7 @@ exports["default"] = new Uint16Array( \*******************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; // Generated using scripts/write-encode-map.ts @@ -12636,6 +29895,7 @@ exports["default"] = new Map( /* #__PURE__ */restoreDiff([[9, " "], [0, "&Ne \***************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -12880,6 +30140,7 @@ Object.defineProperty(exports, "decodeXMLStrict", ({ \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -21547,6 +38808,7 @@ exports.wrapHandler = wrapHandler; \*************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -21667,6 +38929,7 @@ exports.getFrameData = getFrameData; \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -21697,6 +38960,7 @@ exports.getNonce = getNonce; \************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; /*! @@ -21799,6 +39063,7 @@ function isValidObject(val) { \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -22367,6 +39632,7 @@ function isWebSocket(val) { \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -22568,6 +39834,7 @@ function stringifyMessage(msg, replacer) { \*****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; var __createBinding = void 0 && (void 0).__createBinding || (Object.create ? function (o, m, k, k2) { @@ -22604,6 +39871,7 @@ __exportStar(__webpack_require__(/*! ./common */ "../../../node_modules/graphql- \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -22917,6 +40185,7 @@ function handleProtocols(protocols) { \******************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -22980,6 +40249,7 @@ function limitCloseReason(reason, whenTooLong) { \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -23195,6 +40465,7 @@ function formatError(error) { \*****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -23242,6 +40513,7 @@ var _locatedError = __webpack_require__(/*! ./locatedError.mjs */ "../../../node \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -23283,6 +40555,7 @@ function isLocatedGraphQLError(error) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -23310,6 +40583,7 @@ function syntaxError(source, position, description) { \*****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -23450,6 +40724,7 @@ function getFieldEntryKey(node) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24127,6 +41402,7 @@ function getFieldDef(schema, parentType, fieldNode) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24205,6 +41481,7 @@ var _values = __webpack_require__(/*! ./values.mjs */ "../../../node_modules/gra \********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24271,6 +41548,7 @@ function mapAsyncIterator(iterable, callback) { \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24470,6 +41748,7 @@ async function executeSubscription(exeContext) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24661,6 +41940,7 @@ function hasOwnProperty(obj, prop) { \*************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -24790,6 +42070,7 @@ function graphqlImpl(args) { \***********************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26078,6 +43359,7 @@ var _index6 = __webpack_require__(/*! ./utilities/index.mjs */ "../../../node_mo \******************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26117,6 +43399,7 @@ function pathToArray(path) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26138,6 +43421,7 @@ function devAssert(condition, message) { \************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26177,6 +43461,7 @@ function didYouMean(firstArg, secondArg) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26208,6 +43493,7 @@ function groupBy(list, keyFn) { \**************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26229,6 +43515,7 @@ function identityFunc(x) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26328,6 +43615,7 @@ function getObjectTag(object) { \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26391,6 +43679,7 @@ spurious results.`); \***********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26412,6 +43701,7 @@ function invariant(condition, message) { \*****************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26434,6 +43724,7 @@ function isAsyncIterable(maybeAsyncIterable) { \******************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26469,6 +43760,7 @@ function isIterableObject(maybeIterable) { \**************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26491,6 +43783,7 @@ function isObjectLike(value) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26513,6 +43806,7 @@ function isPromise(value) { \********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26562,6 +43856,7 @@ function keyMap(list, keyFn) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26601,6 +43896,7 @@ function keyValMap(list, keyFn, valFn) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26627,6 +43923,7 @@ function mapValue(map, fn) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26669,6 +43966,7 @@ function memoize3(fn) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26734,6 +44032,7 @@ function isDigit(code) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26755,6 +44054,7 @@ function printPathArray(path) { \******************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26786,6 +44086,7 @@ function promiseForObject(object) { \***************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26816,6 +44117,7 @@ function promiseReduce(values, callbackFn, initialValue) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26938,6 +44240,7 @@ function stringToArray(str) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26968,6 +44271,7 @@ class NonErrorThrown extends Error { \**********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -26996,6 +44300,7 @@ function toObjMap(obj) { \******************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27186,6 +44491,7 @@ var OperationTypeNode; \**************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27341,6 +44647,7 @@ function printBlockString(value, options) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27424,6 +44731,7 @@ function isNameContinue(code) { \********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27470,6 +44778,7 @@ var DirectiveLocation; \********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27682,6 +44991,7 @@ var _directiveLocation = __webpack_require__(/*! ./directiveLocation.mjs */ "../ \********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -27752,6 +45062,7 @@ var Kind; \********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -28480,6 +45791,7 @@ function readName(lexer, start) { \***********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -28521,6 +45833,7 @@ function getLocation(source, position) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -29871,6 +47184,7 @@ function getTokenKindDesc(kind) { \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -29926,6 +47240,7 @@ function isTypeExtensionNode(node) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -29983,6 +47298,7 @@ function printPrefixedLines(lines) { \**************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30022,6 +47338,7 @@ const escapeSequences = ['\\u0000', '\\u0001', '\\u0002', '\\u0003', '\\u0004', \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30380,6 +47697,7 @@ function hasMultilineItems(maybeArray) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30431,6 +47749,7 @@ function isSource(source) { \************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30481,6 +47800,7 @@ var TokenKind; \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30807,6 +48127,7 @@ function getVisitFn(visitor, kind, isLeaving) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -30858,6 +48179,7 @@ function assertEnumValueName(name) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -31823,6 +49145,7 @@ function isRequiredInputField(field) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -32000,6 +49323,7 @@ function isSpecifiedDirective(directive) { \****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -32555,6 +49879,7 @@ var _assertName = __webpack_require__(/*! ./assertName.mjs */ "../../../node_mod \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -33073,6 +50398,7 @@ function isIntrospectionType(type) { \******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -33297,6 +50623,7 @@ function serializeObject(outputValue) { \*****************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -33617,6 +50944,7 @@ function collectReferencedTypes(type, typeSet) { \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34024,6 +51352,7 @@ function getDeprecatedDirectiveNode(definitionNode) { \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34322,6 +51651,7 @@ function visitWithTypeInfo(typeInfo, visitor) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34372,6 +51702,7 @@ function isValidNameError(name) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34537,6 +51868,7 @@ const integerStringRegExp = /^-?(?:0|[1-9][0-9]*)$/; \******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34628,6 +51960,7 @@ function buildSchema(source, options) { \*********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -34888,6 +52221,7 @@ function buildClientSchema(introspection, options) { \********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -35017,6 +52351,7 @@ function coerceInputValueImpl(inputValue, type, onError, path) { \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -35049,6 +52384,7 @@ function concatAST(documents) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -35595,6 +52931,7 @@ function isOneOf(node) { \***********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -35991,6 +53328,7 @@ function diff(oldArray, newArray) { \*************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36136,6 +53474,7 @@ function getIntrospectionQuery(options) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36178,6 +53517,7 @@ function getOperationAST(documentAST, operationName) { \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36231,6 +53571,7 @@ function getOperationRootType(schema, operation) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36452,6 +53793,7 @@ var _findBreakingChanges = __webpack_require__(/*! ./findBreakingChanges.mjs */ \***************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36498,6 +53840,7 @@ function introspectionFromSchema(schema, options) { \***************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36649,6 +53992,7 @@ function sortBy(array, mapToKey) { \***************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36856,6 +54200,7 @@ function printDescription(def, indentation = '', firstInBlock = true) { \**********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36937,6 +54282,7 @@ function collectDependencies(selectionSet) { \*****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -36990,6 +54336,7 @@ function sortFields(fields) { \**************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37103,6 +54450,7 @@ function stripIgnoredCharacters(source) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37207,6 +54555,7 @@ function doTypesOverlap(schema, typeA, typeB) { \***************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37240,6 +54589,7 @@ function typeFromAST(schema, typeNode) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37398,6 +54748,7 @@ function isMissingVariable(valueNode, variables) { \***********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37452,6 +54803,7 @@ function valueFromASTUntyped(valueNode, variables) { \**********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37636,6 +54988,7 @@ exports.ValidationContext = ValidationContext; \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37936,6 +55289,7 @@ var _NoSchemaIntrospectionCustomRule = __webpack_require__(/*! ./rules/custom/No \************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -37977,6 +55331,7 @@ function ExecutableDefinitionsRule(context) { \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38089,6 +55444,7 @@ function getSuggestedFieldNames(type, fieldName) { \****************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38142,6 +55498,7 @@ function FragmentsOnCompositeTypesRule(context) { \*********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38233,6 +55590,7 @@ function KnownArgumentNamesOnDirectivesRule(context) { \******************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38360,6 +55718,7 @@ function getDirectiveLocationForOperation(operation) { \*********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38397,6 +55756,7 @@ function KnownFragmentNamesRule(context) { \*****************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38458,6 +55818,7 @@ function isSDLNode(value) { \*************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38498,6 +55859,7 @@ function LoneAnonymousOperationRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38541,6 +55903,7 @@ function LoneSchemaDefinitionRule(context) { \************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38620,6 +55983,7 @@ function MaxIntrospectionDepthRule(context) { \*******************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38694,6 +56058,7 @@ function NoFragmentCyclesRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38744,6 +56109,7 @@ function NoUndefinedVariablesRule(context) { \********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38800,6 +56166,7 @@ function NoUnusedFragmentsRule(context) { \********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -38854,6 +56221,7 @@ function NoUnusedVariablesRule(context) { \*******************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39318,6 +56686,7 @@ class PairSet { \**************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39381,6 +56750,7 @@ function getFragmentType(context, name) { \*************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39508,6 +56878,7 @@ function extensionKindToTypeName(kind) { \****************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39619,6 +56990,7 @@ function isRequiredArgumentNode(arg) { \**************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39668,6 +57040,7 @@ function ScalarLeafsRule(context) { \***************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39733,6 +57106,7 @@ function SingleFieldSubscriptionsRule(context) { \********************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39802,6 +57176,7 @@ function UniqueArgumentDefinitionNamesRule(context) { \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39849,6 +57224,7 @@ function UniqueArgumentNamesRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39893,6 +57269,7 @@ function UniqueDirectiveNamesRule(context) { \******************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -39970,6 +57347,7 @@ function UniqueDirectivesPerLocationRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40029,6 +57407,7 @@ function UniqueEnumValueNamesRule(context) { \*****************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40097,6 +57476,7 @@ function hasField(type, fieldName) { \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40137,6 +57517,7 @@ function UniqueFragmentNamesRule(context) { \************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40189,6 +57570,7 @@ function UniqueInputFieldNamesRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40231,6 +57613,7 @@ function UniqueOperationNamesRule(context) { \***********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40289,6 +57672,7 @@ function UniqueOperationTypesRule(context) { \******************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40339,6 +57723,7 @@ function UniqueTypeNamesRule(context) { \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40381,6 +57766,7 @@ function UniqueVariableNamesRule(context) { \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40550,6 +57936,7 @@ function validateOneOfInputObject(context, node, type, fieldNodeMap, variableDef \*************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40591,6 +57978,7 @@ function VariablesAreInputTypesRule(context) { \*****************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40677,6 +58065,7 @@ function allowedVariableUsage(schema, varType, varDefaultValue, locationType, lo \****************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40762,6 +58151,7 @@ function NoDeprecatedCustomRule(context) { \*************************************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40802,6 +58192,7 @@ function NoSchemaIntrospectionCustomRule(context) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -40925,6 +58316,7 @@ const specifiedSDLRules = exports.specifiedSDLRules = Object.freeze([_LoneSchema \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -41040,6 +58432,7 @@ function assertValidSDLExtension(documentAST, schema) { \*************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -41072,6 +58465,7 @@ const versionInfo = exports.versionInfo = Object.freeze({ \**************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -41103,6 +58497,7 @@ if (true) { \******************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; /*! * is-plain-object * @@ -41145,6 +58540,7 @@ module.exports = function isPlainObject(o) { \***************************************************/ /***/ (function(module) { +"use strict"; /*! * is-primitive * @@ -41169,6 +58565,7 @@ module.exports = function isPrimitive(val) { \**********************************************/ /***/ (function(module) { +"use strict"; var toString = {}.toString; @@ -41184,6 +58581,7 @@ module.exports = Array.isArray || function (arr) { \***********************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; /*! * isobject * @@ -41206,6 +58604,7 @@ module.exports = function isObject(val) { \***********************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; var uc_micro = __webpack_require__(/*! uc.micro */ "../../../node_modules/uc.micro/build/index.cjs.js"); @@ -41899,6 +59298,7 @@ module.exports = LinkifyIt; \***********************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; var mdurl = __webpack_require__(/*! mdurl */ "../../../node_modules/mdurl/build/index.cjs.js"); @@ -47438,6 +64838,7 @@ module.exports = MarkdownIt; \******************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; /* eslint-disable no-bitwise */ @@ -47934,6 +65335,7 @@ exports.parse = urlParse; \****************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; var e = new TextDecoder(); @@ -48003,6 +65405,7 @@ exports.meros = t; \******************************************************/ /***/ (function(module) { +"use strict"; function nullthrows(x, message) { @@ -48027,6 +65430,7 @@ Object.defineProperty(module.exports, "__esModule", ({ \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -48981,6 +66385,7 @@ exports.wrap = wrap; \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; /** Highest positive signed 32-bit float value */ @@ -49415,12 +66820,293 @@ var _default = exports["default"] = punycode; /***/ }), +/***/ "../../../node_modules/react-compiler-runtime/dist/index.js": +/*!******************************************************************!*\ + !*** ../../../node_modules/react-compiler-runtime/dist/index.js ***! + \******************************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + +/** + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @lightSyntaxTransform + * @noflow + * @nolint + * @preventMunge + * @preserve-invariant-messages + */ + +"use no memo"; +'use strict'; + +var React = __webpack_require__(/*! react */ "react"); +function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { + return e[k]; + } + }); + } + }); + } + n.default = e; + return Object.freeze(n); +} +var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React); +var _a, _b; +const { + useRef, + useEffect, + isValidElement +} = React__namespace; +const ReactSecretInternals = (_a = React__namespace.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE) !== null && _a !== void 0 ? _a : React__namespace.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; +const $empty = Symbol.for('react.memo_cache_sentinel'); +const c = typeof ((_b = React__namespace.__COMPILER_RUNTIME) === null || _b === void 0 ? void 0 : _b.c) === 'function' ? React__namespace.__COMPILER_RUNTIME.c : function c(size) { + return React__namespace.useMemo(() => { + const $ = new Array(size); + for (let ii = 0; ii < size; ii++) { + $[ii] = $empty; + } + $[$empty] = true; + return $; + }, []); +}; +const LazyGuardDispatcher = {}; +['readContext', 'useCallback', 'useContext', 'useEffect', 'useImperativeHandle', 'useInsertionEffect', 'useLayoutEffect', 'useMemo', 'useReducer', 'useRef', 'useState', 'useDebugValue', 'useDeferredValue', 'useTransition', 'useMutableSource', 'useSyncExternalStore', 'useId', 'unstable_isNewReconciler', 'getCacheSignal', 'getCacheForType', 'useCacheRefresh'].forEach(name => { + LazyGuardDispatcher[name] = () => { + throw new Error(`[React] Unexpected React hook call (${name}) from a React compiled function. ` + "Check that all hooks are called directly and named according to convention ('use[A-Z]') "); + }; +}); +let originalDispatcher = null; +LazyGuardDispatcher['useMemoCache'] = count => { + if (originalDispatcher == null) { + throw new Error('React Compiler internal invariant violation: unexpected null dispatcher'); + } else { + return originalDispatcher.useMemoCache(count); + } +}; +var GuardKind; +(function (GuardKind) { + GuardKind[GuardKind["PushGuardContext"] = 0] = "PushGuardContext"; + GuardKind[GuardKind["PopGuardContext"] = 1] = "PopGuardContext"; + GuardKind[GuardKind["PushExpectHook"] = 2] = "PushExpectHook"; + GuardKind[GuardKind["PopExpectHook"] = 3] = "PopExpectHook"; +})(GuardKind || (GuardKind = {})); +function setCurrent(newDispatcher) { + ReactSecretInternals.ReactCurrentDispatcher.current = newDispatcher; + return ReactSecretInternals.ReactCurrentDispatcher.current; +} +const guardFrames = []; +function $dispatcherGuard(kind) { + const curr = ReactSecretInternals.ReactCurrentDispatcher.current; + if (kind === GuardKind.PushGuardContext) { + guardFrames.push(curr); + if (guardFrames.length === 1) { + originalDispatcher = curr; + } + if (curr === LazyGuardDispatcher) { + throw new Error(`[React] Unexpected call to custom hook or component from a React compiled function. ` + "Check that (1) all hooks are called directly and named according to convention ('use[A-Z]') " + 'and (2) components are returned as JSX instead of being directly invoked.'); + } + setCurrent(LazyGuardDispatcher); + } else if (kind === GuardKind.PopGuardContext) { + const lastFrame = guardFrames.pop(); + if (lastFrame == null) { + throw new Error('React Compiler internal error: unexpected null in guard stack'); + } + if (guardFrames.length === 0) { + originalDispatcher = null; + } + setCurrent(lastFrame); + } else if (kind === GuardKind.PushExpectHook) { + guardFrames.push(curr); + setCurrent(originalDispatcher); + } else if (kind === GuardKind.PopExpectHook) { + const lastFrame = guardFrames.pop(); + if (lastFrame == null) { + throw new Error('React Compiler internal error: unexpected null in guard stack'); + } + setCurrent(lastFrame); + } else { + throw new Error('React Compiler internal error: unreachable block' + kind); + } +} +function $reset($) { + for (let ii = 0; ii < $.length; ii++) { + $[ii] = $empty; + } +} +function $makeReadOnly() { + throw new Error('TODO: implement $makeReadOnly in react-compiler-runtime'); +} +const renderCounterRegistry = new Map(); +function clearRenderCounterRegistry() { + for (const counters of renderCounterRegistry.values()) { + counters.forEach(counter => { + counter.count = 0; + }); + } +} +function registerRenderCounter(name, val) { + let counters = renderCounterRegistry.get(name); + if (counters == null) { + counters = new Set(); + renderCounterRegistry.set(name, counters); + } + counters.add(val); +} +function removeRenderCounter(name, val) { + const counters = renderCounterRegistry.get(name); + if (counters == null) { + return; + } + counters.delete(val); +} +function useRenderCounter(name) { + const val = useRef(null); + if (val.current != null) { + val.current.count += 1; + } + useEffect(() => { + if (val.current == null) { + const counter = { + count: 0 + }; + registerRenderCounter(name, counter); + val.current = counter; + } + return () => { + if (val.current !== null) { + removeRenderCounter(name, val.current); + } + }; + }); +} +const seenErrors = new Set(); +function $structuralCheck(oldValue, newValue, variableName, fnName, kind, loc) { + function error(l, r, path, depth) { + const str = `${fnName}:${loc} [${kind}] ${variableName}${path} changed from ${l} to ${r} at depth ${depth}`; + if (seenErrors.has(str)) { + return; + } + seenErrors.add(str); + console.error(str); + } + const depthLimit = 2; + function recur(oldValue, newValue, path, depth) { + if (depth > depthLimit) { + return; + } else if (oldValue === newValue) { + return; + } else if (typeof oldValue !== typeof newValue) { + error(`type ${typeof oldValue}`, `type ${typeof newValue}`, path, depth); + } else if (typeof oldValue === 'object') { + const oldArray = Array.isArray(oldValue); + const newArray = Array.isArray(newValue); + if (oldValue === null && newValue !== null) { + error('null', `type ${typeof newValue}`, path, depth); + } else if (newValue === null) { + error(`type ${typeof oldValue}`, 'null', path, depth); + } else if (oldValue instanceof Map) { + if (!(newValue instanceof Map)) { + error(`Map instance`, `other value`, path, depth); + } else if (oldValue.size !== newValue.size) { + error(`Map instance with size ${oldValue.size}`, `Map instance with size ${newValue.size}`, path, depth); + } else { + for (const [k, v] of oldValue) { + if (!newValue.has(k)) { + error(`Map instance with key ${k}`, `Map instance without key ${k}`, path, depth); + } else { + recur(v, newValue.get(k), `${path}.get(${k})`, depth + 1); + } + } + } + } else if (newValue instanceof Map) { + error('other value', `Map instance`, path, depth); + } else if (oldValue instanceof Set) { + if (!(newValue instanceof Set)) { + error(`Set instance`, `other value`, path, depth); + } else if (oldValue.size !== newValue.size) { + error(`Set instance with size ${oldValue.size}`, `Set instance with size ${newValue.size}`, path, depth); + } else { + for (const v of newValue) { + if (!oldValue.has(v)) { + error(`Set instance without element ${v}`, `Set instance with element ${v}`, path, depth); + } + } + } + } else if (newValue instanceof Set) { + error('other value', `Set instance`, path, depth); + } else if (oldArray || newArray) { + if (oldArray !== newArray) { + error(`type ${oldArray ? 'array' : 'object'}`, `type ${newArray ? 'array' : 'object'}`, path, depth); + } else if (oldValue.length !== newValue.length) { + error(`array with length ${oldValue.length}`, `array with length ${newValue.length}`, path, depth); + } else { + for (let ii = 0; ii < oldValue.length; ii++) { + recur(oldValue[ii], newValue[ii], `${path}[${ii}]`, depth + 1); + } + } + } else if (isValidElement(oldValue) || isValidElement(newValue)) { + if (isValidElement(oldValue) !== isValidElement(newValue)) { + error(`type ${isValidElement(oldValue) ? 'React element' : 'object'}`, `type ${isValidElement(newValue) ? 'React element' : 'object'}`, path, depth); + } else if (oldValue.type !== newValue.type) { + error(`React element of type ${oldValue.type}`, `React element of type ${newValue.type}`, path, depth); + } else { + recur(oldValue.props, newValue.props, `[props of ${path}]`, depth + 1); + } + } else { + for (const key in newValue) { + if (!(key in oldValue)) { + error(`object without key ${key}`, `object with key ${key}`, path, depth); + } + } + for (const key in oldValue) { + if (!(key in newValue)) { + error(`object with key ${key}`, `object without key ${key}`, path, depth); + } else { + recur(oldValue[key], newValue[key], `${path}.${key}`, depth + 1); + } + } + } + } else if (typeof oldValue === 'function') { + return; + } else if (isNaN(oldValue) || isNaN(newValue)) { + if (isNaN(oldValue) !== isNaN(newValue)) { + error(`${isNaN(oldValue) ? 'NaN' : 'non-NaN value'}`, `${isNaN(newValue) ? 'NaN' : 'non-NaN value'}`, path, depth); + } + } else if (oldValue !== newValue) { + error(oldValue, newValue, path, depth); + } + } + recur(oldValue, newValue, '', 0); +} +exports.$dispatcherGuard = $dispatcherGuard; +exports.$makeReadOnly = $makeReadOnly; +exports.$reset = $reset; +exports.$structuralCheck = $structuralCheck; +exports.c = c; +exports.clearRenderCounterRegistry = clearRenderCounterRegistry; +exports.renderCounterRegistry = renderCounterRegistry; +exports.useRenderCounter = useRenderCounter; + +/***/ }), + /***/ "../../../node_modules/react-remove-scroll-bar/dist/es2015/component.js": /*!******************************************************************************!*\ !*** ../../../node_modules/react-remove-scroll-bar/dist/es2015/component.js ***! \******************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49472,6 +67158,7 @@ exports.RemoveScrollBar = RemoveScrollBar; \******************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49495,6 +67182,7 @@ var removedBarSizeVariable = exports.removedBarSizeVariable = '--removed-body-sc \**************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49548,6 +67236,7 @@ var _utils = __webpack_require__(/*! ./utils */ "../../../node_modules/react-rem \**************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49602,6 +67291,7 @@ exports.getGapWidth = getGapWidth; \****************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49632,6 +67322,7 @@ var _default = exports["default"] = ReactRemoveScroll; \***************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49822,6 +67513,7 @@ function RemoveScrollSideCar(props) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49900,6 +67592,7 @@ RemoveScroll.classNames = { \*********************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -49935,6 +67628,7 @@ var nonPassive = exports.nonPassive = passiveSupported ? { \*****************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50052,6 +67746,7 @@ exports.handleScroll = handleScroll; \**********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50074,6 +67769,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de \***********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50091,6 +67787,7 @@ var effectCar = exports.effectCar = (0, _useSidecar.createSidecarMedium)(); \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50110,6 +67807,7 @@ var _default = exports["default"] = (0, _useSidecar.exportSidecar)(_medium.effec \****************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50143,6 +67841,7 @@ exports.styleSingleton = styleSingleton; \***********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50183,6 +67882,7 @@ exports.styleHookSingleton = styleHookSingleton; \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50218,6 +67918,7 @@ var _hook = __webpack_require__(/*! ./hook */ "../../../node_modules/react-style \****************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -50280,6 +67981,7 @@ exports.stylesheetSingleton = stylesheetSingleton; \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; /** * @license React * react-jsx-runtime.development.js @@ -51418,6 +69120,7 @@ if (true) { \**************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; if (false) {} else { @@ -51432,6 +69135,7 @@ if (false) {} else { \************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; /*! * set-value * @@ -51578,6 +69282,7 @@ module.exports = setValue; \**********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -51802,6 +69507,7 @@ exports.vw = vw; \*******************************************************/ /***/ (function(module) { +"use strict"; module.exports = function () { @@ -51844,6 +69550,7 @@ module.exports = function () { \*************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52412,6 +70119,7 @@ var _default = exports["default"] = { \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; var regex$5 = /[\0-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]/; @@ -52435,6 +70143,7 @@ exports.Z = regex; \***********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52471,6 +70180,7 @@ function assignRef(ref, value) { \***********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52509,6 +70219,7 @@ function createCallbackRef(callback) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52585,6 +70296,7 @@ var _refToCallback = __webpack_require__(/*! ./refToCallback */ "../../../node_m \**********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52622,6 +70334,7 @@ function mergeRefs(refs) { \***************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52687,6 +70400,7 @@ function useRefToCallback(ref) { \**************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52718,6 +70432,7 @@ function transformRef(ref, transformer) { \*************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52756,6 +70471,7 @@ function useMergeRefs(refs, defaultValue) { \********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52812,6 +70528,7 @@ function useCallbackRef(initialValue, callback) { \*****************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52847,6 +70564,7 @@ function useTransformRef(ref, transformer) { \***************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52871,6 +70589,7 @@ exports.setConfig = setConfig; \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52891,6 +70610,7 @@ var env = exports.env = { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52927,6 +70647,7 @@ function exportSidecar(medium, exported) { \************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -52963,6 +70684,7 @@ function sidecar(importer, errorComponent) { \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -53032,6 +70754,7 @@ function useRealSidecar(importer, effect) { \**************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -53094,6 +70817,7 @@ var _exports = __webpack_require__(/*! ./exports */ "../../../node_modules/use-s \***************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -53205,6 +70929,7 @@ function createSidecarMedium(options) { \*******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -53273,6 +70998,7 @@ function renderCar(WrappedComponent, defaults) { \*************************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; /* -------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. @@ -55541,12584 +73267,20 @@ var Is; /***/ }), -/***/ "../../graphiql-react/dist/SchemaReference.cjs.js": -/*!********************************************************!*\ - !*** ../../graphiql-react/dist/SchemaReference.cjs.js ***! - \********************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); -const forEachState = __webpack_require__(/*! ./forEachState.cjs.js */ "../../graphiql-react/dist/forEachState.cjs.js"); -function getTypeInfo(schema, tokenState) { - const info = { - schema, - type: null, - parentType: null, - inputType: null, - directiveDef: null, - fieldDef: null, - argDef: null, - argDefs: null, - objectFieldDefs: null - }; - forEachState.forEachState(tokenState, state => { - var _a, _b; - switch (state.kind) { - case "Query": - case "ShortQuery": - info.type = schema.getQueryType(); - break; - case "Mutation": - info.type = schema.getMutationType(); - break; - case "Subscription": - info.type = schema.getSubscriptionType(); - break; - case "InlineFragment": - case "FragmentDefinition": - if (state.type) { - info.type = schema.getType(state.type); - } - break; - case "Field": - case "AliasedField": - info.fieldDef = info.type && state.name ? getFieldDef(schema, info.parentType, state.name) : null; - info.type = (_a = info.fieldDef) === null || _a === void 0 ? void 0 : _a.type; - break; - case "SelectionSet": - info.parentType = info.type ? graphql.getNamedType(info.type) : null; - break; - case "Directive": - info.directiveDef = state.name ? schema.getDirective(state.name) : null; - break; - case "Arguments": - const parentDef = state.prevState ? state.prevState.kind === "Field" ? info.fieldDef : state.prevState.kind === "Directive" ? info.directiveDef : state.prevState.kind === "AliasedField" ? state.prevState.name && getFieldDef(schema, info.parentType, state.prevState.name) : null : null; - info.argDefs = parentDef ? parentDef.args : null; - break; - case "Argument": - info.argDef = null; - if (info.argDefs) { - for (let i = 0; i < info.argDefs.length; i++) { - if (info.argDefs[i].name === state.name) { - info.argDef = info.argDefs[i]; - break; - } - } - } - info.inputType = (_b = info.argDef) === null || _b === void 0 ? void 0 : _b.type; - break; - case "EnumValue": - const enumType = info.inputType ? graphql.getNamedType(info.inputType) : null; - info.enumValue = enumType instanceof graphql.GraphQLEnumType ? find(enumType.getValues(), val => val.value === state.name) : null; - break; - case "ListValue": - const nullableType = info.inputType ? graphql.getNullableType(info.inputType) : null; - info.inputType = nullableType instanceof graphql.GraphQLList ? nullableType.ofType : null; - break; - case "ObjectValue": - const objectType = info.inputType ? graphql.getNamedType(info.inputType) : null; - info.objectFieldDefs = objectType instanceof graphql.GraphQLInputObjectType ? objectType.getFields() : null; - break; - case "ObjectField": - const objectField = state.name && info.objectFieldDefs ? info.objectFieldDefs[state.name] : null; - info.inputType = objectField === null || objectField === void 0 ? void 0 : objectField.type; - info.fieldDef = objectField; - break; - case "NamedType": - info.type = state.name ? schema.getType(state.name) : null; - break; - } - }); - return info; -} -function getFieldDef(schema, type, fieldName) { - if (fieldName === graphql.SchemaMetaFieldDef.name && schema.getQueryType() === type) { - return graphql.SchemaMetaFieldDef; - } - if (fieldName === graphql.TypeMetaFieldDef.name && schema.getQueryType() === type) { - return graphql.TypeMetaFieldDef; - } - if (fieldName === graphql.TypeNameMetaFieldDef.name && graphql.isCompositeType(type)) { - return graphql.TypeNameMetaFieldDef; - } - if (type && type.getFields) { - return type.getFields()[fieldName]; - } -} -function find(array, predicate) { - for (let i = 0; i < array.length; i++) { - if (predicate(array[i])) { - return array[i]; - } - } -} -function getFieldReference(typeInfo) { - return { - kind: "Field", - schema: typeInfo.schema, - field: typeInfo.fieldDef, - type: isMetaField(typeInfo.fieldDef) ? null : typeInfo.parentType - }; -} -function getDirectiveReference(typeInfo) { - return { - kind: "Directive", - schema: typeInfo.schema, - directive: typeInfo.directiveDef - }; -} -function getArgumentReference(typeInfo) { - return typeInfo.directiveDef ? { - kind: "Argument", - schema: typeInfo.schema, - argument: typeInfo.argDef, - directive: typeInfo.directiveDef - } : { - kind: "Argument", - schema: typeInfo.schema, - argument: typeInfo.argDef, - field: typeInfo.fieldDef, - type: isMetaField(typeInfo.fieldDef) ? null : typeInfo.parentType - }; -} -function getEnumValueReference(typeInfo) { - return { - kind: "EnumValue", - value: typeInfo.enumValue || void 0, - type: typeInfo.inputType ? graphql.getNamedType(typeInfo.inputType) : void 0 - }; -} -function getTypeReference(typeInfo, type) { - return { - kind: "Type", - schema: typeInfo.schema, - type: type || typeInfo.type - }; -} -function isMetaField(fieldDef) { - return fieldDef.name.slice(0, 2) === "__"; -} -exports.getArgumentReference = getArgumentReference; -exports.getDirectiveReference = getDirectiveReference; -exports.getEnumValueReference = getEnumValueReference; -exports.getFieldReference = getFieldReference; -exports.getTypeInfo = getTypeInfo; -exports.getTypeReference = getTypeReference; - -/***/ }), - -/***/ "../../graphiql-react/dist/brace-fold.cjs.js": -/*!***************************************************!*\ - !*** ../../graphiql-react/dist/brace-fold.cjs.js ***! - \***************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var braceFold$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - function bracketFolding(pairs) { - return function (cm, start) { - var line = start.line, - lineText = cm.getLine(line); - function findOpening(pair) { - var tokenType; - for (var at = start.ch, pass = 0;;) { - var found2 = at <= 0 ? -1 : lineText.lastIndexOf(pair[0], at - 1); - if (found2 == -1) { - if (pass == 1) break; - pass = 1; - at = lineText.length; - continue; - } - if (pass == 1 && found2 < start.ch) break; - tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found2 + 1)); - if (!/^(comment|string)/.test(tokenType)) return { - ch: found2 + 1, - tokenType, - pair - }; - at = found2 - 1; - } - } - function findRange(found2) { - var count = 1, - lastLine = cm.lastLine(), - end, - startCh = found2.ch, - endCh; - outer: for (var i2 = line; i2 <= lastLine; ++i2) { - var text = cm.getLine(i2), - pos = i2 == line ? startCh : 0; - for (;;) { - var nextOpen = text.indexOf(found2.pair[0], pos), - nextClose = text.indexOf(found2.pair[1], pos); - if (nextOpen < 0) nextOpen = text.length; - if (nextClose < 0) nextClose = text.length; - pos = Math.min(nextOpen, nextClose); - if (pos == text.length) break; - if (cm.getTokenTypeAt(CodeMirror.Pos(i2, pos + 1)) == found2.tokenType) { - if (pos == nextOpen) ++count;else if (! --count) { - end = i2; - endCh = pos; - break outer; - } - } - ++pos; - } - } - if (end == null || line == end) return null; - return { - from: CodeMirror.Pos(line, startCh), - to: CodeMirror.Pos(end, endCh) - }; - } - var found = []; - for (var i = 0; i < pairs.length; i++) { - var open = findOpening(pairs[i]); - if (open) found.push(open); - } - found.sort(function (a, b) { - return a.ch - b.ch; - }); - for (var i = 0; i < found.length; i++) { - var range = findRange(found[i]); - if (range) return range; - } - return null; - }; - } - CodeMirror.registerHelper("fold", "brace", bracketFolding([["{", "}"], ["[", "]"]])); - CodeMirror.registerHelper("fold", "brace-paren", bracketFolding([["{", "}"], ["[", "]"], ["(", ")"]])); - CodeMirror.registerHelper("fold", "import", function (cm, start) { - function hasImport(line) { - if (line < cm.firstLine() || line > cm.lastLine()) return null; - var start2 = cm.getTokenAt(CodeMirror.Pos(line, 1)); - if (!/\S/.test(start2.string)) start2 = cm.getTokenAt(CodeMirror.Pos(line, start2.end + 1)); - if (start2.type != "keyword" || start2.string != "import") return null; - for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) { - var text = cm.getLine(i), - semi = text.indexOf(";"); - if (semi != -1) return { - startCh: start2.end, - end: CodeMirror.Pos(i, semi) - }; - } - } - var startLine = start.line, - has = hasImport(startLine), - prev; - if (!has || hasImport(startLine - 1) || (prev = hasImport(startLine - 2)) && prev.end.line == startLine - 1) return null; - for (var end = has.end;;) { - var next = hasImport(end.line + 1); - if (next == null) break; - end = next.end; - } - return { - from: cm.clipPos(CodeMirror.Pos(startLine, has.startCh + 1)), - to: end - }; - }); - CodeMirror.registerHelper("fold", "include", function (cm, start) { - function hasInclude(line) { - if (line < cm.firstLine() || line > cm.lastLine()) return null; - var start2 = cm.getTokenAt(CodeMirror.Pos(line, 1)); - if (!/\S/.test(start2.string)) start2 = cm.getTokenAt(CodeMirror.Pos(line, start2.end + 1)); - if (start2.type == "meta" && start2.string.slice(0, 8) == "#include") return start2.start + 8; - } - var startLine = start.line, - has = hasInclude(startLine); - if (has == null || hasInclude(startLine - 1) != null) return null; - for (var end = startLine;;) { - var next = hasInclude(end + 1); - if (next == null) break; - ++end; - } - return { - from: CodeMirror.Pos(startLine, has + 1), - to: cm.clipPos(CodeMirror.Pos(end)) - }; - }); - }); -})(); -var braceFoldExports = braceFold$2.exports; -const braceFold = /* @__PURE__ */codemirror.getDefaultExportFromCjs(braceFoldExports); -const braceFold$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: braceFold -}, [braceFoldExports]); -exports.braceFold = braceFold$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/closebrackets.cjs.js": -/*!******************************************************!*\ - !*** ../../graphiql-react/dist/closebrackets.cjs.js ***! - \******************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var closebrackets$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var defaults = { - pairs: `()[]{}''""`, - closeBefore: `)]}'":;>`, - triples: "", - explode: "[]{}" - }; - var Pos = CodeMirror.Pos; - CodeMirror.defineOption("autoCloseBrackets", false, function (cm, val, old) { - if (old && old != CodeMirror.Init) { - cm.removeKeyMap(keyMap); - cm.state.closeBrackets = null; - } - if (val) { - ensureBound(getOption(val, "pairs")); - cm.state.closeBrackets = val; - cm.addKeyMap(keyMap); - } - }); - function getOption(conf, name) { - if (name == "pairs" && typeof conf == "string") return conf; - if (typeof conf == "object" && conf[name] != null) return conf[name]; - return defaults[name]; - } - var keyMap = { - Backspace: handleBackspace, - Enter: handleEnter - }; - function ensureBound(chars) { - for (var i = 0; i < chars.length; i++) { - var ch = chars.charAt(i), - key = "'" + ch + "'"; - if (!keyMap[key]) keyMap[key] = handler(ch); - } - } - ensureBound(defaults.pairs + "`"); - function handler(ch) { - return function (cm) { - return handleChar(cm, ch); - }; - } - function getConfig(cm) { - var deflt = cm.state.closeBrackets; - if (!deflt || deflt.override) return deflt; - var mode = cm.getModeAt(cm.getCursor()); - return mode.closeBrackets || deflt; - } - function handleBackspace(cm) { - var conf = getConfig(cm); - if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass; - var pairs = getOption(conf, "pairs"); - var ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - if (!ranges[i].empty()) return CodeMirror.Pass; - var around = charsAround(cm, ranges[i].head); - if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass; - } - for (var i = ranges.length - 1; i >= 0; i--) { - var cur = ranges[i].head; - cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete"); - } - } - function handleEnter(cm) { - var conf = getConfig(cm); - var explode = conf && getOption(conf, "explode"); - if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass; - var ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - if (!ranges[i].empty()) return CodeMirror.Pass; - var around = charsAround(cm, ranges[i].head); - if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass; - } - cm.operation(function () { - var linesep = cm.lineSeparator() || "\n"; - cm.replaceSelection(linesep + linesep, null); - moveSel(cm, -1); - ranges = cm.listSelections(); - for (var i2 = 0; i2 < ranges.length; i2++) { - var line = ranges[i2].head.line; - cm.indentLine(line, null, true); - cm.indentLine(line + 1, null, true); - } - }); - } - function moveSel(cm, dir) { - var newRanges = [], - ranges = cm.listSelections(), - primary = 0; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.head == cm.getCursor()) primary = i; - var pos = range.head.ch || dir > 0 ? { - line: range.head.line, - ch: range.head.ch + dir - } : { - line: range.head.line - 1 - }; - newRanges.push({ - anchor: pos, - head: pos - }); - } - cm.setSelections(newRanges, primary); - } - function contractSelection(sel) { - var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0; - return { - anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)), - head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1)) - }; - } - function handleChar(cm, ch) { - var conf = getConfig(cm); - if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass; - var pairs = getOption(conf, "pairs"); - var pos = pairs.indexOf(ch); - if (pos == -1) return CodeMirror.Pass; - var closeBefore = getOption(conf, "closeBefore"); - var triples = getOption(conf, "triples"); - var identical = pairs.charAt(pos + 1) == ch; - var ranges = cm.listSelections(); - var opening = pos % 2 == 0; - var type; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], - cur = range.head, - curType; - var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1)); - if (opening && !range.empty()) { - curType = "surround"; - } else if ((identical || !opening) && next == ch) { - if (identical && stringStartsAfter(cm, cur)) curType = "both";else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch) curType = "skipThree";else curType = "skip"; - } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 && cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) { - if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass; - curType = "addFour"; - } else if (identical) { - var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur); - if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";else return CodeMirror.Pass; - } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) { - curType = "both"; - } else { - return CodeMirror.Pass; - } - if (!type) type = curType;else if (type != curType) return CodeMirror.Pass; - } - var left = pos % 2 ? pairs.charAt(pos - 1) : ch; - var right = pos % 2 ? ch : pairs.charAt(pos + 1); - cm.operation(function () { - if (type == "skip") { - moveSel(cm, 1); - } else if (type == "skipThree") { - moveSel(cm, 3); - } else if (type == "surround") { - var sels = cm.getSelections(); - for (var i2 = 0; i2 < sels.length; i2++) sels[i2] = left + sels[i2] + right; - cm.replaceSelections(sels, "around"); - sels = cm.listSelections().slice(); - for (var i2 = 0; i2 < sels.length; i2++) sels[i2] = contractSelection(sels[i2]); - cm.setSelections(sels); - } else if (type == "both") { - cm.replaceSelection(left + right, null); - cm.triggerElectric(left + right); - moveSel(cm, -1); - } else if (type == "addFour") { - cm.replaceSelection(left + left + left + left, "before"); - moveSel(cm, 1); - } - }); - } - function charsAround(cm, pos) { - var str = cm.getRange(Pos(pos.line, pos.ch - 1), Pos(pos.line, pos.ch + 1)); - return str.length == 2 ? str : null; - } - function stringStartsAfter(cm, pos) { - var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1)); - return /\bstring/.test(token.type) && token.start == pos.ch && (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos))); - } - }); -})(); -var closebracketsExports = closebrackets$2.exports; -const closebrackets = /* @__PURE__ */codemirror.getDefaultExportFromCjs(closebracketsExports); -const closebrackets$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: closebrackets -}, [closebracketsExports]); -exports.closebrackets = closebrackets$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/codemirror.cjs.js": -/*!***************************************************!*\ - !*** ../../graphiql-react/dist/codemirror.cjs.js ***! - \***************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror$1 = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var codemirrorExports = codemirror$1.requireCodemirror(); -const CodeMirror = /* @__PURE__ */codemirror$1.getDefaultExportFromCjs(codemirrorExports); -const codemirror = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: CodeMirror -}, [codemirrorExports]); -exports.CodeMirror = CodeMirror; -exports.codemirror = codemirror; - -/***/ }), - -/***/ "../../graphiql-react/dist/codemirror.cjs2.js": -/*!****************************************************!*\ - !*** ../../graphiql-react/dist/codemirror.cjs2.js ***! - \****************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof __webpack_require__.g !== "undefined" ? __webpack_require__.g : typeof self !== "undefined" ? self : {}; -function getDefaultExportFromCjs(x) { - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x; -} -var codemirror = { - exports: {} -}; -var hasRequiredCodemirror; -function requireCodemirror() { - if (hasRequiredCodemirror) return codemirror.exports; - hasRequiredCodemirror = 1; - (function (module2, exports2) { - (function (global2, factory) { - module2.exports = factory(); - })(commonjsGlobal, function () { - var userAgent = navigator.userAgent; - var platform = navigator.platform; - var gecko = /gecko\/\d/i.test(userAgent); - var ie_upto10 = /MSIE \d/.test(userAgent); - var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent); - var edge = /Edge\/(\d+)/.exec(userAgent); - var ie = ie_upto10 || ie_11up || edge; - var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1]); - var webkit = !edge && /WebKit\//.test(userAgent); - var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent); - var chrome = !edge && /Chrome\//.test(userAgent); - var presto = /Opera\//.test(userAgent); - var safari = /Apple Computer/.test(navigator.vendor); - var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent); - var phantom = /PhantomJS/.test(userAgent); - var ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2); - var android = /Android/.test(userAgent); - var mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent); - var mac = ios || /Mac/.test(platform); - var chromeOS = /\bCrOS\b/.test(userAgent); - var windows = /win/i.test(platform); - var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/); - if (presto_version) { - presto_version = Number(presto_version[1]); - } - if (presto_version && presto_version >= 15) { - presto = false; - webkit = true; - } - var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); - var captureRightClick = gecko || ie && ie_version >= 9; - function classTest(cls) { - return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); - } - var rmClass = function (node, cls) { - var current = node.className; - var match = classTest(cls).exec(current); - if (match) { - var after = current.slice(match.index + match[0].length); - node.className = current.slice(0, match.index) + (after ? match[1] + after : ""); - } - }; - function removeChildren(e) { - for (var count = e.childNodes.length; count > 0; --count) { - e.removeChild(e.firstChild); - } - return e; - } - function removeChildrenAndAdd(parent, e) { - return removeChildren(parent).appendChild(e); - } - function elt(tag, content, className, style) { - var e = document.createElement(tag); - if (className) { - e.className = className; - } - if (style) { - e.style.cssText = style; - } - if (typeof content == "string") { - e.appendChild(document.createTextNode(content)); - } else if (content) { - for (var i2 = 0; i2 < content.length; ++i2) { - e.appendChild(content[i2]); - } - } - return e; - } - function eltP(tag, content, className, style) { - var e = elt(tag, content, className, style); - e.setAttribute("role", "presentation"); - return e; - } - var range; - if (document.createRange) { - range = function (node, start, end, endNode) { - var r = document.createRange(); - r.setEnd(endNode || node, end); - r.setStart(node, start); - return r; - }; - } else { - range = function (node, start, end) { - var r = document.body.createTextRange(); - try { - r.moveToElementText(node.parentNode); - } catch (e) { - return r; - } - r.collapse(true); - r.moveEnd("character", end); - r.moveStart("character", start); - return r; - }; - } - function contains(parent, child) { - if (child.nodeType == 3) { - child = child.parentNode; - } - if (parent.contains) { - return parent.contains(child); - } - do { - if (child.nodeType == 11) { - child = child.host; - } - if (child == parent) { - return true; - } - } while (child = child.parentNode); - } - function activeElt() { - var activeElement; - try { - activeElement = document.activeElement; - } catch (e) { - activeElement = document.body || null; - } - while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement) { - activeElement = activeElement.shadowRoot.activeElement; - } - return activeElement; - } - function addClass(node, cls) { - var current = node.className; - if (!classTest(cls).test(current)) { - node.className += (current ? " " : "") + cls; - } - } - function joinClasses(a, b) { - var as = a.split(" "); - for (var i2 = 0; i2 < as.length; i2++) { - if (as[i2] && !classTest(as[i2]).test(b)) { - b += " " + as[i2]; - } - } - return b; - } - var selectInput = function (node) { - node.select(); - }; - if (ios) { - selectInput = function (node) { - node.selectionStart = 0; - node.selectionEnd = node.value.length; - }; - } else if (ie) { - selectInput = function (node) { - try { - node.select(); - } catch (_e) {} - }; - } - function bind(f) { - var args = Array.prototype.slice.call(arguments, 1); - return function () { - return f.apply(null, args); - }; - } - function copyObj(obj, target, overwrite) { - if (!target) { - target = {}; - } - for (var prop2 in obj) { - if (obj.hasOwnProperty(prop2) && (overwrite !== false || !target.hasOwnProperty(prop2))) { - target[prop2] = obj[prop2]; - } - } - return target; - } - function countColumn(string, end, tabSize, startIndex, startValue) { - if (end == null) { - end = string.search(/[^\s\u00a0]/); - if (end == -1) { - end = string.length; - } - } - for (var i2 = startIndex || 0, n = startValue || 0;;) { - var nextTab = string.indexOf(" ", i2); - if (nextTab < 0 || nextTab >= end) { - return n + (end - i2); - } - n += nextTab - i2; - n += tabSize - n % tabSize; - i2 = nextTab + 1; - } - } - var Delayed = function () { - this.id = null; - this.f = null; - this.time = 0; - this.handler = bind(this.onTimeout, this); - }; - Delayed.prototype.onTimeout = function (self2) { - self2.id = 0; - if (self2.time <= + /* @__PURE__ */new Date()) { - self2.f(); - } else { - setTimeout(self2.handler, self2.time - + /* @__PURE__ */new Date()); - } - }; - Delayed.prototype.set = function (ms, f) { - this.f = f; - var time = + /* @__PURE__ */new Date() + ms; - if (!this.id || time < this.time) { - clearTimeout(this.id); - this.id = setTimeout(this.handler, ms); - this.time = time; - } - }; - function indexOf(array, elt2) { - for (var i2 = 0; i2 < array.length; ++i2) { - if (array[i2] == elt2) { - return i2; - } - } - return -1; - } - var scrollerGap = 50; - var Pass = { - toString: function () { - return "CodeMirror.Pass"; - } - }; - var sel_dontScroll = { - scroll: false - }, - sel_mouse = { - origin: "*mouse" - }, - sel_move = { - origin: "+move" - }; - function findColumn(string, goal, tabSize) { - for (var pos = 0, col = 0;;) { - var nextTab = string.indexOf(" ", pos); - if (nextTab == -1) { - nextTab = string.length; - } - var skipped = nextTab - pos; - if (nextTab == string.length || col + skipped >= goal) { - return pos + Math.min(skipped, goal - col); - } - col += nextTab - pos; - col += tabSize - col % tabSize; - pos = nextTab + 1; - if (col >= goal) { - return pos; - } - } - } - var spaceStrs = [""]; - function spaceStr(n) { - while (spaceStrs.length <= n) { - spaceStrs.push(lst(spaceStrs) + " "); - } - return spaceStrs[n]; - } - function lst(arr) { - return arr[arr.length - 1]; - } - function map(array, f) { - var out = []; - for (var i2 = 0; i2 < array.length; i2++) { - out[i2] = f(array[i2], i2); - } - return out; - } - function insertSorted(array, value, score) { - var pos = 0, - priority = score(value); - while (pos < array.length && score(array[pos]) <= priority) { - pos++; - } - array.splice(pos, 0, value); - } - function nothing() {} - function createObj(base, props) { - var inst; - if (Object.create) { - inst = Object.create(base); - } else { - nothing.prototype = base; - inst = new nothing(); - } - if (props) { - copyObj(props, inst); - } - return inst; - } - var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/; - function isWordCharBasic(ch) { - return /\w/.test(ch) || ch > "€" && (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)); - } - function isWordChar(ch, helper) { - if (!helper) { - return isWordCharBasic(ch); - } - if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) { - return true; - } - return helper.test(ch); - } - function isEmpty(obj) { - for (var n in obj) { - if (obj.hasOwnProperty(n) && obj[n]) { - return false; - } - } - return true; - } - var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/; - function isExtendingChar(ch) { - return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); - } - function skipExtendingChars(str, pos, dir) { - while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) { - pos += dir; - } - return pos; - } - function findFirst(pred, from, to) { - var dir = from > to ? -1 : 1; - for (;;) { - if (from == to) { - return from; - } - var midF = (from + to) / 2, - mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF); - if (mid == from) { - return pred(mid) ? from : to; - } - if (pred(mid)) { - to = mid; - } else { - from = mid + dir; - } - } - } - function iterateBidiSections(order, from, to, f) { - if (!order) { - return f(from, to, "ltr", 0); - } - var found = false; - for (var i2 = 0; i2 < order.length; ++i2) { - var part = order[i2]; - if (part.from < to && part.to > from || from == to && part.to == from) { - f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i2); - found = true; - } - } - if (!found) { - f(from, to, "ltr"); - } - } - var bidiOther = null; - function getBidiPartAt(order, ch, sticky) { - var found; - bidiOther = null; - for (var i2 = 0; i2 < order.length; ++i2) { - var cur = order[i2]; - if (cur.from < ch && cur.to > ch) { - return i2; - } - if (cur.to == ch) { - if (cur.from != cur.to && sticky == "before") { - found = i2; - } else { - bidiOther = i2; - } - } - if (cur.from == ch) { - if (cur.from != cur.to && sticky != "before") { - found = i2; - } else { - bidiOther = i2; - } - } - } - return found != null ? found : bidiOther; - } - var bidiOrdering = /* @__PURE__ */function () { - var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"; - var arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111"; - function charType(code) { - if (code <= 247) { - return lowTypes.charAt(code); - } else if (1424 <= code && code <= 1524) { - return "R"; - } else if (1536 <= code && code <= 1785) { - return arabicTypes.charAt(code - 1536); - } else if (1774 <= code && code <= 2220) { - return "r"; - } else if (8192 <= code && code <= 8203) { - return "w"; - } else if (code == 8204) { - return "b"; - } else { - return "L"; - } - } - var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/; - var isNeutral = /[stwN]/, - isStrong = /[LRr]/, - countsAsLeft = /[Lb1n]/, - countsAsNum = /[1n]/; - function BidiSpan(level, from, to) { - this.level = level; - this.from = from; - this.to = to; - } - return function (str, direction) { - var outerType = direction == "ltr" ? "L" : "R"; - if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) { - return false; - } - var len = str.length, - types = []; - for (var i2 = 0; i2 < len; ++i2) { - types.push(charType(str.charCodeAt(i2))); - } - for (var i$12 = 0, prev = outerType; i$12 < len; ++i$12) { - var type = types[i$12]; - if (type == "m") { - types[i$12] = prev; - } else { - prev = type; - } - } - for (var i$22 = 0, cur = outerType; i$22 < len; ++i$22) { - var type$1 = types[i$22]; - if (type$1 == "1" && cur == "r") { - types[i$22] = "n"; - } else if (isStrong.test(type$1)) { - cur = type$1; - if (type$1 == "r") { - types[i$22] = "R"; - } - } - } - for (var i$3 = 1, prev$1 = types[0]; i$3 < len - 1; ++i$3) { - var type$2 = types[i$3]; - if (type$2 == "+" && prev$1 == "1" && types[i$3 + 1] == "1") { - types[i$3] = "1"; - } else if (type$2 == "," && prev$1 == types[i$3 + 1] && (prev$1 == "1" || prev$1 == "n")) { - types[i$3] = prev$1; - } - prev$1 = type$2; - } - for (var i$4 = 0; i$4 < len; ++i$4) { - var type$3 = types[i$4]; - if (type$3 == ",") { - types[i$4] = "N"; - } else if (type$3 == "%") { - var end = void 0; - for (end = i$4 + 1; end < len && types[end] == "%"; ++end) {} - var replace = i$4 && types[i$4 - 1] == "!" || end < len && types[end] == "1" ? "1" : "N"; - for (var j = i$4; j < end; ++j) { - types[j] = replace; - } - i$4 = end - 1; - } - } - for (var i$5 = 0, cur$1 = outerType; i$5 < len; ++i$5) { - var type$4 = types[i$5]; - if (cur$1 == "L" && type$4 == "1") { - types[i$5] = "L"; - } else if (isStrong.test(type$4)) { - cur$1 = type$4; - } - } - for (var i$6 = 0; i$6 < len; ++i$6) { - if (isNeutral.test(types[i$6])) { - var end$1 = void 0; - for (end$1 = i$6 + 1; end$1 < len && isNeutral.test(types[end$1]); ++end$1) {} - var before = (i$6 ? types[i$6 - 1] : outerType) == "L"; - var after = (end$1 < len ? types[end$1] : outerType) == "L"; - var replace$1 = before == after ? before ? "L" : "R" : outerType; - for (var j$1 = i$6; j$1 < end$1; ++j$1) { - types[j$1] = replace$1; - } - i$6 = end$1 - 1; - } - } - var order = [], - m; - for (var i$7 = 0; i$7 < len;) { - if (countsAsLeft.test(types[i$7])) { - var start = i$7; - for (++i$7; i$7 < len && countsAsLeft.test(types[i$7]); ++i$7) {} - order.push(new BidiSpan(0, start, i$7)); - } else { - var pos = i$7, - at = order.length, - isRTL = direction == "rtl" ? 1 : 0; - for (++i$7; i$7 < len && types[i$7] != "L"; ++i$7) {} - for (var j$2 = pos; j$2 < i$7;) { - if (countsAsNum.test(types[j$2])) { - if (pos < j$2) { - order.splice(at, 0, new BidiSpan(1, pos, j$2)); - at += isRTL; - } - var nstart = j$2; - for (++j$2; j$2 < i$7 && countsAsNum.test(types[j$2]); ++j$2) {} - order.splice(at, 0, new BidiSpan(2, nstart, j$2)); - at += isRTL; - pos = j$2; - } else { - ++j$2; - } - } - if (pos < i$7) { - order.splice(at, 0, new BidiSpan(1, pos, i$7)); - } - } - } - if (direction == "ltr") { - if (order[0].level == 1 && (m = str.match(/^\s+/))) { - order[0].from = m[0].length; - order.unshift(new BidiSpan(0, 0, m[0].length)); - } - if (lst(order).level == 1 && (m = str.match(/\s+$/))) { - lst(order).to -= m[0].length; - order.push(new BidiSpan(0, len - m[0].length, len)); - } - } - return direction == "rtl" ? order.reverse() : order; - }; - }(); - function getOrder(line, direction) { - var order = line.order; - if (order == null) { - order = line.order = bidiOrdering(line.text, direction); - } - return order; - } - var noHandlers = []; - var on = function (emitter, type, f) { - if (emitter.addEventListener) { - emitter.addEventListener(type, f, false); - } else if (emitter.attachEvent) { - emitter.attachEvent("on" + type, f); - } else { - var map2 = emitter._handlers || (emitter._handlers = {}); - map2[type] = (map2[type] || noHandlers).concat(f); - } - }; - function getHandlers(emitter, type) { - return emitter._handlers && emitter._handlers[type] || noHandlers; - } - function off(emitter, type, f) { - if (emitter.removeEventListener) { - emitter.removeEventListener(type, f, false); - } else if (emitter.detachEvent) { - emitter.detachEvent("on" + type, f); - } else { - var map2 = emitter._handlers, - arr = map2 && map2[type]; - if (arr) { - var index = indexOf(arr, f); - if (index > -1) { - map2[type] = arr.slice(0, index).concat(arr.slice(index + 1)); - } - } - } - } - function signal(emitter, type) { - var handlers = getHandlers(emitter, type); - if (!handlers.length) { - return; - } - var args = Array.prototype.slice.call(arguments, 2); - for (var i2 = 0; i2 < handlers.length; ++i2) { - handlers[i2].apply(null, args); - } - } - function signalDOMEvent(cm, e, override) { - if (typeof e == "string") { - e = { - type: e, - preventDefault: function () { - this.defaultPrevented = true; - } - }; - } - signal(cm, override || e.type, cm, e); - return e_defaultPrevented(e) || e.codemirrorIgnore; - } - function signalCursorActivity(cm) { - var arr = cm._handlers && cm._handlers.cursorActivity; - if (!arr) { - return; - } - var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []); - for (var i2 = 0; i2 < arr.length; ++i2) { - if (indexOf(set, arr[i2]) == -1) { - set.push(arr[i2]); - } - } - } - function hasHandler(emitter, type) { - return getHandlers(emitter, type).length > 0; - } - function eventMixin(ctor) { - ctor.prototype.on = function (type, f) { - on(this, type, f); - }; - ctor.prototype.off = function (type, f) { - off(this, type, f); - }; - } - function e_preventDefault(e) { - if (e.preventDefault) { - e.preventDefault(); - } else { - e.returnValue = false; - } - } - function e_stopPropagation(e) { - if (e.stopPropagation) { - e.stopPropagation(); - } else { - e.cancelBubble = true; - } - } - function e_defaultPrevented(e) { - return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false; - } - function e_stop(e) { - e_preventDefault(e); - e_stopPropagation(e); - } - function e_target(e) { - return e.target || e.srcElement; - } - function e_button(e) { - var b = e.which; - if (b == null) { - if (e.button & 1) { - b = 1; - } else if (e.button & 2) { - b = 3; - } else if (e.button & 4) { - b = 2; - } - } - if (mac && e.ctrlKey && b == 1) { - b = 3; - } - return b; - } - var dragAndDrop = function () { - if (ie && ie_version < 9) { - return false; - } - var div = elt("div"); - return "draggable" in div || "dragDrop" in div; - }(); - var zwspSupported; - function zeroWidthElement(measure) { - if (zwspSupported == null) { - var test = elt("span", "​"); - removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])); - if (measure.firstChild.offsetHeight != 0) { - zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); - } - } - var node = zwspSupported ? elt("span", "​") : elt("span", " ", null, "display: inline-block; width: 1px; margin-right: -1px"); - node.setAttribute("cm-text", ""); - return node; - } - var badBidiRects; - function hasBadBidiRects(measure) { - if (badBidiRects != null) { - return badBidiRects; - } - var txt = removeChildrenAndAdd(measure, document.createTextNode("AخA")); - var r0 = range(txt, 0, 1).getBoundingClientRect(); - var r1 = range(txt, 1, 2).getBoundingClientRect(); - removeChildren(measure); - if (!r0 || r0.left == r0.right) { - return false; - } - return badBidiRects = r1.right - r0.right < 3; - } - var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function (string) { - var pos = 0, - result = [], - l = string.length; - while (pos <= l) { - var nl = string.indexOf("\n", pos); - if (nl == -1) { - nl = string.length; - } - var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl); - var rt = line.indexOf("\r"); - if (rt != -1) { - result.push(line.slice(0, rt)); - pos += rt + 1; - } else { - result.push(line); - pos = nl + 1; - } - } - return result; - } : function (string) { - return string.split(/\r\n?|\n/); - }; - var hasSelection = window.getSelection ? function (te) { - try { - return te.selectionStart != te.selectionEnd; - } catch (e) { - return false; - } - } : function (te) { - var range2; - try { - range2 = te.ownerDocument.selection.createRange(); - } catch (e) {} - if (!range2 || range2.parentElement() != te) { - return false; - } - return range2.compareEndPoints("StartToEnd", range2) != 0; - }; - var hasCopyEvent = function () { - var e = elt("div"); - if ("oncopy" in e) { - return true; - } - e.setAttribute("oncopy", "return;"); - return typeof e.oncopy == "function"; - }(); - var badZoomedRects = null; - function hasBadZoomedRects(measure) { - if (badZoomedRects != null) { - return badZoomedRects; - } - var node = removeChildrenAndAdd(measure, elt("span", "x")); - var normal = node.getBoundingClientRect(); - var fromRange = range(node, 0, 1).getBoundingClientRect(); - return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1; - } - var modes = {}, - mimeModes = {}; - function defineMode(name, mode) { - if (arguments.length > 2) { - mode.dependencies = Array.prototype.slice.call(arguments, 2); - } - modes[name] = mode; - } - function defineMIME(mime, spec) { - mimeModes[mime] = spec; - } - function resolveMode(spec) { - if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { - spec = mimeModes[spec]; - } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { - var found = mimeModes[spec.name]; - if (typeof found == "string") { - found = { - name: found - }; - } - spec = createObj(found, spec); - spec.name = found.name; - } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) { - return resolveMode("application/xml"); - } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) { - return resolveMode("application/json"); - } - if (typeof spec == "string") { - return { - name: spec - }; - } else { - return spec || { - name: "null" - }; - } - } - function getMode(options, spec) { - spec = resolveMode(spec); - var mfactory = modes[spec.name]; - if (!mfactory) { - return getMode(options, "text/plain"); - } - var modeObj = mfactory(options, spec); - if (modeExtensions.hasOwnProperty(spec.name)) { - var exts = modeExtensions[spec.name]; - for (var prop2 in exts) { - if (!exts.hasOwnProperty(prop2)) { - continue; - } - if (modeObj.hasOwnProperty(prop2)) { - modeObj["_" + prop2] = modeObj[prop2]; - } - modeObj[prop2] = exts[prop2]; - } - } - modeObj.name = spec.name; - if (spec.helperType) { - modeObj.helperType = spec.helperType; - } - if (spec.modeProps) { - for (var prop$1 in spec.modeProps) { - modeObj[prop$1] = spec.modeProps[prop$1]; - } - } - return modeObj; - } - var modeExtensions = {}; - function extendMode(mode, properties) { - var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : modeExtensions[mode] = {}; - copyObj(properties, exts); - } - function copyState(mode, state) { - if (state === true) { - return state; - } - if (mode.copyState) { - return mode.copyState(state); - } - var nstate = {}; - for (var n in state) { - var val = state[n]; - if (val instanceof Array) { - val = val.concat([]); - } - nstate[n] = val; - } - return nstate; - } - function innerMode(mode, state) { - var info; - while (mode.innerMode) { - info = mode.innerMode(state); - if (!info || info.mode == mode) { - break; - } - state = info.state; - mode = info.mode; - } - return info || { - mode, - state - }; - } - function startState(mode, a1, a2) { - return mode.startState ? mode.startState(a1, a2) : true; - } - var StringStream = function (string, tabSize, lineOracle) { - this.pos = this.start = 0; - this.string = string; - this.tabSize = tabSize || 8; - this.lastColumnPos = this.lastColumnValue = 0; - this.lineStart = 0; - this.lineOracle = lineOracle; - }; - StringStream.prototype.eol = function () { - return this.pos >= this.string.length; - }; - StringStream.prototype.sol = function () { - return this.pos == this.lineStart; - }; - StringStream.prototype.peek = function () { - return this.string.charAt(this.pos) || void 0; - }; - StringStream.prototype.next = function () { - if (this.pos < this.string.length) { - return this.string.charAt(this.pos++); - } - }; - StringStream.prototype.eat = function (match) { - var ch = this.string.charAt(this.pos); - var ok; - if (typeof match == "string") { - ok = ch == match; - } else { - ok = ch && (match.test ? match.test(ch) : match(ch)); - } - if (ok) { - ++this.pos; - return ch; - } - }; - StringStream.prototype.eatWhile = function (match) { - var start = this.pos; - while (this.eat(match)) {} - return this.pos > start; - }; - StringStream.prototype.eatSpace = function () { - var start = this.pos; - while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) { - ++this.pos; - } - return this.pos > start; - }; - StringStream.prototype.skipToEnd = function () { - this.pos = this.string.length; - }; - StringStream.prototype.skipTo = function (ch) { - var found = this.string.indexOf(ch, this.pos); - if (found > -1) { - this.pos = found; - return true; - } - }; - StringStream.prototype.backUp = function (n) { - this.pos -= n; - }; - StringStream.prototype.column = function () { - if (this.lastColumnPos < this.start) { - this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue); - this.lastColumnPos = this.start; - } - return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }; - StringStream.prototype.indentation = function () { - return countColumn(this.string, null, this.tabSize) - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }; - StringStream.prototype.match = function (pattern, consume, caseInsensitive) { - if (typeof pattern == "string") { - var cased = function (str) { - return caseInsensitive ? str.toLowerCase() : str; - }; - var substr = this.string.substr(this.pos, pattern.length); - if (cased(substr) == cased(pattern)) { - if (consume !== false) { - this.pos += pattern.length; - } - return true; - } - } else { - var match = this.string.slice(this.pos).match(pattern); - if (match && match.index > 0) { - return null; - } - if (match && consume !== false) { - this.pos += match[0].length; - } - return match; - } - }; - StringStream.prototype.current = function () { - return this.string.slice(this.start, this.pos); - }; - StringStream.prototype.hideFirstChars = function (n, inner) { - this.lineStart += n; - try { - return inner(); - } finally { - this.lineStart -= n; - } - }; - StringStream.prototype.lookAhead = function (n) { - var oracle = this.lineOracle; - return oracle && oracle.lookAhead(n); - }; - StringStream.prototype.baseToken = function () { - var oracle = this.lineOracle; - return oracle && oracle.baseToken(this.pos); - }; - function getLine(doc, n) { - n -= doc.first; - if (n < 0 || n >= doc.size) { - throw new Error("There is no line " + (n + doc.first) + " in the document."); - } - var chunk = doc; - while (!chunk.lines) { - for (var i2 = 0;; ++i2) { - var child = chunk.children[i2], - sz = child.chunkSize(); - if (n < sz) { - chunk = child; - break; - } - n -= sz; - } - } - return chunk.lines[n]; - } - function getBetween(doc, start, end) { - var out = [], - n = start.line; - doc.iter(start.line, end.line + 1, function (line) { - var text = line.text; - if (n == end.line) { - text = text.slice(0, end.ch); - } - if (n == start.line) { - text = text.slice(start.ch); - } - out.push(text); - ++n; - }); - return out; - } - function getLines(doc, from, to) { - var out = []; - doc.iter(from, to, function (line) { - out.push(line.text); - }); - return out; - } - function updateLineHeight(line, height) { - var diff = height - line.height; - if (diff) { - for (var n = line; n; n = n.parent) { - n.height += diff; - } - } - } - function lineNo(line) { - if (line.parent == null) { - return null; - } - var cur = line.parent, - no = indexOf(cur.lines, line); - for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { - for (var i2 = 0;; ++i2) { - if (chunk.children[i2] == cur) { - break; - } - no += chunk.children[i2].chunkSize(); - } - } - return no + cur.first; - } - function lineAtHeight(chunk, h) { - var n = chunk.first; - outer: do { - for (var i$12 = 0; i$12 < chunk.children.length; ++i$12) { - var child = chunk.children[i$12], - ch = child.height; - if (h < ch) { - chunk = child; - continue outer; - } - h -= ch; - n += child.chunkSize(); - } - return n; - } while (!chunk.lines); - var i2 = 0; - for (; i2 < chunk.lines.length; ++i2) { - var line = chunk.lines[i2], - lh = line.height; - if (h < lh) { - break; - } - h -= lh; - } - return n + i2; - } - function isLine(doc, l) { - return l >= doc.first && l < doc.first + doc.size; - } - function lineNumberFor(options, i2) { - return String(options.lineNumberFormatter(i2 + options.firstLineNumber)); - } - function Pos(line, ch, sticky) { - if (sticky === void 0) sticky = null; - if (!(this instanceof Pos)) { - return new Pos(line, ch, sticky); - } - this.line = line; - this.ch = ch; - this.sticky = sticky; - } - function cmp(a, b) { - return a.line - b.line || a.ch - b.ch; - } - function equalCursorPos(a, b) { - return a.sticky == b.sticky && cmp(a, b) == 0; - } - function copyPos(x) { - return Pos(x.line, x.ch); - } - function maxPos(a, b) { - return cmp(a, b) < 0 ? b : a; - } - function minPos(a, b) { - return cmp(a, b) < 0 ? a : b; - } - function clipLine(doc, n) { - return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1)); - } - function clipPos(doc, pos) { - if (pos.line < doc.first) { - return Pos(doc.first, 0); - } - var last = doc.first + doc.size - 1; - if (pos.line > last) { - return Pos(last, getLine(doc, last).text.length); - } - return clipToLen(pos, getLine(doc, pos.line).text.length); - } - function clipToLen(pos, linelen) { - var ch = pos.ch; - if (ch == null || ch > linelen) { - return Pos(pos.line, linelen); - } else if (ch < 0) { - return Pos(pos.line, 0); - } else { - return pos; - } - } - function clipPosArray(doc, array) { - var out = []; - for (var i2 = 0; i2 < array.length; i2++) { - out[i2] = clipPos(doc, array[i2]); - } - return out; - } - var SavedContext = function (state, lookAhead) { - this.state = state; - this.lookAhead = lookAhead; - }; - var Context = function (doc, state, line, lookAhead) { - this.state = state; - this.doc = doc; - this.line = line; - this.maxLookAhead = lookAhead || 0; - this.baseTokens = null; - this.baseTokenPos = 1; - }; - Context.prototype.lookAhead = function (n) { - var line = this.doc.getLine(this.line + n); - if (line != null && n > this.maxLookAhead) { - this.maxLookAhead = n; - } - return line; - }; - Context.prototype.baseToken = function (n) { - if (!this.baseTokens) { - return null; - } - while (this.baseTokens[this.baseTokenPos] <= n) { - this.baseTokenPos += 2; - } - var type = this.baseTokens[this.baseTokenPos + 1]; - return { - type: type && type.replace(/( |^)overlay .*/, ""), - size: this.baseTokens[this.baseTokenPos] - n - }; - }; - Context.prototype.nextLine = function () { - this.line++; - if (this.maxLookAhead > 0) { - this.maxLookAhead--; - } - }; - Context.fromSaved = function (doc, saved, line) { - if (saved instanceof SavedContext) { - return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead); - } else { - return new Context(doc, copyState(doc.mode, saved), line); - } - }; - Context.prototype.save = function (copy) { - var state = copy !== false ? copyState(this.doc.mode, this.state) : this.state; - return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state; - }; - function highlightLine(cm, line, context, forceToEnd) { - var st = [cm.state.modeGen], - lineClasses = {}; - runMode(cm, line.text, cm.doc.mode, context, function (end, style) { - return st.push(end, style); - }, lineClasses, forceToEnd); - var state = context.state; - var loop = function (o2) { - context.baseTokens = st; - var overlay = cm.state.overlays[o2], - i2 = 1, - at = 0; - context.state = true; - runMode(cm, line.text, overlay.mode, context, function (end, style) { - var start = i2; - while (at < end) { - var i_end = st[i2]; - if (i_end > end) { - st.splice(i2, 1, end, st[i2 + 1], i_end); - } - i2 += 2; - at = Math.min(end, i_end); - } - if (!style) { - return; - } - if (overlay.opaque) { - st.splice(start, i2 - start, end, "overlay " + style); - i2 = start + 2; - } else { - for (; start < i2; start += 2) { - var cur = st[start + 1]; - st[start + 1] = (cur ? cur + " " : "") + "overlay " + style; - } - } - }, lineClasses); - context.state = state; - context.baseTokens = null; - context.baseTokenPos = 1; - }; - for (var o = 0; o < cm.state.overlays.length; ++o) loop(o); - return { - styles: st, - classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null - }; - } - function getLineStyles(cm, line, updateFrontier) { - if (!line.styles || line.styles[0] != cm.state.modeGen) { - var context = getContextBefore(cm, lineNo(line)); - var resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state); - var result = highlightLine(cm, line, context); - if (resetState) { - context.state = resetState; - } - line.stateAfter = context.save(!resetState); - line.styles = result.styles; - if (result.classes) { - line.styleClasses = result.classes; - } else if (line.styleClasses) { - line.styleClasses = null; - } - if (updateFrontier === cm.doc.highlightFrontier) { - cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier); - } - } - return line.styles; - } - function getContextBefore(cm, n, precise) { - var doc = cm.doc, - display = cm.display; - if (!doc.mode.startState) { - return new Context(doc, true, n); - } - var start = findStartLine(cm, n, precise); - var saved = start > doc.first && getLine(doc, start - 1).stateAfter; - var context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start); - doc.iter(start, n, function (line) { - processLine(cm, line.text, context); - var pos = context.line; - line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null; - context.nextLine(); - }); - if (precise) { - doc.modeFrontier = context.line; - } - return context; - } - function processLine(cm, text, context, startAt) { - var mode = cm.doc.mode; - var stream = new StringStream(text, cm.options.tabSize, context); - stream.start = stream.pos = startAt || 0; - if (text == "") { - callBlankLine(mode, context.state); - } - while (!stream.eol()) { - readToken(mode, stream, context.state); - stream.start = stream.pos; - } - } - function callBlankLine(mode, state) { - if (mode.blankLine) { - return mode.blankLine(state); - } - if (!mode.innerMode) { - return; - } - var inner = innerMode(mode, state); - if (inner.mode.blankLine) { - return inner.mode.blankLine(inner.state); - } - } - function readToken(mode, stream, state, inner) { - for (var i2 = 0; i2 < 10; i2++) { - if (inner) { - inner[0] = innerMode(mode, state).mode; - } - var style = mode.token(stream, state); - if (stream.pos > stream.start) { - return style; - } - } - throw new Error("Mode " + mode.name + " failed to advance stream."); - } - var Token = function (stream, type, state) { - this.start = stream.start; - this.end = stream.pos; - this.string = stream.current(); - this.type = type || null; - this.state = state; - }; - function takeToken(cm, pos, precise, asArray) { - var doc = cm.doc, - mode = doc.mode, - style; - pos = clipPos(doc, pos); - var line = getLine(doc, pos.line), - context = getContextBefore(cm, pos.line, precise); - var stream = new StringStream(line.text, cm.options.tabSize, context), - tokens; - if (asArray) { - tokens = []; - } - while ((asArray || stream.pos < pos.ch) && !stream.eol()) { - stream.start = stream.pos; - style = readToken(mode, stream, context.state); - if (asArray) { - tokens.push(new Token(stream, style, copyState(doc.mode, context.state))); - } - } - return asArray ? tokens : new Token(stream, style, context.state); - } - function extractLineClasses(type, output) { - if (type) { - for (;;) { - var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/); - if (!lineClass) { - break; - } - type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length); - var prop2 = lineClass[1] ? "bgClass" : "textClass"; - if (output[prop2] == null) { - output[prop2] = lineClass[2]; - } else if (!new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)").test(output[prop2])) { - output[prop2] += " " + lineClass[2]; - } - } - } - return type; - } - function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) { - var flattenSpans = mode.flattenSpans; - if (flattenSpans == null) { - flattenSpans = cm.options.flattenSpans; - } - var curStart = 0, - curStyle = null; - var stream = new StringStream(text, cm.options.tabSize, context), - style; - var inner = cm.options.addModeClass && [null]; - if (text == "") { - extractLineClasses(callBlankLine(mode, context.state), lineClasses); - } - while (!stream.eol()) { - if (stream.pos > cm.options.maxHighlightLength) { - flattenSpans = false; - if (forceToEnd) { - processLine(cm, text, context, stream.pos); - } - stream.pos = text.length; - style = null; - } else { - style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses); - } - if (inner) { - var mName = inner[0].name; - if (mName) { - style = "m-" + (style ? mName + " " + style : mName); - } - } - if (!flattenSpans || curStyle != style) { - while (curStart < stream.start) { - curStart = Math.min(stream.start, curStart + 5e3); - f(curStart, curStyle); - } - curStyle = style; - } - stream.start = stream.pos; - } - while (curStart < stream.pos) { - var pos = Math.min(stream.pos, curStart + 5e3); - f(pos, curStyle); - curStart = pos; - } - } - function findStartLine(cm, n, precise) { - var minindent, - minline, - doc = cm.doc; - var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1e3 : 100); - for (var search = n; search > lim; --search) { - if (search <= doc.first) { - return doc.first; - } - var line = getLine(doc, search - 1), - after = line.stateAfter; - if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier)) { - return search; - } - var indented = countColumn(line.text, null, cm.options.tabSize); - if (minline == null || minindent > indented) { - minline = search - 1; - minindent = indented; - } - } - return minline; - } - function retreatFrontier(doc, n) { - doc.modeFrontier = Math.min(doc.modeFrontier, n); - if (doc.highlightFrontier < n - 10) { - return; - } - var start = doc.first; - for (var line = n - 1; line > start; line--) { - var saved = getLine(doc, line).stateAfter; - if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) { - start = line + 1; - break; - } - } - doc.highlightFrontier = Math.min(doc.highlightFrontier, start); - } - var sawReadOnlySpans = false, - sawCollapsedSpans = false; - function seeReadOnlySpans() { - sawReadOnlySpans = true; - } - function seeCollapsedSpans() { - sawCollapsedSpans = true; - } - function MarkedSpan(marker, from, to) { - this.marker = marker; - this.from = from; - this.to = to; - } - function getMarkedSpanFor(spans, marker) { - if (spans) { - for (var i2 = 0; i2 < spans.length; ++i2) { - var span = spans[i2]; - if (span.marker == marker) { - return span; - } - } - } - } - function removeMarkedSpan(spans, span) { - var r; - for (var i2 = 0; i2 < spans.length; ++i2) { - if (spans[i2] != span) { - (r || (r = [])).push(spans[i2]); - } - } - return r; - } - function addMarkedSpan(line, span, op) { - var inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = /* @__PURE__ */new WeakSet())); - if (inThisOp && line.markedSpans && inThisOp.has(line.markedSpans)) { - line.markedSpans.push(span); - } else { - line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]; - if (inThisOp) { - inThisOp.add(line.markedSpans); - } - } - span.marker.attachLine(line); - } - function markedSpansBefore(old, startCh, isInsert) { - var nw; - if (old) { - for (var i2 = 0; i2 < old.length; ++i2) { - var span = old[i2], - marker = span.marker; - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh); - if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh); - (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)); - } - } - } - return nw; - } - function markedSpansAfter(old, endCh, isInsert) { - var nw; - if (old) { - for (var i2 = 0; i2 < old.length; ++i2) { - var span = old[i2], - marker = span.marker; - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh); - if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh); - (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, span.to == null ? null : span.to - endCh)); - } - } - } - return nw; - } - function stretchSpansOverChange(doc, change) { - if (change.full) { - return null; - } - var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans; - var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans; - if (!oldFirst && !oldLast) { - return null; - } - var startCh = change.from.ch, - endCh = change.to.ch, - isInsert = cmp(change.from, change.to) == 0; - var first = markedSpansBefore(oldFirst, startCh, isInsert); - var last = markedSpansAfter(oldLast, endCh, isInsert); - var sameLine = change.text.length == 1, - offset = lst(change.text).length + (sameLine ? startCh : 0); - if (first) { - for (var i2 = 0; i2 < first.length; ++i2) { - var span = first[i2]; - if (span.to == null) { - var found = getMarkedSpanFor(last, span.marker); - if (!found) { - span.to = startCh; - } else if (sameLine) { - span.to = found.to == null ? null : found.to + offset; - } - } - } - } - if (last) { - for (var i$12 = 0; i$12 < last.length; ++i$12) { - var span$1 = last[i$12]; - if (span$1.to != null) { - span$1.to += offset; - } - if (span$1.from == null) { - var found$1 = getMarkedSpanFor(first, span$1.marker); - if (!found$1) { - span$1.from = offset; - if (sameLine) { - (first || (first = [])).push(span$1); - } - } - } else { - span$1.from += offset; - if (sameLine) { - (first || (first = [])).push(span$1); - } - } - } - } - if (first) { - first = clearEmptySpans(first); - } - if (last && last != first) { - last = clearEmptySpans(last); - } - var newMarkers = [first]; - if (!sameLine) { - var gap = change.text.length - 2, - gapMarkers; - if (gap > 0 && first) { - for (var i$22 = 0; i$22 < first.length; ++i$22) { - if (first[i$22].to == null) { - (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i$22].marker, null, null)); - } - } - } - for (var i$3 = 0; i$3 < gap; ++i$3) { - newMarkers.push(gapMarkers); - } - newMarkers.push(last); - } - return newMarkers; - } - function clearEmptySpans(spans) { - for (var i2 = 0; i2 < spans.length; ++i2) { - var span = spans[i2]; - if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) { - spans.splice(i2--, 1); - } - } - if (!spans.length) { - return null; - } - return spans; - } - function removeReadOnlyRanges(doc, from, to) { - var markers = null; - doc.iter(from.line, to.line + 1, function (line) { - if (line.markedSpans) { - for (var i3 = 0; i3 < line.markedSpans.length; ++i3) { - var mark = line.markedSpans[i3].marker; - if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) { - (markers || (markers = [])).push(mark); - } - } - } - }); - if (!markers) { - return null; - } - var parts = [{ - from, - to - }]; - for (var i2 = 0; i2 < markers.length; ++i2) { - var mk = markers[i2], - m = mk.find(0); - for (var j = 0; j < parts.length; ++j) { - var p = parts[j]; - if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) { - continue; - } - var newParts = [j, 1], - dfrom = cmp(p.from, m.from), - dto = cmp(p.to, m.to); - if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) { - newParts.push({ - from: p.from, - to: m.from - }); - } - if (dto > 0 || !mk.inclusiveRight && !dto) { - newParts.push({ - from: m.to, - to: p.to - }); - } - parts.splice.apply(parts, newParts); - j += newParts.length - 3; - } - } - return parts; - } - function detachMarkedSpans(line) { - var spans = line.markedSpans; - if (!spans) { - return; - } - for (var i2 = 0; i2 < spans.length; ++i2) { - spans[i2].marker.detachLine(line); - } - line.markedSpans = null; - } - function attachMarkedSpans(line, spans) { - if (!spans) { - return; - } - for (var i2 = 0; i2 < spans.length; ++i2) { - spans[i2].marker.attachLine(line); - } - line.markedSpans = spans; - } - function extraLeft(marker) { - return marker.inclusiveLeft ? -1 : 0; - } - function extraRight(marker) { - return marker.inclusiveRight ? 1 : 0; - } - function compareCollapsedMarkers(a, b) { - var lenDiff = a.lines.length - b.lines.length; - if (lenDiff != 0) { - return lenDiff; - } - var aPos = a.find(), - bPos = b.find(); - var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b); - if (fromCmp) { - return -fromCmp; - } - var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b); - if (toCmp) { - return toCmp; - } - return b.id - a.id; - } - function collapsedSpanAtSide(line, start) { - var sps = sawCollapsedSpans && line.markedSpans, - found; - if (sps) { - for (var sp = void 0, i2 = 0; i2 < sps.length; ++i2) { - sp = sps[i2]; - if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { - found = sp.marker; - } - } - } - return found; - } - function collapsedSpanAtStart(line) { - return collapsedSpanAtSide(line, true); - } - function collapsedSpanAtEnd(line) { - return collapsedSpanAtSide(line, false); - } - function collapsedSpanAround(line, ch) { - var sps = sawCollapsedSpans && line.markedSpans, - found; - if (sps) { - for (var i2 = 0; i2 < sps.length; ++i2) { - var sp = sps[i2]; - if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) && (!found || compareCollapsedMarkers(found, sp.marker) < 0)) { - found = sp.marker; - } - } - } - return found; - } - function conflictingCollapsedRange(doc, lineNo2, from, to, marker) { - var line = getLine(doc, lineNo2); - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) { - for (var i2 = 0; i2 < sps.length; ++i2) { - var sp = sps[i2]; - if (!sp.marker.collapsed) { - continue; - } - var found = sp.marker.find(0); - var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker); - var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); - if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) { - continue; - } - if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) || fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0)) { - return true; - } - } - } - } - function visualLine(line) { - var merged; - while (merged = collapsedSpanAtStart(line)) { - line = merged.find(-1, true).line; - } - return line; - } - function visualLineEnd(line) { - var merged; - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - } - return line; - } - function visualLineContinued(line) { - var merged, lines; - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - (lines || (lines = [])).push(line); - } - return lines; - } - function visualLineNo(doc, lineN) { - var line = getLine(doc, lineN), - vis = visualLine(line); - if (line == vis) { - return lineN; - } - return lineNo(vis); - } - function visualLineEndNo(doc, lineN) { - if (lineN > doc.lastLine()) { - return lineN; - } - var line = getLine(doc, lineN), - merged; - if (!lineIsHidden(doc, line)) { - return lineN; - } - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - } - return lineNo(line) + 1; - } - function lineIsHidden(doc, line) { - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) { - for (var sp = void 0, i2 = 0; i2 < sps.length; ++i2) { - sp = sps[i2]; - if (!sp.marker.collapsed) { - continue; - } - if (sp.from == null) { - return true; - } - if (sp.marker.widgetNode) { - continue; - } - if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp)) { - return true; - } - } - } - } - function lineIsHiddenInner(doc, line, span) { - if (span.to == null) { - var end = span.marker.find(1, true); - return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)); - } - if (span.marker.inclusiveRight && span.to == line.text.length) { - return true; - } - for (var sp = void 0, i2 = 0; i2 < line.markedSpans.length; ++i2) { - sp = line.markedSpans[i2]; - if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && (sp.to == null || sp.to != span.from) && (sp.marker.inclusiveLeft || span.marker.inclusiveRight) && lineIsHiddenInner(doc, line, sp)) { - return true; - } - } - } - function heightAtLine(lineObj) { - lineObj = visualLine(lineObj); - var h = 0, - chunk = lineObj.parent; - for (var i2 = 0; i2 < chunk.lines.length; ++i2) { - var line = chunk.lines[i2]; - if (line == lineObj) { - break; - } else { - h += line.height; - } - } - for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { - for (var i$12 = 0; i$12 < p.children.length; ++i$12) { - var cur = p.children[i$12]; - if (cur == chunk) { - break; - } else { - h += cur.height; - } - } - } - return h; - } - function lineLength(line) { - if (line.height == 0) { - return 0; - } - var len = line.text.length, - merged, - cur = line; - while (merged = collapsedSpanAtStart(cur)) { - var found = merged.find(0, true); - cur = found.from.line; - len += found.from.ch - found.to.ch; - } - cur = line; - while (merged = collapsedSpanAtEnd(cur)) { - var found$1 = merged.find(0, true); - len -= cur.text.length - found$1.from.ch; - cur = found$1.to.line; - len += cur.text.length - found$1.to.ch; - } - return len; - } - function findMaxLine(cm) { - var d = cm.display, - doc = cm.doc; - d.maxLine = getLine(doc, doc.first); - d.maxLineLength = lineLength(d.maxLine); - d.maxLineChanged = true; - doc.iter(function (line) { - var len = lineLength(line); - if (len > d.maxLineLength) { - d.maxLineLength = len; - d.maxLine = line; - } - }); - } - var Line = function (text, markedSpans, estimateHeight2) { - this.text = text; - attachMarkedSpans(this, markedSpans); - this.height = estimateHeight2 ? estimateHeight2(this) : 1; - }; - Line.prototype.lineNo = function () { - return lineNo(this); - }; - eventMixin(Line); - function updateLine(line, text, markedSpans, estimateHeight2) { - line.text = text; - if (line.stateAfter) { - line.stateAfter = null; - } - if (line.styles) { - line.styles = null; - } - if (line.order != null) { - line.order = null; - } - detachMarkedSpans(line); - attachMarkedSpans(line, markedSpans); - var estHeight = estimateHeight2 ? estimateHeight2(line) : 1; - if (estHeight != line.height) { - updateLineHeight(line, estHeight); - } - } - function cleanUpLine(line) { - line.parent = null; - detachMarkedSpans(line); - } - var styleToClassCache = {}, - styleToClassCacheWithMode = {}; - function interpretTokenStyle(style, options) { - if (!style || /^\s*$/.test(style)) { - return null; - } - var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache; - return cache[style] || (cache[style] = style.replace(/\S+/g, "cm-$&")); - } - function buildLineContent(cm, lineView) { - var content = eltP("span", null, null, webkit ? "padding-right: .1px" : null); - var builder = { - pre: eltP("pre", [content], "CodeMirror-line"), - content, - col: 0, - pos: 0, - cm, - trailingSpace: false, - splitSpaces: cm.getOption("lineWrapping") - }; - lineView.measure = {}; - for (var i2 = 0; i2 <= (lineView.rest ? lineView.rest.length : 0); i2++) { - var line = i2 ? lineView.rest[i2 - 1] : lineView.line, - order = void 0; - builder.pos = 0; - builder.addToken = buildToken; - if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction))) { - builder.addToken = buildTokenBadBidi(builder.addToken, order); - } - builder.map = []; - var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line); - insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate)); - if (line.styleClasses) { - if (line.styleClasses.bgClass) { - builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); - } - if (line.styleClasses.textClass) { - builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); - } - } - if (builder.map.length == 0) { - builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); - } - if (i2 == 0) { - lineView.measure.map = builder.map; - lineView.measure.cache = {}; - } else { - (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map); - (lineView.measure.caches || (lineView.measure.caches = [])).push({}); - } - } - if (webkit) { - var last = builder.content.lastChild; - if (/\bcm-tab\b/.test(last.className) || last.querySelector && last.querySelector(".cm-tab")) { - builder.content.className = "cm-tab-wrap-hack"; - } - } - signal(cm, "renderLine", cm, lineView.line, builder.pre); - if (builder.pre.className) { - builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); - } - return builder; - } - function defaultSpecialCharPlaceholder(ch) { - var token = elt("span", "•", "cm-invalidchar"); - token.title = "\\u" + ch.charCodeAt(0).toString(16); - token.setAttribute("aria-label", token.title); - return token; - } - function buildToken(builder, text, style, startStyle, endStyle, css, attributes) { - if (!text) { - return; - } - var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text; - var special = builder.cm.state.specialChars, - mustWrap = false; - var content; - if (!special.test(text)) { - builder.col += text.length; - content = document.createTextNode(displayText); - builder.map.push(builder.pos, builder.pos + text.length, content); - if (ie && ie_version < 9) { - mustWrap = true; - } - builder.pos += text.length; - } else { - content = document.createDocumentFragment(); - var pos = 0; - while (true) { - special.lastIndex = pos; - var m = special.exec(text); - var skipped = m ? m.index - pos : text.length - pos; - if (skipped) { - var txt = document.createTextNode(displayText.slice(pos, pos + skipped)); - if (ie && ie_version < 9) { - content.appendChild(elt("span", [txt])); - } else { - content.appendChild(txt); - } - builder.map.push(builder.pos, builder.pos + skipped, txt); - builder.col += skipped; - builder.pos += skipped; - } - if (!m) { - break; - } - pos += skipped + 1; - var txt$1 = void 0; - if (m[0] == " ") { - var tabSize = builder.cm.options.tabSize, - tabWidth = tabSize - builder.col % tabSize; - txt$1 = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")); - txt$1.setAttribute("role", "presentation"); - txt$1.setAttribute("cm-text", " "); - builder.col += tabWidth; - } else if (m[0] == "\r" || m[0] == "\n") { - txt$1 = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "␤", "cm-invalidchar")); - txt$1.setAttribute("cm-text", m[0]); - builder.col += 1; - } else { - txt$1 = builder.cm.options.specialCharPlaceholder(m[0]); - txt$1.setAttribute("cm-text", m[0]); - if (ie && ie_version < 9) { - content.appendChild(elt("span", [txt$1])); - } else { - content.appendChild(txt$1); - } - builder.col += 1; - } - builder.map.push(builder.pos, builder.pos + 1, txt$1); - builder.pos++; - } - } - builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32; - if (style || startStyle || endStyle || mustWrap || css || attributes) { - var fullStyle = style || ""; - if (startStyle) { - fullStyle += startStyle; - } - if (endStyle) { - fullStyle += endStyle; - } - var token = elt("span", [content], fullStyle, css); - if (attributes) { - for (var attr in attributes) { - if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class") { - token.setAttribute(attr, attributes[attr]); - } - } - } - return builder.content.appendChild(token); - } - builder.content.appendChild(content); - } - function splitSpaces(text, trailingBefore) { - if (text.length > 1 && !/ /.test(text)) { - return text; - } - var spaceBefore = trailingBefore, - result = ""; - for (var i2 = 0; i2 < text.length; i2++) { - var ch = text.charAt(i2); - if (ch == " " && spaceBefore && (i2 == text.length - 1 || text.charCodeAt(i2 + 1) == 32)) { - ch = " "; - } - result += ch; - spaceBefore = ch == " "; - } - return result; - } - function buildTokenBadBidi(inner, order) { - return function (builder, text, style, startStyle, endStyle, css, attributes) { - style = style ? style + " cm-force-border" : "cm-force-border"; - var start = builder.pos, - end = start + text.length; - for (;;) { - var part = void 0; - for (var i2 = 0; i2 < order.length; i2++) { - part = order[i2]; - if (part.to > start && part.from <= start) { - break; - } - } - if (part.to >= end) { - return inner(builder, text, style, startStyle, endStyle, css, attributes); - } - inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes); - startStyle = null; - text = text.slice(part.to - start); - start = part.to; - } - }; - } - function buildCollapsedSpan(builder, size, marker, ignoreWidget) { - var widget = !ignoreWidget && marker.widgetNode; - if (widget) { - builder.map.push(builder.pos, builder.pos + size, widget); - } - if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) { - if (!widget) { - widget = builder.content.appendChild(document.createElement("span")); - } - widget.setAttribute("cm-marker", marker.id); - } - if (widget) { - builder.cm.display.input.setUneditable(widget); - builder.content.appendChild(widget); - } - builder.pos += size; - builder.trailingSpace = false; - } - function insertLineContent(line, builder, styles) { - var spans = line.markedSpans, - allText = line.text, - at = 0; - if (!spans) { - for (var i$12 = 1; i$12 < styles.length; i$12 += 2) { - builder.addToken(builder, allText.slice(at, at = styles[i$12]), interpretTokenStyle(styles[i$12 + 1], builder.cm.options)); - } - return; - } - var len = allText.length, - pos = 0, - i2 = 1, - text = "", - style, - css; - var nextChange = 0, - spanStyle, - spanEndStyle, - spanStartStyle, - collapsed, - attributes; - for (;;) { - if (nextChange == pos) { - spanStyle = spanEndStyle = spanStartStyle = css = ""; - attributes = null; - collapsed = null; - nextChange = Infinity; - var foundBookmarks = [], - endStyles = void 0; - for (var j = 0; j < spans.length; ++j) { - var sp = spans[j], - m = sp.marker; - if (m.type == "bookmark" && sp.from == pos && m.widgetNode) { - foundBookmarks.push(m); - } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) { - if (sp.to != null && sp.to != pos && nextChange > sp.to) { - nextChange = sp.to; - spanEndStyle = ""; - } - if (m.className) { - spanStyle += " " + m.className; - } - if (m.css) { - css = (css ? css + ";" : "") + m.css; - } - if (m.startStyle && sp.from == pos) { - spanStartStyle += " " + m.startStyle; - } - if (m.endStyle && sp.to == nextChange) { - (endStyles || (endStyles = [])).push(m.endStyle, sp.to); - } - if (m.title) { - (attributes || (attributes = {})).title = m.title; - } - if (m.attributes) { - for (var attr in m.attributes) { - (attributes || (attributes = {}))[attr] = m.attributes[attr]; - } - } - if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0)) { - collapsed = sp; - } - } else if (sp.from > pos && nextChange > sp.from) { - nextChange = sp.from; - } - } - if (endStyles) { - for (var j$1 = 0; j$1 < endStyles.length; j$1 += 2) { - if (endStyles[j$1 + 1] == nextChange) { - spanEndStyle += " " + endStyles[j$1]; - } - } - } - if (!collapsed || collapsed.from == pos) { - for (var j$2 = 0; j$2 < foundBookmarks.length; ++j$2) { - buildCollapsedSpan(builder, 0, foundBookmarks[j$2]); - } - } - if (collapsed && (collapsed.from || 0) == pos) { - buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, collapsed.marker, collapsed.from == null); - if (collapsed.to == null) { - return; - } - if (collapsed.to == pos) { - collapsed = false; - } - } - } - if (pos >= len) { - break; - } - var upto = Math.min(len, nextChange); - while (true) { - if (text) { - var end = pos + text.length; - if (!collapsed) { - var tokenText = end > upto ? text.slice(0, upto - pos) : text; - builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes); - } - if (end >= upto) { - text = text.slice(upto - pos); - pos = upto; - break; - } - pos = end; - spanStartStyle = ""; - } - text = allText.slice(at, at = styles[i2++]); - style = interpretTokenStyle(styles[i2++], builder.cm.options); - } - } - } - function LineView(doc, line, lineN) { - this.line = line; - this.rest = visualLineContinued(line); - this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1; - this.node = this.text = null; - this.hidden = lineIsHidden(doc, line); - } - function buildViewArray(cm, from, to) { - var array = [], - nextPos; - for (var pos = from; pos < to; pos = nextPos) { - var view = new LineView(cm.doc, getLine(cm.doc, pos), pos); - nextPos = pos + view.size; - array.push(view); - } - return array; - } - var operationGroup = null; - function pushOperation(op) { - if (operationGroup) { - operationGroup.ops.push(op); - } else { - op.ownsGroup = operationGroup = { - ops: [op], - delayedCallbacks: [] - }; - } - } - function fireCallbacksForOps(group) { - var callbacks = group.delayedCallbacks, - i2 = 0; - do { - for (; i2 < callbacks.length; i2++) { - callbacks[i2].call(null); - } - for (var j = 0; j < group.ops.length; j++) { - var op = group.ops[j]; - if (op.cursorActivityHandlers) { - while (op.cursorActivityCalled < op.cursorActivityHandlers.length) { - op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm); - } - } - } - } while (i2 < callbacks.length); - } - function finishOperation(op, endCb) { - var group = op.ownsGroup; - if (!group) { - return; - } - try { - fireCallbacksForOps(group); - } finally { - operationGroup = null; - endCb(group); - } - } - var orphanDelayedCallbacks = null; - function signalLater(emitter, type) { - var arr = getHandlers(emitter, type); - if (!arr.length) { - return; - } - var args = Array.prototype.slice.call(arguments, 2), - list; - if (operationGroup) { - list = operationGroup.delayedCallbacks; - } else if (orphanDelayedCallbacks) { - list = orphanDelayedCallbacks; - } else { - list = orphanDelayedCallbacks = []; - setTimeout(fireOrphanDelayed, 0); - } - var loop = function (i3) { - list.push(function () { - return arr[i3].apply(null, args); - }); - }; - for (var i2 = 0; i2 < arr.length; ++i2) loop(i2); - } - function fireOrphanDelayed() { - var delayed = orphanDelayedCallbacks; - orphanDelayedCallbacks = null; - for (var i2 = 0; i2 < delayed.length; ++i2) { - delayed[i2](); - } - } - function updateLineForChanges(cm, lineView, lineN, dims) { - for (var j = 0; j < lineView.changes.length; j++) { - var type = lineView.changes[j]; - if (type == "text") { - updateLineText(cm, lineView); - } else if (type == "gutter") { - updateLineGutter(cm, lineView, lineN, dims); - } else if (type == "class") { - updateLineClasses(cm, lineView); - } else if (type == "widget") { - updateLineWidgets(cm, lineView, dims); - } - } - lineView.changes = null; - } - function ensureLineWrapped(lineView) { - if (lineView.node == lineView.text) { - lineView.node = elt("div", null, null, "position: relative"); - if (lineView.text.parentNode) { - lineView.text.parentNode.replaceChild(lineView.node, lineView.text); - } - lineView.node.appendChild(lineView.text); - if (ie && ie_version < 8) { - lineView.node.style.zIndex = 2; - } - } - return lineView.node; - } - function updateLineBackground(cm, lineView) { - var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass; - if (cls) { - cls += " CodeMirror-linebackground"; - } - if (lineView.background) { - if (cls) { - lineView.background.className = cls; - } else { - lineView.background.parentNode.removeChild(lineView.background); - lineView.background = null; - } - } else if (cls) { - var wrap = ensureLineWrapped(lineView); - lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild); - cm.display.input.setUneditable(lineView.background); - } - } - function getLineContent(cm, lineView) { - var ext = cm.display.externalMeasured; - if (ext && ext.line == lineView.line) { - cm.display.externalMeasured = null; - lineView.measure = ext.measure; - return ext.built; - } - return buildLineContent(cm, lineView); - } - function updateLineText(cm, lineView) { - var cls = lineView.text.className; - var built = getLineContent(cm, lineView); - if (lineView.text == lineView.node) { - lineView.node = built.pre; - } - lineView.text.parentNode.replaceChild(built.pre, lineView.text); - lineView.text = built.pre; - if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) { - lineView.bgClass = built.bgClass; - lineView.textClass = built.textClass; - updateLineClasses(cm, lineView); - } else if (cls) { - lineView.text.className = cls; - } - } - function updateLineClasses(cm, lineView) { - updateLineBackground(cm, lineView); - if (lineView.line.wrapClass) { - ensureLineWrapped(lineView).className = lineView.line.wrapClass; - } else if (lineView.node != lineView.text) { - lineView.node.className = ""; - } - var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass; - lineView.text.className = textClass || ""; - } - function updateLineGutter(cm, lineView, lineN, dims) { - if (lineView.gutter) { - lineView.node.removeChild(lineView.gutter); - lineView.gutter = null; - } - if (lineView.gutterBackground) { - lineView.node.removeChild(lineView.gutterBackground); - lineView.gutterBackground = null; - } - if (lineView.line.gutterClass) { - var wrap = ensureLineWrapped(lineView); - lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass, "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px; width: " + dims.gutterTotalWidth + "px"); - cm.display.input.setUneditable(lineView.gutterBackground); - wrap.insertBefore(lineView.gutterBackground, lineView.text); - } - var markers = lineView.line.gutterMarkers; - if (cm.options.lineNumbers || markers) { - var wrap$1 = ensureLineWrapped(lineView); - var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"); - gutterWrap.setAttribute("aria-hidden", "true"); - cm.display.input.setUneditable(gutterWrap); - wrap$1.insertBefore(gutterWrap, lineView.text); - if (lineView.line.gutterClass) { - gutterWrap.className += " " + lineView.line.gutterClass; - } - if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"])) { - lineView.lineNumber = gutterWrap.appendChild(elt("div", lineNumberFor(cm.options, lineN), "CodeMirror-linenumber CodeMirror-gutter-elt", "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: " + cm.display.lineNumInnerWidth + "px")); - } - if (markers) { - for (var k = 0; k < cm.display.gutterSpecs.length; ++k) { - var id = cm.display.gutterSpecs[k].className, - found = markers.hasOwnProperty(id) && markers[id]; - if (found) { - gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " + dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px")); - } - } - } - } - } - function updateLineWidgets(cm, lineView, dims) { - if (lineView.alignable) { - lineView.alignable = null; - } - var isWidget = classTest("CodeMirror-linewidget"); - for (var node = lineView.node.firstChild, next = void 0; node; node = next) { - next = node.nextSibling; - if (isWidget.test(node.className)) { - lineView.node.removeChild(node); - } - } - insertLineWidgets(cm, lineView, dims); - } - function buildLineElement(cm, lineView, lineN, dims) { - var built = getLineContent(cm, lineView); - lineView.text = lineView.node = built.pre; - if (built.bgClass) { - lineView.bgClass = built.bgClass; - } - if (built.textClass) { - lineView.textClass = built.textClass; - } - updateLineClasses(cm, lineView); - updateLineGutter(cm, lineView, lineN, dims); - insertLineWidgets(cm, lineView, dims); - return lineView.node; - } - function insertLineWidgets(cm, lineView, dims) { - insertLineWidgetsFor(cm, lineView.line, lineView, dims, true); - if (lineView.rest) { - for (var i2 = 0; i2 < lineView.rest.length; i2++) { - insertLineWidgetsFor(cm, lineView.rest[i2], lineView, dims, false); - } - } - } - function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) { - if (!line.widgets) { - return; - } - var wrap = ensureLineWrapped(lineView); - for (var i2 = 0, ws = line.widgets; i2 < ws.length; ++i2) { - var widget = ws[i2], - node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : "")); - if (!widget.handleMouseEvents) { - node.setAttribute("cm-ignore-events", "true"); - } - positionLineWidget(widget, node, lineView, dims); - cm.display.input.setUneditable(node); - if (allowAbove && widget.above) { - wrap.insertBefore(node, lineView.gutter || lineView.text); - } else { - wrap.appendChild(node); - } - signalLater(widget, "redraw"); - } - } - function positionLineWidget(widget, node, lineView, dims) { - if (widget.noHScroll) { - (lineView.alignable || (lineView.alignable = [])).push(node); - var width = dims.wrapperWidth; - node.style.left = dims.fixedPos + "px"; - if (!widget.coverGutter) { - width -= dims.gutterTotalWidth; - node.style.paddingLeft = dims.gutterTotalWidth + "px"; - } - node.style.width = width + "px"; - } - if (widget.coverGutter) { - node.style.zIndex = 5; - node.style.position = "relative"; - if (!widget.noHScroll) { - node.style.marginLeft = -dims.gutterTotalWidth + "px"; - } - } - } - function widgetHeight(widget) { - if (widget.height != null) { - return widget.height; - } - var cm = widget.doc.cm; - if (!cm) { - return 0; - } - if (!contains(document.body, widget.node)) { - var parentStyle = "position: relative;"; - if (widget.coverGutter) { - parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"; - } - if (widget.noHScroll) { - parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"; - } - removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle)); - } - return widget.height = widget.node.parentNode.offsetHeight; - } - function eventInWidget(display, e) { - for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { - if (!n || n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true" || n.parentNode == display.sizer && n != display.mover) { - return true; - } - } - } - function paddingTop(display) { - return display.lineSpace.offsetTop; - } - function paddingVert(display) { - return display.mover.offsetHeight - display.lineSpace.offsetHeight; - } - function paddingH(display) { - if (display.cachedPaddingH) { - return display.cachedPaddingH; - } - var e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like")); - var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle; - var data = { - left: parseInt(style.paddingLeft), - right: parseInt(style.paddingRight) - }; - if (!isNaN(data.left) && !isNaN(data.right)) { - display.cachedPaddingH = data; - } - return data; - } - function scrollGap(cm) { - return scrollerGap - cm.display.nativeBarWidth; - } - function displayWidth(cm) { - return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth; - } - function displayHeight(cm) { - return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight; - } - function ensureLineHeights(cm, lineView, rect) { - var wrapping = cm.options.lineWrapping; - var curWidth = wrapping && displayWidth(cm); - if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { - var heights = lineView.measure.heights = []; - if (wrapping) { - lineView.measure.width = curWidth; - var rects = lineView.text.firstChild.getClientRects(); - for (var i2 = 0; i2 < rects.length - 1; i2++) { - var cur = rects[i2], - next = rects[i2 + 1]; - if (Math.abs(cur.bottom - next.bottom) > 2) { - heights.push((cur.bottom + next.top) / 2 - rect.top); - } - } - } - heights.push(rect.bottom - rect.top); - } - } - function mapFromLineView(lineView, line, lineN) { - if (lineView.line == line) { - return { - map: lineView.measure.map, - cache: lineView.measure.cache - }; - } - if (lineView.rest) { - for (var i2 = 0; i2 < lineView.rest.length; i2++) { - if (lineView.rest[i2] == line) { - return { - map: lineView.measure.maps[i2], - cache: lineView.measure.caches[i2] - }; - } - } - for (var i$12 = 0; i$12 < lineView.rest.length; i$12++) { - if (lineNo(lineView.rest[i$12]) > lineN) { - return { - map: lineView.measure.maps[i$12], - cache: lineView.measure.caches[i$12], - before: true - }; - } - } - } - } - function updateExternalMeasurement(cm, line) { - line = visualLine(line); - var lineN = lineNo(line); - var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN); - view.lineN = lineN; - var built = view.built = buildLineContent(cm, view); - view.text = built.pre; - removeChildrenAndAdd(cm.display.lineMeasure, built.pre); - return view; - } - function measureChar(cm, line, ch, bias) { - return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias); - } - function findViewForLine(cm, lineN) { - if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) { - return cm.display.view[findViewIndex(cm, lineN)]; - } - var ext = cm.display.externalMeasured; - if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) { - return ext; - } - } - function prepareMeasureForLine(cm, line) { - var lineN = lineNo(line); - var view = findViewForLine(cm, lineN); - if (view && !view.text) { - view = null; - } else if (view && view.changes) { - updateLineForChanges(cm, view, lineN, getDimensions(cm)); - cm.curOp.forceUpdate = true; - } - if (!view) { - view = updateExternalMeasurement(cm, line); - } - var info = mapFromLineView(view, line, lineN); - return { - line, - view, - rect: null, - map: info.map, - cache: info.cache, - before: info.before, - hasHeights: false - }; - } - function measureCharPrepared(cm, prepared, ch, bias, varHeight) { - if (prepared.before) { - ch = -1; - } - var key = ch + (bias || ""), - found; - if (prepared.cache.hasOwnProperty(key)) { - found = prepared.cache[key]; - } else { - if (!prepared.rect) { - prepared.rect = prepared.view.text.getBoundingClientRect(); - } - if (!prepared.hasHeights) { - ensureLineHeights(cm, prepared.view, prepared.rect); - prepared.hasHeights = true; - } - found = measureCharInner(cm, prepared, ch, bias); - if (!found.bogus) { - prepared.cache[key] = found; - } - } - return { - left: found.left, - right: found.right, - top: varHeight ? found.rtop : found.top, - bottom: varHeight ? found.rbottom : found.bottom - }; - } - var nullRect = { - left: 0, - right: 0, - top: 0, - bottom: 0 - }; - function nodeAndOffsetInLineMap(map2, ch, bias) { - var node, start, end, collapse, mStart, mEnd; - for (var i2 = 0; i2 < map2.length; i2 += 3) { - mStart = map2[i2]; - mEnd = map2[i2 + 1]; - if (ch < mStart) { - start = 0; - end = 1; - collapse = "left"; - } else if (ch < mEnd) { - start = ch - mStart; - end = start + 1; - } else if (i2 == map2.length - 3 || ch == mEnd && map2[i2 + 3] > ch) { - end = mEnd - mStart; - start = end - 1; - if (ch >= mEnd) { - collapse = "right"; - } - } - if (start != null) { - node = map2[i2 + 2]; - if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")) { - collapse = bias; - } - if (bias == "left" && start == 0) { - while (i2 && map2[i2 - 2] == map2[i2 - 3] && map2[i2 - 1].insertLeft) { - node = map2[(i2 -= 3) + 2]; - collapse = "left"; - } - } - if (bias == "right" && start == mEnd - mStart) { - while (i2 < map2.length - 3 && map2[i2 + 3] == map2[i2 + 4] && !map2[i2 + 5].insertLeft) { - node = map2[(i2 += 3) + 2]; - collapse = "right"; - } - } - break; - } - } - return { - node, - start, - end, - collapse, - coverStart: mStart, - coverEnd: mEnd - }; - } - function getUsefulRect(rects, bias) { - var rect = nullRect; - if (bias == "left") { - for (var i2 = 0; i2 < rects.length; i2++) { - if ((rect = rects[i2]).left != rect.right) { - break; - } - } - } else { - for (var i$12 = rects.length - 1; i$12 >= 0; i$12--) { - if ((rect = rects[i$12]).left != rect.right) { - break; - } - } - } - return rect; - } - function measureCharInner(cm, prepared, ch, bias) { - var place = nodeAndOffsetInLineMap(prepared.map, ch, bias); - var node = place.node, - start = place.start, - end = place.end, - collapse = place.collapse; - var rect; - if (node.nodeType == 3) { - for (var i$12 = 0; i$12 < 4; i$12++) { - while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) { - --start; - } - while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) { - ++end; - } - if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) { - rect = node.parentNode.getBoundingClientRect(); - } else { - rect = getUsefulRect(range(node, start, end).getClientRects(), bias); - } - if (rect.left || rect.right || start == 0) { - break; - } - end = start; - start = start - 1; - collapse = "right"; - } - if (ie && ie_version < 11) { - rect = maybeUpdateRectForZooming(cm.display.measure, rect); - } - } else { - if (start > 0) { - collapse = bias = "right"; - } - var rects; - if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) { - rect = rects[bias == "right" ? rects.length - 1 : 0]; - } else { - rect = node.getBoundingClientRect(); - } - } - if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { - var rSpan = node.parentNode.getClientRects()[0]; - if (rSpan) { - rect = { - left: rSpan.left, - right: rSpan.left + charWidth(cm.display), - top: rSpan.top, - bottom: rSpan.bottom - }; - } else { - rect = nullRect; - } - } - var rtop = rect.top - prepared.rect.top, - rbot = rect.bottom - prepared.rect.top; - var mid = (rtop + rbot) / 2; - var heights = prepared.view.measure.heights; - var i2 = 0; - for (; i2 < heights.length - 1; i2++) { - if (mid < heights[i2]) { - break; - } - } - var top = i2 ? heights[i2 - 1] : 0, - bot = heights[i2]; - var result = { - left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, - right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, - top, - bottom: bot - }; - if (!rect.left && !rect.right) { - result.bogus = true; - } - if (!cm.options.singleCursorHeightPerLine) { - result.rtop = rtop; - result.rbottom = rbot; - } - return result; - } - function maybeUpdateRectForZooming(measure, rect) { - if (!window.screen || screen.logicalXDPI == null || screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) { - return rect; - } - var scaleX = screen.logicalXDPI / screen.deviceXDPI; - var scaleY = screen.logicalYDPI / screen.deviceYDPI; - return { - left: rect.left * scaleX, - right: rect.right * scaleX, - top: rect.top * scaleY, - bottom: rect.bottom * scaleY - }; - } - function clearLineMeasurementCacheFor(lineView) { - if (lineView.measure) { - lineView.measure.cache = {}; - lineView.measure.heights = null; - if (lineView.rest) { - for (var i2 = 0; i2 < lineView.rest.length; i2++) { - lineView.measure.caches[i2] = {}; - } - } - } - } - function clearLineMeasurementCache(cm) { - cm.display.externalMeasure = null; - removeChildren(cm.display.lineMeasure); - for (var i2 = 0; i2 < cm.display.view.length; i2++) { - clearLineMeasurementCacheFor(cm.display.view[i2]); - } - } - function clearCaches(cm) { - clearLineMeasurementCache(cm); - cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null; - if (!cm.options.lineWrapping) { - cm.display.maxLineChanged = true; - } - cm.display.lineNumChars = null; - } - function pageScrollX() { - if (chrome && android) { - return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft)); - } - return window.pageXOffset || (document.documentElement || document.body).scrollLeft; - } - function pageScrollY() { - if (chrome && android) { - return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop)); - } - return window.pageYOffset || (document.documentElement || document.body).scrollTop; - } - function widgetTopHeight(lineObj) { - var ref = visualLine(lineObj); - var widgets = ref.widgets; - var height = 0; - if (widgets) { - for (var i2 = 0; i2 < widgets.length; ++i2) { - if (widgets[i2].above) { - height += widgetHeight(widgets[i2]); - } - } - } - return height; - } - function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) { - if (!includeWidgets) { - var height = widgetTopHeight(lineObj); - rect.top += height; - rect.bottom += height; - } - if (context == "line") { - return rect; - } - if (!context) { - context = "local"; - } - var yOff = heightAtLine(lineObj); - if (context == "local") { - yOff += paddingTop(cm.display); - } else { - yOff -= cm.display.viewOffset; - } - if (context == "page" || context == "window") { - var lOff = cm.display.lineSpace.getBoundingClientRect(); - yOff += lOff.top + (context == "window" ? 0 : pageScrollY()); - var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()); - rect.left += xOff; - rect.right += xOff; - } - rect.top += yOff; - rect.bottom += yOff; - return rect; - } - function fromCoordSystem(cm, coords, context) { - if (context == "div") { - return coords; - } - var left = coords.left, - top = coords.top; - if (context == "page") { - left -= pageScrollX(); - top -= pageScrollY(); - } else if (context == "local" || !context) { - var localBox = cm.display.sizer.getBoundingClientRect(); - left += localBox.left; - top += localBox.top; - } - var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect(); - return { - left: left - lineSpaceBox.left, - top: top - lineSpaceBox.top - }; - } - function charCoords(cm, pos, context, lineObj, bias) { - if (!lineObj) { - lineObj = getLine(cm.doc, pos.line); - } - return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context); - } - function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) { - lineObj = lineObj || getLine(cm.doc, pos.line); - if (!preparedMeasure) { - preparedMeasure = prepareMeasureForLine(cm, lineObj); - } - function get(ch2, right) { - var m = measureCharPrepared(cm, preparedMeasure, ch2, right ? "right" : "left", varHeight); - if (right) { - m.left = m.right; - } else { - m.right = m.left; - } - return intoCoordSystem(cm, lineObj, m, context); - } - var order = getOrder(lineObj, cm.doc.direction), - ch = pos.ch, - sticky = pos.sticky; - if (ch >= lineObj.text.length) { - ch = lineObj.text.length; - sticky = "before"; - } else if (ch <= 0) { - ch = 0; - sticky = "after"; - } - if (!order) { - return get(sticky == "before" ? ch - 1 : ch, sticky == "before"); - } - function getBidi(ch2, partPos2, invert) { - var part = order[partPos2], - right = part.level == 1; - return get(invert ? ch2 - 1 : ch2, right != invert); - } - var partPos = getBidiPartAt(order, ch, sticky); - var other = bidiOther; - var val = getBidi(ch, partPos, sticky == "before"); - if (other != null) { - val.other = getBidi(ch, other, sticky != "before"); - } - return val; - } - function estimateCoords(cm, pos) { - var left = 0; - pos = clipPos(cm.doc, pos); - if (!cm.options.lineWrapping) { - left = charWidth(cm.display) * pos.ch; - } - var lineObj = getLine(cm.doc, pos.line); - var top = heightAtLine(lineObj) + paddingTop(cm.display); - return { - left, - right: left, - top, - bottom: top + lineObj.height - }; - } - function PosWithInfo(line, ch, sticky, outside, xRel) { - var pos = Pos(line, ch, sticky); - pos.xRel = xRel; - if (outside) { - pos.outside = outside; - } - return pos; - } - function coordsChar(cm, x, y) { - var doc = cm.doc; - y += cm.display.viewOffset; - if (y < 0) { - return PosWithInfo(doc.first, 0, null, -1, -1); - } - var lineN = lineAtHeight(doc, y), - last = doc.first + doc.size - 1; - if (lineN > last) { - return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1); - } - if (x < 0) { - x = 0; - } - var lineObj = getLine(doc, lineN); - for (;;) { - var found = coordsCharInner(cm, lineObj, lineN, x, y); - var collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0)); - if (!collapsed) { - return found; - } - var rangeEnd = collapsed.find(1); - if (rangeEnd.line == lineN) { - return rangeEnd; - } - lineObj = getLine(doc, lineN = rangeEnd.line); - } - } - function wrappedLineExtent(cm, lineObj, preparedMeasure, y) { - y -= widgetTopHeight(lineObj); - var end = lineObj.text.length; - var begin = findFirst(function (ch) { - return measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y; - }, end, 0); - end = findFirst(function (ch) { - return measureCharPrepared(cm, preparedMeasure, ch).top > y; - }, begin, end); - return { - begin, - end - }; - } - function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) { - if (!preparedMeasure) { - preparedMeasure = prepareMeasureForLine(cm, lineObj); - } - var targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top; - return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop); - } - function boxIsAfter(box, x, y, left) { - return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x; - } - function coordsCharInner(cm, lineObj, lineNo2, x, y) { - y -= heightAtLine(lineObj); - var preparedMeasure = prepareMeasureForLine(cm, lineObj); - var widgetHeight2 = widgetTopHeight(lineObj); - var begin = 0, - end = lineObj.text.length, - ltr = true; - var order = getOrder(lineObj, cm.doc.direction); - if (order) { - var part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)(cm, lineObj, lineNo2, preparedMeasure, order, x, y); - ltr = part.level != 1; - begin = ltr ? part.from : part.to - 1; - end = ltr ? part.to : part.from - 1; - } - var chAround = null, - boxAround = null; - var ch = findFirst(function (ch2) { - var box = measureCharPrepared(cm, preparedMeasure, ch2); - box.top += widgetHeight2; - box.bottom += widgetHeight2; - if (!boxIsAfter(box, x, y, false)) { - return false; - } - if (box.top <= y && box.left <= x) { - chAround = ch2; - boxAround = box; - } - return true; - }, begin, end); - var baseX, - sticky, - outside = false; - if (boxAround) { - var atLeft = x - boxAround.left < boxAround.right - x, - atStart = atLeft == ltr; - ch = chAround + (atStart ? 0 : 1); - sticky = atStart ? "after" : "before"; - baseX = atLeft ? boxAround.left : boxAround.right; - } else { - if (!ltr && (ch == end || ch == begin)) { - ch++; - } - sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" : measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight2 <= y == ltr ? "after" : "before"; - var coords = cursorCoords(cm, Pos(lineNo2, ch, sticky), "line", lineObj, preparedMeasure); - baseX = coords.left; - outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0; - } - ch = skipExtendingChars(lineObj.text, ch, 1); - return PosWithInfo(lineNo2, ch, sticky, outside, x - baseX); - } - function coordsBidiPart(cm, lineObj, lineNo2, preparedMeasure, order, x, y) { - var index = findFirst(function (i2) { - var part2 = order[i2], - ltr2 = part2.level != 1; - return boxIsAfter(cursorCoords(cm, Pos(lineNo2, ltr2 ? part2.to : part2.from, ltr2 ? "before" : "after"), "line", lineObj, preparedMeasure), x, y, true); - }, 0, order.length - 1); - var part = order[index]; - if (index > 0) { - var ltr = part.level != 1; - var start = cursorCoords(cm, Pos(lineNo2, ltr ? part.from : part.to, ltr ? "after" : "before"), "line", lineObj, preparedMeasure); - if (boxIsAfter(start, x, y, true) && start.top > y) { - part = order[index - 1]; - } - } - return part; - } - function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) { - var ref = wrappedLineExtent(cm, lineObj, preparedMeasure, y); - var begin = ref.begin; - var end = ref.end; - if (/\s/.test(lineObj.text.charAt(end - 1))) { - end--; - } - var part = null, - closestDist = null; - for (var i2 = 0; i2 < order.length; i2++) { - var p = order[i2]; - if (p.from >= end || p.to <= begin) { - continue; - } - var ltr = p.level != 1; - var endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right; - var dist = endX < x ? x - endX + 1e9 : endX - x; - if (!part || closestDist > dist) { - part = p; - closestDist = dist; - } - } - if (!part) { - part = order[order.length - 1]; - } - if (part.from < begin) { - part = { - from: begin, - to: part.to, - level: part.level - }; - } - if (part.to > end) { - part = { - from: part.from, - to: end, - level: part.level - }; - } - return part; - } - var measureText; - function textHeight(display) { - if (display.cachedTextHeight != null) { - return display.cachedTextHeight; - } - if (measureText == null) { - measureText = elt("pre", null, "CodeMirror-line-like"); - for (var i2 = 0; i2 < 49; ++i2) { - measureText.appendChild(document.createTextNode("x")); - measureText.appendChild(elt("br")); - } - measureText.appendChild(document.createTextNode("x")); - } - removeChildrenAndAdd(display.measure, measureText); - var height = measureText.offsetHeight / 50; - if (height > 3) { - display.cachedTextHeight = height; - } - removeChildren(display.measure); - return height || 1; - } - function charWidth(display) { - if (display.cachedCharWidth != null) { - return display.cachedCharWidth; - } - var anchor = elt("span", "xxxxxxxxxx"); - var pre = elt("pre", [anchor], "CodeMirror-line-like"); - removeChildrenAndAdd(display.measure, pre); - var rect = anchor.getBoundingClientRect(), - width = (rect.right - rect.left) / 10; - if (width > 2) { - display.cachedCharWidth = width; - } - return width || 10; - } - function getDimensions(cm) { - var d = cm.display, - left = {}, - width = {}; - var gutterLeft = d.gutters.clientLeft; - for (var n = d.gutters.firstChild, i2 = 0; n; n = n.nextSibling, ++i2) { - var id = cm.display.gutterSpecs[i2].className; - left[id] = n.offsetLeft + n.clientLeft + gutterLeft; - width[id] = n.clientWidth; - } - return { - fixedPos: compensateForHScroll(d), - gutterTotalWidth: d.gutters.offsetWidth, - gutterLeft: left, - gutterWidth: width, - wrapperWidth: d.wrapper.clientWidth - }; - } - function compensateForHScroll(display) { - return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left; - } - function estimateHeight(cm) { - var th = textHeight(cm.display), - wrapping = cm.options.lineWrapping; - var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3); - return function (line) { - if (lineIsHidden(cm.doc, line)) { - return 0; - } - var widgetsHeight = 0; - if (line.widgets) { - for (var i2 = 0; i2 < line.widgets.length; i2++) { - if (line.widgets[i2].height) { - widgetsHeight += line.widgets[i2].height; - } - } - } - if (wrapping) { - return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th; - } else { - return widgetsHeight + th; - } - }; - } - function estimateLineHeights(cm) { - var doc = cm.doc, - est = estimateHeight(cm); - doc.iter(function (line) { - var estHeight = est(line); - if (estHeight != line.height) { - updateLineHeight(line, estHeight); - } - }); - } - function posFromMouse(cm, e, liberal, forRect) { - var display = cm.display; - if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") { - return null; - } - var x, - y, - space = display.lineSpace.getBoundingClientRect(); - try { - x = e.clientX - space.left; - y = e.clientY - space.top; - } catch (e$1) { - return null; - } - var coords = coordsChar(cm, x, y), - line; - if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { - var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length; - coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)); - } - return coords; - } - function findViewIndex(cm, n) { - if (n >= cm.display.viewTo) { - return null; - } - n -= cm.display.viewFrom; - if (n < 0) { - return null; - } - var view = cm.display.view; - for (var i2 = 0; i2 < view.length; i2++) { - n -= view[i2].size; - if (n < 0) { - return i2; - } - } - } - function regChange(cm, from, to, lendiff) { - if (from == null) { - from = cm.doc.first; - } - if (to == null) { - to = cm.doc.first + cm.doc.size; - } - if (!lendiff) { - lendiff = 0; - } - var display = cm.display; - if (lendiff && to < display.viewTo && (display.updateLineNumbers == null || display.updateLineNumbers > from)) { - display.updateLineNumbers = from; - } - cm.curOp.viewChanged = true; - if (from >= display.viewTo) { - if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo) { - resetView(cm); - } - } else if (to <= display.viewFrom) { - if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) { - resetView(cm); - } else { - display.viewFrom += lendiff; - display.viewTo += lendiff; - } - } else if (from <= display.viewFrom && to >= display.viewTo) { - resetView(cm); - } else if (from <= display.viewFrom) { - var cut = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cut) { - display.view = display.view.slice(cut.index); - display.viewFrom = cut.lineN; - display.viewTo += lendiff; - } else { - resetView(cm); - } - } else if (to >= display.viewTo) { - var cut$1 = viewCuttingPoint(cm, from, from, -1); - if (cut$1) { - display.view = display.view.slice(0, cut$1.index); - display.viewTo = cut$1.lineN; - } else { - resetView(cm); - } - } else { - var cutTop = viewCuttingPoint(cm, from, from, -1); - var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cutTop && cutBot) { - display.view = display.view.slice(0, cutTop.index).concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)).concat(display.view.slice(cutBot.index)); - display.viewTo += lendiff; - } else { - resetView(cm); - } - } - var ext = display.externalMeasured; - if (ext) { - if (to < ext.lineN) { - ext.lineN += lendiff; - } else if (from < ext.lineN + ext.size) { - display.externalMeasured = null; - } - } - } - function regLineChange(cm, line, type) { - cm.curOp.viewChanged = true; - var display = cm.display, - ext = cm.display.externalMeasured; - if (ext && line >= ext.lineN && line < ext.lineN + ext.size) { - display.externalMeasured = null; - } - if (line < display.viewFrom || line >= display.viewTo) { - return; - } - var lineView = display.view[findViewIndex(cm, line)]; - if (lineView.node == null) { - return; - } - var arr = lineView.changes || (lineView.changes = []); - if (indexOf(arr, type) == -1) { - arr.push(type); - } - } - function resetView(cm) { - cm.display.viewFrom = cm.display.viewTo = cm.doc.first; - cm.display.view = []; - cm.display.viewOffset = 0; - } - function viewCuttingPoint(cm, oldN, newN, dir) { - var index = findViewIndex(cm, oldN), - diff, - view = cm.display.view; - if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) { - return { - index, - lineN: newN - }; - } - var n = cm.display.viewFrom; - for (var i2 = 0; i2 < index; i2++) { - n += view[i2].size; - } - if (n != oldN) { - if (dir > 0) { - if (index == view.length - 1) { - return null; - } - diff = n + view[index].size - oldN; - index++; - } else { - diff = n - oldN; - } - oldN += diff; - newN += diff; - } - while (visualLineNo(cm.doc, newN) != newN) { - if (index == (dir < 0 ? 0 : view.length - 1)) { - return null; - } - newN += dir * view[index - (dir < 0 ? 1 : 0)].size; - index += dir; - } - return { - index, - lineN: newN - }; - } - function adjustView(cm, from, to) { - var display = cm.display, - view = display.view; - if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { - display.view = buildViewArray(cm, from, to); - display.viewFrom = from; - } else { - if (display.viewFrom > from) { - display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); - } else if (display.viewFrom < from) { - display.view = display.view.slice(findViewIndex(cm, from)); - } - display.viewFrom = from; - if (display.viewTo < to) { - display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); - } else if (display.viewTo > to) { - display.view = display.view.slice(0, findViewIndex(cm, to)); - } - } - display.viewTo = to; - } - function countDirtyView(cm) { - var view = cm.display.view, - dirty = 0; - for (var i2 = 0; i2 < view.length; i2++) { - var lineView = view[i2]; - if (!lineView.hidden && (!lineView.node || lineView.changes)) { - ++dirty; - } - } - return dirty; - } - function updateSelection(cm) { - cm.display.input.showSelection(cm.display.input.prepareSelection()); - } - function prepareSelection(cm, primary) { - if (primary === void 0) primary = true; - var doc = cm.doc, - result = {}; - var curFragment = result.cursors = document.createDocumentFragment(); - var selFragment = result.selection = document.createDocumentFragment(); - var customCursor = cm.options.$customCursor; - if (customCursor) { - primary = true; - } - for (var i2 = 0; i2 < doc.sel.ranges.length; i2++) { - if (!primary && i2 == doc.sel.primIndex) { - continue; - } - var range2 = doc.sel.ranges[i2]; - if (range2.from().line >= cm.display.viewTo || range2.to().line < cm.display.viewFrom) { - continue; - } - var collapsed = range2.empty(); - if (customCursor) { - var head = customCursor(cm, range2); - if (head) { - drawSelectionCursor(cm, head, curFragment); - } - } else if (collapsed || cm.options.showCursorWhenSelecting) { - drawSelectionCursor(cm, range2.head, curFragment); - } - if (!collapsed) { - drawSelectionRange(cm, range2, selFragment); - } - } - return result; - } - function drawSelectionCursor(cm, head, output) { - var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine); - var cursor = output.appendChild(elt("div", " ", "CodeMirror-cursor")); - cursor.style.left = pos.left + "px"; - cursor.style.top = pos.top + "px"; - cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"; - if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) { - var charPos = charCoords(cm, head, "div", null, null); - var width = charPos.right - charPos.left; - cursor.style.width = (width > 0 ? width : cm.defaultCharWidth()) + "px"; - } - if (pos.other) { - var otherCursor = output.appendChild(elt("div", " ", "CodeMirror-cursor CodeMirror-secondarycursor")); - otherCursor.style.display = ""; - otherCursor.style.left = pos.other.left + "px"; - otherCursor.style.top = pos.other.top + "px"; - otherCursor.style.height = (pos.other.bottom - pos.other.top) * 0.85 + "px"; - } - } - function cmpCoords(a, b) { - return a.top - b.top || a.left - b.left; - } - function drawSelectionRange(cm, range2, output) { - var display = cm.display, - doc = cm.doc; - var fragment = document.createDocumentFragment(); - var padding = paddingH(cm.display), - leftSide = padding.left; - var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right; - var docLTR = doc.direction == "ltr"; - function add(left, top, width, bottom) { - if (top < 0) { - top = 0; - } - top = Math.round(top); - bottom = Math.round(bottom); - fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left + "px;\n top: " + top + "px; width: " + (width == null ? rightSide - left : width) + "px;\n height: " + (bottom - top) + "px")); - } - function drawForLine(line, fromArg, toArg) { - var lineObj = getLine(doc, line); - var lineLen = lineObj.text.length; - var start, end; - function coords(ch, bias) { - return charCoords(cm, Pos(line, ch), "div", lineObj, bias); - } - function wrapX(pos, dir, side) { - var extent = wrappedLineExtentChar(cm, lineObj, null, pos); - var prop2 = dir == "ltr" == (side == "after") ? "left" : "right"; - var ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1); - return coords(ch, prop2)[prop2]; - } - var order = getOrder(lineObj, doc.direction); - iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, function (from, to, dir, i2) { - var ltr = dir == "ltr"; - var fromPos = coords(from, ltr ? "left" : "right"); - var toPos = coords(to - 1, ltr ? "right" : "left"); - var openStart = fromArg == null && from == 0, - openEnd = toArg == null && to == lineLen; - var first = i2 == 0, - last = !order || i2 == order.length - 1; - if (toPos.top - fromPos.top <= 3) { - var openLeft = (docLTR ? openStart : openEnd) && first; - var openRight = (docLTR ? openEnd : openStart) && last; - var left = openLeft ? leftSide : (ltr ? fromPos : toPos).left; - var right = openRight ? rightSide : (ltr ? toPos : fromPos).right; - add(left, fromPos.top, right - left, fromPos.bottom); - } else { - var topLeft, topRight, botLeft, botRight; - if (ltr) { - topLeft = docLTR && openStart && first ? leftSide : fromPos.left; - topRight = docLTR ? rightSide : wrapX(from, dir, "before"); - botLeft = docLTR ? leftSide : wrapX(to, dir, "after"); - botRight = docLTR && openEnd && last ? rightSide : toPos.right; - } else { - topLeft = !docLTR ? leftSide : wrapX(from, dir, "before"); - topRight = !docLTR && openStart && first ? rightSide : fromPos.right; - botLeft = !docLTR && openEnd && last ? leftSide : toPos.left; - botRight = !docLTR ? rightSide : wrapX(to, dir, "after"); - } - add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom); - if (fromPos.bottom < toPos.top) { - add(leftSide, fromPos.bottom, null, toPos.top); - } - add(botLeft, toPos.top, botRight - botLeft, toPos.bottom); - } - if (!start || cmpCoords(fromPos, start) < 0) { - start = fromPos; - } - if (cmpCoords(toPos, start) < 0) { - start = toPos; - } - if (!end || cmpCoords(fromPos, end) < 0) { - end = fromPos; - } - if (cmpCoords(toPos, end) < 0) { - end = toPos; - } - }); - return { - start, - end - }; - } - var sFrom = range2.from(), - sTo = range2.to(); - if (sFrom.line == sTo.line) { - drawForLine(sFrom.line, sFrom.ch, sTo.ch); - } else { - var fromLine = getLine(doc, sFrom.line), - toLine = getLine(doc, sTo.line); - var singleVLine = visualLine(fromLine) == visualLine(toLine); - var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end; - var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start; - if (singleVLine) { - if (leftEnd.top < rightStart.top - 2) { - add(leftEnd.right, leftEnd.top, null, leftEnd.bottom); - add(leftSide, rightStart.top, rightStart.left, rightStart.bottom); - } else { - add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom); - } - } - if (leftEnd.bottom < rightStart.top) { - add(leftSide, leftEnd.bottom, null, rightStart.top); - } - } - output.appendChild(fragment); - } - function restartBlink(cm) { - if (!cm.state.focused) { - return; - } - var display = cm.display; - clearInterval(display.blinker); - var on2 = true; - display.cursorDiv.style.visibility = ""; - if (cm.options.cursorBlinkRate > 0) { - display.blinker = setInterval(function () { - if (!cm.hasFocus()) { - onBlur(cm); - } - display.cursorDiv.style.visibility = (on2 = !on2) ? "" : "hidden"; - }, cm.options.cursorBlinkRate); - } else if (cm.options.cursorBlinkRate < 0) { - display.cursorDiv.style.visibility = "hidden"; - } - } - function ensureFocus(cm) { - if (!cm.hasFocus()) { - cm.display.input.focus(); - if (!cm.state.focused) { - onFocus(cm); - } - } - } - function delayBlurEvent(cm) { - cm.state.delayingBlurEvent = true; - setTimeout(function () { - if (cm.state.delayingBlurEvent) { - cm.state.delayingBlurEvent = false; - if (cm.state.focused) { - onBlur(cm); - } - } - }, 100); - } - function onFocus(cm, e) { - if (cm.state.delayingBlurEvent && !cm.state.draggingText) { - cm.state.delayingBlurEvent = false; - } - if (cm.options.readOnly == "nocursor") { - return; - } - if (!cm.state.focused) { - signal(cm, "focus", cm, e); - cm.state.focused = true; - addClass(cm.display.wrapper, "CodeMirror-focused"); - if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) { - cm.display.input.reset(); - if (webkit) { - setTimeout(function () { - return cm.display.input.reset(true); - }, 20); - } - } - cm.display.input.receivedFocus(); - } - restartBlink(cm); - } - function onBlur(cm, e) { - if (cm.state.delayingBlurEvent) { - return; - } - if (cm.state.focused) { - signal(cm, "blur", cm, e); - cm.state.focused = false; - rmClass(cm.display.wrapper, "CodeMirror-focused"); - } - clearInterval(cm.display.blinker); - setTimeout(function () { - if (!cm.state.focused) { - cm.display.shift = false; - } - }, 150); - } - function updateHeightsInViewport(cm) { - var display = cm.display; - var prevBottom = display.lineDiv.offsetTop; - var viewTop = Math.max(0, display.scroller.getBoundingClientRect().top); - var oldHeight = display.lineDiv.getBoundingClientRect().top; - var mustScroll = 0; - for (var i2 = 0; i2 < display.view.length; i2++) { - var cur = display.view[i2], - wrapping = cm.options.lineWrapping; - var height = void 0, - width = 0; - if (cur.hidden) { - continue; - } - oldHeight += cur.line.height; - if (ie && ie_version < 8) { - var bot = cur.node.offsetTop + cur.node.offsetHeight; - height = bot - prevBottom; - prevBottom = bot; - } else { - var box = cur.node.getBoundingClientRect(); - height = box.bottom - box.top; - if (!wrapping && cur.text.firstChild) { - width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1; - } - } - var diff = cur.line.height - height; - if (diff > 5e-3 || diff < -5e-3) { - if (oldHeight < viewTop) { - mustScroll -= diff; - } - updateLineHeight(cur.line, height); - updateWidgetHeight(cur.line); - if (cur.rest) { - for (var j = 0; j < cur.rest.length; j++) { - updateWidgetHeight(cur.rest[j]); - } - } - } - if (width > cm.display.sizerWidth) { - var chWidth = Math.ceil(width / charWidth(cm.display)); - if (chWidth > cm.display.maxLineLength) { - cm.display.maxLineLength = chWidth; - cm.display.maxLine = cur.line; - cm.display.maxLineChanged = true; - } - } - } - if (Math.abs(mustScroll) > 2) { - display.scroller.scrollTop += mustScroll; - } - } - function updateWidgetHeight(line) { - if (line.widgets) { - for (var i2 = 0; i2 < line.widgets.length; ++i2) { - var w = line.widgets[i2], - parent = w.node.parentNode; - if (parent) { - w.height = parent.offsetHeight; - } - } - } - } - function visibleLines(display, doc, viewport) { - var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; - top = Math.floor(top - paddingTop(display)); - var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight; - var from = lineAtHeight(doc, top), - to = lineAtHeight(doc, bottom); - if (viewport && viewport.ensure) { - var ensureFrom = viewport.ensure.from.line, - ensureTo = viewport.ensure.to.line; - if (ensureFrom < from) { - from = ensureFrom; - to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight); - } else if (Math.min(ensureTo, doc.lastLine()) >= to) { - from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight); - to = ensureTo; - } - } - return { - from, - to: Math.max(to, from + 1) - }; - } - function maybeScrollWindow(cm, rect) { - if (signalDOMEvent(cm, "scrollCursorIntoView")) { - return; - } - var display = cm.display, - box = display.sizer.getBoundingClientRect(), - doScroll = null; - if (rect.top + box.top < 0) { - doScroll = true; - } else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) { - doScroll = false; - } - if (doScroll != null && !phantom) { - var scrollNode = elt("div", "​", null, "position: absolute;\n top: " + (rect.top - display.viewOffset - paddingTop(cm.display)) + "px;\n height: " + (rect.bottom - rect.top + scrollGap(cm) + display.barHeight) + "px;\n left: " + rect.left + "px; width: " + Math.max(2, rect.right - rect.left) + "px;"); - cm.display.lineSpace.appendChild(scrollNode); - scrollNode.scrollIntoView(doScroll); - cm.display.lineSpace.removeChild(scrollNode); - } - } - function scrollPosIntoView(cm, pos, end, margin) { - if (margin == null) { - margin = 0; - } - var rect; - if (!cm.options.lineWrapping && pos == end) { - end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos; - pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos; - } - for (var limit = 0; limit < 5; limit++) { - var changed = false; - var coords = cursorCoords(cm, pos); - var endCoords = !end || end == pos ? coords : cursorCoords(cm, end); - rect = { - left: Math.min(coords.left, endCoords.left), - top: Math.min(coords.top, endCoords.top) - margin, - right: Math.max(coords.left, endCoords.left), - bottom: Math.max(coords.bottom, endCoords.bottom) + margin - }; - var scrollPos = calculateScrollPos(cm, rect); - var startTop = cm.doc.scrollTop, - startLeft = cm.doc.scrollLeft; - if (scrollPos.scrollTop != null) { - updateScrollTop(cm, scrollPos.scrollTop); - if (Math.abs(cm.doc.scrollTop - startTop) > 1) { - changed = true; - } - } - if (scrollPos.scrollLeft != null) { - setScrollLeft(cm, scrollPos.scrollLeft); - if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) { - changed = true; - } - } - if (!changed) { - break; - } - } - return rect; - } - function scrollIntoView(cm, rect) { - var scrollPos = calculateScrollPos(cm, rect); - if (scrollPos.scrollTop != null) { - updateScrollTop(cm, scrollPos.scrollTop); - } - if (scrollPos.scrollLeft != null) { - setScrollLeft(cm, scrollPos.scrollLeft); - } - } - function calculateScrollPos(cm, rect) { - var display = cm.display, - snapMargin = textHeight(cm.display); - if (rect.top < 0) { - rect.top = 0; - } - var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop; - var screen2 = displayHeight(cm), - result = {}; - if (rect.bottom - rect.top > screen2) { - rect.bottom = rect.top + screen2; - } - var docBottom = cm.doc.height + paddingVert(display); - var atTop = rect.top < snapMargin, - atBottom = rect.bottom > docBottom - snapMargin; - if (rect.top < screentop) { - result.scrollTop = atTop ? 0 : rect.top; - } else if (rect.bottom > screentop + screen2) { - var newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen2); - if (newTop != screentop) { - result.scrollTop = newTop; - } - } - var gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth; - var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace; - var screenw = displayWidth(cm) - display.gutters.offsetWidth; - var tooWide = rect.right - rect.left > screenw; - if (tooWide) { - rect.right = rect.left + screenw; - } - if (rect.left < 10) { - result.scrollLeft = 0; - } else if (rect.left < screenleft) { - result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10)); - } else if (rect.right > screenw + screenleft - 3) { - result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw; - } - return result; - } - function addToScrollTop(cm, top) { - if (top == null) { - return; - } - resolveScrollToPos(cm); - cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; - } - function ensureCursorVisible(cm) { - resolveScrollToPos(cm); - var cur = cm.getCursor(); - cm.curOp.scrollToPos = { - from: cur, - to: cur, - margin: cm.options.cursorScrollMargin - }; - } - function scrollToCoords(cm, x, y) { - if (x != null || y != null) { - resolveScrollToPos(cm); - } - if (x != null) { - cm.curOp.scrollLeft = x; - } - if (y != null) { - cm.curOp.scrollTop = y; - } - } - function scrollToRange(cm, range2) { - resolveScrollToPos(cm); - cm.curOp.scrollToPos = range2; - } - function resolveScrollToPos(cm) { - var range2 = cm.curOp.scrollToPos; - if (range2) { - cm.curOp.scrollToPos = null; - var from = estimateCoords(cm, range2.from), - to = estimateCoords(cm, range2.to); - scrollToCoordsRange(cm, from, to, range2.margin); - } - } - function scrollToCoordsRange(cm, from, to, margin) { - var sPos = calculateScrollPos(cm, { - left: Math.min(from.left, to.left), - top: Math.min(from.top, to.top) - margin, - right: Math.max(from.right, to.right), - bottom: Math.max(from.bottom, to.bottom) + margin - }); - scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop); - } - function updateScrollTop(cm, val) { - if (Math.abs(cm.doc.scrollTop - val) < 2) { - return; - } - if (!gecko) { - updateDisplaySimple(cm, { - top: val - }); - } - setScrollTop(cm, val, true); - if (gecko) { - updateDisplaySimple(cm); - } - startWorker(cm, 100); - } - function setScrollTop(cm, val, forceScroll) { - val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)); - if (cm.display.scroller.scrollTop == val && !forceScroll) { - return; - } - cm.doc.scrollTop = val; - cm.display.scrollbars.setScrollTop(val); - if (cm.display.scroller.scrollTop != val) { - cm.display.scroller.scrollTop = val; - } - } - function setScrollLeft(cm, val, isScroller, forceScroll) { - val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)); - if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) { - return; - } - cm.doc.scrollLeft = val; - alignHorizontally(cm); - if (cm.display.scroller.scrollLeft != val) { - cm.display.scroller.scrollLeft = val; - } - cm.display.scrollbars.setScrollLeft(val); - } - function measureForScrollbars(cm) { - var d = cm.display, - gutterW = d.gutters.offsetWidth; - var docH = Math.round(cm.doc.height + paddingVert(cm.display)); - return { - clientHeight: d.scroller.clientHeight, - viewHeight: d.wrapper.clientHeight, - scrollWidth: d.scroller.scrollWidth, - clientWidth: d.scroller.clientWidth, - viewWidth: d.wrapper.clientWidth, - barLeft: cm.options.fixedGutter ? gutterW : 0, - docHeight: docH, - scrollHeight: docH + scrollGap(cm) + d.barHeight, - nativeBarWidth: d.nativeBarWidth, - gutterWidth: gutterW - }; - } - var NativeScrollbars = function (place, scroll, cm) { - this.cm = cm; - var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar"); - var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar"); - vert.tabIndex = horiz.tabIndex = -1; - place(vert); - place(horiz); - on(vert, "scroll", function () { - if (vert.clientHeight) { - scroll(vert.scrollTop, "vertical"); - } - }); - on(horiz, "scroll", function () { - if (horiz.clientWidth) { - scroll(horiz.scrollLeft, "horizontal"); - } - }); - this.checkedZeroWidth = false; - if (ie && ie_version < 8) { - this.horiz.style.minHeight = this.vert.style.minWidth = "18px"; - } - }; - NativeScrollbars.prototype.update = function (measure) { - var needsH = measure.scrollWidth > measure.clientWidth + 1; - var needsV = measure.scrollHeight > measure.clientHeight + 1; - var sWidth = measure.nativeBarWidth; - if (needsV) { - this.vert.style.display = "block"; - this.vert.style.bottom = needsH ? sWidth + "px" : "0"; - var totalHeight = measure.viewHeight - (needsH ? sWidth : 0); - this.vert.firstChild.style.height = Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"; - } else { - this.vert.scrollTop = 0; - this.vert.style.display = ""; - this.vert.firstChild.style.height = "0"; - } - if (needsH) { - this.horiz.style.display = "block"; - this.horiz.style.right = needsV ? sWidth + "px" : "0"; - this.horiz.style.left = measure.barLeft + "px"; - var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0); - this.horiz.firstChild.style.width = Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px"; - } else { - this.horiz.style.display = ""; - this.horiz.firstChild.style.width = "0"; - } - if (!this.checkedZeroWidth && measure.clientHeight > 0) { - if (sWidth == 0) { - this.zeroWidthHack(); - } - this.checkedZeroWidth = true; - } - return { - right: needsV ? sWidth : 0, - bottom: needsH ? sWidth : 0 - }; - }; - NativeScrollbars.prototype.setScrollLeft = function (pos) { - if (this.horiz.scrollLeft != pos) { - this.horiz.scrollLeft = pos; - } - if (this.disableHoriz) { - this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz"); - } - }; - NativeScrollbars.prototype.setScrollTop = function (pos) { - if (this.vert.scrollTop != pos) { - this.vert.scrollTop = pos; - } - if (this.disableVert) { - this.enableZeroWidthBar(this.vert, this.disableVert, "vert"); - } - }; - NativeScrollbars.prototype.zeroWidthHack = function () { - var w = mac && !mac_geMountainLion ? "12px" : "18px"; - this.horiz.style.height = this.vert.style.width = w; - this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"; - this.disableHoriz = new Delayed(); - this.disableVert = new Delayed(); - }; - NativeScrollbars.prototype.enableZeroWidthBar = function (bar, delay, type) { - bar.style.pointerEvents = "auto"; - function maybeDisable() { - var box = bar.getBoundingClientRect(); - var elt2 = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2) : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1); - if (elt2 != bar) { - bar.style.pointerEvents = "none"; - } else { - delay.set(1e3, maybeDisable); - } - } - delay.set(1e3, maybeDisable); - }; - NativeScrollbars.prototype.clear = function () { - var parent = this.horiz.parentNode; - parent.removeChild(this.horiz); - parent.removeChild(this.vert); - }; - var NullScrollbars = function () {}; - NullScrollbars.prototype.update = function () { - return { - bottom: 0, - right: 0 - }; - }; - NullScrollbars.prototype.setScrollLeft = function () {}; - NullScrollbars.prototype.setScrollTop = function () {}; - NullScrollbars.prototype.clear = function () {}; - function updateScrollbars(cm, measure) { - if (!measure) { - measure = measureForScrollbars(cm); - } - var startWidth = cm.display.barWidth, - startHeight = cm.display.barHeight; - updateScrollbarsInner(cm, measure); - for (var i2 = 0; i2 < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i2++) { - if (startWidth != cm.display.barWidth && cm.options.lineWrapping) { - updateHeightsInViewport(cm); - } - updateScrollbarsInner(cm, measureForScrollbars(cm)); - startWidth = cm.display.barWidth; - startHeight = cm.display.barHeight; - } - } - function updateScrollbarsInner(cm, measure) { - var d = cm.display; - var sizes = d.scrollbars.update(measure); - d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"; - d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"; - d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"; - if (sizes.right && sizes.bottom) { - d.scrollbarFiller.style.display = "block"; - d.scrollbarFiller.style.height = sizes.bottom + "px"; - d.scrollbarFiller.style.width = sizes.right + "px"; - } else { - d.scrollbarFiller.style.display = ""; - } - if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) { - d.gutterFiller.style.display = "block"; - d.gutterFiller.style.height = sizes.bottom + "px"; - d.gutterFiller.style.width = measure.gutterWidth + "px"; - } else { - d.gutterFiller.style.display = ""; - } - } - var scrollbarModel = { - "native": NativeScrollbars, - "null": NullScrollbars - }; - function initScrollbars(cm) { - if (cm.display.scrollbars) { - cm.display.scrollbars.clear(); - if (cm.display.scrollbars.addClass) { - rmClass(cm.display.wrapper, cm.display.scrollbars.addClass); - } - } - cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function (node) { - cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller); - on(node, "mousedown", function () { - if (cm.state.focused) { - setTimeout(function () { - return cm.display.input.focus(); - }, 0); - } - }); - node.setAttribute("cm-not-content", "true"); - }, function (pos, axis) { - if (axis == "horizontal") { - setScrollLeft(cm, pos); - } else { - updateScrollTop(cm, pos); - } - }, cm); - if (cm.display.scrollbars.addClass) { - addClass(cm.display.wrapper, cm.display.scrollbars.addClass); - } - } - var nextOpId = 0; - function startOperation(cm) { - cm.curOp = { - cm, - viewChanged: false, - // Flag that indicates that lines might need to be redrawn - startHeight: cm.doc.height, - // Used to detect need to update scrollbar - forceUpdate: false, - // Used to force a redraw - updateInput: 0, - // Whether to reset the input textarea - typing: false, - // Whether this reset should be careful to leave existing text (for compositing) - changeObjs: null, - // Accumulated changes, for firing change events - cursorActivityHandlers: null, - // Set of handlers to fire cursorActivity on - cursorActivityCalled: 0, - // Tracks which cursorActivity handlers have been called already - selectionChanged: false, - // Whether the selection needs to be redrawn - updateMaxLine: false, - // Set when the widest line needs to be determined anew - scrollLeft: null, - scrollTop: null, - // Intermediate scroll position, not pushed to DOM yet - scrollToPos: null, - // Used to scroll to a specific position - focus: false, - id: ++nextOpId, - // Unique ID - markArrays: null - // Used by addMarkedSpan - }; - pushOperation(cm.curOp); - } - function endOperation(cm) { - var op = cm.curOp; - if (op) { - finishOperation(op, function (group) { - for (var i2 = 0; i2 < group.ops.length; i2++) { - group.ops[i2].cm.curOp = null; - } - endOperations(group); - }); - } - } - function endOperations(group) { - var ops = group.ops; - for (var i2 = 0; i2 < ops.length; i2++) { - endOperation_R1(ops[i2]); - } - for (var i$12 = 0; i$12 < ops.length; i$12++) { - endOperation_W1(ops[i$12]); - } - for (var i$22 = 0; i$22 < ops.length; i$22++) { - endOperation_R2(ops[i$22]); - } - for (var i$3 = 0; i$3 < ops.length; i$3++) { - endOperation_W2(ops[i$3]); - } - for (var i$4 = 0; i$4 < ops.length; i$4++) { - endOperation_finish(ops[i$4]); - } - } - function endOperation_R1(op) { - var cm = op.cm, - display = cm.display; - maybeClipScrollbars(cm); - if (op.updateMaxLine) { - findMaxLine(cm); - } - op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null || op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom || op.scrollToPos.to.line >= display.viewTo) || display.maxLineChanged && cm.options.lineWrapping; - op.update = op.mustUpdate && new DisplayUpdate(cm, op.mustUpdate && { - top: op.scrollTop, - ensure: op.scrollToPos - }, op.forceUpdate); - } - function endOperation_W1(op) { - op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update); - } - function endOperation_R2(op) { - var cm = op.cm, - display = cm.display; - if (op.updatedDisplay) { - updateHeightsInViewport(cm); - } - op.barMeasure = measureForScrollbars(cm); - if (display.maxLineChanged && !cm.options.lineWrapping) { - op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3; - cm.display.sizerWidth = op.adjustWidthTo; - op.barMeasure.scrollWidth = Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth); - op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm)); - } - if (op.updatedDisplay || op.selectionChanged) { - op.preparedSelection = display.input.prepareSelection(); - } - } - function endOperation_W2(op) { - var cm = op.cm; - if (op.adjustWidthTo != null) { - cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"; - if (op.maxScrollLeft < cm.doc.scrollLeft) { - setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); - } - cm.display.maxLineChanged = false; - } - var takeFocus = op.focus && op.focus == activeElt(); - if (op.preparedSelection) { - cm.display.input.showSelection(op.preparedSelection, takeFocus); - } - if (op.updatedDisplay || op.startHeight != cm.doc.height) { - updateScrollbars(cm, op.barMeasure); - } - if (op.updatedDisplay) { - setDocumentHeight(cm, op.barMeasure); - } - if (op.selectionChanged) { - restartBlink(cm); - } - if (cm.state.focused && op.updateInput) { - cm.display.input.reset(op.typing); - } - if (takeFocus) { - ensureFocus(op.cm); - } - } - function endOperation_finish(op) { - var cm = op.cm, - display = cm.display, - doc = cm.doc; - if (op.updatedDisplay) { - postUpdateDisplay(cm, op.update); - } - if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos)) { - display.wheelStartX = display.wheelStartY = null; - } - if (op.scrollTop != null) { - setScrollTop(cm, op.scrollTop, op.forceScroll); - } - if (op.scrollLeft != null) { - setScrollLeft(cm, op.scrollLeft, true, true); - } - if (op.scrollToPos) { - var rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin); - maybeScrollWindow(cm, rect); - } - var hidden = op.maybeHiddenMarkers, - unhidden = op.maybeUnhiddenMarkers; - if (hidden) { - for (var i2 = 0; i2 < hidden.length; ++i2) { - if (!hidden[i2].lines.length) { - signal(hidden[i2], "hide"); - } - } - } - if (unhidden) { - for (var i$12 = 0; i$12 < unhidden.length; ++i$12) { - if (unhidden[i$12].lines.length) { - signal(unhidden[i$12], "unhide"); - } - } - } - if (display.wrapper.offsetHeight) { - doc.scrollTop = cm.display.scroller.scrollTop; - } - if (op.changeObjs) { - signal(cm, "changes", cm, op.changeObjs); - } - if (op.update) { - op.update.finish(); - } - } - function runInOp(cm, f) { - if (cm.curOp) { - return f(); - } - startOperation(cm); - try { - return f(); - } finally { - endOperation(cm); - } - } - function operation(cm, f) { - return function () { - if (cm.curOp) { - return f.apply(cm, arguments); - } - startOperation(cm); - try { - return f.apply(cm, arguments); - } finally { - endOperation(cm); - } - }; - } - function methodOp(f) { - return function () { - if (this.curOp) { - return f.apply(this, arguments); - } - startOperation(this); - try { - return f.apply(this, arguments); - } finally { - endOperation(this); - } - }; - } - function docMethodOp(f) { - return function () { - var cm = this.cm; - if (!cm || cm.curOp) { - return f.apply(this, arguments); - } - startOperation(cm); - try { - return f.apply(this, arguments); - } finally { - endOperation(cm); - } - }; - } - function startWorker(cm, time) { - if (cm.doc.highlightFrontier < cm.display.viewTo) { - cm.state.highlight.set(time, bind(highlightWorker, cm)); - } - } - function highlightWorker(cm) { - var doc = cm.doc; - if (doc.highlightFrontier >= cm.display.viewTo) { - return; - } - var end = + /* @__PURE__ */new Date() + cm.options.workTime; - var context = getContextBefore(cm, doc.highlightFrontier); - var changedLines = []; - doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function (line) { - if (context.line >= cm.display.viewFrom) { - var oldStyles = line.styles; - var resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null; - var highlighted = highlightLine(cm, line, context, true); - if (resetState) { - context.state = resetState; - } - line.styles = highlighted.styles; - var oldCls = line.styleClasses, - newCls = highlighted.classes; - if (newCls) { - line.styleClasses = newCls; - } else if (oldCls) { - line.styleClasses = null; - } - var ischange = !oldStyles || oldStyles.length != line.styles.length || oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass); - for (var i2 = 0; !ischange && i2 < oldStyles.length; ++i2) { - ischange = oldStyles[i2] != line.styles[i2]; - } - if (ischange) { - changedLines.push(context.line); - } - line.stateAfter = context.save(); - context.nextLine(); - } else { - if (line.text.length <= cm.options.maxHighlightLength) { - processLine(cm, line.text, context); - } - line.stateAfter = context.line % 5 == 0 ? context.save() : null; - context.nextLine(); - } - if (+ /* @__PURE__ */new Date() > end) { - startWorker(cm, cm.options.workDelay); - return true; - } - }); - doc.highlightFrontier = context.line; - doc.modeFrontier = Math.max(doc.modeFrontier, context.line); - if (changedLines.length) { - runInOp(cm, function () { - for (var i2 = 0; i2 < changedLines.length; i2++) { - regLineChange(cm, changedLines[i2], "text"); - } - }); - } - } - var DisplayUpdate = function (cm, viewport, force) { - var display = cm.display; - this.viewport = viewport; - this.visible = visibleLines(display, cm.doc, viewport); - this.editorIsHidden = !display.wrapper.offsetWidth; - this.wrapperHeight = display.wrapper.clientHeight; - this.wrapperWidth = display.wrapper.clientWidth; - this.oldDisplayWidth = displayWidth(cm); - this.force = force; - this.dims = getDimensions(cm); - this.events = []; - }; - DisplayUpdate.prototype.signal = function (emitter, type) { - if (hasHandler(emitter, type)) { - this.events.push(arguments); - } - }; - DisplayUpdate.prototype.finish = function () { - for (var i2 = 0; i2 < this.events.length; i2++) { - signal.apply(null, this.events[i2]); - } - }; - function maybeClipScrollbars(cm) { - var display = cm.display; - if (!display.scrollbarsClipped && display.scroller.offsetWidth) { - display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth; - display.heightForcer.style.height = scrollGap(cm) + "px"; - display.sizer.style.marginBottom = -display.nativeBarWidth + "px"; - display.sizer.style.borderRightWidth = scrollGap(cm) + "px"; - display.scrollbarsClipped = true; - } - } - function selectionSnapshot(cm) { - if (cm.hasFocus()) { - return null; - } - var active = activeElt(); - if (!active || !contains(cm.display.lineDiv, active)) { - return null; - } - var result = { - activeElt: active - }; - if (window.getSelection) { - var sel = window.getSelection(); - if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) { - result.anchorNode = sel.anchorNode; - result.anchorOffset = sel.anchorOffset; - result.focusNode = sel.focusNode; - result.focusOffset = sel.focusOffset; - } - } - return result; - } - function restoreSelection(snapshot) { - if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) { - return; - } - snapshot.activeElt.focus(); - if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) && snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) { - var sel = window.getSelection(), - range2 = document.createRange(); - range2.setEnd(snapshot.anchorNode, snapshot.anchorOffset); - range2.collapse(false); - sel.removeAllRanges(); - sel.addRange(range2); - sel.extend(snapshot.focusNode, snapshot.focusOffset); - } - } - function updateDisplayIfNeeded(cm, update) { - var display = cm.display, - doc = cm.doc; - if (update.editorIsHidden) { - resetView(cm); - return false; - } - if (!update.force && update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo && (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) && display.renderedView == display.view && countDirtyView(cm) == 0) { - return false; - } - if (maybeUpdateLineNumberWidth(cm)) { - resetView(cm); - update.dims = getDimensions(cm); - } - var end = doc.first + doc.size; - var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first); - var to = Math.min(end, update.visible.to + cm.options.viewportMargin); - if (display.viewFrom < from && from - display.viewFrom < 20) { - from = Math.max(doc.first, display.viewFrom); - } - if (display.viewTo > to && display.viewTo - to < 20) { - to = Math.min(end, display.viewTo); - } - if (sawCollapsedSpans) { - from = visualLineNo(cm.doc, from); - to = visualLineEndNo(cm.doc, to); - } - var different = from != display.viewFrom || to != display.viewTo || display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth; - adjustView(cm, from, to); - display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom)); - cm.display.mover.style.top = display.viewOffset + "px"; - var toUpdate = countDirtyView(cm); - if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view && (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) { - return false; - } - var selSnapshot = selectionSnapshot(cm); - if (toUpdate > 4) { - display.lineDiv.style.display = "none"; - } - patchDisplay(cm, display.updateLineNumbers, update.dims); - if (toUpdate > 4) { - display.lineDiv.style.display = ""; - } - display.renderedView = display.view; - restoreSelection(selSnapshot); - removeChildren(display.cursorDiv); - removeChildren(display.selectionDiv); - display.gutters.style.height = display.sizer.style.minHeight = 0; - if (different) { - display.lastWrapHeight = update.wrapperHeight; - display.lastWrapWidth = update.wrapperWidth; - startWorker(cm, 400); - } - display.updateLineNumbers = null; - return true; - } - function postUpdateDisplay(cm, update) { - var viewport = update.viewport; - for (var first = true;; first = false) { - if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) { - if (viewport && viewport.top != null) { - viewport = { - top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top) - }; - } - update.visible = visibleLines(cm.display, cm.doc, viewport); - if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo) { - break; - } - } else if (first) { - update.visible = visibleLines(cm.display, cm.doc, viewport); - } - if (!updateDisplayIfNeeded(cm, update)) { - break; - } - updateHeightsInViewport(cm); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - updateScrollbars(cm, barMeasure); - setDocumentHeight(cm, barMeasure); - update.force = false; - } - update.signal(cm, "update", cm); - if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) { - update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo); - cm.display.reportedViewFrom = cm.display.viewFrom; - cm.display.reportedViewTo = cm.display.viewTo; - } - } - function updateDisplaySimple(cm, viewport) { - var update = new DisplayUpdate(cm, viewport); - if (updateDisplayIfNeeded(cm, update)) { - updateHeightsInViewport(cm); - postUpdateDisplay(cm, update); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - updateScrollbars(cm, barMeasure); - setDocumentHeight(cm, barMeasure); - update.finish(); - } - } - function patchDisplay(cm, updateNumbersFrom, dims) { - var display = cm.display, - lineNumbers = cm.options.lineNumbers; - var container = display.lineDiv, - cur = container.firstChild; - function rm(node2) { - var next = node2.nextSibling; - if (webkit && mac && cm.display.currentWheelTarget == node2) { - node2.style.display = "none"; - } else { - node2.parentNode.removeChild(node2); - } - return next; - } - var view = display.view, - lineN = display.viewFrom; - for (var i2 = 0; i2 < view.length; i2++) { - var lineView = view[i2]; - if (lineView.hidden) ;else if (!lineView.node || lineView.node.parentNode != container) { - var node = buildLineElement(cm, lineView, lineN, dims); - container.insertBefore(node, cur); - } else { - while (cur != lineView.node) { - cur = rm(cur); - } - var updateNumber = lineNumbers && updateNumbersFrom != null && updateNumbersFrom <= lineN && lineView.lineNumber; - if (lineView.changes) { - if (indexOf(lineView.changes, "gutter") > -1) { - updateNumber = false; - } - updateLineForChanges(cm, lineView, lineN, dims); - } - if (updateNumber) { - removeChildren(lineView.lineNumber); - lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN))); - } - cur = lineView.node.nextSibling; - } - lineN += lineView.size; - } - while (cur) { - cur = rm(cur); - } - } - function updateGutterSpace(display) { - var width = display.gutters.offsetWidth; - display.sizer.style.marginLeft = width + "px"; - signalLater(display, "gutterChanged", display); - } - function setDocumentHeight(cm, measure) { - cm.display.sizer.style.minHeight = measure.docHeight + "px"; - cm.display.heightForcer.style.top = measure.docHeight + "px"; - cm.display.gutters.style.height = measure.docHeight + cm.display.barHeight + scrollGap(cm) + "px"; - } - function alignHorizontally(cm) { - var display = cm.display, - view = display.view; - if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) { - return; - } - var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft; - var gutterW = display.gutters.offsetWidth, - left = comp + "px"; - for (var i2 = 0; i2 < view.length; i2++) { - if (!view[i2].hidden) { - if (cm.options.fixedGutter) { - if (view[i2].gutter) { - view[i2].gutter.style.left = left; - } - if (view[i2].gutterBackground) { - view[i2].gutterBackground.style.left = left; - } - } - var align = view[i2].alignable; - if (align) { - for (var j = 0; j < align.length; j++) { - align[j].style.left = left; - } - } - } - } - if (cm.options.fixedGutter) { - display.gutters.style.left = comp + gutterW + "px"; - } - } - function maybeUpdateLineNumberWidth(cm) { - if (!cm.options.lineNumbers) { - return false; - } - var doc = cm.doc, - last = lineNumberFor(cm.options, doc.first + doc.size - 1), - display = cm.display; - if (last.length != display.lineNumChars) { - var test = display.measure.appendChild(elt("div", [elt("div", last)], "CodeMirror-linenumber CodeMirror-gutter-elt")); - var innerW = test.firstChild.offsetWidth, - padding = test.offsetWidth - innerW; - display.lineGutter.style.width = ""; - display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1; - display.lineNumWidth = display.lineNumInnerWidth + padding; - display.lineNumChars = display.lineNumInnerWidth ? last.length : -1; - display.lineGutter.style.width = display.lineNumWidth + "px"; - updateGutterSpace(cm.display); - return true; - } - return false; - } - function getGutters(gutters, lineNumbers) { - var result = [], - sawLineNumbers = false; - for (var i2 = 0; i2 < gutters.length; i2++) { - var name = gutters[i2], - style = null; - if (typeof name != "string") { - style = name.style; - name = name.className; - } - if (name == "CodeMirror-linenumbers") { - if (!lineNumbers) { - continue; - } else { - sawLineNumbers = true; - } - } - result.push({ - className: name, - style - }); - } - if (lineNumbers && !sawLineNumbers) { - result.push({ - className: "CodeMirror-linenumbers", - style: null - }); - } - return result; - } - function renderGutters(display) { - var gutters = display.gutters, - specs = display.gutterSpecs; - removeChildren(gutters); - display.lineGutter = null; - for (var i2 = 0; i2 < specs.length; ++i2) { - var ref = specs[i2]; - var className = ref.className; - var style = ref.style; - var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className)); - if (style) { - gElt.style.cssText = style; - } - if (className == "CodeMirror-linenumbers") { - display.lineGutter = gElt; - gElt.style.width = (display.lineNumWidth || 1) + "px"; - } - } - gutters.style.display = specs.length ? "" : "none"; - updateGutterSpace(display); - } - function updateGutters(cm) { - renderGutters(cm.display); - regChange(cm); - alignHorizontally(cm); - } - function Display(place, doc, input, options) { - var d = this; - this.input = input; - d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler"); - d.scrollbarFiller.setAttribute("cm-not-content", "true"); - d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler"); - d.gutterFiller.setAttribute("cm-not-content", "true"); - d.lineDiv = eltP("div", null, "CodeMirror-code"); - d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1"); - d.cursorDiv = elt("div", null, "CodeMirror-cursors"); - d.measure = elt("div", null, "CodeMirror-measure"); - d.lineMeasure = elt("div", null, "CodeMirror-measure"); - d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv], null, "position: relative; outline: none"); - var lines = eltP("div", [d.lineSpace], "CodeMirror-lines"); - d.mover = elt("div", [lines], null, "position: relative"); - d.sizer = elt("div", [d.mover], "CodeMirror-sizer"); - d.sizerWidth = null; - d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;"); - d.gutters = elt("div", null, "CodeMirror-gutters"); - d.lineGutter = null; - d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll"); - d.scroller.setAttribute("tabIndex", "-1"); - d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror"); - d.wrapper.setAttribute("translate", "no"); - if (ie && ie_version < 8) { - d.gutters.style.zIndex = -1; - d.scroller.style.paddingRight = 0; - } - if (!webkit && !(gecko && mobile)) { - d.scroller.draggable = true; - } - if (place) { - if (place.appendChild) { - place.appendChild(d.wrapper); - } else { - place(d.wrapper); - } - } - d.viewFrom = d.viewTo = doc.first; - d.reportedViewFrom = d.reportedViewTo = doc.first; - d.view = []; - d.renderedView = null; - d.externalMeasured = null; - d.viewOffset = 0; - d.lastWrapHeight = d.lastWrapWidth = 0; - d.updateLineNumbers = null; - d.nativeBarWidth = d.barHeight = d.barWidth = 0; - d.scrollbarsClipped = false; - d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null; - d.alignWidgets = false; - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - d.maxLine = null; - d.maxLineLength = 0; - d.maxLineChanged = false; - d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null; - d.shift = false; - d.selForContextMenu = null; - d.activeTouch = null; - d.gutterSpecs = getGutters(options.gutters, options.lineNumbers); - renderGutters(d); - input.init(d); - } - var wheelSamples = 0, - wheelPixelsPerUnit = null; - if (ie) { - wheelPixelsPerUnit = -0.53; - } else if (gecko) { - wheelPixelsPerUnit = 15; - } else if (chrome) { - wheelPixelsPerUnit = -0.7; - } else if (safari) { - wheelPixelsPerUnit = -1 / 3; - } - function wheelEventDelta(e) { - var dx = e.wheelDeltaX, - dy = e.wheelDeltaY; - if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) { - dx = e.detail; - } - if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) { - dy = e.detail; - } else if (dy == null) { - dy = e.wheelDelta; - } - return { - x: dx, - y: dy - }; - } - function wheelEventPixels(e) { - var delta = wheelEventDelta(e); - delta.x *= wheelPixelsPerUnit; - delta.y *= wheelPixelsPerUnit; - return delta; - } - function onScrollWheel(cm, e) { - var delta = wheelEventDelta(e), - dx = delta.x, - dy = delta.y; - var pixelsPerUnit = wheelPixelsPerUnit; - if (e.deltaMode === 0) { - dx = e.deltaX; - dy = e.deltaY; - pixelsPerUnit = 1; - } - var display = cm.display, - scroll = display.scroller; - var canScrollX = scroll.scrollWidth > scroll.clientWidth; - var canScrollY = scroll.scrollHeight > scroll.clientHeight; - if (!(dx && canScrollX || dy && canScrollY)) { - return; - } - if (dy && mac && webkit) { - outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { - for (var i2 = 0; i2 < view.length; i2++) { - if (view[i2].node == cur) { - cm.display.currentWheelTarget = cur; - break outer; - } - } - } - } - if (dx && !gecko && !presto && pixelsPerUnit != null) { - if (dy && canScrollY) { - updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * pixelsPerUnit)); - } - setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * pixelsPerUnit)); - if (!dy || dy && canScrollY) { - e_preventDefault(e); - } - display.wheelStartX = null; - return; - } - if (dy && pixelsPerUnit != null) { - var pixels = dy * pixelsPerUnit; - var top = cm.doc.scrollTop, - bot = top + display.wrapper.clientHeight; - if (pixels < 0) { - top = Math.max(0, top + pixels - 50); - } else { - bot = Math.min(cm.doc.height, bot + pixels + 50); - } - updateDisplaySimple(cm, { - top, - bottom: bot - }); - } - if (wheelSamples < 20 && e.deltaMode !== 0) { - if (display.wheelStartX == null) { - display.wheelStartX = scroll.scrollLeft; - display.wheelStartY = scroll.scrollTop; - display.wheelDX = dx; - display.wheelDY = dy; - setTimeout(function () { - if (display.wheelStartX == null) { - return; - } - var movedX = scroll.scrollLeft - display.wheelStartX; - var movedY = scroll.scrollTop - display.wheelStartY; - var sample = movedY && display.wheelDY && movedY / display.wheelDY || movedX && display.wheelDX && movedX / display.wheelDX; - display.wheelStartX = display.wheelStartY = null; - if (!sample) { - return; - } - wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1); - ++wheelSamples; - }, 200); - } else { - display.wheelDX += dx; - display.wheelDY += dy; - } - } - } - var Selection = function (ranges, primIndex) { - this.ranges = ranges; - this.primIndex = primIndex; - }; - Selection.prototype.primary = function () { - return this.ranges[this.primIndex]; - }; - Selection.prototype.equals = function (other) { - if (other == this) { - return true; - } - if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) { - return false; - } - for (var i2 = 0; i2 < this.ranges.length; i2++) { - var here = this.ranges[i2], - there = other.ranges[i2]; - if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) { - return false; - } - } - return true; - }; - Selection.prototype.deepCopy = function () { - var out = []; - for (var i2 = 0; i2 < this.ranges.length; i2++) { - out[i2] = new Range(copyPos(this.ranges[i2].anchor), copyPos(this.ranges[i2].head)); - } - return new Selection(out, this.primIndex); - }; - Selection.prototype.somethingSelected = function () { - for (var i2 = 0; i2 < this.ranges.length; i2++) { - if (!this.ranges[i2].empty()) { - return true; - } - } - return false; - }; - Selection.prototype.contains = function (pos, end) { - if (!end) { - end = pos; - } - for (var i2 = 0; i2 < this.ranges.length; i2++) { - var range2 = this.ranges[i2]; - if (cmp(end, range2.from()) >= 0 && cmp(pos, range2.to()) <= 0) { - return i2; - } - } - return -1; - }; - var Range = function (anchor, head) { - this.anchor = anchor; - this.head = head; - }; - Range.prototype.from = function () { - return minPos(this.anchor, this.head); - }; - Range.prototype.to = function () { - return maxPos(this.anchor, this.head); - }; - Range.prototype.empty = function () { - return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch; - }; - function normalizeSelection(cm, ranges, primIndex) { - var mayTouch = cm && cm.options.selectionsMayTouch; - var prim = ranges[primIndex]; - ranges.sort(function (a, b) { - return cmp(a.from(), b.from()); - }); - primIndex = indexOf(ranges, prim); - for (var i2 = 1; i2 < ranges.length; i2++) { - var cur = ranges[i2], - prev = ranges[i2 - 1]; - var diff = cmp(prev.to(), cur.from()); - if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) { - var from = minPos(prev.from(), cur.from()), - to = maxPos(prev.to(), cur.to()); - var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head; - if (i2 <= primIndex) { - --primIndex; - } - ranges.splice(--i2, 2, new Range(inv ? to : from, inv ? from : to)); - } - } - return new Selection(ranges, primIndex); - } - function simpleSelection(anchor, head) { - return new Selection([new Range(anchor, head || anchor)], 0); - } - function changeEnd(change) { - if (!change.text) { - return change.to; - } - return Pos(change.from.line + change.text.length - 1, lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0)); - } - function adjustForChange(pos, change) { - if (cmp(pos, change.from) < 0) { - return pos; - } - if (cmp(pos, change.to) <= 0) { - return changeEnd(change); - } - var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, - ch = pos.ch; - if (pos.line == change.to.line) { - ch += changeEnd(change).ch - change.to.ch; - } - return Pos(line, ch); - } - function computeSelAfterChange(doc, change) { - var out = []; - for (var i2 = 0; i2 < doc.sel.ranges.length; i2++) { - var range2 = doc.sel.ranges[i2]; - out.push(new Range(adjustForChange(range2.anchor, change), adjustForChange(range2.head, change))); - } - return normalizeSelection(doc.cm, out, doc.sel.primIndex); - } - function offsetPos(pos, old, nw) { - if (pos.line == old.line) { - return Pos(nw.line, pos.ch - old.ch + nw.ch); - } else { - return Pos(nw.line + (pos.line - old.line), pos.ch); - } - } - function computeReplacedSel(doc, changes, hint) { - var out = []; - var oldPrev = Pos(doc.first, 0), - newPrev = oldPrev; - for (var i2 = 0; i2 < changes.length; i2++) { - var change = changes[i2]; - var from = offsetPos(change.from, oldPrev, newPrev); - var to = offsetPos(changeEnd(change), oldPrev, newPrev); - oldPrev = change.to; - newPrev = to; - if (hint == "around") { - var range2 = doc.sel.ranges[i2], - inv = cmp(range2.head, range2.anchor) < 0; - out[i2] = new Range(inv ? to : from, inv ? from : to); - } else { - out[i2] = new Range(from, from); - } - } - return new Selection(out, doc.sel.primIndex); - } - function loadMode(cm) { - cm.doc.mode = getMode(cm.options, cm.doc.modeOption); - resetModeState(cm); - } - function resetModeState(cm) { - cm.doc.iter(function (line) { - if (line.stateAfter) { - line.stateAfter = null; - } - if (line.styles) { - line.styles = null; - } - }); - cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first; - startWorker(cm, 100); - cm.state.modeGen++; - if (cm.curOp) { - regChange(cm); - } - } - function isWholeLineUpdate(doc, change) { - return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" && (!doc.cm || doc.cm.options.wholeLineUpdateBefore); - } - function updateDoc(doc, change, markedSpans, estimateHeight2) { - function spansFor(n) { - return markedSpans ? markedSpans[n] : null; - } - function update(line, text2, spans) { - updateLine(line, text2, spans, estimateHeight2); - signalLater(line, "change", line, change); - } - function linesFor(start, end) { - var result = []; - for (var i2 = start; i2 < end; ++i2) { - result.push(new Line(text[i2], spansFor(i2), estimateHeight2)); - } - return result; - } - var from = change.from, - to = change.to, - text = change.text; - var firstLine = getLine(doc, from.line), - lastLine = getLine(doc, to.line); - var lastText = lst(text), - lastSpans = spansFor(text.length - 1), - nlines = to.line - from.line; - if (change.full) { - doc.insert(0, linesFor(0, text.length)); - doc.remove(text.length, doc.size - text.length); - } else if (isWholeLineUpdate(doc, change)) { - var added = linesFor(0, text.length - 1); - update(lastLine, lastLine.text, lastSpans); - if (nlines) { - doc.remove(from.line, nlines); - } - if (added.length) { - doc.insert(from.line, added); - } - } else if (firstLine == lastLine) { - if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans); - } else { - var added$1 = linesFor(1, text.length - 1); - added$1.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight2)); - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - doc.insert(from.line + 1, added$1); - } - } else if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0)); - doc.remove(from.line + 1, nlines); - } else { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans); - var added$2 = linesFor(1, text.length - 1); - if (nlines > 1) { - doc.remove(from.line + 1, nlines - 1); - } - doc.insert(from.line + 1, added$2); - } - signalLater(doc, "change", doc, change); - } - function linkedDocs(doc, f, sharedHistOnly) { - function propagate(doc2, skip, sharedHist) { - if (doc2.linked) { - for (var i2 = 0; i2 < doc2.linked.length; ++i2) { - var rel = doc2.linked[i2]; - if (rel.doc == skip) { - continue; - } - var shared = sharedHist && rel.sharedHist; - if (sharedHistOnly && !shared) { - continue; - } - f(rel.doc, shared); - propagate(rel.doc, doc2, shared); - } - } - } - propagate(doc, null, true); - } - function attachDoc(cm, doc) { - if (doc.cm) { - throw new Error("This document is already in use."); - } - cm.doc = doc; - doc.cm = cm; - estimateLineHeights(cm); - loadMode(cm); - setDirectionClass(cm); - cm.options.direction = doc.direction; - if (!cm.options.lineWrapping) { - findMaxLine(cm); - } - cm.options.mode = doc.modeOption; - regChange(cm); - } - function setDirectionClass(cm) { - (cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl"); - } - function directionChanged(cm) { - runInOp(cm, function () { - setDirectionClass(cm); - regChange(cm); - }); - } - function History(prev) { - this.done = []; - this.undone = []; - this.undoDepth = prev ? prev.undoDepth : Infinity; - this.lastModTime = this.lastSelTime = 0; - this.lastOp = this.lastSelOp = null; - this.lastOrigin = this.lastSelOrigin = null; - this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1; - } - function historyChangeFromChange(doc, change) { - var histChange = { - from: copyPos(change.from), - to: changeEnd(change), - text: getBetween(doc, change.from, change.to) - }; - attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); - linkedDocs(doc, function (doc2) { - return attachLocalSpans(doc2, histChange, change.from.line, change.to.line + 1); - }, true); - return histChange; - } - function clearSelectionEvents(array) { - while (array.length) { - var last = lst(array); - if (last.ranges) { - array.pop(); - } else { - break; - } - } - } - function lastChangeEvent(hist, force) { - if (force) { - clearSelectionEvents(hist.done); - return lst(hist.done); - } else if (hist.done.length && !lst(hist.done).ranges) { - return lst(hist.done); - } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) { - hist.done.pop(); - return lst(hist.done); - } - } - function addChangeToHistory(doc, change, selAfter, opId) { - var hist = doc.history; - hist.undone.length = 0; - var time = + /* @__PURE__ */new Date(), - cur; - var last; - if ((hist.lastOp == opId || hist.lastOrigin == change.origin && change.origin && (change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500) || change.origin.charAt(0) == "*")) && (cur = lastChangeEvent(hist, hist.lastOp == opId))) { - last = lst(cur.changes); - if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { - last.to = changeEnd(change); - } else { - cur.changes.push(historyChangeFromChange(doc, change)); - } - } else { - var before = lst(hist.done); - if (!before || !before.ranges) { - pushSelectionToHistory(doc.sel, hist.done); - } - cur = { - changes: [historyChangeFromChange(doc, change)], - generation: hist.generation - }; - hist.done.push(cur); - while (hist.done.length > hist.undoDepth) { - hist.done.shift(); - if (!hist.done[0].ranges) { - hist.done.shift(); - } - } - } - hist.done.push(selAfter); - hist.generation = ++hist.maxGeneration; - hist.lastModTime = hist.lastSelTime = time; - hist.lastOp = hist.lastSelOp = opId; - hist.lastOrigin = hist.lastSelOrigin = change.origin; - if (!last) { - signal(doc, "historyAdded"); - } - } - function selectionEventCanBeMerged(doc, origin, prev, sel) { - var ch = origin.charAt(0); - return ch == "*" || ch == "+" && prev.ranges.length == sel.ranges.length && prev.somethingSelected() == sel.somethingSelected() && /* @__PURE__ */new Date() - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500); - } - function addSelectionToHistory(doc, sel, opId, options) { - var hist = doc.history, - origin = options && options.origin; - if (opId == hist.lastSelOp || origin && hist.lastSelOrigin == origin && (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin || selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))) { - hist.done[hist.done.length - 1] = sel; - } else { - pushSelectionToHistory(sel, hist.done); - } - hist.lastSelTime = + /* @__PURE__ */new Date(); - hist.lastSelOrigin = origin; - hist.lastSelOp = opId; - if (options && options.clearRedo !== false) { - clearSelectionEvents(hist.undone); - } - } - function pushSelectionToHistory(sel, dest) { - var top = lst(dest); - if (!(top && top.ranges && top.equals(sel))) { - dest.push(sel); - } - } - function attachLocalSpans(doc, change, from, to) { - var existing = change["spans_" + doc.id], - n = 0; - doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function (line) { - if (line.markedSpans) { - (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; - } - ++n; - }); - } - function removeClearedSpans(spans) { - if (!spans) { - return null; - } - var out; - for (var i2 = 0; i2 < spans.length; ++i2) { - if (spans[i2].marker.explicitlyCleared) { - if (!out) { - out = spans.slice(0, i2); - } - } else if (out) { - out.push(spans[i2]); - } - } - return !out ? spans : out.length ? out : null; - } - function getOldSpans(doc, change) { - var found = change["spans_" + doc.id]; - if (!found) { - return null; - } - var nw = []; - for (var i2 = 0; i2 < change.text.length; ++i2) { - nw.push(removeClearedSpans(found[i2])); - } - return nw; - } - function mergeOldSpans(doc, change) { - var old = getOldSpans(doc, change); - var stretched = stretchSpansOverChange(doc, change); - if (!old) { - return stretched; - } - if (!stretched) { - return old; - } - for (var i2 = 0; i2 < old.length; ++i2) { - var oldCur = old[i2], - stretchCur = stretched[i2]; - if (oldCur && stretchCur) { - spans: for (var j = 0; j < stretchCur.length; ++j) { - var span = stretchCur[j]; - for (var k = 0; k < oldCur.length; ++k) { - if (oldCur[k].marker == span.marker) { - continue spans; - } - } - oldCur.push(span); - } - } else if (stretchCur) { - old[i2] = stretchCur; - } - } - return old; - } - function copyHistoryArray(events, newGroup, instantiateSel) { - var copy = []; - for (var i2 = 0; i2 < events.length; ++i2) { - var event = events[i2]; - if (event.ranges) { - copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event); - continue; - } - var changes = event.changes, - newChanges = []; - copy.push({ - changes: newChanges - }); - for (var j = 0; j < changes.length; ++j) { - var change = changes[j], - m = void 0; - newChanges.push({ - from: change.from, - to: change.to, - text: change.text - }); - if (newGroup) { - for (var prop2 in change) { - if (m = prop2.match(/^spans_(\d+)$/)) { - if (indexOf(newGroup, Number(m[1])) > -1) { - lst(newChanges)[prop2] = change[prop2]; - delete change[prop2]; - } - } - } - } - } - } - return copy; - } - function extendRange(range2, head, other, extend) { - if (extend) { - var anchor = range2.anchor; - if (other) { - var posBefore = cmp(head, anchor) < 0; - if (posBefore != cmp(other, anchor) < 0) { - anchor = head; - head = other; - } else if (posBefore != cmp(head, other) < 0) { - head = other; - } - } - return new Range(anchor, head); - } else { - return new Range(other || head, head); - } - } - function extendSelection(doc, head, other, options, extend) { - if (extend == null) { - extend = doc.cm && (doc.cm.display.shift || doc.extend); - } - setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options); - } - function extendSelections(doc, heads, options) { - var out = []; - var extend = doc.cm && (doc.cm.display.shift || doc.extend); - for (var i2 = 0; i2 < doc.sel.ranges.length; i2++) { - out[i2] = extendRange(doc.sel.ranges[i2], heads[i2], null, extend); - } - var newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex); - setSelection(doc, newSel, options); - } - function replaceOneSelection(doc, i2, range2, options) { - var ranges = doc.sel.ranges.slice(0); - ranges[i2] = range2; - setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options); - } - function setSimpleSelection(doc, anchor, head, options) { - setSelection(doc, simpleSelection(anchor, head), options); - } - function filterSelectionChange(doc, sel, options) { - var obj = { - ranges: sel.ranges, - update: function (ranges) { - this.ranges = []; - for (var i2 = 0; i2 < ranges.length; i2++) { - this.ranges[i2] = new Range(clipPos(doc, ranges[i2].anchor), clipPos(doc, ranges[i2].head)); - } - }, - origin: options && options.origin - }; - signal(doc, "beforeSelectionChange", doc, obj); - if (doc.cm) { - signal(doc.cm, "beforeSelectionChange", doc.cm, obj); - } - if (obj.ranges != sel.ranges) { - return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1); - } else { - return sel; - } - } - function setSelectionReplaceHistory(doc, sel, options) { - var done = doc.history.done, - last = lst(done); - if (last && last.ranges) { - done[done.length - 1] = sel; - setSelectionNoUndo(doc, sel, options); - } else { - setSelection(doc, sel, options); - } - } - function setSelection(doc, sel, options) { - setSelectionNoUndo(doc, sel, options); - addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options); - } - function setSelectionNoUndo(doc, sel, options) { - if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) { - sel = filterSelectionChange(doc, sel, options); - } - var bias = options && options.bias || (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1); - setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)); - if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor") { - ensureCursorVisible(doc.cm); - } - } - function setSelectionInner(doc, sel) { - if (sel.equals(doc.sel)) { - return; - } - doc.sel = sel; - if (doc.cm) { - doc.cm.curOp.updateInput = 1; - doc.cm.curOp.selectionChanged = true; - signalCursorActivity(doc.cm); - } - signalLater(doc, "cursorActivity", doc); - } - function reCheckSelection(doc) { - setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false)); - } - function skipAtomicInSelection(doc, sel, bias, mayClear) { - var out; - for (var i2 = 0; i2 < sel.ranges.length; i2++) { - var range2 = sel.ranges[i2]; - var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i2]; - var newAnchor = skipAtomic(doc, range2.anchor, old && old.anchor, bias, mayClear); - var newHead = skipAtomic(doc, range2.head, old && old.head, bias, mayClear); - if (out || newAnchor != range2.anchor || newHead != range2.head) { - if (!out) { - out = sel.ranges.slice(0, i2); - } - out[i2] = new Range(newAnchor, newHead); - } - } - return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel; - } - function skipAtomicInner(doc, pos, oldPos, dir, mayClear) { - var line = getLine(doc, pos.line); - if (line.markedSpans) { - for (var i2 = 0; i2 < line.markedSpans.length; ++i2) { - var sp = line.markedSpans[i2], - m = sp.marker; - var preventCursorLeft = "selectLeft" in m ? !m.selectLeft : m.inclusiveLeft; - var preventCursorRight = "selectRight" in m ? !m.selectRight : m.inclusiveRight; - if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) && (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) { - if (mayClear) { - signal(m, "beforeCursorEnter"); - if (m.explicitlyCleared) { - if (!line.markedSpans) { - break; - } else { - --i2; - continue; - } - } - } - if (!m.atomic) { - continue; - } - if (oldPos) { - var near = m.find(dir < 0 ? 1 : -1), - diff = void 0; - if (dir < 0 ? preventCursorRight : preventCursorLeft) { - near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null); - } - if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0)) { - return skipAtomicInner(doc, near, pos, dir, mayClear); - } - } - var far = m.find(dir < 0 ? -1 : 1); - if (dir < 0 ? preventCursorLeft : preventCursorRight) { - far = movePos(doc, far, dir, far.line == pos.line ? line : null); - } - return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null; - } - } - } - return pos; - } - function skipAtomic(doc, pos, oldPos, bias, mayClear) { - var dir = bias || 1; - var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) || !mayClear && skipAtomicInner(doc, pos, oldPos, dir, true) || skipAtomicInner(doc, pos, oldPos, -dir, mayClear) || !mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true); - if (!found) { - doc.cantEdit = true; - return Pos(doc.first, 0); - } - return found; - } - function movePos(doc, pos, dir, line) { - if (dir < 0 && pos.ch == 0) { - if (pos.line > doc.first) { - return clipPos(doc, Pos(pos.line - 1)); - } else { - return null; - } - } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) { - if (pos.line < doc.first + doc.size - 1) { - return Pos(pos.line + 1, 0); - } else { - return null; - } - } else { - return new Pos(pos.line, pos.ch + dir); - } - } - function selectAll(cm) { - cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll); - } - function filterChange(doc, change, update) { - var obj = { - canceled: false, - from: change.from, - to: change.to, - text: change.text, - origin: change.origin, - cancel: function () { - return obj.canceled = true; - } - }; - if (update) { - obj.update = function (from, to, text, origin) { - if (from) { - obj.from = clipPos(doc, from); - } - if (to) { - obj.to = clipPos(doc, to); - } - if (text) { - obj.text = text; - } - if (origin !== void 0) { - obj.origin = origin; - } - }; - } - signal(doc, "beforeChange", doc, obj); - if (doc.cm) { - signal(doc.cm, "beforeChange", doc.cm, obj); - } - if (obj.canceled) { - if (doc.cm) { - doc.cm.curOp.updateInput = 2; - } - return null; - } - return { - from: obj.from, - to: obj.to, - text: obj.text, - origin: obj.origin - }; - } - function makeChange(doc, change, ignoreReadOnly) { - if (doc.cm) { - if (!doc.cm.curOp) { - return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly); - } - if (doc.cm.state.suppressEdits) { - return; - } - } - if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) { - change = filterChange(doc, change, true); - if (!change) { - return; - } - } - var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to); - if (split) { - for (var i2 = split.length - 1; i2 >= 0; --i2) { - makeChangeInner(doc, { - from: split[i2].from, - to: split[i2].to, - text: i2 ? [""] : change.text, - origin: change.origin - }); - } - } else { - makeChangeInner(doc, change); - } - } - function makeChangeInner(doc, change) { - if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) { - return; - } - var selAfter = computeSelAfterChange(doc, change); - addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN); - makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)); - var rebased = []; - linkedDocs(doc, function (doc2, sharedHist) { - if (!sharedHist && indexOf(rebased, doc2.history) == -1) { - rebaseHist(doc2.history, change); - rebased.push(doc2.history); - } - makeChangeSingleDoc(doc2, change, null, stretchSpansOverChange(doc2, change)); - }); - } - function makeChangeFromHistory(doc, type, allowSelectionOnly) { - var suppress = doc.cm && doc.cm.state.suppressEdits; - if (suppress && !allowSelectionOnly) { - return; - } - var hist = doc.history, - event, - selAfter = doc.sel; - var source = type == "undo" ? hist.done : hist.undone, - dest = type == "undo" ? hist.undone : hist.done; - var i2 = 0; - for (; i2 < source.length; i2++) { - event = source[i2]; - if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) { - break; - } - } - if (i2 == source.length) { - return; - } - hist.lastOrigin = hist.lastSelOrigin = null; - for (;;) { - event = source.pop(); - if (event.ranges) { - pushSelectionToHistory(event, dest); - if (allowSelectionOnly && !event.equals(doc.sel)) { - setSelection(doc, event, { - clearRedo: false - }); - return; - } - selAfter = event; - } else if (suppress) { - source.push(event); - return; - } else { - break; - } - } - var antiChanges = []; - pushSelectionToHistory(selAfter, dest); - dest.push({ - changes: antiChanges, - generation: hist.generation - }); - hist.generation = event.generation || ++hist.maxGeneration; - var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange"); - var loop = function (i3) { - var change = event.changes[i3]; - change.origin = type; - if (filter && !filterChange(doc, change, false)) { - source.length = 0; - return {}; - } - antiChanges.push(historyChangeFromChange(doc, change)); - var after = i3 ? computeSelAfterChange(doc, change) : lst(source); - makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)); - if (!i3 && doc.cm) { - doc.cm.scrollIntoView({ - from: change.from, - to: changeEnd(change) - }); - } - var rebased = []; - linkedDocs(doc, function (doc2, sharedHist) { - if (!sharedHist && indexOf(rebased, doc2.history) == -1) { - rebaseHist(doc2.history, change); - rebased.push(doc2.history); - } - makeChangeSingleDoc(doc2, change, null, mergeOldSpans(doc2, change)); - }); - }; - for (var i$12 = event.changes.length - 1; i$12 >= 0; --i$12) { - var returned = loop(i$12); - if (returned) return returned.v; - } - } - function shiftDoc(doc, distance) { - if (distance == 0) { - return; - } - doc.first += distance; - doc.sel = new Selection(map(doc.sel.ranges, function (range2) { - return new Range(Pos(range2.anchor.line + distance, range2.anchor.ch), Pos(range2.head.line + distance, range2.head.ch)); - }), doc.sel.primIndex); - if (doc.cm) { - regChange(doc.cm, doc.first, doc.first - distance, distance); - for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) { - regLineChange(doc.cm, l, "gutter"); - } - } - } - function makeChangeSingleDoc(doc, change, selAfter, spans) { - if (doc.cm && !doc.cm.curOp) { - return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans); - } - if (change.to.line < doc.first) { - shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line)); - return; - } - if (change.from.line > doc.lastLine()) { - return; - } - if (change.from.line < doc.first) { - var shift = change.text.length - 1 - (doc.first - change.from.line); - shiftDoc(doc, shift); - change = { - from: Pos(doc.first, 0), - to: Pos(change.to.line + shift, change.to.ch), - text: [lst(change.text)], - origin: change.origin - }; - } - var last = doc.lastLine(); - if (change.to.line > last) { - change = { - from: change.from, - to: Pos(last, getLine(doc, last).text.length), - text: [change.text[0]], - origin: change.origin - }; - } - change.removed = getBetween(doc, change.from, change.to); - if (!selAfter) { - selAfter = computeSelAfterChange(doc, change); - } - if (doc.cm) { - makeChangeSingleDocInEditor(doc.cm, change, spans); - } else { - updateDoc(doc, change, spans); - } - setSelectionNoUndo(doc, selAfter, sel_dontScroll); - if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0))) { - doc.cantEdit = false; - } - } - function makeChangeSingleDocInEditor(cm, change, spans) { - var doc = cm.doc, - display = cm.display, - from = change.from, - to = change.to; - var recomputeMaxLength = false, - checkWidthStart = from.line; - if (!cm.options.lineWrapping) { - checkWidthStart = lineNo(visualLine(getLine(doc, from.line))); - doc.iter(checkWidthStart, to.line + 1, function (line) { - if (line == display.maxLine) { - recomputeMaxLength = true; - return true; - } - }); - } - if (doc.sel.contains(change.from, change.to) > -1) { - signalCursorActivity(cm); - } - updateDoc(doc, change, spans, estimateHeight(cm)); - if (!cm.options.lineWrapping) { - doc.iter(checkWidthStart, from.line + change.text.length, function (line) { - var len = lineLength(line); - if (len > display.maxLineLength) { - display.maxLine = line; - display.maxLineLength = len; - display.maxLineChanged = true; - recomputeMaxLength = false; - } - }); - if (recomputeMaxLength) { - cm.curOp.updateMaxLine = true; - } - } - retreatFrontier(doc, from.line); - startWorker(cm, 400); - var lendiff = change.text.length - (to.line - from.line) - 1; - if (change.full) { - regChange(cm); - } else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change)) { - regLineChange(cm, from.line, "text"); - } else { - regChange(cm, from.line, to.line + 1, lendiff); - } - var changesHandler = hasHandler(cm, "changes"), - changeHandler = hasHandler(cm, "change"); - if (changeHandler || changesHandler) { - var obj = { - from, - to, - text: change.text, - removed: change.removed, - origin: change.origin - }; - if (changeHandler) { - signalLater(cm, "change", cm, obj); - } - if (changesHandler) { - (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); - } - } - cm.display.selForContextMenu = null; - } - function replaceRange(doc, code, from, to, origin) { - var assign; - if (!to) { - to = from; - } - if (cmp(to, from) < 0) { - assign = [to, from], from = assign[0], to = assign[1]; - } - if (typeof code == "string") { - code = doc.splitLines(code); - } - makeChange(doc, { - from, - to, - text: code, - origin - }); - } - function rebaseHistSelSingle(pos, from, to, diff) { - if (to < pos.line) { - pos.line += diff; - } else if (from < pos.line) { - pos.line = from; - pos.ch = 0; - } - } - function rebaseHistArray(array, from, to, diff) { - for (var i2 = 0; i2 < array.length; ++i2) { - var sub = array[i2], - ok = true; - if (sub.ranges) { - if (!sub.copied) { - sub = array[i2] = sub.deepCopy(); - sub.copied = true; - } - for (var j = 0; j < sub.ranges.length; j++) { - rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff); - rebaseHistSelSingle(sub.ranges[j].head, from, to, diff); - } - continue; - } - for (var j$1 = 0; j$1 < sub.changes.length; ++j$1) { - var cur = sub.changes[j$1]; - if (to < cur.from.line) { - cur.from = Pos(cur.from.line + diff, cur.from.ch); - cur.to = Pos(cur.to.line + diff, cur.to.ch); - } else if (from <= cur.to.line) { - ok = false; - break; - } - } - if (!ok) { - array.splice(0, i2 + 1); - i2 = 0; - } - } - } - function rebaseHist(hist, change) { - var from = change.from.line, - to = change.to.line, - diff = change.text.length - (to - from) - 1; - rebaseHistArray(hist.done, from, to, diff); - rebaseHistArray(hist.undone, from, to, diff); - } - function changeLine(doc, handle, changeType, op) { - var no = handle, - line = handle; - if (typeof handle == "number") { - line = getLine(doc, clipLine(doc, handle)); - } else { - no = lineNo(handle); - } - if (no == null) { - return null; - } - if (op(line, no) && doc.cm) { - regLineChange(doc.cm, no, changeType); - } - return line; - } - function LeafChunk(lines) { - this.lines = lines; - this.parent = null; - var height = 0; - for (var i2 = 0; i2 < lines.length; ++i2) { - lines[i2].parent = this; - height += lines[i2].height; - } - this.height = height; - } - LeafChunk.prototype = { - chunkSize: function () { - return this.lines.length; - }, - // Remove the n lines at offset 'at'. - removeInner: function (at, n) { - for (var i2 = at, e = at + n; i2 < e; ++i2) { - var line = this.lines[i2]; - this.height -= line.height; - cleanUpLine(line); - signalLater(line, "delete"); - } - this.lines.splice(at, n); - }, - // Helper used to collapse a small branch into a single leaf. - collapse: function (lines) { - lines.push.apply(lines, this.lines); - }, - // Insert the given array of lines at offset 'at', count them as - // having the given height. - insertInner: function (at, lines, height) { - this.height += height; - this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)); - for (var i2 = 0; i2 < lines.length; ++i2) { - lines[i2].parent = this; - } - }, - // Used to iterate over a part of the tree. - iterN: function (at, n, op) { - for (var e = at + n; at < e; ++at) { - if (op(this.lines[at])) { - return true; - } - } - } - }; - function BranchChunk(children) { - this.children = children; - var size = 0, - height = 0; - for (var i2 = 0; i2 < children.length; ++i2) { - var ch = children[i2]; - size += ch.chunkSize(); - height += ch.height; - ch.parent = this; - } - this.size = size; - this.height = height; - this.parent = null; - } - BranchChunk.prototype = { - chunkSize: function () { - return this.size; - }, - removeInner: function (at, n) { - this.size -= n; - for (var i2 = 0; i2 < this.children.length; ++i2) { - var child = this.children[i2], - sz = child.chunkSize(); - if (at < sz) { - var rm = Math.min(n, sz - at), - oldHeight = child.height; - child.removeInner(at, rm); - this.height -= oldHeight - child.height; - if (sz == rm) { - this.children.splice(i2--, 1); - child.parent = null; - } - if ((n -= rm) == 0) { - break; - } - at = 0; - } else { - at -= sz; - } - } - if (this.size - n < 25 && (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { - var lines = []; - this.collapse(lines); - this.children = [new LeafChunk(lines)]; - this.children[0].parent = this; - } - }, - collapse: function (lines) { - for (var i2 = 0; i2 < this.children.length; ++i2) { - this.children[i2].collapse(lines); - } - }, - insertInner: function (at, lines, height) { - this.size += lines.length; - this.height += height; - for (var i2 = 0; i2 < this.children.length; ++i2) { - var child = this.children[i2], - sz = child.chunkSize(); - if (at <= sz) { - child.insertInner(at, lines, height); - if (child.lines && child.lines.length > 50) { - var remaining = child.lines.length % 25 + 25; - for (var pos = remaining; pos < child.lines.length;) { - var leaf = new LeafChunk(child.lines.slice(pos, pos += 25)); - child.height -= leaf.height; - this.children.splice(++i2, 0, leaf); - leaf.parent = this; - } - child.lines = child.lines.slice(0, remaining); - this.maybeSpill(); - } - break; - } - at -= sz; - } - }, - // When a node has grown, check whether it should be split. - maybeSpill: function () { - if (this.children.length <= 10) { - return; - } - var me = this; - do { - var spilled = me.children.splice(me.children.length - 5, 5); - var sibling = new BranchChunk(spilled); - if (!me.parent) { - var copy = new BranchChunk(me.children); - copy.parent = me; - me.children = [copy, sibling]; - me = copy; - } else { - me.size -= sibling.size; - me.height -= sibling.height; - var myIndex = indexOf(me.parent.children, me); - me.parent.children.splice(myIndex + 1, 0, sibling); - } - sibling.parent = me.parent; - } while (me.children.length > 10); - me.parent.maybeSpill(); - }, - iterN: function (at, n, op) { - for (var i2 = 0; i2 < this.children.length; ++i2) { - var child = this.children[i2], - sz = child.chunkSize(); - if (at < sz) { - var used = Math.min(n, sz - at); - if (child.iterN(at, used, op)) { - return true; - } - if ((n -= used) == 0) { - break; - } - at = 0; - } else { - at -= sz; - } - } - } - }; - var LineWidget = function (doc, node, options) { - if (options) { - for (var opt in options) { - if (options.hasOwnProperty(opt)) { - this[opt] = options[opt]; - } - } - } - this.doc = doc; - this.node = node; - }; - LineWidget.prototype.clear = function () { - var cm = this.doc.cm, - ws = this.line.widgets, - line = this.line, - no = lineNo(line); - if (no == null || !ws) { - return; - } - for (var i2 = 0; i2 < ws.length; ++i2) { - if (ws[i2] == this) { - ws.splice(i2--, 1); - } - } - if (!ws.length) { - line.widgets = null; - } - var height = widgetHeight(this); - updateLineHeight(line, Math.max(0, line.height - height)); - if (cm) { - runInOp(cm, function () { - adjustScrollWhenAboveVisible(cm, line, -height); - regLineChange(cm, no, "widget"); - }); - signalLater(cm, "lineWidgetCleared", cm, this, no); - } - }; - LineWidget.prototype.changed = function () { - var this$1$1 = this; - var oldH = this.height, - cm = this.doc.cm, - line = this.line; - this.height = null; - var diff = widgetHeight(this) - oldH; - if (!diff) { - return; - } - if (!lineIsHidden(this.doc, line)) { - updateLineHeight(line, line.height + diff); - } - if (cm) { - runInOp(cm, function () { - cm.curOp.forceUpdate = true; - adjustScrollWhenAboveVisible(cm, line, diff); - signalLater(cm, "lineWidgetChanged", cm, this$1$1, lineNo(line)); - }); - } - }; - eventMixin(LineWidget); - function adjustScrollWhenAboveVisible(cm, line, diff) { - if (heightAtLine(line) < (cm.curOp && cm.curOp.scrollTop || cm.doc.scrollTop)) { - addToScrollTop(cm, diff); - } - } - function addLineWidget(doc, handle, node, options) { - var widget = new LineWidget(doc, node, options); - var cm = doc.cm; - if (cm && widget.noHScroll) { - cm.display.alignWidgets = true; - } - changeLine(doc, handle, "widget", function (line) { - var widgets = line.widgets || (line.widgets = []); - if (widget.insertAt == null) { - widgets.push(widget); - } else { - widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget); - } - widget.line = line; - if (cm && !lineIsHidden(doc, line)) { - var aboveVisible = heightAtLine(line) < doc.scrollTop; - updateLineHeight(line, line.height + widgetHeight(widget)); - if (aboveVisible) { - addToScrollTop(cm, widget.height); - } - cm.curOp.forceUpdate = true; - } - return true; - }); - if (cm) { - signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); - } - return widget; - } - var nextMarkerId = 0; - var TextMarker = function (doc, type) { - this.lines = []; - this.type = type; - this.doc = doc; - this.id = ++nextMarkerId; - }; - TextMarker.prototype.clear = function () { - if (this.explicitlyCleared) { - return; - } - var cm = this.doc.cm, - withOp = cm && !cm.curOp; - if (withOp) { - startOperation(cm); - } - if (hasHandler(this, "clear")) { - var found = this.find(); - if (found) { - signalLater(this, "clear", found.from, found.to); - } - } - var min = null, - max = null; - for (var i2 = 0; i2 < this.lines.length; ++i2) { - var line = this.lines[i2]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (cm && !this.collapsed) { - regLineChange(cm, lineNo(line), "text"); - } else if (cm) { - if (span.to != null) { - max = lineNo(line); - } - if (span.from != null) { - min = lineNo(line); - } - } - line.markedSpans = removeMarkedSpan(line.markedSpans, span); - if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) { - updateLineHeight(line, textHeight(cm.display)); - } - } - if (cm && this.collapsed && !cm.options.lineWrapping) { - for (var i$12 = 0; i$12 < this.lines.length; ++i$12) { - var visual = visualLine(this.lines[i$12]), - len = lineLength(visual); - if (len > cm.display.maxLineLength) { - cm.display.maxLine = visual; - cm.display.maxLineLength = len; - cm.display.maxLineChanged = true; - } - } - } - if (min != null && cm && this.collapsed) { - regChange(cm, min, max + 1); - } - this.lines.length = 0; - this.explicitlyCleared = true; - if (this.atomic && this.doc.cantEdit) { - this.doc.cantEdit = false; - if (cm) { - reCheckSelection(cm.doc); - } - } - if (cm) { - signalLater(cm, "markerCleared", cm, this, min, max); - } - if (withOp) { - endOperation(cm); - } - if (this.parent) { - this.parent.clear(); - } - }; - TextMarker.prototype.find = function (side, lineObj) { - if (side == null && this.type == "bookmark") { - side = 1; - } - var from, to; - for (var i2 = 0; i2 < this.lines.length; ++i2) { - var line = this.lines[i2]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (span.from != null) { - from = Pos(lineObj ? line : lineNo(line), span.from); - if (side == -1) { - return from; - } - } - if (span.to != null) { - to = Pos(lineObj ? line : lineNo(line), span.to); - if (side == 1) { - return to; - } - } - } - return from && { - from, - to - }; - }; - TextMarker.prototype.changed = function () { - var this$1$1 = this; - var pos = this.find(-1, true), - widget = this, - cm = this.doc.cm; - if (!pos || !cm) { - return; - } - runInOp(cm, function () { - var line = pos.line, - lineN = lineNo(pos.line); - var view = findViewForLine(cm, lineN); - if (view) { - clearLineMeasurementCacheFor(view); - cm.curOp.selectionChanged = cm.curOp.forceUpdate = true; - } - cm.curOp.updateMaxLine = true; - if (!lineIsHidden(widget.doc, line) && widget.height != null) { - var oldHeight = widget.height; - widget.height = null; - var dHeight = widgetHeight(widget) - oldHeight; - if (dHeight) { - updateLineHeight(line, line.height + dHeight); - } - } - signalLater(cm, "markerChanged", cm, this$1$1); - }); - }; - TextMarker.prototype.attachLine = function (line) { - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) { - (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); - } - } - this.lines.push(line); - }; - TextMarker.prototype.detachLine = function (line) { - this.lines.splice(indexOf(this.lines, line), 1); - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this); - } - }; - eventMixin(TextMarker); - function markText(doc, from, to, options, type) { - if (options && options.shared) { - return markTextShared(doc, from, to, options, type); - } - if (doc.cm && !doc.cm.curOp) { - return operation(doc.cm, markText)(doc, from, to, options, type); - } - var marker = new TextMarker(doc, type), - diff = cmp(from, to); - if (options) { - copyObj(options, marker, false); - } - if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) { - return marker; - } - if (marker.replacedWith) { - marker.collapsed = true; - marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget"); - if (!options.handleMouseEvents) { - marker.widgetNode.setAttribute("cm-ignore-events", "true"); - } - if (options.insertLeft) { - marker.widgetNode.insertLeft = true; - } - } - if (marker.collapsed) { - if (conflictingCollapsedRange(doc, from.line, from, to, marker) || from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) { - throw new Error("Inserting collapsed marker partially overlapping an existing one"); - } - seeCollapsedSpans(); - } - if (marker.addToHistory) { - addChangeToHistory(doc, { - from, - to, - origin: "markText" - }, doc.sel, NaN); - } - var curLine = from.line, - cm = doc.cm, - updateMaxLine; - doc.iter(curLine, to.line + 1, function (line) { - if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) { - updateMaxLine = true; - } - if (marker.collapsed && curLine != from.line) { - updateLineHeight(line, 0); - } - addMarkedSpan(line, new MarkedSpan(marker, curLine == from.line ? from.ch : null, curLine == to.line ? to.ch : null), doc.cm && doc.cm.curOp); - ++curLine; - }); - if (marker.collapsed) { - doc.iter(from.line, to.line + 1, function (line) { - if (lineIsHidden(doc, line)) { - updateLineHeight(line, 0); - } - }); - } - if (marker.clearOnEnter) { - on(marker, "beforeCursorEnter", function () { - return marker.clear(); - }); - } - if (marker.readOnly) { - seeReadOnlySpans(); - if (doc.history.done.length || doc.history.undone.length) { - doc.clearHistory(); - } - } - if (marker.collapsed) { - marker.id = ++nextMarkerId; - marker.atomic = true; - } - if (cm) { - if (updateMaxLine) { - cm.curOp.updateMaxLine = true; - } - if (marker.collapsed) { - regChange(cm, from.line, to.line + 1); - } else if (marker.className || marker.startStyle || marker.endStyle || marker.css || marker.attributes || marker.title) { - for (var i2 = from.line; i2 <= to.line; i2++) { - regLineChange(cm, i2, "text"); - } - } - if (marker.atomic) { - reCheckSelection(cm.doc); - } - signalLater(cm, "markerAdded", cm, marker); - } - return marker; - } - var SharedTextMarker = function (markers, primary) { - this.markers = markers; - this.primary = primary; - for (var i2 = 0; i2 < markers.length; ++i2) { - markers[i2].parent = this; - } - }; - SharedTextMarker.prototype.clear = function () { - if (this.explicitlyCleared) { - return; - } - this.explicitlyCleared = true; - for (var i2 = 0; i2 < this.markers.length; ++i2) { - this.markers[i2].clear(); - } - signalLater(this, "clear"); - }; - SharedTextMarker.prototype.find = function (side, lineObj) { - return this.primary.find(side, lineObj); - }; - eventMixin(SharedTextMarker); - function markTextShared(doc, from, to, options, type) { - options = copyObj(options); - options.shared = false; - var markers = [markText(doc, from, to, options, type)], - primary = markers[0]; - var widget = options.widgetNode; - linkedDocs(doc, function (doc2) { - if (widget) { - options.widgetNode = widget.cloneNode(true); - } - markers.push(markText(doc2, clipPos(doc2, from), clipPos(doc2, to), options, type)); - for (var i2 = 0; i2 < doc2.linked.length; ++i2) { - if (doc2.linked[i2].isParent) { - return; - } - } - primary = lst(markers); - }); - return new SharedTextMarker(markers, primary); - } - function findSharedMarkers(doc) { - return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), function (m) { - return m.parent; - }); - } - function copySharedMarkers(doc, markers) { - for (var i2 = 0; i2 < markers.length; i2++) { - var marker = markers[i2], - pos = marker.find(); - var mFrom = doc.clipPos(pos.from), - mTo = doc.clipPos(pos.to); - if (cmp(mFrom, mTo)) { - var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type); - marker.markers.push(subMark); - subMark.parent = marker; - } - } - } - function detachSharedMarkers(markers) { - var loop = function (i3) { - var marker = markers[i3], - linked = [marker.primary.doc]; - linkedDocs(marker.primary.doc, function (d) { - return linked.push(d); - }); - for (var j = 0; j < marker.markers.length; j++) { - var subMarker = marker.markers[j]; - if (indexOf(linked, subMarker.doc) == -1) { - subMarker.parent = null; - marker.markers.splice(j--, 1); - } - } - }; - for (var i2 = 0; i2 < markers.length; i2++) loop(i2); - } - var nextDocId = 0; - var Doc = function (text, mode, firstLine, lineSep, direction) { - if (!(this instanceof Doc)) { - return new Doc(text, mode, firstLine, lineSep, direction); - } - if (firstLine == null) { - firstLine = 0; - } - BranchChunk.call(this, [new LeafChunk([new Line("", null)])]); - this.first = firstLine; - this.scrollTop = this.scrollLeft = 0; - this.cantEdit = false; - this.cleanGeneration = 1; - this.modeFrontier = this.highlightFrontier = firstLine; - var start = Pos(firstLine, 0); - this.sel = simpleSelection(start); - this.history = new History(null); - this.id = ++nextDocId; - this.modeOption = mode; - this.lineSep = lineSep; - this.direction = direction == "rtl" ? "rtl" : "ltr"; - this.extend = false; - if (typeof text == "string") { - text = this.splitLines(text); - } - updateDoc(this, { - from: start, - to: start, - text - }); - setSelection(this, simpleSelection(start), sel_dontScroll); - }; - Doc.prototype = createObj(BranchChunk.prototype, { - constructor: Doc, - // Iterate over the document. Supports two forms -- with only one - // argument, it calls that for each line in the document. With - // three, it iterates over the range given by the first two (with - // the second being non-inclusive). - iter: function (from, to, op) { - if (op) { - this.iterN(from - this.first, to - from, op); - } else { - this.iterN(this.first, this.first + this.size, from); - } - }, - // Non-public interface for adding and removing lines. - insert: function (at, lines) { - var height = 0; - for (var i2 = 0; i2 < lines.length; ++i2) { - height += lines[i2].height; - } - this.insertInner(at - this.first, lines, height); - }, - remove: function (at, n) { - this.removeInner(at - this.first, n); - }, - // From here, the methods are part of the public interface. Most - // are also available from CodeMirror (editor) instances. - getValue: function (lineSep) { - var lines = getLines(this, this.first, this.first + this.size); - if (lineSep === false) { - return lines; - } - return lines.join(lineSep || this.lineSeparator()); - }, - setValue: docMethodOp(function (code) { - var top = Pos(this.first, 0), - last = this.first + this.size - 1; - makeChange(this, { - from: top, - to: Pos(last, getLine(this, last).text.length), - text: this.splitLines(code), - origin: "setValue", - full: true - }, true); - if (this.cm) { - scrollToCoords(this.cm, 0, 0); - } - setSelection(this, simpleSelection(top), sel_dontScroll); - }), - replaceRange: function (code, from, to, origin) { - from = clipPos(this, from); - to = to ? clipPos(this, to) : from; - replaceRange(this, code, from, to, origin); - }, - getRange: function (from, to, lineSep) { - var lines = getBetween(this, clipPos(this, from), clipPos(this, to)); - if (lineSep === false) { - return lines; - } - if (lineSep === "") { - return lines.join(""); - } - return lines.join(lineSep || this.lineSeparator()); - }, - getLine: function (line) { - var l = this.getLineHandle(line); - return l && l.text; - }, - getLineHandle: function (line) { - if (isLine(this, line)) { - return getLine(this, line); - } - }, - getLineNumber: function (line) { - return lineNo(line); - }, - getLineHandleVisualStart: function (line) { - if (typeof line == "number") { - line = getLine(this, line); - } - return visualLine(line); - }, - lineCount: function () { - return this.size; - }, - firstLine: function () { - return this.first; - }, - lastLine: function () { - return this.first + this.size - 1; - }, - clipPos: function (pos) { - return clipPos(this, pos); - }, - getCursor: function (start) { - var range2 = this.sel.primary(), - pos; - if (start == null || start == "head") { - pos = range2.head; - } else if (start == "anchor") { - pos = range2.anchor; - } else if (start == "end" || start == "to" || start === false) { - pos = range2.to(); - } else { - pos = range2.from(); - } - return pos; - }, - listSelections: function () { - return this.sel.ranges; - }, - somethingSelected: function () { - return this.sel.somethingSelected(); - }, - setCursor: docMethodOp(function (line, ch, options) { - setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options); - }), - setSelection: docMethodOp(function (anchor, head, options) { - setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options); - }), - extendSelection: docMethodOp(function (head, other, options) { - extendSelection(this, clipPos(this, head), other && clipPos(this, other), options); - }), - extendSelections: docMethodOp(function (heads, options) { - extendSelections(this, clipPosArray(this, heads), options); - }), - extendSelectionsBy: docMethodOp(function (f, options) { - var heads = map(this.sel.ranges, f); - extendSelections(this, clipPosArray(this, heads), options); - }), - setSelections: docMethodOp(function (ranges, primary, options) { - if (!ranges.length) { - return; - } - var out = []; - for (var i2 = 0; i2 < ranges.length; i2++) { - out[i2] = new Range(clipPos(this, ranges[i2].anchor), clipPos(this, ranges[i2].head || ranges[i2].anchor)); - } - if (primary == null) { - primary = Math.min(ranges.length - 1, this.sel.primIndex); - } - setSelection(this, normalizeSelection(this.cm, out, primary), options); - }), - addSelection: docMethodOp(function (anchor, head, options) { - var ranges = this.sel.ranges.slice(0); - ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))); - setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options); - }), - getSelection: function (lineSep) { - var ranges = this.sel.ranges, - lines; - for (var i2 = 0; i2 < ranges.length; i2++) { - var sel = getBetween(this, ranges[i2].from(), ranges[i2].to()); - lines = lines ? lines.concat(sel) : sel; - } - if (lineSep === false) { - return lines; - } else { - return lines.join(lineSep || this.lineSeparator()); - } - }, - getSelections: function (lineSep) { - var parts = [], - ranges = this.sel.ranges; - for (var i2 = 0; i2 < ranges.length; i2++) { - var sel = getBetween(this, ranges[i2].from(), ranges[i2].to()); - if (lineSep !== false) { - sel = sel.join(lineSep || this.lineSeparator()); - } - parts[i2] = sel; - } - return parts; - }, - replaceSelection: function (code, collapse, origin) { - var dup = []; - for (var i2 = 0; i2 < this.sel.ranges.length; i2++) { - dup[i2] = code; - } - this.replaceSelections(dup, collapse, origin || "+input"); - }, - replaceSelections: docMethodOp(function (code, collapse, origin) { - var changes = [], - sel = this.sel; - for (var i2 = 0; i2 < sel.ranges.length; i2++) { - var range2 = sel.ranges[i2]; - changes[i2] = { - from: range2.from(), - to: range2.to(), - text: this.splitLines(code[i2]), - origin - }; - } - var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse); - for (var i$12 = changes.length - 1; i$12 >= 0; i$12--) { - makeChange(this, changes[i$12]); - } - if (newSel) { - setSelectionReplaceHistory(this, newSel); - } else if (this.cm) { - ensureCursorVisible(this.cm); - } - }), - undo: docMethodOp(function () { - makeChangeFromHistory(this, "undo"); - }), - redo: docMethodOp(function () { - makeChangeFromHistory(this, "redo"); - }), - undoSelection: docMethodOp(function () { - makeChangeFromHistory(this, "undo", true); - }), - redoSelection: docMethodOp(function () { - makeChangeFromHistory(this, "redo", true); - }), - setExtending: function (val) { - this.extend = val; - }, - getExtending: function () { - return this.extend; - }, - historySize: function () { - var hist = this.history, - done = 0, - undone = 0; - for (var i2 = 0; i2 < hist.done.length; i2++) { - if (!hist.done[i2].ranges) { - ++done; - } - } - for (var i$12 = 0; i$12 < hist.undone.length; i$12++) { - if (!hist.undone[i$12].ranges) { - ++undone; - } - } - return { - undo: done, - redo: undone - }; - }, - clearHistory: function () { - var this$1$1 = this; - this.history = new History(this.history); - linkedDocs(this, function (doc) { - return doc.history = this$1$1.history; - }, true); - }, - markClean: function () { - this.cleanGeneration = this.changeGeneration(true); - }, - changeGeneration: function (forceSplit) { - if (forceSplit) { - this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; - } - return this.history.generation; - }, - isClean: function (gen) { - return this.history.generation == (gen || this.cleanGeneration); - }, - getHistory: function () { - return { - done: copyHistoryArray(this.history.done), - undone: copyHistoryArray(this.history.undone) - }; - }, - setHistory: function (histData) { - var hist = this.history = new History(this.history); - hist.done = copyHistoryArray(histData.done.slice(0), null, true); - hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); - }, - setGutterMarker: docMethodOp(function (line, gutterID, value) { - return changeLine(this, line, "gutter", function (line2) { - var markers = line2.gutterMarkers || (line2.gutterMarkers = {}); - markers[gutterID] = value; - if (!value && isEmpty(markers)) { - line2.gutterMarkers = null; - } - return true; - }); - }), - clearGutter: docMethodOp(function (gutterID) { - var this$1$1 = this; - this.iter(function (line) { - if (line.gutterMarkers && line.gutterMarkers[gutterID]) { - changeLine(this$1$1, line, "gutter", function () { - line.gutterMarkers[gutterID] = null; - if (isEmpty(line.gutterMarkers)) { - line.gutterMarkers = null; - } - return true; - }); - } - }); - }), - lineInfo: function (line) { - var n; - if (typeof line == "number") { - if (!isLine(this, line)) { - return null; - } - n = line; - line = getLine(this, line); - if (!line) { - return null; - } - } else { - n = lineNo(line); - if (n == null) { - return null; - } - } - return { - line: n, - handle: line, - text: line.text, - gutterMarkers: line.gutterMarkers, - textClass: line.textClass, - bgClass: line.bgClass, - wrapClass: line.wrapClass, - widgets: line.widgets - }; - }, - addLineClass: docMethodOp(function (handle, where, cls) { - return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { - var prop2 = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass"; - if (!line[prop2]) { - line[prop2] = cls; - } else if (classTest(cls).test(line[prop2])) { - return false; - } else { - line[prop2] += " " + cls; - } - return true; - }); - }), - removeLineClass: docMethodOp(function (handle, where, cls) { - return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function (line) { - var prop2 = where == "text" ? "textClass" : where == "background" ? "bgClass" : where == "gutter" ? "gutterClass" : "wrapClass"; - var cur = line[prop2]; - if (!cur) { - return false; - } else if (cls == null) { - line[prop2] = null; - } else { - var found = cur.match(classTest(cls)); - if (!found) { - return false; - } - var end = found.index + found[0].length; - line[prop2] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null; - } - return true; - }); - }), - addLineWidget: docMethodOp(function (handle, node, options) { - return addLineWidget(this, handle, node, options); - }), - removeLineWidget: function (widget) { - widget.clear(); - }, - markText: function (from, to, options) { - return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range"); - }, - setBookmark: function (pos, options) { - var realOpts = { - replacedWith: options && (options.nodeType == null ? options.widget : options), - insertLeft: options && options.insertLeft, - clearWhenEmpty: false, - shared: options && options.shared, - handleMouseEvents: options && options.handleMouseEvents - }; - pos = clipPos(this, pos); - return markText(this, pos, pos, realOpts, "bookmark"); - }, - findMarksAt: function (pos) { - pos = clipPos(this, pos); - var markers = [], - spans = getLine(this, pos.line).markedSpans; - if (spans) { - for (var i2 = 0; i2 < spans.length; ++i2) { - var span = spans[i2]; - if ((span.from == null || span.from <= pos.ch) && (span.to == null || span.to >= pos.ch)) { - markers.push(span.marker.parent || span.marker); - } - } - } - return markers; - }, - findMarks: function (from, to, filter) { - from = clipPos(this, from); - to = clipPos(this, to); - var found = [], - lineNo2 = from.line; - this.iter(from.line, to.line + 1, function (line) { - var spans = line.markedSpans; - if (spans) { - for (var i2 = 0; i2 < spans.length; i2++) { - var span = spans[i2]; - if (!(span.to != null && lineNo2 == from.line && from.ch >= span.to || span.from == null && lineNo2 != from.line || span.from != null && lineNo2 == to.line && span.from >= to.ch) && (!filter || filter(span.marker))) { - found.push(span.marker.parent || span.marker); - } - } - } - ++lineNo2; - }); - return found; - }, - getAllMarks: function () { - var markers = []; - this.iter(function (line) { - var sps = line.markedSpans; - if (sps) { - for (var i2 = 0; i2 < sps.length; ++i2) { - if (sps[i2].from != null) { - markers.push(sps[i2].marker); - } - } - } - }); - return markers; - }, - posFromIndex: function (off2) { - var ch, - lineNo2 = this.first, - sepSize = this.lineSeparator().length; - this.iter(function (line) { - var sz = line.text.length + sepSize; - if (sz > off2) { - ch = off2; - return true; - } - off2 -= sz; - ++lineNo2; - }); - return clipPos(this, Pos(lineNo2, ch)); - }, - indexFromPos: function (coords) { - coords = clipPos(this, coords); - var index = coords.ch; - if (coords.line < this.first || coords.ch < 0) { - return 0; - } - var sepSize = this.lineSeparator().length; - this.iter(this.first, coords.line, function (line) { - index += line.text.length + sepSize; - }); - return index; - }, - copy: function (copyHistory) { - var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first, this.lineSep, this.direction); - doc.scrollTop = this.scrollTop; - doc.scrollLeft = this.scrollLeft; - doc.sel = this.sel; - doc.extend = false; - if (copyHistory) { - doc.history.undoDepth = this.history.undoDepth; - doc.setHistory(this.getHistory()); - } - return doc; - }, - linkedDoc: function (options) { - if (!options) { - options = {}; - } - var from = this.first, - to = this.first + this.size; - if (options.from != null && options.from > from) { - from = options.from; - } - if (options.to != null && options.to < to) { - to = options.to; - } - var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction); - if (options.sharedHist) { - copy.history = this.history; - } - (this.linked || (this.linked = [])).push({ - doc: copy, - sharedHist: options.sharedHist - }); - copy.linked = [{ - doc: this, - isParent: true, - sharedHist: options.sharedHist - }]; - copySharedMarkers(copy, findSharedMarkers(this)); - return copy; - }, - unlinkDoc: function (other) { - if (other instanceof CodeMirror) { - other = other.doc; - } - if (this.linked) { - for (var i2 = 0; i2 < this.linked.length; ++i2) { - var link = this.linked[i2]; - if (link.doc != other) { - continue; - } - this.linked.splice(i2, 1); - other.unlinkDoc(this); - detachSharedMarkers(findSharedMarkers(this)); - break; - } - } - if (other.history == this.history) { - var splitIds = [other.id]; - linkedDocs(other, function (doc) { - return splitIds.push(doc.id); - }, true); - other.history = new History(null); - other.history.done = copyHistoryArray(this.history.done, splitIds); - other.history.undone = copyHistoryArray(this.history.undone, splitIds); - } - }, - iterLinkedDocs: function (f) { - linkedDocs(this, f); - }, - getMode: function () { - return this.mode; - }, - getEditor: function () { - return this.cm; - }, - splitLines: function (str) { - if (this.lineSep) { - return str.split(this.lineSep); - } - return splitLinesAuto(str); - }, - lineSeparator: function () { - return this.lineSep || "\n"; - }, - setDirection: docMethodOp(function (dir) { - if (dir != "rtl") { - dir = "ltr"; - } - if (dir == this.direction) { - return; - } - this.direction = dir; - this.iter(function (line) { - return line.order = null; - }); - if (this.cm) { - directionChanged(this.cm); - } - }) - }); - Doc.prototype.eachLine = Doc.prototype.iter; - var lastDrop = 0; - function onDrop(e) { - var cm = this; - clearDragCursor(cm); - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { - return; - } - e_preventDefault(e); - if (ie) { - lastDrop = + /* @__PURE__ */new Date(); - } - var pos = posFromMouse(cm, e, true), - files = e.dataTransfer.files; - if (!pos || cm.isReadOnly()) { - return; - } - if (files && files.length && window.FileReader && window.File) { - var n = files.length, - text = Array(n), - read = 0; - var markAsReadAndPasteIfAllFilesAreRead = function () { - if (++read == n) { - operation(cm, function () { - pos = clipPos(cm.doc, pos); - var change = { - from: pos, - to: pos, - text: cm.doc.splitLines(text.filter(function (t) { - return t != null; - }).join(cm.doc.lineSeparator())), - origin: "paste" - }; - makeChange(cm.doc, change); - setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change)))); - })(); - } - }; - var readTextFromFile = function (file, i3) { - if (cm.options.allowDropFileTypes && indexOf(cm.options.allowDropFileTypes, file.type) == -1) { - markAsReadAndPasteIfAllFilesAreRead(); - return; - } - var reader = new FileReader(); - reader.onerror = function () { - return markAsReadAndPasteIfAllFilesAreRead(); - }; - reader.onload = function () { - var content = reader.result; - if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) { - markAsReadAndPasteIfAllFilesAreRead(); - return; - } - text[i3] = content; - markAsReadAndPasteIfAllFilesAreRead(); - }; - reader.readAsText(file); - }; - for (var i2 = 0; i2 < files.length; i2++) { - readTextFromFile(files[i2], i2); - } - } else { - if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { - cm.state.draggingText(e); - setTimeout(function () { - return cm.display.input.focus(); - }, 20); - return; - } - try { - var text$1 = e.dataTransfer.getData("Text"); - if (text$1) { - var selected; - if (cm.state.draggingText && !cm.state.draggingText.copy) { - selected = cm.listSelections(); - } - setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)); - if (selected) { - for (var i$12 = 0; i$12 < selected.length; ++i$12) { - replaceRange(cm.doc, "", selected[i$12].anchor, selected[i$12].head, "drag"); - } - } - cm.replaceSelection(text$1, "around", "paste"); - cm.display.input.focus(); - } - } catch (e$1) {} - } - } - function onDragStart(cm, e) { - if (ie && (!cm.state.draggingText || + /* @__PURE__ */new Date() - lastDrop < 100)) { - e_stop(e); - return; - } - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) { - return; - } - e.dataTransfer.setData("Text", cm.getSelection()); - e.dataTransfer.effectAllowed = "copyMove"; - if (e.dataTransfer.setDragImage && !safari) { - var img = elt("img", null, null, "position: fixed; left: 0; top: 0;"); - img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; - if (presto) { - img.width = img.height = 1; - cm.display.wrapper.appendChild(img); - img._top = img.offsetTop; - } - e.dataTransfer.setDragImage(img, 0, 0); - if (presto) { - img.parentNode.removeChild(img); - } - } - } - function onDragOver(cm, e) { - var pos = posFromMouse(cm, e); - if (!pos) { - return; - } - var frag = document.createDocumentFragment(); - drawSelectionCursor(cm, pos, frag); - if (!cm.display.dragCursor) { - cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors"); - cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv); - } - removeChildrenAndAdd(cm.display.dragCursor, frag); - } - function clearDragCursor(cm) { - if (cm.display.dragCursor) { - cm.display.lineSpace.removeChild(cm.display.dragCursor); - cm.display.dragCursor = null; - } - } - function forEachCodeMirror(f) { - if (!document.getElementsByClassName) { - return; - } - var byClass = document.getElementsByClassName("CodeMirror"), - editors = []; - for (var i2 = 0; i2 < byClass.length; i2++) { - var cm = byClass[i2].CodeMirror; - if (cm) { - editors.push(cm); - } - } - if (editors.length) { - editors[0].operation(function () { - for (var i3 = 0; i3 < editors.length; i3++) { - f(editors[i3]); - } - }); - } - } - var globalsRegistered = false; - function ensureGlobalHandlers() { - if (globalsRegistered) { - return; - } - registerGlobalHandlers(); - globalsRegistered = true; - } - function registerGlobalHandlers() { - var resizeTimer; - on(window, "resize", function () { - if (resizeTimer == null) { - resizeTimer = setTimeout(function () { - resizeTimer = null; - forEachCodeMirror(onResize); - }, 100); - } - }); - on(window, "blur", function () { - return forEachCodeMirror(onBlur); - }); - } - function onResize(cm) { - var d = cm.display; - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - d.scrollbarsClipped = false; - cm.setSize(); - } - var keyNames = { - 3: "Pause", - 8: "Backspace", - 9: "Tab", - 13: "Enter", - 16: "Shift", - 17: "Ctrl", - 18: "Alt", - 19: "Pause", - 20: "CapsLock", - 27: "Esc", - 32: "Space", - 33: "PageUp", - 34: "PageDown", - 35: "End", - 36: "Home", - 37: "Left", - 38: "Up", - 39: "Right", - 40: "Down", - 44: "PrintScrn", - 45: "Insert", - 46: "Delete", - 59: ";", - 61: "=", - 91: "Mod", - 92: "Mod", - 93: "Mod", - 106: "*", - 107: "=", - 109: "-", - 110: ".", - 111: "/", - 145: "ScrollLock", - 173: "-", - 186: ";", - 187: "=", - 188: ",", - 189: "-", - 190: ".", - 191: "/", - 192: "`", - 219: "[", - 220: "\\", - 221: "]", - 222: "'", - 224: "Mod", - 63232: "Up", - 63233: "Down", - 63234: "Left", - 63235: "Right", - 63272: "Delete", - 63273: "Home", - 63275: "End", - 63276: "PageUp", - 63277: "PageDown", - 63302: "Insert" - }; - for (var i = 0; i < 10; i++) { - keyNames[i + 48] = keyNames[i + 96] = String(i); - } - for (var i$1 = 65; i$1 <= 90; i$1++) { - keyNames[i$1] = String.fromCharCode(i$1); - } - for (var i$2 = 1; i$2 <= 12; i$2++) { - keyNames[i$2 + 111] = keyNames[i$2 + 63235] = "F" + i$2; - } - var keyMap = {}; - keyMap.basic = { - "Left": "goCharLeft", - "Right": "goCharRight", - "Up": "goLineUp", - "Down": "goLineDown", - "End": "goLineEnd", - "Home": "goLineStartSmart", - "PageUp": "goPageUp", - "PageDown": "goPageDown", - "Delete": "delCharAfter", - "Backspace": "delCharBefore", - "Shift-Backspace": "delCharBefore", - "Tab": "defaultTab", - "Shift-Tab": "indentAuto", - "Enter": "newlineAndIndent", - "Insert": "toggleOverwrite", - "Esc": "singleSelection" - }; - keyMap.pcDefault = { - "Ctrl-A": "selectAll", - "Ctrl-D": "deleteLine", - "Ctrl-Z": "undo", - "Shift-Ctrl-Z": "redo", - "Ctrl-Y": "redo", - "Ctrl-Home": "goDocStart", - "Ctrl-End": "goDocEnd", - "Ctrl-Up": "goLineUp", - "Ctrl-Down": "goLineDown", - "Ctrl-Left": "goGroupLeft", - "Ctrl-Right": "goGroupRight", - "Alt-Left": "goLineStart", - "Alt-Right": "goLineEnd", - "Ctrl-Backspace": "delGroupBefore", - "Ctrl-Delete": "delGroupAfter", - "Ctrl-S": "save", - "Ctrl-F": "find", - "Ctrl-G": "findNext", - "Shift-Ctrl-G": "findPrev", - "Shift-Ctrl-F": "replace", - "Shift-Ctrl-R": "replaceAll", - "Ctrl-[": "indentLess", - "Ctrl-]": "indentMore", - "Ctrl-U": "undoSelection", - "Shift-Ctrl-U": "redoSelection", - "Alt-U": "redoSelection", - "fallthrough": "basic" - }; - keyMap.emacsy = { - "Ctrl-F": "goCharRight", - "Ctrl-B": "goCharLeft", - "Ctrl-P": "goLineUp", - "Ctrl-N": "goLineDown", - "Ctrl-A": "goLineStart", - "Ctrl-E": "goLineEnd", - "Ctrl-V": "goPageDown", - "Shift-Ctrl-V": "goPageUp", - "Ctrl-D": "delCharAfter", - "Ctrl-H": "delCharBefore", - "Alt-Backspace": "delWordBefore", - "Ctrl-K": "killLine", - "Ctrl-T": "transposeChars", - "Ctrl-O": "openLine" - }; - keyMap.macDefault = { - "Cmd-A": "selectAll", - "Cmd-D": "deleteLine", - "Cmd-Z": "undo", - "Shift-Cmd-Z": "redo", - "Cmd-Y": "redo", - "Cmd-Home": "goDocStart", - "Cmd-Up": "goDocStart", - "Cmd-End": "goDocEnd", - "Cmd-Down": "goDocEnd", - "Alt-Left": "goGroupLeft", - "Alt-Right": "goGroupRight", - "Cmd-Left": "goLineLeft", - "Cmd-Right": "goLineRight", - "Alt-Backspace": "delGroupBefore", - "Ctrl-Alt-Backspace": "delGroupAfter", - "Alt-Delete": "delGroupAfter", - "Cmd-S": "save", - "Cmd-F": "find", - "Cmd-G": "findNext", - "Shift-Cmd-G": "findPrev", - "Cmd-Alt-F": "replace", - "Shift-Cmd-Alt-F": "replaceAll", - "Cmd-[": "indentLess", - "Cmd-]": "indentMore", - "Cmd-Backspace": "delWrappedLineLeft", - "Cmd-Delete": "delWrappedLineRight", - "Cmd-U": "undoSelection", - "Shift-Cmd-U": "redoSelection", - "Ctrl-Up": "goDocStart", - "Ctrl-Down": "goDocEnd", - "fallthrough": ["basic", "emacsy"] - }; - keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault; - function normalizeKeyName(name) { - var parts = name.split(/-(?!$)/); - name = parts[parts.length - 1]; - var alt, ctrl, shift, cmd; - for (var i2 = 0; i2 < parts.length - 1; i2++) { - var mod = parts[i2]; - if (/^(cmd|meta|m)$/i.test(mod)) { - cmd = true; - } else if (/^a(lt)?$/i.test(mod)) { - alt = true; - } else if (/^(c|ctrl|control)$/i.test(mod)) { - ctrl = true; - } else if (/^s(hift)?$/i.test(mod)) { - shift = true; - } else { - throw new Error("Unrecognized modifier name: " + mod); - } - } - if (alt) { - name = "Alt-" + name; - } - if (ctrl) { - name = "Ctrl-" + name; - } - if (cmd) { - name = "Cmd-" + name; - } - if (shift) { - name = "Shift-" + name; - } - return name; - } - function normalizeKeyMap(keymap) { - var copy = {}; - for (var keyname in keymap) { - if (keymap.hasOwnProperty(keyname)) { - var value = keymap[keyname]; - if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) { - continue; - } - if (value == "...") { - delete keymap[keyname]; - continue; - } - var keys = map(keyname.split(" "), normalizeKeyName); - for (var i2 = 0; i2 < keys.length; i2++) { - var val = void 0, - name = void 0; - if (i2 == keys.length - 1) { - name = keys.join(" "); - val = value; - } else { - name = keys.slice(0, i2 + 1).join(" "); - val = "..."; - } - var prev = copy[name]; - if (!prev) { - copy[name] = val; - } else if (prev != val) { - throw new Error("Inconsistent bindings for " + name); - } - } - delete keymap[keyname]; - } - } - for (var prop2 in copy) { - keymap[prop2] = copy[prop2]; - } - return keymap; - } - function lookupKey(key, map2, handle, context) { - map2 = getKeyMap(map2); - var found = map2.call ? map2.call(key, context) : map2[key]; - if (found === false) { - return "nothing"; - } - if (found === "...") { - return "multi"; - } - if (found != null && handle(found)) { - return "handled"; - } - if (map2.fallthrough) { - if (Object.prototype.toString.call(map2.fallthrough) != "[object Array]") { - return lookupKey(key, map2.fallthrough, handle, context); - } - for (var i2 = 0; i2 < map2.fallthrough.length; i2++) { - var result = lookupKey(key, map2.fallthrough[i2], handle, context); - if (result) { - return result; - } - } - } - } - function isModifierKey(value) { - var name = typeof value == "string" ? value : keyNames[value.keyCode]; - return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"; - } - function addModifierNames(name, event, noShift) { - var base = name; - if (event.altKey && base != "Alt") { - name = "Alt-" + name; - } - if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") { - name = "Ctrl-" + name; - } - if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") { - name = "Cmd-" + name; - } - if (!noShift && event.shiftKey && base != "Shift") { - name = "Shift-" + name; - } - return name; - } - function keyName(event, noShift) { - if (presto && event.keyCode == 34 && event["char"]) { - return false; - } - var name = keyNames[event.keyCode]; - if (name == null || event.altGraphKey) { - return false; - } - if (event.keyCode == 3 && event.code) { - name = event.code; - } - return addModifierNames(name, event, noShift); - } - function getKeyMap(val) { - return typeof val == "string" ? keyMap[val] : val; - } - function deleteNearSelection(cm, compute) { - var ranges = cm.doc.sel.ranges, - kill = []; - for (var i2 = 0; i2 < ranges.length; i2++) { - var toKill = compute(ranges[i2]); - while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { - var replaced = kill.pop(); - if (cmp(replaced.from, toKill.from) < 0) { - toKill.from = replaced.from; - break; - } - } - kill.push(toKill); - } - runInOp(cm, function () { - for (var i3 = kill.length - 1; i3 >= 0; i3--) { - replaceRange(cm.doc, "", kill[i3].from, kill[i3].to, "+delete"); - } - ensureCursorVisible(cm); - }); - } - function moveCharLogically(line, ch, dir) { - var target = skipExtendingChars(line.text, ch + dir, dir); - return target < 0 || target > line.text.length ? null : target; - } - function moveLogically(line, start, dir) { - var ch = moveCharLogically(line, start.ch, dir); - return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before"); - } - function endOfLine(visually, cm, lineObj, lineNo2, dir) { - if (visually) { - if (cm.doc.direction == "rtl") { - dir = -dir; - } - var order = getOrder(lineObj, cm.doc.direction); - if (order) { - var part = dir < 0 ? lst(order) : order[0]; - var moveInStorageOrder = dir < 0 == (part.level == 1); - var sticky = moveInStorageOrder ? "after" : "before"; - var ch; - if (part.level > 0 || cm.doc.direction == "rtl") { - var prep = prepareMeasureForLine(cm, lineObj); - ch = dir < 0 ? lineObj.text.length - 1 : 0; - var targetTop = measureCharPrepared(cm, prep, ch).top; - ch = findFirst(function (ch2) { - return measureCharPrepared(cm, prep, ch2).top == targetTop; - }, dir < 0 == (part.level == 1) ? part.from : part.to - 1, ch); - if (sticky == "before") { - ch = moveCharLogically(lineObj, ch, 1); - } - } else { - ch = dir < 0 ? part.to : part.from; - } - return new Pos(lineNo2, ch, sticky); - } - } - return new Pos(lineNo2, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after"); - } - function moveVisually(cm, line, start, dir) { - var bidi = getOrder(line, cm.doc.direction); - if (!bidi) { - return moveLogically(line, start, dir); - } - if (start.ch >= line.text.length) { - start.ch = line.text.length; - start.sticky = "before"; - } else if (start.ch <= 0) { - start.ch = 0; - start.sticky = "after"; - } - var partPos = getBidiPartAt(bidi, start.ch, start.sticky), - part = bidi[partPos]; - if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) { - return moveLogically(line, start, dir); - } - var mv = function (pos, dir2) { - return moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir2); - }; - var prep; - var getWrappedLineExtent = function (ch2) { - if (!cm.options.lineWrapping) { - return { - begin: 0, - end: line.text.length - }; - } - prep = prep || prepareMeasureForLine(cm, line); - return wrappedLineExtentChar(cm, line, prep, ch2); - }; - var wrappedLineExtent2 = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch); - if (cm.doc.direction == "rtl" || part.level == 1) { - var moveInStorageOrder = part.level == 1 == dir < 0; - var ch = mv(start, moveInStorageOrder ? 1 : -1); - if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent2.begin : ch <= part.to && ch <= wrappedLineExtent2.end)) { - var sticky = moveInStorageOrder ? "before" : "after"; - return new Pos(start.line, ch, sticky); - } - } - var searchInVisualLine = function (partPos2, dir2, wrappedLineExtent3) { - var getRes = function (ch3, moveInStorageOrder3) { - return moveInStorageOrder3 ? new Pos(start.line, mv(ch3, 1), "before") : new Pos(start.line, ch3, "after"); - }; - for (; partPos2 >= 0 && partPos2 < bidi.length; partPos2 += dir2) { - var part2 = bidi[partPos2]; - var moveInStorageOrder2 = dir2 > 0 == (part2.level != 1); - var ch2 = moveInStorageOrder2 ? wrappedLineExtent3.begin : mv(wrappedLineExtent3.end, -1); - if (part2.from <= ch2 && ch2 < part2.to) { - return getRes(ch2, moveInStorageOrder2); - } - ch2 = moveInStorageOrder2 ? part2.from : mv(part2.to, -1); - if (wrappedLineExtent3.begin <= ch2 && ch2 < wrappedLineExtent3.end) { - return getRes(ch2, moveInStorageOrder2); - } - } - }; - var res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent2); - if (res) { - return res; - } - var nextCh = dir > 0 ? wrappedLineExtent2.end : mv(wrappedLineExtent2.begin, -1); - if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) { - res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh)); - if (res) { - return res; - } - } - return null; - } - var commands = { - selectAll, - singleSelection: function (cm) { - return cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); - }, - killLine: function (cm) { - return deleteNearSelection(cm, function (range2) { - if (range2.empty()) { - var len = getLine(cm.doc, range2.head.line).text.length; - if (range2.head.ch == len && range2.head.line < cm.lastLine()) { - return { - from: range2.head, - to: Pos(range2.head.line + 1, 0) - }; - } else { - return { - from: range2.head, - to: Pos(range2.head.line, len) - }; - } - } else { - return { - from: range2.from(), - to: range2.to() - }; - } - }); - }, - deleteLine: function (cm) { - return deleteNearSelection(cm, function (range2) { - return { - from: Pos(range2.from().line, 0), - to: clipPos(cm.doc, Pos(range2.to().line + 1, 0)) - }; - }); - }, - delLineLeft: function (cm) { - return deleteNearSelection(cm, function (range2) { - return { - from: Pos(range2.from().line, 0), - to: range2.from() - }; - }); - }, - delWrappedLineLeft: function (cm) { - return deleteNearSelection(cm, function (range2) { - var top = cm.charCoords(range2.head, "div").top + 5; - var leftPos = cm.coordsChar({ - left: 0, - top - }, "div"); - return { - from: leftPos, - to: range2.from() - }; - }); - }, - delWrappedLineRight: function (cm) { - return deleteNearSelection(cm, function (range2) { - var top = cm.charCoords(range2.head, "div").top + 5; - var rightPos = cm.coordsChar({ - left: cm.display.lineDiv.offsetWidth + 100, - top - }, "div"); - return { - from: range2.from(), - to: rightPos - }; - }); - }, - undo: function (cm) { - return cm.undo(); - }, - redo: function (cm) { - return cm.redo(); - }, - undoSelection: function (cm) { - return cm.undoSelection(); - }, - redoSelection: function (cm) { - return cm.redoSelection(); - }, - goDocStart: function (cm) { - return cm.extendSelection(Pos(cm.firstLine(), 0)); - }, - goDocEnd: function (cm) { - return cm.extendSelection(Pos(cm.lastLine())); - }, - goLineStart: function (cm) { - return cm.extendSelectionsBy(function (range2) { - return lineStart(cm, range2.head.line); - }, { - origin: "+move", - bias: 1 - }); - }, - goLineStartSmart: function (cm) { - return cm.extendSelectionsBy(function (range2) { - return lineStartSmart(cm, range2.head); - }, { - origin: "+move", - bias: 1 - }); - }, - goLineEnd: function (cm) { - return cm.extendSelectionsBy(function (range2) { - return lineEnd(cm, range2.head.line); - }, { - origin: "+move", - bias: -1 - }); - }, - goLineRight: function (cm) { - return cm.extendSelectionsBy(function (range2) { - var top = cm.cursorCoords(range2.head, "div").top + 5; - return cm.coordsChar({ - left: cm.display.lineDiv.offsetWidth + 100, - top - }, "div"); - }, sel_move); - }, - goLineLeft: function (cm) { - return cm.extendSelectionsBy(function (range2) { - var top = cm.cursorCoords(range2.head, "div").top + 5; - return cm.coordsChar({ - left: 0, - top - }, "div"); - }, sel_move); - }, - goLineLeftSmart: function (cm) { - return cm.extendSelectionsBy(function (range2) { - var top = cm.cursorCoords(range2.head, "div").top + 5; - var pos = cm.coordsChar({ - left: 0, - top - }, "div"); - if (pos.ch < cm.getLine(pos.line).search(/\S/)) { - return lineStartSmart(cm, range2.head); - } - return pos; - }, sel_move); - }, - goLineUp: function (cm) { - return cm.moveV(-1, "line"); - }, - goLineDown: function (cm) { - return cm.moveV(1, "line"); - }, - goPageUp: function (cm) { - return cm.moveV(-1, "page"); - }, - goPageDown: function (cm) { - return cm.moveV(1, "page"); - }, - goCharLeft: function (cm) { - return cm.moveH(-1, "char"); - }, - goCharRight: function (cm) { - return cm.moveH(1, "char"); - }, - goColumnLeft: function (cm) { - return cm.moveH(-1, "column"); - }, - goColumnRight: function (cm) { - return cm.moveH(1, "column"); - }, - goWordLeft: function (cm) { - return cm.moveH(-1, "word"); - }, - goGroupRight: function (cm) { - return cm.moveH(1, "group"); - }, - goGroupLeft: function (cm) { - return cm.moveH(-1, "group"); - }, - goWordRight: function (cm) { - return cm.moveH(1, "word"); - }, - delCharBefore: function (cm) { - return cm.deleteH(-1, "codepoint"); - }, - delCharAfter: function (cm) { - return cm.deleteH(1, "char"); - }, - delWordBefore: function (cm) { - return cm.deleteH(-1, "word"); - }, - delWordAfter: function (cm) { - return cm.deleteH(1, "word"); - }, - delGroupBefore: function (cm) { - return cm.deleteH(-1, "group"); - }, - delGroupAfter: function (cm) { - return cm.deleteH(1, "group"); - }, - indentAuto: function (cm) { - return cm.indentSelection("smart"); - }, - indentMore: function (cm) { - return cm.indentSelection("add"); - }, - indentLess: function (cm) { - return cm.indentSelection("subtract"); - }, - insertTab: function (cm) { - return cm.replaceSelection(" "); - }, - insertSoftTab: function (cm) { - var spaces = [], - ranges = cm.listSelections(), - tabSize = cm.options.tabSize; - for (var i2 = 0; i2 < ranges.length; i2++) { - var pos = ranges[i2].from(); - var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize); - spaces.push(spaceStr(tabSize - col % tabSize)); - } - cm.replaceSelections(spaces); - }, - defaultTab: function (cm) { - if (cm.somethingSelected()) { - cm.indentSelection("add"); - } else { - cm.execCommand("insertTab"); - } - }, - // Swap the two chars left and right of each selection's head. - // Move cursor behind the two swapped characters afterwards. - // - // Doesn't consider line feeds a character. - // Doesn't scan more than one line above to find a character. - // Doesn't do anything on an empty line. - // Doesn't do anything with non-empty selections. - transposeChars: function (cm) { - return runInOp(cm, function () { - var ranges = cm.listSelections(), - newSel = []; - for (var i2 = 0; i2 < ranges.length; i2++) { - if (!ranges[i2].empty()) { - continue; - } - var cur = ranges[i2].head, - line = getLine(cm.doc, cur.line).text; - if (line) { - if (cur.ch == line.length) { - cur = new Pos(cur.line, cur.ch - 1); - } - if (cur.ch > 0) { - cur = new Pos(cur.line, cur.ch + 1); - cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), Pos(cur.line, cur.ch - 2), cur, "+transpose"); - } else if (cur.line > cm.doc.first) { - var prev = getLine(cm.doc, cur.line - 1).text; - if (prev) { - cur = new Pos(cur.line, 1); - cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() + prev.charAt(prev.length - 1), Pos(cur.line - 1, prev.length - 1), cur, "+transpose"); - } - } - } - newSel.push(new Range(cur, cur)); - } - cm.setSelections(newSel); - }); - }, - newlineAndIndent: function (cm) { - return runInOp(cm, function () { - var sels = cm.listSelections(); - for (var i2 = sels.length - 1; i2 >= 0; i2--) { - cm.replaceRange(cm.doc.lineSeparator(), sels[i2].anchor, sels[i2].head, "+input"); - } - sels = cm.listSelections(); - for (var i$12 = 0; i$12 < sels.length; i$12++) { - cm.indentLine(sels[i$12].from().line, null, true); - } - ensureCursorVisible(cm); - }); - }, - openLine: function (cm) { - return cm.replaceSelection("\n", "start"); - }, - toggleOverwrite: function (cm) { - return cm.toggleOverwrite(); - } - }; - function lineStart(cm, lineN) { - var line = getLine(cm.doc, lineN); - var visual = visualLine(line); - if (visual != line) { - lineN = lineNo(visual); - } - return endOfLine(true, cm, visual, lineN, 1); - } - function lineEnd(cm, lineN) { - var line = getLine(cm.doc, lineN); - var visual = visualLineEnd(line); - if (visual != line) { - lineN = lineNo(visual); - } - return endOfLine(true, cm, line, lineN, -1); - } - function lineStartSmart(cm, pos) { - var start = lineStart(cm, pos.line); - var line = getLine(cm.doc, start.line); - var order = getOrder(line, cm.doc.direction); - if (!order || order[0].level == 0) { - var firstNonWS = Math.max(start.ch, line.text.search(/\S/)); - var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch; - return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky); - } - return start; - } - function doHandleBinding(cm, bound, dropShift) { - if (typeof bound == "string") { - bound = commands[bound]; - if (!bound) { - return false; - } - } - cm.display.input.ensurePolled(); - var prevShift = cm.display.shift, - done = false; - try { - if (cm.isReadOnly()) { - cm.state.suppressEdits = true; - } - if (dropShift) { - cm.display.shift = false; - } - done = bound(cm) != Pass; - } finally { - cm.display.shift = prevShift; - cm.state.suppressEdits = false; - } - return done; - } - function lookupKeyForEditor(cm, name, handle) { - for (var i2 = 0; i2 < cm.state.keyMaps.length; i2++) { - var result = lookupKey(name, cm.state.keyMaps[i2], handle, cm); - if (result) { - return result; - } - } - return cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm) || lookupKey(name, cm.options.keyMap, handle, cm); - } - var stopSeq = new Delayed(); - function dispatchKey(cm, name, e, handle) { - var seq = cm.state.keySeq; - if (seq) { - if (isModifierKey(name)) { - return "handled"; - } - if (/\'$/.test(name)) { - cm.state.keySeq = null; - } else { - stopSeq.set(50, function () { - if (cm.state.keySeq == seq) { - cm.state.keySeq = null; - cm.display.input.reset(); - } - }); - } - if (dispatchKeyInner(cm, seq + " " + name, e, handle)) { - return true; - } - } - return dispatchKeyInner(cm, name, e, handle); - } - function dispatchKeyInner(cm, name, e, handle) { - var result = lookupKeyForEditor(cm, name, handle); - if (result == "multi") { - cm.state.keySeq = name; - } - if (result == "handled") { - signalLater(cm, "keyHandled", cm, name, e); - } - if (result == "handled" || result == "multi") { - e_preventDefault(e); - restartBlink(cm); - } - return !!result; - } - function handleKeyBinding(cm, e) { - var name = keyName(e, true); - if (!name) { - return false; - } - if (e.shiftKey && !cm.state.keySeq) { - return dispatchKey(cm, "Shift-" + name, e, function (b) { - return doHandleBinding(cm, b, true); - }) || dispatchKey(cm, name, e, function (b) { - if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion) { - return doHandleBinding(cm, b); - } - }); - } else { - return dispatchKey(cm, name, e, function (b) { - return doHandleBinding(cm, b); - }); - } - } - function handleCharBinding(cm, e, ch) { - return dispatchKey(cm, "'" + ch + "'", e, function (b) { - return doHandleBinding(cm, b, true); - }); - } - var lastStoppedKey = null; - function onKeyDown(e) { - var cm = this; - if (e.target && e.target != cm.display.input.getField()) { - return; - } - cm.curOp.focus = activeElt(); - if (signalDOMEvent(cm, e)) { - return; - } - if (ie && ie_version < 11 && e.keyCode == 27) { - e.returnValue = false; - } - var code = e.keyCode; - cm.display.shift = code == 16 || e.shiftKey; - var handled = handleKeyBinding(cm, e); - if (presto) { - lastStoppedKey = handled ? code : null; - if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)) { - cm.replaceSelection("", null, "cut"); - } - } - if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand) { - document.execCommand("cut"); - } - if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className)) { - showCrossHair(cm); - } - } - function showCrossHair(cm) { - var lineDiv = cm.display.lineDiv; - addClass(lineDiv, "CodeMirror-crosshair"); - function up(e) { - if (e.keyCode == 18 || !e.altKey) { - rmClass(lineDiv, "CodeMirror-crosshair"); - off(document, "keyup", up); - off(document, "mouseover", up); - } - } - on(document, "keyup", up); - on(document, "mouseover", up); - } - function onKeyUp(e) { - if (e.keyCode == 16) { - this.doc.sel.shift = false; - } - signalDOMEvent(this, e); - } - function onKeyPress(e) { - var cm = this; - if (e.target && e.target != cm.display.input.getField()) { - return; - } - if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) { - return; - } - var keyCode = e.keyCode, - charCode = e.charCode; - if (presto && keyCode == lastStoppedKey) { - lastStoppedKey = null; - e_preventDefault(e); - return; - } - if (presto && (!e.which || e.which < 10) && handleKeyBinding(cm, e)) { - return; - } - var ch = String.fromCharCode(charCode == null ? keyCode : charCode); - if (ch == "\b") { - return; - } - if (handleCharBinding(cm, e, ch)) { - return; - } - cm.display.input.onKeyPress(e); - } - var DOUBLECLICK_DELAY = 400; - var PastClick = function (time, pos, button) { - this.time = time; - this.pos = pos; - this.button = button; - }; - PastClick.prototype.compare = function (time, pos, button) { - return this.time + DOUBLECLICK_DELAY > time && cmp(pos, this.pos) == 0 && button == this.button; - }; - var lastClick, lastDoubleClick; - function clickRepeat(pos, button) { - var now = + /* @__PURE__ */new Date(); - if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) { - lastClick = lastDoubleClick = null; - return "triple"; - } else if (lastClick && lastClick.compare(now, pos, button)) { - lastDoubleClick = new PastClick(now, pos, button); - lastClick = null; - return "double"; - } else { - lastClick = new PastClick(now, pos, button); - lastDoubleClick = null; - return "single"; - } - } - function onMouseDown(e) { - var cm = this, - display = cm.display; - if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) { - return; - } - display.input.ensurePolled(); - display.shift = e.shiftKey; - if (eventInWidget(display, e)) { - if (!webkit) { - display.scroller.draggable = false; - setTimeout(function () { - return display.scroller.draggable = true; - }, 100); - } - return; - } - if (clickInGutter(cm, e)) { - return; - } - var pos = posFromMouse(cm, e), - button = e_button(e), - repeat = pos ? clickRepeat(pos, button) : "single"; - window.focus(); - if (button == 1 && cm.state.selectingText) { - cm.state.selectingText(e); - } - if (pos && handleMappedButton(cm, button, pos, repeat, e)) { - return; - } - if (button == 1) { - if (pos) { - leftButtonDown(cm, pos, repeat, e); - } else if (e_target(e) == display.scroller) { - e_preventDefault(e); - } - } else if (button == 2) { - if (pos) { - extendSelection(cm.doc, pos); - } - setTimeout(function () { - return display.input.focus(); - }, 20); - } else if (button == 3) { - if (captureRightClick) { - cm.display.input.onContextMenu(e); - } else { - delayBlurEvent(cm); - } - } - } - function handleMappedButton(cm, button, pos, repeat, event) { - var name = "Click"; - if (repeat == "double") { - name = "Double" + name; - } else if (repeat == "triple") { - name = "Triple" + name; - } - name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name; - return dispatchKey(cm, addModifierNames(name, event), event, function (bound) { - if (typeof bound == "string") { - bound = commands[bound]; - } - if (!bound) { - return false; - } - var done = false; - try { - if (cm.isReadOnly()) { - cm.state.suppressEdits = true; - } - done = bound(cm, pos) != Pass; - } finally { - cm.state.suppressEdits = false; - } - return done; - }); - } - function configureMouse(cm, repeat, event) { - var option = cm.getOption("configureMouse"); - var value = option ? option(cm, repeat, event) : {}; - if (value.unit == null) { - var rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey; - value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line"; - } - if (value.extend == null || cm.doc.extend) { - value.extend = cm.doc.extend || event.shiftKey; - } - if (value.addNew == null) { - value.addNew = mac ? event.metaKey : event.ctrlKey; - } - if (value.moveOnDrag == null) { - value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey); - } - return value; - } - function leftButtonDown(cm, pos, repeat, event) { - if (ie) { - setTimeout(bind(ensureFocus, cm), 0); - } else { - cm.curOp.focus = activeElt(); - } - var behavior = configureMouse(cm, repeat, event); - var sel = cm.doc.sel, - contained; - if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() && repeat == "single" && (contained = sel.contains(pos)) > -1 && (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) && (cmp(contained.to(), pos) > 0 || pos.xRel < 0)) { - leftButtonStartDrag(cm, event, pos, behavior); - } else { - leftButtonSelect(cm, event, pos, behavior); - } - } - function leftButtonStartDrag(cm, event, pos, behavior) { - var display = cm.display, - moved = false; - var dragEnd = operation(cm, function (e) { - if (webkit) { - display.scroller.draggable = false; - } - cm.state.draggingText = false; - if (cm.state.delayingBlurEvent) { - if (cm.hasFocus()) { - cm.state.delayingBlurEvent = false; - } else { - delayBlurEvent(cm); - } - } - off(display.wrapper.ownerDocument, "mouseup", dragEnd); - off(display.wrapper.ownerDocument, "mousemove", mouseMove); - off(display.scroller, "dragstart", dragStart); - off(display.scroller, "drop", dragEnd); - if (!moved) { - e_preventDefault(e); - if (!behavior.addNew) { - extendSelection(cm.doc, pos, null, null, behavior.extend); - } - if (webkit && !safari || ie && ie_version == 9) { - setTimeout(function () { - display.wrapper.ownerDocument.body.focus({ - preventScroll: true - }); - display.input.focus(); - }, 20); - } else { - display.input.focus(); - } - } - }); - var mouseMove = function (e2) { - moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10; - }; - var dragStart = function () { - return moved = true; - }; - if (webkit) { - display.scroller.draggable = true; - } - cm.state.draggingText = dragEnd; - dragEnd.copy = !behavior.moveOnDrag; - on(display.wrapper.ownerDocument, "mouseup", dragEnd); - on(display.wrapper.ownerDocument, "mousemove", mouseMove); - on(display.scroller, "dragstart", dragStart); - on(display.scroller, "drop", dragEnd); - cm.state.delayingBlurEvent = true; - setTimeout(function () { - return display.input.focus(); - }, 20); - if (display.scroller.dragDrop) { - display.scroller.dragDrop(); - } - } - function rangeForUnit(cm, pos, unit) { - if (unit == "char") { - return new Range(pos, pos); - } - if (unit == "word") { - return cm.findWordAt(pos); - } - if (unit == "line") { - return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); - } - var result = unit(cm, pos); - return new Range(result.from, result.to); - } - function leftButtonSelect(cm, event, start, behavior) { - if (ie) { - delayBlurEvent(cm); - } - var display = cm.display, - doc = cm.doc; - e_preventDefault(event); - var ourRange, - ourIndex, - startSel = doc.sel, - ranges = startSel.ranges; - if (behavior.addNew && !behavior.extend) { - ourIndex = doc.sel.contains(start); - if (ourIndex > -1) { - ourRange = ranges[ourIndex]; - } else { - ourRange = new Range(start, start); - } - } else { - ourRange = doc.sel.primary(); - ourIndex = doc.sel.primIndex; - } - if (behavior.unit == "rectangle") { - if (!behavior.addNew) { - ourRange = new Range(start, start); - } - start = posFromMouse(cm, event, true, true); - ourIndex = -1; - } else { - var range2 = rangeForUnit(cm, start, behavior.unit); - if (behavior.extend) { - ourRange = extendRange(ourRange, range2.anchor, range2.head, behavior.extend); - } else { - ourRange = range2; - } - } - if (!behavior.addNew) { - ourIndex = 0; - setSelection(doc, new Selection([ourRange], 0), sel_mouse); - startSel = doc.sel; - } else if (ourIndex == -1) { - ourIndex = ranges.length; - setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex), { - scroll: false, - origin: "*mouse" - }); - } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) { - setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0), { - scroll: false, - origin: "*mouse" - }); - startSel = doc.sel; - } else { - replaceOneSelection(doc, ourIndex, ourRange, sel_mouse); - } - var lastPos = start; - function extendTo(pos) { - if (cmp(lastPos, pos) == 0) { - return; - } - lastPos = pos; - if (behavior.unit == "rectangle") { - var ranges2 = [], - tabSize = cm.options.tabSize; - var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize); - var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize); - var left = Math.min(startCol, posCol), - right = Math.max(startCol, posCol); - for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); line <= end; line++) { - var text = getLine(doc, line).text, - leftPos = findColumn(text, left, tabSize); - if (left == right) { - ranges2.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); - } else if (text.length > leftPos) { - ranges2.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); - } - } - if (!ranges2.length) { - ranges2.push(new Range(start, start)); - } - setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges2), ourIndex), { - origin: "*mouse", - scroll: false - }); - cm.scrollIntoView(pos); - } else { - var oldRange = ourRange; - var range3 = rangeForUnit(cm, pos, behavior.unit); - var anchor = oldRange.anchor, - head; - if (cmp(range3.anchor, anchor) > 0) { - head = range3.head; - anchor = minPos(oldRange.from(), range3.anchor); - } else { - head = range3.anchor; - anchor = maxPos(oldRange.to(), range3.head); - } - var ranges$1 = startSel.ranges.slice(0); - ranges$1[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head)); - setSelection(doc, normalizeSelection(cm, ranges$1, ourIndex), sel_mouse); - } - } - var editorSize = display.wrapper.getBoundingClientRect(); - var counter = 0; - function extend(e) { - var curCount = ++counter; - var cur = posFromMouse(cm, e, true, behavior.unit == "rectangle"); - if (!cur) { - return; - } - if (cmp(cur, lastPos) != 0) { - cm.curOp.focus = activeElt(); - extendTo(cur); - var visible = visibleLines(display, doc); - if (cur.line >= visible.to || cur.line < visible.from) { - setTimeout(operation(cm, function () { - if (counter == curCount) { - extend(e); - } - }), 150); - } - } else { - var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0; - if (outside) { - setTimeout(operation(cm, function () { - if (counter != curCount) { - return; - } - display.scroller.scrollTop += outside; - extend(e); - }), 50); - } - } - } - function done(e) { - cm.state.selectingText = false; - counter = Infinity; - if (e) { - e_preventDefault(e); - display.input.focus(); - } - off(display.wrapper.ownerDocument, "mousemove", move); - off(display.wrapper.ownerDocument, "mouseup", up); - doc.history.lastSelOrigin = null; - } - var move = operation(cm, function (e) { - if (e.buttons === 0 || !e_button(e)) { - done(e); - } else { - extend(e); - } - }); - var up = operation(cm, done); - cm.state.selectingText = up; - on(display.wrapper.ownerDocument, "mousemove", move); - on(display.wrapper.ownerDocument, "mouseup", up); - } - function bidiSimplify(cm, range2) { - var anchor = range2.anchor; - var head = range2.head; - var anchorLine = getLine(cm.doc, anchor.line); - if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) { - return range2; - } - var order = getOrder(anchorLine); - if (!order) { - return range2; - } - var index = getBidiPartAt(order, anchor.ch, anchor.sticky), - part = order[index]; - if (part.from != anchor.ch && part.to != anchor.ch) { - return range2; - } - var boundary = index + (part.from == anchor.ch == (part.level != 1) ? 0 : 1); - if (boundary == 0 || boundary == order.length) { - return range2; - } - var leftSide; - if (head.line != anchor.line) { - leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0; - } else { - var headIndex = getBidiPartAt(order, head.ch, head.sticky); - var dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1); - if (headIndex == boundary - 1 || headIndex == boundary) { - leftSide = dir < 0; - } else { - leftSide = dir > 0; - } - } - var usePart = order[boundary + (leftSide ? -1 : 0)]; - var from = leftSide == (usePart.level == 1); - var ch = from ? usePart.from : usePart.to, - sticky = from ? "after" : "before"; - return anchor.ch == ch && anchor.sticky == sticky ? range2 : new Range(new Pos(anchor.line, ch, sticky), head); - } - function gutterEvent(cm, e, type, prevent) { - var mX, mY; - if (e.touches) { - mX = e.touches[0].clientX; - mY = e.touches[0].clientY; - } else { - try { - mX = e.clientX; - mY = e.clientY; - } catch (e$1) { - return false; - } - } - if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) { - return false; - } - if (prevent) { - e_preventDefault(e); - } - var display = cm.display; - var lineBox = display.lineDiv.getBoundingClientRect(); - if (mY > lineBox.bottom || !hasHandler(cm, type)) { - return e_defaultPrevented(e); - } - mY -= lineBox.top - display.viewOffset; - for (var i2 = 0; i2 < cm.display.gutterSpecs.length; ++i2) { - var g = display.gutters.childNodes[i2]; - if (g && g.getBoundingClientRect().right >= mX) { - var line = lineAtHeight(cm.doc, mY); - var gutter = cm.display.gutterSpecs[i2]; - signal(cm, type, cm, line, gutter.className, e); - return e_defaultPrevented(e); - } - } - } - function clickInGutter(cm, e) { - return gutterEvent(cm, e, "gutterClick", true); - } - function onContextMenu(cm, e) { - if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) { - return; - } - if (signalDOMEvent(cm, e, "contextmenu")) { - return; - } - if (!captureRightClick) { - cm.display.input.onContextMenu(e); - } - } - function contextMenuInGutter(cm, e) { - if (!hasHandler(cm, "gutterContextMenu")) { - return false; - } - return gutterEvent(cm, e, "gutterContextMenu", false); - } - function themeChanged(cm) { - cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") + cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-"); - clearCaches(cm); - } - var Init = { - toString: function () { - return "CodeMirror.Init"; - } - }; - var defaults = {}; - var optionHandlers = {}; - function defineOptions(CodeMirror2) { - var optionHandlers2 = CodeMirror2.optionHandlers; - function option(name, deflt, handle, notOnInit) { - CodeMirror2.defaults[name] = deflt; - if (handle) { - optionHandlers2[name] = notOnInit ? function (cm, val, old) { - if (old != Init) { - handle(cm, val, old); - } - } : handle; - } - } - CodeMirror2.defineOption = option; - CodeMirror2.Init = Init; - option("value", "", function (cm, val) { - return cm.setValue(val); - }, true); - option("mode", null, function (cm, val) { - cm.doc.modeOption = val; - loadMode(cm); - }, true); - option("indentUnit", 2, loadMode, true); - option("indentWithTabs", false); - option("smartIndent", true); - option("tabSize", 4, function (cm) { - resetModeState(cm); - clearCaches(cm); - regChange(cm); - }, true); - option("lineSeparator", null, function (cm, val) { - cm.doc.lineSep = val; - if (!val) { - return; - } - var newBreaks = [], - lineNo2 = cm.doc.first; - cm.doc.iter(function (line) { - for (var pos = 0;;) { - var found = line.text.indexOf(val, pos); - if (found == -1) { - break; - } - pos = found + val.length; - newBreaks.push(Pos(lineNo2, found)); - } - lineNo2++; - }); - for (var i2 = newBreaks.length - 1; i2 >= 0; i2--) { - replaceRange(cm.doc, val, newBreaks[i2], Pos(newBreaks[i2].line, newBreaks[i2].ch + val.length)); - } - }); - option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { - cm.state.specialChars = new RegExp(val.source + (val.test(" ") ? "" : "| "), "g"); - if (old != Init) { - cm.refresh(); - } - }); - option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function (cm) { - return cm.refresh(); - }, true); - option("electricChars", true); - option("inputStyle", mobile ? "contenteditable" : "textarea", function () { - throw new Error("inputStyle can not (yet) be changed in a running editor"); - }, true); - option("spellcheck", false, function (cm, val) { - return cm.getInputField().spellcheck = val; - }, true); - option("autocorrect", false, function (cm, val) { - return cm.getInputField().autocorrect = val; - }, true); - option("autocapitalize", false, function (cm, val) { - return cm.getInputField().autocapitalize = val; - }, true); - option("rtlMoveVisually", !windows); - option("wholeLineUpdateBefore", true); - option("theme", "default", function (cm) { - themeChanged(cm); - updateGutters(cm); - }, true); - option("keyMap", "default", function (cm, val, old) { - var next = getKeyMap(val); - var prev = old != Init && getKeyMap(old); - if (prev && prev.detach) { - prev.detach(cm, next); - } - if (next.attach) { - next.attach(cm, prev || null); - } - }); - option("extraKeys", null); - option("configureMouse", null); - option("lineWrapping", false, wrappingChanged, true); - option("gutters", [], function (cm, val) { - cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers); - updateGutters(cm); - }, true); - option("fixedGutter", true, function (cm, val) { - cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"; - cm.refresh(); - }, true); - option("coverGutterNextToScrollbar", false, function (cm) { - return updateScrollbars(cm); - }, true); - option("scrollbarStyle", "native", function (cm) { - initScrollbars(cm); - updateScrollbars(cm); - cm.display.scrollbars.setScrollTop(cm.doc.scrollTop); - cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft); - }, true); - option("lineNumbers", false, function (cm, val) { - cm.display.gutterSpecs = getGutters(cm.options.gutters, val); - updateGutters(cm); - }, true); - option("firstLineNumber", 1, updateGutters, true); - option("lineNumberFormatter", function (integer) { - return integer; - }, updateGutters, true); - option("showCursorWhenSelecting", false, updateSelection, true); - option("resetSelectionOnContextMenu", true); - option("lineWiseCopyCut", true); - option("pasteLinesPerSelection", true); - option("selectionsMayTouch", false); - option("readOnly", false, function (cm, val) { - if (val == "nocursor") { - onBlur(cm); - cm.display.input.blur(); - } - cm.display.input.readOnlyChanged(val); - }); - option("screenReaderLabel", null, function (cm, val) { - val = val === "" ? null : val; - cm.display.input.screenReaderLabelChanged(val); - }); - option("disableInput", false, function (cm, val) { - if (!val) { - cm.display.input.reset(); - } - }, true); - option("dragDrop", true, dragDropChanged); - option("allowDropFileTypes", null); - option("cursorBlinkRate", 530); - option("cursorScrollMargin", 0); - option("cursorHeight", 1, updateSelection, true); - option("singleCursorHeightPerLine", true, updateSelection, true); - option("workTime", 100); - option("workDelay", 100); - option("flattenSpans", true, resetModeState, true); - option("addModeClass", false, resetModeState, true); - option("pollInterval", 100); - option("undoDepth", 200, function (cm, val) { - return cm.doc.history.undoDepth = val; - }); - option("historyEventDelay", 1250); - option("viewportMargin", 10, function (cm) { - return cm.refresh(); - }, true); - option("maxHighlightLength", 1e4, resetModeState, true); - option("moveInputWithCursor", true, function (cm, val) { - if (!val) { - cm.display.input.resetPosition(); - } - }); - option("tabindex", null, function (cm, val) { - return cm.display.input.getField().tabIndex = val || ""; - }); - option("autofocus", null); - option("direction", "ltr", function (cm, val) { - return cm.doc.setDirection(val); - }, true); - option("phrases", null); - } - function dragDropChanged(cm, value, old) { - var wasOn = old && old != Init; - if (!value != !wasOn) { - var funcs = cm.display.dragFunctions; - var toggle = value ? on : off; - toggle(cm.display.scroller, "dragstart", funcs.start); - toggle(cm.display.scroller, "dragenter", funcs.enter); - toggle(cm.display.scroller, "dragover", funcs.over); - toggle(cm.display.scroller, "dragleave", funcs.leave); - toggle(cm.display.scroller, "drop", funcs.drop); - } - } - function wrappingChanged(cm) { - if (cm.options.lineWrapping) { - addClass(cm.display.wrapper, "CodeMirror-wrap"); - cm.display.sizer.style.minWidth = ""; - cm.display.sizerWidth = null; - } else { - rmClass(cm.display.wrapper, "CodeMirror-wrap"); - findMaxLine(cm); - } - estimateLineHeights(cm); - regChange(cm); - clearCaches(cm); - setTimeout(function () { - return updateScrollbars(cm); - }, 100); - } - function CodeMirror(place, options) { - var this$1$1 = this; - if (!(this instanceof CodeMirror)) { - return new CodeMirror(place, options); - } - this.options = options = options ? copyObj(options) : {}; - copyObj(defaults, options, false); - var doc = options.value; - if (typeof doc == "string") { - doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction); - } else if (options.mode) { - doc.modeOption = options.mode; - } - this.doc = doc; - var input = new CodeMirror.inputStyles[options.inputStyle](this); - var display = this.display = new Display(place, doc, input, options); - display.wrapper.CodeMirror = this; - themeChanged(this); - if (options.lineWrapping) { - this.display.wrapper.className += " CodeMirror-wrap"; - } - initScrollbars(this); - this.state = { - keyMaps: [], - // stores maps added by addKeyMap - overlays: [], - // highlighting overlays, as added by addOverlay - modeGen: 0, - // bumped when mode/overlay changes, used to invalidate highlighting info - overwrite: false, - delayingBlurEvent: false, - focused: false, - suppressEdits: false, - // used to disable editing during key handlers when in readOnly mode - pasteIncoming: -1, - cutIncoming: -1, - // help recognize paste/cut edits in input.poll - selectingText: false, - draggingText: false, - highlight: new Delayed(), - // stores highlight worker timeout - keySeq: null, - // Unfinished key sequence - specialChars: null - }; - if (options.autofocus && !mobile) { - display.input.focus(); - } - if (ie && ie_version < 11) { - setTimeout(function () { - return this$1$1.display.input.reset(true); - }, 20); - } - registerEventHandlers(this); - ensureGlobalHandlers(); - startOperation(this); - this.curOp.forceUpdate = true; - attachDoc(this, doc); - if (options.autofocus && !mobile || this.hasFocus()) { - setTimeout(function () { - if (this$1$1.hasFocus() && !this$1$1.state.focused) { - onFocus(this$1$1); - } - }, 20); - } else { - onBlur(this); - } - for (var opt in optionHandlers) { - if (optionHandlers.hasOwnProperty(opt)) { - optionHandlers[opt](this, options[opt], Init); - } - } - maybeUpdateLineNumberWidth(this); - if (options.finishInit) { - options.finishInit(this); - } - for (var i2 = 0; i2 < initHooks.length; ++i2) { - initHooks[i2](this); - } - endOperation(this); - if (webkit && options.lineWrapping && getComputedStyle(display.lineDiv).textRendering == "optimizelegibility") { - display.lineDiv.style.textRendering = "auto"; - } - } - CodeMirror.defaults = defaults; - CodeMirror.optionHandlers = optionHandlers; - function registerEventHandlers(cm) { - var d = cm.display; - on(d.scroller, "mousedown", operation(cm, onMouseDown)); - if (ie && ie_version < 11) { - on(d.scroller, "dblclick", operation(cm, function (e) { - if (signalDOMEvent(cm, e)) { - return; - } - var pos = posFromMouse(cm, e); - if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) { - return; - } - e_preventDefault(e); - var word = cm.findWordAt(pos); - extendSelection(cm.doc, word.anchor, word.head); - })); - } else { - on(d.scroller, "dblclick", function (e) { - return signalDOMEvent(cm, e) || e_preventDefault(e); - }); - } - on(d.scroller, "contextmenu", function (e) { - return onContextMenu(cm, e); - }); - on(d.input.getField(), "contextmenu", function (e) { - if (!d.scroller.contains(e.target)) { - onContextMenu(cm, e); - } - }); - var touchFinished, - prevTouch = { - end: 0 - }; - function finishTouch() { - if (d.activeTouch) { - touchFinished = setTimeout(function () { - return d.activeTouch = null; - }, 1e3); - prevTouch = d.activeTouch; - prevTouch.end = + /* @__PURE__ */new Date(); - } - } - function isMouseLikeTouchEvent(e) { - if (e.touches.length != 1) { - return false; - } - var touch = e.touches[0]; - return touch.radiusX <= 1 && touch.radiusY <= 1; - } - function farAway(touch, other) { - if (other.left == null) { - return true; - } - var dx = other.left - touch.left, - dy = other.top - touch.top; - return dx * dx + dy * dy > 20 * 20; - } - on(d.scroller, "touchstart", function (e) { - if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) { - d.input.ensurePolled(); - clearTimeout(touchFinished); - var now = + /* @__PURE__ */new Date(); - d.activeTouch = { - start: now, - moved: false, - prev: now - prevTouch.end <= 300 ? prevTouch : null - }; - if (e.touches.length == 1) { - d.activeTouch.left = e.touches[0].pageX; - d.activeTouch.top = e.touches[0].pageY; - } - } - }); - on(d.scroller, "touchmove", function () { - if (d.activeTouch) { - d.activeTouch.moved = true; - } - }); - on(d.scroller, "touchend", function (e) { - var touch = d.activeTouch; - if (touch && !eventInWidget(d, e) && touch.left != null && !touch.moved && /* @__PURE__ */new Date() - touch.start < 300) { - var pos = cm.coordsChar(d.activeTouch, "page"), - range2; - if (!touch.prev || farAway(touch, touch.prev)) { - range2 = new Range(pos, pos); - } else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) { - range2 = cm.findWordAt(pos); - } else { - range2 = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0))); - } - cm.setSelection(range2.anchor, range2.head); - cm.focus(); - e_preventDefault(e); - } - finishTouch(); - }); - on(d.scroller, "touchcancel", finishTouch); - on(d.scroller, "scroll", function () { - if (d.scroller.clientHeight) { - updateScrollTop(cm, d.scroller.scrollTop); - setScrollLeft(cm, d.scroller.scrollLeft, true); - signal(cm, "scroll", cm); - } - }); - on(d.scroller, "mousewheel", function (e) { - return onScrollWheel(cm, e); - }); - on(d.scroller, "DOMMouseScroll", function (e) { - return onScrollWheel(cm, e); - }); - on(d.wrapper, "scroll", function () { - return d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; - }); - d.dragFunctions = { - enter: function (e) { - if (!signalDOMEvent(cm, e)) { - e_stop(e); - } - }, - over: function (e) { - if (!signalDOMEvent(cm, e)) { - onDragOver(cm, e); - e_stop(e); - } - }, - start: function (e) { - return onDragStart(cm, e); - }, - drop: operation(cm, onDrop), - leave: function (e) { - if (!signalDOMEvent(cm, e)) { - clearDragCursor(cm); - } - } - }; - var inp = d.input.getField(); - on(inp, "keyup", function (e) { - return onKeyUp.call(cm, e); - }); - on(inp, "keydown", operation(cm, onKeyDown)); - on(inp, "keypress", operation(cm, onKeyPress)); - on(inp, "focus", function (e) { - return onFocus(cm, e); - }); - on(inp, "blur", function (e) { - return onBlur(cm, e); - }); - } - var initHooks = []; - CodeMirror.defineInitHook = function (f) { - return initHooks.push(f); - }; - function indentLine(cm, n, how, aggressive) { - var doc = cm.doc, - state; - if (how == null) { - how = "add"; - } - if (how == "smart") { - if (!doc.mode.indent) { - how = "prev"; - } else { - state = getContextBefore(cm, n).state; - } - } - var tabSize = cm.options.tabSize; - var line = getLine(doc, n), - curSpace = countColumn(line.text, null, tabSize); - if (line.stateAfter) { - line.stateAfter = null; - } - var curSpaceString = line.text.match(/^\s*/)[0], - indentation; - if (!aggressive && !/\S/.test(line.text)) { - indentation = 0; - how = "not"; - } else if (how == "smart") { - indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text); - if (indentation == Pass || indentation > 150) { - if (!aggressive) { - return; - } - how = "prev"; - } - } - if (how == "prev") { - if (n > doc.first) { - indentation = countColumn(getLine(doc, n - 1).text, null, tabSize); - } else { - indentation = 0; - } - } else if (how == "add") { - indentation = curSpace + cm.options.indentUnit; - } else if (how == "subtract") { - indentation = curSpace - cm.options.indentUnit; - } else if (typeof how == "number") { - indentation = curSpace + how; - } - indentation = Math.max(0, indentation); - var indentString = "", - pos = 0; - if (cm.options.indentWithTabs) { - for (var i2 = Math.floor(indentation / tabSize); i2; --i2) { - pos += tabSize; - indentString += " "; - } - } - if (pos < indentation) { - indentString += spaceStr(indentation - pos); - } - if (indentString != curSpaceString) { - replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input"); - line.stateAfter = null; - return true; - } else { - for (var i$12 = 0; i$12 < doc.sel.ranges.length; i$12++) { - var range2 = doc.sel.ranges[i$12]; - if (range2.head.line == n && range2.head.ch < curSpaceString.length) { - var pos$1 = Pos(n, curSpaceString.length); - replaceOneSelection(doc, i$12, new Range(pos$1, pos$1)); - break; - } - } - } - } - var lastCopied = null; - function setLastCopied(newLastCopied) { - lastCopied = newLastCopied; - } - function applyTextInput(cm, inserted, deleted, sel, origin) { - var doc = cm.doc; - cm.display.shift = false; - if (!sel) { - sel = doc.sel; - } - var recent = + /* @__PURE__ */new Date() - 200; - var paste = origin == "paste" || cm.state.pasteIncoming > recent; - var textLines = splitLinesAuto(inserted), - multiPaste = null; - if (paste && sel.ranges.length > 1) { - if (lastCopied && lastCopied.text.join("\n") == inserted) { - if (sel.ranges.length % lastCopied.text.length == 0) { - multiPaste = []; - for (var i2 = 0; i2 < lastCopied.text.length; i2++) { - multiPaste.push(doc.splitLines(lastCopied.text[i2])); - } - } - } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) { - multiPaste = map(textLines, function (l) { - return [l]; - }); - } - } - var updateInput = cm.curOp.updateInput; - for (var i$12 = sel.ranges.length - 1; i$12 >= 0; i$12--) { - var range2 = sel.ranges[i$12]; - var from = range2.from(), - to = range2.to(); - if (range2.empty()) { - if (deleted && deleted > 0) { - from = Pos(from.line, from.ch - deleted); - } else if (cm.state.overwrite && !paste) { - to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); - } else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n")) { - from = to = Pos(from.line, 0); - } - } - var changeEvent = { - from, - to, - text: multiPaste ? multiPaste[i$12 % multiPaste.length] : textLines, - origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input") - }; - makeChange(cm.doc, changeEvent); - signalLater(cm, "inputRead", cm, changeEvent); - } - if (inserted && !paste) { - triggerElectric(cm, inserted); - } - ensureCursorVisible(cm); - if (cm.curOp.updateInput < 2) { - cm.curOp.updateInput = updateInput; - } - cm.curOp.typing = true; - cm.state.pasteIncoming = cm.state.cutIncoming = -1; - } - function handlePaste(e, cm) { - var pasted = e.clipboardData && e.clipboardData.getData("Text"); - if (pasted) { - e.preventDefault(); - if (!cm.isReadOnly() && !cm.options.disableInput) { - runInOp(cm, function () { - return applyTextInput(cm, pasted, 0, null, "paste"); - }); - } - return true; - } - } - function triggerElectric(cm, inserted) { - if (!cm.options.electricChars || !cm.options.smartIndent) { - return; - } - var sel = cm.doc.sel; - for (var i2 = sel.ranges.length - 1; i2 >= 0; i2--) { - var range2 = sel.ranges[i2]; - if (range2.head.ch > 100 || i2 && sel.ranges[i2 - 1].head.line == range2.head.line) { - continue; - } - var mode = cm.getModeAt(range2.head); - var indented = false; - if (mode.electricChars) { - for (var j = 0; j < mode.electricChars.length; j++) { - if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { - indented = indentLine(cm, range2.head.line, "smart"); - break; - } - } - } else if (mode.electricInput) { - if (mode.electricInput.test(getLine(cm.doc, range2.head.line).text.slice(0, range2.head.ch))) { - indented = indentLine(cm, range2.head.line, "smart"); - } - } - if (indented) { - signalLater(cm, "electricInput", cm, range2.head.line); - } - } - } - function copyableRanges(cm) { - var text = [], - ranges = []; - for (var i2 = 0; i2 < cm.doc.sel.ranges.length; i2++) { - var line = cm.doc.sel.ranges[i2].head.line; - var lineRange = { - anchor: Pos(line, 0), - head: Pos(line + 1, 0) - }; - ranges.push(lineRange); - text.push(cm.getRange(lineRange.anchor, lineRange.head)); - } - return { - text, - ranges - }; - } - function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) { - field.setAttribute("autocorrect", autocorrect ? "" : "off"); - field.setAttribute("autocapitalize", autocapitalize ? "" : "off"); - field.setAttribute("spellcheck", !!spellcheck); - } - function hiddenTextarea() { - var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none"); - var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;"); - if (webkit) { - te.style.width = "1000px"; - } else { - te.setAttribute("wrap", "off"); - } - if (ios) { - te.style.border = "1px solid black"; - } - disableBrowserMagic(te); - return div; - } - function addEditorMethods(CodeMirror2) { - var optionHandlers2 = CodeMirror2.optionHandlers; - var helpers = CodeMirror2.helpers = {}; - CodeMirror2.prototype = { - constructor: CodeMirror2, - focus: function () { - window.focus(); - this.display.input.focus(); - }, - setOption: function (option, value) { - var options = this.options, - old = options[option]; - if (options[option] == value && option != "mode") { - return; - } - options[option] = value; - if (optionHandlers2.hasOwnProperty(option)) { - operation(this, optionHandlers2[option])(this, value, old); - } - signal(this, "optionChange", this, option); - }, - getOption: function (option) { - return this.options[option]; - }, - getDoc: function () { - return this.doc; - }, - addKeyMap: function (map2, bottom) { - this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map2)); - }, - removeKeyMap: function (map2) { - var maps = this.state.keyMaps; - for (var i2 = 0; i2 < maps.length; ++i2) { - if (maps[i2] == map2 || maps[i2].name == map2) { - maps.splice(i2, 1); - return true; - } - } - }, - addOverlay: methodOp(function (spec, options) { - var mode = spec.token ? spec : CodeMirror2.getMode(this.options, spec); - if (mode.startState) { - throw new Error("Overlays may not be stateful."); - } - insertSorted(this.state.overlays, { - mode, - modeSpec: spec, - opaque: options && options.opaque, - priority: options && options.priority || 0 - }, function (overlay) { - return overlay.priority; - }); - this.state.modeGen++; - regChange(this); - }), - removeOverlay: methodOp(function (spec) { - var overlays = this.state.overlays; - for (var i2 = 0; i2 < overlays.length; ++i2) { - var cur = overlays[i2].modeSpec; - if (cur == spec || typeof spec == "string" && cur.name == spec) { - overlays.splice(i2, 1); - this.state.modeGen++; - regChange(this); - return; - } - } - }), - indentLine: methodOp(function (n, dir, aggressive) { - if (typeof dir != "string" && typeof dir != "number") { - if (dir == null) { - dir = this.options.smartIndent ? "smart" : "prev"; - } else { - dir = dir ? "add" : "subtract"; - } - } - if (isLine(this.doc, n)) { - indentLine(this, n, dir, aggressive); - } - }), - indentSelection: methodOp(function (how) { - var ranges = this.doc.sel.ranges, - end = -1; - for (var i2 = 0; i2 < ranges.length; i2++) { - var range2 = ranges[i2]; - if (!range2.empty()) { - var from = range2.from(), - to = range2.to(); - var start = Math.max(end, from.line); - end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1; - for (var j = start; j < end; ++j) { - indentLine(this, j, how); - } - var newRanges = this.doc.sel.ranges; - if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i2].from().ch > 0) { - replaceOneSelection(this.doc, i2, new Range(from, newRanges[i2].to()), sel_dontScroll); - } - } else if (range2.head.line > end) { - indentLine(this, range2.head.line, how, true); - end = range2.head.line; - if (i2 == this.doc.sel.primIndex) { - ensureCursorVisible(this); - } - } - } - }), - // Fetch the parser token for a given character. Useful for hacks - // that want to inspect the mode state (say, for completion). - getTokenAt: function (pos, precise) { - return takeToken(this, pos, precise); - }, - getLineTokens: function (line, precise) { - return takeToken(this, Pos(line), precise, true); - }, - getTokenTypeAt: function (pos) { - pos = clipPos(this.doc, pos); - var styles = getLineStyles(this, getLine(this.doc, pos.line)); - var before = 0, - after = (styles.length - 1) / 2, - ch = pos.ch; - var type; - if (ch == 0) { - type = styles[2]; - } else { - for (;;) { - var mid = before + after >> 1; - if ((mid ? styles[mid * 2 - 1] : 0) >= ch) { - after = mid; - } else if (styles[mid * 2 + 1] < ch) { - before = mid + 1; - } else { - type = styles[mid * 2 + 2]; - break; - } - } - } - var cut = type ? type.indexOf("overlay ") : -1; - return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1); - }, - getModeAt: function (pos) { - var mode = this.doc.mode; - if (!mode.innerMode) { - return mode; - } - return CodeMirror2.innerMode(mode, this.getTokenAt(pos).state).mode; - }, - getHelper: function (pos, type) { - return this.getHelpers(pos, type)[0]; - }, - getHelpers: function (pos, type) { - var found = []; - if (!helpers.hasOwnProperty(type)) { - return found; - } - var help = helpers[type], - mode = this.getModeAt(pos); - if (typeof mode[type] == "string") { - if (help[mode[type]]) { - found.push(help[mode[type]]); - } - } else if (mode[type]) { - for (var i2 = 0; i2 < mode[type].length; i2++) { - var val = help[mode[type][i2]]; - if (val) { - found.push(val); - } - } - } else if (mode.helperType && help[mode.helperType]) { - found.push(help[mode.helperType]); - } else if (help[mode.name]) { - found.push(help[mode.name]); - } - for (var i$12 = 0; i$12 < help._global.length; i$12++) { - var cur = help._global[i$12]; - if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) { - found.push(cur.val); - } - } - return found; - }, - getStateAfter: function (line, precise) { - var doc = this.doc; - line = clipLine(doc, line == null ? doc.first + doc.size - 1 : line); - return getContextBefore(this, line + 1, precise).state; - }, - cursorCoords: function (start, mode) { - var pos, - range2 = this.doc.sel.primary(); - if (start == null) { - pos = range2.head; - } else if (typeof start == "object") { - pos = clipPos(this.doc, start); - } else { - pos = start ? range2.from() : range2.to(); - } - return cursorCoords(this, pos, mode || "page"); - }, - charCoords: function (pos, mode) { - return charCoords(this, clipPos(this.doc, pos), mode || "page"); - }, - coordsChar: function (coords, mode) { - coords = fromCoordSystem(this, coords, mode || "page"); - return coordsChar(this, coords.left, coords.top); - }, - lineAtHeight: function (height, mode) { - height = fromCoordSystem(this, { - top: height, - left: 0 - }, mode || "page").top; - return lineAtHeight(this.doc, height + this.display.viewOffset); - }, - heightAtLine: function (line, mode, includeWidgets) { - var end = false, - lineObj; - if (typeof line == "number") { - var last = this.doc.first + this.doc.size - 1; - if (line < this.doc.first) { - line = this.doc.first; - } else if (line > last) { - line = last; - end = true; - } - lineObj = getLine(this.doc, line); - } else { - lineObj = line; - } - return intoCoordSystem(this, lineObj, { - top: 0, - left: 0 - }, mode || "page", includeWidgets || end).top + (end ? this.doc.height - heightAtLine(lineObj) : 0); - }, - defaultTextHeight: function () { - return textHeight(this.display); - }, - defaultCharWidth: function () { - return charWidth(this.display); - }, - getViewport: function () { - return { - from: this.display.viewFrom, - to: this.display.viewTo - }; - }, - addWidget: function (pos, node, scroll, vert, horiz) { - var display = this.display; - pos = cursorCoords(this, clipPos(this.doc, pos)); - var top = pos.bottom, - left = pos.left; - node.style.position = "absolute"; - node.setAttribute("cm-ignore-events", "true"); - this.display.input.setUneditable(node); - display.sizer.appendChild(node); - if (vert == "over") { - top = pos.top; - } else if (vert == "above" || vert == "near") { - var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), - hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth); - if ((vert == "above" || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) { - top = pos.top - node.offsetHeight; - } else if (pos.bottom + node.offsetHeight <= vspace) { - top = pos.bottom; - } - if (left + node.offsetWidth > hspace) { - left = hspace - node.offsetWidth; - } - } - node.style.top = top + "px"; - node.style.left = node.style.right = ""; - if (horiz == "right") { - left = display.sizer.clientWidth - node.offsetWidth; - node.style.right = "0px"; - } else { - if (horiz == "left") { - left = 0; - } else if (horiz == "middle") { - left = (display.sizer.clientWidth - node.offsetWidth) / 2; - } - node.style.left = left + "px"; - } - if (scroll) { - scrollIntoView(this, { - left, - top, - right: left + node.offsetWidth, - bottom: top + node.offsetHeight - }); - } - }, - triggerOnKeyDown: methodOp(onKeyDown), - triggerOnKeyPress: methodOp(onKeyPress), - triggerOnKeyUp: onKeyUp, - triggerOnMouseDown: methodOp(onMouseDown), - execCommand: function (cmd) { - if (commands.hasOwnProperty(cmd)) { - return commands[cmd].call(null, this); - } - }, - triggerElectric: methodOp(function (text) { - triggerElectric(this, text); - }), - findPosH: function (from, amount, unit, visually) { - var dir = 1; - if (amount < 0) { - dir = -1; - amount = -amount; - } - var cur = clipPos(this.doc, from); - for (var i2 = 0; i2 < amount; ++i2) { - cur = findPosH(this.doc, cur, dir, unit, visually); - if (cur.hitSide) { - break; - } - } - return cur; - }, - moveH: methodOp(function (dir, unit) { - var this$1$1 = this; - this.extendSelectionsBy(function (range2) { - if (this$1$1.display.shift || this$1$1.doc.extend || range2.empty()) { - return findPosH(this$1$1.doc, range2.head, dir, unit, this$1$1.options.rtlMoveVisually); - } else { - return dir < 0 ? range2.from() : range2.to(); - } - }, sel_move); - }), - deleteH: methodOp(function (dir, unit) { - var sel = this.doc.sel, - doc = this.doc; - if (sel.somethingSelected()) { - doc.replaceSelection("", null, "+delete"); - } else { - deleteNearSelection(this, function (range2) { - var other = findPosH(doc, range2.head, dir, unit, false); - return dir < 0 ? { - from: other, - to: range2.head - } : { - from: range2.head, - to: other - }; - }); - } - }), - findPosV: function (from, amount, unit, goalColumn) { - var dir = 1, - x = goalColumn; - if (amount < 0) { - dir = -1; - amount = -amount; - } - var cur = clipPos(this.doc, from); - for (var i2 = 0; i2 < amount; ++i2) { - var coords = cursorCoords(this, cur, "div"); - if (x == null) { - x = coords.left; - } else { - coords.left = x; - } - cur = findPosV(this, coords, dir, unit); - if (cur.hitSide) { - break; - } - } - return cur; - }, - moveV: methodOp(function (dir, unit) { - var this$1$1 = this; - var doc = this.doc, - goals = []; - var collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected(); - doc.extendSelectionsBy(function (range2) { - if (collapse) { - return dir < 0 ? range2.from() : range2.to(); - } - var headPos = cursorCoords(this$1$1, range2.head, "div"); - if (range2.goalColumn != null) { - headPos.left = range2.goalColumn; - } - goals.push(headPos.left); - var pos = findPosV(this$1$1, headPos, dir, unit); - if (unit == "page" && range2 == doc.sel.primary()) { - addToScrollTop(this$1$1, charCoords(this$1$1, pos, "div").top - headPos.top); - } - return pos; - }, sel_move); - if (goals.length) { - for (var i2 = 0; i2 < doc.sel.ranges.length; i2++) { - doc.sel.ranges[i2].goalColumn = goals[i2]; - } - } - }), - // Find the word at the given position (as returned by coordsChar). - findWordAt: function (pos) { - var doc = this.doc, - line = getLine(doc, pos.line).text; - var start = pos.ch, - end = pos.ch; - if (line) { - var helper = this.getHelper(pos, "wordChars"); - if ((pos.sticky == "before" || end == line.length) && start) { - --start; - } else { - ++end; - } - var startChar = line.charAt(start); - var check = isWordChar(startChar, helper) ? function (ch) { - return isWordChar(ch, helper); - } : /\s/.test(startChar) ? function (ch) { - return /\s/.test(ch); - } : function (ch) { - return !/\s/.test(ch) && !isWordChar(ch); - }; - while (start > 0 && check(line.charAt(start - 1))) { - --start; - } - while (end < line.length && check(line.charAt(end))) { - ++end; - } - } - return new Range(Pos(pos.line, start), Pos(pos.line, end)); - }, - toggleOverwrite: function (value) { - if (value != null && value == this.state.overwrite) { - return; - } - if (this.state.overwrite = !this.state.overwrite) { - addClass(this.display.cursorDiv, "CodeMirror-overwrite"); - } else { - rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); - } - signal(this, "overwriteToggle", this, this.state.overwrite); - }, - hasFocus: function () { - return this.display.input.getField() == activeElt(); - }, - isReadOnly: function () { - return !!(this.options.readOnly || this.doc.cantEdit); - }, - scrollTo: methodOp(function (x, y) { - scrollToCoords(this, x, y); - }), - getScrollInfo: function () { - var scroller = this.display.scroller; - return { - left: scroller.scrollLeft, - top: scroller.scrollTop, - height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight, - width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth, - clientHeight: displayHeight(this), - clientWidth: displayWidth(this) - }; - }, - scrollIntoView: methodOp(function (range2, margin) { - if (range2 == null) { - range2 = { - from: this.doc.sel.primary().head, - to: null - }; - if (margin == null) { - margin = this.options.cursorScrollMargin; - } - } else if (typeof range2 == "number") { - range2 = { - from: Pos(range2, 0), - to: null - }; - } else if (range2.from == null) { - range2 = { - from: range2, - to: null - }; - } - if (!range2.to) { - range2.to = range2.from; - } - range2.margin = margin || 0; - if (range2.from.line != null) { - scrollToRange(this, range2); - } else { - scrollToCoordsRange(this, range2.from, range2.to, range2.margin); - } - }), - setSize: methodOp(function (width, height) { - var this$1$1 = this; - var interpret = function (val) { - return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; - }; - if (width != null) { - this.display.wrapper.style.width = interpret(width); - } - if (height != null) { - this.display.wrapper.style.height = interpret(height); - } - if (this.options.lineWrapping) { - clearLineMeasurementCache(this); - } - var lineNo2 = this.display.viewFrom; - this.doc.iter(lineNo2, this.display.viewTo, function (line) { - if (line.widgets) { - for (var i2 = 0; i2 < line.widgets.length; i2++) { - if (line.widgets[i2].noHScroll) { - regLineChange(this$1$1, lineNo2, "widget"); - break; - } - } - } - ++lineNo2; - }); - this.curOp.forceUpdate = true; - signal(this, "refresh", this); - }), - operation: function (f) { - return runInOp(this, f); - }, - startOperation: function () { - return startOperation(this); - }, - endOperation: function () { - return endOperation(this); - }, - refresh: methodOp(function () { - var oldHeight = this.display.cachedTextHeight; - regChange(this); - this.curOp.forceUpdate = true; - clearCaches(this); - scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop); - updateGutterSpace(this.display); - if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > 0.5 || this.options.lineWrapping) { - estimateLineHeights(this); - } - signal(this, "refresh", this); - }), - swapDoc: methodOp(function (doc) { - var old = this.doc; - old.cm = null; - if (this.state.selectingText) { - this.state.selectingText(); - } - attachDoc(this, doc); - clearCaches(this); - this.display.input.reset(); - scrollToCoords(this, doc.scrollLeft, doc.scrollTop); - this.curOp.forceScroll = true; - signalLater(this, "swapDoc", this, old); - return old; - }), - phrase: function (phraseText) { - var phrases = this.options.phrases; - return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText; - }, - getInputField: function () { - return this.display.input.getField(); - }, - getWrapperElement: function () { - return this.display.wrapper; - }, - getScrollerElement: function () { - return this.display.scroller; - }, - getGutterElement: function () { - return this.display.gutters; - } - }; - eventMixin(CodeMirror2); - CodeMirror2.registerHelper = function (type, name, value) { - if (!helpers.hasOwnProperty(type)) { - helpers[type] = CodeMirror2[type] = { - _global: [] - }; - } - helpers[type][name] = value; - }; - CodeMirror2.registerGlobalHelper = function (type, name, predicate, value) { - CodeMirror2.registerHelper(type, name, value); - helpers[type]._global.push({ - pred: predicate, - val: value - }); - }; - } - function findPosH(doc, pos, dir, unit, visually) { - var oldPos = pos; - var origDir = dir; - var lineObj = getLine(doc, pos.line); - var lineDir = visually && doc.direction == "rtl" ? -dir : dir; - function findNextLine() { - var l = pos.line + lineDir; - if (l < doc.first || l >= doc.first + doc.size) { - return false; - } - pos = new Pos(l, pos.ch, pos.sticky); - return lineObj = getLine(doc, l); - } - function moveOnce(boundToLine) { - var next; - if (unit == "codepoint") { - var ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1)); - if (isNaN(ch)) { - next = null; - } else { - var astral = dir > 0 ? ch >= 55296 && ch < 56320 : ch >= 56320 && ch < 57343; - next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir); - } - } else if (visually) { - next = moveVisually(doc.cm, lineObj, pos, dir); - } else { - next = moveLogically(lineObj, pos, dir); - } - if (next == null) { - if (!boundToLine && findNextLine()) { - pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir); - } else { - return false; - } - } else { - pos = next; - } - return true; - } - if (unit == "char" || unit == "codepoint") { - moveOnce(); - } else if (unit == "column") { - moveOnce(true); - } else if (unit == "word" || unit == "group") { - var sawType = null, - group = unit == "group"; - var helper = doc.cm && doc.cm.getHelper(pos, "wordChars"); - for (var first = true;; first = false) { - if (dir < 0 && !moveOnce(!first)) { - break; - } - var cur = lineObj.text.charAt(pos.ch) || "\n"; - var type = isWordChar(cur, helper) ? "w" : group && cur == "\n" ? "n" : !group || /\s/.test(cur) ? null : "p"; - if (group && !first && !type) { - type = "s"; - } - if (sawType && sawType != type) { - if (dir < 0) { - dir = 1; - moveOnce(); - pos.sticky = "after"; - } - break; - } - if (type) { - sawType = type; - } - if (dir > 0 && !moveOnce(!first)) { - break; - } - } - } - var result = skipAtomic(doc, pos, oldPos, origDir, true); - if (equalCursorPos(oldPos, result)) { - result.hitSide = true; - } - return result; - } - function findPosV(cm, pos, dir, unit) { - var doc = cm.doc, - x = pos.left, - y; - if (unit == "page") { - var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight); - var moveAmount = Math.max(pageSize - 0.5 * textHeight(cm.display), 3); - y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount; - } else if (unit == "line") { - y = dir > 0 ? pos.bottom + 3 : pos.top - 3; - } - var target; - for (;;) { - target = coordsChar(cm, x, y); - if (!target.outside) { - break; - } - if (dir < 0 ? y <= 0 : y >= doc.height) { - target.hitSide = true; - break; - } - y += dir * 5; - } - return target; - } - var ContentEditableInput = function (cm) { - this.cm = cm; - this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null; - this.polling = new Delayed(); - this.composing = null; - this.gracePeriod = false; - this.readDOMTimeout = null; - }; - ContentEditableInput.prototype.init = function (display) { - var this$1$1 = this; - var input = this, - cm = input.cm; - var div = input.div = display.lineDiv; - div.contentEditable = true; - disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize); - function belongsToInput(e) { - for (var t = e.target; t; t = t.parentNode) { - if (t == div) { - return true; - } - if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) { - break; - } - } - return false; - } - on(div, "paste", function (e) { - if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) { - return; - } - if (ie_version <= 11) { - setTimeout(operation(cm, function () { - return this$1$1.updateFromDOM(); - }), 20); - } - }); - on(div, "compositionstart", function (e) { - this$1$1.composing = { - data: e.data, - done: false - }; - }); - on(div, "compositionupdate", function (e) { - if (!this$1$1.composing) { - this$1$1.composing = { - data: e.data, - done: false - }; - } - }); - on(div, "compositionend", function (e) { - if (this$1$1.composing) { - if (e.data != this$1$1.composing.data) { - this$1$1.readFromDOMSoon(); - } - this$1$1.composing.done = true; - } - }); - on(div, "touchstart", function () { - return input.forceCompositionEnd(); - }); - on(div, "input", function () { - if (!this$1$1.composing) { - this$1$1.readFromDOMSoon(); - } - }); - function onCopyCut(e) { - if (!belongsToInput(e) || signalDOMEvent(cm, e)) { - return; - } - if (cm.somethingSelected()) { - setLastCopied({ - lineWise: false, - text: cm.getSelections() - }); - if (e.type == "cut") { - cm.replaceSelection("", null, "cut"); - } - } else if (!cm.options.lineWiseCopyCut) { - return; - } else { - var ranges = copyableRanges(cm); - setLastCopied({ - lineWise: true, - text: ranges.text - }); - if (e.type == "cut") { - cm.operation(function () { - cm.setSelections(ranges.ranges, 0, sel_dontScroll); - cm.replaceSelection("", null, "cut"); - }); - } - } - if (e.clipboardData) { - e.clipboardData.clearData(); - var content = lastCopied.text.join("\n"); - e.clipboardData.setData("Text", content); - if (e.clipboardData.getData("Text") == content) { - e.preventDefault(); - return; - } - } - var kludge = hiddenTextarea(), - te = kludge.firstChild; - cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild); - te.value = lastCopied.text.join("\n"); - var hadFocus = activeElt(); - selectInput(te); - setTimeout(function () { - cm.display.lineSpace.removeChild(kludge); - hadFocus.focus(); - if (hadFocus == div) { - input.showPrimarySelection(); - } - }, 50); - } - on(div, "copy", onCopyCut); - on(div, "cut", onCopyCut); - }; - ContentEditableInput.prototype.screenReaderLabelChanged = function (label) { - if (label) { - this.div.setAttribute("aria-label", label); - } else { - this.div.removeAttribute("aria-label"); - } - }; - ContentEditableInput.prototype.prepareSelection = function () { - var result = prepareSelection(this.cm, false); - result.focus = activeElt() == this.div; - return result; - }; - ContentEditableInput.prototype.showSelection = function (info, takeFocus) { - if (!info || !this.cm.display.view.length) { - return; - } - if (info.focus || takeFocus) { - this.showPrimarySelection(); - } - this.showMultipleSelections(info); - }; - ContentEditableInput.prototype.getSelection = function () { - return this.cm.display.wrapper.ownerDocument.getSelection(); - }; - ContentEditableInput.prototype.showPrimarySelection = function () { - var sel = this.getSelection(), - cm = this.cm, - prim = cm.doc.sel.primary(); - var from = prim.from(), - to = prim.to(); - if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) { - sel.removeAllRanges(); - return; - } - var curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); - var curFocus = domToPos(cm, sel.focusNode, sel.focusOffset); - if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad && cmp(minPos(curAnchor, curFocus), from) == 0 && cmp(maxPos(curAnchor, curFocus), to) == 0) { - return; - } - var view = cm.display.view; - var start = from.line >= cm.display.viewFrom && posToDOM(cm, from) || { - node: view[0].measure.map[2], - offset: 0 - }; - var end = to.line < cm.display.viewTo && posToDOM(cm, to); - if (!end) { - var measure = view[view.length - 1].measure; - var map2 = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map; - end = { - node: map2[map2.length - 1], - offset: map2[map2.length - 2] - map2[map2.length - 3] - }; - } - if (!start || !end) { - sel.removeAllRanges(); - return; - } - var old = sel.rangeCount && sel.getRangeAt(0), - rng; - try { - rng = range(start.node, start.offset, end.offset, end.node); - } catch (e) {} - if (rng) { - if (!gecko && cm.state.focused) { - sel.collapse(start.node, start.offset); - if (!rng.collapsed) { - sel.removeAllRanges(); - sel.addRange(rng); - } - } else { - sel.removeAllRanges(); - sel.addRange(rng); - } - if (old && sel.anchorNode == null) { - sel.addRange(old); - } else if (gecko) { - this.startGracePeriod(); - } - } - this.rememberSelection(); - }; - ContentEditableInput.prototype.startGracePeriod = function () { - var this$1$1 = this; - clearTimeout(this.gracePeriod); - this.gracePeriod = setTimeout(function () { - this$1$1.gracePeriod = false; - if (this$1$1.selectionChanged()) { - this$1$1.cm.operation(function () { - return this$1$1.cm.curOp.selectionChanged = true; - }); - } - }, 20); - }; - ContentEditableInput.prototype.showMultipleSelections = function (info) { - removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors); - removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection); - }; - ContentEditableInput.prototype.rememberSelection = function () { - var sel = this.getSelection(); - this.lastAnchorNode = sel.anchorNode; - this.lastAnchorOffset = sel.anchorOffset; - this.lastFocusNode = sel.focusNode; - this.lastFocusOffset = sel.focusOffset; - }; - ContentEditableInput.prototype.selectionInEditor = function () { - var sel = this.getSelection(); - if (!sel.rangeCount) { - return false; - } - var node = sel.getRangeAt(0).commonAncestorContainer; - return contains(this.div, node); - }; - ContentEditableInput.prototype.focus = function () { - if (this.cm.options.readOnly != "nocursor") { - if (!this.selectionInEditor() || activeElt() != this.div) { - this.showSelection(this.prepareSelection(), true); - } - this.div.focus(); - } - }; - ContentEditableInput.prototype.blur = function () { - this.div.blur(); - }; - ContentEditableInput.prototype.getField = function () { - return this.div; - }; - ContentEditableInput.prototype.supportsTouch = function () { - return true; - }; - ContentEditableInput.prototype.receivedFocus = function () { - var this$1$1 = this; - var input = this; - if (this.selectionInEditor()) { - setTimeout(function () { - return this$1$1.pollSelection(); - }, 20); - } else { - runInOp(this.cm, function () { - return input.cm.curOp.selectionChanged = true; - }); - } - function poll() { - if (input.cm.state.focused) { - input.pollSelection(); - input.polling.set(input.cm.options.pollInterval, poll); - } - } - this.polling.set(this.cm.options.pollInterval, poll); - }; - ContentEditableInput.prototype.selectionChanged = function () { - var sel = this.getSelection(); - return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset || sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset; - }; - ContentEditableInput.prototype.pollSelection = function () { - if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) { - return; - } - var sel = this.getSelection(), - cm = this.cm; - if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) { - this.cm.triggerOnKeyDown({ - type: "keydown", - keyCode: 8, - preventDefault: Math.abs - }); - this.blur(); - this.focus(); - return; - } - if (this.composing) { - return; - } - this.rememberSelection(); - var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset); - var head = domToPos(cm, sel.focusNode, sel.focusOffset); - if (anchor && head) { - runInOp(cm, function () { - setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll); - if (anchor.bad || head.bad) { - cm.curOp.selectionChanged = true; - } - }); - } - }; - ContentEditableInput.prototype.pollContent = function () { - if (this.readDOMTimeout != null) { - clearTimeout(this.readDOMTimeout); - this.readDOMTimeout = null; - } - var cm = this.cm, - display = cm.display, - sel = cm.doc.sel.primary(); - var from = sel.from(), - to = sel.to(); - if (from.ch == 0 && from.line > cm.firstLine()) { - from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length); - } - if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine()) { - to = Pos(to.line + 1, 0); - } - if (from.line < display.viewFrom || to.line > display.viewTo - 1) { - return false; - } - var fromIndex, fromLine, fromNode; - if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) { - fromLine = lineNo(display.view[0].line); - fromNode = display.view[0].node; - } else { - fromLine = lineNo(display.view[fromIndex].line); - fromNode = display.view[fromIndex - 1].node.nextSibling; - } - var toIndex = findViewIndex(cm, to.line); - var toLine, toNode; - if (toIndex == display.view.length - 1) { - toLine = display.viewTo - 1; - toNode = display.lineDiv.lastChild; - } else { - toLine = lineNo(display.view[toIndex + 1].line) - 1; - toNode = display.view[toIndex + 1].node.previousSibling; - } - if (!fromNode) { - return false; - } - var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine)); - var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length)); - while (newText.length > 1 && oldText.length > 1) { - if (lst(newText) == lst(oldText)) { - newText.pop(); - oldText.pop(); - toLine--; - } else if (newText[0] == oldText[0]) { - newText.shift(); - oldText.shift(); - fromLine++; - } else { - break; - } - } - var cutFront = 0, - cutEnd = 0; - var newTop = newText[0], - oldTop = oldText[0], - maxCutFront = Math.min(newTop.length, oldTop.length); - while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront)) { - ++cutFront; - } - var newBot = lst(newText), - oldBot = lst(oldText); - var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0), oldBot.length - (oldText.length == 1 ? cutFront : 0)); - while (cutEnd < maxCutEnd && newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) { - ++cutEnd; - } - if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) { - while (cutFront && cutFront > from.ch && newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) { - cutFront--; - cutEnd++; - } - } - newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, ""); - newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, ""); - var chFrom = Pos(fromLine, cutFront); - var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0); - if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) { - replaceRange(cm.doc, newText, chFrom, chTo, "+input"); - return true; - } - }; - ContentEditableInput.prototype.ensurePolled = function () { - this.forceCompositionEnd(); - }; - ContentEditableInput.prototype.reset = function () { - this.forceCompositionEnd(); - }; - ContentEditableInput.prototype.forceCompositionEnd = function () { - if (!this.composing) { - return; - } - clearTimeout(this.readDOMTimeout); - this.composing = null; - this.updateFromDOM(); - this.div.blur(); - this.div.focus(); - }; - ContentEditableInput.prototype.readFromDOMSoon = function () { - var this$1$1 = this; - if (this.readDOMTimeout != null) { - return; - } - this.readDOMTimeout = setTimeout(function () { - this$1$1.readDOMTimeout = null; - if (this$1$1.composing) { - if (this$1$1.composing.done) { - this$1$1.composing = null; - } else { - return; - } - } - this$1$1.updateFromDOM(); - }, 80); - }; - ContentEditableInput.prototype.updateFromDOM = function () { - var this$1$1 = this; - if (this.cm.isReadOnly() || !this.pollContent()) { - runInOp(this.cm, function () { - return regChange(this$1$1.cm); - }); - } - }; - ContentEditableInput.prototype.setUneditable = function (node) { - node.contentEditable = "false"; - }; - ContentEditableInput.prototype.onKeyPress = function (e) { - if (e.charCode == 0 || this.composing) { - return; - } - e.preventDefault(); - if (!this.cm.isReadOnly()) { - operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0); - } - }; - ContentEditableInput.prototype.readOnlyChanged = function (val) { - this.div.contentEditable = String(val != "nocursor"); - }; - ContentEditableInput.prototype.onContextMenu = function () {}; - ContentEditableInput.prototype.resetPosition = function () {}; - ContentEditableInput.prototype.needsContentAttribute = true; - function posToDOM(cm, pos) { - var view = findViewForLine(cm, pos.line); - if (!view || view.hidden) { - return null; - } - var line = getLine(cm.doc, pos.line); - var info = mapFromLineView(view, line, pos.line); - var order = getOrder(line, cm.doc.direction), - side = "left"; - if (order) { - var partPos = getBidiPartAt(order, pos.ch); - side = partPos % 2 ? "right" : "left"; - } - var result = nodeAndOffsetInLineMap(info.map, pos.ch, side); - result.offset = result.collapse == "right" ? result.end : result.start; - return result; - } - function isInGutter(node) { - for (var scan = node; scan; scan = scan.parentNode) { - if (/CodeMirror-gutter-wrapper/.test(scan.className)) { - return true; - } - } - return false; - } - function badPos(pos, bad) { - if (bad) { - pos.bad = true; - } - return pos; - } - function domTextBetween(cm, from, to, fromLine, toLine) { - var text = "", - closing = false, - lineSep = cm.doc.lineSeparator(), - extraLinebreak = false; - function recognizeMarker(id) { - return function (marker) { - return marker.id == id; - }; - } - function close() { - if (closing) { - text += lineSep; - if (extraLinebreak) { - text += lineSep; - } - closing = extraLinebreak = false; - } - } - function addText(str) { - if (str) { - close(); - text += str; - } - } - function walk(node) { - if (node.nodeType == 1) { - var cmText = node.getAttribute("cm-text"); - if (cmText) { - addText(cmText); - return; - } - var markerID = node.getAttribute("cm-marker"), - range2; - if (markerID) { - var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID)); - if (found.length && (range2 = found[0].find(0))) { - addText(getBetween(cm.doc, range2.from, range2.to).join(lineSep)); - } - return; - } - if (node.getAttribute("contenteditable") == "false") { - return; - } - var isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName); - if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) { - return; - } - if (isBlock) { - close(); - } - for (var i2 = 0; i2 < node.childNodes.length; i2++) { - walk(node.childNodes[i2]); - } - if (/^(pre|p)$/i.test(node.nodeName)) { - extraLinebreak = true; - } - if (isBlock) { - closing = true; - } - } else if (node.nodeType == 3) { - addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " ")); - } - } - for (;;) { - walk(from); - if (from == to) { - break; - } - from = from.nextSibling; - extraLinebreak = false; - } - return text; - } - function domToPos(cm, node, offset) { - var lineNode; - if (node == cm.display.lineDiv) { - lineNode = cm.display.lineDiv.childNodes[offset]; - if (!lineNode) { - return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true); - } - node = null; - offset = 0; - } else { - for (lineNode = node;; lineNode = lineNode.parentNode) { - if (!lineNode || lineNode == cm.display.lineDiv) { - return null; - } - if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) { - break; - } - } - } - for (var i2 = 0; i2 < cm.display.view.length; i2++) { - var lineView = cm.display.view[i2]; - if (lineView.node == lineNode) { - return locateNodeInLineView(lineView, node, offset); - } - } - } - function locateNodeInLineView(lineView, node, offset) { - var wrapper = lineView.text.firstChild, - bad = false; - if (!node || !contains(wrapper, node)) { - return badPos(Pos(lineNo(lineView.line), 0), true); - } - if (node == wrapper) { - bad = true; - node = wrapper.childNodes[offset]; - offset = 0; - if (!node) { - var line = lineView.rest ? lst(lineView.rest) : lineView.line; - return badPos(Pos(lineNo(line), line.text.length), bad); - } - } - var textNode = node.nodeType == 3 ? node : null, - topNode = node; - if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) { - textNode = node.firstChild; - if (offset) { - offset = textNode.nodeValue.length; - } - } - while (topNode.parentNode != wrapper) { - topNode = topNode.parentNode; - } - var measure = lineView.measure, - maps = measure.maps; - function find(textNode2, topNode2, offset2) { - for (var i2 = -1; i2 < (maps ? maps.length : 0); i2++) { - var map2 = i2 < 0 ? measure.map : maps[i2]; - for (var j = 0; j < map2.length; j += 3) { - var curNode = map2[j + 2]; - if (curNode == textNode2 || curNode == topNode2) { - var line2 = lineNo(i2 < 0 ? lineView.line : lineView.rest[i2]); - var ch = map2[j] + offset2; - if (offset2 < 0 || curNode != textNode2) { - ch = map2[j + (offset2 ? 1 : 0)]; - } - return Pos(line2, ch); - } - } - } - } - var found = find(textNode, topNode, offset); - if (found) { - return badPos(found, bad); - } - for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) { - found = find(after, after.firstChild, 0); - if (found) { - return badPos(Pos(found.line, found.ch - dist), bad); - } else { - dist += after.textContent.length; - } - } - for (var before = topNode.previousSibling, dist$1 = offset; before; before = before.previousSibling) { - found = find(before, before.firstChild, -1); - if (found) { - return badPos(Pos(found.line, found.ch + dist$1), bad); - } else { - dist$1 += before.textContent.length; - } - } - } - var TextareaInput = function (cm) { - this.cm = cm; - this.prevInput = ""; - this.pollingFast = false; - this.polling = new Delayed(); - this.hasSelection = false; - this.composing = null; - }; - TextareaInput.prototype.init = function (display) { - var this$1$1 = this; - var input = this, - cm = this.cm; - this.createField(display); - var te = this.textarea; - display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild); - if (ios) { - te.style.width = "0px"; - } - on(te, "input", function () { - if (ie && ie_version >= 9 && this$1$1.hasSelection) { - this$1$1.hasSelection = null; - } - input.poll(); - }); - on(te, "paste", function (e) { - if (signalDOMEvent(cm, e) || handlePaste(e, cm)) { - return; - } - cm.state.pasteIncoming = + /* @__PURE__ */new Date(); - input.fastPoll(); - }); - function prepareCopyCut(e) { - if (signalDOMEvent(cm, e)) { - return; - } - if (cm.somethingSelected()) { - setLastCopied({ - lineWise: false, - text: cm.getSelections() - }); - } else if (!cm.options.lineWiseCopyCut) { - return; - } else { - var ranges = copyableRanges(cm); - setLastCopied({ - lineWise: true, - text: ranges.text - }); - if (e.type == "cut") { - cm.setSelections(ranges.ranges, null, sel_dontScroll); - } else { - input.prevInput = ""; - te.value = ranges.text.join("\n"); - selectInput(te); - } - } - if (e.type == "cut") { - cm.state.cutIncoming = + /* @__PURE__ */new Date(); - } - } - on(te, "cut", prepareCopyCut); - on(te, "copy", prepareCopyCut); - on(display.scroller, "paste", function (e) { - if (eventInWidget(display, e) || signalDOMEvent(cm, e)) { - return; - } - if (!te.dispatchEvent) { - cm.state.pasteIncoming = + /* @__PURE__ */new Date(); - input.focus(); - return; - } - var event = new Event("paste"); - event.clipboardData = e.clipboardData; - te.dispatchEvent(event); - }); - on(display.lineSpace, "selectstart", function (e) { - if (!eventInWidget(display, e)) { - e_preventDefault(e); - } - }); - on(te, "compositionstart", function () { - var start = cm.getCursor("from"); - if (input.composing) { - input.composing.range.clear(); - } - input.composing = { - start, - range: cm.markText(start, cm.getCursor("to"), { - className: "CodeMirror-composing" - }) - }; - }); - on(te, "compositionend", function () { - if (input.composing) { - input.poll(); - input.composing.range.clear(); - input.composing = null; - } - }); - }; - TextareaInput.prototype.createField = function (_display) { - this.wrapper = hiddenTextarea(); - this.textarea = this.wrapper.firstChild; - }; - TextareaInput.prototype.screenReaderLabelChanged = function (label) { - if (label) { - this.textarea.setAttribute("aria-label", label); - } else { - this.textarea.removeAttribute("aria-label"); - } - }; - TextareaInput.prototype.prepareSelection = function () { - var cm = this.cm, - display = cm.display, - doc = cm.doc; - var result = prepareSelection(cm); - if (cm.options.moveInputWithCursor) { - var headPos = cursorCoords(cm, doc.sel.primary().head, "div"); - var wrapOff = display.wrapper.getBoundingClientRect(), - lineOff = display.lineDiv.getBoundingClientRect(); - result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, headPos.top + lineOff.top - wrapOff.top)); - result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, headPos.left + lineOff.left - wrapOff.left)); - } - return result; - }; - TextareaInput.prototype.showSelection = function (drawn) { - var cm = this.cm, - display = cm.display; - removeChildrenAndAdd(display.cursorDiv, drawn.cursors); - removeChildrenAndAdd(display.selectionDiv, drawn.selection); - if (drawn.teTop != null) { - this.wrapper.style.top = drawn.teTop + "px"; - this.wrapper.style.left = drawn.teLeft + "px"; - } - }; - TextareaInput.prototype.reset = function (typing) { - if (this.contextMenuPending || this.composing) { - return; - } - var cm = this.cm; - if (cm.somethingSelected()) { - this.prevInput = ""; - var content = cm.getSelection(); - this.textarea.value = content; - if (cm.state.focused) { - selectInput(this.textarea); - } - if (ie && ie_version >= 9) { - this.hasSelection = content; - } - } else if (!typing) { - this.prevInput = this.textarea.value = ""; - if (ie && ie_version >= 9) { - this.hasSelection = null; - } - } - }; - TextareaInput.prototype.getField = function () { - return this.textarea; - }; - TextareaInput.prototype.supportsTouch = function () { - return false; - }; - TextareaInput.prototype.focus = function () { - if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) { - try { - this.textarea.focus(); - } catch (e) {} - } - }; - TextareaInput.prototype.blur = function () { - this.textarea.blur(); - }; - TextareaInput.prototype.resetPosition = function () { - this.wrapper.style.top = this.wrapper.style.left = 0; - }; - TextareaInput.prototype.receivedFocus = function () { - this.slowPoll(); - }; - TextareaInput.prototype.slowPoll = function () { - var this$1$1 = this; - if (this.pollingFast) { - return; - } - this.polling.set(this.cm.options.pollInterval, function () { - this$1$1.poll(); - if (this$1$1.cm.state.focused) { - this$1$1.slowPoll(); - } - }); - }; - TextareaInput.prototype.fastPoll = function () { - var missed = false, - input = this; - input.pollingFast = true; - function p() { - var changed = input.poll(); - if (!changed && !missed) { - missed = true; - input.polling.set(60, p); - } else { - input.pollingFast = false; - input.slowPoll(); - } - } - input.polling.set(20, p); - }; - TextareaInput.prototype.poll = function () { - var this$1$1 = this; - var cm = this.cm, - input = this.textarea, - prevInput = this.prevInput; - if (this.contextMenuPending || !cm.state.focused || hasSelection(input) && !prevInput && !this.composing || cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq) { - return false; - } - var text = input.value; - if (text == prevInput && !cm.somethingSelected()) { - return false; - } - if (ie && ie_version >= 9 && this.hasSelection === text || mac && /[\uf700-\uf7ff]/.test(text)) { - cm.display.input.reset(); - return false; - } - if (cm.doc.sel == cm.display.selForContextMenu) { - var first = text.charCodeAt(0); - if (first == 8203 && !prevInput) { - prevInput = "​"; - } - if (first == 8666) { - this.reset(); - return this.cm.execCommand("undo"); - } - } - var same = 0, - l = Math.min(prevInput.length, text.length); - while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) { - ++same; - } - runInOp(cm, function () { - applyTextInput(cm, text.slice(same), prevInput.length - same, null, this$1$1.composing ? "*compose" : null); - if (text.length > 1e3 || text.indexOf("\n") > -1) { - input.value = this$1$1.prevInput = ""; - } else { - this$1$1.prevInput = text; - } - if (this$1$1.composing) { - this$1$1.composing.range.clear(); - this$1$1.composing.range = cm.markText(this$1$1.composing.start, cm.getCursor("to"), { - className: "CodeMirror-composing" - }); - } - }); - return true; - }; - TextareaInput.prototype.ensurePolled = function () { - if (this.pollingFast && this.poll()) { - this.pollingFast = false; - } - }; - TextareaInput.prototype.onKeyPress = function () { - if (ie && ie_version >= 9) { - this.hasSelection = null; - } - this.fastPoll(); - }; - TextareaInput.prototype.onContextMenu = function (e) { - var input = this, - cm = input.cm, - display = cm.display, - te = input.textarea; - if (input.contextMenuPending) { - input.contextMenuPending(); - } - var pos = posFromMouse(cm, e), - scrollPos = display.scroller.scrollTop; - if (!pos || presto) { - return; - } - var reset = cm.options.resetSelectionOnContextMenu; - if (reset && cm.doc.sel.contains(pos) == -1) { - operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); - } - var oldCSS = te.style.cssText, - oldWrapperCSS = input.wrapper.style.cssText; - var wrapperBox = input.wrapper.offsetParent.getBoundingClientRect(); - input.wrapper.style.cssText = "position: static"; - te.style.cssText = "position: absolute; width: 30px; height: 30px;\n top: " + (e.clientY - wrapperBox.top - 5) + "px; left: " + (e.clientX - wrapperBox.left - 5) + "px;\n z-index: 1000; background: " + (ie ? "rgba(255, 255, 255, .05)" : "transparent") + ";\n outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; - var oldScrollY; - if (webkit) { - oldScrollY = window.scrollY; - } - display.input.focus(); - if (webkit) { - window.scrollTo(null, oldScrollY); - } - display.input.reset(); - if (!cm.somethingSelected()) { - te.value = input.prevInput = " "; - } - input.contextMenuPending = rehide; - display.selForContextMenu = cm.doc.sel; - clearTimeout(display.detectingSelectAll); - function prepareSelectAllHack() { - if (te.selectionStart != null) { - var selected = cm.somethingSelected(); - var extval = "​" + (selected ? te.value : ""); - te.value = "⇚"; - te.value = extval; - input.prevInput = selected ? "" : "​"; - te.selectionStart = 1; - te.selectionEnd = extval.length; - display.selForContextMenu = cm.doc.sel; - } - } - function rehide() { - if (input.contextMenuPending != rehide) { - return; - } - input.contextMenuPending = false; - input.wrapper.style.cssText = oldWrapperCSS; - te.style.cssText = oldCSS; - if (ie && ie_version < 9) { - display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos); - } - if (te.selectionStart != null) { - if (!ie || ie && ie_version < 9) { - prepareSelectAllHack(); - } - var i2 = 0, - poll = function () { - if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && te.selectionEnd > 0 && input.prevInput == "​") { - operation(cm, selectAll)(cm); - } else if (i2++ < 10) { - display.detectingSelectAll = setTimeout(poll, 500); - } else { - display.selForContextMenu = null; - display.input.reset(); - } - }; - display.detectingSelectAll = setTimeout(poll, 200); - } - } - if (ie && ie_version >= 9) { - prepareSelectAllHack(); - } - if (captureRightClick) { - e_stop(e); - var mouseup = function () { - off(window, "mouseup", mouseup); - setTimeout(rehide, 20); - }; - on(window, "mouseup", mouseup); - } else { - setTimeout(rehide, 50); - } - }; - TextareaInput.prototype.readOnlyChanged = function (val) { - if (!val) { - this.reset(); - } - this.textarea.disabled = val == "nocursor"; - this.textarea.readOnly = !!val; - }; - TextareaInput.prototype.setUneditable = function () {}; - TextareaInput.prototype.needsContentAttribute = false; - function fromTextArea(textarea, options) { - options = options ? copyObj(options) : {}; - options.value = textarea.value; - if (!options.tabindex && textarea.tabIndex) { - options.tabindex = textarea.tabIndex; - } - if (!options.placeholder && textarea.placeholder) { - options.placeholder = textarea.placeholder; - } - if (options.autofocus == null) { - var hasFocus = activeElt(); - options.autofocus = hasFocus == textarea || textarea.getAttribute("autofocus") != null && hasFocus == document.body; - } - function save() { - textarea.value = cm.getValue(); - } - var realSubmit; - if (textarea.form) { - on(textarea.form, "submit", save); - if (!options.leaveSubmitMethodAlone) { - var form = textarea.form; - realSubmit = form.submit; - try { - var wrappedSubmit = form.submit = function () { - save(); - form.submit = realSubmit; - form.submit(); - form.submit = wrappedSubmit; - }; - } catch (e) {} - } - } - options.finishInit = function (cm2) { - cm2.save = save; - cm2.getTextArea = function () { - return textarea; - }; - cm2.toTextArea = function () { - cm2.toTextArea = isNaN; - save(); - textarea.parentNode.removeChild(cm2.getWrapperElement()); - textarea.style.display = ""; - if (textarea.form) { - off(textarea.form, "submit", save); - if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function") { - textarea.form.submit = realSubmit; - } - } - }; - }; - textarea.style.display = "none"; - var cm = CodeMirror(function (node) { - return textarea.parentNode.insertBefore(node, textarea.nextSibling); - }, options); - return cm; - } - function addLegacyProps(CodeMirror2) { - CodeMirror2.off = off; - CodeMirror2.on = on; - CodeMirror2.wheelEventPixels = wheelEventPixels; - CodeMirror2.Doc = Doc; - CodeMirror2.splitLines = splitLinesAuto; - CodeMirror2.countColumn = countColumn; - CodeMirror2.findColumn = findColumn; - CodeMirror2.isWordChar = isWordCharBasic; - CodeMirror2.Pass = Pass; - CodeMirror2.signal = signal; - CodeMirror2.Line = Line; - CodeMirror2.changeEnd = changeEnd; - CodeMirror2.scrollbarModel = scrollbarModel; - CodeMirror2.Pos = Pos; - CodeMirror2.cmpPos = cmp; - CodeMirror2.modes = modes; - CodeMirror2.mimeModes = mimeModes; - CodeMirror2.resolveMode = resolveMode; - CodeMirror2.getMode = getMode; - CodeMirror2.modeExtensions = modeExtensions; - CodeMirror2.extendMode = extendMode; - CodeMirror2.copyState = copyState; - CodeMirror2.startState = startState; - CodeMirror2.innerMode = innerMode; - CodeMirror2.commands = commands; - CodeMirror2.keyMap = keyMap; - CodeMirror2.keyName = keyName; - CodeMirror2.isModifierKey = isModifierKey; - CodeMirror2.lookupKey = lookupKey; - CodeMirror2.normalizeKeyMap = normalizeKeyMap; - CodeMirror2.StringStream = StringStream; - CodeMirror2.SharedTextMarker = SharedTextMarker; - CodeMirror2.TextMarker = TextMarker; - CodeMirror2.LineWidget = LineWidget; - CodeMirror2.e_preventDefault = e_preventDefault; - CodeMirror2.e_stopPropagation = e_stopPropagation; - CodeMirror2.e_stop = e_stop; - CodeMirror2.addClass = addClass; - CodeMirror2.contains = contains; - CodeMirror2.rmClass = rmClass; - CodeMirror2.keyNames = keyNames; - } - defineOptions(CodeMirror); - addEditorMethods(CodeMirror); - var dontDelegate = "iter insert remove copy getEditor constructor".split(" "); - for (var prop in Doc.prototype) { - if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) { - CodeMirror.prototype[prop] = /* @__PURE__ */function (method) { - return function () { - return method.apply(this.doc, arguments); - }; - }(Doc.prototype[prop]); - } - } - eventMixin(Doc); - CodeMirror.inputStyles = { - "textarea": TextareaInput, - "contenteditable": ContentEditableInput - }; - CodeMirror.defineMode = function (name) { - if (!CodeMirror.defaults.mode && name != "null") { - CodeMirror.defaults.mode = name; - } - defineMode.apply(this, arguments); - }; - CodeMirror.defineMIME = defineMIME; - CodeMirror.defineMode("null", function () { - return { - token: function (stream) { - return stream.skipToEnd(); - } - }; - }); - CodeMirror.defineMIME("text/plain", "null"); - CodeMirror.defineExtension = function (name, func) { - CodeMirror.prototype[name] = func; - }; - CodeMirror.defineDocExtension = function (name, func) { - Doc.prototype[name] = func; - }; - CodeMirror.fromTextArea = fromTextArea; - addLegacyProps(CodeMirror); - CodeMirror.version = "5.65.3"; - return CodeMirror; - }); - })(codemirror); - return codemirror.exports; -} -exports.getDefaultExportFromCjs = getDefaultExportFromCjs; -exports.requireCodemirror = requireCodemirror; - -/***/ }), - -/***/ "../../graphiql-react/dist/comment.cjs.js": -/*!************************************************!*\ - !*** ../../graphiql-react/dist/comment.cjs.js ***! - \************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var comment$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var noOptions = {}; - var nonWS = /[^\s\u00a0]/; - var Pos = CodeMirror.Pos, - cmp = CodeMirror.cmpPos; - function firstNonWS(str) { - var found = str.search(nonWS); - return found == -1 ? 0 : found; - } - CodeMirror.commands.toggleComment = function (cm) { - cm.toggleComment(); - }; - CodeMirror.defineExtension("toggleComment", function (options) { - if (!options) options = noOptions; - var cm = this; - var minLine = Infinity, - ranges = this.listSelections(), - mode = null; - for (var i = ranges.length - 1; i >= 0; i--) { - var from = ranges[i].from(), - to = ranges[i].to(); - if (from.line >= minLine) continue; - if (to.line >= minLine) to = Pos(minLine, 0); - minLine = from.line; - if (mode == null) { - if (cm.uncomment(from, to, options)) mode = "un";else { - cm.lineComment(from, to, options); - mode = "line"; - } - } else if (mode == "un") { - cm.uncomment(from, to, options); - } else { - cm.lineComment(from, to, options); - } - } - }); - function probablyInsideString(cm, pos, line) { - return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line); - } - function getMode(cm, pos) { - var mode = cm.getMode(); - return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos); - } - CodeMirror.defineExtension("lineComment", function (from, to, options) { - if (!options) options = noOptions; - var self = this, - mode = getMode(self, from); - var firstLine = self.getLine(from.line); - if (firstLine == null || probablyInsideString(self, from, firstLine)) return; - var commentString = options.lineComment || mode.lineComment; - if (!commentString) { - if (options.blockCommentStart || mode.blockCommentStart) { - options.fullLines = true; - self.blockComment(from, to, options); - } - return; - } - var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1); - var pad = options.padding == null ? " " : options.padding; - var blankLines = options.commentBlankLines || from.line == to.line; - self.operation(function () { - if (options.indent) { - var baseString = null; - for (var i = from.line; i < end; ++i) { - var line = self.getLine(i); - var whitespace = line.slice(0, firstNonWS(line)); - if (baseString == null || baseString.length > whitespace.length) { - baseString = whitespace; - } - } - for (var i = from.line; i < end; ++i) { - var line = self.getLine(i), - cut = baseString.length; - if (!blankLines && !nonWS.test(line)) continue; - if (line.slice(0, cut) != baseString) cut = firstNonWS(line); - self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut)); - } - } else { - for (var i = from.line; i < end; ++i) { - if (blankLines || nonWS.test(self.getLine(i))) self.replaceRange(commentString + pad, Pos(i, 0)); - } - } - }); - }); - CodeMirror.defineExtension("blockComment", function (from, to, options) { - if (!options) options = noOptions; - var self = this, - mode = getMode(self, from); - var startString = options.blockCommentStart || mode.blockCommentStart; - var endString = options.blockCommentEnd || mode.blockCommentEnd; - if (!startString || !endString) { - if ((options.lineComment || mode.lineComment) && options.fullLines != false) self.lineComment(from, to, options); - return; - } - if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return; - var end = Math.min(to.line, self.lastLine()); - if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end; - var pad = options.padding == null ? " " : options.padding; - if (from.line > end) return; - self.operation(function () { - if (options.fullLines != false) { - var lastLineHasText = nonWS.test(self.getLine(end)); - self.replaceRange(pad + endString, Pos(end)); - self.replaceRange(startString + pad, Pos(from.line, 0)); - var lead = options.blockCommentLead || mode.blockCommentLead; - if (lead != null) { - for (var i = from.line + 1; i <= end; ++i) if (i != end || lastLineHasText) self.replaceRange(lead + pad, Pos(i, 0)); - } - } else { - var atCursor = cmp(self.getCursor("to"), to) == 0, - empty = !self.somethingSelected(); - self.replaceRange(endString, to); - if (atCursor) self.setSelection(empty ? to : self.getCursor("from"), to); - self.replaceRange(startString, from); - } - }); - }); - CodeMirror.defineExtension("uncomment", function (from, to, options) { - if (!options) options = noOptions; - var self = this, - mode = getMode(self, from); - var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), - start = Math.min(from.line, end); - var lineString = options.lineComment || mode.lineComment, - lines = []; - var pad = options.padding == null ? " " : options.padding, - didSomething; - lineComment: { - if (!lineString) break lineComment; - for (var i = start; i <= end; ++i) { - var line = self.getLine(i); - var found = line.indexOf(lineString); - if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1; - if (found == -1 && nonWS.test(line)) break lineComment; - if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment; - lines.push(line); - } - self.operation(function () { - for (var i2 = start; i2 <= end; ++i2) { - var line2 = lines[i2 - start]; - var pos = line2.indexOf(lineString), - endPos = pos + lineString.length; - if (pos < 0) continue; - if (line2.slice(endPos, endPos + pad.length) == pad) endPos += pad.length; - didSomething = true; - self.replaceRange("", Pos(i2, pos), Pos(i2, endPos)); - } - }); - if (didSomething) return true; - } - var startString = options.blockCommentStart || mode.blockCommentStart; - var endString = options.blockCommentEnd || mode.blockCommentEnd; - if (!startString || !endString) return false; - var lead = options.blockCommentLead || mode.blockCommentLead; - var startLine = self.getLine(start), - open = startLine.indexOf(startString); - if (open == -1) return false; - var endLine = end == start ? startLine : self.getLine(end); - var close = endLine.indexOf(endString, end == start ? open + startString.length : 0); - var insideStart = Pos(start, open + 1), - insideEnd = Pos(end, close + 1); - if (close == -1 || !/comment/.test(self.getTokenTypeAt(insideStart)) || !/comment/.test(self.getTokenTypeAt(insideEnd)) || self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1) return false; - var lastStart = startLine.lastIndexOf(startString, from.ch); - var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length); - if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false; - firstEnd = endLine.indexOf(endString, to.ch); - var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch); - lastStart = firstEnd == -1 || almostLastStart == -1 ? -1 : to.ch + almostLastStart; - if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false; - self.operation(function () { - self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)), Pos(end, close + endString.length)); - var openEnd = open + startString.length; - if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length; - self.replaceRange("", Pos(start, open), Pos(start, openEnd)); - if (lead) for (var i2 = start + 1; i2 <= end; ++i2) { - var line2 = self.getLine(i2), - found2 = line2.indexOf(lead); - if (found2 == -1 || nonWS.test(line2.slice(0, found2))) continue; - var foundEnd = found2 + lead.length; - if (pad && line2.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length; - self.replaceRange("", Pos(i2, found2), Pos(i2, foundEnd)); - } - }); - return true; - }); - }); -})(); -var commentExports = comment$2.exports; -const comment = /* @__PURE__ */codemirror.getDefaultExportFromCjs(commentExports); -const comment$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: comment -}, [commentExports]); -exports.comment = comment$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/dialog.cjs.js": -/*!***********************************************!*\ - !*** ../../graphiql-react/dist/dialog.cjs.js ***! - \***********************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var dialog$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - function dialogDiv(cm, template, bottom) { - var wrap = cm.getWrapperElement(); - var dialog2; - dialog2 = wrap.appendChild(document.createElement("div")); - if (bottom) dialog2.className = "CodeMirror-dialog CodeMirror-dialog-bottom";else dialog2.className = "CodeMirror-dialog CodeMirror-dialog-top"; - if (typeof template == "string") { - dialog2.innerHTML = template; - } else { - dialog2.appendChild(template); - } - CodeMirror.addClass(wrap, "dialog-opened"); - return dialog2; - } - function closeNotification(cm, newVal) { - if (cm.state.currentNotificationClose) cm.state.currentNotificationClose(); - cm.state.currentNotificationClose = newVal; - } - CodeMirror.defineExtension("openDialog", function (template, callback, options) { - if (!options) options = {}; - closeNotification(this, null); - var dialog2 = dialogDiv(this, template, options.bottom); - var closed = false, - me = this; - function close(newVal) { - if (typeof newVal == "string") { - inp.value = newVal; - } else { - if (closed) return; - closed = true; - CodeMirror.rmClass(dialog2.parentNode, "dialog-opened"); - dialog2.parentNode.removeChild(dialog2); - me.focus(); - if (options.onClose) options.onClose(dialog2); - } - } - var inp = dialog2.getElementsByTagName("input")[0], - button; - if (inp) { - inp.focus(); - if (options.value) { - inp.value = options.value; - if (options.selectValueOnOpen !== false) { - inp.select(); - } - } - if (options.onInput) CodeMirror.on(inp, "input", function (e) { - options.onInput(e, inp.value, close); - }); - if (options.onKeyUp) CodeMirror.on(inp, "keyup", function (e) { - options.onKeyUp(e, inp.value, close); - }); - CodeMirror.on(inp, "keydown", function (e) { - if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { - return; - } - if (e.keyCode == 27 || options.closeOnEnter !== false && e.keyCode == 13) { - inp.blur(); - CodeMirror.e_stop(e); - close(); - } - if (e.keyCode == 13) callback(inp.value, e); - }); - if (options.closeOnBlur !== false) CodeMirror.on(dialog2, "focusout", function (evt) { - if (evt.relatedTarget !== null) close(); - }); - } else if (button = dialog2.getElementsByTagName("button")[0]) { - CodeMirror.on(button, "click", function () { - close(); - me.focus(); - }); - if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close); - button.focus(); - } - return close; - }); - CodeMirror.defineExtension("openConfirm", function (template, callbacks, options) { - closeNotification(this, null); - var dialog2 = dialogDiv(this, template, options && options.bottom); - var buttons = dialog2.getElementsByTagName("button"); - var closed = false, - me = this, - blurring = 1; - function close() { - if (closed) return; - closed = true; - CodeMirror.rmClass(dialog2.parentNode, "dialog-opened"); - dialog2.parentNode.removeChild(dialog2); - me.focus(); - } - buttons[0].focus(); - for (var i = 0; i < buttons.length; ++i) { - var b = buttons[i]; - (function (callback) { - CodeMirror.on(b, "click", function (e) { - CodeMirror.e_preventDefault(e); - close(); - if (callback) callback(me); - }); - })(callbacks[i]); - CodeMirror.on(b, "blur", function () { - --blurring; - setTimeout(function () { - if (blurring <= 0) close(); - }, 200); - }); - CodeMirror.on(b, "focus", function () { - ++blurring; - }); - } - }); - CodeMirror.defineExtension("openNotification", function (template, options) { - closeNotification(this, close); - var dialog2 = dialogDiv(this, template, options && options.bottom); - var closed = false, - doneTimer; - var duration = options && typeof options.duration !== "undefined" ? options.duration : 5e3; - function close() { - if (closed) return; - closed = true; - clearTimeout(doneTimer); - CodeMirror.rmClass(dialog2.parentNode, "dialog-opened"); - dialog2.parentNode.removeChild(dialog2); - } - CodeMirror.on(dialog2, "click", function (e) { - CodeMirror.e_preventDefault(e); - close(); - }); - if (duration) doneTimer = setTimeout(close, duration); - return close; - }); - }); -})(); -var dialogExports = dialog$2.exports; -const dialog = /* @__PURE__ */codemirror.getDefaultExportFromCjs(dialogExports); -const dialog$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: dialog -}, [dialogExports]); -exports.dialog = dialog$1; -exports.dialogExports = dialogExports; - -/***/ }), - -/***/ "../../graphiql-react/dist/foldgutter.cjs.js": -/*!***************************************************!*\ - !*** ../../graphiql-react/dist/foldgutter.cjs.js ***! - \***************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var foldgutter$2 = { - exports: {} -}; -var foldcode = { - exports: {} -}; -var hasRequiredFoldcode; -function requireFoldcode() { - if (hasRequiredFoldcode) return foldcode.exports; - hasRequiredFoldcode = 1; - (function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - function doFold(cm, pos, options, force) { - if (options && options.call) { - var finder = options; - options = null; - } else { - var finder = getOption(cm, options, "rangeFinder"); - } - if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0); - var minSize = getOption(cm, options, "minFoldSize"); - function getRange(allowFolded) { - var range2 = finder(cm, pos); - if (!range2 || range2.to.line - range2.from.line < minSize) return null; - if (force === "fold") return range2; - var marks = cm.findMarksAt(range2.from); - for (var i = 0; i < marks.length; ++i) { - if (marks[i].__isFold) { - if (!allowFolded) return null; - range2.cleared = true; - marks[i].clear(); - } - } - return range2; - } - var range = getRange(true); - if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) { - pos = CodeMirror.Pos(pos.line - 1, 0); - range = getRange(false); - } - if (!range || range.cleared || force === "unfold") return; - var myWidget = makeWidget(cm, options, range); - CodeMirror.on(myWidget, "mousedown", function (e) { - myRange.clear(); - CodeMirror.e_preventDefault(e); - }); - var myRange = cm.markText(range.from, range.to, { - replacedWith: myWidget, - clearOnEnter: getOption(cm, options, "clearOnEnter"), - __isFold: true - }); - myRange.on("clear", function (from, to) { - CodeMirror.signal(cm, "unfold", cm, from, to); - }); - CodeMirror.signal(cm, "fold", cm, range.from, range.to); - } - function makeWidget(cm, options, range) { - var widget = getOption(cm, options, "widget"); - if (typeof widget == "function") { - widget = widget(range.from, range.to); - } - if (typeof widget == "string") { - var text = document.createTextNode(widget); - widget = document.createElement("span"); - widget.appendChild(text); - widget.className = "CodeMirror-foldmarker"; - } else if (widget) { - widget = widget.cloneNode(true); - } - return widget; - } - CodeMirror.newFoldFunction = function (rangeFinder, widget) { - return function (cm, pos) { - doFold(cm, pos, { - rangeFinder, - widget - }); - }; - }; - CodeMirror.defineExtension("foldCode", function (pos, options, force) { - doFold(this, pos, options, force); - }); - CodeMirror.defineExtension("isFolded", function (pos) { - var marks = this.findMarksAt(pos); - for (var i = 0; i < marks.length; ++i) if (marks[i].__isFold) return true; - }); - CodeMirror.commands.toggleFold = function (cm) { - cm.foldCode(cm.getCursor()); - }; - CodeMirror.commands.fold = function (cm) { - cm.foldCode(cm.getCursor(), null, "fold"); - }; - CodeMirror.commands.unfold = function (cm) { - cm.foldCode(cm.getCursor(), { - scanUp: false - }, "unfold"); - }; - CodeMirror.commands.foldAll = function (cm) { - cm.operation(function () { - for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++) cm.foldCode(CodeMirror.Pos(i, 0), { - scanUp: false - }, "fold"); - }); - }; - CodeMirror.commands.unfoldAll = function (cm) { - cm.operation(function () { - for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++) cm.foldCode(CodeMirror.Pos(i, 0), { - scanUp: false - }, "unfold"); - }); - }; - CodeMirror.registerHelper("fold", "combine", function () { - var funcs = Array.prototype.slice.call(arguments, 0); - return function (cm, start) { - for (var i = 0; i < funcs.length; ++i) { - var found = funcs[i](cm, start); - if (found) return found; - } - }; - }); - CodeMirror.registerHelper("fold", "auto", function (cm, start) { - var helpers = cm.getHelpers(start, "fold"); - for (var i = 0; i < helpers.length; i++) { - var cur = helpers[i](cm, start); - if (cur) return cur; - } - }); - var defaultOptions = { - rangeFinder: CodeMirror.fold.auto, - widget: "↔", - minFoldSize: 0, - scanUp: false, - clearOnEnter: true - }; - CodeMirror.defineOption("foldOptions", null); - function getOption(cm, options, name) { - if (options && options[name] !== void 0) return options[name]; - var editorOptions = cm.options.foldOptions; - if (editorOptions && editorOptions[name] !== void 0) return editorOptions[name]; - return defaultOptions[name]; - } - CodeMirror.defineExtension("foldOption", function (options, name) { - return getOption(this, options, name); - }); - }); - })(); - return foldcode.exports; -} -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror(), requireFoldcode()); - })(function (CodeMirror) { - CodeMirror.defineOption("foldGutter", false, function (cm, val, old) { - if (old && old != CodeMirror.Init) { - cm.clearGutter(cm.state.foldGutter.options.gutter); - cm.state.foldGutter = null; - cm.off("gutterClick", onGutterClick); - cm.off("changes", onChange); - cm.off("viewportChange", onViewportChange); - cm.off("fold", onFold); - cm.off("unfold", onFold); - cm.off("swapDoc", onChange); - } - if (val) { - cm.state.foldGutter = new State(parseOptions(val)); - updateInViewport(cm); - cm.on("gutterClick", onGutterClick); - cm.on("changes", onChange); - cm.on("viewportChange", onViewportChange); - cm.on("fold", onFold); - cm.on("unfold", onFold); - cm.on("swapDoc", onChange); - } - }); - var Pos = CodeMirror.Pos; - function State(options) { - this.options = options; - this.from = this.to = 0; - } - function parseOptions(opts) { - if (opts === true) opts = {}; - if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter"; - if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open"; - if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded"; - return opts; - } - function isFolded(cm, line) { - var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0)); - for (var i = 0; i < marks.length; ++i) { - if (marks[i].__isFold) { - var fromPos = marks[i].find(-1); - if (fromPos && fromPos.line === line) return marks[i]; - } - } - } - function marker(spec) { - if (typeof spec == "string") { - var elt = document.createElement("div"); - elt.className = spec + " CodeMirror-guttermarker-subtle"; - return elt; - } else { - return spec.cloneNode(true); - } - } - function updateFoldInfo(cm, from, to) { - var opts = cm.state.foldGutter.options, - cur = from - 1; - var minSize = cm.foldOption(opts, "minFoldSize"); - var func = cm.foldOption(opts, "rangeFinder"); - var clsFolded = typeof opts.indicatorFolded == "string" && classTest(opts.indicatorFolded); - var clsOpen = typeof opts.indicatorOpen == "string" && classTest(opts.indicatorOpen); - cm.eachLine(from, to, function (line) { - ++cur; - var mark = null; - var old = line.gutterMarkers; - if (old) old = old[opts.gutter]; - if (isFolded(cm, cur)) { - if (clsFolded && old && clsFolded.test(old.className)) return; - mark = marker(opts.indicatorFolded); - } else { - var pos = Pos(cur, 0); - var range = func && func(cm, pos); - if (range && range.to.line - range.from.line >= minSize) { - if (clsOpen && old && clsOpen.test(old.className)) return; - mark = marker(opts.indicatorOpen); - } - } - if (!mark && !old) return; - cm.setGutterMarker(line, opts.gutter, mark); - }); - } - function classTest(cls) { - return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); - } - function updateInViewport(cm) { - var vp = cm.getViewport(), - state = cm.state.foldGutter; - if (!state) return; - cm.operation(function () { - updateFoldInfo(cm, vp.from, vp.to); - }); - state.from = vp.from; - state.to = vp.to; - } - function onGutterClick(cm, line, gutter) { - var state = cm.state.foldGutter; - if (!state) return; - var opts = state.options; - if (gutter != opts.gutter) return; - var folded = isFolded(cm, line); - if (folded) folded.clear();else cm.foldCode(Pos(line, 0), opts); - } - function onChange(cm) { - var state = cm.state.foldGutter; - if (!state) return; - var opts = state.options; - state.from = state.to = 0; - clearTimeout(state.changeUpdate); - state.changeUpdate = setTimeout(function () { - updateInViewport(cm); - }, opts.foldOnChangeTimeSpan || 600); - } - function onViewportChange(cm) { - var state = cm.state.foldGutter; - if (!state) return; - var opts = state.options; - clearTimeout(state.changeUpdate); - state.changeUpdate = setTimeout(function () { - var vp = cm.getViewport(); - if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) { - updateInViewport(cm); - } else { - cm.operation(function () { - if (vp.from < state.from) { - updateFoldInfo(cm, vp.from, state.from); - state.from = vp.from; - } - if (vp.to > state.to) { - updateFoldInfo(cm, state.to, vp.to); - state.to = vp.to; - } - }); - } - }, opts.updateViewportTimeSpan || 400); - } - function onFold(cm, from) { - var state = cm.state.foldGutter; - if (!state) return; - var line = from.line; - if (line >= state.from && line < state.to) updateFoldInfo(cm, line, line + 1); - } - }); -})(); -var foldgutterExports = foldgutter$2.exports; -const foldgutter = /* @__PURE__ */codemirror.getDefaultExportFromCjs(foldgutterExports); -const foldgutter$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: foldgutter -}, [foldgutterExports]); -exports.foldgutter = foldgutter$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/forEachState.cjs.js": -/*!*****************************************************!*\ - !*** ../../graphiql-react/dist/forEachState.cjs.js ***! - \*****************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -function forEachState(stack, fn) { - const reverseStateStack = []; - let state = stack; - while (state === null || state === void 0 ? void 0 : state.kind) { - reverseStateStack.push(state); - state = state.prevState; - } - for (let i = reverseStateStack.length - 1; i >= 0; i--) { - fn(reverseStateStack[i]); - } -} -exports.forEachState = forEachState; - -/***/ }), - -/***/ "../../graphiql-react/dist/hint.cjs.js": -/*!*********************************************!*\ - !*** ../../graphiql-react/dist/hint.cjs.js ***! - \*********************************************/ +/***/ "../../codemirror-graphql/esm/hint.js": +/*!********************************************!*\ + !*** ../../codemirror-graphql/esm/hint.js ***! + \********************************************/ /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { +"use strict"; -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -__webpack_require__(/*! ./show-hint.cjs.js */ "../../graphiql-react/dist/show-hint.cjs.js"); -const graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); -codemirror.CodeMirror.registerHelper("hint", "graphql", (editor, options) => { +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +__webpack_require__(/*! codemirror/addon/hint/show-hint.js */ "../../../node_modules/codemirror/addon/hint/show-hint.js"); +var _graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.registerHelper('hint', 'graphql', (editor, options) => { const { schema, externalFragments, @@ -68130,8 +73292,8 @@ codemirror.CodeMirror.registerHelper("hint", "graphql", (editor, options) => { const cur = editor.getCursor(); const token = editor.getTokenAt(cur); const tokenStart = token.type !== null && /"|\w/.test(token.string[0]) ? token.start : token.end; - const position = new graphqlLanguageService.Position(cur.line, tokenStart); - const rawResults = graphqlLanguageService.getAutocompleteSuggestions(schema, editor.getValue(), position, token, externalFragments, autocompleteOptions); + const position = new _graphqlLanguageService.Position(cur.line, tokenStart); + const rawResults = (0, _graphqlLanguageService.getAutocompleteSuggestions)(schema, editor.getValue(), position, token, externalFragments, autocompleteOptions); const results = { list: rawResults.map(item => { var _a; @@ -68153,26 +73315,611 @@ codemirror.CodeMirror.registerHelper("hint", "graphql", (editor, options) => { } }; if ((results === null || results === void 0 ? void 0 : results.list) && results.list.length > 0) { - results.from = codemirror.CodeMirror.Pos(results.from.line, results.from.ch); - results.to = codemirror.CodeMirror.Pos(results.to.line, results.to.ch); - codemirror.CodeMirror.signal(editor, "hasCompletion", editor, results, token); + results.from = _codemirror.default.Pos(results.from.line, results.from.ch); + results.to = _codemirror.default.Pos(results.to.line, results.to.ch); + _codemirror.default.signal(editor, 'hasCompletion', editor, results, token); } return results; }); /***/ }), -/***/ "../../graphiql-react/dist/hint.cjs2.js": -/*!**********************************************!*\ - !*** ../../graphiql-react/dist/hint.cjs2.js ***! - \**********************************************/ +/***/ "../../codemirror-graphql/esm/info.js": +/*!********************************************!*\ + !*** ../../codemirror-graphql/esm/info.js ***! + \********************************************/ /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { +"use strict"; -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); -const forEachState = __webpack_require__(/*! ./forEachState.cjs.js */ "../../graphiql-react/dist/forEachState.cjs.js"); +var _graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _getTypeInfo = _interopRequireDefault(__webpack_require__(/*! ./utils/getTypeInfo */ "../../codemirror-graphql/esm/utils/getTypeInfo.js")); +var _SchemaReference = __webpack_require__(/*! ./utils/SchemaReference */ "../../codemirror-graphql/esm/utils/SchemaReference.js"); +__webpack_require__(/*! ./utils/info-addon */ "../../codemirror-graphql/esm/utils/info-addon.js"); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.registerHelper('info', 'graphql', (token, options) => { + var _a; + if (!options.schema || !token.state) { + return; + } + const { + kind, + step + } = token.state; + const typeInfo = (0, _getTypeInfo.default)(options.schema, token.state); + if (kind === 'Field' && step === 0 && typeInfo.fieldDef || kind === 'AliasedField' && step === 2 && typeInfo.fieldDef || kind === 'ObjectField' && step === 0 && typeInfo.fieldDef) { + const header = document.createElement('div'); + header.className = 'CodeMirror-info-header'; + renderField(header, typeInfo, options); + const into = document.createElement('div'); + into.append(header); + renderDescription(into, options, typeInfo.fieldDef); + return into; + } + if (kind === 'Directive' && step === 1 && typeInfo.directiveDef) { + const header = document.createElement('div'); + header.className = 'CodeMirror-info-header'; + renderDirective(header, typeInfo, options); + const into = document.createElement('div'); + into.append(header); + renderDescription(into, options, typeInfo.directiveDef); + return into; + } + if (kind === 'Argument' && step === 0 && typeInfo.argDef) { + const header = document.createElement('div'); + header.className = 'CodeMirror-info-header'; + renderArg(header, typeInfo, options); + const into = document.createElement('div'); + into.append(header); + renderDescription(into, options, typeInfo.argDef); + return into; + } + if (kind === 'EnumValue' && ((_a = typeInfo.enumValue) === null || _a === void 0 ? void 0 : _a.description)) { + const header = document.createElement('div'); + header.className = 'CodeMirror-info-header'; + renderEnumValue(header, typeInfo, options); + const into = document.createElement('div'); + into.append(header); + renderDescription(into, options, typeInfo.enumValue); + return into; + } + if (kind === 'NamedType' && typeInfo.type && typeInfo.type.description) { + const header = document.createElement('div'); + header.className = 'CodeMirror-info-header'; + renderType(header, typeInfo, options, typeInfo.type); + const into = document.createElement('div'); + into.append(header); + renderDescription(into, options, typeInfo.type); + return into; + } +}); +function renderField(into, typeInfo, options) { + renderQualifiedField(into, typeInfo, options); + renderTypeAnnotation(into, typeInfo, options, typeInfo.type); +} +function renderQualifiedField(into, typeInfo, options) { + var _a; + const fieldName = ((_a = typeInfo.fieldDef) === null || _a === void 0 ? void 0 : _a.name) || ''; + text(into, fieldName, 'field-name', options, (0, _SchemaReference.getFieldReference)(typeInfo)); +} +function renderDirective(into, typeInfo, options) { + var _a; + const name = '@' + (((_a = typeInfo.directiveDef) === null || _a === void 0 ? void 0 : _a.name) || ''); + text(into, name, 'directive-name', options, (0, _SchemaReference.getDirectiveReference)(typeInfo)); +} +function renderArg(into, typeInfo, options) { + var _a; + const name = ((_a = typeInfo.argDef) === null || _a === void 0 ? void 0 : _a.name) || ''; + text(into, name, 'arg-name', options, (0, _SchemaReference.getArgumentReference)(typeInfo)); + renderTypeAnnotation(into, typeInfo, options, typeInfo.inputType); +} +function renderEnumValue(into, typeInfo, options) { + var _a; + const name = ((_a = typeInfo.enumValue) === null || _a === void 0 ? void 0 : _a.name) || ''; + renderType(into, typeInfo, options, typeInfo.inputType); + text(into, '.'); + text(into, name, 'enum-value', options, (0, _SchemaReference.getEnumValueReference)(typeInfo)); +} +function renderTypeAnnotation(into, typeInfo, options, t) { + const typeSpan = document.createElement('span'); + typeSpan.className = 'type-name-pill'; + if (t instanceof _graphql.GraphQLNonNull) { + renderType(typeSpan, typeInfo, options, t.ofType); + text(typeSpan, '!'); + } else if (t instanceof _graphql.GraphQLList) { + text(typeSpan, '['); + renderType(typeSpan, typeInfo, options, t.ofType); + text(typeSpan, ']'); + } else { + text(typeSpan, (t === null || t === void 0 ? void 0 : t.name) || '', 'type-name', options, (0, _SchemaReference.getTypeReference)(typeInfo, t)); + } + into.append(typeSpan); +} +function renderType(into, typeInfo, options, t) { + if (t instanceof _graphql.GraphQLNonNull) { + renderType(into, typeInfo, options, t.ofType); + text(into, '!'); + } else if (t instanceof _graphql.GraphQLList) { + text(into, '['); + renderType(into, typeInfo, options, t.ofType); + text(into, ']'); + } else { + text(into, (t === null || t === void 0 ? void 0 : t.name) || '', 'type-name', options, (0, _SchemaReference.getTypeReference)(typeInfo, t)); + } +} +function renderDescription(into, options, def) { + const { + description + } = def; + if (description) { + const descriptionDiv = document.createElement('div'); + descriptionDiv.className = 'info-description'; + if (options.renderDescription) { + descriptionDiv.innerHTML = options.renderDescription(description); + } else { + descriptionDiv.append(document.createTextNode(description)); + } + into.append(descriptionDiv); + } + renderDeprecation(into, options, def); +} +function renderDeprecation(into, options, def) { + const reason = def.deprecationReason; + if (reason) { + const deprecationDiv = document.createElement('div'); + deprecationDiv.className = 'info-deprecation'; + into.append(deprecationDiv); + const label = document.createElement('span'); + label.className = 'info-deprecation-label'; + label.append(document.createTextNode('Deprecated')); + deprecationDiv.append(label); + const reasonDiv = document.createElement('div'); + reasonDiv.className = 'info-deprecation-reason'; + if (options.renderDescription) { + reasonDiv.innerHTML = options.renderDescription(reason); + } else { + reasonDiv.append(document.createTextNode(reason)); + } + deprecationDiv.append(reasonDiv); + } +} +function text(into, content, className = '', options = { + onClick: null +}, ref = null) { + if (className) { + const { + onClick + } = options; + let node; + if (onClick) { + node = document.createElement('a'); + node.href = 'javascript:void 0'; + node.addEventListener('click', e => { + e.preventDefault(); + onClick(ref, e); + }); + } else { + node = document.createElement('span'); + } + node.className = className; + node.append(document.createTextNode(content)); + into.append(node); + } else { + into.append(document.createTextNode(content)); + } +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/jump.js": +/*!********************************************!*\ + !*** ../../codemirror-graphql/esm/jump.js ***! + \********************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _getTypeInfo = _interopRequireDefault(__webpack_require__(/*! ./utils/getTypeInfo */ "../../codemirror-graphql/esm/utils/getTypeInfo.js")); +var _SchemaReference = __webpack_require__(/*! ./utils/SchemaReference */ "../../codemirror-graphql/esm/utils/SchemaReference.js"); +__webpack_require__(/*! ./utils/jump-addon */ "../../codemirror-graphql/esm/utils/jump-addon.js"); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.registerHelper('jump', 'graphql', (token, options) => { + if (!options.schema || !options.onClick || !token.state) { + return; + } + const { + state + } = token; + const { + kind, + step + } = state; + const typeInfo = (0, _getTypeInfo.default)(options.schema, state); + if (kind === 'Field' && step === 0 && typeInfo.fieldDef || kind === 'AliasedField' && step === 2 && typeInfo.fieldDef) { + return (0, _SchemaReference.getFieldReference)(typeInfo); + } + if (kind === 'Directive' && step === 1 && typeInfo.directiveDef) { + return (0, _SchemaReference.getDirectiveReference)(typeInfo); + } + if (kind === 'Argument' && step === 0 && typeInfo.argDef) { + return (0, _SchemaReference.getArgumentReference)(typeInfo); + } + if (kind === 'EnumValue' && typeInfo.enumValue) { + return (0, _SchemaReference.getEnumValueReference)(typeInfo); + } + if (kind === 'NamedType' && typeInfo.type) { + return (0, _SchemaReference.getTypeReference)(typeInfo); + } +}); + +/***/ }), + +/***/ "../../codemirror-graphql/esm/lint.js": +/*!********************************************!*\ + !*** ../../codemirror-graphql/esm/lint.js ***! + \********************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +const SEVERITY = ['error', 'warning', 'information', 'hint']; +const TYPE = { + 'GraphQL: Validation': 'validation', + 'GraphQL: Deprecation': 'deprecation', + 'GraphQL: Syntax': 'syntax' +}; +_codemirror.default.registerHelper('lint', 'graphql', (text, options) => { + const { + schema, + validationRules, + externalFragments + } = options; + const rawResults = (0, _graphqlLanguageService.getDiagnostics)(text, schema, validationRules, undefined, externalFragments); + const results = rawResults.map(error => ({ + message: error.message, + severity: error.severity ? SEVERITY[error.severity - 1] : SEVERITY[0], + type: error.source ? TYPE[error.source] : undefined, + from: _codemirror.default.Pos(error.range.start.line, error.range.start.character), + to: _codemirror.default.Pos(error.range.end.line, error.range.end.character) + })); + return results; +}); + +/***/ }), + +/***/ "../../codemirror-graphql/esm/mode.js": +/*!********************************************!*\ + !*** ../../codemirror-graphql/esm/mode.js ***! + \********************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _modeFactory = _interopRequireDefault(__webpack_require__(/*! ./utils/mode-factory */ "../../codemirror-graphql/esm/utils/mode-factory.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.defineMode('graphql', _modeFactory.default); + +/***/ }), + +/***/ "../../codemirror-graphql/esm/results/mode.js": +/*!****************************************************!*\ + !*** ../../codemirror-graphql/esm/results/mode.js ***! + \****************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); +var _modeIndent = _interopRequireDefault(__webpack_require__(/*! ../utils/mode-indent */ "../../codemirror-graphql/esm/utils/mode-indent.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.defineMode('graphql-results', config => { + const parser = (0, _graphqlLanguageService.onlineParser)({ + eatWhitespace: stream => stream.eatSpace(), + lexRules: LexRules, + parseRules: ParseRules, + editorConfig: { + tabSize: config.tabSize + } + }); + return { + config, + startState: parser.startState, + token: parser.token, + indent: _modeIndent.default, + electricInput: /^\s*[}\]]/, + fold: 'brace', + closeBrackets: { + pairs: '[]{}""', + explode: '[]{}' + } + }; +}); +const LexRules = { + Punctuation: /^\[|]|\{|\}|:|,/, + Number: /^-?(?:0|(?:[1-9][0-9]*))(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?/, + String: /^"(?:[^"\\]|\\(?:"|\/|\\|b|f|n|r|t|u[0-9a-fA-F]{4}))*"?/, + Keyword: /^true|false|null/ +}; +const ParseRules = { + Document: [(0, _graphqlLanguageService.p)('{'), (0, _graphqlLanguageService.list)('Entry', (0, _graphqlLanguageService.p)(',')), (0, _graphqlLanguageService.p)('}')], + Entry: [(0, _graphqlLanguageService.t)('String', 'def'), (0, _graphqlLanguageService.p)(':'), 'Value'], + Value(token) { + switch (token.kind) { + case 'Number': + return 'NumberValue'; + case 'String': + return 'StringValue'; + case 'Punctuation': + switch (token.value) { + case '[': + return 'ListValue'; + case '{': + return 'ObjectValue'; + } + return null; + case 'Keyword': + switch (token.value) { + case 'true': + case 'false': + return 'BooleanValue'; + case 'null': + return 'NullValue'; + } + return null; + } + }, + NumberValue: [(0, _graphqlLanguageService.t)('Number', 'number')], + StringValue: [(0, _graphqlLanguageService.t)('String', 'string')], + BooleanValue: [(0, _graphqlLanguageService.t)('Keyword', 'builtin')], + NullValue: [(0, _graphqlLanguageService.t)('Keyword', 'keyword')], + ListValue: [(0, _graphqlLanguageService.p)('['), (0, _graphqlLanguageService.list)('Value', (0, _graphqlLanguageService.p)(',')), (0, _graphqlLanguageService.p)(']')], + ObjectValue: [(0, _graphqlLanguageService.p)('{'), (0, _graphqlLanguageService.list)('ObjectField', (0, _graphqlLanguageService.p)(',')), (0, _graphqlLanguageService.p)('}')], + ObjectField: [(0, _graphqlLanguageService.t)('String', 'property'), (0, _graphqlLanguageService.p)(':'), 'Value'] +}; + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/SchemaReference.js": +/*!*************************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/SchemaReference.js ***! + \*************************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports.getArgumentReference = getArgumentReference; +exports.getDirectiveReference = getDirectiveReference; +exports.getEnumValueReference = getEnumValueReference; +exports.getFieldReference = getFieldReference; +exports.getTypeReference = getTypeReference; +var _graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); +function getFieldReference(typeInfo) { + return { + kind: 'Field', + schema: typeInfo.schema, + field: typeInfo.fieldDef, + type: isMetaField(typeInfo.fieldDef) ? null : typeInfo.parentType + }; +} +function getDirectiveReference(typeInfo) { + return { + kind: 'Directive', + schema: typeInfo.schema, + directive: typeInfo.directiveDef + }; +} +function getArgumentReference(typeInfo) { + return typeInfo.directiveDef ? { + kind: 'Argument', + schema: typeInfo.schema, + argument: typeInfo.argDef, + directive: typeInfo.directiveDef + } : { + kind: 'Argument', + schema: typeInfo.schema, + argument: typeInfo.argDef, + field: typeInfo.fieldDef, + type: isMetaField(typeInfo.fieldDef) ? null : typeInfo.parentType + }; +} +function getEnumValueReference(typeInfo) { + return { + kind: 'EnumValue', + value: typeInfo.enumValue || undefined, + type: typeInfo.inputType ? (0, _graphql.getNamedType)(typeInfo.inputType) : undefined + }; +} +function getTypeReference(typeInfo, type) { + return { + kind: 'Type', + schema: typeInfo.schema, + type: type || typeInfo.type + }; +} +function isMetaField(fieldDef) { + return fieldDef.name.slice(0, 2) === '__'; +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/forEachState.js": +/*!**********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/forEachState.js ***! + \**********************************************************/ +/***/ (function(__unused_webpack_module, exports) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports["default"] = forEachState; +function forEachState(stack, fn) { + const reverseStateStack = []; + let state = stack; + while (state === null || state === void 0 ? void 0 : state.kind) { + reverseStateStack.push(state); + state = state.prevState; + } + for (let i = reverseStateStack.length - 1; i >= 0; i--) { + fn(reverseStateStack[i]); + } +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/getTypeInfo.js": +/*!*********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/getTypeInfo.js ***! + \*********************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports["default"] = getTypeInfo; +var _graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); +var _forEachState = _interopRequireDefault(__webpack_require__(/*! ./forEachState */ "../../codemirror-graphql/esm/utils/forEachState.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +function getTypeInfo(schema, tokenState) { + const info = { + schema, + type: null, + parentType: null, + inputType: null, + directiveDef: null, + fieldDef: null, + argDef: null, + argDefs: null, + objectFieldDefs: null + }; + (0, _forEachState.default)(tokenState, state => { + var _a, _b; + switch (state.kind) { + case 'Query': + case 'ShortQuery': + info.type = schema.getQueryType(); + break; + case 'Mutation': + info.type = schema.getMutationType(); + break; + case 'Subscription': + info.type = schema.getSubscriptionType(); + break; + case 'InlineFragment': + case 'FragmentDefinition': + if (state.type) { + info.type = schema.getType(state.type); + } + break; + case 'Field': + case 'AliasedField': + info.fieldDef = info.type && state.name ? getFieldDef(schema, info.parentType, state.name) : null; + info.type = (_a = info.fieldDef) === null || _a === void 0 ? void 0 : _a.type; + break; + case 'SelectionSet': + info.parentType = info.type ? (0, _graphql.getNamedType)(info.type) : null; + break; + case 'Directive': + info.directiveDef = state.name ? schema.getDirective(state.name) : null; + break; + case 'Arguments': + const parentDef = state.prevState ? state.prevState.kind === 'Field' ? info.fieldDef : state.prevState.kind === 'Directive' ? info.directiveDef : state.prevState.kind === 'AliasedField' ? state.prevState.name && getFieldDef(schema, info.parentType, state.prevState.name) : null : null; + info.argDefs = parentDef ? parentDef.args : null; + break; + case 'Argument': + info.argDef = null; + if (info.argDefs) { + for (let i = 0; i < info.argDefs.length; i++) { + if (info.argDefs[i].name === state.name) { + info.argDef = info.argDefs[i]; + break; + } + } + } + info.inputType = (_b = info.argDef) === null || _b === void 0 ? void 0 : _b.type; + break; + case 'EnumValue': + const enumType = info.inputType ? (0, _graphql.getNamedType)(info.inputType) : null; + info.enumValue = enumType instanceof _graphql.GraphQLEnumType ? find(enumType.getValues(), val => val.value === state.name) : null; + break; + case 'ListValue': + const nullableType = info.inputType ? (0, _graphql.getNullableType)(info.inputType) : null; + info.inputType = nullableType instanceof _graphql.GraphQLList ? nullableType.ofType : null; + break; + case 'ObjectValue': + const objectType = info.inputType ? (0, _graphql.getNamedType)(info.inputType) : null; + info.objectFieldDefs = objectType instanceof _graphql.GraphQLInputObjectType ? objectType.getFields() : null; + break; + case 'ObjectField': + const objectField = state.name && info.objectFieldDefs ? info.objectFieldDefs[state.name] : null; + info.inputType = objectField === null || objectField === void 0 ? void 0 : objectField.type; + info.fieldDef = objectField; + break; + case 'NamedType': + info.type = state.name ? schema.getType(state.name) : null; + break; + } + }); + return info; +} +function getFieldDef(schema, type, fieldName) { + if (fieldName === _graphql.SchemaMetaFieldDef.name && schema.getQueryType() === type) { + return _graphql.SchemaMetaFieldDef; + } + if (fieldName === _graphql.TypeMetaFieldDef.name && schema.getQueryType() === type) { + return _graphql.TypeMetaFieldDef; + } + if (fieldName === _graphql.TypeNameMetaFieldDef.name && (0, _graphql.isCompositeType)(type)) { + return _graphql.TypeNameMetaFieldDef; + } + if (type && type.getFields) { + return type.getFields()[fieldName]; + } +} +function find(array, predicate) { + for (let i = 0; i < array.length; i++) { + if (predicate(array[i])) { + return array[i]; + } + } +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/hintList.js": +/*!******************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/hintList.js ***! + \******************************************************/ +/***/ (function(__unused_webpack_module, exports) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports["default"] = hintList; function hintList(cursor, token, list) { const hints = filterAndSortList(list, normalizeText(token.string)); if (!hints) { @@ -68208,7 +73955,7 @@ function filterNonEmpty(array, predicate) { return filtered.length === 0 ? array : filtered; } function normalizeText(text) { - return text.toLowerCase().replaceAll(/\W/g, ""); + return text.toLowerCase().replaceAll(/\W/g, ''); } function getProximity(suggestion, text) { let proximity = lexicalDistance(text, suggestion); @@ -68241,26 +73988,668 @@ function lexicalDistance(a, b) { } return d[aLength][bLength]; } -codemirror.CodeMirror.registerHelper("hint", "graphql-variables", (editor, options) => { + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/info-addon.js": +/*!********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/info-addon.js ***! + \********************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.defineOption('info', false, (cm, options, old) => { + if (old && old !== _codemirror.default.Init) { + const oldOnMouseOver = cm.state.info.onMouseOver; + _codemirror.default.off(cm.getWrapperElement(), 'mouseover', oldOnMouseOver); + clearTimeout(cm.state.info.hoverTimeout); + delete cm.state.info; + } + if (options) { + const state = cm.state.info = createState(options); + state.onMouseOver = onMouseOver.bind(null, cm); + _codemirror.default.on(cm.getWrapperElement(), 'mouseover', state.onMouseOver); + } +}); +function createState(options) { + return { + options: options instanceof Function ? { + render: options + } : options === true ? {} : options + }; +} +function getHoverTime(cm) { + const { + options + } = cm.state.info; + return (options === null || options === void 0 ? void 0 : options.hoverTime) || 500; +} +function onMouseOver(cm, e) { + const state = cm.state.info; + const target = e.target || e.srcElement; + if (!(target instanceof HTMLElement)) { + return; + } + if (target.nodeName !== 'SPAN' || state.hoverTimeout !== undefined) { + return; + } + const box = target.getBoundingClientRect(); + const onMouseMove = function () { + clearTimeout(state.hoverTimeout); + state.hoverTimeout = setTimeout(onHover, hoverTime); + }; + const onMouseOut = function () { + _codemirror.default.off(document, 'mousemove', onMouseMove); + _codemirror.default.off(cm.getWrapperElement(), 'mouseout', onMouseOut); + clearTimeout(state.hoverTimeout); + state.hoverTimeout = undefined; + }; + const onHover = function () { + _codemirror.default.off(document, 'mousemove', onMouseMove); + _codemirror.default.off(cm.getWrapperElement(), 'mouseout', onMouseOut); + state.hoverTimeout = undefined; + onMouseHover(cm, box); + }; + const hoverTime = getHoverTime(cm); + state.hoverTimeout = setTimeout(onHover, hoverTime); + _codemirror.default.on(document, 'mousemove', onMouseMove); + _codemirror.default.on(cm.getWrapperElement(), 'mouseout', onMouseOut); +} +function onMouseHover(cm, box) { + const pos = cm.coordsChar({ + left: (box.left + box.right) / 2, + top: (box.top + box.bottom) / 2 + }, 'window'); + const state = cm.state.info; + const { + options + } = state; + const render = options.render || cm.getHelper(pos, 'info'); + if (render) { + const token = cm.getTokenAt(pos, true); + if (token) { + const info = render(token, options, cm, pos); + if (info) { + showPopup(cm, box, info); + } + } + } +} +function showPopup(cm, box, info) { + const popup = document.createElement('div'); + popup.className = 'CodeMirror-info'; + popup.append(info); + document.body.append(popup); + const popupBox = popup.getBoundingClientRect(); + const popupStyle = window.getComputedStyle(popup); + const popupWidth = popupBox.right - popupBox.left + parseFloat(popupStyle.marginLeft) + parseFloat(popupStyle.marginRight); + const popupHeight = popupBox.bottom - popupBox.top + parseFloat(popupStyle.marginTop) + parseFloat(popupStyle.marginBottom); + let topPos = box.bottom; + if (popupHeight > window.innerHeight - box.bottom - 15 && box.top > window.innerHeight - box.bottom) { + topPos = box.top - popupHeight; + } + if (topPos < 0) { + topPos = box.bottom; + } + let leftPos = Math.max(0, window.innerWidth - popupWidth - 15); + if (leftPos > box.left) { + leftPos = box.left; + } + popup.style.opacity = '1'; + popup.style.top = topPos + 'px'; + popup.style.left = leftPos + 'px'; + let popupTimeout; + const onMouseOverPopup = function () { + clearTimeout(popupTimeout); + }; + const onMouseOut = function () { + clearTimeout(popupTimeout); + popupTimeout = setTimeout(hidePopup, 200); + }; + const hidePopup = function () { + _codemirror.default.off(popup, 'mouseover', onMouseOverPopup); + _codemirror.default.off(popup, 'mouseout', onMouseOut); + _codemirror.default.off(cm.getWrapperElement(), 'mouseout', onMouseOut); + if (popup.style.opacity) { + popup.style.opacity = '0'; + setTimeout(() => { + if (popup.parentNode) { + popup.remove(); + } + }, 600); + } else if (popup.parentNode) { + popup.remove(); + } + }; + _codemirror.default.on(popup, 'mouseover', onMouseOverPopup); + _codemirror.default.on(popup, 'mouseout', onMouseOut); + _codemirror.default.on(cm.getWrapperElement(), 'mouseout', onMouseOut); +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/jsonParse.js": +/*!*******************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/jsonParse.js ***! + \*******************************************************/ +/***/ (function(__unused_webpack_module, exports) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports.JSONSyntaxError = void 0; +exports["default"] = jsonParse; +function jsonParse(str) { + string = str; + strLen = str.length; + start = end = lastEnd = -1; + ch(); + lex(); + const ast = parseObj(); + expect('EOF'); + return ast; +} +let string; +let strLen; +let start; +let end; +let lastEnd; +let code; +let kind; +function parseObj() { + const nodeStart = start; + const members = []; + expect('{'); + if (!skip('}')) { + do { + members.push(parseMember()); + } while (skip(',')); + expect('}'); + } + return { + kind: 'Object', + start: nodeStart, + end: lastEnd, + members + }; +} +function parseMember() { + const nodeStart = start; + const key = kind === 'String' ? curToken() : null; + expect('String'); + expect(':'); + const value = parseVal(); + return { + kind: 'Member', + start: nodeStart, + end: lastEnd, + key, + value + }; +} +function parseArr() { + const nodeStart = start; + const values = []; + expect('['); + if (!skip(']')) { + do { + values.push(parseVal()); + } while (skip(',')); + expect(']'); + } + return { + kind: 'Array', + start: nodeStart, + end: lastEnd, + values + }; +} +function parseVal() { + switch (kind) { + case '[': + return parseArr(); + case '{': + return parseObj(); + case 'String': + case 'Number': + case 'Boolean': + case 'Null': + const token = curToken(); + lex(); + return token; + } + expect('Value'); +} +function curToken() { + return { + kind, + start, + end, + value: JSON.parse(string.slice(start, end)) + }; +} +function expect(str) { + if (kind === str) { + lex(); + return; + } + let found; + if (kind === 'EOF') { + found = '[end of file]'; + } else if (end - start > 1) { + found = '`' + string.slice(start, end) + '`'; + } else { + const match = string.slice(start).match(/^.+?\b/); + found = '`' + (match ? match[0] : string[start]) + '`'; + } + throw syntaxError(`Expected ${str} but found ${found}.`); +} +class JSONSyntaxError extends Error { + constructor(message, position) { + super(message); + this.position = position; + } +} +exports.JSONSyntaxError = JSONSyntaxError; +function syntaxError(message) { + return new JSONSyntaxError(message, { + start, + end + }); +} +function skip(k) { + if (kind === k) { + lex(); + return true; + } +} +function ch() { + if (end < strLen) { + end++; + code = end === strLen ? 0 : string.charCodeAt(end); + } + return code; +} +function lex() { + lastEnd = end; + while (code === 9 || code === 10 || code === 13 || code === 32) { + ch(); + } + if (code === 0) { + kind = 'EOF'; + return; + } + start = end; + switch (code) { + case 34: + kind = 'String'; + return readString(); + case 45: + case 48: + case 49: + case 50: + case 51: + case 52: + case 53: + case 54: + case 55: + case 56: + case 57: + kind = 'Number'; + return readNumber(); + case 102: + if (string.slice(start, start + 5) !== 'false') { + break; + } + end += 4; + ch(); + kind = 'Boolean'; + return; + case 110: + if (string.slice(start, start + 4) !== 'null') { + break; + } + end += 3; + ch(); + kind = 'Null'; + return; + case 116: + if (string.slice(start, start + 4) !== 'true') { + break; + } + end += 3; + ch(); + kind = 'Boolean'; + return; + } + kind = string[start]; + ch(); +} +function readString() { + ch(); + while (code !== 34 && code > 31) { + if (code === 92) { + code = ch(); + switch (code) { + case 34: + case 47: + case 92: + case 98: + case 102: + case 110: + case 114: + case 116: + ch(); + break; + case 117: + ch(); + readHex(); + readHex(); + readHex(); + readHex(); + break; + default: + throw syntaxError('Bad character escape sequence.'); + } + } else if (end === strLen) { + throw syntaxError('Unterminated string.'); + } else { + ch(); + } + } + if (code === 34) { + ch(); + return; + } + throw syntaxError('Unterminated string.'); +} +function readHex() { + if (code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102) { + return ch(); + } + throw syntaxError('Expected hexadecimal digit.'); +} +function readNumber() { + if (code === 45) { + ch(); + } + if (code === 48) { + ch(); + } else { + readDigits(); + } + if (code === 46) { + ch(); + readDigits(); + } + if (code === 69 || code === 101) { + code = ch(); + if (code === 43 || code === 45) { + ch(); + } + readDigits(); + } +} +function readDigits() { + if (code < 48 || code > 57) { + throw syntaxError('Expected decimal digit.'); + } + do { + ch(); + } while (code >= 48 && code <= 57); +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/jump-addon.js": +/*!********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/jump-addon.js ***! + \********************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.defineOption('jump', false, (cm, options, old) => { + if (old && old !== _codemirror.default.Init) { + const oldOnMouseOver = cm.state.jump.onMouseOver; + _codemirror.default.off(cm.getWrapperElement(), 'mouseover', oldOnMouseOver); + const oldOnMouseOut = cm.state.jump.onMouseOut; + _codemirror.default.off(cm.getWrapperElement(), 'mouseout', oldOnMouseOut); + _codemirror.default.off(document, 'keydown', cm.state.jump.onKeyDown); + delete cm.state.jump; + } + if (options) { + const state = cm.state.jump = { + options, + onMouseOver: onMouseOver.bind(null, cm), + onMouseOut: onMouseOut.bind(null, cm), + onKeyDown: onKeyDown.bind(null, cm) + }; + _codemirror.default.on(cm.getWrapperElement(), 'mouseover', state.onMouseOver); + _codemirror.default.on(cm.getWrapperElement(), 'mouseout', state.onMouseOut); + _codemirror.default.on(document, 'keydown', state.onKeyDown); + } +}); +function onMouseOver(cm, event) { + const target = event.target || event.srcElement; + if (!(target instanceof HTMLElement)) { + return; + } + if ((target === null || target === void 0 ? void 0 : target.nodeName) !== 'SPAN') { + return; + } + const box = target.getBoundingClientRect(); + const cursor = { + left: (box.left + box.right) / 2, + top: (box.top + box.bottom) / 2 + }; + cm.state.jump.cursor = cursor; + if (cm.state.jump.isHoldingModifier) { + enableJumpMode(cm); + } +} +function onMouseOut(cm) { + if (!cm.state.jump.isHoldingModifier && cm.state.jump.cursor) { + cm.state.jump.cursor = null; + return; + } + if (cm.state.jump.isHoldingModifier && cm.state.jump.marker) { + disableJumpMode(cm); + } +} +function onKeyDown(cm, event) { + if (cm.state.jump.isHoldingModifier || !isJumpModifier(event.key)) { + return; + } + cm.state.jump.isHoldingModifier = true; + if (cm.state.jump.cursor) { + enableJumpMode(cm); + } + const onKeyUp = upEvent => { + if (upEvent.code !== event.code) { + return; + } + cm.state.jump.isHoldingModifier = false; + if (cm.state.jump.marker) { + disableJumpMode(cm); + } + _codemirror.default.off(document, 'keyup', onKeyUp); + _codemirror.default.off(document, 'click', onClick); + cm.off('mousedown', onMouseDown); + }; + const onClick = clickEvent => { + const { + destination, + options + } = cm.state.jump; + if (destination) { + options.onClick(destination, clickEvent); + } + }; + const onMouseDown = (_, downEvent) => { + if (cm.state.jump.destination) { + downEvent.codemirrorIgnore = true; + } + }; + _codemirror.default.on(document, 'keyup', onKeyUp); + _codemirror.default.on(document, 'click', onClick); + cm.on('mousedown', onMouseDown); +} +const isMac = typeof navigator !== 'undefined' && navigator.userAgent.includes('Mac'); +function isJumpModifier(key) { + return key === (isMac ? 'Meta' : 'Control'); +} +function enableJumpMode(cm) { + if (cm.state.jump.marker) { + return; + } + const { + cursor, + options + } = cm.state.jump; + const pos = cm.coordsChar(cursor); + const token = cm.getTokenAt(pos, true); + const getDestination = options.getDestination || cm.getHelper(pos, 'jump'); + if (getDestination) { + const destination = getDestination(token, options, cm); + if (destination) { + const marker = cm.markText({ + line: pos.line, + ch: token.start + }, { + line: pos.line, + ch: token.end + }, { + className: 'CodeMirror-jump-token' + }); + cm.state.jump.marker = marker; + cm.state.jump.destination = destination; + } + } +} +function disableJumpMode(cm) { + const { + marker + } = cm.state.jump; + cm.state.jump.marker = null; + cm.state.jump.destination = null; + marker.clear(); +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/mode-factory.js": +/*!**********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/mode-factory.js ***! + \**********************************************************/ +/***/ (function(__unused_webpack_module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports["default"] = void 0; +var _graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); +var _modeIndent = _interopRequireDefault(__webpack_require__(/*! ./mode-indent */ "../../codemirror-graphql/esm/utils/mode-indent.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +const graphqlModeFactory = config => { + const parser = (0, _graphqlLanguageService.onlineParser)({ + eatWhitespace: stream => stream.eatWhile(_graphqlLanguageService.isIgnored), + lexRules: _graphqlLanguageService.LexRules, + parseRules: _graphqlLanguageService.ParseRules, + editorConfig: { + tabSize: config.tabSize + } + }); + return { + config, + startState: parser.startState, + token: parser.token, + indent: _modeIndent.default, + electricInput: /^\s*[})\]]/, + fold: 'brace', + lineComment: '#', + closeBrackets: { + pairs: '()[]{}""', + explode: '()[]{}' + } + }; +}; +var _default = exports["default"] = graphqlModeFactory; + +/***/ }), + +/***/ "../../codemirror-graphql/esm/utils/mode-indent.js": +/*!*********************************************************!*\ + !*** ../../codemirror-graphql/esm/utils/mode-indent.js ***! + \*********************************************************/ +/***/ (function(__unused_webpack_module, exports) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", ({ + value: true +})); +exports["default"] = indent; +function indent(state, textAfter) { + var _a, _b; + const { + levels, + indentLevel + } = state; + const level = !levels || levels.length === 0 ? indentLevel : levels.at(-1) - (((_a = this.electricInput) === null || _a === void 0 ? void 0 : _a.test(textAfter)) ? 1 : 0); + return (level || 0) * (((_b = this.config) === null || _b === void 0 ? void 0 : _b.indentUnit) || 0); +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/variables/hint.js": +/*!******************************************************!*\ + !*** ../../codemirror-graphql/esm/variables/hint.js ***! + \******************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); +var _forEachState = _interopRequireDefault(__webpack_require__(/*! ../utils/forEachState */ "../../codemirror-graphql/esm/utils/forEachState.js")); +var _hintList = _interopRequireDefault(__webpack_require__(/*! ../utils/hintList */ "../../codemirror-graphql/esm/utils/hintList.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.registerHelper('hint', 'graphql-variables', (editor, options) => { const cur = editor.getCursor(); const token = editor.getTokenAt(cur); const results = getVariablesHint(cur, token, options); if ((results === null || results === void 0 ? void 0 : results.list) && results.list.length > 0) { - results.from = codemirror.CodeMirror.Pos(results.from.line, results.from.ch); - results.to = codemirror.CodeMirror.Pos(results.to.line, results.to.ch); - codemirror.CodeMirror.signal(editor, "hasCompletion", editor, results, token); + results.from = _codemirror.default.Pos(results.from.line, results.from.ch); + results.to = _codemirror.default.Pos(results.to.line, results.to.ch); + _codemirror.default.signal(editor, 'hasCompletion', editor, results, token); } return results; }); function getVariablesHint(cur, token, options) { - const state = token.state.kind === "Invalid" ? token.state.prevState : token.state; + const state = token.state.kind === 'Invalid' ? token.state.prevState : token.state; const { kind, step } = state; - if (kind === "Document" && step === 0) { - return hintList(cur, token, [{ - text: "{" + if (kind === 'Document' && step === 0) { + return (0, _hintList.default)(cur, token, [{ + text: '{' }]); } const { @@ -68270,45 +74659,45 @@ function getVariablesHint(cur, token, options) { return; } const typeInfo = getTypeInfo(variableToType, token.state); - if (kind === "Document" || kind === "Variable" && step === 0) { + if (kind === 'Document' || kind === 'Variable' && step === 0) { const variableNames = Object.keys(variableToType); - return hintList(cur, token, variableNames.map(name => ({ + return (0, _hintList.default)(cur, token, variableNames.map(name => ({ text: `"${name}": `, type: variableToType[name] }))); } - if ((kind === "ObjectValue" || kind === "ObjectField" && step === 0) && typeInfo.fields) { + if ((kind === 'ObjectValue' || kind === 'ObjectField' && step === 0) && typeInfo.fields) { const inputFields = Object.keys(typeInfo.fields).map(fieldName => typeInfo.fields[fieldName]); - return hintList(cur, token, inputFields.map(field => ({ + return (0, _hintList.default)(cur, token, inputFields.map(field => ({ text: `"${field.name}": `, type: field.type, description: field.description }))); } - if (kind === "StringValue" || kind === "NumberValue" || kind === "BooleanValue" || kind === "NullValue" || kind === "ListValue" && step === 1 || kind === "ObjectField" && step === 2 || kind === "Variable" && step === 2) { - const namedInputType = typeInfo.type ? graphql.getNamedType(typeInfo.type) : void 0; - if (namedInputType instanceof graphql.GraphQLInputObjectType) { - return hintList(cur, token, [{ - text: "{" + if (kind === 'StringValue' || kind === 'NumberValue' || kind === 'BooleanValue' || kind === 'NullValue' || kind === 'ListValue' && step === 1 || kind === 'ObjectField' && step === 2 || kind === 'Variable' && step === 2) { + const namedInputType = typeInfo.type ? (0, _graphql.getNamedType)(typeInfo.type) : undefined; + if (namedInputType instanceof _graphql.GraphQLInputObjectType) { + return (0, _hintList.default)(cur, token, [{ + text: '{' }]); } - if (namedInputType instanceof graphql.GraphQLEnumType) { + if (namedInputType instanceof _graphql.GraphQLEnumType) { const values = namedInputType.getValues(); - return hintList(cur, token, values.map(value => ({ + return (0, _hintList.default)(cur, token, values.map(value => ({ text: `"${value.name}"`, type: namedInputType, description: value.description }))); } - if (namedInputType === graphql.GraphQLBoolean) { - return hintList(cur, token, [{ - text: "true", - type: graphql.GraphQLBoolean, - description: "Not false." + if (namedInputType === _graphql.GraphQLBoolean) { + return (0, _hintList.default)(cur, token, [{ + text: 'true', + type: _graphql.GraphQLBoolean, + description: 'Not false.' }, { - text: "false", - type: graphql.GraphQLBoolean, - description: "Not true." + text: 'false', + type: _graphql.GraphQLBoolean, + description: 'Not true.' }]); } } @@ -68318,26 +74707,26 @@ function getTypeInfo(variableToType, tokenState) { type: null, fields: null }; - forEachState.forEachState(tokenState, state => { + (0, _forEachState.default)(tokenState, state => { switch (state.kind) { - case "Variable": + case 'Variable': { info.type = variableToType[state.name]; break; } - case "ListValue": + case 'ListValue': { - const nullableType = info.type ? graphql.getNullableType(info.type) : void 0; - info.type = nullableType instanceof graphql.GraphQLList ? nullableType.ofType : null; + const nullableType = info.type ? (0, _graphql.getNullableType)(info.type) : undefined; + info.type = nullableType instanceof _graphql.GraphQLList ? nullableType.ofType : null; break; } - case "ObjectValue": + case 'ObjectValue': { - const objectType = info.type ? graphql.getNamedType(info.type) : void 0; - info.fields = objectType instanceof graphql.GraphQLInputObjectType ? objectType.getFields() : null; + const objectType = info.type ? (0, _graphql.getNamedType)(info.type) : undefined; + info.fields = objectType instanceof _graphql.GraphQLInputObjectType ? objectType.getFields() : null; break; } - case "ObjectField": + case 'ObjectField': { const objectField = state.name && info.fields ? info.fields[state.name] : null; info.type = objectField === null || objectField === void 0 ? void 0 : objectField.type; @@ -68350,18 +74739,260 @@ function getTypeInfo(variableToType, tokenState) { /***/ }), +/***/ "../../codemirror-graphql/esm/variables/lint.js": +/*!******************************************************!*\ + !*** ../../codemirror-graphql/esm/variables/lint.js ***! + \******************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); +var _jsonParse = _interopRequireWildcard(__webpack_require__(/*! ../utils/jsonParse */ "../../codemirror-graphql/esm/utils/jsonParse.js")); +function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); } +function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.registerHelper('lint', 'graphql-variables', (text, options, editor) => { + if (!text) { + return []; + } + let ast; + try { + ast = (0, _jsonParse.default)(text); + } catch (error) { + if (error instanceof _jsonParse.JSONSyntaxError) { + return [lintError(editor, error.position, error.message)]; + } + throw error; + } + const { + variableToType + } = options; + if (!variableToType) { + return []; + } + return validateVariables(editor, variableToType, ast); +}); +function validateVariables(editor, variableToType, variablesAST) { + var _a; + const errors = []; + for (const member of variablesAST.members) { + if (member) { + const variableName = (_a = member.key) === null || _a === void 0 ? void 0 : _a.value; + const type = variableToType[variableName]; + if (type) { + for (const [node, message] of validateValue(type, member.value)) { + errors.push(lintError(editor, node, message)); + } + } else { + errors.push(lintError(editor, member.key, `Variable "$${variableName}" does not appear in any GraphQL query.`)); + } + } + } + return errors; +} +function validateValue(type, valueAST) { + if (!type || !valueAST) { + return []; + } + if (type instanceof _graphql.GraphQLNonNull) { + if (valueAST.kind === 'Null') { + return [[valueAST, `Type "${type}" is non-nullable and cannot be null.`]]; + } + return validateValue(type.ofType, valueAST); + } + if (valueAST.kind === 'Null') { + return []; + } + if (type instanceof _graphql.GraphQLList) { + const itemType = type.ofType; + if (valueAST.kind === 'Array') { + const values = valueAST.values || []; + return mapCat(values, item => validateValue(itemType, item)); + } + return validateValue(itemType, valueAST); + } + if (type instanceof _graphql.GraphQLInputObjectType) { + if (valueAST.kind !== 'Object') { + return [[valueAST, `Type "${type}" must be an Object.`]]; + } + const providedFields = Object.create(null); + const fieldErrors = mapCat(valueAST.members, member => { + var _a; + const fieldName = (_a = member === null || member === void 0 ? void 0 : member.key) === null || _a === void 0 ? void 0 : _a.value; + providedFields[fieldName] = true; + const inputField = type.getFields()[fieldName]; + if (!inputField) { + return [[member.key, `Type "${type}" does not have a field "${fieldName}".`]]; + } + const fieldType = inputField ? inputField.type : undefined; + return validateValue(fieldType, member.value); + }); + for (const fieldName of Object.keys(type.getFields())) { + const field = type.getFields()[fieldName]; + if (!providedFields[fieldName] && field.type instanceof _graphql.GraphQLNonNull && !field.defaultValue) { + fieldErrors.push([valueAST, `Object of type "${type}" is missing required field "${fieldName}".`]); + } + } + return fieldErrors; + } + if (type.name === 'Boolean' && valueAST.kind !== 'Boolean' || type.name === 'String' && valueAST.kind !== 'String' || type.name === 'ID' && valueAST.kind !== 'Number' && valueAST.kind !== 'String' || type.name === 'Float' && valueAST.kind !== 'Number' || type.name === 'Int' && (valueAST.kind !== 'Number' || (valueAST.value | 0) !== valueAST.value)) { + return [[valueAST, `Expected value of type "${type}".`]]; + } + if ((type instanceof _graphql.GraphQLEnumType || type instanceof _graphql.GraphQLScalarType) && (valueAST.kind !== 'String' && valueAST.kind !== 'Number' && valueAST.kind !== 'Boolean' && valueAST.kind !== 'Null' || isNullish(type.parseValue(valueAST.value)))) { + return [[valueAST, `Expected value of type "${type}".`]]; + } + return []; +} +function lintError(editor, node, message) { + return { + message, + severity: 'error', + type: 'validation', + from: editor.posFromIndex(node.start), + to: editor.posFromIndex(node.end) + }; +} +function isNullish(value) { + return value === null || value === undefined || value !== value; +} +function mapCat(array, mapper) { + return Array.prototype.concat.apply([], array.map(mapper)); +} + +/***/ }), + +/***/ "../../codemirror-graphql/esm/variables/mode.js": +/*!******************************************************!*\ + !*** ../../codemirror-graphql/esm/variables/mode.js ***! + \******************************************************/ +/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { + +"use strict"; + + +var _codemirror = _interopRequireDefault(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js")); +var _graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); +var _modeIndent = _interopRequireDefault(__webpack_require__(/*! ../utils/mode-indent */ "../../codemirror-graphql/esm/utils/mode-indent.js")); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +_codemirror.default.defineMode('graphql-variables', config => { + const parser = (0, _graphqlLanguageService.onlineParser)({ + eatWhitespace: stream => stream.eatSpace(), + lexRules: LexRules, + parseRules: ParseRules, + editorConfig: { + tabSize: config.tabSize + } + }); + return { + config, + startState: parser.startState, + token: parser.token, + indent: _modeIndent.default, + electricInput: /^\s*[}\]]/, + fold: 'brace', + closeBrackets: { + pairs: '[]{}""', + explode: '[]{}' + } + }; +}); +const LexRules = { + Punctuation: /^\[|]|\{|\}|:|,/, + Number: /^-?(?:0|(?:[1-9][0-9]*))(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?/, + String: /^"(?:[^"\\]|\\(?:"|\/|\\|b|f|n|r|t|u[0-9a-fA-F]{4}))*"?/, + Keyword: /^true|false|null/ +}; +const ParseRules = { + Document: [(0, _graphqlLanguageService.p)('{'), (0, _graphqlLanguageService.list)('Variable', (0, _graphqlLanguageService.opt)((0, _graphqlLanguageService.p)(','))), (0, _graphqlLanguageService.p)('}')], + Variable: [namedKey('variable'), (0, _graphqlLanguageService.p)(':'), 'Value'], + Value(token) { + switch (token.kind) { + case 'Number': + return 'NumberValue'; + case 'String': + return 'StringValue'; + case 'Punctuation': + switch (token.value) { + case '[': + return 'ListValue'; + case '{': + return 'ObjectValue'; + } + return null; + case 'Keyword': + switch (token.value) { + case 'true': + case 'false': + return 'BooleanValue'; + case 'null': + return 'NullValue'; + } + return null; + } + }, + NumberValue: [(0, _graphqlLanguageService.t)('Number', 'number')], + StringValue: [(0, _graphqlLanguageService.t)('String', 'string')], + BooleanValue: [(0, _graphqlLanguageService.t)('Keyword', 'builtin')], + NullValue: [(0, _graphqlLanguageService.t)('Keyword', 'keyword')], + ListValue: [(0, _graphqlLanguageService.p)('['), (0, _graphqlLanguageService.list)('Value', (0, _graphqlLanguageService.opt)((0, _graphqlLanguageService.p)(','))), (0, _graphqlLanguageService.p)(']')], + ObjectValue: [(0, _graphqlLanguageService.p)('{'), (0, _graphqlLanguageService.list)('ObjectField', (0, _graphqlLanguageService.opt)((0, _graphqlLanguageService.p)(','))), (0, _graphqlLanguageService.p)('}')], + ObjectField: [namedKey('attribute'), (0, _graphqlLanguageService.p)(':'), 'Value'] +}; +function namedKey(style) { + return { + style, + match: token => token.kind === 'String', + update(state, token) { + state.name = token.value.slice(1, -1); + } + }; +} + +/***/ }), + /***/ "../../graphiql-react/dist/index.js": /*!******************************************!*\ !*** ../../graphiql-react/dist/index.js ***! \******************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; +function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); } +function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } +var __create = Object.create; +var __defProp = Object.defineProperty; +var __getOwnPropDesc = Object.getOwnPropertyDescriptor; +var __getOwnPropNames = Object.getOwnPropertyNames; +var __getProtoOf = Object.getPrototypeOf; +var __hasOwnProp = Object.prototype.hasOwnProperty; +var __copyProps = (to, from, except, desc) => { + if (from && typeof from === "object" || typeof from === "function") { + for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, { + get: () => from[key], + enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable + }); + } + return to; +}; +var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps( +// If the importer is in node compatibility mode or this is not an ESM +// file that has been converted to a CommonJS file using a Babel- +// compatible transform (i.e. "__esModule" has not been set), then set +// "default" to the CommonJS "module.exports" for node compatibility. +isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { + value: mod, + enumerable: true +}) : target, mod)); Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" }); const jsxRuntime = __webpack_require__(/*! react/jsx-runtime */ "../../../node_modules/react/jsx-runtime.js"); +const reactCompilerRuntime = __webpack_require__(/*! react-compiler-runtime */ "../../../node_modules/react-compiler-runtime/dist/index.js"); const React = __webpack_require__(/*! react */ "react"); const clsx = __webpack_require__(/*! clsx */ "../../../node_modules/clsx/dist/clsx.m.js"); const graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); @@ -68422,19 +75053,49 @@ function createContextHook(context) { } const StorageContext = createNullableContext("StorageContext"); function StorageContextProvider(props) { + const $ = reactCompilerRuntime.c(8); const isInitialRender = React.useRef(true); - const [storage, setStorage] = React.useState(() => new toolkit.StorageAPI(props.storage)); - React.useEffect(() => { - if (isInitialRender.current) { - isInitialRender.current = false; - } else { - setStorage(new toolkit.StorageAPI(props.storage)); - } - }, [props.storage]); - return /* @__PURE__ */jsxRuntime.jsx(StorageContext.Provider, { - value: storage, - children: props.children - }); + let t0; + if ($[0] !== props.storage) { + t0 = () => new toolkit.StorageAPI(props.storage); + $[0] = props.storage; + $[1] = t0; + } else { + t0 = $[1]; + } + const [storage, setStorage] = React.useState(t0); + let t1; + let t2; + if ($[2] !== props.storage) { + t1 = () => { + if (isInitialRender.current) { + isInitialRender.current = false; + } else { + setStorage(new toolkit.StorageAPI(props.storage)); + } + }; + t2 = [props.storage]; + $[2] = props.storage; + $[3] = t1; + $[4] = t2; + } else { + t1 = $[3]; + t2 = $[4]; + } + React.useEffect(t1, t2); + let t3; + if ($[5] !== props.children || $[6] !== storage) { + t3 = /* @__PURE__ */jsxRuntime.jsx(StorageContext.Provider, { + value: storage, + children: props.children + }); + $[5] = props.children; + $[6] = storage; + $[7] = t3; + } else { + t3 = $[7]; + } + return t3; } const useStorageContext = createContextHook(StorageContext); const SvgArgument = ({ @@ -69255,67 +75916,208 @@ const TypeIcon = generateIcon(SvgType); function generateIcon(RawComponent) { const title = RawComponent.name.replace("Svg", "").replaceAll(/([A-Z])/g, " $1").trimStart().toLowerCase() + " icon"; function IconComponent(props) { - return /* @__PURE__ */jsxRuntime.jsx(RawComponent, { - title, - ...props - }); + const $ = reactCompilerRuntime.c(2); + let t0; + if ($[0] !== props) { + t0 = /* @__PURE__ */jsxRuntime.jsx(RawComponent, { + title, + ...props + }); + $[0] = props; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; } IconComponent.displayName = RawComponent.name; return IconComponent; } -const UnStyledButton = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx("button", { - ...props, - ref, - className: clsx.clsx("graphiql-un-styled", props.className) -})); +const UnStyledButton = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-un-styled", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props || $[3] !== ref || $[4] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx("button", { + ...props, + ref, + className: t0 + }); + $[2] = props; + $[3] = ref; + $[4] = t0; + $[5] = t1; + } else { + t1 = $[5]; + } + return t1; +}); UnStyledButton.displayName = "UnStyledButton"; -const Button$1 = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx("button", { - ...props, - ref, - className: clsx.clsx("graphiql-button", { - success: "graphiql-button-success", - error: "graphiql-button-error" - }[props.state], props.className) -})); +const Button$1 = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(7); + let t0; + if ($[0] !== props.className || $[1] !== props.state) { + t0 = clsx.clsx("graphiql-button", { + success: "graphiql-button-success", + error: "graphiql-button-error" + }[props.state], props.className); + $[0] = props.className; + $[1] = props.state; + $[2] = t0; + } else { + t0 = $[2]; + } + let t1; + if ($[3] !== props || $[4] !== ref || $[5] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx("button", { + ...props, + ref, + className: t0 + }); + $[3] = props; + $[4] = ref; + $[5] = t0; + $[6] = t1; + } else { + t1 = $[6]; + } + return t1; +}); Button$1.displayName = "Button"; -const ButtonGroup = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx("div", { - ...props, - ref, - className: clsx.clsx("graphiql-button-group", props.className) -})); +const ButtonGroup = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-button-group", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props || $[3] !== ref || $[4] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx("div", { + ...props, + ref, + className: t0 + }); + $[2] = props; + $[3] = ref; + $[4] = t0; + $[5] = t1; + } else { + t1 = $[5]; + } + return t1; +}); ButtonGroup.displayName = "ButtonGroup"; const createComponentGroup = (root, children) => Object.entries(children).reduce((r, [key, value]) => { r[key] = value; return r; }, root); -const DialogClose = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx(D__namespace.Close, { - asChild: true, - children: /* @__PURE__ */jsxRuntime.jsxs(UnStyledButton, { - ...props, - ref, - type: "button", - className: clsx.clsx("graphiql-dialog-close", props.className), - children: [/* @__PURE__ */jsxRuntime.jsx(reactVisuallyHidden.Root, { +const DialogClose = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(8); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-dialog-close", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + let t2; + if ($[2] === Symbol.for("react.memo_cache_sentinel")) { + t1 = /* @__PURE__ */jsxRuntime.jsx(reactVisuallyHidden.Root, { children: "Close dialog" - }), /* @__PURE__ */jsxRuntime.jsx(CloseIcon, {})] - }) -})); + }); + t2 = /* @__PURE__ */jsxRuntime.jsx(CloseIcon, {}); + $[2] = t1; + $[3] = t2; + } else { + t1 = $[2]; + t2 = $[3]; + } + let t3; + if ($[4] !== props || $[5] !== ref || $[6] !== t0) { + t3 = /* @__PURE__ */jsxRuntime.jsx(D__namespace.Close, { + asChild: true, + children: /* @__PURE__ */jsxRuntime.jsxs(UnStyledButton, { + ...props, + ref, + type: "button", + className: t0, + children: [t1, t2] + }) + }); + $[4] = props; + $[5] = ref; + $[6] = t0; + $[7] = t3; + } else { + t3 = $[7]; + } + return t3; +}); DialogClose.displayName = "Dialog.Close"; -function DialogRoot({ - children, - ...props -}) { - return /* @__PURE__ */jsxRuntime.jsx(D__namespace.Root, { - ...props, - children: /* @__PURE__ */jsxRuntime.jsxs(D__namespace.Portal, { - children: [/* @__PURE__ */jsxRuntime.jsx(D__namespace.Overlay, { - className: "graphiql-dialog-overlay" - }), /* @__PURE__ */jsxRuntime.jsx(D__namespace.Content, { +function DialogRoot(t0) { + const $ = reactCompilerRuntime.c(9); + let children; + let props; + if ($[0] !== t0) { + ({ + children, + ...props + } = t0); + $[0] = t0; + $[1] = children; + $[2] = props; + } else { + children = $[1]; + props = $[2]; + } + let t1; + if ($[3] === Symbol.for("react.memo_cache_sentinel")) { + t1 = /* @__PURE__ */jsxRuntime.jsx(D__namespace.Overlay, { + className: "graphiql-dialog-overlay" + }); + $[3] = t1; + } else { + t1 = $[3]; + } + let t2; + if ($[4] !== children) { + t2 = /* @__PURE__ */jsxRuntime.jsxs(D__namespace.Portal, { + children: [t1, /* @__PURE__ */jsxRuntime.jsx(D__namespace.Content, { className: "graphiql-dialog", children })] - }) - }); + }); + $[4] = children; + $[5] = t2; + } else { + t2 = $[5]; + } + let t3; + if ($[6] !== props || $[7] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsx(D__namespace.Root, { + ...props, + children: t2 + }); + $[6] = props; + $[7] = t2; + $[8] = t3; + } else { + t3 = $[8]; + } + return t3; } const Dialog = createComponentGroup(DialogRoot, { Close: DialogClose, @@ -69323,31 +76125,95 @@ const Dialog = createComponentGroup(DialogRoot, { Trigger: D__namespace.Trigger, Description: D__namespace.Description }); -const Button = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Trigger, { - asChild: true, - children: /* @__PURE__ */jsxRuntime.jsx("button", { - ...props, - ref, - className: clsx.clsx("graphiql-un-styled", props.className) - }) -})); +const Button = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-un-styled", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props || $[3] !== ref || $[4] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Trigger, { + asChild: true, + children: /* @__PURE__ */jsxRuntime.jsx("button", { + ...props, + ref, + className: t0 + }) + }); + $[2] = props; + $[3] = ref; + $[4] = t0; + $[5] = t1; + } else { + t1 = $[5]; + } + return t1; +}); Button.displayName = "DropdownMenuButton"; -function Content({ - children, - align = "start", - sideOffset = 5, - className, - ...props -}) { - return /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Portal, { - children: /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Content, { - align, - sideOffset, - className: clsx.clsx("graphiql-dropdown-content", className), - ...props, - children - }) - }); +function Content(t0) { + const $ = reactCompilerRuntime.c(14); + let children; + let className; + let props; + let t1; + let t2; + if ($[0] !== t0) { + ({ + children, + align: t1, + sideOffset: t2, + className, + ...props + } = t0); + $[0] = t0; + $[1] = children; + $[2] = className; + $[3] = props; + $[4] = t1; + $[5] = t2; + } else { + children = $[1]; + className = $[2]; + props = $[3]; + t1 = $[4]; + t2 = $[5]; + } + const align = t1 === void 0 ? "start" : t1; + const sideOffset = t2 === void 0 ? 5 : t2; + let t3; + if ($[6] !== className) { + t3 = clsx.clsx("graphiql-dropdown-content", className); + $[6] = className; + $[7] = t3; + } else { + t3 = $[7]; + } + let t4; + if ($[8] !== align || $[9] !== children || $[10] !== props || $[11] !== sideOffset || $[12] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Portal, { + children: /* @__PURE__ */jsxRuntime.jsx(reactDropdownMenu.Content, { + align, + sideOffset, + className: t3, + ...props, + children + }) + }); + $[8] = align; + $[9] = children; + $[10] = props; + $[11] = sideOffset; + $[12] = t3; + $[13] = t4; + } else { + t4 = $[13]; + } + return t4; } const Item = ({ className, @@ -69367,38 +76233,132 @@ const markdown = new MarkdownIt({ breaks: true, linkify: true }); -const MarkdownContent = React.forwardRef(({ - children, - onlyShowFirstChild, - type, - ...props -}, ref) => /* @__PURE__ */jsxRuntime.jsx("div", { - ...props, - ref, - className: clsx.clsx(`graphiql-markdown-${type}`, onlyShowFirstChild && "graphiql-markdown-preview", props.className), - dangerouslySetInnerHTML: { - __html: markdown.render(children) +const MarkdownContent = React.forwardRef((t0, ref) => { + const $ = reactCompilerRuntime.c(18); + let children; + let onlyShowFirstChild; + let props; + let type; + if ($[0] !== t0) { + ({ + children, + onlyShowFirstChild, + type, + ...props + } = t0); + $[0] = t0; + $[1] = children; + $[2] = onlyShowFirstChild; + $[3] = props; + $[4] = type; + } else { + children = $[1]; + onlyShowFirstChild = $[2]; + props = $[3]; + type = $[4]; } -})); + const t1 = `graphiql-markdown-${type}`; + const t2 = onlyShowFirstChild && "graphiql-markdown-preview"; + let t3; + if ($[5] !== props.className || $[6] !== t1 || $[7] !== t2) { + t3 = clsx.clsx(t1, t2, props.className); + $[5] = props.className; + $[6] = t1; + $[7] = t2; + $[8] = t3; + } else { + t3 = $[8]; + } + let t4; + if ($[9] !== children) { + t4 = markdown.render(children); + $[9] = children; + $[10] = t4; + } else { + t4 = $[10]; + } + let t5; + if ($[11] !== t4) { + t5 = { + __html: t4 + }; + $[11] = t4; + $[12] = t5; + } else { + t5 = $[12]; + } + let t6; + if ($[13] !== props || $[14] !== ref || $[15] !== t3 || $[16] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsx("div", { + ...props, + ref, + className: t3, + dangerouslySetInnerHTML: t5 + }); + $[13] = props; + $[14] = ref; + $[15] = t3; + $[16] = t5; + $[17] = t6; + } else { + t6 = $[17]; + } + return t6; +}); MarkdownContent.displayName = "MarkdownContent"; -const Spinner = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx("div", { - ...props, - ref, - className: clsx.clsx("graphiql-spinner", props.className) -})); +const Spinner = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-spinner", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props || $[3] !== ref || $[4] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx("div", { + ...props, + ref, + className: t0 + }); + $[2] = props; + $[3] = ref; + $[4] = t0; + $[5] = t1; + } else { + t1 = $[5]; + } + return t1; +}); Spinner.displayName = "Spinner"; -function TooltipRoot({ - children, - align = "start", - side = "bottom", - sideOffset = 5, - label -}) { - return /* @__PURE__ */jsxRuntime.jsxs(T__namespace.Root, { - children: [/* @__PURE__ */jsxRuntime.jsx(T__namespace.Trigger, { +function TooltipRoot(t0) { + const $ = reactCompilerRuntime.c(10); + const { + children, + align: t1, + side: t2, + sideOffset: t3, + label + } = t0; + const align = t1 === void 0 ? "start" : t1; + const side = t2 === void 0 ? "bottom" : t2; + const sideOffset = t3 === void 0 ? 5 : t3; + let t4; + if ($[0] !== children) { + t4 = /* @__PURE__ */jsxRuntime.jsx(T__namespace.Trigger, { asChild: true, children - }), /* @__PURE__ */jsxRuntime.jsx(T__namespace.Portal, { + }); + $[0] = children; + $[1] = t4; + } else { + t4 = $[1]; + } + let t5; + if ($[2] !== align || $[3] !== label || $[4] !== side || $[5] !== sideOffset) { + t5 = /* @__PURE__ */jsxRuntime.jsx(T__namespace.Portal, { children: /* @__PURE__ */jsxRuntime.jsx(T__namespace.Content, { className: "graphiql-tooltip", align, @@ -69406,103 +76366,301 @@ function TooltipRoot({ sideOffset, children: label }) - })] - }); + }); + $[2] = align; + $[3] = label; + $[4] = side; + $[5] = sideOffset; + $[6] = t5; + } else { + t5 = $[6]; + } + let t6; + if ($[7] !== t4 || $[8] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsxs(T__namespace.Root, { + children: [t4, t5] + }); + $[7] = t4; + $[8] = t5; + $[9] = t6; + } else { + t6 = $[9]; + } + return t6; } const Tooltip = createComponentGroup(TooltipRoot, { Provider: T__namespace.Provider }); -const TabRoot = React.forwardRef(({ - isActive, - value, - children, - className, - ...props -}, ref) => /* @__PURE__ */jsxRuntime.jsx(framerMotion.Reorder.Item, { - ...props, - ref, - value, - "aria-selected": isActive ? "true" : void 0, - role: "tab", - className: clsx.clsx("graphiql-tab", isActive && "graphiql-tab-active", className), - children -})); +const TabRoot = React.forwardRef((t0, ref) => { + const $ = reactCompilerRuntime.c(16); + let children; + let className; + let isActive; + let props; + let value; + if ($[0] !== t0) { + ({ + isActive, + value, + children, + className, + ...props + } = t0); + $[0] = t0; + $[1] = children; + $[2] = className; + $[3] = isActive; + $[4] = props; + $[5] = value; + } else { + children = $[1]; + className = $[2]; + isActive = $[3]; + props = $[4]; + value = $[5]; + } + const t1 = isActive ? "true" : void 0; + const t2 = isActive && "graphiql-tab-active"; + let t3; + if ($[6] !== className || $[7] !== t2) { + t3 = clsx.clsx("graphiql-tab", t2, className); + $[6] = className; + $[7] = t2; + $[8] = t3; + } else { + t3 = $[8]; + } + let t4; + if ($[9] !== children || $[10] !== props || $[11] !== ref || $[12] !== t1 || $[13] !== t3 || $[14] !== value) { + t4 = /* @__PURE__ */jsxRuntime.jsx(framerMotion.Reorder.Item, { + ...props, + ref, + value, + "aria-selected": t1, + role: "tab", + className: t3, + children + }); + $[9] = children; + $[10] = props; + $[11] = ref; + $[12] = t1; + $[13] = t3; + $[14] = value; + $[15] = t4; + } else { + t4 = $[15]; + } + return t4; +}); TabRoot.displayName = "Tab"; -const TabButton = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { - ...props, - ref, - type: "button", - className: clsx.clsx("graphiql-tab-button", props.className), - children: props.children -})); +const TabButton = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-tab-button", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props || $[3] !== ref || $[4] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { + ...props, + ref, + type: "button", + className: t0, + children: props.children + }); + $[2] = props; + $[3] = ref; + $[4] = t0; + $[5] = t1; + } else { + t1 = $[5]; + } + return t1; +}); TabButton.displayName = "Tab.Button"; -const TabClose = React.forwardRef((props, ref) => /* @__PURE__ */jsxRuntime.jsx(Tooltip, { - label: "Close Tab", - children: /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { - "aria-label": "Close Tab", - ...props, - ref, - type: "button", - className: clsx.clsx("graphiql-tab-close", props.className), - children: /* @__PURE__ */jsxRuntime.jsx(CloseIcon, {}) - }) -})); +const TabClose = React.forwardRef((props, ref) => { + const $ = reactCompilerRuntime.c(7); + let t0; + if ($[0] !== props.className) { + t0 = clsx.clsx("graphiql-tab-close", props.className); + $[0] = props.className; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] === Symbol.for("react.memo_cache_sentinel")) { + t1 = /* @__PURE__ */jsxRuntime.jsx(CloseIcon, {}); + $[2] = t1; + } else { + t1 = $[2]; + } + let t2; + if ($[3] !== props || $[4] !== ref || $[5] !== t0) { + t2 = /* @__PURE__ */jsxRuntime.jsx(Tooltip, { + label: "Close Tab", + children: /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { + "aria-label": "Close Tab", + ...props, + ref, + type: "button", + className: t0, + children: t1 + }) + }); + $[3] = props; + $[4] = ref; + $[5] = t0; + $[6] = t2; + } else { + t2 = $[6]; + } + return t2; +}); TabClose.displayName = "Tab.Close"; const Tab = createComponentGroup(TabRoot, { Button: TabButton, Close: TabClose }); -const Tabs = React.forwardRef(({ - values, - onReorder, - children, - className, - ...props -}, ref) => /* @__PURE__ */jsxRuntime.jsx(framerMotion.Reorder.Group, { - ...props, - ref, - values, - onReorder, - axis: "x", - role: "tablist", - className: clsx.clsx("graphiql-tabs", className), - children -})); +const Tabs = React.forwardRef((t0, ref) => { + const $ = reactCompilerRuntime.c(15); + let children; + let className; + let onReorder; + let props; + let values; + if ($[0] !== t0) { + ({ + values, + onReorder, + children, + className, + ...props + } = t0); + $[0] = t0; + $[1] = children; + $[2] = className; + $[3] = onReorder; + $[4] = props; + $[5] = values; + } else { + children = $[1]; + className = $[2]; + onReorder = $[3]; + props = $[4]; + values = $[5]; + } + let t1; + if ($[6] !== className) { + t1 = clsx.clsx("graphiql-tabs", className); + $[6] = className; + $[7] = t1; + } else { + t1 = $[7]; + } + let t2; + if ($[8] !== children || $[9] !== onReorder || $[10] !== props || $[11] !== ref || $[12] !== t1 || $[13] !== values) { + t2 = /* @__PURE__ */jsxRuntime.jsx(framerMotion.Reorder.Group, { + ...props, + ref, + values, + onReorder, + axis: "x", + role: "tablist", + className: t1, + children + }); + $[8] = children; + $[9] = onReorder; + $[10] = props; + $[11] = ref; + $[12] = t1; + $[13] = values; + $[14] = t2; + } else { + t2 = $[14]; + } + return t2; +}); Tabs.displayName = "Tabs"; const HistoryContext = createNullableContext("HistoryContext"); -function HistoryContextProvider({ - maxHistoryLength = DEFAULT_HISTORY_LENGTH, - children -}) { - const storage = useStorageContext(); - const [historyStore] = React.useState(() => - // Fall back to a noop storage when the StorageContext is empty - new toolkit.HistoryStore(storage || new toolkit.StorageAPI(null), maxHistoryLength)); - const [items, setItems] = React.useState(() => historyStore.queries || []); - const value = React.useMemo(() => ({ - addToHistory(operation) { - historyStore.updateHistory(operation); - setItems(historyStore.queries); - }, - editLabel(operation, index) { - historyStore.editLabel(operation, index); - setItems(historyStore.queries); - }, - items, - toggleFavorite(operation) { - historyStore.toggleFavorite(operation); - setItems(historyStore.queries); - }, - setActive: item => item, - deleteFromHistory(item, clearFavorites) { - historyStore.deleteHistory(item, clearFavorites); - setItems(historyStore.queries); - } - }), [items, historyStore]); - return /* @__PURE__ */jsxRuntime.jsx(HistoryContext.Provider, { - value, +function HistoryContextProvider(t0) { + const $ = reactCompilerRuntime.c(11); + const { + maxHistoryLength: t1, children - }); + } = t0; + const maxHistoryLength = t1 === void 0 ? DEFAULT_HISTORY_LENGTH : t1; + const storage = useStorageContext(); + let t2; + if ($[0] !== maxHistoryLength || $[1] !== storage) { + t2 = () => new toolkit.HistoryStore(storage || new toolkit.StorageAPI(null), maxHistoryLength); + $[0] = maxHistoryLength; + $[1] = storage; + $[2] = t2; + } else { + t2 = $[2]; + } + const [historyStore] = React.useState(t2); + let t3; + if ($[3] !== historyStore.queries) { + t3 = () => historyStore.queries || []; + $[3] = historyStore.queries; + $[4] = t3; + } else { + t3 = $[4]; + } + const [items, setItems] = React.useState(t3); + let t4; + if ($[5] !== historyStore || $[6] !== items) { + t4 = { + addToHistory(operation) { + historyStore.updateHistory(operation); + setItems(historyStore.queries); + }, + editLabel(operation_0, index) { + historyStore.editLabel(operation_0, index); + setItems(historyStore.queries); + }, + items, + toggleFavorite(operation_1) { + historyStore.toggleFavorite(operation_1); + setItems(historyStore.queries); + }, + setActive: _temp$8, + deleteFromHistory(item_0, clearFavorites) { + historyStore.deleteHistory(item_0, clearFavorites); + setItems(historyStore.queries); + } + }; + $[5] = historyStore; + $[6] = items; + $[7] = t4; + } else { + t4 = $[7]; + } + const value = t4; + let t5; + if ($[8] !== children || $[9] !== value) { + t5 = /* @__PURE__ */jsxRuntime.jsx(HistoryContext.Provider, { + value, + children + }); + $[8] = children; + $[9] = value; + $[10] = t5; + } else { + t5 = $[10]; + } + return t5; +} +function _temp$8(item) { + return item; } const useHistoryContext = createContextHook(HistoryContext); const DEFAULT_HISTORY_LENGTH = 20; @@ -69517,9 +76675,9 @@ function History() { ...item, index: i })).reverse(); - const favorites = items.filter(item => item.favorite); + const favorites = items.filter(item_0 => item_0.favorite); if (favorites.length) { - items = items.filter(item => !item.favorite); + items = items.filter(item_1 => !item_1.favorite); } const [clearStatus, setClearStatus] = React.useState(null); React.useEffect(() => { @@ -69529,16 +76687,16 @@ function History() { }, 2e3); } }, [clearStatus]); - const handleClearStatus = React.useCallback(() => { + const handleClearStatus = () => { try { - for (const item of items) { - deleteFromHistory(item, true); + for (const item_2 of items) { + deleteFromHistory(item_2, true); } setClearStatus("success"); } catch { setClearStatus("error"); } - }, [deleteFromHistory, items]); + }; return /* @__PURE__ */jsxRuntime.jsxs("section", { "aria-label": "History", className: "graphiql-history", @@ -69556,101 +76714,202 @@ function History() { })] }), Boolean(favorites.length) && /* @__PURE__ */jsxRuntime.jsx("ul", { className: "graphiql-history-items", - children: favorites.map(item => /* @__PURE__ */jsxRuntime.jsx(HistoryItem, { - item - }, item.index)) + children: favorites.map(item_3 => /* @__PURE__ */jsxRuntime.jsx(HistoryItem, { + item: item_3 + }, item_3.index)) }), Boolean(favorites.length) && Boolean(items.length) && /* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-history-item-spacer" }), Boolean(items.length) && /* @__PURE__ */jsxRuntime.jsx("ul", { className: "graphiql-history-items", - children: items.map(item => /* @__PURE__ */jsxRuntime.jsx(HistoryItem, { - item - }, item.index)) + children: items.map(item_4 => /* @__PURE__ */jsxRuntime.jsx(HistoryItem, { + item: item_4 + }, item_4.index)) })] }); } function HistoryItem(props) { + const $ = reactCompilerRuntime.c(40); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true, + caller: HistoryItem + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { editLabel, toggleFavorite, deleteFromHistory, setActive - } = useHistoryContext({ - nonNull: true, - caller: HistoryItem - }); + } = useHistoryContext(t0); + let t1; + if ($[1] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: HistoryItem + }; + $[1] = t1; + } else { + t1 = $[1]; + } const { headerEditor, queryEditor, variableEditor - } = useEditorContext({ - nonNull: true, - caller: HistoryItem - }); + } = useEditorContext(t1); const inputRef = React.useRef(null); const buttonRef = React.useRef(null); const [isEditable, setIsEditable] = React.useState(false); - React.useEffect(() => { - var _a; - if (isEditable) { - (_a = inputRef.current) == null ? void 0 : _a.focus(); - } - }, [isEditable]); - const displayName = props.item.label || props.item.operationName || formatQuery(props.item.query); - const handleSave = React.useCallback(() => { - var _a; - setIsEditable(false); - const { - index, - ...item - } = props.item; - editLabel({ - ...item, - label: (_a = inputRef.current) == null ? void 0 : _a.value - }, index); - }, [editLabel, props.item]); - const handleClose = React.useCallback(() => { - setIsEditable(false); - }, []); - const handleEditLabel = React.useCallback(e => { - e.stopPropagation(); - setIsEditable(true); - }, []); - const handleHistoryItemClick = React.useCallback(() => { - const { - query, - variables, - headers - } = props.item; - queryEditor == null ? void 0 : queryEditor.setValue(query !== null && query !== void 0 ? query : ""); - variableEditor == null ? void 0 : variableEditor.setValue(variables !== null && variables !== void 0 ? variables : ""); - headerEditor == null ? void 0 : headerEditor.setValue(headers !== null && headers !== void 0 ? headers : ""); - setActive(props.item); - }, [headerEditor, props.item, queryEditor, setActive, variableEditor]); - const handleDeleteItemFromHistory = React.useCallback(e => { - e.stopPropagation(); - deleteFromHistory(props.item); - }, [props.item, deleteFromHistory]); - const handleToggleFavorite = React.useCallback(e => { - e.stopPropagation(); - toggleFavorite(props.item); - }, [props.item, toggleFavorite]); - return /* @__PURE__ */jsxRuntime.jsx("li", { - className: clsx.clsx("graphiql-history-item", isEditable && "editable"), - children: isEditable ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + let t2; + let t3; + if ($[2] !== isEditable) { + t2 = () => { + var _a; + if (isEditable) { + (_a = inputRef.current) == null ? void 0 : _a.focus(); + } + }; + t3 = [isEditable]; + $[2] = isEditable; + $[3] = t2; + $[4] = t3; + } else { + t2 = $[3]; + t3 = $[4]; + } + React.useEffect(t2, t3); + let t4; + if ($[5] !== props.item.label || $[6] !== props.item.operationName || $[7] !== props.item.query) { + t4 = props.item.label || props.item.operationName || formatQuery(props.item.query); + $[5] = props.item.label; + $[6] = props.item.operationName; + $[7] = props.item.query; + $[8] = t4; + } else { + t4 = $[8]; + } + const displayName = t4; + let t5; + if ($[9] !== editLabel || $[10] !== props.item) { + t5 = () => { + var _a; + setIsEditable(false); + const { + index, + ...item + } = props.item; + editLabel({ + ...item, + label: (_a = inputRef.current) == null ? void 0 : _a.value + }, index); + }; + $[9] = editLabel; + $[10] = props.item; + $[11] = t5; + } else { + t5 = $[11]; + } + const handleSave = t5; + let t6; + if ($[12] === Symbol.for("react.memo_cache_sentinel")) { + t6 = () => { + setIsEditable(false); + }; + $[12] = t6; + } else { + t6 = $[12]; + } + const handleClose = t6; + let t7; + if ($[13] === Symbol.for("react.memo_cache_sentinel")) { + t7 = e => { + e.stopPropagation(); + setIsEditable(true); + }; + $[13] = t7; + } else { + t7 = $[13]; + } + const handleEditLabel = t7; + let t8; + if ($[14] !== headerEditor || $[15] !== props.item || $[16] !== queryEditor || $[17] !== setActive || $[18] !== variableEditor) { + t8 = () => { + const { + query, + variables, + headers + } = props.item; + queryEditor == null ? void 0 : queryEditor.setValue(query !== null && query !== void 0 ? query : ""); + variableEditor == null ? void 0 : variableEditor.setValue(variables !== null && variables !== void 0 ? variables : ""); + headerEditor == null ? void 0 : headerEditor.setValue(headers !== null && headers !== void 0 ? headers : ""); + setActive(props.item); + }; + $[14] = headerEditor; + $[15] = props.item; + $[16] = queryEditor; + $[17] = setActive; + $[18] = variableEditor; + $[19] = t8; + } else { + t8 = $[19]; + } + const handleHistoryItemClick = t8; + let t9; + if ($[20] !== deleteFromHistory || $[21] !== props.item) { + t9 = e_0 => { + e_0.stopPropagation(); + deleteFromHistory(props.item); + }; + $[20] = deleteFromHistory; + $[21] = props.item; + $[22] = t9; + } else { + t9 = $[22]; + } + const handleDeleteItemFromHistory = t9; + let t10; + if ($[23] !== props.item || $[24] !== toggleFavorite) { + t10 = e_1 => { + e_1.stopPropagation(); + toggleFavorite(props.item); + }; + $[23] = props.item; + $[24] = toggleFavorite; + $[25] = t10; + } else { + t10 = $[25]; + } + const handleToggleFavorite = t10; + const t11 = isEditable && "editable"; + let t12; + if ($[26] !== t11) { + t12 = clsx.clsx("graphiql-history-item", t11); + $[26] = t11; + $[27] = t12; + } else { + t12 = $[27]; + } + let t13; + if ($[28] !== displayName || $[29] !== editLabel || $[30] !== handleDeleteItemFromHistory || $[31] !== handleHistoryItemClick || $[32] !== handleSave || $[33] !== handleToggleFavorite || $[34] !== isEditable || $[35] !== props.item) { + t13 = isEditable ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [/* @__PURE__ */jsxRuntime.jsx("input", { type: "text", defaultValue: props.item.label, ref: inputRef, - onKeyDown: e => { - if (e.key === "Esc") { + onKeyDown: e_2 => { + if (e_2.key === "Esc") { setIsEditable(false); - } else if (e.key === "Enter") { - setIsEditable(false); - editLabel({ - ...props.item, - label: e.currentTarget.value - }); + } else { + if (e_2.key === "Enter") { + setIsEditable(false); + editLabel({ + ...props.item, + label: e_2.currentTarget.value + }); + } } }, placeholder: "Type a label" @@ -69711,22 +76970,58 @@ function HistoryItem(props) { }) }) })] - }) - }); + }); + $[28] = displayName; + $[29] = editLabel; + $[30] = handleDeleteItemFromHistory; + $[31] = handleHistoryItemClick; + $[32] = handleSave; + $[33] = handleToggleFavorite; + $[34] = isEditable; + $[35] = props.item; + $[36] = t13; + } else { + t13 = $[36]; + } + let t14; + if ($[37] !== t12 || $[38] !== t13) { + t14 = /* @__PURE__ */jsxRuntime.jsx("li", { + className: t12, + children: t13 + }); + $[37] = t12; + $[38] = t13; + $[39] = t14; + } else { + t14 = $[39]; + } + return t14; } function formatQuery(query) { return query == null ? void 0 : query.split("\n").map(line => line.replace(/#(.*)/, "")).join(" ").replaceAll("{", " { ").replaceAll("}", " } ").replaceAll(/[\s]{2,}/g, " "); } const ExecutionContext = createNullableContext("ExecutionContext"); -function ExecutionContextProvider({ - fetcher, - getDefaultFieldNames, - children, - operationName -}) { +function ExecutionContextProvider(t0) { + const $ = reactCompilerRuntime.c(27); + const { + fetcher, + getDefaultFieldNames, + children, + operationName + } = t0; if (!fetcher) { throw new TypeError("The `ExecutionContextProvider` component requires a `fetcher` function to be passed as prop."); } + let t1; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: ExecutionContextProvider + }; + $[0] = t1; + } else { + t1 = $[0]; + } const { externalFragments, headerEditor, @@ -69734,162 +77029,228 @@ function ExecutionContextProvider({ responseEditor, variableEditor, updateActiveTabValues - } = useEditorContext({ - nonNull: true, - caller: ExecutionContextProvider - }); + } = useEditorContext(t1); const history = useHistoryContext(); - const autoCompleteLeafs = useAutoCompleteLeafs({ - getDefaultFieldNames, - caller: ExecutionContextProvider - }); + let t2; + if ($[1] !== getDefaultFieldNames) { + t2 = { + getDefaultFieldNames, + caller: ExecutionContextProvider + }; + $[1] = getDefaultFieldNames; + $[2] = t2; + } else { + t2 = $[2]; + } + const autoCompleteLeafs = useAutoCompleteLeafs(t2); const [isFetching, setIsFetching] = React.useState(false); const [subscription, setSubscription] = React.useState(null); const queryIdRef = React.useRef(0); - const stop = React.useCallback(() => { - subscription == null ? void 0 : subscription.unsubscribe(); - setIsFetching(false); - setSubscription(null); - }, [subscription]); - const run = React.useCallback(async () => { - var _ref; - if (!queryEditor || !responseEditor) { - return; - } - if (subscription) { - stop(); - return; - } - const setResponse = value2 => { - responseEditor.setValue(value2); - updateActiveTabValues({ - response: value2 - }); - }; - queryIdRef.current += 1; - const queryId = queryIdRef.current; - let query = autoCompleteLeafs() || queryEditor.getValue(); - const variablesString = variableEditor == null ? void 0 : variableEditor.getValue(); - let variables; - try { - variables = tryParseJsonObject({ - json: variablesString, - errorMessageParse: "Variables are invalid JSON", - errorMessageType: "Variables are not a JSON object." - }); - } catch (error) { - setResponse(error instanceof Error ? error.message : `${error}`); - return; - } - const headersString = headerEditor == null ? void 0 : headerEditor.getValue(); - let headers; - try { - headers = tryParseJsonObject({ - json: headersString, - errorMessageParse: "Headers are invalid JSON", - errorMessageType: "Headers are not a JSON object." - }); - } catch (error) { - setResponse(error instanceof Error ? error.message : `${error}`); - return; - } - if (externalFragments) { - const fragmentDependencies = queryEditor.documentAST ? graphqlLanguageService.getFragmentDependenciesForAST(queryEditor.documentAST, externalFragments) : []; - if (fragmentDependencies.length > 0) { - query += "\n" + fragmentDependencies.map(node => graphql.print(node)).join("\n"); - } - } - setResponse(""); - setIsFetching(true); - const opName = (_ref = operationName !== null && operationName !== void 0 ? operationName : queryEditor.operationName) !== null && _ref !== void 0 ? _ref : void 0; - history == null ? void 0 : history.addToHistory({ - query, - variables: variablesString, - headers: headersString, - operationName: opName - }); - try { - var _headers, _queryEditor$document; - const fullResponse = {}; - const handleResponse = result => { - if (queryId !== queryIdRef.current) { - return; - } - let maybeMultipart = Array.isArray(result) ? result : false; - if (!maybeMultipart && typeof result === "object" && result !== null && "hasNext" in result) { - maybeMultipart = [result]; - } - if (maybeMultipart) { - for (const part of maybeMultipart) { - mergeIncrementalResult(fullResponse, part); - } - setIsFetching(false); - setResponse(toolkit.formatResult(fullResponse)); - } else { - const response = toolkit.formatResult(result); - setIsFetching(false); - setResponse(response); - } - }; - const fetch2 = fetcher({ - query, - variables, - operationName: opName - }, { - headers: (_headers = headers) !== null && _headers !== void 0 ? _headers : void 0, - documentAST: (_queryEditor$document = queryEditor.documentAST) !== null && _queryEditor$document !== void 0 ? _queryEditor$document : void 0 - }); - const value2 = await Promise.resolve(fetch2); - if (toolkit.isObservable(value2)) { - setSubscription(value2.subscribe({ - next(result) { - handleResponse(result); - }, - error(error) { - setIsFetching(false); - if (error) { - setResponse(toolkit.formatError(error)); - } - setSubscription(null); - }, - complete() { - setIsFetching(false); - setSubscription(null); - } - })); - } else if (toolkit.isAsyncIterable(value2)) { - setSubscription({ - unsubscribe: () => { - var _a, _b; - return (_b = (_a = value2[Symbol.asyncIterator]()).return) == null ? void 0 : _b.call(_a); - } - }); - for await (const result of value2) { - handleResponse(result); - } - setIsFetching(false); - setSubscription(null); - } else { - handleResponse(value2); - } - } catch (error) { + let t3; + if ($[3] !== subscription) { + t3 = () => { + subscription == null ? void 0 : subscription.unsubscribe(); setIsFetching(false); - setResponse(toolkit.formatError(error)); setSubscription(null); - } - }, [autoCompleteLeafs, externalFragments, fetcher, headerEditor, history, operationName, queryEditor, responseEditor, stop, subscription, updateActiveTabValues, variableEditor]); + }; + $[3] = subscription; + $[4] = t3; + } else { + t3 = $[4]; + } + const stop = t3; + let t4; + if ($[5] !== autoCompleteLeafs || $[6] !== externalFragments || $[7] !== fetcher || $[8] !== headerEditor || $[9] !== history || $[10] !== operationName || $[11] !== queryEditor || $[12] !== responseEditor || $[13] !== stop || $[14] !== subscription || $[15] !== updateActiveTabValues || $[16] !== variableEditor) { + t4 = async () => { + var _ref, _headers2, _queryEditor$document; + if (!queryEditor || !responseEditor) { + return; + } + if (subscription) { + stop(); + return; + } + const setResponse = value => { + responseEditor.setValue(value); + updateActiveTabValues({ + response: value + }); + }; + queryIdRef.current = queryIdRef.current + 1; + const queryId = queryIdRef.current; + let query = autoCompleteLeafs() || queryEditor.getValue(); + const variablesString = variableEditor == null ? void 0 : variableEditor.getValue(); + let variables; + try { + variables = tryParseJsonObject({ + json: variablesString, + errorMessageParse: "Variables are invalid JSON", + errorMessageType: "Variables are not a JSON object." + }); + } catch (t52) { + const error = t52; + setResponse(error instanceof Error ? error.message : `${error}`); + return; + } + const headersString = headerEditor == null ? void 0 : headerEditor.getValue(); + let headers; + try { + headers = tryParseJsonObject({ + json: headersString, + errorMessageParse: "Headers are invalid JSON", + errorMessageType: "Headers are not a JSON object." + }); + } catch (t62) { + const error_0 = t62; + setResponse(error_0 instanceof Error ? error_0.message : `${error_0}`); + return; + } + if (externalFragments) { + const fragmentDependencies = queryEditor.documentAST ? graphqlLanguageService.getFragmentDependenciesForAST(queryEditor.documentAST, externalFragments) : []; + if (fragmentDependencies.length > 0) { + query = query + ("\n" + fragmentDependencies.map(_temp$7).join("\n")); + } + } + setResponse(""); + setIsFetching(true); + const opName = (_ref = operationName !== null && operationName !== void 0 ? operationName : queryEditor.operationName) !== null && _ref !== void 0 ? _ref : void 0; + history == null ? void 0 : history.addToHistory({ + query, + variables: variablesString, + headers: headersString, + operationName: opName + }); + const _headers = (_headers2 = headers) !== null && _headers2 !== void 0 ? _headers2 : void 0; + const documentAST = (_queryEditor$document = queryEditor.documentAST) !== null && _queryEditor$document !== void 0 ? _queryEditor$document : void 0; + try { + const fullResponse = {}; + const handleResponse = result => { + if (queryId !== queryIdRef.current) { + return; + } + let maybeMultipart = Array.isArray(result) ? result : false; + if (!maybeMultipart && typeof result === "object" && result !== null && "hasNext" in result) { + maybeMultipart = [result]; + } + if (maybeMultipart) { + for (const part of maybeMultipart) { + mergeIncrementalResult(fullResponse, part); + } + setIsFetching(false); + setResponse(toolkit.formatResult(fullResponse)); + } else { + const response = toolkit.formatResult(result); + setIsFetching(false); + setResponse(response); + } + }; + const fetch2 = fetcher({ + query, + variables, + operationName: opName + }, { + headers: _headers, + documentAST + }); + const value_0 = await Promise.resolve(fetch2); + if (toolkit.isObservable(value_0)) { + setSubscription(value_0.subscribe({ + next(result_0) { + handleResponse(result_0); + }, + error(error_2) { + setIsFetching(false); + if (error_2) { + setResponse(toolkit.formatError(error_2)); + } + setSubscription(null); + }, + complete() { + setIsFetching(false); + setSubscription(null); + } + })); + } else { + if (toolkit.isAsyncIterable(value_0)) { + setSubscription({ + unsubscribe: () => { + var _a, _b; + return (_b = (_a = value_0[Symbol.asyncIterator]()).return) == null ? void 0 : _b.call(_a); + } + }); + await handleAsyncResults(handleResponse, value_0); + setIsFetching(false); + setSubscription(null); + } else { + handleResponse(value_0); + } + } + } catch (t72) { + const error_1 = t72; + setIsFetching(false); + setResponse(toolkit.formatError(error_1)); + setSubscription(null); + } + }; + $[5] = autoCompleteLeafs; + $[6] = externalFragments; + $[7] = fetcher; + $[8] = headerEditor; + $[9] = history; + $[10] = operationName; + $[11] = queryEditor; + $[12] = responseEditor; + $[13] = stop; + $[14] = subscription; + $[15] = updateActiveTabValues; + $[16] = variableEditor; + $[17] = t4; + } else { + t4 = $[17]; + } + const run = t4; const isSubscribed = Boolean(subscription); - const value = React.useMemo(() => ({ - isFetching, - isSubscribed, - operationName: operationName !== null && operationName !== void 0 ? operationName : null, - run, - stop - }), [isFetching, isSubscribed, operationName, run, stop]); - return /* @__PURE__ */jsxRuntime.jsx(ExecutionContext.Provider, { - value, - children - }); + const t5 = operationName !== null && operationName !== void 0 ? operationName : null; + let t6; + if ($[18] !== isFetching || $[19] !== isSubscribed || $[20] !== run || $[21] !== stop || $[22] !== t5) { + t6 = { + isFetching, + isSubscribed, + operationName: t5, + run, + stop + }; + $[18] = isFetching; + $[19] = isSubscribed; + $[20] = run; + $[21] = stop; + $[22] = t5; + $[23] = t6; + } else { + t6 = $[23]; + } + const value_1 = t6; + let t7; + if ($[24] !== children || $[25] !== value_1) { + t7 = /* @__PURE__ */jsxRuntime.jsx(ExecutionContext.Provider, { + value: value_1, + children + }); + $[24] = children; + $[25] = value_1; + $[26] = t7; + } else { + t7 = $[26]; + } + return t7; +} +function _temp$7(node) { + return graphql.print(node); +} +async function handleAsyncResults(onResponse, value) { + for await (const result of value) { + onResponse(result); + } } const useExecutionContext = createContextHook(ExecutionContext); function tryParseJsonObject({ @@ -70017,13 +77378,12 @@ const commonKeys = { "Alt-Right": "goGroupRight" }; async function importCodeMirror(addons, options) { - const CodeMirror = await Promise.resolve().then(() => __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js")).then(n => n.codemirror).then(c => + const CodeMirror = await Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror */ "../../../node_modules/codemirror/lib/codemirror.js"))).then(c => // Depending on bundler and settings the dynamic import either returns a // function (e.g. parcel) or an object containing a `default` property typeof c === "function" ? c : c.default); - await Promise.all((options == null ? void 0 : options.useCommonAddons) === false ? addons : [Promise.resolve().then(() => __webpack_require__(/*! ./show-hint.cjs.js */ "../../graphiql-react/dist/show-hint.cjs.js")).then(n => n.showHint), Promise.resolve().then(() => __webpack_require__(/*! ./matchbrackets.cjs.js */ "../../graphiql-react/dist/matchbrackets.cjs.js")).then(n => n.matchbrackets), Promise.resolve().then(() => __webpack_require__(/*! ./closebrackets.cjs.js */ "../../graphiql-react/dist/closebrackets.cjs.js")).then(n => n.closebrackets), Promise.resolve().then(() => __webpack_require__(/*! ./brace-fold.cjs.js */ "../../graphiql-react/dist/brace-fold.cjs.js")).then(n => n.braceFold), Promise.resolve().then(() => __webpack_require__(/*! ./foldgutter.cjs.js */ "../../graphiql-react/dist/foldgutter.cjs.js")).then(n => n.foldgutter), Promise.resolve().then(() => __webpack_require__(/*! ./lint.cjs.js */ "../../graphiql-react/dist/lint.cjs.js")).then(n => n.lint), Promise.resolve().then(() => __webpack_require__(/*! ./searchcursor.cjs.js */ "../../graphiql-react/dist/searchcursor.cjs.js")).then(n => n.searchcursor), Promise.resolve().then(() => __webpack_require__(/*! ./jump-to-line.cjs.js */ "../../graphiql-react/dist/jump-to-line.cjs.js")).then(n => n.jumpToLine), Promise.resolve().then(() => __webpack_require__(/*! ./dialog.cjs.js */ "../../graphiql-react/dist/dialog.cjs.js")).then(n => n.dialog), - // @ts-expect-error - Promise.resolve().then(() => __webpack_require__(/*! ./sublime.cjs.js */ "../../graphiql-react/dist/sublime.cjs.js")).then(n => n.sublime), ...addons]); + await Promise.all((options == null ? void 0 : options.useCommonAddons) === false ? addons : [Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/hint/show-hint.js */ "../../../node_modules/codemirror/addon/hint/show-hint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/edit/matchbrackets.js */ "../../../node_modules/codemirror/addon/edit/matchbrackets.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/edit/closebrackets.js */ "../../../node_modules/codemirror/addon/edit/closebrackets.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/fold/brace-fold.js */ "../../../node_modules/codemirror/addon/fold/brace-fold.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/fold/foldgutter.js */ "../../../node_modules/codemirror/addon/fold/foldgutter.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/lint/lint.js */ "../../../node_modules/codemirror/addon/lint/lint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/searchcursor.js */ "../../../node_modules/codemirror/addon/search/searchcursor.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/jump-to-line.js */ "../../../node_modules/codemirror/addon/search/jump-to-line.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/dialog/dialog.js */ "../../../node_modules/codemirror/addon/dialog/dialog.js"))), // @ts-expect-error + Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/keymap/sublime.js */ "../../../node_modules/codemirror/keymap/sublime.js"))), ...addons]); return CodeMirror; } const printDefault = ast => { @@ -70032,158 +77392,320 @@ const printDefault = ast => { } return graphql.print(ast); }; -function DefaultValue({ - field -}) { +function DefaultValue(t0) { + const $ = reactCompilerRuntime.c(12); + const { + field + } = t0; if (!("defaultValue" in field) || field.defaultValue === void 0) { return null; } - const ast = graphql.astFromValue(field.defaultValue, field.type); - if (!ast) { - return null; + const t1 = field.defaultValue; + const t2 = field.type; + let t3; + let t4; + let t5; + let t6; + if ($[0] !== field.defaultValue || $[1] !== field.type) { + t6 = Symbol.for("react.early_return_sentinel"); + bb0: { + const ast = graphql.astFromValue(t1, t2); + if (!ast) { + t6 = null; + break bb0; + } + t5 = " = "; + t3 = "graphiql-doc-explorer-default-value"; + t4 = printDefault(ast); + } + $[0] = field.defaultValue; + $[1] = field.type; + $[2] = t3; + $[3] = t4; + $[4] = t5; + $[5] = t6; + } else { + t3 = $[2]; + t4 = $[3]; + t5 = $[4]; + t6 = $[5]; } - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [" = ", /* @__PURE__ */jsxRuntime.jsx("span", { - className: "graphiql-doc-explorer-default-value", - children: printDefault(ast) - })] - }); + if (t6 !== Symbol.for("react.early_return_sentinel")) { + return t6; + } + let t7; + if ($[6] !== t3 || $[7] !== t4) { + t7 = /* @__PURE__ */jsxRuntime.jsx("span", { + className: t3, + children: t4 + }); + $[6] = t3; + $[7] = t4; + $[8] = t7; + } else { + t7 = $[8]; + } + let t8; + if ($[9] !== t5 || $[10] !== t7) { + t8 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t5, t7] + }); + $[9] = t5; + $[10] = t7; + $[11] = t8; + } else { + t8 = $[11]; + } + return t8; } const SchemaContext = createNullableContext("SchemaContext"); -function SchemaContextProvider(props) { - if (!props.fetcher) { +function SchemaContextProvider(t0) { + const $ = reactCompilerRuntime.c(38); + let fetcher; + let onSchemaChange; + let props; + if ($[0] !== t0) { + ({ + fetcher, + onSchemaChange, + ...props + } = t0); + $[0] = t0; + $[1] = fetcher; + $[2] = onSchemaChange; + $[3] = props; + } else { + fetcher = $[1]; + onSchemaChange = $[2]; + props = $[3]; + } + if (!fetcher) { throw new TypeError("The `SchemaContextProvider` component requires a `fetcher` function to be passed as prop."); } + let t1; + if ($[4] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: SchemaContextProvider + }; + $[4] = t1; + } else { + t1 = $[4]; + } const { initialHeaders, headerEditor - } = useEditorContext({ - nonNull: true, - caller: SchemaContextProvider - }); + } = useEditorContext(t1); const [schema, setSchema] = React.useState(); const [isFetching, setIsFetching] = React.useState(false); const [fetchError, setFetchError] = React.useState(null); const counterRef = React.useRef(0); - React.useEffect(() => { - setSchema(graphql.isSchema(props.schema) || props.schema === null || props.schema === void 0 ? props.schema : void 0); - counterRef.current++; - }, [props.schema]); + let t2; + let t3; + if ($[5] !== props.schema) { + t2 = () => { + setSchema(graphql.isSchema(props.schema) || props.schema == null ? props.schema : void 0); + counterRef.current = counterRef.current + 1; + }; + t3 = [props.schema]; + $[5] = props.schema; + $[6] = t2; + $[7] = t3; + } else { + t2 = $[6]; + t3 = $[7]; + } + React.useEffect(t2, t3); const headersRef = React.useRef(initialHeaders); - React.useEffect(() => { - if (headerEditor) { - headersRef.current = headerEditor.getValue(); - } - }); + let t4; + if ($[8] !== headerEditor) { + t4 = () => { + if (headerEditor) { + headersRef.current = headerEditor.getValue(); + } + }; + $[8] = headerEditor; + $[9] = t4; + } else { + t4 = $[9]; + } + React.useEffect(t4); + let t5; + if ($[10] !== props.inputValueDeprecation || $[11] !== props.introspectionQueryName || $[12] !== props.schemaDescription) { + t5 = { + inputValueDeprecation: props.inputValueDeprecation, + introspectionQueryName: props.introspectionQueryName, + schemaDescription: props.schemaDescription + }; + $[10] = props.inputValueDeprecation; + $[11] = props.introspectionQueryName; + $[12] = props.schemaDescription; + $[13] = t5; + } else { + t5 = $[13]; + } const { introspectionQuery, introspectionQueryName, introspectionQuerySansSubscriptions - } = useIntrospectionQuery({ - inputValueDeprecation: props.inputValueDeprecation, - introspectionQueryName: props.introspectionQueryName, - schemaDescription: props.schemaDescription - }); - const { - fetcher, - onSchemaChange, - dangerouslyAssumeSchemaIsValid, - children - } = props; - const introspect = React.useCallback(() => { - if (graphql.isSchema(props.schema) || props.schema === null) { - return; - } - const counter = ++counterRef.current; - const maybeIntrospectionData = props.schema; - async function fetchIntrospectionData() { - if (maybeIntrospectionData) { - return maybeIntrospectionData; - } - const parsedHeaders = parseHeaderString(headersRef.current); - if (!parsedHeaders.isValidJSON) { - setFetchError("Introspection failed as headers are invalid."); + } = useIntrospectionQuery(t5); + let t6; + if ($[14] !== fetcher || $[15] !== introspectionQuery || $[16] !== introspectionQueryName || $[17] !== introspectionQuerySansSubscriptions || $[18] !== onSchemaChange || $[19] !== props.schema) { + t6 = () => { + if (graphql.isSchema(props.schema) || props.schema === null) { return; } - const fetcherOpts = parsedHeaders.headers ? { - headers: parsedHeaders.headers - } : {}; - const fetch2 = toolkit.fetcherReturnToPromise(fetcher({ - query: introspectionQuery, - operationName: introspectionQueryName - }, fetcherOpts)); - if (!toolkit.isPromise(fetch2)) { - setFetchError("Fetcher did not return a Promise for introspection."); - return; - } - setIsFetching(true); - setFetchError(null); - let result = await fetch2; - if (typeof result !== "object" || result === null || !("data" in result)) { - const fetch22 = toolkit.fetcherReturnToPromise(fetcher({ - query: introspectionQuerySansSubscriptions, + const counter = counterRef.current = counterRef.current + 1; + const maybeIntrospectionData = props.schema; + const fetchIntrospectionData = async function fetchIntrospectionData2() { + if (maybeIntrospectionData) { + return maybeIntrospectionData; + } + const parsedHeaders = parseHeaderString(headersRef.current); + if (!parsedHeaders.isValidJSON) { + setFetchError("Introspection failed as headers are invalid."); + return; + } + const fetcherOpts = parsedHeaders.headers ? { + headers: parsedHeaders.headers + } : {}; + const fetch2 = toolkit.fetcherReturnToPromise(fetcher({ + query: introspectionQuery, operationName: introspectionQueryName }, fetcherOpts)); - if (!toolkit.isPromise(fetch22)) { - throw new Error("Fetcher did not return a Promise for introspection."); + if (!toolkit.isPromise(fetch2)) { + setFetchError("Fetcher did not return a Promise for introspection."); + return; } - result = await fetch22; - } - setIsFetching(false); - if ((result == null ? void 0 : result.data) && "__schema" in result.data) { - return result.data; - } - const responseString = typeof result === "string" ? result : toolkit.formatResult(result); - setFetchError(responseString); - } - fetchIntrospectionData().then(introspectionData => { - if (counter !== counterRef.current || !introspectionData) { - return; - } - try { - const newSchema = graphql.buildClientSchema(introspectionData); - setSchema(newSchema); - onSchemaChange == null ? void 0 : onSchemaChange(newSchema); - } catch (error) { - setFetchError(toolkit.formatError(error)); - } - }).catch(error => { - if (counter !== counterRef.current) { - return; - } - setFetchError(toolkit.formatError(error)); - setIsFetching(false); + setIsFetching(true); + setFetchError(null); + let result = await fetch2; + if (typeof result !== "object" || result === null || !("data" in result)) { + const fetch22 = toolkit.fetcherReturnToPromise(fetcher({ + query: introspectionQuerySansSubscriptions, + operationName: introspectionQueryName + }, fetcherOpts)); + if (!toolkit.isPromise(fetch22)) { + throw new Error("Fetcher did not return a Promise for introspection."); + } + result = await fetch22; + } + setIsFetching(false); + if ((result == null ? void 0 : result.data) && "__schema" in result.data) { + return result.data; + } + const responseString = typeof result === "string" ? result : toolkit.formatResult(result); + setFetchError(responseString); + }; + fetchIntrospectionData().then(introspectionData => { + if (counter !== counterRef.current || !introspectionData) { + return; + } + try { + const newSchema = graphql.buildClientSchema(introspectionData); + setSchema(newSchema); + if (onSchemaChange) { + onSchemaChange(newSchema); + } + } catch (t72) { + const error = t72; + setFetchError(toolkit.formatError(error)); + } + }).catch(error_0 => { + if (counter !== counterRef.current) { + return; + } + setFetchError(toolkit.formatError(error_0)); + setIsFetching(false); + }); + }; + $[14] = fetcher; + $[15] = introspectionQuery; + $[16] = introspectionQueryName; + $[17] = introspectionQuerySansSubscriptions; + $[18] = onSchemaChange; + $[19] = props.schema; + $[20] = t6; + } else { + t6 = $[20]; + } + const introspect = t6; + let t7; + let t8; + if ($[21] !== introspect) { + t7 = () => { + introspect(); + }; + t8 = [introspect]; + $[21] = introspect; + $[22] = t7; + $[23] = t8; + } else { + t7 = $[22]; + t8 = $[23]; + } + React.useEffect(t7, t8); + let t9; + if ($[24] !== introspect) { + t9 = () => { + const triggerIntrospection = function triggerIntrospection2(event) { + if (event.ctrlKey && event.key === "R") { + introspect(); + } + }; + window.addEventListener("keydown", triggerIntrospection); + return () => { + window.removeEventListener("keydown", triggerIntrospection); + }; + }; + $[24] = introspect; + $[25] = t9; + } else { + t9 = $[25]; + } + React.useEffect(t9); + let t10; + if ($[26] !== props.dangerouslyAssumeSchemaIsValid || $[27] !== schema) { + t10 = !schema || props.dangerouslyAssumeSchemaIsValid ? [] : graphql.validateSchema(schema); + $[26] = props.dangerouslyAssumeSchemaIsValid; + $[27] = schema; + $[28] = t10; + } else { + t10 = $[28]; + } + const validationErrors = t10; + let t11; + if ($[29] !== fetchError || $[30] !== introspect || $[31] !== isFetching || $[32] !== schema || $[33] !== validationErrors) { + t11 = { + fetchError, + introspect, + isFetching, + schema, + validationErrors + }; + $[29] = fetchError; + $[30] = introspect; + $[31] = isFetching; + $[32] = schema; + $[33] = validationErrors; + $[34] = t11; + } else { + t11 = $[34]; + } + const value = t11; + let t12; + if ($[35] !== props.children || $[36] !== value) { + t12 = /* @__PURE__ */jsxRuntime.jsx(SchemaContext.Provider, { + value, + children: props.children }); - }, [fetcher, introspectionQueryName, introspectionQuery, introspectionQuerySansSubscriptions, onSchemaChange, props.schema]); - React.useEffect(() => { - introspect(); - }, [introspect]); - React.useEffect(() => { - function triggerIntrospection(event) { - if (event.ctrlKey && event.key === "R") { - introspect(); - } - } - window.addEventListener("keydown", triggerIntrospection); - return () => window.removeEventListener("keydown", triggerIntrospection); - }); - const validationErrors = React.useMemo(() => { - if (!schema || dangerouslyAssumeSchemaIsValid) { - return []; - } - return graphql.validateSchema(schema); - }, [schema, dangerouslyAssumeSchemaIsValid]); - const value = React.useMemo(() => ({ - fetchError, - introspect, - isFetching, - schema, - validationErrors - }), [fetchError, introspect, isFetching, schema, validationErrors]); - return /* @__PURE__ */jsxRuntime.jsx(SchemaContext.Provider, { - value, - children - }); + $[35] = props.children; + $[36] = value; + $[37] = t12; + } else { + t12 = $[37]; + } + return t12; } const useSchemaContext = createContextHook(SchemaContext); function useIntrospectionQuery({ @@ -70191,22 +77713,20 @@ function useIntrospectionQuery({ introspectionQueryName, schemaDescription }) { - return React.useMemo(() => { - const queryName = introspectionQueryName || "IntrospectionQuery"; - let query = graphql.getIntrospectionQuery({ - inputValueDeprecation, - schemaDescription - }); - if (introspectionQueryName) { - query = query.replace("query IntrospectionQuery", `query ${queryName}`); - } - const querySansSubscriptions = query.replace("subscriptionType { name }", ""); - return { - introspectionQueryName: queryName, - introspectionQuery: query, - introspectionQuerySansSubscriptions: querySansSubscriptions - }; - }, [inputValueDeprecation, introspectionQueryName, schemaDescription]); + const queryName = introspectionQueryName || "IntrospectionQuery"; + let query = graphql.getIntrospectionQuery({ + inputValueDeprecation, + schemaDescription + }); + if (introspectionQueryName) { + query = query.replace("query IntrospectionQuery", `query ${queryName}`); + } + const querySansSubscriptions = query.replace("subscriptionType { name }", ""); + return { + introspectionQueryName: queryName, + introspectionQuery: query, + introspectionQuerySansSubscriptions: querySansSubscriptions + }; } function parseHeaderString(headersString) { let headers = null; @@ -70228,99 +77748,175 @@ const initialNavStackItem = { }; const ExplorerContext = createNullableContext("ExplorerContext"); function ExplorerContextProvider(props) { + const $ = reactCompilerRuntime.c(14); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true, + caller: ExplorerContextProvider + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { schema, validationErrors - } = useSchemaContext({ - nonNull: true, - caller: ExplorerContextProvider - }); - const [navStack, setNavStack] = React.useState([initialNavStackItem]); - const push = React.useCallback(item => { - setNavStack(currentState => { - const lastItem = currentState.at(-1); - return lastItem.def === item.def ? - // Avoid pushing duplicate items - currentState : [...currentState, item]; - }); - }, []); - const pop = React.useCallback(() => { - setNavStack(currentState => currentState.length > 1 ? currentState.slice(0, -1) : currentState); - }, []); - const reset = React.useCallback(() => { - setNavStack(currentState => currentState.length === 1 ? currentState : [initialNavStackItem]); - }, []); - React.useEffect(() => { - if (schema == null || validationErrors.length > 0) { - reset(); - } else { - setNavStack(oldNavStack => { - if (oldNavStack.length === 1) { - return oldNavStack; - } - const newNavStack = [initialNavStackItem]; - let lastEntity = null; - for (const item of oldNavStack) { - if (item === initialNavStackItem) { - continue; - } - if (item.def) { - if (graphql.isNamedType(item.def)) { - const newType = schema.getType(item.def.name); - if (newType) { - newNavStack.push({ - name: item.name, - def: newType - }); - lastEntity = newType; - } else { - break; - } - } else if (lastEntity === null) { - break; - } else if (graphql.isObjectType(lastEntity) || graphql.isInputObjectType(lastEntity)) { - const field = lastEntity.getFields()[item.name]; - if (field) { - newNavStack.push({ - name: item.name, - def: field - }); - } else { - break; - } - } else if (graphql.isScalarType(lastEntity) || graphql.isEnumType(lastEntity) || graphql.isInterfaceType(lastEntity) || graphql.isUnionType(lastEntity)) { - break; - } else { - const field = lastEntity; - const arg = field.args.find(a => a.name === item.name); - if (arg) { - newNavStack.push({ - name: item.name, - def: field - }); - } else { - break; - } - } - } else { - lastEntity = null; - newNavStack.push(item); - } - } - return newNavStack; + } = useSchemaContext(t0); + let t1; + if ($[1] === Symbol.for("react.memo_cache_sentinel")) { + t1 = [initialNavStackItem]; + $[1] = t1; + } else { + t1 = $[1]; + } + const [navStack, setNavStack] = React.useState(t1); + let t2; + if ($[2] === Symbol.for("react.memo_cache_sentinel")) { + t2 = item => { + setNavStack(currentState => { + const lastItem = currentState.at(-1); + return lastItem.def === item.def ? currentState : [...currentState, item]; }); - } - }, [reset, schema, validationErrors]); - const value = React.useMemo(() => ({ - explorerNavStack: navStack, - push, - pop, - reset - }), [navStack, push, pop, reset]); - return /* @__PURE__ */jsxRuntime.jsx(ExplorerContext.Provider, { - value, - children: props.children - }); + }; + $[2] = t2; + } else { + t2 = $[2]; + } + const push = t2; + let t3; + if ($[3] === Symbol.for("react.memo_cache_sentinel")) { + t3 = () => { + setNavStack(_temp$6); + }; + $[3] = t3; + } else { + t3 = $[3]; + } + const pop = t3; + let t4; + if ($[4] === Symbol.for("react.memo_cache_sentinel")) { + t4 = () => { + setNavStack(_temp2$3); + }; + $[4] = t4; + } else { + t4 = $[4]; + } + const reset = t4; + let t5; + let t6; + if ($[5] !== schema || $[6] !== validationErrors) { + t5 = () => { + if (schema == null || validationErrors.length > 0) { + reset(); + } else { + setNavStack(oldNavStack => { + if (oldNavStack.length === 1) { + return oldNavStack; + } + const newNavStack = [initialNavStackItem]; + let lastEntity = null; + for (const item_0 of oldNavStack) { + if (item_0 === initialNavStackItem) { + continue; + } + if (item_0.def) { + if (graphql.isNamedType(item_0.def)) { + const newType = schema.getType(item_0.def.name); + if (newType) { + newNavStack.push({ + name: item_0.name, + def: newType + }); + lastEntity = newType; + } else { + break; + } + } else { + if (lastEntity === null) { + break; + } else { + if (graphql.isObjectType(lastEntity) || graphql.isInputObjectType(lastEntity)) { + const field = lastEntity.getFields()[item_0.name]; + if (field) { + newNavStack.push({ + name: item_0.name, + def: field + }); + } else { + break; + } + } else { + if (graphql.isScalarType(lastEntity) || graphql.isEnumType(lastEntity) || graphql.isInterfaceType(lastEntity) || graphql.isUnionType(lastEntity)) { + break; + } else { + const field_0 = lastEntity; + const arg = field_0.args.find(a => a.name === item_0.name); + if (arg) { + newNavStack.push({ + name: item_0.name, + def: field_0 + }); + } else { + break; + } + } + } + } + } + } else { + lastEntity = null; + newNavStack.push(item_0); + } + } + return newNavStack; + }); + } + }; + t6 = [schema, validationErrors]; + $[5] = schema; + $[6] = validationErrors; + $[7] = t5; + $[8] = t6; + } else { + t5 = $[7]; + t6 = $[8]; + } + React.useEffect(t5, t6); + let t7; + if ($[9] !== navStack) { + t7 = { + explorerNavStack: navStack, + push, + pop, + reset + }; + $[9] = navStack; + $[10] = t7; + } else { + t7 = $[10]; + } + const value = t7; + let t8; + if ($[11] !== props.children || $[12] !== value) { + t8 = /* @__PURE__ */jsxRuntime.jsx(ExplorerContext.Provider, { + value, + children: props.children + }); + $[11] = props.children; + $[12] = value; + $[13] = t8; + } else { + t8 = $[13]; + } + return t8; +} +function _temp2$3(currentState_1) { + return currentState_1.length === 1 ? currentState_1 : [initialNavStackItem]; +} +function _temp$6(currentState_0) { + return currentState_0.length > 1 ? currentState_0.slice(0, -1) : currentState_0; } const useExplorerContext = createContextHook(ExplorerContext); function renderType(type, renderNamedType) { @@ -70337,52 +77933,122 @@ function renderType(type, renderNamedType) { return renderNamedType(type); } function TypeLink(props) { + const $ = reactCompilerRuntime.c(6); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true, + caller: TypeLink + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { push - } = useExplorerContext({ - nonNull: true, - caller: TypeLink - }); + } = useExplorerContext(t0); if (!props.type) { return null; } - return renderType(props.type, namedType => /* @__PURE__ */jsxRuntime.jsx("a", { - className: "graphiql-doc-explorer-type-name", - onClick: event => { - event.preventDefault(); - push({ - name: namedType.name, - def: namedType - }); - }, - href: "#", - children: namedType.name - })); + let t1; + if ($[1] !== push) { + t1 = namedType => /* @__PURE__ */jsxRuntime.jsx("a", { + className: "graphiql-doc-explorer-type-name", + onClick: event => { + event.preventDefault(); + push({ + name: namedType.name, + def: namedType + }); + }, + href: "#", + children: namedType.name + }); + $[1] = push; + $[2] = t1; + } else { + t1 = $[2]; + } + let t2; + if ($[3] !== props.type || $[4] !== t1) { + t2 = renderType(props.type, t1); + $[3] = props.type; + $[4] = t1; + $[5] = t2; + } else { + t2 = $[5]; + } + return t2; } -function Argument({ - arg, - showDefaultValue, - inline -}) { - const definition = /* @__PURE__ */jsxRuntime.jsxs("span", { - children: [/* @__PURE__ */jsxRuntime.jsx("span", { +function Argument(t0) { + const $ = reactCompilerRuntime.c(19); + const { + arg, + showDefaultValue, + inline + } = t0; + let t1; + if ($[0] !== arg.name) { + t1 = /* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-argument-name", children: arg.name - }), ": ", /* @__PURE__ */jsxRuntime.jsx(TypeLink, { + }); + $[0] = arg.name; + $[1] = t1; + } else { + t1 = $[1]; + } + let t2; + if ($[2] !== arg.type) { + t2 = /* @__PURE__ */jsxRuntime.jsx(TypeLink, { type: arg.type - }), showDefaultValue !== false && /* @__PURE__ */jsxRuntime.jsx(DefaultValue, { + }); + $[2] = arg.type; + $[3] = t2; + } else { + t2 = $[3]; + } + let t3; + if ($[4] !== arg || $[5] !== showDefaultValue) { + t3 = showDefaultValue !== false && /* @__PURE__ */jsxRuntime.jsx(DefaultValue, { field: arg - })] - }); + }); + $[4] = arg; + $[5] = showDefaultValue; + $[6] = t3; + } else { + t3 = $[6]; + } + let t4; + if ($[7] !== t1 || $[8] !== t2 || $[9] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs("span", { + children: [t1, ": ", t2, t3] + }); + $[7] = t1; + $[8] = t2; + $[9] = t3; + $[10] = t4; + } else { + t4 = $[10]; + } + const definition = t4; if (inline) { return definition; } - return /* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-argument", - children: [definition, arg.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + let t5; + if ($[11] !== arg.description) { + t5 = arg.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { type: "description", children: arg.description - }) : null, arg.deprecationReason ? /* @__PURE__ */jsxRuntime.jsxs("div", { + }) : null; + $[11] = arg.description; + $[12] = t5; + } else { + t5 = $[12]; + } + let t6; + if ($[13] !== arg.deprecationReason) { + t6 = arg.deprecationReason ? /* @__PURE__ */jsxRuntime.jsxs("div", { className: "graphiql-doc-explorer-argument-deprecation", children: [/* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-doc-explorer-argument-deprecation-label", @@ -70391,42 +78057,115 @@ function Argument({ type: "deprecation", children: arg.deprecationReason })] - }) : null] - }); + }) : null; + $[13] = arg.deprecationReason; + $[14] = t6; + } else { + t6 = $[14]; + } + let t7; + if ($[15] !== definition || $[16] !== t5 || $[17] !== t6) { + t7 = /* @__PURE__ */jsxRuntime.jsxs("div", { + className: "graphiql-doc-explorer-argument", + children: [definition, t5, t6] + }); + $[15] = definition; + $[16] = t5; + $[17] = t6; + $[18] = t7; + } else { + t7 = $[18]; + } + return t7; } function DeprecationReason(props) { - var _props$preview; - return props.children ? /* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-deprecation", - children: [/* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-doc-explorer-deprecation-label", - children: "Deprecated" - }), /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { - type: "deprecation", - onlyShowFirstChild: (_props$preview = props.preview) !== null && _props$preview !== void 0 ? _props$preview : true, - children: props.children - })] - }) : null; + const $ = reactCompilerRuntime.c(3); + let t0; + if ($[0] !== props.children || $[1] !== props.preview) { + var _props$preview; + t0 = props.children ? /* @__PURE__ */jsxRuntime.jsxs("div", { + className: "graphiql-doc-explorer-deprecation", + children: [/* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-doc-explorer-deprecation-label", + children: "Deprecated" + }), /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + type: "deprecation", + onlyShowFirstChild: (_props$preview = props.preview) !== null && _props$preview !== void 0 ? _props$preview : true, + children: props.children + })] + }) : null; + $[0] = props.children; + $[1] = props.preview; + $[2] = t0; + } else { + t0 = $[2]; + } + return t0; } -function Directive({ - directive -}) { - return /* @__PURE__ */jsxRuntime.jsxs("span", { - className: "graphiql-doc-explorer-directive", - children: ["@", directive.name.value] - }); +function Directive(t0) { + const $ = reactCompilerRuntime.c(2); + const { + directive + } = t0; + let t1; + if ($[0] !== directive.name.value) { + t1 = /* @__PURE__ */jsxRuntime.jsxs("span", { + className: "graphiql-doc-explorer-directive", + children: ["@", directive.name.value] + }); + $[0] = directive.name.value; + $[1] = t1; + } else { + t1 = $[1]; + } + return t1; } function ExplorerSection(props) { + const $ = reactCompilerRuntime.c(10); const Icon2 = TYPE_TO_ICON[props.title]; - return /* @__PURE__ */jsxRuntime.jsxs("div", { - children: [/* @__PURE__ */jsxRuntime.jsxs("div", { + let t0; + if ($[0] !== Icon2) { + t0 = /* @__PURE__ */jsxRuntime.jsx(Icon2, {}); + $[0] = Icon2; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props.title || $[3] !== t0) { + t1 = /* @__PURE__ */jsxRuntime.jsxs("div", { className: "graphiql-doc-explorer-section-title", - children: [/* @__PURE__ */jsxRuntime.jsx(Icon2, {}), props.title] - }), /* @__PURE__ */jsxRuntime.jsx("div", { + children: [t0, props.title] + }); + $[2] = props.title; + $[3] = t0; + $[4] = t1; + } else { + t1 = $[4]; + } + let t2; + if ($[5] !== props.children) { + t2 = /* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-doc-explorer-section-content", children: props.children - })] - }); + }); + $[5] = props.children; + $[6] = t2; + } else { + t2 = $[6]; + } + let t3; + if ($[7] !== t1 || $[8] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsxs("div", { + children: [t1, t2] + }); + $[7] = t1; + $[8] = t2; + $[9] = t3; + } else { + t3 = $[9]; + } + return t3; } const TYPE_TO_ICON = { Arguments: ArgumentIcon, @@ -70444,130 +78183,380 @@ const TYPE_TO_ICON = { "All Schema Types": TypeIcon }; function FieldDocumentation(props) { - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [props.field.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + const $ = reactCompilerRuntime.c(15); + let t0; + if ($[0] !== props.field.description) { + t0 = props.field.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { type: "description", children: props.field.description - }) : null, /* @__PURE__ */jsxRuntime.jsx(DeprecationReason, { + }) : null; + $[0] = props.field.description; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== props.field.deprecationReason) { + t1 = /* @__PURE__ */jsxRuntime.jsx(DeprecationReason, { preview: false, children: props.field.deprecationReason - }), /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + }); + $[2] = props.field.deprecationReason; + $[3] = t1; + } else { + t1 = $[3]; + } + let t2; + if ($[4] !== props.field.type) { + t2 = /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Type", children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { type: props.field.type }) - }), /* @__PURE__ */jsxRuntime.jsx(Arguments, { + }); + $[4] = props.field.type; + $[5] = t2; + } else { + t2 = $[5]; + } + let t3; + let t4; + if ($[6] !== props.field) { + t3 = /* @__PURE__ */jsxRuntime.jsx(Arguments, { field: props.field - }), /* @__PURE__ */jsxRuntime.jsx(Directives, { + }); + t4 = /* @__PURE__ */jsxRuntime.jsx(Directives, { field: props.field - })] - }); + }); + $[6] = props.field; + $[7] = t3; + $[8] = t4; + } else { + t3 = $[7]; + t4 = $[8]; + } + let t5; + if ($[9] !== t0 || $[10] !== t1 || $[11] !== t2 || $[12] !== t3 || $[13] !== t4) { + t5 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t0, t1, t2, t3, t4] + }); + $[9] = t0; + $[10] = t1; + $[11] = t2; + $[12] = t3; + $[13] = t4; + $[14] = t5; + } else { + t5 = $[14]; + } + return t5; } -function Arguments({ - field -}) { +function Arguments(t0) { + const $ = reactCompilerRuntime.c(12); + const { + field + } = t0; const [showDeprecated, setShowDeprecated] = React.useState(false); - const handleShowDeprecated = React.useCallback(() => { - setShowDeprecated(true); - }, []); + let t1; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t1 = () => { + setShowDeprecated(true); + }; + $[0] = t1; + } else { + t1 = $[0]; + } + const handleShowDeprecated = t1; if (!("args" in field)) { return null; } - const args = []; - const deprecatedArgs = []; - for (const argument of field.args) { - if (argument.deprecationReason) { - deprecatedArgs.push(argument); - } else { - args.push(argument); + let args; + let deprecatedArgs; + let t2; + if ($[1] !== field.args) { + args = []; + deprecatedArgs = []; + for (const argument of field.args) { + if (argument.deprecationReason) { + deprecatedArgs.push(argument); + } else { + args.push(argument); + } } - } - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [args.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + t2 = args.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Arguments", - children: args.map(arg => /* @__PURE__ */jsxRuntime.jsx(Argument, { - arg - }, arg.name)) - }) : null, deprecatedArgs.length > 0 ? showDeprecated || args.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + children: args.map(_temp$5) + }) : null; + $[1] = field.args; + $[2] = args; + $[3] = deprecatedArgs; + $[4] = t2; + } else { + args = $[2]; + deprecatedArgs = $[3]; + t2 = $[4]; + } + let t3; + if ($[5] !== args.length || $[6] !== deprecatedArgs || $[7] !== showDeprecated) { + t3 = deprecatedArgs.length > 0 ? showDeprecated || args.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Deprecated Arguments", - children: deprecatedArgs.map(arg => /* @__PURE__ */jsxRuntime.jsx(Argument, { - arg - }, arg.name)) + children: deprecatedArgs.map(_temp2$2) }) : /* @__PURE__ */jsxRuntime.jsx(Button$1, { type: "button", onClick: handleShowDeprecated, children: "Show Deprecated Arguments" - }) : null] - }); + }) : null; + $[5] = args.length; + $[6] = deprecatedArgs; + $[7] = showDeprecated; + $[8] = t3; + } else { + t3 = $[8]; + } + let t4; + if ($[9] !== t2 || $[10] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t2, t3] + }); + $[9] = t2; + $[10] = t3; + $[11] = t4; + } else { + t4 = $[11]; + } + return t4; } -function Directives({ - field -}) { - var _a; - const directives = ((_a = field.astNode) == null ? void 0 : _a.directives) || []; +function _temp2$2(arg_0) { + return /* @__PURE__ */jsxRuntime.jsx(Argument, { + arg: arg_0 + }, arg_0.name); +} +function _temp$5(arg) { + return /* @__PURE__ */jsxRuntime.jsx(Argument, { + arg + }, arg.name); +} +function Directives(t0) { + var _a, _b, _c; + const $ = reactCompilerRuntime.c(6); + const { + field + } = t0; + let t1; + if ($[0] !== ((_a = field.astNode) == null ? void 0 : _a.directives)) { + t1 = ((_b = field.astNode) == null ? void 0 : _b.directives) || []; + $[0] = (_c = field.astNode) == null ? void 0 : _c.directives; + $[1] = t1; + } else { + t1 = $[1]; + } + const directives = t1; if (!directives || directives.length === 0) { return null; } - return /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { - title: "Directives", - children: directives.map(directive => /* @__PURE__ */jsxRuntime.jsx("div", { - children: /* @__PURE__ */jsxRuntime.jsx(Directive, { - directive - }) - }, directive.name.value)) - }); + let t2; + if ($[2] !== directives) { + t2 = directives.map(_temp3$2); + $[2] = directives; + $[3] = t2; + } else { + t2 = $[3]; + } + let t3; + if ($[4] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + title: "Directives", + children: t2 + }); + $[4] = t2; + $[5] = t3; + } else { + t3 = $[5]; + } + return t3; +} +function _temp3$2(directive) { + return /* @__PURE__ */jsxRuntime.jsx("div", { + children: /* @__PURE__ */jsxRuntime.jsx(Directive, { + directive + }) + }, directive.name.value); } function SchemaDocumentation(props) { var _a, _b, _c, _d; - const queryType = props.schema.getQueryType(); - const mutationType = (_b = (_a = props.schema).getMutationType) == null ? void 0 : _b.call(_a); - const subscriptionType = (_d = (_c = props.schema).getSubscriptionType) == null ? void 0 : _d.call(_c); - const typeMap = props.schema.getTypeMap(); - const ignoreTypesInAllSchema = [queryType == null ? void 0 : queryType.name, mutationType == null ? void 0 : mutationType.name, subscriptionType == null ? void 0 : subscriptionType.name]; - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [/* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { - type: "description", - children: props.schema.description || "A GraphQL schema provides a root type for each kind of operation." - }), /* @__PURE__ */jsxRuntime.jsxs(ExplorerSection, { - title: "Root Types", - children: [queryType ? /* @__PURE__ */jsxRuntime.jsxs("div", { + const $ = reactCompilerRuntime.c(39); + let t0; + if ($[0] !== props.schema) { + t0 = props.schema.getQueryType(); + $[0] = props.schema; + $[1] = t0; + } else { + t0 = $[1]; + } + const queryType = t0; + let t1; + if ($[2] !== props.schema) { + t1 = (_b = (_a = props.schema).getMutationType) == null ? void 0 : _b.call(_a); + $[2] = props.schema; + $[3] = t1; + } else { + t1 = $[3]; + } + const mutationType = t1; + let t2; + if ($[4] !== props.schema) { + t2 = (_d = (_c = props.schema).getSubscriptionType) == null ? void 0 : _d.call(_c); + $[4] = props.schema; + $[5] = t2; + } else { + t2 = $[5]; + } + const subscriptionType = t2; + let T0; + let t3; + let t4; + let t5; + let t6; + if ($[6] !== mutationType || $[7] !== props.schema || $[8] !== queryType || $[9] !== subscriptionType) { + const typeMap = props.schema.getTypeMap(); + const t72 = queryType == null ? void 0 : queryType.name; + const t82 = mutationType == null ? void 0 : mutationType.name; + const t9 = subscriptionType == null ? void 0 : subscriptionType.name; + let t10; + if ($[15] !== t72 || $[16] !== t82 || $[17] !== t9) { + t10 = [t72, t82, t9]; + $[15] = t72; + $[16] = t82; + $[17] = t9; + $[18] = t10; + } else { + t10 = $[18]; + } + const ignoreTypesInAllSchema = t10; + const t11 = props.schema.description || "A GraphQL schema provides a root type for each kind of operation."; + if ($[19] !== t11) { + t5 = /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + type: "description", + children: t11 + }); + $[19] = t11; + $[20] = t5; + } else { + t5 = $[20]; + } + let t12; + if ($[21] !== queryType) { + t12 = queryType ? /* @__PURE__ */jsxRuntime.jsxs("div", { children: [/* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-root-type", children: "query" }), ": ", /* @__PURE__ */jsxRuntime.jsx(TypeLink, { type: queryType })] - }) : null, mutationType && /* @__PURE__ */jsxRuntime.jsxs("div", { + }) : null; + $[21] = queryType; + $[22] = t12; + } else { + t12 = $[22]; + } + let t13; + if ($[23] !== mutationType) { + t13 = mutationType && /* @__PURE__ */jsxRuntime.jsxs("div", { children: [/* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-root-type", children: "mutation" }), ": ", /* @__PURE__ */jsxRuntime.jsx(TypeLink, { type: mutationType })] - }), subscriptionType && /* @__PURE__ */jsxRuntime.jsxs("div", { + }); + $[23] = mutationType; + $[24] = t13; + } else { + t13 = $[24]; + } + let t14; + if ($[25] !== subscriptionType) { + t14 = subscriptionType && /* @__PURE__ */jsxRuntime.jsxs("div", { children: [/* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-root-type", children: "subscription" }), ": ", /* @__PURE__ */jsxRuntime.jsx(TypeLink, { type: subscriptionType })] - })] - }), /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { - title: "All Schema Types", - children: typeMap && /* @__PURE__ */jsxRuntime.jsx("div", { - children: Object.values(typeMap).map(type => { - if (ignoreTypesInAllSchema.includes(type.name) || type.name.startsWith("__")) { - return null; - } - return /* @__PURE__ */jsxRuntime.jsx("div", { - children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { - type - }) - }, type.name); - }) + }); + $[25] = subscriptionType; + $[26] = t14; + } else { + t14 = $[26]; + } + if ($[27] !== t12 || $[28] !== t13 || $[29] !== t14) { + t6 = /* @__PURE__ */jsxRuntime.jsxs(ExplorerSection, { + title: "Root Types", + children: [t12, t13, t14] + }); + $[27] = t12; + $[28] = t13; + $[29] = t14; + $[30] = t6; + } else { + t6 = $[30]; + } + T0 = ExplorerSection; + t3 = "All Schema Types"; + t4 = typeMap && /* @__PURE__ */jsxRuntime.jsx("div", { + children: Object.values(typeMap).map(type => { + if (ignoreTypesInAllSchema.includes(type.name) || type.name.startsWith("__")) { + return null; + } + return /* @__PURE__ */jsxRuntime.jsx("div", { + children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { + type + }) + }, type.name); }) - })] - }); + }); + $[6] = mutationType; + $[7] = props.schema; + $[8] = queryType; + $[9] = subscriptionType; + $[10] = T0; + $[11] = t3; + $[12] = t4; + $[13] = t5; + $[14] = t6; + } else { + T0 = $[10]; + t3 = $[11]; + t4 = $[12]; + t5 = $[13]; + t6 = $[14]; + } + let t7; + if ($[31] !== T0 || $[32] !== t3 || $[33] !== t4) { + t7 = /* @__PURE__ */jsxRuntime.jsx(T0, { + title: t3, + children: t4 + }); + $[31] = T0; + $[32] = t3; + $[33] = t4; + $[34] = t7; + } else { + t7 = $[34]; + } + let t8; + if ($[35] !== t5 || $[36] !== t6 || $[37] !== t7) { + t8 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t5, t6, t7] + }); + $[35] = t5; + $[36] = t6; + $[37] = t7; + $[38] = t8; + } else { + t8 = $[38]; + } + return t8; } function debounce(duration, fn) { let timeout; @@ -70582,6 +78571,8 @@ function debounce(duration, fn) { }; } function Search() { + "use no memo"; + const { explorerNavStack, push @@ -70643,7 +78634,7 @@ function Search() { autoComplete: "off", onFocus: handleFocus, onBlur: handleFocus, - onChange: event => setSearchValue(event.target.value), + onChange: event_0 => setSearchValue(event_0.target.value), placeholder: `${isMacOs ? "⌘" : "Ctrl"} K`, ref: inputRef, value: searchValue, @@ -70664,94 +78655,131 @@ function Search() { }, `within-${i}`)), results.within.length > 0 && results.types.length + results.fields.length > 0 ? /* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-doc-explorer-search-divider", children: "Other results" - }) : null, results.types.map((result, i) => /* @__PURE__ */jsxRuntime.jsx(react.Combobox.Option, { - value: result, + }) : null, results.types.map((result_0, i_0) => /* @__PURE__ */jsxRuntime.jsx(react.Combobox.Option, { + value: result_0, "data-cy": "doc-explorer-option", children: /* @__PURE__ */jsxRuntime.jsx(Type, { - type: result.type + type: result_0.type }) - }, `type-${i}`)), results.fields.map((result, i) => /* @__PURE__ */jsxRuntime.jsxs(react.Combobox.Option, { - value: result, + }, `type-${i_0}`)), results.fields.map((result_1, i_1) => /* @__PURE__ */jsxRuntime.jsxs(react.Combobox.Option, { + value: result_1, "data-cy": "doc-explorer-option", children: [/* @__PURE__ */jsxRuntime.jsx(Type, { - type: result.type + type: result_1.type }), ".", /* @__PURE__ */jsxRuntime.jsx(Field$1, { - field: result.field, - argument: result.argument + field: result_1.field, + argument: result_1.argument })] - }, `field-${i}`))] + }, `field-${i_1}`))] })] }); } +const _useSearchResults = useSearchResults; function useSearchResults(caller) { + const $ = reactCompilerRuntime.c(9); + const t0 = caller || _useSearchResults; + let t1; + if ($[0] !== t0) { + t1 = { + nonNull: true, + caller: t0 + }; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } const { explorerNavStack - } = useExplorerContext({ - nonNull: true, - caller: caller || useSearchResults - }); + } = useExplorerContext(t1); + const t2 = caller || _useSearchResults; + let t3; + if ($[2] !== t2) { + t3 = { + nonNull: true, + caller: t2 + }; + $[2] = t2; + $[3] = t3; + } else { + t3 = $[3]; + } const { schema - } = useSchemaContext({ - nonNull: true, - caller: caller || useSearchResults - }); - const navItem = explorerNavStack.at(-1); - return React.useCallback(searchValue => { - const matches = { - within: [], - types: [], - fields: [] - }; - if (!schema) { - return matches; - } - const withinType = navItem.def; - const typeMap = schema.getTypeMap(); - let typeNames = Object.keys(typeMap); - if (withinType) { - typeNames = typeNames.filter(n => n !== withinType.name); - typeNames.unshift(withinType.name); - } - for (const typeName of typeNames) { - if (matches.within.length + matches.types.length + matches.fields.length >= 100) { - break; + } = useSchemaContext(t3); + let t4; + if ($[4] !== explorerNavStack) { + t4 = explorerNavStack.at(-1); + $[4] = explorerNavStack; + $[5] = t4; + } else { + t4 = $[5]; + } + const navItem = t4; + let t5; + if ($[6] !== navItem || $[7] !== schema) { + t5 = searchValue => { + const matches = { + within: [], + types: [], + fields: [] + }; + if (!schema) { + return matches; } - const type = typeMap[typeName]; - if (withinType !== type && isMatch(typeName, searchValue)) { - matches.types.push({ - type - }); + const withinType = navItem.def; + const typeMap = schema.getTypeMap(); + let typeNames = Object.keys(typeMap); + if (withinType) { + typeNames = typeNames.filter(n => n !== withinType.name); + typeNames.unshift(withinType.name); } - if (!graphql.isObjectType(type) && !graphql.isInterfaceType(type) && !graphql.isInputObjectType(type)) { - continue; - } - const fields = type.getFields(); - for (const fieldName in fields) { - const field = fields[fieldName]; - let matchingArgs; - if (!isMatch(fieldName, searchValue)) { - if ("args" in field) { - matchingArgs = field.args.filter(arg => isMatch(arg.name, searchValue)); - if (matchingArgs.length === 0) { + for (const typeName of typeNames) { + if (matches.within.length + matches.types.length + matches.fields.length >= 100) { + break; + } + const type = typeMap[typeName]; + if (withinType !== type && isMatch(typeName, searchValue)) { + matches.types.push({ + type + }); + } + if (!graphql.isObjectType(type) && !graphql.isInterfaceType(type) && !graphql.isInputObjectType(type)) { + continue; + } + const fields = type.getFields(); + for (const fieldName in fields) { + const field = fields[fieldName]; + let matchingArgs; + if (!isMatch(fieldName, searchValue)) { + if ("args" in field) { + matchingArgs = field.args.filter(arg => isMatch(arg.name, searchValue)); + if (matchingArgs.length === 0) { + continue; + } + } else { continue; } - } else { - continue; } + matches[withinType === type ? "within" : "fields"].push(...(matchingArgs ? matchingArgs.map(argument => ({ + type, + field, + argument + })) : [{ + type, + field + }])); } - matches[withinType === type ? "within" : "fields"].push(...(matchingArgs ? matchingArgs.map(argument => ({ - type, - field, - argument - })) : [{ - type, - field - }])); } - } - return matches; - }, [navItem.def, schema]); + return matches; + }; + $[6] = navItem; + $[7] = schema; + $[8] = t5; + } else { + t5 = $[8]; + } + return t5; } function isMatch(sourceText, searchValue) { try { @@ -70762,307 +78790,804 @@ function isMatch(sourceText, searchValue) { } } function Type(props) { - return /* @__PURE__ */jsxRuntime.jsx("span", { - className: "graphiql-doc-explorer-search-type", - children: props.type.name - }); + const $ = reactCompilerRuntime.c(2); + let t0; + if ($[0] !== props.type.name) { + t0 = /* @__PURE__ */jsxRuntime.jsx("span", { + className: "graphiql-doc-explorer-search-type", + children: props.type.name + }); + $[0] = props.type.name; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; } -function Field$1({ - field, - argument -}) { - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [/* @__PURE__ */jsxRuntime.jsx("span", { +function Field$1(t0) { + const $ = reactCompilerRuntime.c(7); + const { + field, + argument + } = t0; + let t1; + if ($[0] !== field.name) { + t1 = /* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-search-field", children: field.name - }), argument ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + }); + $[0] = field.name; + $[1] = t1; + } else { + t1 = $[1]; + } + let t2; + if ($[2] !== argument) { + t2 = argument ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { children: ["(", /* @__PURE__ */jsxRuntime.jsx("span", { className: "graphiql-doc-explorer-search-argument", children: argument.name - }), ":", " ", renderType(argument.type, namedType => /* @__PURE__ */jsxRuntime.jsx(Type, { - type: namedType - })), ")"] - }) : null] + }), ":", " ", renderType(argument.type, _temp$4), ")"] + }) : null; + $[2] = argument; + $[3] = t2; + } else { + t2 = $[3]; + } + let t3; + if ($[4] !== t1 || $[5] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t1, t2] + }); + $[4] = t1; + $[5] = t2; + $[6] = t3; + } else { + t3 = $[6]; + } + return t3; +} +function _temp$4(namedType) { + return /* @__PURE__ */jsxRuntime.jsx(Type, { + type: namedType }); } function FieldLink(props) { + const $ = reactCompilerRuntime.c(7); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { push - } = useExplorerContext({ - nonNull: true - }); - return /* @__PURE__ */jsxRuntime.jsx("a", { - className: "graphiql-doc-explorer-field-name", - onClick: event => { + } = useExplorerContext(t0); + let t1; + if ($[1] !== props.field || $[2] !== push) { + t1 = event => { event.preventDefault(); push({ name: props.field.name, def: props.field }); - }, - href: "#", - children: props.field.name - }); + }; + $[1] = props.field; + $[2] = push; + $[3] = t1; + } else { + t1 = $[3]; + } + let t2; + if ($[4] !== props.field.name || $[5] !== t1) { + t2 = /* @__PURE__ */jsxRuntime.jsx("a", { + className: "graphiql-doc-explorer-field-name", + onClick: t1, + href: "#", + children: props.field.name + }); + $[4] = props.field.name; + $[5] = t1; + $[6] = t2; + } else { + t2 = $[6]; + } + return t2; } function TypeDocumentation(props) { - return graphql.isNamedType(props.type) ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [props.type.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { - type: "description", - children: props.type.description - }) : null, /* @__PURE__ */jsxRuntime.jsx(ImplementsInterfaces, { - type: props.type - }), /* @__PURE__ */jsxRuntime.jsx(Fields, { - type: props.type - }), /* @__PURE__ */jsxRuntime.jsx(EnumValues, { - type: props.type - }), /* @__PURE__ */jsxRuntime.jsx(PossibleTypes, { - type: props.type - })] - }) : null; + const $ = reactCompilerRuntime.c(2); + let t0; + if ($[0] !== props.type) { + t0 = graphql.isNamedType(props.type) ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [props.type.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + type: "description", + children: props.type.description + }) : null, /* @__PURE__ */jsxRuntime.jsx(ImplementsInterfaces, { + type: props.type + }), /* @__PURE__ */jsxRuntime.jsx(Fields, { + type: props.type + }), /* @__PURE__ */jsxRuntime.jsx(EnumValues, { + type: props.type + }), /* @__PURE__ */jsxRuntime.jsx(PossibleTypes, { + type: props.type + })] + }) : null; + $[0] = props.type; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; } -function ImplementsInterfaces({ - type -}) { +function ImplementsInterfaces(t0) { + const $ = reactCompilerRuntime.c(5); + const { + type + } = t0; if (!graphql.isObjectType(type)) { return null; } - const interfaces = type.getInterfaces(); - return interfaces.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { - title: "Implements", - children: type.getInterfaces().map(implementedInterface => /* @__PURE__ */jsxRuntime.jsx("div", { - children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { - type: implementedInterface - }) - }, implementedInterface.name)) - }) : null; + let t1; + if ($[0] !== type) { + t1 = type.getInterfaces(); + $[0] = type; + $[1] = t1; + } else { + t1 = $[1]; + } + const interfaces = t1; + let t2; + if ($[2] !== interfaces.length || $[3] !== type) { + t2 = interfaces.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + title: "Implements", + children: type.getInterfaces().map(_temp$3) + }) : null; + $[2] = interfaces.length; + $[3] = type; + $[4] = t2; + } else { + t2 = $[4]; + } + return t2; } -function Fields({ - type -}) { +function _temp$3(implementedInterface) { + return /* @__PURE__ */jsxRuntime.jsx("div", { + children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { + type: implementedInterface + }) + }, implementedInterface.name); +} +function Fields(t0) { + const $ = reactCompilerRuntime.c(12); + const { + type + } = t0; const [showDeprecated, setShowDeprecated] = React.useState(false); - const handleShowDeprecated = React.useCallback(() => { - setShowDeprecated(true); - }, []); + let t1; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t1 = () => { + setShowDeprecated(true); + }; + $[0] = t1; + } else { + t1 = $[0]; + } + const handleShowDeprecated = t1; if (!graphql.isObjectType(type) && !graphql.isInterfaceType(type) && !graphql.isInputObjectType(type)) { return null; } - const fieldMap = type.getFields(); - const fields = []; - const deprecatedFields = []; - for (const field of Object.keys(fieldMap).map(name => fieldMap[name])) { - if (field.deprecationReason) { - deprecatedFields.push(field); - } else { - fields.push(field); + let deprecatedFields; + let fields; + let t2; + if ($[1] !== type) { + const fieldMap = type.getFields(); + fields = []; + deprecatedFields = []; + for (const field of Object.keys(fieldMap).map(name => fieldMap[name])) { + if (field.deprecationReason) { + deprecatedFields.push(field); + } else { + fields.push(field); + } } - } - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [fields.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + t2 = fields.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Fields", - children: fields.map(field => /* @__PURE__ */jsxRuntime.jsx(Field, { - field - }, field.name)) - }) : null, deprecatedFields.length > 0 ? showDeprecated || fields.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + children: fields.map(_temp2$1) + }) : null; + $[1] = type; + $[2] = deprecatedFields; + $[3] = fields; + $[4] = t2; + } else { + deprecatedFields = $[2]; + fields = $[3]; + t2 = $[4]; + } + let t3; + if ($[5] !== deprecatedFields || $[6] !== fields.length || $[7] !== showDeprecated) { + t3 = deprecatedFields.length > 0 ? showDeprecated || fields.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Deprecated Fields", - children: deprecatedFields.map(field => /* @__PURE__ */jsxRuntime.jsx(Field, { - field - }, field.name)) + children: deprecatedFields.map(_temp3$1) }) : /* @__PURE__ */jsxRuntime.jsx(Button$1, { type: "button", onClick: handleShowDeprecated, children: "Show Deprecated Fields" - }) : null] - }); + }) : null; + $[5] = deprecatedFields; + $[6] = fields.length; + $[7] = showDeprecated; + $[8] = t3; + } else { + t3 = $[8]; + } + let t4; + if ($[9] !== t2 || $[10] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t2, t3] + }); + $[9] = t2; + $[10] = t3; + $[11] = t4; + } else { + t4 = $[11]; + } + return t4; } -function Field({ - field -}) { - const args = "args" in field ? field.args.filter(arg => !arg.deprecationReason) : []; - return /* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-item", - children: [/* @__PURE__ */jsxRuntime.jsxs("div", { - children: [/* @__PURE__ */jsxRuntime.jsx(FieldLink, { - field - }), args.length > 0 ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: ["(", /* @__PURE__ */jsxRuntime.jsx("span", { - children: args.map(arg => args.length === 1 ? /* @__PURE__ */jsxRuntime.jsx(Argument, { - arg, +function _temp3$1(field_1) { + return /* @__PURE__ */jsxRuntime.jsx(Field, { + field: field_1 + }, field_1.name); +} +function _temp2$1(field_0) { + return /* @__PURE__ */jsxRuntime.jsx(Field, { + field: field_0 + }, field_0.name); +} +function Field(t0) { + const $ = reactCompilerRuntime.c(22); + const { + field + } = t0; + let t1; + let t2; + let t3; + if ($[0] !== field) { + const args = "args" in field ? field.args.filter(_temp4$1) : []; + t3 = "graphiql-doc-explorer-item"; + t1 = /* @__PURE__ */jsxRuntime.jsx(FieldLink, { + field + }); + t2 = args.length > 0 ? /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: ["(", /* @__PURE__ */jsxRuntime.jsx("span", { + children: args.map(arg_0 => args.length === 1 ? /* @__PURE__ */jsxRuntime.jsx(Argument, { + arg: arg_0, + inline: true + }, arg_0.name) : /* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-doc-explorer-argument-multiple", + children: /* @__PURE__ */jsxRuntime.jsx(Argument, { + arg: arg_0, inline: true - }, arg.name) : /* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-doc-explorer-argument-multiple", - children: /* @__PURE__ */jsxRuntime.jsx(Argument, { - arg, - inline: true - }) - }, arg.name)) - }), ")"] - }) : null, ": ", /* @__PURE__ */jsxRuntime.jsx(TypeLink, { - type: field.type - }), /* @__PURE__ */jsxRuntime.jsx(DefaultValue, { - field - })] - }), field.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + }) + }, arg_0.name)) + }), ")"] + }) : null; + $[0] = field; + $[1] = t1; + $[2] = t2; + $[3] = t3; + } else { + t1 = $[1]; + t2 = $[2]; + t3 = $[3]; + } + let t4; + if ($[4] !== field.type) { + t4 = /* @__PURE__ */jsxRuntime.jsx(TypeLink, { + type: field.type + }); + $[4] = field.type; + $[5] = t4; + } else { + t4 = $[5]; + } + let t5; + if ($[6] !== field) { + t5 = /* @__PURE__ */jsxRuntime.jsx(DefaultValue, { + field + }); + $[6] = field; + $[7] = t5; + } else { + t5 = $[7]; + } + let t6; + if ($[8] !== t1 || $[9] !== t2 || $[10] !== t4 || $[11] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsxs("div", { + children: [t1, t2, ": ", t4, t5] + }); + $[8] = t1; + $[9] = t2; + $[10] = t4; + $[11] = t5; + $[12] = t6; + } else { + t6 = $[12]; + } + let t7; + if ($[13] !== field.description) { + t7 = field.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { type: "description", onlyShowFirstChild: true, children: field.description - }) : null, /* @__PURE__ */jsxRuntime.jsx(DeprecationReason, { + }) : null; + $[13] = field.description; + $[14] = t7; + } else { + t7 = $[14]; + } + let t8; + if ($[15] !== field.deprecationReason) { + t8 = /* @__PURE__ */jsxRuntime.jsx(DeprecationReason, { children: field.deprecationReason - })] - }); + }); + $[15] = field.deprecationReason; + $[16] = t8; + } else { + t8 = $[16]; + } + let t9; + if ($[17] !== t3 || $[18] !== t6 || $[19] !== t7 || $[20] !== t8) { + t9 = /* @__PURE__ */jsxRuntime.jsxs("div", { + className: t3, + children: [t6, t7, t8] + }); + $[17] = t3; + $[18] = t6; + $[19] = t7; + $[20] = t8; + $[21] = t9; + } else { + t9 = $[21]; + } + return t9; } -function EnumValues({ - type -}) { +function _temp4$1(arg) { + return !arg.deprecationReason; +} +function EnumValues(t0) { + const $ = reactCompilerRuntime.c(12); + const { + type + } = t0; const [showDeprecated, setShowDeprecated] = React.useState(false); - const handleShowDeprecated = React.useCallback(() => { - setShowDeprecated(true); - }, []); + let t1; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t1 = () => { + setShowDeprecated(true); + }; + $[0] = t1; + } else { + t1 = $[0]; + } + const handleShowDeprecated = t1; if (!graphql.isEnumType(type)) { return null; } - const values = []; - const deprecatedValues = []; - for (const value of type.getValues()) { - if (value.deprecationReason) { - deprecatedValues.push(value); - } else { - values.push(value); + let deprecatedValues; + let t2; + let values; + if ($[1] !== type) { + values = []; + deprecatedValues = []; + for (const value of type.getValues()) { + if (value.deprecationReason) { + deprecatedValues.push(value); + } else { + values.push(value); + } } - } - return /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { - children: [values.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + t2 = values.length > 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Enum Values", - children: values.map(value => /* @__PURE__ */jsxRuntime.jsx(EnumValue, { - value - }, value.name)) - }) : null, deprecatedValues.length > 0 ? showDeprecated || values.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + children: values.map(_temp5) + }) : null; + $[1] = type; + $[2] = deprecatedValues; + $[3] = t2; + $[4] = values; + } else { + deprecatedValues = $[2]; + t2 = $[3]; + values = $[4]; + } + let t3; + if ($[5] !== deprecatedValues || $[6] !== showDeprecated || $[7] !== values.length) { + t3 = deprecatedValues.length > 0 ? showDeprecated || values.length === 0 ? /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { title: "Deprecated Enum Values", - children: deprecatedValues.map(value => /* @__PURE__ */jsxRuntime.jsx(EnumValue, { - value - }, value.name)) + children: deprecatedValues.map(_temp6) }) : /* @__PURE__ */jsxRuntime.jsx(Button$1, { type: "button", onClick: handleShowDeprecated, children: "Show Deprecated Values" - }) : null] - }); + }) : null; + $[5] = deprecatedValues; + $[6] = showDeprecated; + $[7] = values.length; + $[8] = t3; + } else { + t3 = $[8]; + } + let t4; + if ($[9] !== t2 || $[10] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs(jsxRuntime.Fragment, { + children: [t2, t3] + }); + $[9] = t2; + $[10] = t3; + $[11] = t4; + } else { + t4 = $[11]; + } + return t4; } -function EnumValue({ - value -}) { - return /* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-item", - children: [/* @__PURE__ */jsxRuntime.jsx("div", { +function _temp6(value_1) { + return /* @__PURE__ */jsxRuntime.jsx(EnumValue, { + value: value_1 + }, value_1.name); +} +function _temp5(value_0) { + return /* @__PURE__ */jsxRuntime.jsx(EnumValue, { + value: value_0 + }, value_0.name); +} +function EnumValue(t0) { + const $ = reactCompilerRuntime.c(10); + const { + value + } = t0; + let t1; + if ($[0] !== value.name) { + t1 = /* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-doc-explorer-enum-value", children: value.name - }), value.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + }); + $[0] = value.name; + $[1] = t1; + } else { + t1 = $[1]; + } + let t2; + if ($[2] !== value.description) { + t2 = value.description ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { type: "description", children: value.description - }) : null, value.deprecationReason ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { + }) : null; + $[2] = value.description; + $[3] = t2; + } else { + t2 = $[3]; + } + let t3; + if ($[4] !== value.deprecationReason) { + t3 = value.deprecationReason ? /* @__PURE__ */jsxRuntime.jsx(MarkdownContent, { type: "deprecation", children: value.deprecationReason - }) : null] - }); + }) : null; + $[4] = value.deprecationReason; + $[5] = t3; + } else { + t3 = $[5]; + } + let t4; + if ($[6] !== t1 || $[7] !== t2 || $[8] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs("div", { + className: "graphiql-doc-explorer-item", + children: [t1, t2, t3] + }); + $[6] = t1; + $[7] = t2; + $[8] = t3; + $[9] = t4; + } else { + t4 = $[9]; + } + return t4; } -function PossibleTypes({ - type -}) { +function PossibleTypes(t0) { + const $ = reactCompilerRuntime.c(7); + const { + type + } = t0; + let t1; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true + }; + $[0] = t1; + } else { + t1 = $[0]; + } const { schema - } = useSchemaContext({ - nonNull: true - }); + } = useSchemaContext(t1); if (!schema || !graphql.isAbstractType(type)) { return null; } - return /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { - title: graphql.isInterfaceType(type) ? "Implementations" : "Possible Types", - children: schema.getPossibleTypes(type).map(possibleType => /* @__PURE__ */jsxRuntime.jsx("div", { - children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { - type: possibleType - }) - }, possibleType.name)) - }); + const t2 = graphql.isInterfaceType(type) ? "Implementations" : "Possible Types"; + let t3; + if ($[1] !== schema || $[2] !== type) { + t3 = schema.getPossibleTypes(type).map(_temp7); + $[1] = schema; + $[2] = type; + $[3] = t3; + } else { + t3 = $[3]; + } + let t4; + if ($[4] !== t2 || $[5] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsx(ExplorerSection, { + title: t2, + children: t3 + }); + $[4] = t2; + $[5] = t3; + $[6] = t4; + } else { + t4 = $[6]; + } + return t4; +} +function _temp7(possibleType) { + return /* @__PURE__ */jsxRuntime.jsx("div", { + children: /* @__PURE__ */jsxRuntime.jsx(TypeLink, { + type: possibleType + }) + }, possibleType.name); } function DocExplorer() { + const $ = reactCompilerRuntime.c(40); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true, + caller: DocExplorer + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { fetchError, isFetching, schema, validationErrors - } = useSchemaContext({ - nonNull: true, - caller: DocExplorer - }); + } = useSchemaContext(t0); + let t1; + if ($[1] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: DocExplorer + }; + $[1] = t1; + } else { + t1 = $[1]; + } const { explorerNavStack, pop - } = useExplorerContext({ - nonNull: true, - caller: DocExplorer - }); - const navItem = explorerNavStack.at(-1); - let content = null; - if (fetchError) { - content = /* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-doc-explorer-error", - children: "Error fetching schema" - }); - } else if (validationErrors.length > 0) { - content = /* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-error", - children: ["Schema is invalid: ", validationErrors[0].message] - }); - } else if (isFetching) { - content = /* @__PURE__ */jsxRuntime.jsx(Spinner, {}); - } else if (!schema) { - content = /* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-doc-explorer-error", - children: "No GraphQL schema available" - }); - } else if (explorerNavStack.length === 1) { - content = /* @__PURE__ */jsxRuntime.jsx(SchemaDocumentation, { - schema - }); - } else if (graphql.isType(navItem.def)) { - content = /* @__PURE__ */jsxRuntime.jsx(TypeDocumentation, { - type: navItem.def - }); - } else if (navItem.def) { - content = /* @__PURE__ */jsxRuntime.jsx(FieldDocumentation, { - field: navItem.def - }); + } = useExplorerContext(t1); + let content; + let navItem; + if ($[2] !== explorerNavStack || $[3] !== fetchError || $[4] !== isFetching || $[5] !== schema || $[6] !== validationErrors) { + navItem = explorerNavStack.at(-1); + content = null; + if (fetchError) { + let t22; + if ($[9] === Symbol.for("react.memo_cache_sentinel")) { + t22 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-doc-explorer-error", + children: "Error fetching schema" + }); + $[9] = t22; + } else { + t22 = $[9]; + } + content = t22; + } else { + if (validationErrors.length > 0) { + const t22 = validationErrors[0]; + let t32; + if ($[10] !== t22.message) { + t32 = /* @__PURE__ */jsxRuntime.jsxs("div", { + className: "graphiql-doc-explorer-error", + children: ["Schema is invalid: ", t22.message] + }); + $[10] = t22.message; + $[11] = t32; + } else { + t32 = $[11]; + } + content = t32; + } else { + if (isFetching) { + let t22; + if ($[12] === Symbol.for("react.memo_cache_sentinel")) { + t22 = /* @__PURE__ */jsxRuntime.jsx(Spinner, {}); + $[12] = t22; + } else { + t22 = $[12]; + } + content = t22; + } else { + if (!schema) { + let t22; + if ($[13] === Symbol.for("react.memo_cache_sentinel")) { + t22 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-doc-explorer-error", + children: "No GraphQL schema available" + }); + $[13] = t22; + } else { + t22 = $[13]; + } + content = t22; + } else { + if (explorerNavStack.length === 1) { + let t22; + if ($[14] !== schema) { + t22 = /* @__PURE__ */jsxRuntime.jsx(SchemaDocumentation, { + schema + }); + $[14] = schema; + $[15] = t22; + } else { + t22 = $[15]; + } + content = t22; + } else { + if (graphql.isType(navItem.def)) { + let t22; + if ($[16] !== navItem.def) { + t22 = /* @__PURE__ */jsxRuntime.jsx(TypeDocumentation, { + type: navItem.def + }); + $[16] = navItem.def; + $[17] = t22; + } else { + t22 = $[17]; + } + content = t22; + } else { + if (navItem.def) { + let t22; + if ($[18] !== navItem.def) { + t22 = /* @__PURE__ */jsxRuntime.jsx(FieldDocumentation, { + field: navItem.def + }); + $[18] = navItem.def; + $[19] = t22; + } else { + t22 = $[19]; + } + content = t22; + } + } + } + } + } + } + } + $[2] = explorerNavStack; + $[3] = fetchError; + $[4] = isFetching; + $[5] = schema; + $[6] = validationErrors; + $[7] = content; + $[8] = navItem; + } else { + content = $[7]; + navItem = $[8]; } let prevName; if (explorerNavStack.length > 1) { - prevName = explorerNavStack.at(-2).name; + let t22; + if ($[20] !== explorerNavStack) { + t22 = explorerNavStack.at(-2); + $[20] = explorerNavStack; + $[21] = t22; + } else { + t22 = $[21]; + } + prevName = t22.name; } - return /* @__PURE__ */jsxRuntime.jsxs("section", { - className: "graphiql-doc-explorer", - "aria-label": "Documentation Explorer", - children: [/* @__PURE__ */jsxRuntime.jsxs("div", { + let t2; + if ($[22] !== pop || $[23] !== prevName) { + t2 = prevName && /* @__PURE__ */jsxRuntime.jsxs("a", { + href: "#", + className: "graphiql-doc-explorer-back", + onClick: event => { + event.preventDefault(); + pop(); + }, + "aria-label": `Go back to ${prevName}`, + children: [/* @__PURE__ */jsxRuntime.jsx(ChevronLeftIcon, {}), prevName] + }); + $[22] = pop; + $[23] = prevName; + $[24] = t2; + } else { + t2 = $[24]; + } + let t3; + if ($[25] !== navItem.name) { + t3 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-doc-explorer-title", + children: navItem.name + }); + $[25] = navItem.name; + $[26] = t3; + } else { + t3 = $[26]; + } + let t4; + if ($[27] !== t2 || $[28] !== t3) { + t4 = /* @__PURE__ */jsxRuntime.jsxs("div", { + className: "graphiql-doc-explorer-header-content", + children: [t2, t3] + }); + $[27] = t2; + $[28] = t3; + $[29] = t4; + } else { + t4 = $[29]; + } + let t5; + if ($[30] !== navItem.name) { + t5 = /* @__PURE__ */jsxRuntime.jsx(Search, {}, navItem.name); + $[30] = navItem.name; + $[31] = t5; + } else { + t5 = $[31]; + } + let t6; + if ($[32] !== t4 || $[33] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsxs("div", { className: "graphiql-doc-explorer-header", - children: [/* @__PURE__ */jsxRuntime.jsxs("div", { - className: "graphiql-doc-explorer-header-content", - children: [prevName && /* @__PURE__ */jsxRuntime.jsxs("a", { - href: "#", - className: "graphiql-doc-explorer-back", - onClick: event => { - event.preventDefault(); - pop(); - }, - "aria-label": `Go back to ${prevName}`, - children: [/* @__PURE__ */jsxRuntime.jsx(ChevronLeftIcon, {}), prevName] - }), /* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-doc-explorer-title", - children: navItem.name - })] - }), /* @__PURE__ */jsxRuntime.jsx(Search, {}, navItem.name)] - }), /* @__PURE__ */jsxRuntime.jsx("div", { + children: [t4, t5] + }); + $[32] = t4; + $[33] = t5; + $[34] = t6; + } else { + t6 = $[34]; + } + let t7; + if ($[35] !== content) { + t7 = /* @__PURE__ */jsxRuntime.jsx("div", { className: "graphiql-doc-explorer-content", children: content - })] - }); + }); + $[35] = content; + $[36] = t7; + } else { + t7 = $[36]; + } + let t8; + if ($[37] !== t6 || $[38] !== t7) { + t8 = /* @__PURE__ */jsxRuntime.jsxs("section", { + className: "graphiql-doc-explorer", + "aria-label": "Documentation Explorer", + children: [t6, t7] + }); + $[37] = t6; + $[38] = t7; + $[39] = t8; + } else { + t8 = $[39]; + } + return t8; } const DOC_EXPLORER_PLUGIN = { title: "Documentation Explorer", @@ -71079,13 +79604,16 @@ const HISTORY_PLUGIN = { }; const PluginContext = createNullableContext("PluginContext"); function PluginContextProvider(props) { + const $ = reactCompilerRuntime.c(27); const storage = useStorageContext(); const explorerContext = useExplorerContext(); const historyContext = useHistoryContext(); const hasExplorerContext = Boolean(explorerContext); const hasHistoryContext = Boolean(historyContext); - const plugins = React.useMemo(() => { - const pluginList = []; + let t0; + let pluginList; + if ($[0] !== hasExplorerContext || $[1] !== hasHistoryContext || $[2] !== props.plugins) { + pluginList = []; const pluginTitles = {}; if (hasExplorerContext) { pluginList.push(DOC_EXPLORER_PLUGIN); @@ -71095,7 +79623,15 @@ function PluginContextProvider(props) { pluginList.push(HISTORY_PLUGIN); pluginTitles[HISTORY_PLUGIN.title] = true; } - for (const plugin of props.plugins || []) { + let t12; + if ($[4] !== props.plugins) { + t12 = props.plugins || []; + $[4] = props.plugins; + $[5] = t12; + } else { + t12 = $[5]; + } + for (const plugin of t12) { if (typeof plugin.title !== "string" || !plugin.title) { throw new Error("All GraphiQL plugins must have a unique title"); } @@ -71106,50 +79642,114 @@ function PluginContextProvider(props) { pluginTitles[plugin.title] = true; } } - return pluginList; - }, [hasExplorerContext, hasHistoryContext, props.plugins]); - const [visiblePlugin, internalSetVisiblePlugin] = React.useState(() => { - const storedValue = storage == null ? void 0 : storage.get(STORAGE_KEY$4); - const pluginForStoredValue = plugins.find(plugin => plugin.title === storedValue); - if (pluginForStoredValue) { - return pluginForStoredValue; - } - if (storedValue) { - storage == null ? void 0 : storage.set(STORAGE_KEY$4, ""); - } - if (!props.visiblePlugin) { - return null; - } - return plugins.find(plugin => (typeof props.visiblePlugin === "string" ? plugin.title : plugin) === props.visiblePlugin) || null; - }); + $[0] = hasExplorerContext; + $[1] = hasHistoryContext; + $[2] = props.plugins; + $[3] = pluginList; + } else { + pluginList = $[3]; + } + t0 = pluginList; + const plugins = t0; + let t1; + if ($[6] !== plugins || $[7] !== props.visiblePlugin || $[8] !== storage) { + t1 = () => { + const storedValue = storage == null ? void 0 : storage.get(STORAGE_KEY$4); + const pluginForStoredValue = plugins.find(plugin_0 => plugin_0.title === storedValue); + if (pluginForStoredValue) { + return pluginForStoredValue; + } + if (storedValue) { + storage == null ? void 0 : storage.set(STORAGE_KEY$4, ""); + } + if (!props.visiblePlugin) { + return null; + } + return plugins.find(plugin_1 => (typeof props.visiblePlugin === "string" ? plugin_1.title : plugin_1) === props.visiblePlugin) || null; + }; + $[6] = plugins; + $[7] = props.visiblePlugin; + $[8] = storage; + $[9] = t1; + } else { + t1 = $[9]; + } + const [visiblePlugin, internalSetVisiblePlugin] = React.useState(t1); const { onTogglePluginVisibility, children } = props; - const setVisiblePlugin = React.useCallback(plugin => { - const newVisiblePlugin = plugin ? plugins.find(p => (typeof plugin === "string" ? p.title : p) === plugin) || null : null; - internalSetVisiblePlugin(current => { - if (newVisiblePlugin === current) { - return current; + let t2; + if ($[10] !== onTogglePluginVisibility || $[11] !== plugins) { + t2 = plugin_2 => { + const newVisiblePlugin = plugin_2 ? plugins.find(p => (typeof plugin_2 === "string" ? p.title : p) === plugin_2) || null : null; + internalSetVisiblePlugin(current => { + if (newVisiblePlugin === current) { + return current; + } + onTogglePluginVisibility == null ? void 0 : onTogglePluginVisibility(newVisiblePlugin); + return newVisiblePlugin; + }); + }; + $[10] = onTogglePluginVisibility; + $[11] = plugins; + $[12] = t2; + } else { + t2 = $[12]; + } + const setVisiblePlugin = t2; + let t3; + if ($[13] !== props.visiblePlugin || $[14] !== setVisiblePlugin) { + t3 = () => { + if (props.visiblePlugin) { + setVisiblePlugin(props.visiblePlugin); } - onTogglePluginVisibility == null ? void 0 : onTogglePluginVisibility(newVisiblePlugin); - return newVisiblePlugin; + }; + $[13] = props.visiblePlugin; + $[14] = setVisiblePlugin; + $[15] = t3; + } else { + t3 = $[15]; + } + let t4; + if ($[16] !== plugins || $[17] !== props.visiblePlugin || $[18] !== setVisiblePlugin) { + t4 = [plugins, props.visiblePlugin, setVisiblePlugin]; + $[16] = plugins; + $[17] = props.visiblePlugin; + $[18] = setVisiblePlugin; + $[19] = t4; + } else { + t4 = $[19]; + } + React.useEffect(t3, t4); + let t5; + if ($[20] !== plugins || $[21] !== setVisiblePlugin || $[22] !== visiblePlugin) { + t5 = { + plugins, + setVisiblePlugin, + visiblePlugin + }; + $[20] = plugins; + $[21] = setVisiblePlugin; + $[22] = visiblePlugin; + $[23] = t5; + } else { + t5 = $[23]; + } + const value = t5; + let t6; + if ($[24] !== children || $[25] !== value) { + t6 = /* @__PURE__ */jsxRuntime.jsx(PluginContext.Provider, { + value, + children }); - }, [onTogglePluginVisibility, plugins]); - React.useEffect(() => { - if (props.visiblePlugin) { - setVisiblePlugin(props.visiblePlugin); - } - }, [plugins, props.visiblePlugin, setVisiblePlugin]); - const value = React.useMemo(() => ({ - plugins, - setVisiblePlugin, - visiblePlugin - }), [plugins, setVisiblePlugin, visiblePlugin]); - return /* @__PURE__ */jsxRuntime.jsx(PluginContext.Provider, { - value, - children - }); + $[24] = children; + $[25] = value; + $[26] = t6; + } else { + t6 = $[26]; + } + return t6; } const usePluginContext = createContextHook(PluginContext); const STORAGE_KEY$4 = "visiblePlugin"; @@ -71301,244 +79901,476 @@ function onHasCompletion(_cm, data, schema, explorer, plugin, callback) { } } function useSynchronizeValue(editor, value) { - React.useEffect(() => { - if (editor && typeof value === "string" && value !== editor.getValue()) { - editor.setValue(value); - } - }, [editor, value]); + const $ = reactCompilerRuntime.c(4); + let t0; + let t1; + if ($[0] !== editor || $[1] !== value) { + t0 = () => { + if (editor && typeof value === "string" && value !== editor.getValue()) { + editor.setValue(value); + } + }; + t1 = [editor, value]; + $[0] = editor; + $[1] = value; + $[2] = t0; + $[3] = t1; + } else { + t0 = $[2]; + t1 = $[3]; + } + React.useEffect(t0, t1); } function useSynchronizeOption(editor, option, value) { - React.useEffect(() => { - if (editor) { - editor.setOption(option, value); - } - }, [editor, option, value]); + const $ = reactCompilerRuntime.c(5); + let t0; + let t1; + if ($[0] !== editor || $[1] !== option || $[2] !== value) { + t0 = () => { + if (editor) { + editor.setOption(option, value); + } + }; + t1 = [editor, option, value]; + $[0] = editor; + $[1] = option; + $[2] = value; + $[3] = t0; + $[4] = t1; + } else { + t0 = $[3]; + t1 = $[4]; + } + React.useEffect(t0, t1); } function useChangeHandler(editor, callback, storageKey, tabProperty, caller) { + const $ = reactCompilerRuntime.c(10); + let t0; + if ($[0] !== caller) { + t0 = { + nonNull: true, + caller + }; + $[0] = caller; + $[1] = t0; + } else { + t0 = $[1]; + } const { updateActiveTabValues - } = useEditorContext({ - nonNull: true, - caller - }); + } = useEditorContext(t0); const storage = useStorageContext(); - React.useEffect(() => { - if (!editor) { - return; - } - const store = debounce(500, value => { - if (!storage || storageKey === null) { + let t1; + let t2; + if ($[2] !== callback || $[3] !== editor || $[4] !== storage || $[5] !== storageKey || $[6] !== tabProperty || $[7] !== updateActiveTabValues) { + t1 = () => { + if (!editor) { return; } - storage.set(storageKey, value); - }); - const updateTab = debounce(100, value => { - updateActiveTabValues({ - [tabProperty]: value + const store = debounce(500, value => { + if (!storage || storageKey === null) { + return; + } + storage.set(storageKey, value); }); - }); - const handleChange = (editorInstance, changeObj) => { - if (!changeObj) { - return; - } - const newValue = editorInstance.getValue(); - store(newValue); - updateTab(newValue); - callback == null ? void 0 : callback(newValue); - }; - editor.on("change", handleChange); - return () => editor.off("change", handleChange); - }, [callback, editor, storage, storageKey, tabProperty, updateActiveTabValues]); -} -function useCompletion(editor, callback, caller) { - const { - schema - } = useSchemaContext({ - nonNull: true, - caller - }); - const explorer = useExplorerContext(); - const plugin = usePluginContext(); - React.useEffect(() => { - if (!editor) { - return; - } - const handleCompletion = (instance, changeObj) => { - onHasCompletion(instance, changeObj, schema, explorer, plugin, type => { - callback == null ? void 0 : callback({ - kind: "Type", - type, - schema: schema || void 0 + const updateTab = debounce(100, value_0 => { + updateActiveTabValues({ + [tabProperty]: value_0 }); }); + const handleChange = (editorInstance, changeObj) => { + if (!changeObj) { + return; + } + const newValue = editorInstance.getValue(); + store(newValue); + updateTab(newValue); + callback == null ? void 0 : callback(newValue); + }; + editor.on("change", handleChange); + return () => editor.off("change", handleChange); }; - editor.on( - // @ts-expect-error @TODO additional args for hasCompletion event - "hasCompletion", handleCompletion); - return () => editor.off( - // @ts-expect-error @TODO additional args for hasCompletion event - "hasCompletion", handleCompletion); - }, [callback, editor, explorer, plugin, schema]); + t2 = [callback, editor, storage, storageKey, tabProperty, updateActiveTabValues]; + $[2] = callback; + $[3] = editor; + $[4] = storage; + $[5] = storageKey; + $[6] = tabProperty; + $[7] = updateActiveTabValues; + $[8] = t1; + $[9] = t2; + } else { + t1 = $[8]; + t2 = $[9]; + } + React.useEffect(t1, t2); } -function useKeyMap(editor, keys, callback) { - React.useEffect(() => { - if (!editor) { - return; - } - for (const key of keys) { - editor.removeKeyMap(key); - } - if (callback) { - const keyMap = {}; - for (const key of keys) { - keyMap[key] = () => callback(); - } - editor.addKeyMap(keyMap); - } - }, [editor, keys, callback]); -} -function useCopyQuery({ - caller, - onCopyQuery -} = {}) { - const { - queryEditor - } = useEditorContext({ - nonNull: true, - caller: caller || useCopyQuery - }); - return React.useCallback(() => { - if (!queryEditor) { - return; - } - const query = queryEditor.getValue(); - copyToClipboard(query); - onCopyQuery == null ? void 0 : onCopyQuery(query); - }, [queryEditor, onCopyQuery]); -} -function useMergeQuery({ - caller -} = {}) { - const { - queryEditor - } = useEditorContext({ - nonNull: true, - caller: caller || useMergeQuery - }); +function useCompletion(editor, callback, caller) { + const $ = reactCompilerRuntime.c(9); + let t0; + if ($[0] !== caller) { + t0 = { + nonNull: true, + caller + }; + $[0] = caller; + $[1] = t0; + } else { + t0 = $[1]; + } const { schema - } = useSchemaContext({ - nonNull: true, - caller: useMergeQuery - }); - return React.useCallback(() => { - const documentAST = queryEditor == null ? void 0 : queryEditor.documentAST; - const query = queryEditor == null ? void 0 : queryEditor.getValue(); - if (!documentAST || !query) { - return; - } - queryEditor.setValue(graphql.print(toolkit.mergeAst(documentAST, schema))); - }, [queryEditor, schema]); + } = useSchemaContext(t0); + const explorer = useExplorerContext(); + const plugin = usePluginContext(); + let t1; + let t2; + if ($[2] !== callback || $[3] !== editor || $[4] !== explorer || $[5] !== plugin || $[6] !== schema) { + t1 = () => { + if (!editor) { + return; + } + const handleCompletion = (instance, changeObj) => { + onHasCompletion(instance, changeObj, schema, explorer, plugin, type => { + callback == null ? void 0 : callback({ + kind: "Type", + type, + schema: schema || void 0 + }); + }); + }; + editor.on("hasCompletion", handleCompletion); + return () => editor.off("hasCompletion", handleCompletion); + }; + t2 = [callback, editor, explorer, plugin, schema]; + $[2] = callback; + $[3] = editor; + $[4] = explorer; + $[5] = plugin; + $[6] = schema; + $[7] = t1; + $[8] = t2; + } else { + t1 = $[7]; + t2 = $[8]; + } + React.useEffect(t1, t2); } -function usePrettifyEditors({ - caller -} = {}) { +function useKeyMap(editor, keys, callback) { + const $ = reactCompilerRuntime.c(5); + let t0; + let t1; + if ($[0] !== callback || $[1] !== editor || $[2] !== keys) { + t0 = () => { + if (!editor) { + return; + } + for (const key of keys) { + editor.removeKeyMap(key); + } + if (callback) { + const keyMap = {}; + for (const key_0 of keys) { + keyMap[key_0] = () => callback(); + } + editor.addKeyMap(keyMap); + } + }; + t1 = [editor, keys, callback]; + $[0] = callback; + $[1] = editor; + $[2] = keys; + $[3] = t0; + $[4] = t1; + } else { + t0 = $[3]; + t1 = $[4]; + } + React.useEffect(t0, t1); +} +const _useCopyQuery = useCopyQuery; +const _useMergeQuery = useMergeQuery; +const _usePrettifyEditors = usePrettifyEditors; +const _useAutoCompleteLeafs = useAutoCompleteLeafs; +function useCopyQuery(t0) { + const $ = reactCompilerRuntime.c(7); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + caller, + onCopyQuery + } = t1; + const t2 = caller || _useCopyQuery; + let t3; + if ($[2] !== t2) { + t3 = { + nonNull: true, + caller: t2 + }; + $[2] = t2; + $[3] = t3; + } else { + t3 = $[3]; + } + const { + queryEditor + } = useEditorContext(t3); + let t4; + if ($[4] !== onCopyQuery || $[5] !== queryEditor) { + t4 = () => { + if (!queryEditor) { + return; + } + const query = queryEditor.getValue(); + copyToClipboard(query); + onCopyQuery == null ? void 0 : onCopyQuery(query); + }; + $[4] = onCopyQuery; + $[5] = queryEditor; + $[6] = t4; + } else { + t4 = $[6]; + } + return t4; +} +function useMergeQuery(t0) { + const $ = reactCompilerRuntime.c(8); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + caller + } = t1; + const t2 = caller || _useMergeQuery; + let t3; + if ($[2] !== t2) { + t3 = { + nonNull: true, + caller: t2 + }; + $[2] = t2; + $[3] = t3; + } else { + t3 = $[3]; + } + const { + queryEditor + } = useEditorContext(t3); + let t4; + if ($[4] === Symbol.for("react.memo_cache_sentinel")) { + t4 = { + nonNull: true, + caller: _useMergeQuery + }; + $[4] = t4; + } else { + t4 = $[4]; + } + const { + schema + } = useSchemaContext(t4); + let t5; + if ($[5] !== queryEditor || $[6] !== schema) { + t5 = () => { + const documentAST = queryEditor == null ? void 0 : queryEditor.documentAST; + const query = queryEditor == null ? void 0 : queryEditor.getValue(); + if (!documentAST || !query) { + return; + } + queryEditor.setValue(graphql.print(toolkit.mergeAst(documentAST, schema))); + }; + $[5] = queryEditor; + $[6] = schema; + $[7] = t5; + } else { + t5 = $[7]; + } + return t5; +} +function usePrettifyEditors(t0) { + const $ = reactCompilerRuntime.c(8); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + caller + } = t1; + const t2 = caller || _usePrettifyEditors; + let t3; + if ($[2] !== t2) { + t3 = { + nonNull: true, + caller: t2 + }; + $[2] = t2; + $[3] = t3; + } else { + t3 = $[3]; + } const { queryEditor, headerEditor, variableEditor - } = useEditorContext({ - nonNull: true, - caller: caller || usePrettifyEditors - }); - return React.useCallback(() => { - if (variableEditor) { - const variableEditorContent = variableEditor.getValue(); - try { - const prettifiedVariableEditorContent = JSON.stringify(JSON.parse(variableEditorContent), null, 2); - if (prettifiedVariableEditorContent !== variableEditorContent) { - variableEditor.setValue(prettifiedVariableEditorContent); - } - } catch {} - } - if (headerEditor) { - const headerEditorContent = headerEditor.getValue(); - try { - const prettifiedHeaderEditorContent = JSON.stringify(JSON.parse(headerEditorContent), null, 2); - if (prettifiedHeaderEditorContent !== headerEditorContent) { - headerEditor.setValue(prettifiedHeaderEditorContent); - } - } catch {} - } - if (queryEditor) { - const editorContent = queryEditor.getValue(); - const prettifiedEditorContent = graphql.print(graphql.parse(editorContent)); - if (prettifiedEditorContent !== editorContent) { - queryEditor.setValue(prettifiedEditorContent); + } = useEditorContext(t3); + let t4; + if ($[4] !== headerEditor || $[5] !== queryEditor || $[6] !== variableEditor) { + t4 = () => { + if (variableEditor) { + const variableEditorContent = variableEditor.getValue(); + try { + const prettifiedVariableEditorContent = JSON.stringify(JSON.parse(variableEditorContent), null, 2); + if (prettifiedVariableEditorContent !== variableEditorContent) { + variableEditor.setValue(prettifiedVariableEditorContent); + } + } catch {} } - } - }, [queryEditor, variableEditor, headerEditor]); + if (headerEditor) { + const headerEditorContent = headerEditor.getValue(); + try { + const prettifiedHeaderEditorContent = JSON.stringify(JSON.parse(headerEditorContent), null, 2); + if (prettifiedHeaderEditorContent !== headerEditorContent) { + headerEditor.setValue(prettifiedHeaderEditorContent); + } + } catch {} + } + if (queryEditor) { + const editorContent = queryEditor.getValue(); + const prettifiedEditorContent = graphql.print(graphql.parse(editorContent)); + if (prettifiedEditorContent !== editorContent) { + queryEditor.setValue(prettifiedEditorContent); + } + } + }; + $[4] = headerEditor; + $[5] = queryEditor; + $[6] = variableEditor; + $[7] = t4; + } else { + t4 = $[7]; + } + return t4; } -function useAutoCompleteLeafs({ - getDefaultFieldNames, - caller -} = {}) { +function useAutoCompleteLeafs(t0) { + const $ = reactCompilerRuntime.c(10); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + getDefaultFieldNames, + caller + } = t1; + const t2 = caller || _useAutoCompleteLeafs; + let t3; + if ($[2] !== t2) { + t3 = { + nonNull: true, + caller: t2 + }; + $[2] = t2; + $[3] = t3; + } else { + t3 = $[3]; + } const { schema - } = useSchemaContext({ - nonNull: true, - caller: caller || useAutoCompleteLeafs - }); + } = useSchemaContext(t3); + const t4 = caller || _useAutoCompleteLeafs; + let t5; + if ($[4] !== t4) { + t5 = { + nonNull: true, + caller: t4 + }; + $[4] = t4; + $[5] = t5; + } else { + t5 = $[5]; + } const { queryEditor - } = useEditorContext({ - nonNull: true, - caller: caller || useAutoCompleteLeafs - }); - return React.useCallback(() => { - if (!queryEditor) { - return; - } - const query = queryEditor.getValue(); - const { - insertions, - result - } = toolkit.fillLeafs(schema, query, getDefaultFieldNames); - if (insertions && insertions.length > 0) { - queryEditor.operation(() => { - const cursor = queryEditor.getCursor(); - const cursorIndex = queryEditor.indexFromPos(cursor); - queryEditor.setValue(result || ""); - let added = 0; - const markers = insertions.map(({ - index, - string - }) => queryEditor.markText(queryEditor.posFromIndex(index + added), queryEditor.posFromIndex(index + (added += string.length)), { - className: "auto-inserted-leaf", - clearOnEnter: true, - title: "Automatically added leaf fields" - })); - setTimeout(() => { - for (const marker of markers) { - marker.clear(); + } = useEditorContext(t5); + let t6; + if ($[6] !== getDefaultFieldNames || $[7] !== queryEditor || $[8] !== schema) { + t6 = () => { + if (!queryEditor) { + return; + } + const query = queryEditor.getValue(); + const { + insertions, + result + } = toolkit.fillLeafs(schema, query, getDefaultFieldNames); + if (insertions && insertions.length > 0) { + queryEditor.operation(() => { + const cursor = queryEditor.getCursor(); + const cursorIndex = queryEditor.indexFromPos(cursor); + queryEditor.setValue(result || ""); + let added; + added = 0; + const markers = insertions.map(t7 => { + const { + index, + string + } = t7; + added = added + string.length; + return queryEditor.markText(queryEditor.posFromIndex(index + added), queryEditor.posFromIndex(index + added), { + className: "auto-inserted-leaf", + clearOnEnter: true, + title: "Automatically added leaf fields" + }); + }); + setTimeout(() => { + for (const marker of markers) { + marker.clear(); + } + }, 7e3); + let newCursorIndex = cursorIndex; + for (const { + index: index_0, + string: string_0 + } of insertions) { + if (index_0 < cursorIndex) { + newCursorIndex = newCursorIndex + string_0.length; + } } - }, 7e3); - let newCursorIndex = cursorIndex; - for (const { - index, - string - } of insertions) { - if (index < cursorIndex) { - newCursorIndex += string.length; - } - } - queryEditor.setCursor(queryEditor.posFromIndex(newCursorIndex)); - }); - } - return result; - }, [getDefaultFieldNames, queryEditor, schema]); + queryEditor.setCursor(queryEditor.posFromIndex(newCursorIndex)); + }); + } + return result; + }; + $[6] = getDefaultFieldNames; + $[7] = queryEditor; + $[8] = schema; + $[9] = t6; + } else { + t6 = $[9]; + } + return t6; } const useEditorState = editor => { + "use no memo"; + var _ref2; const context = useEditorContext({ nonNull: true @@ -71561,143 +80393,265 @@ const useVariablesEditorState = () => { const useHeadersEditorState = () => { return useEditorState("header"); }; -function useOptimisticState([upstreamState, upstreamSetState]) { - const lastStateRef = React.useRef({ - /** The last thing that we sent upstream; we're expecting this back */ - pending: null, - /** The last thing we received from upstream */ - last: upstreamState - }); +function useOptimisticState(t0) { + const $ = reactCompilerRuntime.c(12); + const [upstreamState, upstreamSetState] = t0; + let t1; + if ($[0] !== upstreamState) { + t1 = { + pending: null, + last: upstreamState + }; + $[0] = upstreamState; + $[1] = t1; + } else { + t1 = $[1]; + } + const lastStateRef = React.useRef(t1); const [state, setOperationsText] = React.useState(upstreamState); - React.useEffect(() => { - if (lastStateRef.current.last === upstreamState) ;else { - lastStateRef.current.last = upstreamState; - if (lastStateRef.current.pending === null) { - setOperationsText(upstreamState); - } else if (lastStateRef.current.pending === upstreamState) { - lastStateRef.current.pending = null; - if (upstreamState !== state) { - lastStateRef.current.pending = state; - upstreamSetState(state); + let t2; + let t3; + if ($[2] !== state || $[3] !== upstreamSetState || $[4] !== upstreamState) { + t2 = () => { + if (lastStateRef.current.last === upstreamState) ;else { + lastStateRef.current.last = upstreamState; + if (lastStateRef.current.pending === null) { + setOperationsText(upstreamState); + } else { + if (lastStateRef.current.pending === upstreamState) { + lastStateRef.current.pending = null; + if (upstreamState !== state) { + lastStateRef.current.pending = state; + upstreamSetState(state); + } + } else { + lastStateRef.current.pending = null; + setOperationsText(upstreamState); + } } - } else { - lastStateRef.current.pending = null; - setOperationsText(upstreamState); } - } - }, [upstreamState, state, upstreamSetState]); - const setState = React.useCallback(newState => { - setOperationsText(newState); - if (lastStateRef.current.pending === null && lastStateRef.current.last !== newState) { - lastStateRef.current.pending = newState; - upstreamSetState(newState); - } - }, [upstreamSetState]); - return React.useMemo(() => [state, setState], [state, setState]); + }; + t3 = [upstreamState, state, upstreamSetState]; + $[2] = state; + $[3] = upstreamSetState; + $[4] = upstreamState; + $[5] = t2; + $[6] = t3; + } else { + t2 = $[5]; + t3 = $[6]; + } + React.useEffect(t2, t3); + let t4; + if ($[7] !== upstreamSetState) { + t4 = newState => { + setOperationsText(newState); + if (lastStateRef.current.pending === null && lastStateRef.current.last !== newState) { + lastStateRef.current.pending = newState; + upstreamSetState(newState); + } + }; + $[7] = upstreamSetState; + $[8] = t4; + } else { + t4 = $[8]; + } + const setState = t4; + let t5; + if ($[9] !== setState || $[10] !== state) { + t5 = [state, setState]; + $[9] = setState; + $[10] = state; + $[11] = t5; + } else { + t5 = $[11]; + } + return t5; } -function useHeaderEditor({ - editorTheme = DEFAULT_EDITOR_THEME, - keyMap = DEFAULT_KEY_MAP, - onEdit, - readOnly = false -} = {}, caller) { +function importCodeMirrorImports$3() { + return importCodeMirror([// @ts-expect-error + Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/mode/javascript/javascript.js */ "../../../node_modules/codemirror/mode/javascript/javascript.js")))]); +} +const _useHeaderEditor = useHeaderEditor; +function useHeaderEditor(t0, caller) { + const $ = reactCompilerRuntime.c(17); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + editorTheme: t2, + keyMap: t3, + onEdit, + readOnly: t4 + } = t1; + const editorTheme = t2 === void 0 ? DEFAULT_EDITOR_THEME : t2; + const keyMap = t3 === void 0 ? DEFAULT_KEY_MAP : t3; + const readOnly = t4 === void 0 ? false : t4; + const t5 = caller || _useHeaderEditor; + let t6; + if ($[2] !== t5) { + t6 = { + nonNull: true, + caller: t5 + }; + $[2] = t5; + $[3] = t6; + } else { + t6 = $[3]; + } const { initialHeaders, headerEditor, setHeaderEditor, shouldPersistHeaders - } = useEditorContext({ - nonNull: true, - caller: caller || useHeaderEditor - }); + } = useEditorContext(t6); const executionContext = useExecutionContext(); - const merge = useMergeQuery({ - caller: caller || useHeaderEditor - }); - const prettify = usePrettifyEditors({ - caller: caller || useHeaderEditor - }); - const ref = React.useRef(null); - React.useEffect(() => { - let isActive = true; - void importCodeMirror([ - // @ts-expect-error - Promise.resolve().then(() => __webpack_require__(/*! ./javascript.cjs.js */ "../../graphiql-react/dist/javascript.cjs.js")).then(n => n.javascript)]).then(CodeMirror => { - if (!isActive) { - return; - } - const container = ref.current; - if (!container) { - return; - } - const newEditor = CodeMirror(container, { - value: initialHeaders, - lineNumbers: true, - tabSize: 2, - mode: { - name: "javascript", - json: true - }, - theme: editorTheme, - autoCloseBrackets: true, - matchBrackets: true, - showCursorWhenSelecting: true, - readOnly: readOnly ? "nocursor" : false, - foldGutter: true, - gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], - extraKeys: commonKeys - }); - newEditor.addKeyMap({ - "Cmd-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Ctrl-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Alt-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Shift-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - } - }); - newEditor.on("keyup", (editorInstance, event) => { - const { - code, - key, - shiftKey - } = event; - const isLetter = code.startsWith("Key"); - const isNumber = !shiftKey && code.startsWith("Digit"); - if (isLetter || isNumber || key === "_" || key === '"') { - editorInstance.execCommand("autocomplete"); - } - }); - setHeaderEditor(newEditor); - }); - return () => { - isActive = false; + const t7 = caller || _useHeaderEditor; + let t8; + if ($[4] !== t7) { + t8 = { + caller: t7 }; - }, [editorTheme, initialHeaders, readOnly, setHeaderEditor]); + $[4] = t7; + $[5] = t8; + } else { + t8 = $[5]; + } + const merge = useMergeQuery(t8); + const t9 = caller || _useHeaderEditor; + let t10; + if ($[6] !== t9) { + t10 = { + caller: t9 + }; + $[6] = t9; + $[7] = t10; + } else { + t10 = $[7]; + } + const prettify = usePrettifyEditors(t10); + const ref = React.useRef(null); + let t11; + let t12; + if ($[8] !== editorTheme || $[9] !== initialHeaders || $[10] !== readOnly || $[11] !== setHeaderEditor) { + t11 = () => { + let isActive; + isActive = true; + importCodeMirrorImports$3().then(CodeMirror => { + if (!isActive) { + return; + } + const container = ref.current; + if (!container) { + return; + } + const newEditor = CodeMirror(container, { + value: initialHeaders, + lineNumbers: true, + tabSize: 2, + mode: { + name: "javascript", + json: true + }, + theme: editorTheme, + autoCloseBrackets: true, + matchBrackets: true, + showCursorWhenSelecting: true, + readOnly: readOnly ? "nocursor" : false, + foldGutter: true, + gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], + extraKeys: commonKeys + }); + newEditor.addKeyMap({ + "Cmd-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Ctrl-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Alt-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Shift-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + } + }); + newEditor.on("keyup", _temp$2); + setHeaderEditor(newEditor); + }); + return () => { + isActive = false; + }; + }; + t12 = [editorTheme, initialHeaders, readOnly, setHeaderEditor]; + $[8] = editorTheme; + $[9] = initialHeaders; + $[10] = readOnly; + $[11] = setHeaderEditor; + $[12] = t11; + $[13] = t12; + } else { + t11 = $[12]; + t12 = $[13]; + } + React.useEffect(t11, t12); useSynchronizeOption(headerEditor, "keyMap", keyMap); - useChangeHandler(headerEditor, onEdit, shouldPersistHeaders ? STORAGE_KEY$3 : null, "headers", useHeaderEditor); - useKeyMap(headerEditor, ["Cmd-Enter", "Ctrl-Enter"], executionContext == null ? void 0 : executionContext.run); - useKeyMap(headerEditor, ["Shift-Ctrl-P"], prettify); - useKeyMap(headerEditor, ["Shift-Ctrl-M"], merge); + useChangeHandler(headerEditor, onEdit, shouldPersistHeaders ? STORAGE_KEY$3 : null, "headers", _useHeaderEditor); + let t13; + if ($[14] === Symbol.for("react.memo_cache_sentinel")) { + t13 = ["Cmd-Enter", "Ctrl-Enter"]; + $[14] = t13; + } else { + t13 = $[14]; + } + useKeyMap(headerEditor, t13, executionContext == null ? void 0 : executionContext.run); + let t14; + if ($[15] === Symbol.for("react.memo_cache_sentinel")) { + t14 = ["Shift-Ctrl-P"]; + $[15] = t14; + } else { + t14 = $[15]; + } + useKeyMap(headerEditor, t14, prettify); + let t15; + if ($[16] === Symbol.for("react.memo_cache_sentinel")) { + t15 = ["Shift-Ctrl-M"]; + $[16] = t15; + } else { + t15 = $[16]; + } + useKeyMap(headerEditor, t15, merge); return ref; } +function _temp$2(editorInstance, event) { + const { + code, + key, + shiftKey + } = event; + const isLetter = code.startsWith("Key"); + const isNumber = !shiftKey && code.startsWith("Digit"); + if (isLetter || isNumber || key === "_" || key === '"') { + editorInstance.execCommand("autocomplete"); + } +} const STORAGE_KEY$3 = "headers"; const invalidCharacters = Array.from({ length: 11 @@ -71708,20 +80662,79 @@ const sanitizeRegex = new RegExp("[" + invalidCharacters.join("") + "]", "g"); function normalizeWhitespace(line) { return line.replace(sanitizeRegex, " "); } -function useQueryEditor({ - editorTheme = DEFAULT_EDITOR_THEME, - keyMap = DEFAULT_KEY_MAP, - onClickReference, - onCopyQuery, - onEdit, - readOnly = false -} = {}, caller) { +function importCodeMirrorImports$2() { + return importCodeMirror([Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/comment/comment.js */ "../../../node_modules/codemirror/addon/comment/comment.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/search.js */ "../../../node_modules/codemirror/addon/search/search.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/hint.js */ "../../codemirror-graphql/esm/hint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/lint.js */ "../../codemirror-graphql/esm/lint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/info.js */ "../../codemirror-graphql/esm/info.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/jump.js */ "../../codemirror-graphql/esm/jump.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/mode.js */ "../../codemirror-graphql/esm/mode.js")))]); +} +const _useQueryEditor = useQueryEditor; +function updateVariableEditor(variableEditor, operationFacts) { + variableEditor.state.lint.linterOptions.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; + variableEditor.options.lint.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; + variableEditor.options.hintOptions.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; +} +function updateEditorSchema(editor, schema) { + editor.state.lint.linterOptions.schema = schema; + editor.options.lint.schema = schema; + editor.options.hintOptions.schema = schema; + editor.options.info.schema = schema; + editor.options.jump.schema = schema; +} +function updateEditorValidationRules(editor, validationRules) { + editor.state.lint.linterOptions.validationRules = validationRules; + editor.options.lint.validationRules = validationRules; +} +function updateEditorExternalFragments(editor, externalFragmentList) { + editor.state.lint.linterOptions.externalFragments = externalFragmentList; + editor.options.lint.externalFragments = externalFragmentList; + editor.options.hintOptions.externalFragments = externalFragmentList; +} +function useQueryEditor(t0, caller) { + const $ = reactCompilerRuntime.c(41); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + editorTheme: t2, + keyMap: t3, + onClickReference, + onCopyQuery, + onEdit, + readOnly: t4 + } = t1; + const editorTheme = t2 === void 0 ? DEFAULT_EDITOR_THEME : t2; + const keyMap = t3 === void 0 ? DEFAULT_KEY_MAP : t3; + const readOnly = t4 === void 0 ? false : t4; + const t5 = caller || _useQueryEditor; + let t6; + if ($[2] !== t5) { + t6 = { + nonNull: true, + caller: t5 + }; + $[2] = t5; + $[3] = t6; + } else { + t6 = $[3]; + } const { schema - } = useSchemaContext({ - nonNull: true, - caller: caller || useQueryEditor - }); + } = useSchemaContext(t6); + const t7 = caller || _useQueryEditor; + let t8; + if ($[4] !== t7) { + t8 = { + nonNull: true, + caller: t7 + }; + $[4] = t7; + $[5] = t8; + } else { + t8 = $[5]; + } const { externalFragments, initialQuery, @@ -71731,321 +80744,484 @@ function useQueryEditor({ validationRules, variableEditor, updateActiveTabValues - } = useEditorContext({ - nonNull: true, - caller: caller || useQueryEditor - }); + } = useEditorContext(t8); const executionContext = useExecutionContext(); const storage = useStorageContext(); const explorer = useExplorerContext(); const plugin = usePluginContext(); - const copy = useCopyQuery({ - caller: caller || useQueryEditor, - onCopyQuery - }); - const merge = useMergeQuery({ - caller: caller || useQueryEditor - }); - const prettify = usePrettifyEditors({ - caller: caller || useQueryEditor - }); + const t9 = caller || _useQueryEditor; + let t10; + if ($[6] !== onCopyQuery || $[7] !== t9) { + t10 = { + caller: t9, + onCopyQuery + }; + $[6] = onCopyQuery; + $[7] = t9; + $[8] = t10; + } else { + t10 = $[8]; + } + const copy = useCopyQuery(t10); + const t11 = caller || _useQueryEditor; + let t12; + if ($[9] !== t11) { + t12 = { + caller: t11 + }; + $[9] = t11; + $[10] = t12; + } else { + t12 = $[10]; + } + const merge = useMergeQuery(t12); + const t13 = caller || _useQueryEditor; + let t14; + if ($[11] !== t13) { + t14 = { + caller: t13 + }; + $[11] = t13; + $[12] = t14; + } else { + t14 = $[12]; + } + const prettify = usePrettifyEditors(t14); const ref = React.useRef(null); const codeMirrorRef = React.useRef(); - const onClickReferenceRef = React.useRef(() => {}); - React.useEffect(() => { - onClickReferenceRef.current = reference => { - if (!explorer || !plugin) { - return; - } - plugin.setVisiblePlugin(DOC_EXPLORER_PLUGIN); - switch (reference.kind) { - case "Type": - { - explorer.push({ - name: reference.type.name, - def: reference.type - }); - break; - } - case "Field": - { - explorer.push({ - name: reference.field.name, - def: reference.field - }); - break; - } - case "Argument": - { - if (reference.field) { - explorer.push({ - name: reference.field.name, - def: reference.field - }); - } - break; - } - case "EnumValue": - { - if (reference.type) { + const onClickReferenceRef = React.useRef(_temp$1); + let t15; + let t16; + if ($[13] !== explorer || $[14] !== onClickReference || $[15] !== plugin) { + t15 = () => { + onClickReferenceRef.current = reference => { + if (!explorer || !plugin) { + return; + } + plugin.setVisiblePlugin(DOC_EXPLORER_PLUGIN); + bb47: switch (reference.kind) { + case "Type": + { explorer.push({ name: reference.type.name, def: reference.type }); + break bb47; } - break; - } - } - onClickReference == null ? void 0 : onClickReference(reference); + case "Field": + { + explorer.push({ + name: reference.field.name, + def: reference.field + }); + break bb47; + } + case "Argument": + { + if (reference.field) { + explorer.push({ + name: reference.field.name, + def: reference.field + }); + } + break bb47; + } + case "EnumValue": + { + if (reference.type) { + explorer.push({ + name: reference.type.name, + def: reference.type + }); + } + } + } + onClickReference == null ? void 0 : onClickReference(reference); + }; }; - }, [explorer, onClickReference, plugin]); - React.useEffect(() => { - let isActive = true; - void importCodeMirror([Promise.resolve().then(() => __webpack_require__(/*! ./comment.cjs.js */ "../../graphiql-react/dist/comment.cjs.js")).then(n => n.comment), Promise.resolve().then(() => __webpack_require__(/*! ./search.cjs.js */ "../../graphiql-react/dist/search.cjs.js")).then(n => n.search), Promise.resolve().then(() => __webpack_require__(/*! ./hint.cjs.js */ "../../graphiql-react/dist/hint.cjs.js")), Promise.resolve().then(() => __webpack_require__(/*! ./lint.cjs2.js */ "../../graphiql-react/dist/lint.cjs2.js")), Promise.resolve().then(() => __webpack_require__(/*! ./info.cjs.js */ "../../graphiql-react/dist/info.cjs.js")), Promise.resolve().then(() => __webpack_require__(/*! ./jump.cjs.js */ "../../graphiql-react/dist/jump.cjs.js")), Promise.resolve().then(() => __webpack_require__(/*! ./mode.cjs.js */ "../../graphiql-react/dist/mode.cjs.js"))]).then(CodeMirror => { - if (!isActive) { - return; - } - codeMirrorRef.current = CodeMirror; - const container = ref.current; - if (!container) { - return; - } - const newEditor = CodeMirror(container, { - value: initialQuery, - lineNumbers: true, - tabSize: 2, - foldGutter: true, - mode: "graphql", - theme: editorTheme, - autoCloseBrackets: true, - matchBrackets: true, - showCursorWhenSelecting: true, - readOnly: readOnly ? "nocursor" : false, - lint: { - // @ts-expect-error - schema: void 0, - validationRules: null, - // linting accepts string or FragmentDefinitionNode[] - externalFragments: void 0 - }, - hintOptions: { - // @ts-expect-error - schema: void 0, - closeOnUnfocus: false, - completeSingle: false, - container, - externalFragments: void 0, - autocompleteOptions: { - // for the query editor, restrict to executable type definitions - mode: graphqlLanguageService.GraphQLDocumentMode.EXECUTABLE - } - }, - info: { - schema: void 0, - renderDescription: text => markdown.render(text), - onClick(reference) { - onClickReferenceRef.current(reference); - } - }, - jump: { - schema: void 0, - onClick(reference) { - onClickReferenceRef.current(reference); - } - }, - gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], - extraKeys: { - ...commonKeys, - "Cmd-S"() {}, - "Ctrl-S"() {} + t16 = [explorer, onClickReference, plugin]; + $[13] = explorer; + $[14] = onClickReference; + $[15] = plugin; + $[16] = t15; + $[17] = t16; + } else { + t15 = $[16]; + t16 = $[17]; + } + React.useEffect(t15, t16); + let t17; + let t18; + if ($[18] !== editorTheme || $[19] !== initialQuery || $[20] !== readOnly || $[21] !== setQueryEditor) { + t17 = () => { + let isActive; + isActive = true; + importCodeMirrorImports$2().then(CodeMirror => { + if (!isActive) { + return; } - }); - newEditor.addKeyMap({ - "Cmd-Space"() { - newEditor.showHint({ - completeSingle: true, - container - }); - }, - "Ctrl-Space"() { - newEditor.showHint({ - completeSingle: true, - container - }); - }, - "Alt-Space"() { - newEditor.showHint({ - completeSingle: true, - container - }); - }, - "Shift-Space"() { - newEditor.showHint({ - completeSingle: true, - container - }); - }, - "Shift-Alt-Space"() { - newEditor.showHint({ - completeSingle: true, - container - }); + codeMirrorRef.current = CodeMirror; + const container = ref.current; + if (!container) { + return; } - }); - newEditor.on("keyup", (editorInstance, event) => { - if (AUTO_COMPLETE_AFTER_KEY.test(event.key)) { - editorInstance.execCommand("autocomplete"); - } - }); - let showingHints = false; - newEditor.on("startCompletion", () => { - showingHints = true; - }); - newEditor.on("endCompletion", () => { + const newEditor = CodeMirror(container, { + value: initialQuery, + lineNumbers: true, + tabSize: 2, + foldGutter: true, + mode: "graphql", + theme: editorTheme, + autoCloseBrackets: true, + matchBrackets: true, + showCursorWhenSelecting: true, + readOnly: readOnly ? "nocursor" : false, + lint: { + schema: void 0, + validationRules: null, + externalFragments: void 0 + }, + hintOptions: { + schema: void 0, + closeOnUnfocus: false, + completeSingle: false, + container, + externalFragments: void 0, + autocompleteOptions: { + mode: graphqlLanguageService.GraphQLDocumentMode.EXECUTABLE + } + }, + info: { + schema: void 0, + renderDescription: _temp2, + onClick(reference_0) { + onClickReferenceRef.current(reference_0); + } + }, + jump: { + schema: void 0, + onClick(reference_1) { + onClickReferenceRef.current(reference_1); + } + }, + gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], + extraKeys: { + ...commonKeys, + "Cmd-S"() {}, + "Ctrl-S"() {} + } + }); + newEditor.addKeyMap({ + "Cmd-Space"() { + newEditor.showHint({ + completeSingle: true, + container + }); + }, + "Ctrl-Space"() { + newEditor.showHint({ + completeSingle: true, + container + }); + }, + "Alt-Space"() { + newEditor.showHint({ + completeSingle: true, + container + }); + }, + "Shift-Space"() { + newEditor.showHint({ + completeSingle: true, + container + }); + }, + "Shift-Alt-Space"() { + newEditor.showHint({ + completeSingle: true, + container + }); + } + }); + newEditor.on("keyup", _temp3); + let showingHints; showingHints = false; + newEditor.on("startCompletion", () => { + showingHints = true; + }); + newEditor.on("endCompletion", () => { + showingHints = false; + }); + newEditor.on("keydown", (editorInstance_0, event_0) => { + if (event_0.key === "Escape" && showingHints) { + event_0.stopPropagation(); + } + }); + newEditor.on("beforeChange", _temp4); + newEditor.documentAST = null; + newEditor.operationName = null; + newEditor.operations = null; + newEditor.variableToType = null; + setQueryEditor(newEditor); }); - newEditor.on("keydown", (editorInstance, event) => { - if (event.key === "Escape" && showingHints) { - event.stopPropagation(); - } - }); - newEditor.on("beforeChange", (editorInstance, change) => { - var _a; - if (change.origin === "paste") { - const text = change.text.map(normalizeWhitespace); - (_a = change.update) == null ? void 0 : _a.call(change, change.from, change.to, text); - } - }); - newEditor.documentAST = null; - newEditor.operationName = null; - newEditor.operations = null; - newEditor.variableToType = null; - setQueryEditor(newEditor); - }); - return () => { - isActive = false; + return () => { + isActive = false; + }; }; - }, [editorTheme, initialQuery, readOnly, setQueryEditor]); + t18 = [editorTheme, initialQuery, readOnly, setQueryEditor]; + $[18] = editorTheme; + $[19] = initialQuery; + $[20] = readOnly; + $[21] = setQueryEditor; + $[22] = t17; + $[23] = t18; + } else { + t17 = $[22]; + t18 = $[23]; + } + React.useEffect(t17, t18); useSynchronizeOption(queryEditor, "keyMap", keyMap); - React.useEffect(() => { - if (!queryEditor) { - return; - } - function getAndUpdateOperationFacts(editorInstance) { - var _editorInstance$opera, _editorInstance$opera2, _ref3, _ref4; - var _a; - const operationFacts = graphqlLanguageService.getOperationFacts(schema, editorInstance.getValue()); - const operationName = toolkit.getSelectedOperationName((_editorInstance$opera = editorInstance.operations) !== null && _editorInstance$opera !== void 0 ? _editorInstance$opera : void 0, (_editorInstance$opera2 = editorInstance.operationName) !== null && _editorInstance$opera2 !== void 0 ? _editorInstance$opera2 : void 0, operationFacts == null ? void 0 : operationFacts.operations); - editorInstance.documentAST = (_ref3 = operationFacts == null ? void 0 : operationFacts.documentAST) !== null && _ref3 !== void 0 ? _ref3 : null; - editorInstance.operationName = operationName !== null && operationName !== void 0 ? operationName : null; - editorInstance.operations = (_ref4 = operationFacts == null ? void 0 : operationFacts.operations) !== null && _ref4 !== void 0 ? _ref4 : null; - if (variableEditor) { - variableEditor.state.lint.linterOptions.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; - variableEditor.options.lint.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; - variableEditor.options.hintOptions.variableToType = operationFacts == null ? void 0 : operationFacts.variableToType; - (_a = codeMirrorRef.current) == null ? void 0 : _a.signal(variableEditor, "change", variableEditor); + let t19; + let t20; + if ($[24] !== onEdit || $[25] !== queryEditor || $[26] !== schema || $[27] !== setOperationName || $[28] !== storage || $[29] !== updateActiveTabValues || $[30] !== variableEditor) { + t19 = () => { + if (!queryEditor) { + return; } - return operationFacts ? { - ...operationFacts, - operationName - } : null; - } - const handleChange = debounce(100, editorInstance => { - var _ref5; - const query = editorInstance.getValue(); - storage == null ? void 0 : storage.set(STORAGE_KEY_QUERY, query); - const currentOperationName = editorInstance.operationName; - const operationFacts = getAndUpdateOperationFacts(editorInstance); - if ((operationFacts == null ? void 0 : operationFacts.operationName) !== void 0) { - storage == null ? void 0 : storage.set(STORAGE_KEY_OPERATION_NAME, operationFacts.operationName); - } - onEdit == null ? void 0 : onEdit(query, operationFacts == null ? void 0 : operationFacts.documentAST); - if ((operationFacts == null ? void 0 : operationFacts.operationName) && currentOperationName !== operationFacts.operationName) { - setOperationName(operationFacts.operationName); - } - updateActiveTabValues({ - query, - operationName: (_ref5 = operationFacts == null ? void 0 : operationFacts.operationName) !== null && _ref5 !== void 0 ? _ref5 : null + const getAndUpdateOperationFacts = function getAndUpdateOperationFacts2(editorInstance_2) { + var _editorInstance_2$ope, _editorInstance_2$ope2, _ref3, _ref4; + var _a; + const operationFacts = graphqlLanguageService.getOperationFacts(schema, editorInstance_2.getValue()); + const operationName = toolkit.getSelectedOperationName((_editorInstance_2$ope = editorInstance_2.operations) !== null && _editorInstance_2$ope !== void 0 ? _editorInstance_2$ope : void 0, (_editorInstance_2$ope2 = editorInstance_2.operationName) !== null && _editorInstance_2$ope2 !== void 0 ? _editorInstance_2$ope2 : void 0, operationFacts == null ? void 0 : operationFacts.operations); + editorInstance_2.documentAST = (_ref3 = operationFacts == null ? void 0 : operationFacts.documentAST) !== null && _ref3 !== void 0 ? _ref3 : null; + editorInstance_2.operationName = operationName !== null && operationName !== void 0 ? operationName : null; + editorInstance_2.operations = (_ref4 = operationFacts == null ? void 0 : operationFacts.operations) !== null && _ref4 !== void 0 ? _ref4 : null; + if (variableEditor) { + updateVariableEditor(variableEditor, operationFacts); + (_a = codeMirrorRef.current) == null ? void 0 : _a.signal(variableEditor, "change", variableEditor); + } + return operationFacts ? { + ...operationFacts, + operationName + } : null; + }; + const handleChange = debounce(100, editorInstance_3 => { + var _ref5; + const query = editorInstance_3.getValue(); + storage == null ? void 0 : storage.set(STORAGE_KEY_QUERY, query); + const currentOperationName = editorInstance_3.operationName; + const operationFacts_0 = getAndUpdateOperationFacts(editorInstance_3); + if ((operationFacts_0 == null ? void 0 : operationFacts_0.operationName) !== void 0) { + storage == null ? void 0 : storage.set(STORAGE_KEY_OPERATION_NAME, operationFacts_0.operationName); + } + onEdit == null ? void 0 : onEdit(query, operationFacts_0 == null ? void 0 : operationFacts_0.documentAST); + if ((operationFacts_0 == null ? void 0 : operationFacts_0.operationName) && currentOperationName !== operationFacts_0.operationName) { + setOperationName(operationFacts_0.operationName); + } + updateActiveTabValues({ + query, + operationName: (_ref5 = operationFacts_0 == null ? void 0 : operationFacts_0.operationName) !== null && _ref5 !== void 0 ? _ref5 : null + }); }); - }); - getAndUpdateOperationFacts(queryEditor); - queryEditor.on("change", handleChange); - return () => queryEditor.off("change", handleChange); - }, [onEdit, queryEditor, schema, setOperationName, storage, variableEditor, updateActiveTabValues]); + getAndUpdateOperationFacts(queryEditor); + queryEditor.on("change", handleChange); + return () => queryEditor.off("change", handleChange); + }; + t20 = [onEdit, queryEditor, schema, setOperationName, storage, variableEditor, updateActiveTabValues]; + $[24] = onEdit; + $[25] = queryEditor; + $[26] = schema; + $[27] = setOperationName; + $[28] = storage; + $[29] = updateActiveTabValues; + $[30] = variableEditor; + $[31] = t19; + $[32] = t20; + } else { + t19 = $[31]; + t20 = $[32]; + } + React.useEffect(t19, t20); useSynchronizeSchema(queryEditor, schema !== null && schema !== void 0 ? schema : null, codeMirrorRef); useSynchronizeValidationRules(queryEditor, validationRules !== null && validationRules !== void 0 ? validationRules : null, codeMirrorRef); useSynchronizeExternalFragments(queryEditor, externalFragments, codeMirrorRef); - useCompletion(queryEditor, onClickReference || null, useQueryEditor); + useCompletion(queryEditor, onClickReference || null, _useQueryEditor); const run = executionContext == null ? void 0 : executionContext.run; - const runAtCursor = React.useCallback(() => { - var _a; - if (!run || !queryEditor || !queryEditor.operations || !queryEditor.hasFocus()) { - run == null ? void 0 : run(); - return; - } - const cursorIndex = queryEditor.indexFromPos(queryEditor.getCursor()); - let operationName; - for (const operation of queryEditor.operations) { - if (operation.loc && operation.loc.start <= cursorIndex && operation.loc.end >= cursorIndex) { - operationName = (_a = operation.name) == null ? void 0 : _a.value; + let t21; + if ($[33] !== queryEditor || $[34] !== run || $[35] !== setOperationName) { + t21 = () => { + var _a; + if (!run || !queryEditor || !queryEditor.operations || !queryEditor.hasFocus()) { + run == null ? void 0 : run(); + return; } - } - if (operationName && operationName !== queryEditor.operationName) { - setOperationName(operationName); - } - run(); - }, [queryEditor, run, setOperationName]); - useKeyMap(queryEditor, ["Cmd-Enter", "Ctrl-Enter"], runAtCursor); - useKeyMap(queryEditor, ["Shift-Ctrl-C"], copy); - useKeyMap(queryEditor, ["Shift-Ctrl-P", - // Shift-Ctrl-P is hard coded in Firefox for private browsing so adding an alternative to prettify - "Shift-Ctrl-F"], prettify); - useKeyMap(queryEditor, ["Shift-Ctrl-M"], merge); + const cursorIndex = queryEditor.indexFromPos(queryEditor.getCursor()); + let operationName_0; + for (const operation of queryEditor.operations) { + if (operation.loc && operation.loc.start <= cursorIndex && operation.loc.end >= cursorIndex) { + operationName_0 = (_a = operation.name) == null ? void 0 : _a.value; + } + } + if (operationName_0 && operationName_0 !== queryEditor.operationName) { + setOperationName(operationName_0); + } + run(); + }; + $[33] = queryEditor; + $[34] = run; + $[35] = setOperationName; + $[36] = t21; + } else { + t21 = $[36]; + } + const runAtCursor = t21; + let t22; + if ($[37] === Symbol.for("react.memo_cache_sentinel")) { + t22 = ["Cmd-Enter", "Ctrl-Enter"]; + $[37] = t22; + } else { + t22 = $[37]; + } + useKeyMap(queryEditor, t22, runAtCursor); + let t23; + if ($[38] === Symbol.for("react.memo_cache_sentinel")) { + t23 = ["Shift-Ctrl-C"]; + $[38] = t23; + } else { + t23 = $[38]; + } + useKeyMap(queryEditor, t23, copy); + let t24; + if ($[39] === Symbol.for("react.memo_cache_sentinel")) { + t24 = ["Shift-Ctrl-P", "Shift-Ctrl-F"]; + $[39] = t24; + } else { + t24 = $[39]; + } + useKeyMap(queryEditor, t24, prettify); + let t25; + if ($[40] === Symbol.for("react.memo_cache_sentinel")) { + t25 = ["Shift-Ctrl-M"]; + $[40] = t25; + } else { + t25 = $[40]; + } + useKeyMap(queryEditor, t25, merge); return ref; } +function _temp4(editorInstance_1, change) { + var _a; + if (change.origin === "paste") { + const text_0 = change.text.map(normalizeWhitespace); + (_a = change.update) == null ? void 0 : _a.call(change, change.from, change.to, text_0); + } +} +function _temp3(editorInstance, event) { + if (AUTO_COMPLETE_AFTER_KEY.test(event.key)) { + editorInstance.execCommand("autocomplete"); + } +} +function _temp2(text) { + return markdown.render(text); +} +function _temp$1() {} function useSynchronizeSchema(editor, schema, codeMirrorRef) { - React.useEffect(() => { - if (!editor) { - return; - } - const didChange = editor.options.lint.schema !== schema; - editor.state.lint.linterOptions.schema = schema; - editor.options.lint.schema = schema; - editor.options.hintOptions.schema = schema; - editor.options.info.schema = schema; - editor.options.jump.schema = schema; - if (didChange && codeMirrorRef.current) { - codeMirrorRef.current.signal(editor, "change", editor); - } - }, [editor, schema, codeMirrorRef]); + const $ = reactCompilerRuntime.c(5); + let t0; + let t1; + if ($[0] !== codeMirrorRef || $[1] !== editor || $[2] !== schema) { + t0 = () => { + if (!editor) { + return; + } + const didChange = editor.options.lint.schema !== schema; + updateEditorSchema(editor, schema); + if (didChange && codeMirrorRef.current) { + codeMirrorRef.current.signal(editor, "change", editor); + } + }; + t1 = [editor, schema, codeMirrorRef]; + $[0] = codeMirrorRef; + $[1] = editor; + $[2] = schema; + $[3] = t0; + $[4] = t1; + } else { + t0 = $[3]; + t1 = $[4]; + } + React.useEffect(t0, t1); } function useSynchronizeValidationRules(editor, validationRules, codeMirrorRef) { - React.useEffect(() => { - if (!editor) { - return; - } - const didChange = editor.options.lint.validationRules !== validationRules; - editor.state.lint.linterOptions.validationRules = validationRules; - editor.options.lint.validationRules = validationRules; - if (didChange && codeMirrorRef.current) { - codeMirrorRef.current.signal(editor, "change", editor); - } - }, [editor, validationRules, codeMirrorRef]); + const $ = reactCompilerRuntime.c(5); + let t0; + let t1; + if ($[0] !== codeMirrorRef || $[1] !== editor || $[2] !== validationRules) { + t0 = () => { + if (!editor) { + return; + } + const didChange = editor.options.lint.validationRules !== validationRules; + updateEditorValidationRules(editor, validationRules); + if (didChange && codeMirrorRef.current) { + codeMirrorRef.current.signal(editor, "change", editor); + } + }; + t1 = [editor, validationRules, codeMirrorRef]; + $[0] = codeMirrorRef; + $[1] = editor; + $[2] = validationRules; + $[3] = t0; + $[4] = t1; + } else { + t0 = $[3]; + t1 = $[4]; + } + React.useEffect(t0, t1); } function useSynchronizeExternalFragments(editor, externalFragments, codeMirrorRef) { - const externalFragmentList = React.useMemo(() => [...externalFragments.values()], [externalFragments]); - React.useEffect(() => { - if (!editor) { - return; - } - const didChange = editor.options.lint.externalFragments !== externalFragmentList; - editor.state.lint.linterOptions.externalFragments = externalFragmentList; - editor.options.lint.externalFragments = externalFragmentList; - editor.options.hintOptions.externalFragments = externalFragmentList; - if (didChange && codeMirrorRef.current) { - codeMirrorRef.current.signal(editor, "change", editor); - } - }, [editor, externalFragmentList, codeMirrorRef]); + const $ = reactCompilerRuntime.c(9); + let t0; + if ($[0] !== externalFragments) { + t0 = externalFragments.values(); + $[0] = externalFragments; + $[1] = t0; + } else { + t0 = $[1]; + } + let t1; + if ($[2] !== t0) { + t1 = [...t0]; + $[2] = t0; + $[3] = t1; + } else { + t1 = $[3]; + } + const externalFragmentList = t1; + let t2; + let t3; + if ($[4] !== codeMirrorRef || $[5] !== editor || $[6] !== externalFragmentList) { + t2 = () => { + if (!editor) { + return; + } + const didChange = editor.options.lint.externalFragments !== externalFragmentList; + updateEditorExternalFragments(editor, externalFragmentList); + if (didChange && codeMirrorRef.current) { + codeMirrorRef.current.signal(editor, "change", editor); + } + }; + t3 = [editor, externalFragmentList, codeMirrorRef]; + $[4] = codeMirrorRef; + $[5] = editor; + $[6] = externalFragmentList; + $[7] = t2; + $[8] = t3; + } else { + t2 = $[7]; + t3 = $[8]; + } + React.useEffect(t2, t3); } const AUTO_COMPLETE_AFTER_KEY = /^[a-zA-Z0-9_@(]$/; const STORAGE_KEY_QUERY = "query"; @@ -72250,325 +81426,606 @@ function clearHeadersFromTabs(storage) { } const DEFAULT_TITLE = ""; const STORAGE_KEY$2 = "tabState"; -function useVariableEditor({ - editorTheme = DEFAULT_EDITOR_THEME, - keyMap = DEFAULT_KEY_MAP, - onClickReference, - onEdit, - readOnly = false -} = {}, caller) { +function importCodeMirrorImports$1() { + return importCodeMirror([Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/variables/hint.js */ "../../codemirror-graphql/esm/variables/hint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/variables/lint.js */ "../../codemirror-graphql/esm/variables/lint.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/variables/mode.js */ "../../codemirror-graphql/esm/variables/mode.js")))]); +} +const _useVariableEditor = useVariableEditor; +function useVariableEditor(t0, caller) { + const $ = reactCompilerRuntime.c(17); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + editorTheme: t2, + keyMap: t3, + onClickReference, + onEdit, + readOnly: t4 + } = t1; + const editorTheme = t2 === void 0 ? DEFAULT_EDITOR_THEME : t2; + const keyMap = t3 === void 0 ? DEFAULT_KEY_MAP : t3; + const readOnly = t4 === void 0 ? false : t4; + const t5 = caller || _useVariableEditor; + let t6; + if ($[2] !== t5) { + t6 = { + nonNull: true, + caller: t5 + }; + $[2] = t5; + $[3] = t6; + } else { + t6 = $[3]; + } const { initialVariables, variableEditor, setVariableEditor - } = useEditorContext({ - nonNull: true, - caller: caller || useVariableEditor - }); + } = useEditorContext(t6); const executionContext = useExecutionContext(); - const merge = useMergeQuery({ - caller: caller || useVariableEditor - }); - const prettify = usePrettifyEditors({ - caller: caller || useVariableEditor - }); + const t7 = caller || _useVariableEditor; + let t8; + if ($[4] !== t7) { + t8 = { + caller: t7 + }; + $[4] = t7; + $[5] = t8; + } else { + t8 = $[5]; + } + const merge = useMergeQuery(t8); + const t9 = caller || _useVariableEditor; + let t10; + if ($[6] !== t9) { + t10 = { + caller: t9 + }; + $[6] = t9; + $[7] = t10; + } else { + t10 = $[7]; + } + const prettify = usePrettifyEditors(t10); const ref = React.useRef(null); const codeMirrorRef = React.useRef(); - React.useEffect(() => { - let isActive = true; - void importCodeMirror([Promise.resolve().then(() => __webpack_require__(/*! ./hint.cjs2.js */ "../../graphiql-react/dist/hint.cjs2.js")), Promise.resolve().then(() => __webpack_require__(/*! ./lint.cjs3.js */ "../../graphiql-react/dist/lint.cjs3.js")), Promise.resolve().then(() => __webpack_require__(/*! ./mode.cjs2.js */ "../../graphiql-react/dist/mode.cjs2.js"))]).then(CodeMirror => { - if (!isActive) { - return; - } - codeMirrorRef.current = CodeMirror; - const container = ref.current; - if (!container) { - return; - } - const newEditor = CodeMirror(container, { - value: initialVariables, - lineNumbers: true, - tabSize: 2, - mode: "graphql-variables", - theme: editorTheme, - autoCloseBrackets: true, - matchBrackets: true, - showCursorWhenSelecting: true, - readOnly: readOnly ? "nocursor" : false, - foldGutter: true, - lint: { - // @ts-expect-error - variableToType: void 0 - }, - hintOptions: { - closeOnUnfocus: false, - completeSingle: false, - container, - // @ts-expect-error - variableToType: void 0 - }, - gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], - extraKeys: commonKeys - }); - newEditor.addKeyMap({ - "Cmd-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Ctrl-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Alt-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); - }, - "Shift-Space"() { - newEditor.showHint({ - completeSingle: false, - container - }); + let t11; + let t12; + if ($[8] !== editorTheme || $[9] !== initialVariables || $[10] !== readOnly || $[11] !== setVariableEditor) { + t11 = () => { + let isActive; + isActive = true; + importCodeMirrorImports$1().then(CodeMirror => { + if (!isActive) { + return; } - }); - newEditor.on("keyup", (editorInstance, event) => { - const { - code, - key, - shiftKey - } = event; - const isLetter = code.startsWith("Key"); - const isNumber = !shiftKey && code.startsWith("Digit"); - if (isLetter || isNumber || key === "_" || key === '"') { - editorInstance.execCommand("autocomplete"); + codeMirrorRef.current = CodeMirror; + const container = ref.current; + if (!container) { + return; } + const newEditor = CodeMirror(container, { + value: initialVariables, + lineNumbers: true, + tabSize: 2, + mode: "graphql-variables", + theme: editorTheme, + autoCloseBrackets: true, + matchBrackets: true, + showCursorWhenSelecting: true, + readOnly: readOnly ? "nocursor" : false, + foldGutter: true, + lint: { + variableToType: void 0 + }, + hintOptions: { + closeOnUnfocus: false, + completeSingle: false, + container, + variableToType: void 0 + }, + gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], + extraKeys: commonKeys + }); + newEditor.addKeyMap({ + "Cmd-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Ctrl-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Alt-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + }, + "Shift-Space"() { + newEditor.showHint({ + completeSingle: false, + container + }); + } + }); + newEditor.on("keyup", _temp); + setVariableEditor(newEditor); }); - setVariableEditor(newEditor); - }); - return () => { - isActive = false; + return () => { + isActive = false; + }; }; - }, [editorTheme, initialVariables, readOnly, setVariableEditor]); + t12 = [editorTheme, initialVariables, readOnly, setVariableEditor]; + $[8] = editorTheme; + $[9] = initialVariables; + $[10] = readOnly; + $[11] = setVariableEditor; + $[12] = t11; + $[13] = t12; + } else { + t11 = $[12]; + t12 = $[13]; + } + React.useEffect(t11, t12); useSynchronizeOption(variableEditor, "keyMap", keyMap); - useChangeHandler(variableEditor, onEdit, STORAGE_KEY$1, "variables", useVariableEditor); - useCompletion(variableEditor, onClickReference || null, useVariableEditor); - useKeyMap(variableEditor, ["Cmd-Enter", "Ctrl-Enter"], executionContext == null ? void 0 : executionContext.run); - useKeyMap(variableEditor, ["Shift-Ctrl-P"], prettify); - useKeyMap(variableEditor, ["Shift-Ctrl-M"], merge); + useChangeHandler(variableEditor, onEdit, STORAGE_KEY$1, "variables", _useVariableEditor); + useCompletion(variableEditor, onClickReference || null, _useVariableEditor); + let t13; + if ($[14] === Symbol.for("react.memo_cache_sentinel")) { + t13 = ["Cmd-Enter", "Ctrl-Enter"]; + $[14] = t13; + } else { + t13 = $[14]; + } + useKeyMap(variableEditor, t13, executionContext == null ? void 0 : executionContext.run); + let t14; + if ($[15] === Symbol.for("react.memo_cache_sentinel")) { + t14 = ["Shift-Ctrl-P"]; + $[15] = t14; + } else { + t14 = $[15]; + } + useKeyMap(variableEditor, t14, prettify); + let t15; + if ($[16] === Symbol.for("react.memo_cache_sentinel")) { + t15 = ["Shift-Ctrl-M"]; + $[16] = t15; + } else { + t15 = $[16]; + } + useKeyMap(variableEditor, t15, merge); return ref; } +function _temp(editorInstance, event) { + const { + code, + key, + shiftKey + } = event; + const isLetter = code.startsWith("Key"); + const isNumber = !shiftKey && code.startsWith("Digit"); + if (isLetter || isNumber || key === "_" || key === '"') { + editorInstance.execCommand("autocomplete"); + } +} const STORAGE_KEY$1 = "variables"; const EditorContext = createNullableContext("EditorContext"); function EditorContextProvider(props) { + const $ = reactCompilerRuntime.c(89); const storage = useStorageContext(); const [headerEditor, setHeaderEditor] = React.useState(null); const [queryEditor, setQueryEditor] = React.useState(null); const [responseEditor, setResponseEditor] = React.useState(null); const [variableEditor, setVariableEditor] = React.useState(null); - const [shouldPersistHeaders, setShouldPersistHeadersInternal] = React.useState(() => { - const isStored = (storage == null ? void 0 : storage.get(PERSIST_HEADERS_STORAGE_KEY)) !== null; - return props.shouldPersistHeaders !== false && isStored ? (storage == null ? void 0 : storage.get(PERSIST_HEADERS_STORAGE_KEY)) === "true" : Boolean(props.shouldPersistHeaders); - }); + let t0; + if ($[0] !== props.shouldPersistHeaders || $[1] !== storage) { + t0 = () => { + const isStored = (storage == null ? void 0 : storage.get(PERSIST_HEADERS_STORAGE_KEY)) !== null; + return props.shouldPersistHeaders !== false && isStored ? (storage == null ? void 0 : storage.get(PERSIST_HEADERS_STORAGE_KEY)) === "true" : Boolean(props.shouldPersistHeaders); + }; + $[0] = props.shouldPersistHeaders; + $[1] = storage; + $[2] = t0; + } else { + t0 = $[2]; + } + const [shouldPersistHeaders, setShouldPersistHeadersInternal] = React.useState(t0); useSynchronizeValue(headerEditor, props.headers); useSynchronizeValue(queryEditor, props.query); useSynchronizeValue(responseEditor, props.response); useSynchronizeValue(variableEditor, props.variables); - const storeTabs = useStoreTabs({ - storage, - shouldPersistHeaders - }); - const [initialState] = React.useState(() => { - var _ref13, _props$query, _ref14, _props$variables, _ref15, _props$headers, _props$response, _ref16, _ref17; - const query = (_ref13 = (_props$query = props.query) !== null && _props$query !== void 0 ? _props$query : storage == null ? void 0 : storage.get(STORAGE_KEY_QUERY)) !== null && _ref13 !== void 0 ? _ref13 : null; - const variables = (_ref14 = (_props$variables = props.variables) !== null && _props$variables !== void 0 ? _props$variables : storage == null ? void 0 : storage.get(STORAGE_KEY$1)) !== null && _ref14 !== void 0 ? _ref14 : null; - const headers = (_ref15 = (_props$headers = props.headers) !== null && _props$headers !== void 0 ? _props$headers : storage == null ? void 0 : storage.get(STORAGE_KEY$3)) !== null && _ref15 !== void 0 ? _ref15 : null; - const response = (_props$response = props.response) !== null && _props$response !== void 0 ? _props$response : ""; - const tabState2 = getDefaultTabState({ - query, - variables, - headers, - defaultTabs: props.defaultTabs, - defaultQuery: props.defaultQuery || DEFAULT_QUERY, - defaultHeaders: props.defaultHeaders, + let t1; + if ($[3] !== shouldPersistHeaders || $[4] !== storage) { + t1 = { storage, shouldPersistHeaders - }); - storeTabs(tabState2); - return { - query: (_ref16 = query !== null && query !== void 0 ? query : tabState2.activeTabIndex === 0 ? tabState2.tabs[0].query : null) !== null && _ref16 !== void 0 ? _ref16 : "", - variables: variables !== null && variables !== void 0 ? variables : "", - headers: (_ref17 = headers !== null && headers !== void 0 ? headers : props.defaultHeaders) !== null && _ref17 !== void 0 ? _ref17 : "", - response, - tabState: tabState2 }; - }); - const [tabState, setTabState] = React.useState(initialState.tabState); - const setShouldPersistHeaders = React.useCallback(persist => { - if (persist) { - var _ref18; - storage == null ? void 0 : storage.set(STORAGE_KEY$3, (_ref18 = headerEditor == null ? void 0 : headerEditor.getValue()) !== null && _ref18 !== void 0 ? _ref18 : ""); - const serializedTabs = serializeTabState(tabState, true); - storage == null ? void 0 : storage.set(STORAGE_KEY$2, serializedTabs); - } else { - storage == null ? void 0 : storage.set(STORAGE_KEY$3, ""); - clearHeadersFromTabs(storage); - } - setShouldPersistHeadersInternal(persist); - storage == null ? void 0 : storage.set(PERSIST_HEADERS_STORAGE_KEY, persist.toString()); - }, [storage, tabState, headerEditor]); + $[3] = shouldPersistHeaders; + $[4] = storage; + $[5] = t1; + } else { + t1 = $[5]; + } + const storeTabs = useStoreTabs(t1); + let t2; + if ($[6] !== props.defaultHeaders || $[7] !== props.defaultQuery || $[8] !== props.defaultTabs || $[9] !== props.headers || $[10] !== props.query || $[11] !== props.response || $[12] !== props.variables || $[13] !== shouldPersistHeaders || $[14] !== storage || $[15] !== storeTabs) { + t2 = () => { + var _ref13, _props$query, _ref14, _props$variables, _ref15, _props$headers, _props$response, _ref16, _ref17; + const query = (_ref13 = (_props$query = props.query) !== null && _props$query !== void 0 ? _props$query : storage == null ? void 0 : storage.get(STORAGE_KEY_QUERY)) !== null && _ref13 !== void 0 ? _ref13 : null; + const variables = (_ref14 = (_props$variables = props.variables) !== null && _props$variables !== void 0 ? _props$variables : storage == null ? void 0 : storage.get(STORAGE_KEY$1)) !== null && _ref14 !== void 0 ? _ref14 : null; + const headers = (_ref15 = (_props$headers = props.headers) !== null && _props$headers !== void 0 ? _props$headers : storage == null ? void 0 : storage.get(STORAGE_KEY$3)) !== null && _ref15 !== void 0 ? _ref15 : null; + const response = (_props$response = props.response) !== null && _props$response !== void 0 ? _props$response : ""; + const tabState = getDefaultTabState({ + query, + variables, + headers, + defaultTabs: props.defaultTabs, + defaultQuery: props.defaultQuery || DEFAULT_QUERY, + defaultHeaders: props.defaultHeaders, + storage, + shouldPersistHeaders + }); + storeTabs(tabState); + return { + query: (_ref16 = query !== null && query !== void 0 ? query : tabState.activeTabIndex === 0 ? tabState.tabs[0].query : null) !== null && _ref16 !== void 0 ? _ref16 : "", + variables: variables !== null && variables !== void 0 ? variables : "", + headers: (_ref17 = headers !== null && headers !== void 0 ? headers : props.defaultHeaders) !== null && _ref17 !== void 0 ? _ref17 : "", + response, + tabState + }; + }; + $[6] = props.defaultHeaders; + $[7] = props.defaultQuery; + $[8] = props.defaultTabs; + $[9] = props.headers; + $[10] = props.query; + $[11] = props.response; + $[12] = props.variables; + $[13] = shouldPersistHeaders; + $[14] = storage; + $[15] = storeTabs; + $[16] = t2; + } else { + t2 = $[16]; + } + const [initialState] = React.useState(t2); + const [tabState_0, setTabState] = React.useState(initialState.tabState); + let t3; + if ($[17] !== headerEditor || $[18] !== storage || $[19] !== tabState_0) { + t3 = persist => { + if (persist) { + var _ref18; + storage == null ? void 0 : storage.set(STORAGE_KEY$3, (_ref18 = headerEditor == null ? void 0 : headerEditor.getValue()) !== null && _ref18 !== void 0 ? _ref18 : ""); + const serializedTabs = serializeTabState(tabState_0, true); + storage == null ? void 0 : storage.set(STORAGE_KEY$2, serializedTabs); + } else { + storage == null ? void 0 : storage.set(STORAGE_KEY$3, ""); + clearHeadersFromTabs(storage); + } + setShouldPersistHeadersInternal(persist); + storage == null ? void 0 : storage.set(PERSIST_HEADERS_STORAGE_KEY, persist.toString()); + }; + $[17] = headerEditor; + $[18] = storage; + $[19] = tabState_0; + $[20] = t3; + } else { + t3 = $[20]; + } + const setShouldPersistHeaders = t3; const lastShouldPersistHeadersProp = React.useRef(); - React.useEffect(() => { - const propValue = Boolean(props.shouldPersistHeaders); - if ((lastShouldPersistHeadersProp == null ? void 0 : lastShouldPersistHeadersProp.current) !== propValue) { - setShouldPersistHeaders(propValue); - lastShouldPersistHeadersProp.current = propValue; - } - }, [props.shouldPersistHeaders, setShouldPersistHeaders]); - const synchronizeActiveTabValues = useSynchronizeActiveTabValues({ - queryEditor, - variableEditor, - headerEditor, - responseEditor - }); + let t4; + let t5; + if ($[21] !== props.shouldPersistHeaders || $[22] !== setShouldPersistHeaders) { + t4 = () => { + const propValue = Boolean(props.shouldPersistHeaders); + if ((lastShouldPersistHeadersProp == null ? void 0 : lastShouldPersistHeadersProp.current) !== propValue) { + setShouldPersistHeaders(propValue); + lastShouldPersistHeadersProp.current = propValue; + } + }; + t5 = [props.shouldPersistHeaders, setShouldPersistHeaders]; + $[21] = props.shouldPersistHeaders; + $[22] = setShouldPersistHeaders; + $[23] = t4; + $[24] = t5; + } else { + t4 = $[23]; + t5 = $[24]; + } + React.useEffect(t4, t5); + let t6; + if ($[25] !== headerEditor || $[26] !== queryEditor || $[27] !== responseEditor || $[28] !== variableEditor) { + t6 = { + queryEditor, + variableEditor, + headerEditor, + responseEditor + }; + $[25] = headerEditor; + $[26] = queryEditor; + $[27] = responseEditor; + $[28] = variableEditor; + $[29] = t6; + } else { + t6 = $[29]; + } + const synchronizeActiveTabValues = useSynchronizeActiveTabValues(t6); const { onTabChange, defaultHeaders, defaultQuery, children } = props; - const setEditorValues = useSetEditorValues({ - queryEditor, - variableEditor, - headerEditor, - responseEditor, - defaultHeaders - }); - const addTab = React.useCallback(() => { - setTabState(current => { - const updatedValues = synchronizeActiveTabValues(current); - const updated = { - tabs: [...updatedValues.tabs, createTab({ - headers: defaultHeaders, - query: defaultQuery !== null && defaultQuery !== void 0 ? defaultQuery : DEFAULT_QUERY - })], - activeTabIndex: updatedValues.tabs.length - }; - storeTabs(updated); - setEditorValues(updated.tabs[updated.activeTabIndex]); - onTabChange == null ? void 0 : onTabChange(updated); - return updated; - }); - }, [defaultHeaders, defaultQuery, onTabChange, setEditorValues, storeTabs, synchronizeActiveTabValues]); - const changeTab = React.useCallback(index => { - setTabState(current => { - const updated = { - ...current, - activeTabIndex: index - }; - storeTabs(updated); - setEditorValues(updated.tabs[updated.activeTabIndex]); - onTabChange == null ? void 0 : onTabChange(updated); - return updated; - }); - }, [onTabChange, setEditorValues, storeTabs]); - const moveTab = React.useCallback(newOrder => { - setTabState(current => { - const activeTab = current.tabs[current.activeTabIndex]; - const updated = { - tabs: newOrder, - activeTabIndex: newOrder.indexOf(activeTab) - }; - storeTabs(updated); - setEditorValues(updated.tabs[updated.activeTabIndex]); - onTabChange == null ? void 0 : onTabChange(updated); - return updated; - }); - }, [onTabChange, setEditorValues, storeTabs]); - const closeTab = React.useCallback(index => { - setTabState(current => { - const updated = { - tabs: current.tabs.filter((_tab, i) => index !== i), - activeTabIndex: Math.max(current.activeTabIndex - 1, 0) - }; - storeTabs(updated); - setEditorValues(updated.tabs[updated.activeTabIndex]); - onTabChange == null ? void 0 : onTabChange(updated); - return updated; - }); - }, [onTabChange, setEditorValues, storeTabs]); - const updateActiveTabValues = React.useCallback(partialTab => { - setTabState(current => { - const updated = setPropertiesInActiveTab(current, partialTab); - storeTabs(updated); - onTabChange == null ? void 0 : onTabChange(updated); - return updated; - }); - }, [onTabChange, storeTabs]); + let t7; + if ($[30] !== defaultHeaders || $[31] !== headerEditor || $[32] !== queryEditor || $[33] !== responseEditor || $[34] !== variableEditor) { + t7 = { + queryEditor, + variableEditor, + headerEditor, + responseEditor, + defaultHeaders + }; + $[30] = defaultHeaders; + $[31] = headerEditor; + $[32] = queryEditor; + $[33] = responseEditor; + $[34] = variableEditor; + $[35] = t7; + } else { + t7 = $[35]; + } + const setEditorValues = useSetEditorValues(t7); + let t8; + if ($[36] !== defaultHeaders || $[37] !== defaultQuery || $[38] !== onTabChange || $[39] !== setEditorValues || $[40] !== storeTabs || $[41] !== synchronizeActiveTabValues) { + t8 = () => { + setTabState(current => { + const updatedValues = synchronizeActiveTabValues(current); + const updated = { + tabs: [...updatedValues.tabs, createTab({ + headers: defaultHeaders, + query: defaultQuery !== null && defaultQuery !== void 0 ? defaultQuery : DEFAULT_QUERY + })], + activeTabIndex: updatedValues.tabs.length + }; + storeTabs(updated); + setEditorValues(updated.tabs[updated.activeTabIndex]); + onTabChange == null ? void 0 : onTabChange(updated); + return updated; + }); + }; + $[36] = defaultHeaders; + $[37] = defaultQuery; + $[38] = onTabChange; + $[39] = setEditorValues; + $[40] = storeTabs; + $[41] = synchronizeActiveTabValues; + $[42] = t8; + } else { + t8 = $[42]; + } + const addTab = t8; + let t9; + if ($[43] !== onTabChange || $[44] !== setEditorValues || $[45] !== storeTabs) { + t9 = index => { + setTabState(current_0 => { + const updated_0 = { + ...current_0, + activeTabIndex: index + }; + storeTabs(updated_0); + setEditorValues(updated_0.tabs[updated_0.activeTabIndex]); + onTabChange == null ? void 0 : onTabChange(updated_0); + return updated_0; + }); + }; + $[43] = onTabChange; + $[44] = setEditorValues; + $[45] = storeTabs; + $[46] = t9; + } else { + t9 = $[46]; + } + const changeTab = t9; + let t10; + if ($[47] !== onTabChange || $[48] !== setEditorValues || $[49] !== storeTabs) { + t10 = newOrder => { + setTabState(current_1 => { + const activeTab = current_1.tabs[current_1.activeTabIndex]; + const updated_1 = { + tabs: newOrder, + activeTabIndex: newOrder.indexOf(activeTab) + }; + storeTabs(updated_1); + setEditorValues(updated_1.tabs[updated_1.activeTabIndex]); + onTabChange == null ? void 0 : onTabChange(updated_1); + return updated_1; + }); + }; + $[47] = onTabChange; + $[48] = setEditorValues; + $[49] = storeTabs; + $[50] = t10; + } else { + t10 = $[50]; + } + const moveTab = t10; + let t11; + if ($[51] !== onTabChange || $[52] !== setEditorValues || $[53] !== storeTabs) { + t11 = index_0 => { + setTabState(current_2 => { + const updated_2 = { + tabs: current_2.tabs.filter((_tab, i) => index_0 !== i), + activeTabIndex: Math.max(current_2.activeTabIndex - 1, 0) + }; + storeTabs(updated_2); + setEditorValues(updated_2.tabs[updated_2.activeTabIndex]); + onTabChange == null ? void 0 : onTabChange(updated_2); + return updated_2; + }); + }; + $[51] = onTabChange; + $[52] = setEditorValues; + $[53] = storeTabs; + $[54] = t11; + } else { + t11 = $[54]; + } + const closeTab = t11; + let t12; + if ($[55] !== onTabChange || $[56] !== storeTabs) { + t12 = partialTab => { + setTabState(current_3 => { + const updated_3 = setPropertiesInActiveTab(current_3, partialTab); + storeTabs(updated_3); + onTabChange == null ? void 0 : onTabChange(updated_3); + return updated_3; + }); + }; + $[55] = onTabChange; + $[56] = storeTabs; + $[57] = t12; + } else { + t12 = $[57]; + } + const updateActiveTabValues = t12; const { onEditOperationName } = props; - const setOperationName = React.useCallback(operationName => { - if (!queryEditor) { - return; - } - queryEditor.operationName = operationName; - updateActiveTabValues({ - operationName - }); - onEditOperationName == null ? void 0 : onEditOperationName(operationName); - }, [onEditOperationName, queryEditor, updateActiveTabValues]); - const externalFragments = React.useMemo(() => { - const map = /* @__PURE__ */new Map(); + let t13; + if ($[58] !== onEditOperationName || $[59] !== queryEditor || $[60] !== updateActiveTabValues) { + t13 = operationName => { + if (!queryEditor) { + return; + } + updateQueryEditor(queryEditor, operationName); + updateActiveTabValues({ + operationName + }); + onEditOperationName == null ? void 0 : onEditOperationName(operationName); + }; + $[58] = onEditOperationName; + $[59] = queryEditor; + $[60] = updateActiveTabValues; + $[61] = t13; + } else { + t13 = $[61]; + } + const setOperationName = t13; + let t14; + let map; + if ($[62] !== props.externalFragments) { + map = /* @__PURE__ */new Map(); if (Array.isArray(props.externalFragments)) { for (const fragment of props.externalFragments) { map.set(fragment.name.value, fragment); } - } else if (typeof props.externalFragments === "string") { - graphql.visit(graphql.parse(props.externalFragments, {}), { - FragmentDefinition(fragment) { - map.set(fragment.name.value, fragment); + } else { + if (typeof props.externalFragments === "string") { + graphql.visit(graphql.parse(props.externalFragments, {}), { + FragmentDefinition(fragment_0) { + map.set(fragment_0.name.value, fragment_0); + } + }); + } else { + if (props.externalFragments) { + throw new Error("The `externalFragments` prop must either be a string that contains the fragment definitions in SDL or a list of FragmentDefinitionNode objects."); } - }); - } else if (props.externalFragments) { - throw new Error("The `externalFragments` prop must either be a string that contains the fragment definitions in SDL or a list of FragmentDefinitionNode objects."); + } } - return map; - }, [props.externalFragments]); - const validationRules = React.useMemo(() => props.validationRules || [], [props.validationRules]); - const value = React.useMemo(() => ({ - ...tabState, - addTab, - changeTab, - moveTab, - closeTab, - updateActiveTabValues, - headerEditor, - queryEditor, - responseEditor, - variableEditor, - setHeaderEditor, - setQueryEditor, - setResponseEditor, - setVariableEditor, - setOperationName, - initialQuery: initialState.query, - initialVariables: initialState.variables, - initialHeaders: initialState.headers, - initialResponse: initialState.response, - externalFragments, - validationRules, - shouldPersistHeaders, - setShouldPersistHeaders - }), [tabState, addTab, changeTab, moveTab, closeTab, updateActiveTabValues, headerEditor, queryEditor, responseEditor, variableEditor, setOperationName, initialState, externalFragments, validationRules, shouldPersistHeaders, setShouldPersistHeaders]); - return /* @__PURE__ */jsxRuntime.jsx(EditorContext.Provider, { - value, - children - }); + $[62] = props.externalFragments; + $[63] = map; + } else { + map = $[63]; + } + t14 = map; + const externalFragments = t14; + let t15; + if ($[64] !== props.validationRules) { + t15 = props.validationRules || []; + $[64] = props.validationRules; + $[65] = t15; + } else { + t15 = $[65]; + } + const validationRules = t15; + let t16; + if ($[66] !== addTab || $[67] !== changeTab || $[68] !== closeTab || $[69] !== externalFragments || $[70] !== headerEditor || $[71] !== initialState.headers || $[72] !== initialState.query || $[73] !== initialState.response || $[74] !== initialState.variables || $[75] !== moveTab || $[76] !== queryEditor || $[77] !== responseEditor || $[78] !== setOperationName || $[79] !== setShouldPersistHeaders || $[80] !== shouldPersistHeaders || $[81] !== tabState_0 || $[82] !== updateActiveTabValues || $[83] !== validationRules || $[84] !== variableEditor) { + t16 = { + ...tabState_0, + addTab, + changeTab, + moveTab, + closeTab, + updateActiveTabValues, + headerEditor, + queryEditor, + responseEditor, + variableEditor, + setHeaderEditor, + setQueryEditor, + setResponseEditor, + setVariableEditor, + setOperationName, + initialQuery: initialState.query, + initialVariables: initialState.variables, + initialHeaders: initialState.headers, + initialResponse: initialState.response, + externalFragments, + validationRules, + shouldPersistHeaders, + setShouldPersistHeaders + }; + $[66] = addTab; + $[67] = changeTab; + $[68] = closeTab; + $[69] = externalFragments; + $[70] = headerEditor; + $[71] = initialState.headers; + $[72] = initialState.query; + $[73] = initialState.response; + $[74] = initialState.variables; + $[75] = moveTab; + $[76] = queryEditor; + $[77] = responseEditor; + $[78] = setOperationName; + $[79] = setShouldPersistHeaders; + $[80] = shouldPersistHeaders; + $[81] = tabState_0; + $[82] = updateActiveTabValues; + $[83] = validationRules; + $[84] = variableEditor; + $[85] = t16; + } else { + t16 = $[85]; + } + const value = t16; + let t17; + if ($[86] !== children || $[87] !== value) { + t17 = /* @__PURE__ */jsxRuntime.jsx(EditorContext.Provider, { + value, + children + }); + $[86] = children; + $[87] = value; + $[88] = t17; + } else { + t17 = $[88]; + } + return t17; +} +function updateQueryEditor(queryEditor, operationName) { + queryEditor.operationName = operationName; } const useEditorContext = createContextHook(EditorContext); const PERSIST_HEADERS_STORAGE_KEY = "shouldPersistHeaders"; @@ -72604,73 +82061,177 @@ const DEFAULT_QUERY = `# Welcome to GraphiQL # `; -function HeaderEditor({ - isHidden, - ...hookArgs -}) { +function HeaderEditor(t0) { + const $ = reactCompilerRuntime.c(13); + let hookArgs; + let isHidden; + if ($[0] !== t0) { + ({ + isHidden, + ...hookArgs + } = t0); + $[0] = t0; + $[1] = hookArgs; + $[2] = isHidden; + } else { + hookArgs = $[1]; + isHidden = $[2]; + } + let t1; + if ($[3] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: HeaderEditor + }; + $[3] = t1; + } else { + t1 = $[3]; + } const { headerEditor - } = useEditorContext({ - nonNull: true, - caller: HeaderEditor - }); + } = useEditorContext(t1); const ref = useHeaderEditor(hookArgs, HeaderEditor); - React.useEffect(() => { - if (!isHidden) { - headerEditor == null ? void 0 : headerEditor.refresh(); - } - }, [headerEditor, isHidden]); - return /* @__PURE__ */jsxRuntime.jsx("div", { - className: clsx.clsx("graphiql-editor", isHidden && "hidden"), - ref - }); + let t2; + let t3; + if ($[4] !== headerEditor || $[5] !== isHidden) { + t2 = () => { + if (!isHidden) { + headerEditor == null ? void 0 : headerEditor.refresh(); + } + }; + t3 = [headerEditor, isHidden]; + $[4] = headerEditor; + $[5] = isHidden; + $[6] = t2; + $[7] = t3; + } else { + t2 = $[6]; + t3 = $[7]; + } + React.useEffect(t2, t3); + const t4 = isHidden && "hidden"; + let t5; + if ($[8] !== t4) { + t5 = clsx.clsx("graphiql-editor", t4); + $[8] = t4; + $[9] = t5; + } else { + t5 = $[9]; + } + let t6; + if ($[10] !== ref || $[11] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: t5, + ref + }); + $[10] = ref; + $[11] = t5; + $[12] = t6; + } else { + t6 = $[12]; + } + return t6; } function ImagePreview(props) { var _a; - const [dimensions, setDimensions] = React.useState({ - width: null, - height: null - }); + const $ = reactCompilerRuntime.c(14); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + width: null, + height: null + }; + $[0] = t0; + } else { + t0 = $[0]; + } + const [dimensions, setDimensions] = React.useState(t0); const [mime, setMime] = React.useState(null); const ref = React.useRef(null); const src = (_a = tokenToURL(props.token)) == null ? void 0 : _a.href; - React.useEffect(() => { - if (!ref.current) { - return; - } - if (!src) { - setDimensions({ - width: null, - height: null - }); - setMime(null); - return; - } - fetch(src, { - method: "HEAD" - }).then(response => { - setMime(response.headers.get("Content-Type")); - }).catch(() => { - setMime(null); - }); - }, [src]); - const dims = dimensions.width !== null && dimensions.height !== null ? /* @__PURE__ */jsxRuntime.jsxs("div", { - children: [dimensions.width, "x", dimensions.height, mime === null ? null : " " + mime] - }) : null; - return /* @__PURE__ */jsxRuntime.jsxs("div", { - children: [/* @__PURE__ */jsxRuntime.jsx("img", { - onLoad: () => { - var _ref19, _ref20; - var _a2, _b; + let t1; + let t2; + if ($[1] !== src) { + t1 = () => { + if (!ref.current) { + return; + } + if (!src) { setDimensions({ - width: (_ref19 = (_a2 = ref.current) == null ? void 0 : _a2.naturalWidth) !== null && _ref19 !== void 0 ? _ref19 : null, - height: (_ref20 = (_b = ref.current) == null ? void 0 : _b.naturalHeight) !== null && _ref20 !== void 0 ? _ref20 : null + width: null, + height: null }); - }, + setMime(null); + return; + } + fetch(src, { + method: "HEAD" + }).then(response => { + setMime(response.headers.get("Content-Type")); + }).catch(() => { + setMime(null); + }); + }; + t2 = [src]; + $[1] = src; + $[2] = t1; + $[3] = t2; + } else { + t1 = $[2]; + t2 = $[3]; + } + React.useEffect(t1, t2); + let t3; + if ($[4] !== dimensions.height || $[5] !== dimensions.width || $[6] !== mime) { + t3 = dimensions.width !== null && dimensions.height !== null ? /* @__PURE__ */jsxRuntime.jsxs("div", { + children: [dimensions.width, "x", dimensions.height, mime === null ? null : " " + mime] + }) : null; + $[4] = dimensions.height; + $[5] = dimensions.width; + $[6] = mime; + $[7] = t3; + } else { + t3 = $[7]; + } + const dims = t3; + let t4; + if ($[8] === Symbol.for("react.memo_cache_sentinel")) { + t4 = () => { + var _ref19, _ref20; + var _a2, _b; + setDimensions({ + width: (_ref19 = (_a2 = ref.current) == null ? void 0 : _a2.naturalWidth) !== null && _ref19 !== void 0 ? _ref19 : null, + height: (_ref20 = (_b = ref.current) == null ? void 0 : _b.naturalHeight) !== null && _ref20 !== void 0 ? _ref20 : null + }); + }; + $[8] = t4; + } else { + t4 = $[8]; + } + let t5; + if ($[9] !== src) { + t5 = /* @__PURE__ */jsxRuntime.jsx("img", { + onLoad: t4, ref, src - }), dims] - }); + }); + $[9] = src; + $[10] = t5; + } else { + t5 = $[10]; + } + let t6; + if ($[11] !== dims || $[12] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsxs("div", { + children: [t5, dims] + }); + $[11] = dims; + $[12] = t5; + $[13] = t6; + } else { + t6 = $[13]; + } + return t6; } ImagePreview.shouldRender = function shouldRender(token) { const url = tokenToURL(token); @@ -72694,513 +82255,1050 @@ function isImageURL(url) { return /\.(bmp|gif|jpe?g|png|svg|webp)$/.test(url.pathname); } function QueryEditor(props) { + const $ = reactCompilerRuntime.c(2); const ref = useQueryEditor(props, QueryEditor); - return /* @__PURE__ */jsxRuntime.jsx("div", { - className: "graphiql-editor", - ref + let t0; + if ($[0] !== ref) { + t0 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: "graphiql-editor", + ref + }); + $[0] = ref; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; +} +function importCodeMirrorImports() { + return importCodeMirror([Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/fold/foldgutter.js */ "../../../node_modules/codemirror/addon/fold/foldgutter.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/fold/brace-fold.js */ "../../../node_modules/codemirror/addon/fold/brace-fold.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/dialog/dialog.js */ "../../../node_modules/codemirror/addon/dialog/dialog.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/search.js */ "../../../node_modules/codemirror/addon/search/search.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/searchcursor.js */ "../../../node_modules/codemirror/addon/search/searchcursor.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/addon/search/jump-to-line.js */ "../../../node_modules/codemirror/addon/search/jump-to-line.js"))), // @ts-expect-error + Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror/keymap/sublime.js */ "../../../node_modules/codemirror/keymap/sublime.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/results/mode.js */ "../../codemirror-graphql/esm/results/mode.js"))), Promise.resolve().then(() => _interopRequireWildcard(__webpack_require__(/*! codemirror-graphql/esm/utils/info-addon.js */ "../../codemirror-graphql/esm/utils/info-addon.js")))], { + useCommonAddons: false }); } -function useResponseEditor({ - responseTooltip, - editorTheme = DEFAULT_EDITOR_THEME, - keyMap = DEFAULT_KEY_MAP -} = {}, caller) { +const _useResponseEditor = useResponseEditor; +function useResponseEditor(t0, caller) { + const $ = reactCompilerRuntime.c(19); + let t1; + if ($[0] !== t0) { + t1 = t0 === void 0 ? {} : t0; + $[0] = t0; + $[1] = t1; + } else { + t1 = $[1]; + } + const { + responseTooltip, + editorTheme: t2, + keyMap: t3 + } = t1; + const editorTheme = t2 === void 0 ? DEFAULT_EDITOR_THEME : t2; + const keyMap = t3 === void 0 ? DEFAULT_KEY_MAP : t3; + const t4 = caller || _useResponseEditor; + let t5; + if ($[2] !== t4) { + t5 = { + nonNull: true, + caller: t4 + }; + $[2] = t4; + $[3] = t5; + } else { + t5 = $[3]; + } const { fetchError, validationErrors - } = useSchemaContext({ - nonNull: true, - caller: caller || useResponseEditor - }); + } = useSchemaContext(t5); + const t6 = caller || _useResponseEditor; + let t7; + if ($[4] !== t6) { + t7 = { + nonNull: true, + caller: t6 + }; + $[4] = t6; + $[5] = t7; + } else { + t7 = $[5]; + } const { initialResponse, responseEditor, setResponseEditor - } = useEditorContext({ - nonNull: true, - caller: caller || useResponseEditor - }); + } = useEditorContext(t7); const ref = React.useRef(null); const responseTooltipRef = React.useRef(responseTooltip); - React.useEffect(() => { - responseTooltipRef.current = responseTooltip; - }, [responseTooltip]); - React.useEffect(() => { - let isActive = true; - void importCodeMirror([Promise.resolve().then(() => __webpack_require__(/*! ./foldgutter.cjs.js */ "../../graphiql-react/dist/foldgutter.cjs.js")).then(n => n.foldgutter), Promise.resolve().then(() => __webpack_require__(/*! ./brace-fold.cjs.js */ "../../graphiql-react/dist/brace-fold.cjs.js")).then(n => n.braceFold), Promise.resolve().then(() => __webpack_require__(/*! ./dialog.cjs.js */ "../../graphiql-react/dist/dialog.cjs.js")).then(n => n.dialog), Promise.resolve().then(() => __webpack_require__(/*! ./search.cjs.js */ "../../graphiql-react/dist/search.cjs.js")).then(n => n.search), Promise.resolve().then(() => __webpack_require__(/*! ./searchcursor.cjs.js */ "../../graphiql-react/dist/searchcursor.cjs.js")).then(n => n.searchcursor), Promise.resolve().then(() => __webpack_require__(/*! ./jump-to-line.cjs.js */ "../../graphiql-react/dist/jump-to-line.cjs.js")).then(n => n.jumpToLine), - // @ts-expect-error - Promise.resolve().then(() => __webpack_require__(/*! ./sublime.cjs.js */ "../../graphiql-react/dist/sublime.cjs.js")).then(n => n.sublime), Promise.resolve().then(() => __webpack_require__(/*! ./mode.cjs3.js */ "../../graphiql-react/dist/mode.cjs3.js")), Promise.resolve().then(() => __webpack_require__(/*! ./info-addon.cjs.js */ "../../graphiql-react/dist/info-addon.cjs.js"))], { - useCommonAddons: false - }).then(CodeMirror => { - if (!isActive) { - return; - } - const tooltipDiv = document.createElement("div"); - CodeMirror.registerHelper("info", "graphql-results", (token, _options, _cm, pos) => { - const infoElements = []; - const ResponseTooltipComponent = responseTooltipRef.current; - if (ResponseTooltipComponent) { - infoElements.push( /* @__PURE__ */jsxRuntime.jsx(ResponseTooltipComponent, { - pos, - token - })); - } - if (ImagePreview.shouldRender(token)) { - infoElements.push( /* @__PURE__ */jsxRuntime.jsx(ImagePreview, { - token - }, "image-preview")); - } - if (!infoElements.length) { - ReactDOM.unmountComponentAtNode(tooltipDiv); - return null; - } - ReactDOM.render(infoElements, tooltipDiv); - return tooltipDiv; - }); - const container = ref.current; - if (!container) { - return; - } - const newEditor = CodeMirror(container, { - value: initialResponse, - lineWrapping: true, - readOnly: true, - theme: editorTheme, - mode: "graphql-results", - foldGutter: true, - gutters: ["CodeMirror-foldgutter"], - // @ts-expect-error - info: true, - extraKeys: commonKeys - }); - setResponseEditor(newEditor); - }); - return () => { - isActive = false; + let t8; + let t9; + if ($[6] !== responseTooltip) { + t8 = () => { + responseTooltipRef.current = responseTooltip; }; - }, [editorTheme, initialResponse, setResponseEditor]); + t9 = [responseTooltip]; + $[6] = responseTooltip; + $[7] = t8; + $[8] = t9; + } else { + t8 = $[7]; + t9 = $[8]; + } + React.useEffect(t8, t9); + let t10; + let t11; + if ($[9] !== editorTheme || $[10] !== initialResponse || $[11] !== setResponseEditor) { + t10 = () => { + let isActive; + isActive = true; + importCodeMirrorImports().then(CodeMirror => { + if (!isActive) { + return; + } + const tooltipDiv = document.createElement("div"); + CodeMirror.registerHelper("info", "graphql-results", (token, _options, _cm, pos) => { + const infoElements = []; + const ResponseTooltipComponent = responseTooltipRef.current; + if (ResponseTooltipComponent) { + infoElements.push( /* @__PURE__ */jsxRuntime.jsx(ResponseTooltipComponent, { + pos, + token + })); + } + if (ImagePreview.shouldRender(token)) { + infoElements.push( /* @__PURE__ */jsxRuntime.jsx(ImagePreview, { + token + }, "image-preview")); + } + if (!infoElements.length) { + ReactDOM.unmountComponentAtNode(tooltipDiv); + return null; + } + ReactDOM.render(infoElements, tooltipDiv); + return tooltipDiv; + }); + const container = ref.current; + if (!container) { + return; + } + const newEditor = CodeMirror(container, { + value: initialResponse, + lineWrapping: true, + readOnly: true, + theme: editorTheme, + mode: "graphql-results", + foldGutter: true, + gutters: ["CodeMirror-foldgutter"], + info: true, + extraKeys: commonKeys + }); + setResponseEditor(newEditor); + }); + return () => { + isActive = false; + }; + }; + t11 = [editorTheme, initialResponse, setResponseEditor]; + $[9] = editorTheme; + $[10] = initialResponse; + $[11] = setResponseEditor; + $[12] = t10; + $[13] = t11; + } else { + t10 = $[12]; + t11 = $[13]; + } + React.useEffect(t10, t11); useSynchronizeOption(responseEditor, "keyMap", keyMap); - React.useEffect(() => { - if (fetchError) { - responseEditor == null ? void 0 : responseEditor.setValue(fetchError); - } - if (validationErrors.length > 0) { - responseEditor == null ? void 0 : responseEditor.setValue(toolkit.formatError(validationErrors)); - } - }, [responseEditor, fetchError, validationErrors]); + let t12; + let t13; + if ($[14] !== fetchError || $[15] !== responseEditor || $[16] !== validationErrors) { + t12 = () => { + if (fetchError) { + responseEditor == null ? void 0 : responseEditor.setValue(fetchError); + } + if (validationErrors.length > 0) { + responseEditor == null ? void 0 : responseEditor.setValue(toolkit.formatError(validationErrors)); + } + }; + t13 = [responseEditor, fetchError, validationErrors]; + $[14] = fetchError; + $[15] = responseEditor; + $[16] = validationErrors; + $[17] = t12; + $[18] = t13; + } else { + t12 = $[17]; + t13 = $[18]; + } + React.useEffect(t12, t13); return ref; } function ResponseEditor(props) { + const $ = reactCompilerRuntime.c(2); const ref = useResponseEditor(props, ResponseEditor); - return /* @__PURE__ */jsxRuntime.jsx("section", { - className: "result-window", - "aria-label": "Result Window", - "aria-live": "polite", - "aria-atomic": "true", - ref - }); + let t0; + if ($[0] !== ref) { + t0 = /* @__PURE__ */jsxRuntime.jsx("section", { + className: "result-window", + "aria-label": "Result Window", + "aria-live": "polite", + "aria-atomic": "true", + ref + }); + $[0] = ref; + $[1] = t0; + } else { + t0 = $[1]; + } + return t0; } -function VariableEditor({ - isHidden, - ...hookArgs -}) { +function VariableEditor(t0) { + const $ = reactCompilerRuntime.c(13); + let hookArgs; + let isHidden; + if ($[0] !== t0) { + ({ + isHidden, + ...hookArgs + } = t0); + $[0] = t0; + $[1] = hookArgs; + $[2] = isHidden; + } else { + hookArgs = $[1]; + isHidden = $[2]; + } + let t1; + if ($[3] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: VariableEditor + }; + $[3] = t1; + } else { + t1 = $[3]; + } const { variableEditor - } = useEditorContext({ - nonNull: true, - caller: VariableEditor - }); + } = useEditorContext(t1); const ref = useVariableEditor(hookArgs, VariableEditor); - React.useEffect(() => { - if (variableEditor && !isHidden) { - variableEditor.refresh(); - } - }, [variableEditor, isHidden]); - return /* @__PURE__ */jsxRuntime.jsx("div", { - className: clsx.clsx("graphiql-editor", isHidden && "hidden"), - ref - }); + let t2; + let t3; + if ($[4] !== isHidden || $[5] !== variableEditor) { + t2 = () => { + if (variableEditor && !isHidden) { + variableEditor.refresh(); + } + }; + t3 = [variableEditor, isHidden]; + $[4] = isHidden; + $[5] = variableEditor; + $[6] = t2; + $[7] = t3; + } else { + t2 = $[6]; + t3 = $[7]; + } + React.useEffect(t2, t3); + const t4 = isHidden && "hidden"; + let t5; + if ($[8] !== t4) { + t5 = clsx.clsx("graphiql-editor", t4); + $[8] = t4; + $[9] = t5; + } else { + t5 = $[9]; + } + let t6; + if ($[10] !== ref || $[11] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsx("div", { + className: t5, + ref + }); + $[10] = ref; + $[11] = t5; + $[12] = t6; + } else { + t6 = $[12]; + } + return t6; } -function GraphiQLProvider({ - children, - dangerouslyAssumeSchemaIsValid, - defaultQuery, - defaultHeaders, - defaultTabs, - externalFragments, - fetcher, - getDefaultFieldNames, - headers, - inputValueDeprecation, - introspectionQueryName, - maxHistoryLength, - onEditOperationName, - onSchemaChange, - onTabChange, - onTogglePluginVisibility, - operationName, - plugins, - query, - response, - schema, - schemaDescription, - shouldPersistHeaders, - storage, - validationRules, - variables, - visiblePlugin -}) { - return /* @__PURE__ */jsxRuntime.jsx(StorageContextProvider, { +function GraphiQLProvider(t0) { + const $ = reactCompilerRuntime.c(39); + const { + children, + dangerouslyAssumeSchemaIsValid, + defaultQuery, + defaultHeaders, + defaultTabs, + externalFragments, + fetcher, + getDefaultFieldNames, + headers, + inputValueDeprecation, + introspectionQueryName, + maxHistoryLength, + onEditOperationName, + onSchemaChange, + onTabChange, + onTogglePluginVisibility, + operationName, + plugins, + query, + response, + schema, + schemaDescription, + shouldPersistHeaders, storage, - children: /* @__PURE__ */jsxRuntime.jsx(HistoryContextProvider, { - maxHistoryLength, - children: /* @__PURE__ */jsxRuntime.jsx(EditorContextProvider, { - defaultQuery, - defaultHeaders, - defaultTabs, - externalFragments, - headers, - onEditOperationName, - onTabChange, - query, - response, - shouldPersistHeaders, - validationRules, - variables, - children: /* @__PURE__ */jsxRuntime.jsx(SchemaContextProvider, { - dangerouslyAssumeSchemaIsValid, - fetcher, - inputValueDeprecation, - introspectionQueryName, - onSchemaChange, - schema, - schemaDescription, - children: /* @__PURE__ */jsxRuntime.jsx(ExecutionContextProvider, { - getDefaultFieldNames, - fetcher, - operationName, - children: /* @__PURE__ */jsxRuntime.jsx(ExplorerContextProvider, { - children: /* @__PURE__ */jsxRuntime.jsx(PluginContextProvider, { - onTogglePluginVisibility, - plugins, - visiblePlugin, - children - }) - }) - }) - }) + validationRules, + variables, + visiblePlugin + } = t0; + let t1; + if ($[0] !== children || $[1] !== onTogglePluginVisibility || $[2] !== plugins || $[3] !== visiblePlugin) { + t1 = /* @__PURE__ */jsxRuntime.jsx(ExplorerContextProvider, { + children: /* @__PURE__ */jsxRuntime.jsx(PluginContextProvider, { + onTogglePluginVisibility, + plugins, + visiblePlugin, + children }) - }) - }); + }); + $[0] = children; + $[1] = onTogglePluginVisibility; + $[2] = plugins; + $[3] = visiblePlugin; + $[4] = t1; + } else { + t1 = $[4]; + } + let t2; + if ($[5] !== fetcher || $[6] !== getDefaultFieldNames || $[7] !== operationName || $[8] !== t1) { + t2 = /* @__PURE__ */jsxRuntime.jsx(ExecutionContextProvider, { + getDefaultFieldNames, + fetcher, + operationName, + children: t1 + }); + $[5] = fetcher; + $[6] = getDefaultFieldNames; + $[7] = operationName; + $[8] = t1; + $[9] = t2; + } else { + t2 = $[9]; + } + let t3; + if ($[10] !== dangerouslyAssumeSchemaIsValid || $[11] !== fetcher || $[12] !== inputValueDeprecation || $[13] !== introspectionQueryName || $[14] !== onSchemaChange || $[15] !== schema || $[16] !== schemaDescription || $[17] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsx(SchemaContextProvider, { + dangerouslyAssumeSchemaIsValid, + fetcher, + inputValueDeprecation, + introspectionQueryName, + onSchemaChange, + schema, + schemaDescription, + children: t2 + }); + $[10] = dangerouslyAssumeSchemaIsValid; + $[11] = fetcher; + $[12] = inputValueDeprecation; + $[13] = introspectionQueryName; + $[14] = onSchemaChange; + $[15] = schema; + $[16] = schemaDescription; + $[17] = t2; + $[18] = t3; + } else { + t3 = $[18]; + } + let t4; + if ($[19] !== defaultHeaders || $[20] !== defaultQuery || $[21] !== defaultTabs || $[22] !== externalFragments || $[23] !== headers || $[24] !== onEditOperationName || $[25] !== onTabChange || $[26] !== query || $[27] !== response || $[28] !== shouldPersistHeaders || $[29] !== t3 || $[30] !== validationRules || $[31] !== variables) { + t4 = /* @__PURE__ */jsxRuntime.jsx(EditorContextProvider, { + defaultQuery, + defaultHeaders, + defaultTabs, + externalFragments, + headers, + onEditOperationName, + onTabChange, + query, + response, + shouldPersistHeaders, + validationRules, + variables, + children: t3 + }); + $[19] = defaultHeaders; + $[20] = defaultQuery; + $[21] = defaultTabs; + $[22] = externalFragments; + $[23] = headers; + $[24] = onEditOperationName; + $[25] = onTabChange; + $[26] = query; + $[27] = response; + $[28] = shouldPersistHeaders; + $[29] = t3; + $[30] = validationRules; + $[31] = variables; + $[32] = t4; + } else { + t4 = $[32]; + } + let t5; + if ($[33] !== maxHistoryLength || $[34] !== t4) { + t5 = /* @__PURE__ */jsxRuntime.jsx(HistoryContextProvider, { + maxHistoryLength, + children: t4 + }); + $[33] = maxHistoryLength; + $[34] = t4; + $[35] = t5; + } else { + t5 = $[35]; + } + let t6; + if ($[36] !== storage || $[37] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsx(StorageContextProvider, { + storage, + children: t5 + }); + $[36] = storage; + $[37] = t5; + $[38] = t6; + } else { + t6 = $[38]; + } + return t6; } -function useTheme(defaultTheme = null) { +function useTheme(t0) { + const $ = reactCompilerRuntime.c(11); + const defaultTheme = t0 === void 0 ? null : t0; const storageContext = useStorageContext(); - const [theme, setThemeInternal] = React.useState(() => { - if (!storageContext) { - return null; - } - const stored = storageContext.get(STORAGE_KEY); - switch (stored) { - case "light": - return "light"; - case "dark": - return "dark"; - default: - if (typeof stored === "string") { - storageContext.set(STORAGE_KEY, ""); - } - return defaultTheme; - } - }); - React.useLayoutEffect(() => { - if (typeof window === "undefined") { - return; - } - document.body.classList.remove("graphiql-light", "graphiql-dark"); - if (theme) { - document.body.classList.add(`graphiql-${theme}`); - } - }, [theme]); - const setTheme = React.useCallback(newTheme => { - storageContext == null ? void 0 : storageContext.set(STORAGE_KEY, newTheme || ""); - setThemeInternal(newTheme); - }, [storageContext]); - return React.useMemo(() => ({ - theme, - setTheme - }), [theme, setTheme]); + let t1; + if ($[0] !== defaultTheme || $[1] !== storageContext) { + t1 = () => { + if (!storageContext) { + return null; + } + const stored = storageContext.get(STORAGE_KEY); + switch (stored) { + case "light": + { + return "light"; + } + case "dark": + { + return "dark"; + } + default: + { + if (typeof stored === "string") { + storageContext.set(STORAGE_KEY, ""); + } + return defaultTheme; + } + } + }; + $[0] = defaultTheme; + $[1] = storageContext; + $[2] = t1; + } else { + t1 = $[2]; + } + const [theme, setThemeInternal] = React.useState(t1); + let t2; + let t3; + if ($[3] !== theme) { + t2 = () => { + if (typeof window === "undefined") { + return; + } + document.body.classList.remove("graphiql-light", "graphiql-dark"); + if (theme) { + document.body.classList.add(`graphiql-${theme}`); + } + }; + t3 = [theme]; + $[3] = theme; + $[4] = t2; + $[5] = t3; + } else { + t2 = $[4]; + t3 = $[5]; + } + React.useLayoutEffect(t2, t3); + let t4; + if ($[6] !== storageContext) { + t4 = newTheme => { + storageContext == null ? void 0 : storageContext.set(STORAGE_KEY, newTheme || ""); + setThemeInternal(newTheme); + }; + $[6] = storageContext; + $[7] = t4; + } else { + t4 = $[7]; + } + const setTheme = t4; + let t5; + if ($[8] !== setTheme || $[9] !== theme) { + t5 = { + theme, + setTheme + }; + $[8] = setTheme; + $[9] = theme; + $[10] = t5; + } else { + t5 = $[10]; + } + return t5; } const STORAGE_KEY = "theme"; -function useDragResize({ - defaultSizeRelation = DEFAULT_FLEX, - direction, - initiallyHidden, - onHiddenElementChange, - sizeThresholdFirst = 100, - sizeThresholdSecond = 100, - storageKey -}) { +function useDragResize(t0) { + const $ = reactCompilerRuntime.c(31); + const { + defaultSizeRelation: t1, + direction, + initiallyHidden, + onHiddenElementChange, + sizeThresholdFirst: t2, + sizeThresholdSecond: t3, + storageKey + } = t0; + const defaultSizeRelation = t1 === void 0 ? DEFAULT_FLEX : t1; + const sizeThresholdFirst = t2 === void 0 ? 100 : t2; + const sizeThresholdSecond = t3 === void 0 ? 100 : t3; const storage = useStorageContext(); - const store = React.useMemo(() => debounce(500, value => { - if (storageKey) { - storage == null ? void 0 : storage.set(storageKey, value); - } - }), [storage, storageKey]); - const [hiddenElement, setHiddenElement] = React.useState(() => { - const storedValue = storageKey && (storage == null ? void 0 : storage.get(storageKey)); - if (storedValue === HIDE_FIRST || initiallyHidden === "first") { - return "first"; - } - if (storedValue === HIDE_SECOND || initiallyHidden === "second") { - return "second"; - } - return null; - }); - const setHiddenElementWithCallback = React.useCallback(element => { - if (element !== hiddenElement) { - setHiddenElement(element); - onHiddenElementChange == null ? void 0 : onHiddenElementChange(element); - } - }, [hiddenElement, onHiddenElementChange]); + let t4; + if ($[0] !== storage || $[1] !== storageKey) { + t4 = debounce(500, value => { + if (storageKey) { + storage == null ? void 0 : storage.set(storageKey, value); + } + }); + $[0] = storage; + $[1] = storageKey; + $[2] = t4; + } else { + t4 = $[2]; + } + const store = t4; + let t5; + if ($[3] !== initiallyHidden || $[4] !== storage || $[5] !== storageKey) { + t5 = () => { + const storedValue = storageKey && (storage == null ? void 0 : storage.get(storageKey)); + if (storedValue === HIDE_FIRST || initiallyHidden === "first") { + return "first"; + } + if (storedValue === HIDE_SECOND || initiallyHidden === "second") { + return "second"; + } + return null; + }; + $[3] = initiallyHidden; + $[4] = storage; + $[5] = storageKey; + $[6] = t5; + } else { + t5 = $[6]; + } + const [hiddenElement, setHiddenElement] = React.useState(t5); + let t6; + if ($[7] !== hiddenElement || $[8] !== onHiddenElementChange) { + t6 = element => { + if (element !== hiddenElement) { + setHiddenElement(element); + onHiddenElementChange == null ? void 0 : onHiddenElementChange(element); + } + }; + $[7] = hiddenElement; + $[8] = onHiddenElementChange; + $[9] = t6; + } else { + t6 = $[9]; + } + const setHiddenElementWithCallback = t6; const firstRef = React.useRef(null); const dragBarRef = React.useRef(null); const secondRef = React.useRef(null); const defaultFlexRef = React.useRef(`${defaultSizeRelation}`); - React.useLayoutEffect(() => { - const storedValue = storageKey && (storage == null ? void 0 : storage.get(storageKey)) || defaultFlexRef.current; - if (firstRef.current) { - firstRef.current.style.display = "flex"; - firstRef.current.style.flex = storedValue === HIDE_FIRST || storedValue === HIDE_SECOND ? defaultFlexRef.current : storedValue; - } - if (secondRef.current) { - secondRef.current.style.display = "flex"; - secondRef.current.style.flex = "1"; - } - if (dragBarRef.current) { - dragBarRef.current.style.display = "flex"; - } - }, [direction, storage, storageKey]); - const hide = React.useCallback(resizableElement => { - const element = resizableElement === "first" ? firstRef.current : secondRef.current; - if (!element) { - return; - } - element.style.left = "-1000px"; - element.style.position = "absolute"; - element.style.opacity = "0"; - element.style.height = "500px"; - element.style.width = "500px"; - if (firstRef.current) { - const flex = parseFloat(firstRef.current.style.flex); - if (!Number.isFinite(flex) || flex < 1) { - firstRef.current.style.flex = "1"; - } - } - }, []); - const show = React.useCallback(resizableElement => { - const element = resizableElement === "first" ? firstRef.current : secondRef.current; - if (!element) { - return; - } - element.style.width = ""; - element.style.height = ""; - element.style.opacity = ""; - element.style.position = ""; - element.style.left = ""; - if (storage && storageKey) { - const storedValue = storage.get(storageKey); - if (firstRef.current && storedValue !== HIDE_FIRST && storedValue !== HIDE_SECOND) { - firstRef.current.style.flex = storedValue || defaultFlexRef.current; - } - } - }, [storage, storageKey]); - React.useLayoutEffect(() => { - if (hiddenElement === "first") { - hide("first"); - } else { - show("first"); - } - if (hiddenElement === "second") { - hide("second"); - } else { - show("second"); - } - }, [hiddenElement, hide, show]); - React.useEffect(() => { - if (!dragBarRef.current || !firstRef.current || !secondRef.current) { - return; - } - const dragBarContainer = dragBarRef.current; - const firstContainer = firstRef.current; - const wrapper = firstContainer.parentElement; - const eventProperty = direction === "horizontal" ? "clientX" : "clientY"; - const rectProperty = direction === "horizontal" ? "left" : "top"; - const adjacentRectProperty = direction === "horizontal" ? "right" : "bottom"; - const sizeProperty = direction === "horizontal" ? "clientWidth" : "clientHeight"; - function handleMouseDown(downEvent) { - downEvent.preventDefault(); - const offset = downEvent[eventProperty] - dragBarContainer.getBoundingClientRect()[rectProperty]; - function handleMouseMove(moveEvent) { - if (moveEvent.buttons === 0) { - return handleMouseUp(); - } - const firstSize = moveEvent[eventProperty] - wrapper.getBoundingClientRect()[rectProperty] - offset; - const secondSize = wrapper.getBoundingClientRect()[adjacentRectProperty] - moveEvent[eventProperty] + offset - dragBarContainer[sizeProperty]; - if (firstSize < sizeThresholdFirst) { - setHiddenElementWithCallback("first"); - store(HIDE_FIRST); - } else if (secondSize < sizeThresholdSecond) { - setHiddenElementWithCallback("second"); - store(HIDE_SECOND); - } else { - setHiddenElementWithCallback(null); - const newFlex = `${firstSize / secondSize}`; - firstContainer.style.flex = newFlex; - store(newFlex); - } - } - function handleMouseUp() { - document.removeEventListener("mousemove", handleMouseMove); - document.removeEventListener("mouseup", handleMouseUp); - } - document.addEventListener("mousemove", handleMouseMove); - document.addEventListener("mouseup", handleMouseUp); - } - dragBarContainer.addEventListener("mousedown", handleMouseDown); - function reset() { + let t7; + if ($[10] !== storage || $[11] !== storageKey) { + t7 = () => { + const storedValue_0 = storageKey && (storage == null ? void 0 : storage.get(storageKey)) || defaultFlexRef.current; if (firstRef.current) { - firstRef.current.style.flex = defaultFlexRef.current; + firstRef.current.style.display = "flex"; + firstRef.current.style.flex = storedValue_0 === HIDE_FIRST || storedValue_0 === HIDE_SECOND ? defaultFlexRef.current : storedValue_0; + } + if (secondRef.current) { + secondRef.current.style.display = "flex"; + secondRef.current.style.flex = "1"; + } + if (dragBarRef.current) { + dragBarRef.current.style.display = "flex"; } - store(defaultFlexRef.current); - setHiddenElementWithCallback(null); - } - dragBarContainer.addEventListener("dblclick", reset); - return () => { - dragBarContainer.removeEventListener("mousedown", handleMouseDown); - dragBarContainer.removeEventListener("dblclick", reset); }; - }, [direction, setHiddenElementWithCallback, sizeThresholdFirst, sizeThresholdSecond, store]); - return React.useMemo(() => ({ - dragBarRef, - hiddenElement, - firstRef, - setHiddenElement, - secondRef - }), [hiddenElement, setHiddenElement]); + $[10] = storage; + $[11] = storageKey; + $[12] = t7; + } else { + t7 = $[12]; + } + let t8; + if ($[13] !== direction || $[14] !== storage || $[15] !== storageKey) { + t8 = [direction, storage, storageKey]; + $[13] = direction; + $[14] = storage; + $[15] = storageKey; + $[16] = t8; + } else { + t8 = $[16]; + } + React.useLayoutEffect(t7, t8); + let t10; + let t9; + if ($[17] !== hiddenElement || $[18] !== storage || $[19] !== storageKey) { + t9 = () => { + const hide = resizableElement => { + const element_0 = resizableElement === "first" ? firstRef.current : secondRef.current; + if (!element_0) { + return; + } + element_0.style.left = "-1000px"; + element_0.style.position = "absolute"; + element_0.style.opacity = "0"; + element_0.style.height = "500px"; + element_0.style.width = "500px"; + if (firstRef.current) { + const flex = parseFloat(firstRef.current.style.flex); + if (!Number.isFinite(flex) || flex < 1) { + firstRef.current.style.flex = "1"; + } + } + }; + const show = resizableElement_0 => { + const element_1 = resizableElement_0 === "first" ? firstRef.current : secondRef.current; + if (!element_1) { + return; + } + element_1.style.width = ""; + element_1.style.height = ""; + element_1.style.opacity = ""; + element_1.style.position = ""; + element_1.style.left = ""; + if (storage && storageKey) { + const storedValue_1 = storage.get(storageKey); + if (firstRef.current && storedValue_1 !== HIDE_FIRST && storedValue_1 !== HIDE_SECOND) { + firstRef.current.style.flex = storedValue_1 || defaultFlexRef.current; + } + } + }; + if (hiddenElement === "first") { + hide("first"); + } else { + show("first"); + } + if (hiddenElement === "second") { + hide("second"); + } else { + show("second"); + } + }; + t10 = [hiddenElement, storage, storageKey]; + $[17] = hiddenElement; + $[18] = storage; + $[19] = storageKey; + $[20] = t10; + $[21] = t9; + } else { + t10 = $[20]; + t9 = $[21]; + } + React.useLayoutEffect(t9, t10); + let t11; + let t12; + if ($[22] !== direction || $[23] !== setHiddenElementWithCallback || $[24] !== sizeThresholdFirst || $[25] !== sizeThresholdSecond || $[26] !== store) { + t11 = () => { + if (!dragBarRef.current || !firstRef.current || !secondRef.current) { + return; + } + const dragBarContainer = dragBarRef.current; + const firstContainer = firstRef.current; + const wrapper = firstContainer.parentElement; + const eventProperty = direction === "horizontal" ? "clientX" : "clientY"; + const rectProperty = direction === "horizontal" ? "left" : "top"; + const adjacentRectProperty = direction === "horizontal" ? "right" : "bottom"; + const sizeProperty = direction === "horizontal" ? "clientWidth" : "clientHeight"; + const handleMouseDown = function handleMouseDown2(downEvent) { + downEvent.preventDefault(); + const offset = downEvent[eventProperty] - dragBarContainer.getBoundingClientRect()[rectProperty]; + const handleMouseMove = function handleMouseMove2(moveEvent) { + if (moveEvent.buttons === 0) { + return handleMouseUp(); + } + const firstSize = moveEvent[eventProperty] - wrapper.getBoundingClientRect()[rectProperty] - offset; + const secondSize = wrapper.getBoundingClientRect()[adjacentRectProperty] - moveEvent[eventProperty] + offset - dragBarContainer[sizeProperty]; + if (firstSize < sizeThresholdFirst) { + setHiddenElementWithCallback("first"); + store(HIDE_FIRST); + } else { + if (secondSize < sizeThresholdSecond) { + setHiddenElementWithCallback("second"); + store(HIDE_SECOND); + } else { + setHiddenElementWithCallback(null); + const newFlex = `${firstSize / secondSize}`; + firstContainer.style.flex = newFlex; + store(newFlex); + } + } + }; + function handleMouseUp() { + document.removeEventListener("mousemove", handleMouseMove); + document.removeEventListener("mouseup", handleMouseUp); + } + document.addEventListener("mousemove", handleMouseMove); + document.addEventListener("mouseup", handleMouseUp); + }; + dragBarContainer.addEventListener("mousedown", handleMouseDown); + const reset = function reset2() { + if (firstRef.current) { + firstRef.current.style.flex = defaultFlexRef.current; + } + store(defaultFlexRef.current); + setHiddenElementWithCallback(null); + }; + dragBarContainer.addEventListener("dblclick", reset); + return () => { + dragBarContainer.removeEventListener("mousedown", handleMouseDown); + dragBarContainer.removeEventListener("dblclick", reset); + }; + }; + t12 = [direction, setHiddenElementWithCallback, sizeThresholdFirst, sizeThresholdSecond, store]; + $[22] = direction; + $[23] = setHiddenElementWithCallback; + $[24] = sizeThresholdFirst; + $[25] = sizeThresholdSecond; + $[26] = store; + $[27] = t11; + $[28] = t12; + } else { + t11 = $[27]; + t12 = $[28]; + } + React.useEffect(t11, t12); + let t13; + if ($[29] !== hiddenElement) { + t13 = { + dragBarRef, + hiddenElement, + firstRef, + setHiddenElement, + secondRef + }; + $[29] = hiddenElement; + $[30] = t13; + } else { + t13 = $[30]; + } + return t13; } const DEFAULT_FLEX = 1; const HIDE_FIRST = "hide-first"; const HIDE_SECOND = "hide-second"; -const ToolbarButton = React.forwardRef(({ - label, - onClick, - ...props -}, ref) => { +const ToolbarButton = React.forwardRef((t0, ref) => { + const $ = reactCompilerRuntime.c(19); + let label; + let onClick; + let props; + if ($[0] !== t0) { + ({ + label, + onClick, + ...props + } = t0); + $[0] = t0; + $[1] = label; + $[2] = onClick; + $[3] = props; + } else { + label = $[1]; + onClick = $[2]; + props = $[3]; + } const [error, setError] = React.useState(null); - const handleClick = React.useCallback(event => { - try { - onClick == null ? void 0 : onClick(event); - setError(null); - } catch (err) { - setError(err instanceof Error ? err : new Error(`Toolbar button click failed: ${err}`)); - } - }, [onClick]); - return /* @__PURE__ */jsxRuntime.jsx(Tooltip, { - label, - children: /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { + let t1; + if ($[4] !== onClick) { + t1 = event => { + try { + if (onClick) { + onClick(event); + } + setError(null); + } catch (t22) { + const err = t22; + setError(err instanceof Error ? err : new Error(`Toolbar button click failed: ${err}`)); + } + }; + $[4] = onClick; + $[5] = t1; + } else { + t1 = $[5]; + } + const handleClick = t1; + const t2 = error && "error"; + let t3; + if ($[6] !== props.className || $[7] !== t2) { + t3 = clsx.clsx("graphiql-toolbar-button", t2, props.className); + $[6] = props.className; + $[7] = t2; + $[8] = t3; + } else { + t3 = $[8]; + } + const t4 = error ? error.message : label; + const t5 = error ? "true" : props["aria-invalid"]; + let t6; + if ($[9] !== handleClick || $[10] !== props || $[11] !== ref || $[12] !== t3 || $[13] !== t4 || $[14] !== t5) { + t6 = /* @__PURE__ */jsxRuntime.jsx(UnStyledButton, { ...props, ref, type: "button", - className: clsx.clsx("graphiql-toolbar-button", error && "error", props.className), + className: t3, onClick: handleClick, - "aria-label": error ? error.message : label, - "aria-invalid": error ? "true" : props["aria-invalid"] - }) - }); + "aria-label": t4, + "aria-invalid": t5 + }); + $[9] = handleClick; + $[10] = props; + $[11] = ref; + $[12] = t3; + $[13] = t4; + $[14] = t5; + $[15] = t6; + } else { + t6 = $[15]; + } + let t7; + if ($[16] !== label || $[17] !== t6) { + t7 = /* @__PURE__ */jsxRuntime.jsx(Tooltip, { + label, + children: t6 + }); + $[16] = label; + $[17] = t6; + $[18] = t7; + } else { + t7 = $[18]; + } + return t7; }); ToolbarButton.displayName = "ToolbarButton"; function ExecuteButton() { + const $ = reactCompilerRuntime.c(19); + let t0; + if ($[0] === Symbol.for("react.memo_cache_sentinel")) { + t0 = { + nonNull: true, + caller: ExecuteButton + }; + $[0] = t0; + } else { + t0 = $[0]; + } const { queryEditor, setOperationName - } = useEditorContext({ - nonNull: true, - caller: ExecuteButton - }); + } = useEditorContext(t0); + let t1; + if ($[1] === Symbol.for("react.memo_cache_sentinel")) { + t1 = { + nonNull: true, + caller: ExecuteButton + }; + $[1] = t1; + } else { + t1 = $[1]; + } const { isFetching, isSubscribed, operationName, run, stop - } = useExecutionContext({ - nonNull: true, - caller: ExecuteButton - }); - const operations = (queryEditor == null ? void 0 : queryEditor.operations) || []; + } = useExecutionContext(t1); + let t2; + if ($[2] !== (queryEditor == null ? void 0 : queryEditor.operations)) { + t2 = (queryEditor == null ? void 0 : queryEditor.operations) || []; + $[2] = queryEditor == null ? void 0 : queryEditor.operations; + $[3] = t2; + } else { + t2 = $[3]; + } + const operations = t2; const hasOptions = operations.length > 1 && typeof operationName !== "string"; const isRunning = isFetching || isSubscribed; const label = `${isRunning ? "Stop" : "Execute"} query (Ctrl-Enter)`; - const buttonProps = { - type: "button", - className: "graphiql-execute-button", - children: isRunning ? /* @__PURE__ */jsxRuntime.jsx(StopIcon, {}) : /* @__PURE__ */jsxRuntime.jsx(PlayIcon, {}), - "aria-label": label - }; - return hasOptions && !isRunning ? /* @__PURE__ */jsxRuntime.jsxs(DropdownMenu, { - children: [/* @__PURE__ */jsxRuntime.jsx(Tooltip, { + let t3; + if ($[4] !== isRunning) { + t3 = isRunning ? /* @__PURE__ */jsxRuntime.jsx(StopIcon, {}) : /* @__PURE__ */jsxRuntime.jsx(PlayIcon, {}); + $[4] = isRunning; + $[5] = t3; + } else { + t3 = $[5]; + } + let t4; + if ($[6] !== label || $[7] !== t3) { + t4 = { + type: "button", + className: "graphiql-execute-button", + children: t3, + "aria-label": label + }; + $[6] = label; + $[7] = t3; + $[8] = t4; + } else { + t4 = $[8]; + } + const buttonProps = t4; + let t5; + if ($[9] !== buttonProps || $[10] !== hasOptions || $[11] !== isRunning || $[12] !== label || $[13] !== operations || $[14] !== queryEditor || $[15] !== run || $[16] !== setOperationName || $[17] !== stop) { + t5 = hasOptions && !isRunning ? /* @__PURE__ */jsxRuntime.jsxs(DropdownMenu, { + children: [/* @__PURE__ */jsxRuntime.jsx(Tooltip, { + label, + children: /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Button, { + ...buttonProps + }) + }), /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Content, { + children: operations.map((operation, i) => { + const opName = operation.name ? operation.name.value : ``; + return /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Item, { + onSelect: () => { + var _a; + const selectedOperationName = (_a = operation.name) == null ? void 0 : _a.value; + if (queryEditor && selectedOperationName && selectedOperationName !== queryEditor.operationName) { + setOperationName(selectedOperationName); + } + run(); + }, + children: opName + }, `${opName}-${i}`); + }) + })] + }) : /* @__PURE__ */jsxRuntime.jsx(Tooltip, { label, - children: /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Button, { - ...buttonProps - }) - }), /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Content, { - children: operations.map((operation, i) => { - const opName = operation.name ? operation.name.value : ``; - return /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Item, { - onSelect: () => { - var _a; - const selectedOperationName = (_a = operation.name) == null ? void 0 : _a.value; - if (queryEditor && selectedOperationName && selectedOperationName !== queryEditor.operationName) { - setOperationName(selectedOperationName); - } + children: /* @__PURE__ */jsxRuntime.jsx("button", { + ...buttonProps, + onClick: () => { + if (isRunning) { + stop(); + } else { run(); - }, - children: opName - }, `${opName}-${i}`); - }) - })] - }) : /* @__PURE__ */jsxRuntime.jsx(Tooltip, { - label, - children: /* @__PURE__ */jsxRuntime.jsx("button", { - ...buttonProps, - onClick: () => { - if (isRunning) { - stop(); - } else { - run(); + } } - } - }) - }); + }) + }); + $[9] = buttonProps; + $[10] = hasOptions; + $[11] = isRunning; + $[12] = label; + $[13] = operations; + $[14] = queryEditor; + $[15] = run; + $[16] = setOperationName; + $[17] = stop; + $[18] = t5; + } else { + t5 = $[18]; + } + return t5; } -const ToolbarMenuRoot = ({ - button, - children, - label, - ...props -}) => /* @__PURE__ */jsxRuntime.jsxs(DropdownMenu, { - ...props, - children: [/* @__PURE__ */jsxRuntime.jsx(Tooltip, { - label, - children: /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Button, { - className: clsx.clsx("graphiql-un-styled graphiql-toolbar-menu", props.className), +const ToolbarMenuRoot = t0 => { + const $ = reactCompilerRuntime.c(20); + let button; + let children; + let label; + let props; + if ($[0] !== t0) { + ({ + button, + children, + label, + ...props + } = t0); + $[0] = t0; + $[1] = button; + $[2] = children; + $[3] = label; + $[4] = props; + } else { + button = $[1]; + children = $[2]; + label = $[3]; + props = $[4]; + } + let t1; + if ($[5] !== props.className) { + t1 = clsx.clsx("graphiql-un-styled graphiql-toolbar-menu", props.className); + $[5] = props.className; + $[6] = t1; + } else { + t1 = $[6]; + } + let t2; + if ($[7] !== button || $[8] !== label || $[9] !== t1) { + t2 = /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Button, { + className: t1, "aria-label": label, children: button - }) - }), /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Content, { - children - })] -}); + }); + $[7] = button; + $[8] = label; + $[9] = t1; + $[10] = t2; + } else { + t2 = $[10]; + } + let t3; + if ($[11] !== label || $[12] !== t2) { + t3 = /* @__PURE__ */jsxRuntime.jsx(Tooltip, { + label, + children: t2 + }); + $[11] = label; + $[12] = t2; + $[13] = t3; + } else { + t3 = $[13]; + } + let t4; + if ($[14] !== children) { + t4 = /* @__PURE__ */jsxRuntime.jsx(DropdownMenu.Content, { + children + }); + $[14] = children; + $[15] = t4; + } else { + t4 = $[15]; + } + let t5; + if ($[16] !== props || $[17] !== t3 || $[18] !== t4) { + t5 = /* @__PURE__ */jsxRuntime.jsxs(DropdownMenu, { + ...props, + children: [t3, t4] + }); + $[16] = props; + $[17] = t3; + $[18] = t4; + $[19] = t5; + } else { + t5 = $[19]; + } + return t5; +}; const ToolbarMenu = createComponentGroup(ToolbarMenuRoot, { Item: DropdownMenu.Item }); @@ -73311,4833 +83409,13 @@ exports.useVariablesEditorState = useVariablesEditorState; /***/ }), -/***/ "../../graphiql-react/dist/info-addon.cjs.js": -/*!***************************************************!*\ - !*** ../../graphiql-react/dist/info-addon.cjs.js ***! - \***************************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -codemirror.CodeMirror.defineOption("info", false, (cm, options, old) => { - if (old && old !== codemirror.CodeMirror.Init) { - const oldOnMouseOver = cm.state.info.onMouseOver; - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseover", oldOnMouseOver); - clearTimeout(cm.state.info.hoverTimeout); - delete cm.state.info; - } - if (options) { - const state = cm.state.info = createState(options); - state.onMouseOver = onMouseOver.bind(null, cm); - codemirror.CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver); - } -}); -function createState(options) { - return { - options: options instanceof Function ? { - render: options - } : options === true ? {} : options - }; -} -function getHoverTime(cm) { - const { - options - } = cm.state.info; - return (options === null || options === void 0 ? void 0 : options.hoverTime) || 500; -} -function onMouseOver(cm, e) { - const state = cm.state.info; - const target = e.target || e.srcElement; - if (!(target instanceof HTMLElement)) { - return; - } - if (target.nodeName !== "SPAN" || state.hoverTimeout !== void 0) { - return; - } - const box = target.getBoundingClientRect(); - const onMouseMove = function () { - clearTimeout(state.hoverTimeout); - state.hoverTimeout = setTimeout(onHover, hoverTime); - }; - const onMouseOut = function () { - codemirror.CodeMirror.off(document, "mousemove", onMouseMove); - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseout", onMouseOut); - clearTimeout(state.hoverTimeout); - state.hoverTimeout = void 0; - }; - const onHover = function () { - codemirror.CodeMirror.off(document, "mousemove", onMouseMove); - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseout", onMouseOut); - state.hoverTimeout = void 0; - onMouseHover(cm, box); - }; - const hoverTime = getHoverTime(cm); - state.hoverTimeout = setTimeout(onHover, hoverTime); - codemirror.CodeMirror.on(document, "mousemove", onMouseMove); - codemirror.CodeMirror.on(cm.getWrapperElement(), "mouseout", onMouseOut); -} -function onMouseHover(cm, box) { - const pos = cm.coordsChar({ - left: (box.left + box.right) / 2, - top: (box.top + box.bottom) / 2 - }, "window"); - const state = cm.state.info; - const { - options - } = state; - const render = options.render || cm.getHelper(pos, "info"); - if (render) { - const token = cm.getTokenAt(pos, true); - if (token) { - const info = render(token, options, cm, pos); - if (info) { - showPopup(cm, box, info); - } - } - } -} -function showPopup(cm, box, info) { - const popup = document.createElement("div"); - popup.className = "CodeMirror-info"; - popup.append(info); - document.body.append(popup); - const popupBox = popup.getBoundingClientRect(); - const popupStyle = window.getComputedStyle(popup); - const popupWidth = popupBox.right - popupBox.left + parseFloat(popupStyle.marginLeft) + parseFloat(popupStyle.marginRight); - const popupHeight = popupBox.bottom - popupBox.top + parseFloat(popupStyle.marginTop) + parseFloat(popupStyle.marginBottom); - let topPos = box.bottom; - if (popupHeight > window.innerHeight - box.bottom - 15 && box.top > window.innerHeight - box.bottom) { - topPos = box.top - popupHeight; - } - if (topPos < 0) { - topPos = box.bottom; - } - let leftPos = Math.max(0, window.innerWidth - popupWidth - 15); - if (leftPos > box.left) { - leftPos = box.left; - } - popup.style.opacity = "1"; - popup.style.top = topPos + "px"; - popup.style.left = leftPos + "px"; - let popupTimeout; - const onMouseOverPopup = function () { - clearTimeout(popupTimeout); - }; - const onMouseOut = function () { - clearTimeout(popupTimeout); - popupTimeout = setTimeout(hidePopup, 200); - }; - const hidePopup = function () { - codemirror.CodeMirror.off(popup, "mouseover", onMouseOverPopup); - codemirror.CodeMirror.off(popup, "mouseout", onMouseOut); - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseout", onMouseOut); - if (popup.style.opacity) { - popup.style.opacity = "0"; - setTimeout(() => { - if (popup.parentNode) { - popup.remove(); - } - }, 600); - } else if (popup.parentNode) { - popup.remove(); - } - }; - codemirror.CodeMirror.on(popup, "mouseover", onMouseOverPopup); - codemirror.CodeMirror.on(popup, "mouseout", onMouseOut); - codemirror.CodeMirror.on(cm.getWrapperElement(), "mouseout", onMouseOut); -} - -/***/ }), - -/***/ "../../graphiql-react/dist/info.cjs.js": -/*!*********************************************!*\ - !*** ../../graphiql-react/dist/info.cjs.js ***! - \*********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const SchemaReference = __webpack_require__(/*! ./SchemaReference.cjs.js */ "../../graphiql-react/dist/SchemaReference.cjs.js"); -__webpack_require__(/*! ./info-addon.cjs.js */ "../../graphiql-react/dist/info-addon.cjs.js"); -codemirror.CodeMirror.registerHelper("info", "graphql", (token, options) => { - var _a; - if (!options.schema || !token.state) { - return; - } - const { - kind, - step - } = token.state; - const typeInfo = SchemaReference.getTypeInfo(options.schema, token.state); - if (kind === "Field" && step === 0 && typeInfo.fieldDef || kind === "AliasedField" && step === 2 && typeInfo.fieldDef || kind === "ObjectField" && step === 0 && typeInfo.fieldDef) { - const header = document.createElement("div"); - header.className = "CodeMirror-info-header"; - renderField(header, typeInfo, options); - const into = document.createElement("div"); - into.append(header); - renderDescription(into, options, typeInfo.fieldDef); - return into; - } - if (kind === "Directive" && step === 1 && typeInfo.directiveDef) { - const header = document.createElement("div"); - header.className = "CodeMirror-info-header"; - renderDirective(header, typeInfo, options); - const into = document.createElement("div"); - into.append(header); - renderDescription(into, options, typeInfo.directiveDef); - return into; - } - if (kind === "Argument" && step === 0 && typeInfo.argDef) { - const header = document.createElement("div"); - header.className = "CodeMirror-info-header"; - renderArg(header, typeInfo, options); - const into = document.createElement("div"); - into.append(header); - renderDescription(into, options, typeInfo.argDef); - return into; - } - if (kind === "EnumValue" && ((_a = typeInfo.enumValue) === null || _a === void 0 ? void 0 : _a.description)) { - const header = document.createElement("div"); - header.className = "CodeMirror-info-header"; - renderEnumValue(header, typeInfo, options); - const into = document.createElement("div"); - into.append(header); - renderDescription(into, options, typeInfo.enumValue); - return into; - } - if (kind === "NamedType" && typeInfo.type && typeInfo.type.description) { - const header = document.createElement("div"); - header.className = "CodeMirror-info-header"; - renderType(header, typeInfo, options, typeInfo.type); - const into = document.createElement("div"); - into.append(header); - renderDescription(into, options, typeInfo.type); - return into; - } -}); -function renderField(into, typeInfo, options) { - renderQualifiedField(into, typeInfo, options); - renderTypeAnnotation(into, typeInfo, options, typeInfo.type); -} -function renderQualifiedField(into, typeInfo, options) { - var _a; - const fieldName = ((_a = typeInfo.fieldDef) === null || _a === void 0 ? void 0 : _a.name) || ""; - text(into, fieldName, "field-name", options, SchemaReference.getFieldReference(typeInfo)); -} -function renderDirective(into, typeInfo, options) { - var _a; - const name = "@" + (((_a = typeInfo.directiveDef) === null || _a === void 0 ? void 0 : _a.name) || ""); - text(into, name, "directive-name", options, SchemaReference.getDirectiveReference(typeInfo)); -} -function renderArg(into, typeInfo, options) { - var _a; - const name = ((_a = typeInfo.argDef) === null || _a === void 0 ? void 0 : _a.name) || ""; - text(into, name, "arg-name", options, SchemaReference.getArgumentReference(typeInfo)); - renderTypeAnnotation(into, typeInfo, options, typeInfo.inputType); -} -function renderEnumValue(into, typeInfo, options) { - var _a; - const name = ((_a = typeInfo.enumValue) === null || _a === void 0 ? void 0 : _a.name) || ""; - renderType(into, typeInfo, options, typeInfo.inputType); - text(into, "."); - text(into, name, "enum-value", options, SchemaReference.getEnumValueReference(typeInfo)); -} -function renderTypeAnnotation(into, typeInfo, options, t) { - const typeSpan = document.createElement("span"); - typeSpan.className = "type-name-pill"; - if (t instanceof graphql.GraphQLNonNull) { - renderType(typeSpan, typeInfo, options, t.ofType); - text(typeSpan, "!"); - } else if (t instanceof graphql.GraphQLList) { - text(typeSpan, "["); - renderType(typeSpan, typeInfo, options, t.ofType); - text(typeSpan, "]"); - } else { - text(typeSpan, (t === null || t === void 0 ? void 0 : t.name) || "", "type-name", options, SchemaReference.getTypeReference(typeInfo, t)); - } - into.append(typeSpan); -} -function renderType(into, typeInfo, options, t) { - if (t instanceof graphql.GraphQLNonNull) { - renderType(into, typeInfo, options, t.ofType); - text(into, "!"); - } else if (t instanceof graphql.GraphQLList) { - text(into, "["); - renderType(into, typeInfo, options, t.ofType); - text(into, "]"); - } else { - text(into, (t === null || t === void 0 ? void 0 : t.name) || "", "type-name", options, SchemaReference.getTypeReference(typeInfo, t)); - } -} -function renderDescription(into, options, def) { - const { - description - } = def; - if (description) { - const descriptionDiv = document.createElement("div"); - descriptionDiv.className = "info-description"; - if (options.renderDescription) { - descriptionDiv.innerHTML = options.renderDescription(description); - } else { - descriptionDiv.append(document.createTextNode(description)); - } - into.append(descriptionDiv); - } - renderDeprecation(into, options, def); -} -function renderDeprecation(into, options, def) { - const reason = def.deprecationReason; - if (reason) { - const deprecationDiv = document.createElement("div"); - deprecationDiv.className = "info-deprecation"; - into.append(deprecationDiv); - const label = document.createElement("span"); - label.className = "info-deprecation-label"; - label.append(document.createTextNode("Deprecated")); - deprecationDiv.append(label); - const reasonDiv = document.createElement("div"); - reasonDiv.className = "info-deprecation-reason"; - if (options.renderDescription) { - reasonDiv.innerHTML = options.renderDescription(reason); - } else { - reasonDiv.append(document.createTextNode(reason)); - } - deprecationDiv.append(reasonDiv); - } -} -function text(into, content, className = "", options = { - onClick: null -}, ref = null) { - if (className) { - const { - onClick - } = options; - let node; - if (onClick) { - node = document.createElement("a"); - node.href = "javascript:void 0"; - node.addEventListener("click", e => { - e.preventDefault(); - onClick(ref, e); - }); - } else { - node = document.createElement("span"); - } - node.className = className; - node.append(document.createTextNode(content)); - into.append(node); - } else { - into.append(document.createTextNode(content)); - } -} - -/***/ }), - -/***/ "../../graphiql-react/dist/javascript.cjs.js": -/*!***************************************************!*\ - !*** ../../graphiql-react/dist/javascript.cjs.js ***! - \***************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var javascript$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - CodeMirror.defineMode("javascript", function (config, parserConfig) { - var indentUnit = config.indentUnit; - var statementIndent = parserConfig.statementIndent; - var jsonldMode = parserConfig.jsonld; - var jsonMode = parserConfig.json || jsonldMode; - var trackScope = parserConfig.trackScope !== false; - var isTS = parserConfig.typescript; - var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/; - var keywords = function () { - function kw(type2) { - return { - type: type2, - style: "keyword" - }; - } - var A = kw("keyword a"), - B = kw("keyword b"), - C = kw("keyword c"), - D = kw("keyword d"); - var operator = kw("operator"), - atom = { - type: "atom", - style: "atom" - }; - return { - "if": kw("if"), - "while": A, - "with": A, - "else": B, - "do": B, - "try": B, - "finally": B, - "return": D, - "break": D, - "continue": D, - "new": kw("new"), - "delete": C, - "void": C, - "throw": C, - "debugger": kw("debugger"), - "var": kw("var"), - "const": kw("var"), - "let": kw("var"), - "function": kw("function"), - "catch": kw("catch"), - "for": kw("for"), - "switch": kw("switch"), - "case": kw("case"), - "default": kw("default"), - "in": operator, - "typeof": operator, - "instanceof": operator, - "true": atom, - "false": atom, - "null": atom, - "undefined": atom, - "NaN": atom, - "Infinity": atom, - "this": kw("this"), - "class": kw("class"), - "super": kw("atom"), - "yield": C, - "export": kw("export"), - "import": kw("import"), - "extends": C, - "await": C - }; - }(); - var isOperatorChar = /[+\-*&%=<>!?|~^@]/; - var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/; - function readRegexp(stream) { - var escaped = false, - next, - inSet = false; - while ((next = stream.next()) != null) { - if (!escaped) { - if (next == "/" && !inSet) return; - if (next == "[") inSet = true;else if (inSet && next == "]") inSet = false; - } - escaped = !escaped && next == "\\"; - } - } - var type, content; - function ret(tp, style, cont2) { - type = tp; - content = cont2; - return style; - } - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) { - return ret("number", "number"); - } else if (ch == "." && stream.match("..")) { - return ret("spread", "meta"); - } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - return ret(ch); - } else if (ch == "=" && stream.eat(">")) { - return ret("=>", "operator"); - } else if (ch == "0" && stream.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/)) { - return ret("number", "number"); - } else if (/\d/.test(ch)) { - stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/); - return ret("number", "number"); - } else if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else if (expressionAllowed(stream, state, 1)) { - readRegexp(stream); - stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/); - return ret("regexp", "string-2"); - } else { - stream.eat("="); - return ret("operator", "operator", stream.current()); - } - } else if (ch == "`") { - state.tokenize = tokenQuasi; - return tokenQuasi(stream, state); - } else if (ch == "#" && stream.peek() == "!") { - stream.skipToEnd(); - return ret("meta", "meta"); - } else if (ch == "#" && stream.eatWhile(wordRE)) { - return ret("variable", "property"); - } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->") && !/\S/.test(stream.string.slice(0, stream.start))) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else if (isOperatorChar.test(ch)) { - if (ch != ">" || !state.lexical || state.lexical.type != ">") { - if (stream.eat("=")) { - if (ch == "!" || ch == "=") stream.eat("="); - } else if (/[<>*+\-|&?]/.test(ch)) { - stream.eat(ch); - if (ch == ">") stream.eat(ch); - } - } - if (ch == "?" && stream.eat(".")) return ret("."); - return ret("operator", "operator", stream.current()); - } else if (wordRE.test(ch)) { - stream.eatWhile(wordRE); - var word = stream.current(); - if (state.lastType != ".") { - if (keywords.propertyIsEnumerable(word)) { - var kw = keywords[word]; - return ret(kw.type, kw.style, word); - } - if (word == "async" && stream.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/, false)) return ret("async", "keyword", word); - } - return ret("variable", "variable", word); - } - } - function tokenString(quote) { - return function (stream, state) { - var escaped = false, - next; - if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)) { - state.tokenize = tokenBase; - return ret("jsonld-keyword", "meta"); - } - while ((next = stream.next()) != null) { - if (next == quote && !escaped) break; - escaped = !escaped && next == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return ret("string", "string"); - }; - } - function tokenComment(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = ch == "*"; - } - return ret("comment", "comment"); - } - function tokenQuasi(stream, state) { - var escaped = false, - next; - while ((next = stream.next()) != null) { - if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && next == "\\"; - } - return ret("quasi", "string-2", stream.current()); - } - var brackets = "([{}])"; - function findFatArrow(stream, state) { - if (state.fatArrowAt) state.fatArrowAt = null; - var arrow = stream.string.indexOf("=>", stream.start); - if (arrow < 0) return; - if (isTS) { - var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow)); - if (m) arrow = m.index; - } - var depth = 0, - sawSomething = false; - for (var pos = arrow - 1; pos >= 0; --pos) { - var ch = stream.string.charAt(pos); - var bracket = brackets.indexOf(ch); - if (bracket >= 0 && bracket < 3) { - if (!depth) { - ++pos; - break; - } - if (--depth == 0) { - if (ch == "(") sawSomething = true; - break; - } - } else if (bracket >= 3 && bracket < 6) { - ++depth; - } else if (wordRE.test(ch)) { - sawSomething = true; - } else if (/["'\/`]/.test(ch)) { - for (;; --pos) { - if (pos == 0) return; - var next = stream.string.charAt(pos - 1); - if (next == ch && stream.string.charAt(pos - 2) != "\\") { - pos--; - break; - } - } - } else if (sawSomething && !depth) { - ++pos; - break; - } - } - if (sawSomething && !depth) state.fatArrowAt = pos; - } - var atomicTypes = { - "atom": true, - "number": true, - "variable": true, - "string": true, - "regexp": true, - "this": true, - "import": true, - "jsonld-keyword": true - }; - function JSLexical(indented, column, type2, align, prev, info) { - this.indented = indented; - this.column = column; - this.type = type2; - this.prev = prev; - this.info = info; - if (align != null) this.align = align; - } - function inScope(state, varname) { - if (!trackScope) return false; - for (var v = state.localVars; v; v = v.next) if (v.name == varname) return true; - for (var cx2 = state.context; cx2; cx2 = cx2.prev) { - for (var v = cx2.vars; v; v = v.next) if (v.name == varname) return true; - } - } - function parseJS(state, style, type2, content2, stream) { - var cc = state.cc; - cx.state = state; - cx.stream = stream; - cx.marked = null, cx.cc = cc; - cx.style = style; - if (!state.lexical.hasOwnProperty("align")) state.lexical.align = true; - while (true) { - var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; - if (combinator(type2, content2)) { - while (cc.length && cc[cc.length - 1].lex) cc.pop()(); - if (cx.marked) return cx.marked; - if (type2 == "variable" && inScope(state, content2)) return "variable-2"; - return style; - } - } - } - var cx = { - state: null, - column: null, - marked: null, - cc: null - }; - function pass() { - for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - function inList(name, list) { - for (var v = list; v; v = v.next) if (v.name == name) return true; - return false; - } - function register(varname) { - var state = cx.state; - cx.marked = "def"; - if (!trackScope) return; - if (state.context) { - if (state.lexical.info == "var" && state.context && state.context.block) { - var newContext = registerVarScoped(varname, state.context); - if (newContext != null) { - state.context = newContext; - return; - } - } else if (!inList(varname, state.localVars)) { - state.localVars = new Var(varname, state.localVars); - return; - } - } - if (parserConfig.globalVars && !inList(varname, state.globalVars)) state.globalVars = new Var(varname, state.globalVars); - } - function registerVarScoped(varname, context) { - if (!context) { - return null; - } else if (context.block) { - var inner = registerVarScoped(varname, context.prev); - if (!inner) return null; - if (inner == context.prev) return context; - return new Context(inner, context.vars, true); - } else if (inList(varname, context.vars)) { - return context; - } else { - return new Context(context.prev, new Var(varname, context.vars), false); - } - } - function isModifier(name) { - return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"; - } - function Context(prev, vars, block2) { - this.prev = prev; - this.vars = vars; - this.block = block2; - } - function Var(name, next) { - this.name = name; - this.next = next; - } - var defaultVars = new Var("this", new Var("arguments", null)); - function pushcontext() { - cx.state.context = new Context(cx.state.context, cx.state.localVars, false); - cx.state.localVars = defaultVars; - } - function pushblockcontext() { - cx.state.context = new Context(cx.state.context, cx.state.localVars, true); - cx.state.localVars = null; - } - pushcontext.lex = pushblockcontext.lex = true; - function popcontext() { - cx.state.localVars = cx.state.context.vars; - cx.state.context = cx.state.context.prev; - } - popcontext.lex = true; - function pushlex(type2, info) { - var result = function () { - var state = cx.state, - indent = state.indented; - if (state.lexical.type == "stat") indent = state.lexical.indented;else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev) indent = outer.indented; - state.lexical = new JSLexical(indent, cx.stream.column(), type2, null, state.lexical, info); - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - poplex.lex = true; - function expect(wanted) { - function exp(type2) { - if (type2 == wanted) return cont();else if (wanted == ";" || type2 == "}" || type2 == ")" || type2 == "]") return pass();else return cont(exp); - } - return exp; - } - function statement(type2, value) { - if (type2 == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex); - if (type2 == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex); - if (type2 == "keyword b") return cont(pushlex("form"), statement, poplex); - if (type2 == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex); - if (type2 == "debugger") return cont(expect(";")); - if (type2 == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext); - if (type2 == ";") return cont(); - if (type2 == "if") { - if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex) cx.state.cc.pop()(); - return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse); - } - if (type2 == "function") return cont(functiondef); - if (type2 == "for") return cont(pushlex("form"), pushblockcontext, forspec, statement, popcontext, poplex); - if (type2 == "class" || isTS && value == "interface") { - cx.marked = "keyword"; - return cont(pushlex("form", type2 == "class" ? type2 : value), className, poplex); - } - if (type2 == "variable") { - if (isTS && value == "declare") { - cx.marked = "keyword"; - return cont(statement); - } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) { - cx.marked = "keyword"; - if (value == "enum") return cont(enumdef);else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";"));else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex); - } else if (isTS && value == "namespace") { - cx.marked = "keyword"; - return cont(pushlex("form"), expression, statement, poplex); - } else if (isTS && value == "abstract") { - cx.marked = "keyword"; - return cont(statement); - } else { - return cont(pushlex("stat"), maybelabel); - } - } - if (type2 == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext, block, poplex, poplex, popcontext); - if (type2 == "case") return cont(expression, expect(":")); - if (type2 == "default") return cont(expect(":")); - if (type2 == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext); - if (type2 == "export") return cont(pushlex("stat"), afterExport, poplex); - if (type2 == "import") return cont(pushlex("stat"), afterImport, poplex); - if (type2 == "async") return cont(statement); - if (value == "@") return cont(expression, statement); - return pass(pushlex("stat"), expression, expect(";"), poplex); - } - function maybeCatchBinding(type2) { - if (type2 == "(") return cont(funarg, expect(")")); - } - function expression(type2, value) { - return expressionInner(type2, value, false); - } - function expressionNoComma(type2, value) { - return expressionInner(type2, value, true); - } - function parenExpr(type2) { - if (type2 != "(") return pass(); - return cont(pushlex(")"), maybeexpression, expect(")"), poplex); - } - function expressionInner(type2, value, noComma) { - if (cx.state.fatArrowAt == cx.stream.start) { - var body = noComma ? arrowBodyNoComma : arrowBody; - if (type2 == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);else if (type2 == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext); - } - var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma; - if (atomicTypes.hasOwnProperty(type2)) return cont(maybeop); - if (type2 == "function") return cont(functiondef, maybeop); - if (type2 == "class" || isTS && value == "interface") { - cx.marked = "keyword"; - return cont(pushlex("form"), classExpression, poplex); - } - if (type2 == "keyword c" || type2 == "async") return cont(noComma ? expressionNoComma : expression); - if (type2 == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop); - if (type2 == "operator" || type2 == "spread") return cont(noComma ? expressionNoComma : expression); - if (type2 == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop); - if (type2 == "{") return contCommasep(objprop, "}", null, maybeop); - if (type2 == "quasi") return pass(quasi, maybeop); - if (type2 == "new") return cont(maybeTarget(noComma)); - return cont(); - } - function maybeexpression(type2) { - if (type2.match(/[;\}\)\],]/)) return pass(); - return pass(expression); - } - function maybeoperatorComma(type2, value) { - if (type2 == ",") return cont(maybeexpression); - return maybeoperatorNoComma(type2, value, false); - } - function maybeoperatorNoComma(type2, value, noComma) { - var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma; - var expr = noComma == false ? expression : expressionNoComma; - if (type2 == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext); - if (type2 == "operator") { - if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me); - if (isTS && value == "<" && cx.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/, false)) return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me); - if (value == "?") return cont(expression, expect(":"), expr); - return cont(expr); - } - if (type2 == "quasi") { - return pass(quasi, me); - } - if (type2 == ";") return; - if (type2 == "(") return contCommasep(expressionNoComma, ")", "call", me); - if (type2 == ".") return cont(property, me); - if (type2 == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me); - if (isTS && value == "as") { - cx.marked = "keyword"; - return cont(typeexpr, me); - } - if (type2 == "regexp") { - cx.state.lastType = cx.marked = "operator"; - cx.stream.backUp(cx.stream.pos - cx.stream.start - 1); - return cont(expr); - } - } - function quasi(type2, value) { - if (type2 != "quasi") return pass(); - if (value.slice(value.length - 2) != "${") return cont(quasi); - return cont(maybeexpression, continueQuasi); - } - function continueQuasi(type2) { - if (type2 == "}") { - cx.marked = "string-2"; - cx.state.tokenize = tokenQuasi; - return cont(quasi); - } - } - function arrowBody(type2) { - findFatArrow(cx.stream, cx.state); - return pass(type2 == "{" ? statement : expression); - } - function arrowBodyNoComma(type2) { - findFatArrow(cx.stream, cx.state); - return pass(type2 == "{" ? statement : expressionNoComma); - } - function maybeTarget(noComma) { - return function (type2) { - if (type2 == ".") return cont(noComma ? targetNoComma : target);else if (type2 == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma);else return pass(noComma ? expressionNoComma : expression); - }; - } - function target(_, value) { - if (value == "target") { - cx.marked = "keyword"; - return cont(maybeoperatorComma); - } - } - function targetNoComma(_, value) { - if (value == "target") { - cx.marked = "keyword"; - return cont(maybeoperatorNoComma); - } - } - function maybelabel(type2) { - if (type2 == ":") return cont(poplex, statement); - return pass(maybeoperatorComma, expect(";"), poplex); - } - function property(type2) { - if (type2 == "variable") { - cx.marked = "property"; - return cont(); - } - } - function objprop(type2, value) { - if (type2 == "async") { - cx.marked = "property"; - return cont(objprop); - } else if (type2 == "variable" || cx.style == "keyword") { - cx.marked = "property"; - if (value == "get" || value == "set") return cont(getterSetter); - var m; - if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false))) cx.state.fatArrowAt = cx.stream.pos + m[0].length; - return cont(afterprop); - } else if (type2 == "number" || type2 == "string") { - cx.marked = jsonldMode ? "property" : cx.style + " property"; - return cont(afterprop); - } else if (type2 == "jsonld-keyword") { - return cont(afterprop); - } else if (isTS && isModifier(value)) { - cx.marked = "keyword"; - return cont(objprop); - } else if (type2 == "[") { - return cont(expression, maybetype, expect("]"), afterprop); - } else if (type2 == "spread") { - return cont(expressionNoComma, afterprop); - } else if (value == "*") { - cx.marked = "keyword"; - return cont(objprop); - } else if (type2 == ":") { - return pass(afterprop); - } - } - function getterSetter(type2) { - if (type2 != "variable") return pass(afterprop); - cx.marked = "property"; - return cont(functiondef); - } - function afterprop(type2) { - if (type2 == ":") return cont(expressionNoComma); - if (type2 == "(") return pass(functiondef); - } - function commasep(what, end, sep) { - function proceed(type2, value) { - if (sep ? sep.indexOf(type2) > -1 : type2 == ",") { - var lex = cx.state.lexical; - if (lex.info == "call") lex.pos = (lex.pos || 0) + 1; - return cont(function (type3, value2) { - if (type3 == end || value2 == end) return pass(); - return pass(what); - }, proceed); - } - if (type2 == end || value == end) return cont(); - if (sep && sep.indexOf(";") > -1) return pass(what); - return cont(expect(end)); - } - return function (type2, value) { - if (type2 == end || value == end) return cont(); - return pass(what, proceed); - }; - } - function contCommasep(what, end, info) { - for (var i = 3; i < arguments.length; i++) cx.cc.push(arguments[i]); - return cont(pushlex(end, info), commasep(what, end), poplex); - } - function block(type2) { - if (type2 == "}") return cont(); - return pass(statement, block); - } - function maybetype(type2, value) { - if (isTS) { - if (type2 == ":") return cont(typeexpr); - if (value == "?") return cont(maybetype); - } - } - function maybetypeOrIn(type2, value) { - if (isTS && (type2 == ":" || value == "in")) return cont(typeexpr); - } - function mayberettype(type2) { - if (isTS && type2 == ":") { - if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr);else return cont(typeexpr); - } - } - function isKW(_, value) { - if (value == "is") { - cx.marked = "keyword"; - return cont(); - } - } - function typeexpr(type2, value) { - if (value == "keyof" || value == "typeof" || value == "infer" || value == "readonly") { - cx.marked = "keyword"; - return cont(value == "typeof" ? expressionNoComma : typeexpr); - } - if (type2 == "variable" || value == "void") { - cx.marked = "type"; - return cont(afterType); - } - if (value == "|" || value == "&") return cont(typeexpr); - if (type2 == "string" || type2 == "number" || type2 == "atom") return cont(afterType); - if (type2 == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType); - if (type2 == "{") return cont(pushlex("}"), typeprops, poplex, afterType); - if (type2 == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType); - if (type2 == "<") return cont(commasep(typeexpr, ">"), typeexpr); - if (type2 == "quasi") { - return pass(quasiType, afterType); - } - } - function maybeReturnType(type2) { - if (type2 == "=>") return cont(typeexpr); - } - function typeprops(type2) { - if (type2.match(/[\}\)\]]/)) return cont(); - if (type2 == "," || type2 == ";") return cont(typeprops); - return pass(typeprop, typeprops); - } - function typeprop(type2, value) { - if (type2 == "variable" || cx.style == "keyword") { - cx.marked = "property"; - return cont(typeprop); - } else if (value == "?" || type2 == "number" || type2 == "string") { - return cont(typeprop); - } else if (type2 == ":") { - return cont(typeexpr); - } else if (type2 == "[") { - return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop); - } else if (type2 == "(") { - return pass(functiondecl, typeprop); - } else if (!type2.match(/[;\}\)\],]/)) { - return cont(); - } - } - function quasiType(type2, value) { - if (type2 != "quasi") return pass(); - if (value.slice(value.length - 2) != "${") return cont(quasiType); - return cont(typeexpr, continueQuasiType); - } - function continueQuasiType(type2) { - if (type2 == "}") { - cx.marked = "string-2"; - cx.state.tokenize = tokenQuasi; - return cont(quasiType); - } - } - function typearg(type2, value) { - if (type2 == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg); - if (type2 == ":") return cont(typeexpr); - if (type2 == "spread") return cont(typearg); - return pass(typeexpr); - } - function afterType(type2, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType); - if (value == "|" || type2 == "." || value == "&") return cont(typeexpr); - if (type2 == "[") return cont(typeexpr, expect("]"), afterType); - if (value == "extends" || value == "implements") { - cx.marked = "keyword"; - return cont(typeexpr); - } - if (value == "?") return cont(typeexpr, expect(":"), typeexpr); - } - function maybeTypeArgs(_, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType); - } - function typeparam() { - return pass(typeexpr, maybeTypeDefault); - } - function maybeTypeDefault(_, value) { - if (value == "=") return cont(typeexpr); - } - function vardef(_, value) { - if (value == "enum") { - cx.marked = "keyword"; - return cont(enumdef); - } - return pass(pattern, maybetype, maybeAssign, vardefCont); - } - function pattern(type2, value) { - if (isTS && isModifier(value)) { - cx.marked = "keyword"; - return cont(pattern); - } - if (type2 == "variable") { - register(value); - return cont(); - } - if (type2 == "spread") return cont(pattern); - if (type2 == "[") return contCommasep(eltpattern, "]"); - if (type2 == "{") return contCommasep(proppattern, "}"); - } - function proppattern(type2, value) { - if (type2 == "variable" && !cx.stream.match(/^\s*:/, false)) { - register(value); - return cont(maybeAssign); - } - if (type2 == "variable") cx.marked = "property"; - if (type2 == "spread") return cont(pattern); - if (type2 == "}") return pass(); - if (type2 == "[") return cont(expression, expect("]"), expect(":"), proppattern); - return cont(expect(":"), pattern, maybeAssign); - } - function eltpattern() { - return pass(pattern, maybeAssign); - } - function maybeAssign(_type, value) { - if (value == "=") return cont(expressionNoComma); - } - function vardefCont(type2) { - if (type2 == ",") return cont(vardef); - } - function maybeelse(type2, value) { - if (type2 == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex); - } - function forspec(type2, value) { - if (value == "await") return cont(forspec); - if (type2 == "(") return cont(pushlex(")"), forspec1, poplex); - } - function forspec1(type2) { - if (type2 == "var") return cont(vardef, forspec2); - if (type2 == "variable") return cont(forspec2); - return pass(forspec2); - } - function forspec2(type2, value) { - if (type2 == ")") return cont(); - if (type2 == ";") return cont(forspec2); - if (value == "in" || value == "of") { - cx.marked = "keyword"; - return cont(expression, forspec2); - } - return pass(expression, forspec2); - } - function functiondef(type2, value) { - if (value == "*") { - cx.marked = "keyword"; - return cont(functiondef); - } - if (type2 == "variable") { - register(value); - return cont(functiondef); - } - if (type2 == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext); - if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef); - } - function functiondecl(type2, value) { - if (value == "*") { - cx.marked = "keyword"; - return cont(functiondecl); - } - if (type2 == "variable") { - register(value); - return cont(functiondecl); - } - if (type2 == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext); - if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl); - } - function typename(type2, value) { - if (type2 == "keyword" || type2 == "variable") { - cx.marked = "type"; - return cont(typename); - } else if (value == "<") { - return cont(pushlex(">"), commasep(typeparam, ">"), poplex); - } - } - function funarg(type2, value) { - if (value == "@") cont(expression, funarg); - if (type2 == "spread") return cont(funarg); - if (isTS && isModifier(value)) { - cx.marked = "keyword"; - return cont(funarg); - } - if (isTS && type2 == "this") return cont(maybetype, maybeAssign); - return pass(pattern, maybetype, maybeAssign); - } - function classExpression(type2, value) { - if (type2 == "variable") return className(type2, value); - return classNameAfter(type2, value); - } - function className(type2, value) { - if (type2 == "variable") { - register(value); - return cont(classNameAfter); - } - } - function classNameAfter(type2, value) { - if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter); - if (value == "extends" || value == "implements" || isTS && type2 == ",") { - if (value == "implements") cx.marked = "keyword"; - return cont(isTS ? typeexpr : expression, classNameAfter); - } - if (type2 == "{") return cont(pushlex("}"), classBody, poplex); - } - function classBody(type2, value) { - if (type2 == "async" || type2 == "variable" && (value == "static" || value == "get" || value == "set" || isTS && isModifier(value)) && cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) { - cx.marked = "keyword"; - return cont(classBody); - } - if (type2 == "variable" || cx.style == "keyword") { - cx.marked = "property"; - return cont(classfield, classBody); - } - if (type2 == "number" || type2 == "string") return cont(classfield, classBody); - if (type2 == "[") return cont(expression, maybetype, expect("]"), classfield, classBody); - if (value == "*") { - cx.marked = "keyword"; - return cont(classBody); - } - if (isTS && type2 == "(") return pass(functiondecl, classBody); - if (type2 == ";" || type2 == ",") return cont(classBody); - if (type2 == "}") return cont(); - if (value == "@") return cont(expression, classBody); - } - function classfield(type2, value) { - if (value == "!") return cont(classfield); - if (value == "?") return cont(classfield); - if (type2 == ":") return cont(typeexpr, maybeAssign); - if (value == "=") return cont(expressionNoComma); - var context = cx.state.lexical.prev, - isInterface = context && context.info == "interface"; - return pass(isInterface ? functiondecl : functiondef); - } - function afterExport(type2, value) { - if (value == "*") { - cx.marked = "keyword"; - return cont(maybeFrom, expect(";")); - } - if (value == "default") { - cx.marked = "keyword"; - return cont(expression, expect(";")); - } - if (type2 == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";")); - return pass(statement); - } - function exportField(type2, value) { - if (value == "as") { - cx.marked = "keyword"; - return cont(expect("variable")); - } - if (type2 == "variable") return pass(expressionNoComma, exportField); - } - function afterImport(type2) { - if (type2 == "string") return cont(); - if (type2 == "(") return pass(expression); - if (type2 == ".") return pass(maybeoperatorComma); - return pass(importSpec, maybeMoreImports, maybeFrom); - } - function importSpec(type2, value) { - if (type2 == "{") return contCommasep(importSpec, "}"); - if (type2 == "variable") register(value); - if (value == "*") cx.marked = "keyword"; - return cont(maybeAs); - } - function maybeMoreImports(type2) { - if (type2 == ",") return cont(importSpec, maybeMoreImports); - } - function maybeAs(_type, value) { - if (value == "as") { - cx.marked = "keyword"; - return cont(importSpec); - } - } - function maybeFrom(_type, value) { - if (value == "from") { - cx.marked = "keyword"; - return cont(expression); - } - } - function arrayLiteral(type2) { - if (type2 == "]") return cont(); - return pass(commasep(expressionNoComma, "]")); - } - function enumdef() { - return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex); - } - function enummember() { - return pass(pattern, maybeAssign); - } - function isContinuedStatement(state, textAfter) { - return state.lastType == "operator" || state.lastType == "," || isOperatorChar.test(textAfter.charAt(0)) || /[,.]/.test(textAfter.charAt(0)); - } - function expressionAllowed(stream, state, backUp) { - return state.tokenize == tokenBase && /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) || state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))); - } - return { - startState: function (basecolumn) { - var state = { - tokenize: tokenBase, - lastType: "sof", - cc: [], - lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), - localVars: parserConfig.localVars, - context: parserConfig.localVars && new Context(null, null, false), - indented: basecolumn || 0 - }; - if (parserConfig.globalVars && typeof parserConfig.globalVars == "object") state.globalVars = parserConfig.globalVars; - return state; - }, - token: function (stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) state.lexical.align = false; - state.indented = stream.indentation(); - findFatArrow(stream, state); - } - if (state.tokenize != tokenComment && stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (type == "comment") return style; - state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type; - return parseJS(state, style, type, content, stream); - }, - indent: function (state, textAfter) { - if (state.tokenize == tokenComment || state.tokenize == tokenQuasi) return CodeMirror.Pass; - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), - lexical = state.lexical, - top; - if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) { - var c = state.cc[i]; - if (c == poplex) lexical = lexical.prev;else if (c != maybeelse && c != popcontext) break; - } - while ((lexical.type == "stat" || lexical.type == "form") && (firstChar == "}" || (top = state.cc[state.cc.length - 1]) && (top == maybeoperatorComma || top == maybeoperatorNoComma) && !/^[,\.=+\-*:?[\(]/.test(textAfter))) lexical = lexical.prev; - if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat") lexical = lexical.prev; - var type2 = lexical.type, - closing = firstChar == type2; - if (type2 == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);else if (type2 == "form" && firstChar == "{") return lexical.indented;else if (type2 == "form") return lexical.indented + indentUnit;else if (type2 == "stat") return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false) return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);else if (lexical.align) return lexical.column + (closing ? 0 : 1);else return lexical.indented + (closing ? 0 : indentUnit); - }, - electricInput: /^\s*(?:case .*?:|default:|\{|\})$/, - blockCommentStart: jsonMode ? null : "/*", - blockCommentEnd: jsonMode ? null : "*/", - blockCommentContinue: jsonMode ? null : " * ", - lineComment: jsonMode ? null : "//", - fold: "brace", - closeBrackets: "()[]{}''\"\"``", - helperType: jsonMode ? "json" : "javascript", - jsonldMode, - jsonMode, - expressionAllowed, - skipExpression: function (state) { - parseJS(state, "atom", "atom", "true", new CodeMirror.StringStream("", 2, null)); - } - }; - }); - CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/); - CodeMirror.defineMIME("text/javascript", "javascript"); - CodeMirror.defineMIME("text/ecmascript", "javascript"); - CodeMirror.defineMIME("application/javascript", "javascript"); - CodeMirror.defineMIME("application/x-javascript", "javascript"); - CodeMirror.defineMIME("application/ecmascript", "javascript"); - CodeMirror.defineMIME("application/json", { - name: "javascript", - json: true - }); - CodeMirror.defineMIME("application/x-json", { - name: "javascript", - json: true - }); - CodeMirror.defineMIME("application/manifest+json", { - name: "javascript", - json: true - }); - CodeMirror.defineMIME("application/ld+json", { - name: "javascript", - jsonld: true - }); - CodeMirror.defineMIME("text/typescript", { - name: "javascript", - typescript: true - }); - CodeMirror.defineMIME("application/typescript", { - name: "javascript", - typescript: true - }); - }); -})(); -var javascriptExports = javascript$2.exports; -const javascript = /* @__PURE__ */codemirror.getDefaultExportFromCjs(javascriptExports); -const javascript$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: javascript -}, [javascriptExports]); -exports.javascript = javascript$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/jump-to-line.cjs.js": -/*!*****************************************************!*\ - !*** ../../graphiql-react/dist/jump-to-line.cjs.js ***! - \*****************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -const dialog = __webpack_require__(/*! ./dialog.cjs.js */ "../../graphiql-react/dist/dialog.cjs.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var jumpToLine$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror(), dialog.dialogExports); - })(function (CodeMirror) { - CodeMirror.defineOption("search", { - bottom: false - }); - function dialog2(cm, text, shortText, deflt, f) { - if (cm.openDialog) cm.openDialog(text, f, { - value: deflt, - selectValueOnOpen: true, - bottom: cm.options.search.bottom - });else f(prompt(shortText, deflt)); - } - function getJumpDialog(cm) { - return cm.phrase("Jump to line:") + ' ' + cm.phrase("(Use line:column or scroll% syntax)") + ""; - } - function interpretLine(cm, string) { - var num = Number(string); - if (/^[-+]/.test(string)) return cm.getCursor().line + num;else return num - 1; - } - CodeMirror.commands.jumpToLine = function (cm) { - var cur = cm.getCursor(); - dialog2(cm, getJumpDialog(cm), cm.phrase("Jump to line:"), cur.line + 1 + ":" + cur.ch, function (posStr) { - if (!posStr) return; - var match; - if (match = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr)) { - cm.setCursor(interpretLine(cm, match[1]), Number(match[2])); - } else if (match = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr)) { - var line = Math.round(cm.lineCount() * Number(match[1]) / 100); - if (/^[-+]/.test(match[1])) line = cur.line + line + 1; - cm.setCursor(line - 1, cur.ch); - } else if (match = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr)) { - cm.setCursor(interpretLine(cm, match[1]), cur.ch); - } - }); - }; - CodeMirror.keyMap["default"]["Alt-G"] = "jumpToLine"; - }); -})(); -var jumpToLineExports = jumpToLine$2.exports; -const jumpToLine = /* @__PURE__ */codemirror.getDefaultExportFromCjs(jumpToLineExports); -const jumpToLine$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: jumpToLine -}, [jumpToLineExports]); -exports.jumpToLine = jumpToLine$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/jump.cjs.js": -/*!*********************************************!*\ - !*** ../../graphiql-react/dist/jump.cjs.js ***! - \*********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const SchemaReference = __webpack_require__(/*! ./SchemaReference.cjs.js */ "../../graphiql-react/dist/SchemaReference.cjs.js"); -codemirror.CodeMirror.defineOption("jump", false, (cm, options, old) => { - if (old && old !== codemirror.CodeMirror.Init) { - const oldOnMouseOver = cm.state.jump.onMouseOver; - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseover", oldOnMouseOver); - const oldOnMouseOut = cm.state.jump.onMouseOut; - codemirror.CodeMirror.off(cm.getWrapperElement(), "mouseout", oldOnMouseOut); - codemirror.CodeMirror.off(document, "keydown", cm.state.jump.onKeyDown); - delete cm.state.jump; - } - if (options) { - const state = cm.state.jump = { - options, - onMouseOver: onMouseOver.bind(null, cm), - onMouseOut: onMouseOut.bind(null, cm), - onKeyDown: onKeyDown.bind(null, cm) - }; - codemirror.CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver); - codemirror.CodeMirror.on(cm.getWrapperElement(), "mouseout", state.onMouseOut); - codemirror.CodeMirror.on(document, "keydown", state.onKeyDown); - } -}); -function onMouseOver(cm, event) { - const target = event.target || event.srcElement; - if (!(target instanceof HTMLElement)) { - return; - } - if ((target === null || target === void 0 ? void 0 : target.nodeName) !== "SPAN") { - return; - } - const box = target.getBoundingClientRect(); - const cursor = { - left: (box.left + box.right) / 2, - top: (box.top + box.bottom) / 2 - }; - cm.state.jump.cursor = cursor; - if (cm.state.jump.isHoldingModifier) { - enableJumpMode(cm); - } -} -function onMouseOut(cm) { - if (!cm.state.jump.isHoldingModifier && cm.state.jump.cursor) { - cm.state.jump.cursor = null; - return; - } - if (cm.state.jump.isHoldingModifier && cm.state.jump.marker) { - disableJumpMode(cm); - } -} -function onKeyDown(cm, event) { - if (cm.state.jump.isHoldingModifier || !isJumpModifier(event.key)) { - return; - } - cm.state.jump.isHoldingModifier = true; - if (cm.state.jump.cursor) { - enableJumpMode(cm); - } - const onKeyUp = upEvent => { - if (upEvent.code !== event.code) { - return; - } - cm.state.jump.isHoldingModifier = false; - if (cm.state.jump.marker) { - disableJumpMode(cm); - } - codemirror.CodeMirror.off(document, "keyup", onKeyUp); - codemirror.CodeMirror.off(document, "click", onClick); - cm.off("mousedown", onMouseDown); - }; - const onClick = clickEvent => { - const { - destination, - options - } = cm.state.jump; - if (destination) { - options.onClick(destination, clickEvent); - } - }; - const onMouseDown = (_, downEvent) => { - if (cm.state.jump.destination) { - downEvent.codemirrorIgnore = true; - } - }; - codemirror.CodeMirror.on(document, "keyup", onKeyUp); - codemirror.CodeMirror.on(document, "click", onClick); - cm.on("mousedown", onMouseDown); -} -const isMac = typeof navigator !== "undefined" && navigator.userAgent.includes("Mac"); -function isJumpModifier(key) { - return key === (isMac ? "Meta" : "Control"); -} -function enableJumpMode(cm) { - if (cm.state.jump.marker) { - return; - } - const { - cursor, - options - } = cm.state.jump; - const pos = cm.coordsChar(cursor); - const token = cm.getTokenAt(pos, true); - const getDestination = options.getDestination || cm.getHelper(pos, "jump"); - if (getDestination) { - const destination = getDestination(token, options, cm); - if (destination) { - const marker = cm.markText({ - line: pos.line, - ch: token.start - }, { - line: pos.line, - ch: token.end - }, { - className: "CodeMirror-jump-token" - }); - cm.state.jump.marker = marker; - cm.state.jump.destination = destination; - } - } -} -function disableJumpMode(cm) { - const { - marker - } = cm.state.jump; - cm.state.jump.marker = null; - cm.state.jump.destination = null; - marker.clear(); -} -codemirror.CodeMirror.registerHelper("jump", "graphql", (token, options) => { - if (!options.schema || !options.onClick || !token.state) { - return; - } - const { - state - } = token; - const { - kind, - step - } = state; - const typeInfo = SchemaReference.getTypeInfo(options.schema, state); - if (kind === "Field" && step === 0 && typeInfo.fieldDef || kind === "AliasedField" && step === 2 && typeInfo.fieldDef) { - return SchemaReference.getFieldReference(typeInfo); - } - if (kind === "Directive" && step === 1 && typeInfo.directiveDef) { - return SchemaReference.getDirectiveReference(typeInfo); - } - if (kind === "Argument" && step === 0 && typeInfo.argDef) { - return SchemaReference.getArgumentReference(typeInfo); - } - if (kind === "EnumValue" && typeInfo.enumValue) { - return SchemaReference.getEnumValueReference(typeInfo); - } - if (kind === "NamedType" && typeInfo.type) { - return SchemaReference.getTypeReference(typeInfo); - } -}); - -/***/ }), - -/***/ "../../graphiql-react/dist/lint.cjs.js": -/*!*********************************************!*\ - !*** ../../graphiql-react/dist/lint.cjs.js ***! - \*********************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var lint$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var GUTTER_ID = "CodeMirror-lint-markers"; - var LINT_LINE_ID = "CodeMirror-lint-line-"; - function showTooltip(cm, e, content) { - var tt = document.createElement("div"); - tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme; - tt.appendChild(content.cloneNode(true)); - if (cm.state.lint.options.selfContain) cm.getWrapperElement().appendChild(tt);else document.body.appendChild(tt); - function position(e2) { - if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position); - tt.style.top = Math.max(0, e2.clientY - tt.offsetHeight - 5) + "px"; - tt.style.left = e2.clientX + 5 + "px"; - } - CodeMirror.on(document, "mousemove", position); - position(e); - if (tt.style.opacity != null) tt.style.opacity = 1; - return tt; - } - function rm(elt) { - if (elt.parentNode) elt.parentNode.removeChild(elt); - } - function hideTooltip(tt) { - if (!tt.parentNode) return; - if (tt.style.opacity == null) rm(tt); - tt.style.opacity = 0; - setTimeout(function () { - rm(tt); - }, 600); - } - function showTooltipFor(cm, e, content, node) { - var tooltip = showTooltip(cm, e, content); - function hide() { - CodeMirror.off(node, "mouseout", hide); - if (tooltip) { - hideTooltip(tooltip); - tooltip = null; - } - } - var poll = setInterval(function () { - if (tooltip) for (var n = node;; n = n.parentNode) { - if (n && n.nodeType == 11) n = n.host; - if (n == document.body) return; - if (!n) { - hide(); - break; - } - } - if (!tooltip) return clearInterval(poll); - }, 400); - CodeMirror.on(node, "mouseout", hide); - } - function LintState(cm, conf, hasGutter) { - this.marked = []; - if (conf instanceof Function) conf = { - getAnnotations: conf - }; - if (!conf || conf === true) conf = {}; - this.options = {}; - this.linterOptions = conf.options || {}; - for (var prop in defaults) this.options[prop] = defaults[prop]; - for (var prop in conf) { - if (defaults.hasOwnProperty(prop)) { - if (conf[prop] != null) this.options[prop] = conf[prop]; - } else if (!conf.options) { - this.linterOptions[prop] = conf[prop]; - } - } - this.timeout = null; - this.hasGutter = hasGutter; - this.onMouseOver = function (e) { - onMouseOver(cm, e); - }; - this.waitingFor = 0; - } - var defaults = { - highlightLines: false, - tooltips: true, - delay: 500, - lintOnChange: true, - getAnnotations: null, - async: false, - selfContain: null, - formatAnnotation: null, - onUpdateLinting: null - }; - function clearMarks(cm) { - var state = cm.state.lint; - if (state.hasGutter) cm.clearGutter(GUTTER_ID); - if (state.options.highlightLines) clearErrorLines(cm); - for (var i = 0; i < state.marked.length; ++i) state.marked[i].clear(); - state.marked.length = 0; - } - function clearErrorLines(cm) { - cm.eachLine(function (line) { - var has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass); - if (has) cm.removeLineClass(line, "wrap", has[0]); - }); - } - function makeMarker(cm, labels, severity, multiple, tooltips) { - var marker = document.createElement("div"), - inner = marker; - marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity; - if (multiple) { - inner = marker.appendChild(document.createElement("div")); - inner.className = "CodeMirror-lint-marker CodeMirror-lint-marker-multiple"; - } - if (tooltips != false) CodeMirror.on(inner, "mouseover", function (e) { - showTooltipFor(cm, e, labels, inner); - }); - return marker; - } - function getMaxSeverity(a, b) { - if (a == "error") return a;else return b; - } - function groupByLine(annotations) { - var lines = []; - for (var i = 0; i < annotations.length; ++i) { - var ann = annotations[i], - line = ann.from.line; - (lines[line] || (lines[line] = [])).push(ann); - } - return lines; - } - function annotationTooltip(ann) { - var severity = ann.severity; - if (!severity) severity = "error"; - var tip = document.createElement("div"); - tip.className = "CodeMirror-lint-message CodeMirror-lint-message-" + severity; - if (typeof ann.messageHTML != "undefined") { - tip.innerHTML = ann.messageHTML; - } else { - tip.appendChild(document.createTextNode(ann.message)); - } - return tip; - } - function lintAsync(cm, getAnnotations) { - var state = cm.state.lint; - var id = ++state.waitingFor; - function abort() { - id = -1; - cm.off("change", abort); - } - cm.on("change", abort); - getAnnotations(cm.getValue(), function (annotations, arg2) { - cm.off("change", abort); - if (state.waitingFor != id) return; - if (arg2 && annotations instanceof CodeMirror) annotations = arg2; - cm.operation(function () { - updateLinting(cm, annotations); - }); - }, state.linterOptions, cm); - } - function startLinting(cm) { - var state = cm.state.lint; - if (!state) return; - var options = state.options; - var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint"); - if (!getAnnotations) return; - if (options.async || getAnnotations.async) { - lintAsync(cm, getAnnotations); - } else { - var annotations = getAnnotations(cm.getValue(), state.linterOptions, cm); - if (!annotations) return; - if (annotations.then) annotations.then(function (issues) { - cm.operation(function () { - updateLinting(cm, issues); - }); - });else cm.operation(function () { - updateLinting(cm, annotations); - }); - } - } - function updateLinting(cm, annotationsNotSorted) { - var state = cm.state.lint; - if (!state) return; - var options = state.options; - clearMarks(cm); - var annotations = groupByLine(annotationsNotSorted); - for (var line = 0; line < annotations.length; ++line) { - var anns = annotations[line]; - if (!anns) continue; - var message = []; - anns = anns.filter(function (item) { - return message.indexOf(item.message) > -1 ? false : message.push(item.message); - }); - var maxSeverity = null; - var tipLabel = state.hasGutter && document.createDocumentFragment(); - for (var i = 0; i < anns.length; ++i) { - var ann = anns[i]; - var severity = ann.severity; - if (!severity) severity = "error"; - maxSeverity = getMaxSeverity(maxSeverity, severity); - if (options.formatAnnotation) ann = options.formatAnnotation(ann); - if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann)); - if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, { - className: "CodeMirror-lint-mark CodeMirror-lint-mark-" + severity, - __annotation: ann - })); - } - if (state.hasGutter) cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1, options.tooltips)); - if (options.highlightLines) cm.addLineClass(line, "wrap", LINT_LINE_ID + maxSeverity); - } - if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm); - } - function onChange(cm) { - var state = cm.state.lint; - if (!state) return; - clearTimeout(state.timeout); - state.timeout = setTimeout(function () { - startLinting(cm); - }, state.options.delay); - } - function popupTooltips(cm, annotations, e) { - var target = e.target || e.srcElement; - var tooltip = document.createDocumentFragment(); - for (var i = 0; i < annotations.length; i++) { - var ann = annotations[i]; - tooltip.appendChild(annotationTooltip(ann)); - } - showTooltipFor(cm, e, tooltip, target); - } - function onMouseOver(cm, e) { - var target = e.target || e.srcElement; - if (!/\bCodeMirror-lint-mark-/.test(target.className)) return; - var box = target.getBoundingClientRect(), - x = (box.left + box.right) / 2, - y = (box.top + box.bottom) / 2; - var spans = cm.findMarksAt(cm.coordsChar({ - left: x, - top: y - }, "client")); - var annotations = []; - for (var i = 0; i < spans.length; ++i) { - var ann = spans[i].__annotation; - if (ann) annotations.push(ann); - } - if (annotations.length) popupTooltips(cm, annotations, e); - } - CodeMirror.defineOption("lint", false, function (cm, val, old) { - if (old && old != CodeMirror.Init) { - clearMarks(cm); - if (cm.state.lint.options.lintOnChange !== false) cm.off("change", onChange); - CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver); - clearTimeout(cm.state.lint.timeout); - delete cm.state.lint; - } - if (val) { - var gutters = cm.getOption("gutters"), - hasLintGutter = false; - for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true; - var state = cm.state.lint = new LintState(cm, val, hasLintGutter); - if (state.options.lintOnChange) cm.on("change", onChange); - if (state.options.tooltips != false && state.options.tooltips != "gutter") CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver); - startLinting(cm); - } - }); - CodeMirror.defineExtension("performLint", function () { - startLinting(this); - }); - }); -})(); -var lintExports = lint$2.exports; -const lint = /* @__PURE__ */codemirror.getDefaultExportFromCjs(lintExports); -const lint$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: lint -}, [lintExports]); -exports.lint = lint$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/lint.cjs2.js": -/*!**********************************************!*\ - !*** ../../graphiql-react/dist/lint.cjs2.js ***! - \**********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); -const SEVERITY = ["error", "warning", "information", "hint"]; -const TYPE = { - "GraphQL: Validation": "validation", - "GraphQL: Deprecation": "deprecation", - "GraphQL: Syntax": "syntax" -}; -codemirror.CodeMirror.registerHelper("lint", "graphql", (text, options) => { - const { - schema, - validationRules, - externalFragments - } = options; - const rawResults = graphqlLanguageService.getDiagnostics(text, schema, validationRules, void 0, externalFragments); - const results = rawResults.map(error => ({ - message: error.message, - severity: error.severity ? SEVERITY[error.severity - 1] : SEVERITY[0], - type: error.source ? TYPE[error.source] : void 0, - from: codemirror.CodeMirror.Pos(error.range.start.line, error.range.start.character), - to: codemirror.CodeMirror.Pos(error.range.end.line, error.range.end.character) - })); - return results; -}); - -/***/ }), - -/***/ "../../graphiql-react/dist/lint.cjs3.js": -/*!**********************************************!*\ - !*** ../../graphiql-react/dist/lint.cjs3.js ***! - \**********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphql = __webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs"); -function jsonParse(str) { - string = str; - strLen = str.length; - start = end = lastEnd = -1; - ch(); - lex(); - const ast = parseObj(); - expect("EOF"); - return ast; -} -let string; -let strLen; -let start; -let end; -let lastEnd; -let code; -let kind; -function parseObj() { - const nodeStart = start; - const members = []; - expect("{"); - if (!skip("}")) { - do { - members.push(parseMember()); - } while (skip(",")); - expect("}"); - } - return { - kind: "Object", - start: nodeStart, - end: lastEnd, - members - }; -} -function parseMember() { - const nodeStart = start; - const key = kind === "String" ? curToken() : null; - expect("String"); - expect(":"); - const value = parseVal(); - return { - kind: "Member", - start: nodeStart, - end: lastEnd, - key, - value - }; -} -function parseArr() { - const nodeStart = start; - const values = []; - expect("["); - if (!skip("]")) { - do { - values.push(parseVal()); - } while (skip(",")); - expect("]"); - } - return { - kind: "Array", - start: nodeStart, - end: lastEnd, - values - }; -} -function parseVal() { - switch (kind) { - case "[": - return parseArr(); - case "{": - return parseObj(); - case "String": - case "Number": - case "Boolean": - case "Null": - const token = curToken(); - lex(); - return token; - } - expect("Value"); -} -function curToken() { - return { - kind, - start, - end, - value: JSON.parse(string.slice(start, end)) - }; -} -function expect(str) { - if (kind === str) { - lex(); - return; - } - let found; - if (kind === "EOF") { - found = "[end of file]"; - } else if (end - start > 1) { - found = "`" + string.slice(start, end) + "`"; - } else { - const match = string.slice(start).match(/^.+?\b/); - found = "`" + (match ? match[0] : string[start]) + "`"; - } - throw syntaxError(`Expected ${str} but found ${found}.`); -} -class JSONSyntaxError extends Error { - constructor(message, position) { - super(message); - this.position = position; - } -} -function syntaxError(message) { - return new JSONSyntaxError(message, { - start, - end - }); -} -function skip(k) { - if (kind === k) { - lex(); - return true; - } -} -function ch() { - if (end < strLen) { - end++; - code = end === strLen ? 0 : string.charCodeAt(end); - } - return code; -} -function lex() { - lastEnd = end; - while (code === 9 || code === 10 || code === 13 || code === 32) { - ch(); - } - if (code === 0) { - kind = "EOF"; - return; - } - start = end; - switch (code) { - case 34: - kind = "String"; - return readString(); - case 45: - case 48: - case 49: - case 50: - case 51: - case 52: - case 53: - case 54: - case 55: - case 56: - case 57: - kind = "Number"; - return readNumber(); - case 102: - if (string.slice(start, start + 5) !== "false") { - break; - } - end += 4; - ch(); - kind = "Boolean"; - return; - case 110: - if (string.slice(start, start + 4) !== "null") { - break; - } - end += 3; - ch(); - kind = "Null"; - return; - case 116: - if (string.slice(start, start + 4) !== "true") { - break; - } - end += 3; - ch(); - kind = "Boolean"; - return; - } - kind = string[start]; - ch(); -} -function readString() { - ch(); - while (code !== 34 && code > 31) { - if (code === 92) { - code = ch(); - switch (code) { - case 34: - case 47: - case 92: - case 98: - case 102: - case 110: - case 114: - case 116: - ch(); - break; - case 117: - ch(); - readHex(); - readHex(); - readHex(); - readHex(); - break; - default: - throw syntaxError("Bad character escape sequence."); - } - } else if (end === strLen) { - throw syntaxError("Unterminated string."); - } else { - ch(); - } - } - if (code === 34) { - ch(); - return; - } - throw syntaxError("Unterminated string."); -} -function readHex() { - if (code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102) { - return ch(); - } - throw syntaxError("Expected hexadecimal digit."); -} -function readNumber() { - if (code === 45) { - ch(); - } - if (code === 48) { - ch(); - } else { - readDigits(); - } - if (code === 46) { - ch(); - readDigits(); - } - if (code === 69 || code === 101) { - code = ch(); - if (code === 43 || code === 45) { - ch(); - } - readDigits(); - } -} -function readDigits() { - if (code < 48 || code > 57) { - throw syntaxError("Expected decimal digit."); - } - do { - ch(); - } while (code >= 48 && code <= 57); -} -codemirror.CodeMirror.registerHelper("lint", "graphql-variables", (text, options, editor) => { - if (!text) { - return []; - } - let ast; - try { - ast = jsonParse(text); - } catch (error) { - if (error instanceof JSONSyntaxError) { - return [lintError(editor, error.position, error.message)]; - } - throw error; - } - const { - variableToType - } = options; - if (!variableToType) { - return []; - } - return validateVariables(editor, variableToType, ast); -}); -function validateVariables(editor, variableToType, variablesAST) { - var _a; - const errors = []; - for (const member of variablesAST.members) { - if (member) { - const variableName = (_a = member.key) === null || _a === void 0 ? void 0 : _a.value; - const type = variableToType[variableName]; - if (type) { - for (const [node, message] of validateValue(type, member.value)) { - errors.push(lintError(editor, node, message)); - } - } else { - errors.push(lintError(editor, member.key, `Variable "$${variableName}" does not appear in any GraphQL query.`)); - } - } - } - return errors; -} -function validateValue(type, valueAST) { - if (!type || !valueAST) { - return []; - } - if (type instanceof graphql.GraphQLNonNull) { - if (valueAST.kind === "Null") { - return [[valueAST, `Type "${type}" is non-nullable and cannot be null.`]]; - } - return validateValue(type.ofType, valueAST); - } - if (valueAST.kind === "Null") { - return []; - } - if (type instanceof graphql.GraphQLList) { - const itemType = type.ofType; - if (valueAST.kind === "Array") { - const values = valueAST.values || []; - return mapCat(values, item => validateValue(itemType, item)); - } - return validateValue(itemType, valueAST); - } - if (type instanceof graphql.GraphQLInputObjectType) { - if (valueAST.kind !== "Object") { - return [[valueAST, `Type "${type}" must be an Object.`]]; - } - const providedFields = /* @__PURE__ */Object.create(null); - const fieldErrors = mapCat(valueAST.members, member => { - var _a; - const fieldName = (_a = member === null || member === void 0 ? void 0 : member.key) === null || _a === void 0 ? void 0 : _a.value; - providedFields[fieldName] = true; - const inputField = type.getFields()[fieldName]; - if (!inputField) { - return [[member.key, `Type "${type}" does not have a field "${fieldName}".`]]; - } - const fieldType = inputField ? inputField.type : void 0; - return validateValue(fieldType, member.value); - }); - for (const fieldName of Object.keys(type.getFields())) { - const field = type.getFields()[fieldName]; - if (!providedFields[fieldName] && field.type instanceof graphql.GraphQLNonNull && !field.defaultValue) { - fieldErrors.push([valueAST, `Object of type "${type}" is missing required field "${fieldName}".`]); - } - } - return fieldErrors; - } - if (type.name === "Boolean" && valueAST.kind !== "Boolean" || type.name === "String" && valueAST.kind !== "String" || type.name === "ID" && valueAST.kind !== "Number" && valueAST.kind !== "String" || type.name === "Float" && valueAST.kind !== "Number" || type.name === "Int" && (valueAST.kind !== "Number" || (valueAST.value | 0) !== valueAST.value)) { - return [[valueAST, `Expected value of type "${type}".`]]; - } - if ((type instanceof graphql.GraphQLEnumType || type instanceof graphql.GraphQLScalarType) && (valueAST.kind !== "String" && valueAST.kind !== "Number" && valueAST.kind !== "Boolean" && valueAST.kind !== "Null" || isNullish(type.parseValue(valueAST.value)))) { - return [[valueAST, `Expected value of type "${type}".`]]; - } - return []; -} -function lintError(editor, node, message) { - return { - message, - severity: "error", - type: "validation", - from: editor.posFromIndex(node.start), - to: editor.posFromIndex(node.end) - }; -} -function isNullish(value) { - return value === null || value === void 0 || value !== value; -} -function mapCat(array, mapper) { - return Array.prototype.concat.apply([], array.map(mapper)); -} - -/***/ }), - -/***/ "../../graphiql-react/dist/matchbrackets.cjs.js": -/*!******************************************************!*\ - !*** ../../graphiql-react/dist/matchbrackets.cjs.js ***! - \******************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -const matchbrackets$2 = __webpack_require__(/*! ./matchbrackets.cjs2.js */ "../../graphiql-react/dist/matchbrackets.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var matchbracketsExports = matchbrackets$2.requireMatchbrackets(); -const matchbrackets = /* @__PURE__ */codemirror.getDefaultExportFromCjs(matchbracketsExports); -const matchbrackets$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: matchbrackets -}, [matchbracketsExports]); -exports.matchbrackets = matchbrackets$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/matchbrackets.cjs2.js": -/*!*******************************************************!*\ - !*** ../../graphiql-react/dist/matchbrackets.cjs2.js ***! - \*******************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -var matchbrackets = { - exports: {} -}; -var hasRequiredMatchbrackets; -function requireMatchbrackets() { - if (hasRequiredMatchbrackets) return matchbrackets.exports; - hasRequiredMatchbrackets = 1; - (function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var ie_lt8 = /MSIE \d/.test(navigator.userAgent) && (document.documentMode == null || document.documentMode < 8); - var Pos = CodeMirror.Pos; - var matching = { - "(": ")>", - ")": "(<", - "[": "]>", - "]": "[<", - "{": "}>", - "}": "{<", - "<": ">>", - ">": "<<" - }; - function bracketRegex(config) { - return config && config.bracketRegex || /[(){}[\]]/; - } - function findMatchingBracket(cm, where, config) { - var line = cm.getLineHandle(where.line), - pos = where.ch - 1; - var afterCursor = config && config.afterCursor; - if (afterCursor == null) afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className); - var re = bracketRegex(config); - var match = !afterCursor && pos >= 0 && re.test(line.text.charAt(pos)) && matching[line.text.charAt(pos)] || re.test(line.text.charAt(pos + 1)) && matching[line.text.charAt(++pos)]; - if (!match) return null; - var dir = match.charAt(1) == ">" ? 1 : -1; - if (config && config.strict && dir > 0 != (pos == where.ch)) return null; - var style = cm.getTokenTypeAt(Pos(where.line, pos + 1)); - var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style, config); - if (found == null) return null; - return { - from: Pos(where.line, pos), - to: found && found.pos, - match: found && found.ch == match.charAt(0), - forward: dir > 0 - }; - } - function scanForBracket(cm, where, dir, style, config) { - var maxScanLen = config && config.maxScanLineLength || 1e4; - var maxScanLines = config && config.maxScanLines || 1e3; - var stack = []; - var re = bracketRegex(config); - var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1) : Math.max(cm.firstLine() - 1, where.line - maxScanLines); - for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) { - var line = cm.getLine(lineNo); - if (!line) continue; - var pos = dir > 0 ? 0 : line.length - 1, - end = dir > 0 ? line.length : -1; - if (line.length > maxScanLen) continue; - if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0); - for (; pos != end; pos += dir) { - var ch = line.charAt(pos); - if (re.test(ch) && (style === void 0 || (cm.getTokenTypeAt(Pos(lineNo, pos + 1)) || "") == (style || ""))) { - var match = matching[ch]; - if (match && match.charAt(1) == ">" == dir > 0) stack.push(ch);else if (!stack.length) return { - pos: Pos(lineNo, pos), - ch - };else stack.pop(); - } - } - } - return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null; - } - function matchBrackets(cm, autoclear, config) { - var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1e3, - highlightNonMatching = config && config.highlightNonMatching; - var marks = [], - ranges = cm.listSelections(); - for (var i = 0; i < ranges.length; i++) { - var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config); - if (match && (match.match || highlightNonMatching !== false) && cm.getLine(match.from.line).length <= maxHighlightLen) { - var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; - marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), { - className: style - })); - if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen) marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), { - className: style - })); - } - } - if (marks.length) { - if (ie_lt8 && cm.state.focused) cm.focus(); - var clear = function () { - cm.operation(function () { - for (var i2 = 0; i2 < marks.length; i2++) marks[i2].clear(); - }); - }; - if (autoclear) setTimeout(clear, 800);else return clear; - } - } - function doMatchBrackets(cm) { - cm.operation(function () { - if (cm.state.matchBrackets.currentlyHighlighted) { - cm.state.matchBrackets.currentlyHighlighted(); - cm.state.matchBrackets.currentlyHighlighted = null; - } - cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets); - }); - } - function clearHighlighted(cm) { - if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) { - cm.state.matchBrackets.currentlyHighlighted(); - cm.state.matchBrackets.currentlyHighlighted = null; - } - } - CodeMirror.defineOption("matchBrackets", false, function (cm, val, old) { - if (old && old != CodeMirror.Init) { - cm.off("cursorActivity", doMatchBrackets); - cm.off("focus", doMatchBrackets); - cm.off("blur", clearHighlighted); - clearHighlighted(cm); - } - if (val) { - cm.state.matchBrackets = typeof val == "object" ? val : {}; - cm.on("cursorActivity", doMatchBrackets); - cm.on("focus", doMatchBrackets); - cm.on("blur", clearHighlighted); - } - }); - CodeMirror.defineExtension("matchBrackets", function () { - matchBrackets(this, true); - }); - CodeMirror.defineExtension("findMatchingBracket", function (pos, config, oldConfig) { - if (oldConfig || typeof config == "boolean") { - if (!oldConfig) { - config = config ? { - strict: true - } : null; - } else { - oldConfig.strict = config; - config = oldConfig; - } - } - return findMatchingBracket(this, pos, config); - }); - CodeMirror.defineExtension("scanForBracket", function (pos, dir, style, config) { - return scanForBracket(this, pos, dir, style, config); - }); - }); - })(); - return matchbrackets.exports; -} -exports.requireMatchbrackets = requireMatchbrackets; - -/***/ }), - -/***/ "../../graphiql-react/dist/mode-indent.cjs.js": -/*!****************************************************!*\ - !*** ../../graphiql-react/dist/mode-indent.cjs.js ***! - \****************************************************/ -/***/ (function(__unused_webpack_module, exports) { - - - -function indent(state, textAfter) { - var _a, _b; - const { - levels, - indentLevel - } = state; - const level = !levels || levels.length === 0 ? indentLevel : levels.at(-1) - (((_a = this.electricInput) === null || _a === void 0 ? void 0 : _a.test(textAfter)) ? 1 : 0); - return (level || 0) * (((_b = this.config) === null || _b === void 0 ? void 0 : _b.indentUnit) || 0); -} -exports.indent = indent; - -/***/ }), - -/***/ "../../graphiql-react/dist/mode.cjs.js": -/*!*********************************************!*\ - !*** ../../graphiql-react/dist/mode.cjs.js ***! - \*********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); -const modeIndent = __webpack_require__(/*! ./mode-indent.cjs.js */ "../../graphiql-react/dist/mode-indent.cjs.js"); -const graphqlModeFactory = config => { - const parser = graphqlLanguageService.onlineParser({ - eatWhitespace: stream => stream.eatWhile(graphqlLanguageService.isIgnored), - lexRules: graphqlLanguageService.LexRules, - parseRules: graphqlLanguageService.ParseRules, - editorConfig: { - tabSize: config.tabSize - } - }); - return { - config, - startState: parser.startState, - token: parser.token, - indent: modeIndent.indent, - electricInput: /^\s*[})\]]/, - fold: "brace", - lineComment: "#", - closeBrackets: { - pairs: '()[]{}""', - explode: "()[]{}" - } - }; -}; -codemirror.CodeMirror.defineMode("graphql", graphqlModeFactory); - -/***/ }), - -/***/ "../../graphiql-react/dist/mode.cjs2.js": -/*!**********************************************!*\ - !*** ../../graphiql-react/dist/mode.cjs2.js ***! - \**********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); -const modeIndent = __webpack_require__(/*! ./mode-indent.cjs.js */ "../../graphiql-react/dist/mode-indent.cjs.js"); -codemirror.CodeMirror.defineMode("graphql-variables", config => { - const parser = graphqlLanguageService.onlineParser({ - eatWhitespace: stream => stream.eatSpace(), - lexRules: LexRules, - parseRules: ParseRules, - editorConfig: { - tabSize: config.tabSize - } - }); - return { - config, - startState: parser.startState, - token: parser.token, - indent: modeIndent.indent, - electricInput: /^\s*[}\]]/, - fold: "brace", - closeBrackets: { - pairs: '[]{}""', - explode: "[]{}" - } - }; -}); -const LexRules = { - Punctuation: /^\[|]|\{|\}|:|,/, - Number: /^-?(?:0|(?:[1-9][0-9]*))(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?/, - String: /^"(?:[^"\\]|\\(?:"|\/|\\|b|f|n|r|t|u[0-9a-fA-F]{4}))*"?/, - Keyword: /^true|false|null/ -}; -const ParseRules = { - Document: [graphqlLanguageService.p("{"), graphqlLanguageService.list("Variable", graphqlLanguageService.opt(graphqlLanguageService.p(","))), graphqlLanguageService.p("}")], - Variable: [namedKey("variable"), graphqlLanguageService.p(":"), "Value"], - Value(token) { - switch (token.kind) { - case "Number": - return "NumberValue"; - case "String": - return "StringValue"; - case "Punctuation": - switch (token.value) { - case "[": - return "ListValue"; - case "{": - return "ObjectValue"; - } - return null; - case "Keyword": - switch (token.value) { - case "true": - case "false": - return "BooleanValue"; - case "null": - return "NullValue"; - } - return null; - } - }, - NumberValue: [graphqlLanguageService.t("Number", "number")], - StringValue: [graphqlLanguageService.t("String", "string")], - BooleanValue: [graphqlLanguageService.t("Keyword", "builtin")], - NullValue: [graphqlLanguageService.t("Keyword", "keyword")], - ListValue: [graphqlLanguageService.p("["), graphqlLanguageService.list("Value", graphqlLanguageService.opt(graphqlLanguageService.p(","))), graphqlLanguageService.p("]")], - ObjectValue: [graphqlLanguageService.p("{"), graphqlLanguageService.list("ObjectField", graphqlLanguageService.opt(graphqlLanguageService.p(","))), graphqlLanguageService.p("}")], - ObjectField: [namedKey("attribute"), graphqlLanguageService.p(":"), "Value"] -}; -function namedKey(style) { - return { - style, - match: token => token.kind === "String", - update(state, token) { - state.name = token.value.slice(1, -1); - } - }; -} - -/***/ }), - -/***/ "../../graphiql-react/dist/mode.cjs3.js": -/*!**********************************************!*\ - !*** ../../graphiql-react/dist/mode.cjs3.js ***! - \**********************************************/ -/***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs.js */ "../../graphiql-react/dist/codemirror.cjs.js"); -const graphqlLanguageService = __webpack_require__(/*! graphql-language-service */ "../../graphql-language-service/esm/index.js"); -const modeIndent = __webpack_require__(/*! ./mode-indent.cjs.js */ "../../graphiql-react/dist/mode-indent.cjs.js"); -codemirror.CodeMirror.defineMode("graphql-results", config => { - const parser = graphqlLanguageService.onlineParser({ - eatWhitespace: stream => stream.eatSpace(), - lexRules: LexRules, - parseRules: ParseRules, - editorConfig: { - tabSize: config.tabSize - } - }); - return { - config, - startState: parser.startState, - token: parser.token, - indent: modeIndent.indent, - electricInput: /^\s*[}\]]/, - fold: "brace", - closeBrackets: { - pairs: '[]{}""', - explode: "[]{}" - } - }; -}); -const LexRules = { - Punctuation: /^\[|]|\{|\}|:|,/, - Number: /^-?(?:0|(?:[1-9][0-9]*))(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?/, - String: /^"(?:[^"\\]|\\(?:"|\/|\\|b|f|n|r|t|u[0-9a-fA-F]{4}))*"?/, - Keyword: /^true|false|null/ -}; -const ParseRules = { - Document: [graphqlLanguageService.p("{"), graphqlLanguageService.list("Entry", graphqlLanguageService.p(",")), graphqlLanguageService.p("}")], - Entry: [graphqlLanguageService.t("String", "def"), graphqlLanguageService.p(":"), "Value"], - Value(token) { - switch (token.kind) { - case "Number": - return "NumberValue"; - case "String": - return "StringValue"; - case "Punctuation": - switch (token.value) { - case "[": - return "ListValue"; - case "{": - return "ObjectValue"; - } - return null; - case "Keyword": - switch (token.value) { - case "true": - case "false": - return "BooleanValue"; - case "null": - return "NullValue"; - } - return null; - } - }, - NumberValue: [graphqlLanguageService.t("Number", "number")], - StringValue: [graphqlLanguageService.t("String", "string")], - BooleanValue: [graphqlLanguageService.t("Keyword", "builtin")], - NullValue: [graphqlLanguageService.t("Keyword", "keyword")], - ListValue: [graphqlLanguageService.p("["), graphqlLanguageService.list("Value", graphqlLanguageService.p(",")), graphqlLanguageService.p("]")], - ObjectValue: [graphqlLanguageService.p("{"), graphqlLanguageService.list("ObjectField", graphqlLanguageService.p(",")), graphqlLanguageService.p("}")], - ObjectField: [graphqlLanguageService.t("String", "property"), graphqlLanguageService.p(":"), "Value"] -}; - -/***/ }), - -/***/ "../../graphiql-react/dist/search.cjs.js": -/*!***********************************************!*\ - !*** ../../graphiql-react/dist/search.cjs.js ***! - \***********************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -const searchcursor = __webpack_require__(/*! ./searchcursor.cjs2.js */ "../../graphiql-react/dist/searchcursor.cjs2.js"); -const dialog = __webpack_require__(/*! ./dialog.cjs.js */ "../../graphiql-react/dist/dialog.cjs.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var search$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror(), searchcursor.requireSearchcursor(), dialog.dialogExports); - })(function (CodeMirror) { - CodeMirror.defineOption("search", { - bottom: false - }); - function searchOverlay(query, caseInsensitive) { - if (typeof query == "string") query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");else if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "gi" : "g"); - return { - token: function (stream) { - query.lastIndex = stream.pos; - var match = query.exec(stream.string); - if (match && match.index == stream.pos) { - stream.pos += match[0].length || 1; - return "searching"; - } else if (match) { - stream.pos = match.index; - } else { - stream.skipToEnd(); - } - } - }; - } - function SearchState() { - this.posFrom = this.posTo = this.lastQuery = this.query = null; - this.overlay = null; - } - function getSearchState(cm) { - return cm.state.search || (cm.state.search = new SearchState()); - } - function queryCaseInsensitive(query) { - return typeof query == "string" && query == query.toLowerCase(); - } - function getSearchCursor(cm, query, pos) { - return cm.getSearchCursor(query, pos, { - caseFold: queryCaseInsensitive(query), - multiline: true - }); - } - function persistentDialog(cm, text, deflt, onEnter, onKeyDown) { - cm.openDialog(text, onEnter, { - value: deflt, - selectValueOnOpen: true, - closeOnEnter: false, - onClose: function () { - clearSearch(cm); - }, - onKeyDown, - bottom: cm.options.search.bottom - }); - } - function dialog2(cm, text, shortText, deflt, f) { - if (cm.openDialog) cm.openDialog(text, f, { - value: deflt, - selectValueOnOpen: true, - bottom: cm.options.search.bottom - });else f(prompt(shortText, deflt)); - } - function confirmDialog(cm, text, shortText, fs) { - if (cm.openConfirm) cm.openConfirm(text, fs);else if (confirm(shortText)) fs[0](); - } - function parseString(string) { - return string.replace(/\\([nrt\\])/g, function (match, ch) { - if (ch == "n") return "\n"; - if (ch == "r") return "\r"; - if (ch == "t") return " "; - if (ch == "\\") return "\\"; - return match; - }); - } - function parseQuery(query) { - var isRE = query.match(/^\/(.*)\/([a-z]*)$/); - if (isRE) { - try { - query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); - } catch (e) {} - } else { - query = parseString(query); - } - if (typeof query == "string" ? query == "" : query.test("")) query = /x^/; - return query; - } - function startSearch(cm, state, query) { - state.queryText = query; - state.query = parseQuery(query); - cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query)); - state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query)); - cm.addOverlay(state.overlay); - if (cm.showMatchesOnScrollbar) { - if (state.annotate) { - state.annotate.clear(); - state.annotate = null; - } - state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query)); - } - } - function doSearch(cm, rev, persistent, immediate) { - var state = getSearchState(cm); - if (state.query) return findNext(cm, rev); - var q = cm.getSelection() || state.lastQuery; - if (q instanceof RegExp && q.source == "x^") q = null; - if (persistent && cm.openDialog) { - var hiding = null; - var searchNext = function (query, event) { - CodeMirror.e_stop(event); - if (!query) return; - if (query != state.queryText) { - startSearch(cm, state, query); - state.posFrom = state.posTo = cm.getCursor(); - } - if (hiding) hiding.style.opacity = 1; - findNext(cm, event.shiftKey, function (_, to) { - var dialog3; - if (to.line < 3 && document.querySelector && (dialog3 = cm.display.wrapper.querySelector(".CodeMirror-dialog")) && dialog3.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top) (hiding = dialog3).style.opacity = 0.4; - }); - }; - persistentDialog(cm, getQueryDialog(cm), q, searchNext, function (event, query) { - var keyName = CodeMirror.keyName(event); - var extra = cm.getOption("extraKeys"), - cmd = extra && extra[keyName] || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]; - if (cmd == "findNext" || cmd == "findPrev" || cmd == "findPersistentNext" || cmd == "findPersistentPrev") { - CodeMirror.e_stop(event); - startSearch(cm, getSearchState(cm), query); - cm.execCommand(cmd); - } else if (cmd == "find" || cmd == "findPersistent") { - CodeMirror.e_stop(event); - searchNext(query, event); - } - }); - if (immediate && q) { - startSearch(cm, state, q); - findNext(cm, rev); - } - } else { - dialog2(cm, getQueryDialog(cm), "Search for:", q, function (query) { - if (query && !state.query) cm.operation(function () { - startSearch(cm, state, query); - state.posFrom = state.posTo = cm.getCursor(); - findNext(cm, rev); - }); - }); - } - } - function findNext(cm, rev, callback) { - cm.operation(function () { - var state = getSearchState(cm); - var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo); - if (!cursor.find(rev)) { - cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0)); - if (!cursor.find(rev)) return; - } - cm.setSelection(cursor.from(), cursor.to()); - cm.scrollIntoView({ - from: cursor.from(), - to: cursor.to() - }, 20); - state.posFrom = cursor.from(); - state.posTo = cursor.to(); - if (callback) callback(cursor.from(), cursor.to()); - }); - } - function clearSearch(cm) { - cm.operation(function () { - var state = getSearchState(cm); - state.lastQuery = state.query; - if (!state.query) return; - state.query = state.queryText = null; - cm.removeOverlay(state.overlay); - if (state.annotate) { - state.annotate.clear(); - state.annotate = null; - } - }); - } - function el(tag, attrs) { - var element = tag ? document.createElement(tag) : document.createDocumentFragment(); - for (var key in attrs) { - element[key] = attrs[key]; - } - for (var i = 2; i < arguments.length; i++) { - var child = arguments[i]; - element.appendChild(typeof child == "string" ? document.createTextNode(child) : child); - } - return element; - } - function getQueryDialog(cm) { - return el("", null, el("span", { - className: "CodeMirror-search-label" - }, cm.phrase("Search:")), " ", el("input", { - type: "text", - "style": "width: 10em", - className: "CodeMirror-search-field" - }), " ", el("span", { - style: "color: #888", - className: "CodeMirror-search-hint" - }, cm.phrase("(Use /re/ syntax for regexp search)"))); - } - function getReplaceQueryDialog(cm) { - return el("", null, " ", el("input", { - type: "text", - "style": "width: 10em", - className: "CodeMirror-search-field" - }), " ", el("span", { - style: "color: #888", - className: "CodeMirror-search-hint" - }, cm.phrase("(Use /re/ syntax for regexp search)"))); - } - function getReplacementQueryDialog(cm) { - return el("", null, el("span", { - className: "CodeMirror-search-label" - }, cm.phrase("With:")), " ", el("input", { - type: "text", - "style": "width: 10em", - className: "CodeMirror-search-field" - })); - } - function getDoReplaceConfirm(cm) { - return el("", null, el("span", { - className: "CodeMirror-search-label" - }, cm.phrase("Replace?")), " ", el("button", {}, cm.phrase("Yes")), " ", el("button", {}, cm.phrase("No")), " ", el("button", {}, cm.phrase("All")), " ", el("button", {}, cm.phrase("Stop"))); - } - function replaceAll(cm, query, text) { - cm.operation(function () { - for (var cursor = getSearchCursor(cm, query); cursor.findNext();) { - if (typeof query != "string") { - var match = cm.getRange(cursor.from(), cursor.to()).match(query); - cursor.replace(text.replace(/\$(\d)/g, function (_, i) { - return match[i]; - })); - } else cursor.replace(text); - } - }); - } - function replace(cm, all) { - if (cm.getOption("readOnly")) return; - var query = cm.getSelection() || getSearchState(cm).lastQuery; - var dialogText = all ? cm.phrase("Replace all:") : cm.phrase("Replace:"); - var fragment = el("", null, el("span", { - className: "CodeMirror-search-label" - }, dialogText), getReplaceQueryDialog(cm)); - dialog2(cm, fragment, dialogText, query, function (query2) { - if (!query2) return; - query2 = parseQuery(query2); - dialog2(cm, getReplacementQueryDialog(cm), cm.phrase("Replace with:"), "", function (text) { - text = parseString(text); - if (all) { - replaceAll(cm, query2, text); - } else { - clearSearch(cm); - var cursor = getSearchCursor(cm, query2, cm.getCursor("from")); - var advance = function () { - var start = cursor.from(), - match; - if (!(match = cursor.findNext())) { - cursor = getSearchCursor(cm, query2); - if (!(match = cursor.findNext()) || start && cursor.from().line == start.line && cursor.from().ch == start.ch) return; - } - cm.setSelection(cursor.from(), cursor.to()); - cm.scrollIntoView({ - from: cursor.from(), - to: cursor.to() - }); - confirmDialog(cm, getDoReplaceConfirm(cm), cm.phrase("Replace?"), [function () { - doReplace(match); - }, advance, function () { - replaceAll(cm, query2, text); - }]); - }; - var doReplace = function (match) { - cursor.replace(typeof query2 == "string" ? text : text.replace(/\$(\d)/g, function (_, i) { - return match[i]; - })); - advance(); - }; - advance(); - } - }); - }); - } - CodeMirror.commands.find = function (cm) { - clearSearch(cm); - doSearch(cm); - }; - CodeMirror.commands.findPersistent = function (cm) { - clearSearch(cm); - doSearch(cm, false, true); - }; - CodeMirror.commands.findPersistentNext = function (cm) { - doSearch(cm, false, true, true); - }; - CodeMirror.commands.findPersistentPrev = function (cm) { - doSearch(cm, true, true, true); - }; - CodeMirror.commands.findNext = doSearch; - CodeMirror.commands.findPrev = function (cm) { - doSearch(cm, true); - }; - CodeMirror.commands.clearSearch = clearSearch; - CodeMirror.commands.replace = replace; - CodeMirror.commands.replaceAll = function (cm) { - replace(cm, true); - }; - }); -})(); -var searchExports = search$2.exports; -const search = /* @__PURE__ */codemirror.getDefaultExportFromCjs(searchExports); -const search$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: search -}, [searchExports]); -exports.search = search$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/searchcursor.cjs.js": -/*!*****************************************************!*\ - !*** ../../graphiql-react/dist/searchcursor.cjs.js ***! - \*****************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -const searchcursor$2 = __webpack_require__(/*! ./searchcursor.cjs2.js */ "../../graphiql-react/dist/searchcursor.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var searchcursorExports = searchcursor$2.requireSearchcursor(); -const searchcursor = /* @__PURE__ */codemirror.getDefaultExportFromCjs(searchcursorExports); -const searchcursor$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: searchcursor -}, [searchcursorExports]); -exports.searchcursor = searchcursor$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/searchcursor.cjs2.js": -/*!******************************************************!*\ - !*** ../../graphiql-react/dist/searchcursor.cjs2.js ***! - \******************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -var searchcursor = { - exports: {} -}; -var hasRequiredSearchcursor; -function requireSearchcursor() { - if (hasRequiredSearchcursor) return searchcursor.exports; - hasRequiredSearchcursor = 1; - (function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var Pos = CodeMirror.Pos; - function regexpFlags(regexp) { - var flags = regexp.flags; - return flags != null ? flags : (regexp.ignoreCase ? "i" : "") + (regexp.global ? "g" : "") + (regexp.multiline ? "m" : ""); - } - function ensureFlags(regexp, flags) { - var current = regexpFlags(regexp), - target = current; - for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1) target += flags.charAt(i); - return current == target ? regexp : new RegExp(regexp.source, target); - } - function maybeMultiline(regexp) { - return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source); - } - function searchRegexpForward(doc, regexp, start) { - regexp = ensureFlags(regexp, "g"); - for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) { - regexp.lastIndex = ch; - var string = doc.getLine(line), - match = regexp.exec(string); - if (match) return { - from: Pos(line, match.index), - to: Pos(line, match.index + match[0].length), - match - }; - } - } - function searchRegexpForwardMultiline(doc, regexp, start) { - if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start); - regexp = ensureFlags(regexp, "gm"); - var string, - chunk = 1; - for (var line = start.line, last = doc.lastLine(); line <= last;) { - for (var i = 0; i < chunk; i++) { - if (line > last) break; - var curLine = doc.getLine(line++); - string = string == null ? curLine : string + "\n" + curLine; - } - chunk = chunk * 2; - regexp.lastIndex = start.ch; - var match = regexp.exec(string); - if (match) { - var before = string.slice(0, match.index).split("\n"), - inside = match[0].split("\n"); - var startLine = start.line + before.length - 1, - startCh = before[before.length - 1].length; - return { - from: Pos(startLine, startCh), - to: Pos(startLine + inside.length - 1, inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length), - match - }; - } - } - } - function lastMatchIn(string, regexp, endMargin) { - var match, - from = 0; - while (from <= string.length) { - regexp.lastIndex = from; - var newMatch = regexp.exec(string); - if (!newMatch) break; - var end = newMatch.index + newMatch[0].length; - if (end > string.length - endMargin) break; - if (!match || end > match.index + match[0].length) match = newMatch; - from = newMatch.index + 1; - } - return match; - } - function searchRegexpBackward(doc, regexp, start) { - regexp = ensureFlags(regexp, "g"); - for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) { - var string = doc.getLine(line); - var match = lastMatchIn(string, regexp, ch < 0 ? 0 : string.length - ch); - if (match) return { - from: Pos(line, match.index), - to: Pos(line, match.index + match[0].length), - match - }; - } - } - function searchRegexpBackwardMultiline(doc, regexp, start) { - if (!maybeMultiline(regexp)) return searchRegexpBackward(doc, regexp, start); - regexp = ensureFlags(regexp, "gm"); - var string, - chunkSize = 1, - endMargin = doc.getLine(start.line).length - start.ch; - for (var line = start.line, first = doc.firstLine(); line >= first;) { - for (var i = 0; i < chunkSize && line >= first; i++) { - var curLine = doc.getLine(line--); - string = string == null ? curLine : curLine + "\n" + string; - } - chunkSize *= 2; - var match = lastMatchIn(string, regexp, endMargin); - if (match) { - var before = string.slice(0, match.index).split("\n"), - inside = match[0].split("\n"); - var startLine = line + before.length, - startCh = before[before.length - 1].length; - return { - from: Pos(startLine, startCh), - to: Pos(startLine + inside.length - 1, inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length), - match - }; - } - } - } - var doFold, noFold; - if (String.prototype.normalize) { - doFold = function (str) { - return str.normalize("NFD").toLowerCase(); - }; - noFold = function (str) { - return str.normalize("NFD"); - }; - } else { - doFold = function (str) { - return str.toLowerCase(); - }; - noFold = function (str) { - return str; - }; - } - function adjustPos(orig, folded, pos, foldFunc) { - if (orig.length == folded.length) return pos; - for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) { - if (min == max) return min; - var mid = min + max >> 1; - var len = foldFunc(orig.slice(0, mid)).length; - if (len == pos) return mid;else if (len > pos) max = mid;else min = mid + 1; - } - } - function searchStringForward(doc, query, start, caseFold) { - if (!query.length) return null; - var fold = caseFold ? doFold : noFold; - var lines = fold(query).split(/\r|\n\r?/); - search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) { - var orig = doc.getLine(line).slice(ch), - string = fold(orig); - if (lines.length == 1) { - var found = string.indexOf(lines[0]); - if (found == -1) continue search; - var start = adjustPos(orig, string, found, fold) + ch; - return { - from: Pos(line, adjustPos(orig, string, found, fold) + ch), - to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch) - }; - } else { - var cutFrom = string.length - lines[0].length; - if (string.slice(cutFrom) != lines[0]) continue search; - for (var i = 1; i < lines.length - 1; i++) if (fold(doc.getLine(line + i)) != lines[i]) continue search; - var end = doc.getLine(line + lines.length - 1), - endString = fold(end), - lastLine = lines[lines.length - 1]; - if (endString.slice(0, lastLine.length) != lastLine) continue search; - return { - from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch), - to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold)) - }; - } - } - } - function searchStringBackward(doc, query, start, caseFold) { - if (!query.length) return null; - var fold = caseFold ? doFold : noFold; - var lines = fold(query).split(/\r|\n\r?/); - search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) { - var orig = doc.getLine(line); - if (ch > -1) orig = orig.slice(0, ch); - var string = fold(orig); - if (lines.length == 1) { - var found = string.lastIndexOf(lines[0]); - if (found == -1) continue search; - return { - from: Pos(line, adjustPos(orig, string, found, fold)), - to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold)) - }; - } else { - var lastLine = lines[lines.length - 1]; - if (string.slice(0, lastLine.length) != lastLine) continue search; - for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++) if (fold(doc.getLine(start + i)) != lines[i]) continue search; - var top = doc.getLine(line + 1 - lines.length), - topString = fold(top); - if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search; - return { - from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)), - to: Pos(line, adjustPos(orig, string, lastLine.length, fold)) - }; - } - } - } - function SearchCursor(doc, query, pos, options) { - this.atOccurrence = false; - this.afterEmptyMatch = false; - this.doc = doc; - pos = pos ? doc.clipPos(pos) : Pos(0, 0); - this.pos = { - from: pos, - to: pos - }; - var caseFold; - if (typeof options == "object") { - caseFold = options.caseFold; - } else { - caseFold = options; - options = null; - } - if (typeof query == "string") { - if (caseFold == null) caseFold = false; - this.matches = function (reverse, pos2) { - return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos2, caseFold); - }; - } else { - query = ensureFlags(query, "gm"); - if (!options || options.multiline !== false) this.matches = function (reverse, pos2) { - return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos2); - };else this.matches = function (reverse, pos2) { - return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos2); - }; - } - } - SearchCursor.prototype = { - findNext: function () { - return this.find(false); - }, - findPrevious: function () { - return this.find(true); - }, - find: function (reverse) { - var head = this.doc.clipPos(reverse ? this.pos.from : this.pos.to); - if (this.afterEmptyMatch && this.atOccurrence) { - head = Pos(head.line, head.ch); - if (reverse) { - head.ch--; - if (head.ch < 0) { - head.line--; - head.ch = (this.doc.getLine(head.line) || "").length; - } - } else { - head.ch++; - if (head.ch > (this.doc.getLine(head.line) || "").length) { - head.ch = 0; - head.line++; - } - } - if (CodeMirror.cmpPos(head, this.doc.clipPos(head)) != 0) { - return this.atOccurrence = false; - } - } - var result = this.matches(reverse, head); - this.afterEmptyMatch = result && CodeMirror.cmpPos(result.from, result.to) == 0; - if (result) { - this.pos = result; - this.atOccurrence = true; - return this.pos.match || true; - } else { - var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0); - this.pos = { - from: end, - to: end - }; - return this.atOccurrence = false; - } - }, - from: function () { - if (this.atOccurrence) return this.pos.from; - }, - to: function () { - if (this.atOccurrence) return this.pos.to; - }, - replace: function (newText, origin) { - if (!this.atOccurrence) return; - var lines = CodeMirror.splitLines(newText); - this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin); - this.pos.to = Pos(this.pos.from.line + lines.length - 1, lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0)); - } - }; - CodeMirror.defineExtension("getSearchCursor", function (query, pos, caseFold) { - return new SearchCursor(this.doc, query, pos, caseFold); - }); - CodeMirror.defineDocExtension("getSearchCursor", function (query, pos, caseFold) { - return new SearchCursor(this, query, pos, caseFold); - }); - CodeMirror.defineExtension("selectMatches", function (query, caseFold) { - var ranges = []; - var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold); - while (cur.findNext()) { - if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break; - ranges.push({ - anchor: cur.from(), - head: cur.to() - }); - } - if (ranges.length) this.setSelections(ranges, 0); - }); - }); - })(); - return searchcursor.exports; -} -exports.requireSearchcursor = requireSearchcursor; - -/***/ }), - -/***/ "../../graphiql-react/dist/show-hint.cjs.js": -/*!**************************************************!*\ - !*** ../../graphiql-react/dist/show-hint.cjs.js ***! - \**************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var showHint$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror()); - })(function (CodeMirror) { - var HINT_ELEMENT_CLASS = "CodeMirror-hint"; - var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active"; - CodeMirror.showHint = function (cm, getHints, options) { - if (!getHints) return cm.showHint(options); - if (options && options.async) getHints.async = true; - var newOpts = { - hint: getHints - }; - if (options) for (var prop in options) newOpts[prop] = options[prop]; - return cm.showHint(newOpts); - }; - CodeMirror.defineExtension("showHint", function (options) { - options = parseOptions(this, this.getCursor("start"), options); - var selections = this.listSelections(); - if (selections.length > 1) return; - if (this.somethingSelected()) { - if (!options.hint.supportsSelection) return; - for (var i = 0; i < selections.length; i++) if (selections[i].head.line != selections[i].anchor.line) return; - } - if (this.state.completionActive) this.state.completionActive.close(); - var completion = this.state.completionActive = new Completion(this, options); - if (!completion.options.hint) return; - CodeMirror.signal(this, "startCompletion", this); - completion.update(true); - }); - CodeMirror.defineExtension("closeHint", function () { - if (this.state.completionActive) this.state.completionActive.close(); - }); - function Completion(cm, options) { - this.cm = cm; - this.options = options; - this.widget = null; - this.debounce = 0; - this.tick = 0; - this.startPos = this.cm.getCursor("start"); - this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length; - if (this.options.updateOnCursorActivity) { - var self = this; - cm.on("cursorActivity", this.activityFunc = function () { - self.cursorActivity(); - }); - } - } - var requestAnimationFrame = window.requestAnimationFrame || function (fn) { - return setTimeout(fn, 1e3 / 60); - }; - var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout; - Completion.prototype = { - close: function () { - if (!this.active()) return; - this.cm.state.completionActive = null; - this.tick = null; - if (this.options.updateOnCursorActivity) { - this.cm.off("cursorActivity", this.activityFunc); - } - if (this.widget && this.data) CodeMirror.signal(this.data, "close"); - if (this.widget) this.widget.close(); - CodeMirror.signal(this.cm, "endCompletion", this.cm); - }, - active: function () { - return this.cm.state.completionActive == this; - }, - pick: function (data, i) { - var completion = data.list[i], - self = this; - this.cm.operation(function () { - if (completion.hint) completion.hint(self.cm, data, completion);else self.cm.replaceRange(getText(completion), completion.from || data.from, completion.to || data.to, "complete"); - CodeMirror.signal(data, "pick", completion); - self.cm.scrollIntoView(); - }); - if (this.options.closeOnPick) { - this.close(); - } - }, - cursorActivity: function () { - if (this.debounce) { - cancelAnimationFrame(this.debounce); - this.debounce = 0; - } - var identStart = this.startPos; - if (this.data) { - identStart = this.data.from; - } - var pos = this.cm.getCursor(), - line = this.cm.getLine(pos.line); - if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch || pos.ch < identStart.ch || this.cm.somethingSelected() || !pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1))) { - this.close(); - } else { - var self = this; - this.debounce = requestAnimationFrame(function () { - self.update(); - }); - if (this.widget) this.widget.disable(); - } - }, - update: function (first) { - if (this.tick == null) return; - var self = this, - myTick = ++this.tick; - fetchHints(this.options.hint, this.cm, this.options, function (data) { - if (self.tick == myTick) self.finishUpdate(data, first); - }); - }, - finishUpdate: function (data, first) { - if (this.data) CodeMirror.signal(this.data, "update"); - var picked = this.widget && this.widget.picked || first && this.options.completeSingle; - if (this.widget) this.widget.close(); - this.data = data; - if (data && data.list.length) { - if (picked && data.list.length == 1) { - this.pick(data, 0); - } else { - this.widget = new Widget(this, data); - CodeMirror.signal(data, "shown"); - } - } - } - }; - function parseOptions(cm, pos, options) { - var editor = cm.options.hintOptions; - var out = {}; - for (var prop in defaultOptions) out[prop] = defaultOptions[prop]; - if (editor) { - for (var prop in editor) if (editor[prop] !== void 0) out[prop] = editor[prop]; - } - if (options) { - for (var prop in options) if (options[prop] !== void 0) out[prop] = options[prop]; - } - if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos); - return out; - } - function getText(completion) { - if (typeof completion == "string") return completion;else return completion.text; - } - function buildKeyMap(completion, handle) { - var baseMap = { - Up: function () { - handle.moveFocus(-1); - }, - Down: function () { - handle.moveFocus(1); - }, - PageUp: function () { - handle.moveFocus(-handle.menuSize() + 1, true); - }, - PageDown: function () { - handle.moveFocus(handle.menuSize() - 1, true); - }, - Home: function () { - handle.setFocus(0); - }, - End: function () { - handle.setFocus(handle.length - 1); - }, - Enter: handle.pick, - Tab: handle.pick, - Esc: handle.close - }; - var mac = /Mac/.test(navigator.platform); - if (mac) { - baseMap["Ctrl-P"] = function () { - handle.moveFocus(-1); - }; - baseMap["Ctrl-N"] = function () { - handle.moveFocus(1); - }; - } - var custom = completion.options.customKeys; - var ourMap = custom ? {} : baseMap; - function addBinding(key2, val) { - var bound; - if (typeof val != "string") bound = function (cm) { - return val(cm, handle); - };else if (baseMap.hasOwnProperty(val)) bound = baseMap[val];else bound = val; - ourMap[key2] = bound; - } - if (custom) { - for (var key in custom) if (custom.hasOwnProperty(key)) addBinding(key, custom[key]); - } - var extra = completion.options.extraKeys; - if (extra) { - for (var key in extra) if (extra.hasOwnProperty(key)) addBinding(key, extra[key]); - } - return ourMap; - } - function getHintElement(hintsElement, el) { - while (el && el != hintsElement) { - if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el; - el = el.parentNode; - } - } - function Widget(completion, data) { - this.id = "cm-complete-" + Math.floor(Math.random(1e6)); - this.completion = completion; - this.data = data; - this.picked = false; - var widget = this, - cm = completion.cm; - var ownerDocument = cm.getInputField().ownerDocument; - var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow; - var hints = this.hints = ownerDocument.createElement("ul"); - hints.setAttribute("role", "listbox"); - hints.setAttribute("aria-expanded", "true"); - hints.id = this.id; - var theme = completion.cm.options.theme; - hints.className = "CodeMirror-hints " + theme; - this.selectedHint = data.selectedHint || 0; - var completions = data.list; - for (var i = 0; i < completions.length; ++i) { - var elt = hints.appendChild(ownerDocument.createElement("li")), - cur = completions[i]; - var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS); - if (cur.className != null) className = cur.className + " " + className; - elt.className = className; - if (i == this.selectedHint) elt.setAttribute("aria-selected", "true"); - elt.id = this.id + "-" + i; - elt.setAttribute("role", "option"); - if (cur.render) cur.render(elt, data, cur);else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur))); - elt.hintId = i; - } - var container = completion.options.container || ownerDocument.body; - var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null); - var left = pos.left, - top = pos.bottom, - below = true; - var offsetLeft = 0, - offsetTop = 0; - if (container !== ownerDocument.body) { - var isContainerPositioned = ["absolute", "relative", "fixed"].indexOf(parentWindow.getComputedStyle(container).position) !== -1; - var offsetParent = isContainerPositioned ? container : container.offsetParent; - var offsetParentPosition = offsetParent.getBoundingClientRect(); - var bodyPosition = ownerDocument.body.getBoundingClientRect(); - offsetLeft = offsetParentPosition.left - bodyPosition.left - offsetParent.scrollLeft; - offsetTop = offsetParentPosition.top - bodyPosition.top - offsetParent.scrollTop; - } - hints.style.left = left - offsetLeft + "px"; - hints.style.top = top - offsetTop + "px"; - var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth); - var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight); - container.appendChild(hints); - cm.getInputField().setAttribute("aria-autocomplete", "list"); - cm.getInputField().setAttribute("aria-owns", this.id); - cm.getInputField().setAttribute("aria-activedescendant", this.id + "-" + this.selectedHint); - var box = completion.options.moveOnOverlap ? hints.getBoundingClientRect() : new DOMRect(); - var scrolls = completion.options.paddingForScrollbar ? hints.scrollHeight > hints.clientHeight + 1 : false; - var startScroll; - setTimeout(function () { - startScroll = cm.getScrollInfo(); - }); - var overlapY = box.bottom - winH; - if (overlapY > 0) { - var height = box.bottom - box.top, - curTop = pos.top - (pos.bottom - box.top); - if (curTop - height > 0) { - hints.style.top = (top = pos.top - height - offsetTop) + "px"; - below = false; - } else if (height > winH) { - hints.style.height = winH - 5 + "px"; - hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px"; - var cursor = cm.getCursor(); - if (data.from.ch != cursor.ch) { - pos = cm.cursorCoords(cursor); - hints.style.left = (left = pos.left - offsetLeft) + "px"; - box = hints.getBoundingClientRect(); - } - } - } - var overlapX = box.right - winW; - if (scrolls) overlapX += cm.display.nativeBarWidth; - if (overlapX > 0) { - if (box.right - box.left > winW) { - hints.style.width = winW - 5 + "px"; - overlapX -= box.right - box.left - winW; - } - hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px"; - } - if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling) node.style.paddingRight = cm.display.nativeBarWidth + "px"; - cm.addKeyMap(this.keyMap = buildKeyMap(completion, { - moveFocus: function (n, avoidWrap) { - widget.changeActive(widget.selectedHint + n, avoidWrap); - }, - setFocus: function (n) { - widget.changeActive(n); - }, - menuSize: function () { - return widget.screenAmount(); - }, - length: completions.length, - close: function () { - completion.close(); - }, - pick: function () { - widget.pick(); - }, - data - })); - if (completion.options.closeOnUnfocus) { - var closingOnBlur; - cm.on("blur", this.onBlur = function () { - closingOnBlur = setTimeout(function () { - completion.close(); - }, 100); - }); - cm.on("focus", this.onFocus = function () { - clearTimeout(closingOnBlur); - }); - } - cm.on("scroll", this.onScroll = function () { - var curScroll = cm.getScrollInfo(), - editor = cm.getWrapperElement().getBoundingClientRect(); - if (!startScroll) startScroll = cm.getScrollInfo(); - var newTop = top + startScroll.top - curScroll.top; - var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop); - if (!below) point += hints.offsetHeight; - if (point <= editor.top || point >= editor.bottom) return completion.close(); - hints.style.top = newTop + "px"; - hints.style.left = left + startScroll.left - curScroll.left + "px"; - }); - CodeMirror.on(hints, "dblclick", function (e) { - var t = getHintElement(hints, e.target || e.srcElement); - if (t && t.hintId != null) { - widget.changeActive(t.hintId); - widget.pick(); - } - }); - CodeMirror.on(hints, "click", function (e) { - var t = getHintElement(hints, e.target || e.srcElement); - if (t && t.hintId != null) { - widget.changeActive(t.hintId); - if (completion.options.completeOnSingleClick) widget.pick(); - } - }); - CodeMirror.on(hints, "mousedown", function () { - setTimeout(function () { - cm.focus(); - }, 20); - }); - var selectedHintRange = this.getSelectedHintRange(); - if (selectedHintRange.from !== 0 || selectedHintRange.to !== 0) { - this.scrollToActive(); - } - CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]); - return true; - } - Widget.prototype = { - close: function () { - if (this.completion.widget != this) return; - this.completion.widget = null; - if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints); - this.completion.cm.removeKeyMap(this.keyMap); - var input = this.completion.cm.getInputField(); - input.removeAttribute("aria-activedescendant"); - input.removeAttribute("aria-owns"); - var cm = this.completion.cm; - if (this.completion.options.closeOnUnfocus) { - cm.off("blur", this.onBlur); - cm.off("focus", this.onFocus); - } - cm.off("scroll", this.onScroll); - }, - disable: function () { - this.completion.cm.removeKeyMap(this.keyMap); - var widget = this; - this.keyMap = { - Enter: function () { - widget.picked = true; - } - }; - this.completion.cm.addKeyMap(this.keyMap); - }, - pick: function () { - this.completion.pick(this.data, this.selectedHint); - }, - changeActive: function (i, avoidWrap) { - if (i >= this.data.list.length) i = avoidWrap ? this.data.list.length - 1 : 0;else if (i < 0) i = avoidWrap ? 0 : this.data.list.length - 1; - if (this.selectedHint == i) return; - var node = this.hints.childNodes[this.selectedHint]; - if (node) { - node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, ""); - node.removeAttribute("aria-selected"); - } - node = this.hints.childNodes[this.selectedHint = i]; - node.className += " " + ACTIVE_HINT_ELEMENT_CLASS; - node.setAttribute("aria-selected", "true"); - this.completion.cm.getInputField().setAttribute("aria-activedescendant", node.id); - this.scrollToActive(); - CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node); - }, - scrollToActive: function () { - var selectedHintRange = this.getSelectedHintRange(); - var node1 = this.hints.childNodes[selectedHintRange.from]; - var node2 = this.hints.childNodes[selectedHintRange.to]; - var firstNode = this.hints.firstChild; - if (node1.offsetTop < this.hints.scrollTop) this.hints.scrollTop = node1.offsetTop - firstNode.offsetTop;else if (node2.offsetTop + node2.offsetHeight > this.hints.scrollTop + this.hints.clientHeight) this.hints.scrollTop = node2.offsetTop + node2.offsetHeight - this.hints.clientHeight + firstNode.offsetTop; - }, - screenAmount: function () { - return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1; - }, - getSelectedHintRange: function () { - var margin = this.completion.options.scrollMargin || 0; - return { - from: Math.max(0, this.selectedHint - margin), - to: Math.min(this.data.list.length - 1, this.selectedHint + margin) - }; - } - }; - function applicableHelpers(cm, helpers) { - if (!cm.somethingSelected()) return helpers; - var result = []; - for (var i = 0; i < helpers.length; i++) if (helpers[i].supportsSelection) result.push(helpers[i]); - return result; - } - function fetchHints(hint, cm, options, callback) { - if (hint.async) { - hint(cm, callback, options); - } else { - var result = hint(cm, options); - if (result && result.then) result.then(callback);else callback(result); - } - } - function resolveAutoHints(cm, pos) { - var helpers = cm.getHelpers(pos, "hint"), - words; - if (helpers.length) { - var resolved = function (cm2, callback, options) { - var app = applicableHelpers(cm2, helpers); - function run(i) { - if (i == app.length) return callback(null); - fetchHints(app[i], cm2, options, function (result) { - if (result && result.list.length > 0) callback(result);else run(i + 1); - }); - } - run(0); - }; - resolved.async = true; - resolved.supportsSelection = true; - return resolved; - } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) { - return function (cm2) { - return CodeMirror.hint.fromList(cm2, { - words - }); - }; - } else if (CodeMirror.hint.anyword) { - return function (cm2, options) { - return CodeMirror.hint.anyword(cm2, options); - }; - } else { - return function () {}; - } - } - CodeMirror.registerHelper("hint", "auto", { - resolve: resolveAutoHints - }); - CodeMirror.registerHelper("hint", "fromList", function (cm, options) { - var cur = cm.getCursor(), - token = cm.getTokenAt(cur); - var term, - from = CodeMirror.Pos(cur.line, token.start), - to = cur; - if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) { - term = token.string.substr(0, cur.ch - token.start); - } else { - term = ""; - from = cur; - } - var found = []; - for (var i = 0; i < options.words.length; i++) { - var word = options.words[i]; - if (word.slice(0, term.length) == term) found.push(word); - } - if (found.length) return { - list: found, - from, - to - }; - }); - CodeMirror.commands.autocomplete = CodeMirror.showHint; - var defaultOptions = { - hint: CodeMirror.hint.auto, - completeSingle: true, - alignWithWord: true, - closeCharacters: /[\s()\[\]{};:>,]/, - closeOnPick: true, - closeOnUnfocus: true, - updateOnCursorActivity: true, - completeOnSingleClick: true, - container: null, - customKeys: null, - extraKeys: null, - paddingForScrollbar: true, - moveOnOverlap: true - }; - CodeMirror.defineOption("hintOptions", null); - }); -})(); -var showHintExports = showHint$2.exports; -const showHint = /* @__PURE__ */codemirror.getDefaultExportFromCjs(showHintExports); -const showHint$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: showHint -}, [showHintExports]); -exports.showHint = showHint$1; - -/***/ }), - -/***/ "../../graphiql-react/dist/sublime.cjs.js": -/*!************************************************!*\ - !*** ../../graphiql-react/dist/sublime.cjs.js ***! - \************************************************/ -/***/ (function(__unused_webpack_module, exports, __webpack_require__) { - - - -const codemirror = __webpack_require__(/*! ./codemirror.cjs2.js */ "../../graphiql-react/dist/codemirror.cjs2.js"); -const searchcursor = __webpack_require__(/*! ./searchcursor.cjs2.js */ "../../graphiql-react/dist/searchcursor.cjs2.js"); -const matchbrackets = __webpack_require__(/*! ./matchbrackets.cjs2.js */ "../../graphiql-react/dist/matchbrackets.cjs2.js"); -function _mergeNamespaces(n, m) { - for (var i = 0; i < m.length; i++) { - const e = m[i]; - if (typeof e !== "string" && !Array.isArray(e)) { - for (const k in e) { - if (k !== "default" && !(k in n)) { - const d = Object.getOwnPropertyDescriptor(e, k); - if (d) { - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: () => e[k] - }); - } - } - } - } - } - return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { - value: "Module" - })); -} -var sublime$2 = { - exports: {} -}; -(function (module2, exports2) { - (function (mod) { - mod(codemirror.requireCodemirror(), searchcursor.requireSearchcursor(), matchbrackets.requireMatchbrackets()); - })(function (CodeMirror) { - var cmds = CodeMirror.commands; - var Pos = CodeMirror.Pos; - function findPosSubword(doc, start, dir) { - if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1)); - var line = doc.getLine(start.line); - if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0)); - var state = "start", - type, - startPos = start.ch; - for (var pos = startPos, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) { - var next = line.charAt(dir < 0 ? pos - 1 : pos); - var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o"; - if (cat == "w" && next.toUpperCase() == next) cat = "W"; - if (state == "start") { - if (cat != "o") { - state = "in"; - type = cat; - } else startPos = pos + dir; - } else if (state == "in") { - if (type != cat) { - if (type == "w" && cat == "W" && dir < 0) pos--; - if (type == "W" && cat == "w" && dir > 0) { - if (pos == startPos + 1) { - type = "w"; - continue; - } else pos--; - } - break; - } - } - } - return Pos(start.line, pos); - } - function moveSubword(cm, dir) { - cm.extendSelectionsBy(function (range) { - if (cm.display.shift || cm.doc.extend || range.empty()) return findPosSubword(cm.doc, range.head, dir);else return dir < 0 ? range.from() : range.to(); - }); - } - cmds.goSubwordLeft = function (cm) { - moveSubword(cm, -1); - }; - cmds.goSubwordRight = function (cm) { - moveSubword(cm, 1); - }; - cmds.scrollLineUp = function (cm) { - var info = cm.getScrollInfo(); - if (!cm.somethingSelected()) { - var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local"); - if (cm.getCursor().line >= visibleBottomLine) cm.execCommand("goLineUp"); - } - cm.scrollTo(null, info.top - cm.defaultTextHeight()); - }; - cmds.scrollLineDown = function (cm) { - var info = cm.getScrollInfo(); - if (!cm.somethingSelected()) { - var visibleTopLine = cm.lineAtHeight(info.top, "local") + 1; - if (cm.getCursor().line <= visibleTopLine) cm.execCommand("goLineDown"); - } - cm.scrollTo(null, info.top + cm.defaultTextHeight()); - }; - cmds.splitSelectionByLine = function (cm) { - var ranges = cm.listSelections(), - lineRanges = []; - for (var i = 0; i < ranges.length; i++) { - var from = ranges[i].from(), - to = ranges[i].to(); - for (var line = from.line; line <= to.line; ++line) if (!(to.line > from.line && line == to.line && to.ch == 0)) lineRanges.push({ - anchor: line == from.line ? from : Pos(line, 0), - head: line == to.line ? to : Pos(line) - }); - } - cm.setSelections(lineRanges, 0); - }; - cmds.singleSelectionTop = function (cm) { - var range = cm.listSelections()[0]; - cm.setSelection(range.anchor, range.head, { - scroll: false - }); - }; - cmds.selectLine = function (cm) { - var ranges = cm.listSelections(), - extended = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - extended.push({ - anchor: Pos(range.from().line, 0), - head: Pos(range.to().line + 1, 0) - }); - } - cm.setSelections(extended); - }; - function insertLine(cm, above) { - if (cm.isReadOnly()) return CodeMirror.Pass; - cm.operation(function () { - var len = cm.listSelections().length, - newSelection = [], - last = -1; - for (var i = 0; i < len; i++) { - var head = cm.listSelections()[i].head; - if (head.line <= last) continue; - var at = Pos(head.line + (above ? 0 : 1), 0); - cm.replaceRange("\n", at, null, "+insertLine"); - cm.indentLine(at.line, null, true); - newSelection.push({ - head: at, - anchor: at - }); - last = head.line + 1; - } - cm.setSelections(newSelection); - }); - cm.execCommand("indentAuto"); - } - cmds.insertLineAfter = function (cm) { - return insertLine(cm, false); - }; - cmds.insertLineBefore = function (cm) { - return insertLine(cm, true); - }; - function wordAt(cm, pos) { - var start = pos.ch, - end = start, - line = cm.getLine(pos.line); - while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start; - while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end; - return { - from: Pos(pos.line, start), - to: Pos(pos.line, end), - word: line.slice(start, end) - }; - } - cmds.selectNextOccurrence = function (cm) { - var from = cm.getCursor("from"), - to = cm.getCursor("to"); - var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel; - if (CodeMirror.cmpPos(from, to) == 0) { - var word = wordAt(cm, from); - if (!word.word) return; - cm.setSelection(word.from, word.to); - fullWord = true; - } else { - var text = cm.getRange(from, to); - var query = fullWord ? new RegExp("\\b" + text + "\\b") : text; - var cur = cm.getSearchCursor(query, to); - var found = cur.findNext(); - if (!found) { - cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0)); - found = cur.findNext(); - } - if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to())) return; - cm.addSelection(cur.from(), cur.to()); - } - if (fullWord) cm.state.sublimeFindFullWord = cm.doc.sel; - }; - cmds.skipAndSelectNextOccurrence = function (cm) { - var prevAnchor = cm.getCursor("anchor"), - prevHead = cm.getCursor("head"); - cmds.selectNextOccurrence(cm); - if (CodeMirror.cmpPos(prevAnchor, prevHead) != 0) { - cm.doc.setSelections(cm.doc.listSelections().filter(function (sel) { - return sel.anchor != prevAnchor || sel.head != prevHead; - })); - } - }; - function addCursorToSelection(cm, dir) { - var ranges = cm.listSelections(), - newRanges = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - var newAnchor = cm.findPosV(range.anchor, dir, "line", range.anchor.goalColumn); - var newHead = cm.findPosV(range.head, dir, "line", range.head.goalColumn); - newAnchor.goalColumn = range.anchor.goalColumn != null ? range.anchor.goalColumn : cm.cursorCoords(range.anchor, "div").left; - newHead.goalColumn = range.head.goalColumn != null ? range.head.goalColumn : cm.cursorCoords(range.head, "div").left; - var newRange = { - anchor: newAnchor, - head: newHead - }; - newRanges.push(range); - newRanges.push(newRange); - } - cm.setSelections(newRanges); - } - cmds.addCursorToPrevLine = function (cm) { - addCursorToSelection(cm, -1); - }; - cmds.addCursorToNextLine = function (cm) { - addCursorToSelection(cm, 1); - }; - function isSelectedRange(ranges, from, to) { - for (var i = 0; i < ranges.length; i++) if (CodeMirror.cmpPos(ranges[i].from(), from) == 0 && CodeMirror.cmpPos(ranges[i].to(), to) == 0) return true; - return false; - } - var mirror = "(){}[]"; - function selectBetweenBrackets(cm) { - var ranges = cm.listSelections(), - newRanges = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], - pos = range.head, - opening = cm.scanForBracket(pos, -1); - if (!opening) return false; - for (;;) { - var closing = cm.scanForBracket(pos, 1); - if (!closing) return false; - if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) { - var startPos = Pos(opening.pos.line, opening.pos.ch + 1); - if (CodeMirror.cmpPos(startPos, range.from()) == 0 && CodeMirror.cmpPos(closing.pos, range.to()) == 0) { - opening = cm.scanForBracket(opening.pos, -1); - if (!opening) return false; - } else { - newRanges.push({ - anchor: startPos, - head: closing.pos - }); - break; - } - } - pos = Pos(closing.pos.line, closing.pos.ch + 1); - } - } - cm.setSelections(newRanges); - return true; - } - cmds.selectScope = function (cm) { - selectBetweenBrackets(cm) || cm.execCommand("selectAll"); - }; - cmds.selectBetweenBrackets = function (cm) { - if (!selectBetweenBrackets(cm)) return CodeMirror.Pass; - }; - function puncType(type) { - return !type ? null : /\bpunctuation\b/.test(type) ? type : void 0; - } - cmds.goToBracket = function (cm) { - cm.extendSelectionsBy(function (range) { - var next = cm.scanForBracket(range.head, 1, puncType(cm.getTokenTypeAt(range.head))); - if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos; - var prev = cm.scanForBracket(range.head, -1, puncType(cm.getTokenTypeAt(Pos(range.head.line, range.head.ch + 1)))); - return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head; - }); - }; - cmds.swapLineUp = function (cm) { - if (cm.isReadOnly()) return CodeMirror.Pass; - var ranges = cm.listSelections(), - linesToMove = [], - at = cm.firstLine() - 1, - newSels = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], - from = range.from().line - 1, - to = range.to().line; - newSels.push({ - anchor: Pos(range.anchor.line - 1, range.anchor.ch), - head: Pos(range.head.line - 1, range.head.ch) - }); - if (range.to().ch == 0 && !range.empty()) --to; - if (from > at) linesToMove.push(from, to);else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; - at = to; - } - cm.operation(function () { - for (var i2 = 0; i2 < linesToMove.length; i2 += 2) { - var from2 = linesToMove[i2], - to2 = linesToMove[i2 + 1]; - var line = cm.getLine(from2); - cm.replaceRange("", Pos(from2, 0), Pos(from2 + 1, 0), "+swapLine"); - if (to2 > cm.lastLine()) cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");else cm.replaceRange(line + "\n", Pos(to2, 0), null, "+swapLine"); - } - cm.setSelections(newSels); - cm.scrollIntoView(); - }); - }; - cmds.swapLineDown = function (cm) { - if (cm.isReadOnly()) return CodeMirror.Pass; - var ranges = cm.listSelections(), - linesToMove = [], - at = cm.lastLine() + 1; - for (var i = ranges.length - 1; i >= 0; i--) { - var range = ranges[i], - from = range.to().line + 1, - to = range.from().line; - if (range.to().ch == 0 && !range.empty()) from--; - if (from < at) linesToMove.push(from, to);else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to; - at = to; - } - cm.operation(function () { - for (var i2 = linesToMove.length - 2; i2 >= 0; i2 -= 2) { - var from2 = linesToMove[i2], - to2 = linesToMove[i2 + 1]; - var line = cm.getLine(from2); - if (from2 == cm.lastLine()) cm.replaceRange("", Pos(from2 - 1), Pos(from2), "+swapLine");else cm.replaceRange("", Pos(from2, 0), Pos(from2 + 1, 0), "+swapLine"); - cm.replaceRange(line + "\n", Pos(to2, 0), null, "+swapLine"); - } - cm.scrollIntoView(); - }); - }; - cmds.toggleCommentIndented = function (cm) { - cm.toggleComment({ - indent: true - }); - }; - cmds.joinLines = function (cm) { - var ranges = cm.listSelections(), - joined = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i], - from = range.from(); - var start = from.line, - end = range.to().line; - while (i < ranges.length - 1 && ranges[i + 1].from().line == end) end = ranges[++i].to().line; - joined.push({ - start, - end, - anchor: !range.empty() && from - }); - } - cm.operation(function () { - var offset = 0, - ranges2 = []; - for (var i2 = 0; i2 < joined.length; i2++) { - var obj = joined[i2]; - var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), - head; - for (var line = obj.start; line <= obj.end; line++) { - var actual = line - offset; - if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1); - if (actual < cm.lastLine()) { - cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length)); - ++offset; - } - } - ranges2.push({ - anchor: anchor || head, - head - }); - } - cm.setSelections(ranges2, 0); - }); - }; - cmds.duplicateLine = function (cm) { - cm.operation(function () { - var rangeCount = cm.listSelections().length; - for (var i = 0; i < rangeCount; i++) { - var range = cm.listSelections()[i]; - if (range.empty()) cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));else cm.replaceRange(cm.getRange(range.from(), range.to()), range.from()); - } - cm.scrollIntoView(); - }); - }; - function sortLines(cm, caseSensitive, direction) { - if (cm.isReadOnly()) return CodeMirror.Pass; - var ranges = cm.listSelections(), - toSort = [], - selected; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.empty()) continue; - var from = range.from().line, - to = range.to().line; - while (i < ranges.length - 1 && ranges[i + 1].from().line == to) to = ranges[++i].to().line; - if (!ranges[i].to().ch) to--; - toSort.push(from, to); - } - if (toSort.length) selected = true;else toSort.push(cm.firstLine(), cm.lastLine()); - cm.operation(function () { - var ranges2 = []; - for (var i2 = 0; i2 < toSort.length; i2 += 2) { - var from2 = toSort[i2], - to2 = toSort[i2 + 1]; - var start = Pos(from2, 0), - end = Pos(to2); - var lines = cm.getRange(start, end, false); - if (caseSensitive) lines.sort(function (a, b) { - return a < b ? -direction : a == b ? 0 : direction; - });else lines.sort(function (a, b) { - var au = a.toUpperCase(), - bu = b.toUpperCase(); - if (au != bu) { - a = au; - b = bu; - } - return a < b ? -direction : a == b ? 0 : direction; - }); - cm.replaceRange(lines, start, end); - if (selected) ranges2.push({ - anchor: start, - head: Pos(to2 + 1, 0) - }); - } - if (selected) cm.setSelections(ranges2, 0); - }); - } - cmds.sortLines = function (cm) { - sortLines(cm, true, 1); - }; - cmds.reverseSortLines = function (cm) { - sortLines(cm, true, -1); - }; - cmds.sortLinesInsensitive = function (cm) { - sortLines(cm, false, 1); - }; - cmds.reverseSortLinesInsensitive = function (cm) { - sortLines(cm, false, -1); - }; - cmds.nextBookmark = function (cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) while (marks.length) { - var current = marks.shift(); - var found = current.find(); - if (found) { - marks.push(current); - return cm.setSelection(found.from, found.to); - } - } - }; - cmds.prevBookmark = function (cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) while (marks.length) { - marks.unshift(marks.pop()); - var found = marks[marks.length - 1].find(); - if (!found) marks.pop();else return cm.setSelection(found.from, found.to); - } - }; - cmds.toggleBookmark = function (cm) { - var ranges = cm.listSelections(); - var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []); - for (var i = 0; i < ranges.length; i++) { - var from = ranges[i].from(), - to = ranges[i].to(); - var found = ranges[i].empty() ? cm.findMarksAt(from) : cm.findMarks(from, to); - for (var j = 0; j < found.length; j++) { - if (found[j].sublimeBookmark) { - found[j].clear(); - for (var k = 0; k < marks.length; k++) if (marks[k] == found[j]) marks.splice(k--, 1); - break; - } - } - if (j == found.length) marks.push(cm.markText(from, to, { - sublimeBookmark: true, - clearWhenEmpty: false - })); - } - }; - cmds.clearBookmarks = function (cm) { - var marks = cm.state.sublimeBookmarks; - if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear(); - marks.length = 0; - }; - cmds.selectBookmarks = function (cm) { - var marks = cm.state.sublimeBookmarks, - ranges = []; - if (marks) for (var i = 0; i < marks.length; i++) { - var found = marks[i].find(); - if (!found) marks.splice(i--, 0);else ranges.push({ - anchor: found.from, - head: found.to - }); - } - if (ranges.length) cm.setSelections(ranges, 0); - }; - function modifyWordOrSelection(cm, mod) { - cm.operation(function () { - var ranges = cm.listSelections(), - indices = [], - replacements = []; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (range.empty()) { - indices.push(i); - replacements.push(""); - } else replacements.push(mod(cm.getRange(range.from(), range.to()))); - } - cm.replaceSelections(replacements, "around", "case"); - for (var i = indices.length - 1, at; i >= 0; i--) { - var range = ranges[indices[i]]; - if (at && CodeMirror.cmpPos(range.head, at) > 0) continue; - var word = wordAt(cm, range.head); - at = word.from; - cm.replaceRange(mod(word.word), word.from, word.to); - } - }); - } - cmds.smartBackspace = function (cm) { - if (cm.somethingSelected()) return CodeMirror.Pass; - cm.operation(function () { - var cursors = cm.listSelections(); - var indentUnit = cm.getOption("indentUnit"); - for (var i = cursors.length - 1; i >= 0; i--) { - var cursor = cursors[i].head; - var toStartOfLine = cm.getRange({ - line: cursor.line, - ch: 0 - }, cursor); - var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize")); - var deletePos = cm.findPosH(cursor, -1, "char", false); - if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) { - var prevIndent = new Pos(cursor.line, CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit)); - if (prevIndent.ch != cursor.ch) deletePos = prevIndent; - } - cm.replaceRange("", deletePos, cursor, "+delete"); - } - }); - }; - cmds.delLineRight = function (cm) { - cm.operation(function () { - var ranges = cm.listSelections(); - for (var i = ranges.length - 1; i >= 0; i--) cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete"); - cm.scrollIntoView(); - }); - }; - cmds.upcaseAtCursor = function (cm) { - modifyWordOrSelection(cm, function (str) { - return str.toUpperCase(); - }); - }; - cmds.downcaseAtCursor = function (cm) { - modifyWordOrSelection(cm, function (str) { - return str.toLowerCase(); - }); - }; - cmds.setSublimeMark = function (cm) { - if (cm.state.sublimeMark) cm.state.sublimeMark.clear(); - cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); - }; - cmds.selectToSublimeMark = function (cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) cm.setSelection(cm.getCursor(), found); - }; - cmds.deleteToSublimeMark = function (cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) { - var from = cm.getCursor(), - to = found; - if (CodeMirror.cmpPos(from, to) > 0) { - var tmp = to; - to = from; - from = tmp; - } - cm.state.sublimeKilled = cm.getRange(from, to); - cm.replaceRange("", from, to); - } - }; - cmds.swapWithSublimeMark = function (cm) { - var found = cm.state.sublimeMark && cm.state.sublimeMark.find(); - if (found) { - cm.state.sublimeMark.clear(); - cm.state.sublimeMark = cm.setBookmark(cm.getCursor()); - cm.setCursor(found); - } - }; - cmds.sublimeYank = function (cm) { - if (cm.state.sublimeKilled != null) cm.replaceSelection(cm.state.sublimeKilled, null, "paste"); - }; - cmds.showInCenter = function (cm) { - var pos = cm.cursorCoords(null, "local"); - cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2); - }; - function getTarget(cm) { - var from = cm.getCursor("from"), - to = cm.getCursor("to"); - if (CodeMirror.cmpPos(from, to) == 0) { - var word = wordAt(cm, from); - if (!word.word) return; - from = word.from; - to = word.to; - } - return { - from, - to, - query: cm.getRange(from, to), - word - }; - } - function findAndGoTo(cm, forward) { - var target = getTarget(cm); - if (!target) return; - var query = target.query; - var cur = cm.getSearchCursor(query, forward ? target.to : target.from); - if (forward ? cur.findNext() : cur.findPrevious()) { - cm.setSelection(cur.from(), cur.to()); - } else { - cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0) : cm.clipPos(Pos(cm.lastLine()))); - if (forward ? cur.findNext() : cur.findPrevious()) cm.setSelection(cur.from(), cur.to());else if (target.word) cm.setSelection(target.from, target.to); - } - } - cmds.findUnder = function (cm) { - findAndGoTo(cm, true); - }; - cmds.findUnderPrevious = function (cm) { - findAndGoTo(cm, false); - }; - cmds.findAllUnder = function (cm) { - var target = getTarget(cm); - if (!target) return; - var cur = cm.getSearchCursor(target.query); - var matches = []; - var primaryIndex = -1; - while (cur.findNext()) { - matches.push({ - anchor: cur.from(), - head: cur.to() - }); - if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch) primaryIndex++; - } - cm.setSelections(matches, primaryIndex); - }; - var keyMap = CodeMirror.keyMap; - keyMap.macSublime = { - "Cmd-Left": "goLineStartSmart", - "Shift-Tab": "indentLess", - "Shift-Ctrl-K": "deleteLine", - "Alt-Q": "wrapLines", - "Ctrl-Left": "goSubwordLeft", - "Ctrl-Right": "goSubwordRight", - "Ctrl-Alt-Up": "scrollLineUp", - "Ctrl-Alt-Down": "scrollLineDown", - "Cmd-L": "selectLine", - "Shift-Cmd-L": "splitSelectionByLine", - "Esc": "singleSelectionTop", - "Cmd-Enter": "insertLineAfter", - "Shift-Cmd-Enter": "insertLineBefore", - "Cmd-D": "selectNextOccurrence", - "Shift-Cmd-Space": "selectScope", - "Shift-Cmd-M": "selectBetweenBrackets", - "Cmd-M": "goToBracket", - "Cmd-Ctrl-Up": "swapLineUp", - "Cmd-Ctrl-Down": "swapLineDown", - "Cmd-/": "toggleCommentIndented", - "Cmd-J": "joinLines", - "Shift-Cmd-D": "duplicateLine", - "F5": "sortLines", - "Shift-F5": "reverseSortLines", - "Cmd-F5": "sortLinesInsensitive", - "Shift-Cmd-F5": "reverseSortLinesInsensitive", - "F2": "nextBookmark", - "Shift-F2": "prevBookmark", - "Cmd-F2": "toggleBookmark", - "Shift-Cmd-F2": "clearBookmarks", - "Alt-F2": "selectBookmarks", - "Backspace": "smartBackspace", - "Cmd-K Cmd-D": "skipAndSelectNextOccurrence", - "Cmd-K Cmd-K": "delLineRight", - "Cmd-K Cmd-U": "upcaseAtCursor", - "Cmd-K Cmd-L": "downcaseAtCursor", - "Cmd-K Cmd-Space": "setSublimeMark", - "Cmd-K Cmd-A": "selectToSublimeMark", - "Cmd-K Cmd-W": "deleteToSublimeMark", - "Cmd-K Cmd-X": "swapWithSublimeMark", - "Cmd-K Cmd-Y": "sublimeYank", - "Cmd-K Cmd-C": "showInCenter", - "Cmd-K Cmd-G": "clearBookmarks", - "Cmd-K Cmd-Backspace": "delLineLeft", - "Cmd-K Cmd-1": "foldAll", - "Cmd-K Cmd-0": "unfoldAll", - "Cmd-K Cmd-J": "unfoldAll", - "Ctrl-Shift-Up": "addCursorToPrevLine", - "Ctrl-Shift-Down": "addCursorToNextLine", - "Cmd-F3": "findUnder", - "Shift-Cmd-F3": "findUnderPrevious", - "Alt-F3": "findAllUnder", - "Shift-Cmd-[": "fold", - "Shift-Cmd-]": "unfold", - "Cmd-I": "findIncremental", - "Shift-Cmd-I": "findIncrementalReverse", - "Cmd-H": "replace", - "F3": "findNext", - "Shift-F3": "findPrev", - "fallthrough": "macDefault" - }; - CodeMirror.normalizeKeyMap(keyMap.macSublime); - keyMap.pcSublime = { - "Shift-Tab": "indentLess", - "Shift-Ctrl-K": "deleteLine", - "Alt-Q": "wrapLines", - "Ctrl-T": "transposeChars", - "Alt-Left": "goSubwordLeft", - "Alt-Right": "goSubwordRight", - "Ctrl-Up": "scrollLineUp", - "Ctrl-Down": "scrollLineDown", - "Ctrl-L": "selectLine", - "Shift-Ctrl-L": "splitSelectionByLine", - "Esc": "singleSelectionTop", - "Ctrl-Enter": "insertLineAfter", - "Shift-Ctrl-Enter": "insertLineBefore", - "Ctrl-D": "selectNextOccurrence", - "Shift-Ctrl-Space": "selectScope", - "Shift-Ctrl-M": "selectBetweenBrackets", - "Ctrl-M": "goToBracket", - "Shift-Ctrl-Up": "swapLineUp", - "Shift-Ctrl-Down": "swapLineDown", - "Ctrl-/": "toggleCommentIndented", - "Ctrl-J": "joinLines", - "Shift-Ctrl-D": "duplicateLine", - "F9": "sortLines", - "Shift-F9": "reverseSortLines", - "Ctrl-F9": "sortLinesInsensitive", - "Shift-Ctrl-F9": "reverseSortLinesInsensitive", - "F2": "nextBookmark", - "Shift-F2": "prevBookmark", - "Ctrl-F2": "toggleBookmark", - "Shift-Ctrl-F2": "clearBookmarks", - "Alt-F2": "selectBookmarks", - "Backspace": "smartBackspace", - "Ctrl-K Ctrl-D": "skipAndSelectNextOccurrence", - "Ctrl-K Ctrl-K": "delLineRight", - "Ctrl-K Ctrl-U": "upcaseAtCursor", - "Ctrl-K Ctrl-L": "downcaseAtCursor", - "Ctrl-K Ctrl-Space": "setSublimeMark", - "Ctrl-K Ctrl-A": "selectToSublimeMark", - "Ctrl-K Ctrl-W": "deleteToSublimeMark", - "Ctrl-K Ctrl-X": "swapWithSublimeMark", - "Ctrl-K Ctrl-Y": "sublimeYank", - "Ctrl-K Ctrl-C": "showInCenter", - "Ctrl-K Ctrl-G": "clearBookmarks", - "Ctrl-K Ctrl-Backspace": "delLineLeft", - "Ctrl-K Ctrl-1": "foldAll", - "Ctrl-K Ctrl-0": "unfoldAll", - "Ctrl-K Ctrl-J": "unfoldAll", - "Ctrl-Alt-Up": "addCursorToPrevLine", - "Ctrl-Alt-Down": "addCursorToNextLine", - "Ctrl-F3": "findUnder", - "Shift-Ctrl-F3": "findUnderPrevious", - "Alt-F3": "findAllUnder", - "Shift-Ctrl-[": "fold", - "Shift-Ctrl-]": "unfold", - "Ctrl-I": "findIncremental", - "Shift-Ctrl-I": "findIncrementalReverse", - "Ctrl-H": "replace", - "F3": "findNext", - "Shift-F3": "findPrev", - "fallthrough": "pcDefault" - }; - CodeMirror.normalizeKeyMap(keyMap.pcSublime); - var mac = keyMap.default == keyMap.macDefault; - keyMap.sublime = mac ? keyMap.macSublime : keyMap.pcSublime; - }); -})(); -var sublimeExports = sublime$2.exports; -const sublime = /* @__PURE__ */codemirror.getDefaultExportFromCjs(sublimeExports); -const sublime$1 = /* @__PURE__ */_mergeNamespaces({ - __proto__: null, - default: sublime -}, [sublimeExports]); -exports.sublime = sublime$1; - -/***/ }), - /***/ "../../graphiql-toolkit/dist/esm/async-helpers/index.js": /*!**************************************************************!*\ !*** ../../graphiql-toolkit/dist/esm/async-helpers/index.js ***! \**************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78192,6 +83470,7 @@ async function fetcherReturnToPromise(fetcherResult) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78259,6 +83538,7 @@ exports.__forAwait = __forAwait; \***********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78292,6 +83572,7 @@ function createGraphiQLFetcher(options) { \***************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78329,6 +83610,7 @@ var _createFetcher = __webpack_require__(/*! ./createFetcher */ "../../graphiql- \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78445,6 +83727,7 @@ async function getWsFetcher(options, fetcherOpts) { \***************************************************************/ /***/ (function() { +"use strict"; /***/ }), @@ -78455,6 +83738,7 @@ async function getWsFetcher(options, fetcherOpts) { \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78495,6 +83779,7 @@ function formatResult(result) { \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78608,6 +83893,7 @@ function isFieldType(fieldType) { \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78655,6 +83941,7 @@ Object.keys(_operationName).forEach(function (key) { \********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78762,6 +84049,7 @@ function mergeAst(documentAST, schema) { \*************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78794,6 +84082,7 @@ function getSelectedOperationName(prevOperations, prevSelectedOperationName, ope \************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78863,6 +84152,7 @@ Object.keys(_storage).forEach(function (key) { \*******************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78937,6 +84227,7 @@ const STORAGE_NAMESPACE = "graphiql"; \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -78972,6 +84263,7 @@ function createLocalStorage({ \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -79074,6 +84366,7 @@ exports.HistoryStore = HistoryStore; \********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -79132,6 +84425,7 @@ Object.keys(_custom).forEach(function (key) { \********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -79194,12 +84488,13 @@ exports.QueryStore = QueryStore; /***/ }), -/***/ "./components/GraphiQL.tsx": -/*!*********************************!*\ - !*** ./components/GraphiQL.tsx ***! - \*********************************/ +/***/ "./GraphiQL.tsx": +/*!**********************!*\ + !*** ./GraphiQL.tsx ***! + \**********************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -79817,6 +85112,7 @@ function isChildComponentType(child, component) { \***************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -80117,6 +85413,7 @@ var _utils = __webpack_require__(/*! ./utils */ "../../graphql-language-service/ \*************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -80223,6 +85520,7 @@ exports.getFieldInsertText = getFieldInsertText; \**********************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -80863,6 +86161,7 @@ function unwrapType(state) { \*********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81085,6 +86384,7 @@ function getDefinitionForArgumentDefinition(path, text, definition) { \**********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81207,6 +86507,7 @@ function getLocation(node) { \***************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81400,6 +86701,7 @@ function text(into, content) { \******************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81535,6 +86837,7 @@ function concatMap(arr, fn) { \*************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81615,6 +86918,7 @@ var _getHoverInformation = __webpack_require__(/*! ./getHoverInformation */ "../ \********************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81734,6 +87038,7 @@ exports["default"] = CharacterStream; \****************************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81788,6 +87093,7 @@ function p(value, style) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -81992,6 +87298,7 @@ function type(style) { \********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82116,6 +87423,7 @@ function getContextAtPosition(queryText, cursor, schema, contextToken, options) \****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82333,6 +87641,7 @@ function getTypeInfo(schema, tokenState) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82494,6 +87803,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de \*****************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82715,6 +88025,7 @@ function lex(lexRules, stream) { \**********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82763,6 +88074,7 @@ const RuleKinds = exports.RuleKinds = Object.assign(Object.assign({}, _graphql.K \***************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82825,6 +88137,7 @@ var CompletionItemKind; \*********************************************************/ /***/ (function(__unused_webpack_module, exports) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82890,6 +88203,7 @@ function locToRange(text, loc) { \********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -82930,6 +88244,7 @@ function collectVariables(schema, documentAST) { \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83000,6 +88315,7 @@ exports.getFragmentDependenciesForAST = getFragmentDependenciesForAST; \************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83040,6 +88356,7 @@ function pointToOffset(text, point) { \*********************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83086,6 +88403,7 @@ const getQueryFacts = exports.getQueryFacts = getOperationFacts; \**************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83325,6 +88643,7 @@ function getVariablesJSONSchema(variableToType, options) { \*********************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83432,6 +88751,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; \***************************************************************************/ /***/ (function(__unused_webpack_module, exports, __webpack_require__) { +"use strict"; Object.defineProperty(exports, "__esModule", ({ @@ -83479,6 +88799,7 @@ function validateWithCustomRules(schema, ast, customRules, isRelayCompatMode, is \*******************/ /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { +"use strict"; __webpack_require__.r(__webpack_exports__); // extracted by mini-css-extract-plugin @@ -83491,6 +88812,7 @@ __webpack_require__.r(__webpack_exports__); \*******************************************/ /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { +"use strict"; __webpack_require__.r(__webpack_exports__); // extracted by mini-css-extract-plugin @@ -83503,6 +88825,7 @@ __webpack_require__.r(__webpack_exports__); \***********************************************/ /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { +"use strict"; __webpack_require__.r(__webpack_exports__); // extracted by mini-css-extract-plugin @@ -83515,6 +88838,7 @@ __webpack_require__.r(__webpack_exports__); \********************************************/ /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { +"use strict"; __webpack_require__.r(__webpack_exports__); // extracted by mini-css-extract-plugin @@ -83527,6 +88851,7 @@ __webpack_require__.r(__webpack_exports__); \************************/ /***/ (function(module) { +"use strict"; module.exports = window["React"]; /***/ }), @@ -83537,6 +88862,7 @@ module.exports = window["React"]; \***************************/ /***/ (function(module) { +"use strict"; module.exports = window["ReactDOM"]; /***/ }), @@ -83547,6 +88873,7 @@ module.exports = window["ReactDOM"]; \***********************************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; var __create = Object.create; var __defProp = Object.defineProperty; @@ -90708,6 +96035,7 @@ var Transition = Object.assign(TransitionRoot, { Child, Root: TransitionRoot }); \**************************************************************/ /***/ (function(module, __unused_webpack_exports, __webpack_require__) { +"use strict"; if (false) {} else { @@ -90723,6 +96051,7 @@ if (false) {} else { \***************************************************************/ /***/ (function(module) { +"use strict"; function _extends() { @@ -90800,8 +96129,9 @@ module.exports = _extends, module.exports.__esModule = true, module.exports["def /******/ /************************************************************************/ var __webpack_exports__ = {}; -// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. +// This entry need to be wrapped in an IIFE because it need to be in strict mode. !function() { +"use strict"; var exports = __webpack_exports__; /*!****************!*\ !*** ./cdn.ts ***! @@ -90815,7 +96145,7 @@ exports["default"] = void 0; var GraphiQLReact = _interopRequireWildcard(__webpack_require__(/*! @graphiql/react */ "../../graphiql-react/dist/index.js")); var _toolkit = __webpack_require__(/*! @graphiql/toolkit */ "../../graphiql-toolkit/dist/esm/index.js"); var GraphQL = _interopRequireWildcard(__webpack_require__(/*! graphql */ "../../../node_modules/graphql/index.mjs")); -var _GraphiQL = __webpack_require__(/*! ./components/GraphiQL */ "./components/GraphiQL.tsx"); +var _GraphiQL = __webpack_require__(/*! ./GraphiQL */ "./GraphiQL.tsx"); __webpack_require__(/*! @graphiql/react/font/roboto.css */ "../../graphiql-react/font/roboto.css"); __webpack_require__(/*! @graphiql/react/font/fira-code.css */ "../../graphiql-react/font/fira-code.css"); __webpack_require__(/*! @graphiql/react/dist/style.css */ "../../graphiql-react/dist/style.css"); diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 1492913d94d3a12bd2e178c2c6d77d7e9b1dce51..4661582a3ffd9468ca9a0efe8fdc95c5c3855d0d 100644 GIT binary patch delta 782 zcmZXS&r20i6vt8D!5_VdM@|lU7- ztXQmEtlCKQFY_zQi4_%z!Elyc419(@J8g}%78sdV3QB9i7w5b(7TtK3K;ux0P-X*4 za>Ziwrj*zouFKn0p(Gs;ldm;EV|Cgmmc|I*Y67WFFBUZ|5CzJYBxp7%G0@X3%b)SQ z?tDO8rL!v_Mvf9UWVSP@o8-18o|wcr%d*tI(6Ogb)fs7T=SdkdQrTK8`owT--$AdJ z+ByF2SE4Otq8Fkf{IS}P9ZzIvjMij$t|@GSghqDCvmKlWJQt}oE)po(40}mlyTzNQ z;W!`2Kucy+H$7wul6?|&kGsPulTt_12afgge(+lxt z7}*_0VA&tb-!_4I3I>ZY3Z(1oG&V?O!iJL>FiZ8(jN}#mGt9FQ9 zV05lv6YJ8otAoarO+$>U^N!7&3C-n4N^k+efZr4#U7As`5m?kCe#tpZ6rI!nsLhK z5SXT*=wVDfTkdYcl>AkNiab_>s}ldvTNhd+;G~`_@}nzc;N;K8#@gDX>l*514W3zY z_DjK%OR8}6v=If^C4LxqB);T^Ob{lFraa$l diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index bfe749fd7191bffdf1f69f1e0d1ba1bd34466a24..d94269b5df242edad06ee43c5e12a766b88bf50c 100644 GIT binary patch delta 3889 zcmaJ^Yit}>71lWRv7@9LC$XJpTj$X~5U(`Vl*Tx=9@GuI=@D zy^szj=hsumFxR2?GtQ9-E?X$7>XLlLMINbmzHf)E8Ih2}w;NAsvdlh9O9&N+9} zShV8L%-nPD{m$z<=iYhmtMxBDS$}BOm@S)KFkAl9idT=6+sf+3UmdA9{P47Cc^##O z^(*1ElvA{WEQ)#)N)7UtV|i_*V%{hT`BO4-4gSpE}pjj<2|M>D)og~)Uj z<}b&)Pgw)QCQo*b$V++q$qg~r@y5yAQ7z8NR+ZpwJ+w{r%EG-oo-`S;V6vo5TcfsG z-acg)ZBf|GPn&}mBTTESmlcLfF(DJW(c^_JH5@=*q}6lqt(}-Chgy8h3l*)}z%ZFh z+TvaFFlpRbLK7V{j#AjIV!(ac3r80k1$>|#x{U^RrX9Y%b}P+?30)2DVvwk}hkfES z>Bz`*%4AB!@WnW+j>{Y|#^*>Jg)gI~xHW(GIPIZi5K|nDL;>liq19l|LmoCM=y8n1 zVb#M9@rFpzd1tw`pX_KgB@2yaFPqnD_VH`lWD6C8+w|p+VSP8ODC>x!zZ=#qPX-#q zdgUEdD#bZ#bVs|PP`)C@Tlxti!29g9D2#RCwVy#9R`-KvS)B0`WQUa#ipHYY*biIh z$(w>~<)_N~2)qkV^%L0Z^T7I)Rj`>SgEBd81hH!X)-M)9gozs}5yV3S@EN1qJvIQX z#`2^vEFq-hn2iKe?%W=@$M8rkCcKmpE9=y%!?r&d$w^kkO+YpHQAjs2r7MPf zirnp3w1Rvpn)Igb94NJfgtB*(J~>`ANr9x)OPNdY5gYsVNNI7rtOKRhRH*iD>a^ss zw7h-8@~wLsS5=rEPOj871c~g~$K<7m&@s{@ou$EakNqA#OCcGy{Xuaow}U`a!|ug5 z;G@ce^2ja<5&bi@$pwSpOqrd^C` zc(OOd^f*xB1g+aoV->^BH(~Ln06P?-hwTfLtSA{!dXdV4E+8pVL`{<0797p50?Ib9p1;26`C~~ zeKUMUIe~G0SwX!|;>(+J_=~sTm6cOr4rLD?7@ZU~Dh(b-XYi@N!I7$IKA_cL-re|j zIA$2_c>HZx>nXB>;$762WP+9e16AI>U!Ur{GXkqeL*?gx5~N#ycY) zt~m|UMh8A~8bX`05+;Y~*FP3vV6kH)aA$&#l`$+o1I=a0AU=Ku)?xn{Sh~DJG{%`6 zeUvU`>DhEut5({E*UrG2s&*Om`Ec1;XsDq%c2@{Wl%r^beAsgqzUCR?Hp5I|s0>~^ z3xByMC9**gW${n{fbObcEy`iTIe2i1j%g_uRuOldgFW>rrlsmI^QGGlod`|B7O}*d zz~9lGPz$#YNWxS2>kF{XXuxw9V6(9mJr`lk z!UnM^G!((+i?FdQ8NuBbpa0vfw=-%FJsf@3MTczsXbv{E`vo>SF42#X2k;9qm)LN(T2iIZSDmv!HX-C;~h)I9n$CWXKA6^Hw zUn`Qf!P*E`-$tYxQ!{6EcjSUIs2rb3cONl;DlX2K6F#Eiaw>F%8fDIAt;{gHw}8+7 z6E+{zsVm7pK4-Gh%u828%2aGZT2`EHE(9P!%LeG4Cx!{+r*CCTD9~hXtVKNLs9Na& z9WJz${Ma(j5te+KgOtMtGl$vtVNKf|r{}NbGx3uV=~NEgWjRo3eEoe`v5;J#-rHp6 z@e~iqEE@XF9r(vNsQEvvsQ+J9(8Y90h{CsBXKx`i$Y{pUO<1?JNmFn)W2v;P zmODT=6=Bc__t6+vs+z%PZo-C@WCLlJtF>fV7|S(r{3f&$YUM51P*V`pFzvItCU!7T ze;yyb1));Qi|6t1EvT!awn=)a9lm%AA}jAUQHNq=sc4V+{sC-* zywA=#1+2aec>m}`AZhBdmmetl%d)a<0dj=@;HKQ)+=eB$7Y*f7`vZdq5|blj=KGba f%Ez+#3H-w8$~t%XjmqbsJdw}m+?PMBe5CTf=j4Os delta 3650 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, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: marcpaulchand , 2025\n" "Language-Team: French (https://app.transifex.com/netbox-community/teams/178115/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -158,7 +159,7 @@ msgstr "Inactif" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -170,8 +171,8 @@ msgstr "Région (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Région (slug)" @@ -181,8 +182,8 @@ msgstr "Région (slug)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Groupe de sites (ID)" @@ -193,7 +194,7 @@ msgstr "Groupe de sites (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -263,8 +264,8 @@ msgstr "Site" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -283,13 +284,13 @@ msgstr "Numéro d'AS" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Fournisseur (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Fournisseur (slug)" @@ -318,8 +319,8 @@ msgstr "Type de circuit (slug)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Site (ID)" @@ -673,7 +674,7 @@ msgstr "Identifiant de compte du prestataire" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1108,7 +1109,7 @@ msgstr "Affectation" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1548,7 +1549,7 @@ msgstr "Bande passante garantie" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2954,7 +2955,7 @@ msgid "Parent site group (slug)" msgstr "Groupe de sites parents (slug)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Groupe (ID)" @@ -3004,23 +3005,23 @@ msgstr "Fabricant (slug)" #: netbox/dcim/filtersets.py:393 msgid "Rack type (slug)" -msgstr "Type de rack (limace)" +msgstr "Type de baie (slug)" #: netbox/dcim/filtersets.py:397 msgid "Rack type (ID)" -msgstr "Type de rack (ID)" +msgstr "Type de baie (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Rôle (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rôle (slug)" @@ -3218,7 +3219,7 @@ msgstr "VDC (IDENTIFIANT)" msgid "Device model" msgstr "Modèle d'appareil" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Interface (ID)" @@ -3232,8 +3233,8 @@ msgid "Module bay (ID)" msgstr "Baie modulaire (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Appareil (ID)" @@ -3242,8 +3243,8 @@ msgstr "Appareil (ID)" msgid "Rack (name)" msgstr "Baie (nom)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Appareil (nom)" @@ -3295,9 +3296,9 @@ msgstr "VID attribué" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3324,19 +3325,19 @@ msgstr "VID attribué" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (IDENTIFIANT)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3441,7 +3442,7 @@ msgstr "Panneau d'alimentation (ID)" #: netbox/templates/inc/panels/tags.html:5 #: netbox/utilities/forms/fields/fields.py:81 msgid "Tags" -msgstr "Balises" +msgstr "Étiquettes" #: netbox/dcim/forms/bulk_create.py:112 netbox/dcim/forms/filtersets.py:1498 #: netbox/dcim/forms/model_forms.py:488 netbox/dcim/forms/model_forms.py:546 @@ -3498,7 +3499,7 @@ msgstr "Fuseau horaire" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3597,7 +3598,7 @@ msgstr "Unité de poids" #: netbox/dcim/forms/model_forms.py:217 netbox/dcim/forms/model_forms.py:256 #: netbox/templates/dcim/rack.html:45 netbox/templates/dcim/racktype.html:13 msgid "Rack Type" -msgstr "Type de rack" +msgstr "Type de baie" #: netbox/dcim/forms/bulk_edit.py:299 netbox/dcim/forms/model_forms.py:220 #: netbox/dcim/forms/model_forms.py:297 @@ -3749,7 +3750,7 @@ msgid "Device Type" msgstr "Type d'appareil" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3857,7 +3858,7 @@ msgstr "Cluster" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4098,22 +4099,22 @@ msgstr "groupe VLAN" #: netbox/virtualization/forms/bulk_edit.py:248 #: netbox/virtualization/forms/model_forms.py:326 msgid "Untagged VLAN" -msgstr "VLAN non balisé" +msgstr "VLAN non étiqueté" #: netbox/dcim/forms/bulk_edit.py:1508 netbox/dcim/forms/model_forms.py:1376 #: netbox/dcim/tables/devices.py:585 #: netbox/virtualization/forms/bulk_edit.py:256 #: netbox/virtualization/forms/model_forms.py:335 msgid "Tagged VLANs" -msgstr "VLAN balisés" +msgstr "VLAN étiqueté" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Ajouter des VLANs étiquetés" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Retirer des VLANs étiquetés" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4161,7 +4162,7 @@ msgstr "Commutation 802.1Q" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Ajouter/Supprimer" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4170,7 +4171,7 @@ msgstr "Le mode d'interface doit être spécifié pour attribuer des VLAN" #: netbox/dcim/forms/bulk_edit.py:1624 netbox/dcim/forms/common.py:50 msgid "An access interface cannot have tagged VLANs assigned." msgstr "" -"Des tags de VLAN ne peuvent pas être associés à une interface d'accès." +"Des étiquettes de VLAN ne peuvent pas être associés à une interface d'accès." #: netbox/dcim/forms/bulk_import.py:64 msgid "Name of parent region" @@ -4212,11 +4213,11 @@ msgstr "Emplacement introuvable." #: netbox/dcim/forms/bulk_import.py:185 msgid "The manufacturer of this rack type" -msgstr "Le fabricant de ce type de rack" +msgstr "Le fabricant de ce type de baie" #: netbox/dcim/forms/bulk_import.py:196 msgid "The lowest-numbered position in the rack" -msgstr "La position la plus basse du rack" +msgstr "La position la plus basse de la baie" #: netbox/dcim/forms/bulk_import.py:201 netbox/dcim/forms/bulk_import.py:276 msgid "Rail-to-rail width (in inches)" @@ -4228,7 +4229,7 @@ msgstr "Unité pour les dimensions extérieures" #: netbox/dcim/forms/bulk_import.py:213 netbox/dcim/forms/bulk_import.py:298 msgid "Unit for rack weights" -msgstr "Unité poids de la baie" +msgstr "Unité de poids de la baie" #: netbox/dcim/forms/bulk_import.py:245 msgid "Name of assigned tenant" @@ -4240,7 +4241,7 @@ msgstr "Nom du rôle attribué" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Modèle de baie" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4656,8 +4657,9 @@ msgid "" "The tagged VLANs ({vlans}) must belong to the same site as the interface's " "parent device/VM, or they must be global" msgstr "" -"Les VLAN balisés ({vlans}) doivent appartenir au même site que l'appareil/la" -" machine virtuelle parent de l'interface, ou ils doivent être globaux" +"Les VLAN étiquetés ({vlans}) doivent appartenir au même site que " +"l'appareil/la machine virtuelle parente de l'interface, ou ils doivent être " +"globaux" #: netbox/dcim/forms/common.py:126 msgid "" @@ -4863,7 +4865,7 @@ msgstr "Identifiant" #: netbox/dcim/forms/model_forms.py:259 msgid "Select a pre-defined rack type, or set physical characteristics below." msgstr "" -"Sélectionnez un type de rack prédéfini ou définissez les caractéristiques " +"Sélectionnez un type de baie prédéfini ou définissez les caractéristiques " "physiques ci-dessous." #: netbox/dcim/forms/model_forms.py:265 @@ -5637,7 +5639,7 @@ msgstr "réseaux locaux sans fil" #: netbox/dcim/models/device_components.py:697 #: netbox/virtualization/models/virtualmachines.py:335 msgid "untagged VLAN" -msgstr "VLAN non balisé" +msgstr "VLAN non étiqueté" #: netbox/dcim/models/device_components.py:703 #: netbox/virtualization/models/virtualmachines.py:341 @@ -5786,7 +5788,7 @@ msgid "" "The untagged VLAN ({untagged_vlan}) must belong to the same site as the " "interface's parent device, or it must be global." msgstr "" -"Le VLAN non balisé ({untagged_vlan}) doit appartenir au même site que " +"Le VLAN non étiqueté ({untagged_vlan}) doit appartenir au même site que " "l'appareil parent de l'interface, ou il doit être global." #: netbox/dcim/models/device_components.py:990 @@ -6494,11 +6496,11 @@ msgstr "facteur de forme" #: netbox/dcim/models/racks.py:162 msgid "rack type" -msgstr "type de rack" +msgstr "type de baie" #: netbox/dcim/models/racks.py:163 msgid "rack types" -msgstr "types de rayonnages" +msgstr "types de baies" #: netbox/dcim/models/racks.py:180 netbox/dcim/models/racks.py:379 msgid "Must specify a unit when setting an outer width/depth" @@ -6852,7 +6854,7 @@ msgstr "Baies pour modules" msgid "Inventory items" msgstr "Articles d'inventaire" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Module Bay" @@ -7135,7 +7137,7 @@ msgstr "Réservations" #: netbox/dcim/views.py:757 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" -msgstr "Appareils non rackés" +msgstr "Appareils non mis en baie" #: netbox/dcim/views.py:2086 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 @@ -7584,12 +7586,12 @@ msgstr "Signets" msgid "Show your personal bookmarks" msgstr "Afficher vos favoris personnels" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Type d'action inconnu pour une règle d'événement : {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "" @@ -7632,11 +7634,11 @@ msgstr "Groupe de locataires (slug)" #: netbox/extras/filtersets.py:623 netbox/extras/forms/model_forms.py:495 #: netbox/templates/extras/tag.html:11 msgid "Tag" -msgstr "Balise" +msgstr "Étiquette" #: netbox/extras/filtersets.py:629 msgid "Tag (slug)" -msgstr "Tag (slug)" +msgstr "Étiquette (slug)" #: netbox/extras/filtersets.py:689 netbox/extras/forms/filtersets.py:429 msgid "Has local config context data" @@ -7932,7 +7934,7 @@ msgstr "Type d'action" #: netbox/extras/forms/filtersets.py:307 msgid "Tagged object type" -msgstr "Type d'objet balisé" +msgstr "Type d'objet étiqueté" #: netbox/extras/forms/filtersets.py:312 msgid "Allowed object type" @@ -9066,7 +9068,7 @@ msgstr "étiquette" #: netbox/extras/models/tags.py:50 msgid "tags" -msgstr "balises" +msgstr "étiquettes" #: netbox/extras/models/tags.py:78 msgid "tagged item" @@ -9395,129 +9397,129 @@ msgstr "Exportation de L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Exportation de L2VPN (identifiant)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Préfixe" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIRE (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (slug)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "Dans le préfixe" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "Dans le préfixe et y compris" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Préfixes contenant ce préfixe ou cette adresse IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Longueur du masque" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (IDENTIFIANT)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "Numéro de VLAN (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Adresse" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Plages contenant ce préfixe ou cette adresse IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Préfixe parent" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Machine virtuelle (nom)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Machine virtuelle (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Interface (nom)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "Interface de machine virtuelle (nom)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "Interface de machine virtuelle (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "Groupe FHRP (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Est affecté à une interface" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Est attribué" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Service (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "Adresse IP intérieure NAT (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Interface attribuée" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Interface de machine virtuelle attribuée" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "Adresse IP (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "Adresse IP" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "IPv4 principal (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "IPv6 principal (ID)" @@ -9606,7 +9608,7 @@ msgstr "Longueur du préfixe" #: netbox/ipam/forms/bulk_edit.py:268 netbox/ipam/forms/filtersets.py:241 #: netbox/templates/ipam/prefix.html:85 msgid "Is a pool" -msgstr "C'est une piscine" +msgstr "C'est une plage d'adresses" #: netbox/ipam/forms/bulk_edit.py:273 netbox/ipam/forms/bulk_edit.py:318 #: netbox/ipam/forms/filtersets.py:248 netbox/ipam/forms/filtersets.py:293 @@ -10175,7 +10177,7 @@ msgstr "La fonction principale de ce préfixe" #: netbox/ipam/models/ip.py:265 msgid "is a pool" -msgstr "est une piscine" +msgstr "est une plage d'adresses" #: netbox/ipam/models/ip.py:267 msgid "All IP addresses within this prefix are considered usable" @@ -10523,7 +10525,7 @@ msgstr "Profondeur" #: netbox/ipam/tables/ip.py:262 msgid "Pool" -msgstr "Piscine" +msgstr "Plage d'adresses" #: netbox/ipam/tables/ip.py:266 netbox/ipam/tables/ip.py:320 msgid "Marked Utilized" @@ -10989,11 +10991,11 @@ msgstr "" #: netbox/netbox/forms/base.py:120 msgid "Add tags" -msgstr "Ajouter des tags" +msgstr "Ajouter des étiquettes" #: netbox/netbox/forms/base.py:125 msgid "Remove tags" -msgstr "Supprimer les tags" +msgstr "Supprimer les étiquettes" #: netbox/netbox/forms/mixins.py:38 #, python-brace-format @@ -11081,7 +11083,7 @@ msgstr "Associer des contacts" #: netbox/netbox/navigation/menu.py:50 msgid "Rack Roles" -msgstr "Rôles des baies" +msgstr "Rôles de la baie" #: netbox/netbox/navigation/menu.py:54 msgid "Elevations" @@ -11089,7 +11091,7 @@ msgstr "Élévations" #: netbox/netbox/navigation/menu.py:60 netbox/netbox/navigation/menu.py:62 msgid "Rack Types" -msgstr "Types de rayonnages" +msgstr "Types de baie" #: netbox/netbox/navigation/menu.py:76 msgid "Modules" @@ -12197,7 +12199,7 @@ msgstr "Dossiers" #: netbox/templates/core/inc/config_data.html:7 msgid "Rack elevations" -msgstr "Élévations des rayonnages" +msgstr "Positions en baie" #: netbox/templates/core/inc/config_data.html:10 msgid "Default unit height" @@ -12613,7 +12615,7 @@ msgstr "Non connecté" #: netbox/templates/dcim/device.html:34 msgid "Highlight device in rack" -msgstr "Surligner l'appareil dans le rack" +msgstr "Surligner l'appareil dans la baie" #: netbox/templates/dcim/device.html:55 msgid "Not racked" @@ -12939,7 +12941,7 @@ msgstr "Non connecté" #: netbox/templates/dcim/inc/interface_vlans_table.html:6 msgid "Untagged" -msgstr "Non taggé" +msgstr "Non étiqueté" #: netbox/templates/dcim/inc/interface_vlans_table.html:37 msgid "No VLANs Assigned" @@ -12969,7 +12971,7 @@ msgstr "Unités décroissantes" #: netbox/templates/dcim/inc/rack_elevation.html:3 msgid "Rack elevation" -msgstr "Élévation du rack" +msgstr "Position en baie" #: netbox/templates/dcim/interface.html:17 msgid "Add Child Interface" @@ -13165,7 +13167,7 @@ msgstr "Afficher la liste" #: netbox/templates/dcim/rack_elevation_list.html:14 msgid "Select rack view" -msgstr "Sélectionnez la vue du rack" +msgstr "Sélectionnez la vue de la baie" #: netbox/templates/dcim/rack_elevation_list.html:25 msgid "Sort By" @@ -13275,7 +13277,7 @@ msgstr "Édition d'un châssis virtuel %(name)s" #: netbox/templates/dcim/virtualchassis_edit.html:53 msgid "Rack/Unit" -msgstr "Baie/U" +msgstr "Baie/Unité" #: netbox/templates/dcim/virtualchassis_remove_member.html:5 msgid "Remove Virtual Chassis Member" @@ -13690,7 +13692,7 @@ msgstr "Tous" #: netbox/templates/extras/tag.html:32 msgid "Tagged Items" -msgstr "Articles taggés" +msgstr "Articles étiquetés" #: netbox/templates/extras/tag.html:43 msgid "Allowed Object Types" @@ -13702,11 +13704,11 @@ msgstr "N'importe lequel" #: netbox/templates/extras/tag.html:57 msgid "Tagged Item Types" -msgstr "Types d'articles taggés" +msgstr "Types d'articles étiquetés" #: netbox/templates/extras/tag.html:81 msgid "Tagged Objects" -msgstr "Objets taggés" +msgstr "Objets étiquetés" #: netbox/templates/extras/webhook.html:26 msgid "HTTP Method" @@ -15559,12 +15561,12 @@ msgstr "Mémoire (Mo)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Disque (Mo)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Taille (Mo)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15737,7 +15739,7 @@ msgid "" "The untagged VLAN ({untagged_vlan}) must belong to the same site as the " "interface's parent virtual machine, or it must be global." msgstr "" -"Le VLAN non taggé ({untagged_vlan}) doit appartenir au même site que la " +"Le VLAN non étiqueté ({untagged_vlan}) doit appartenir au même site que la " "machine virtuelle parente de l'interface, ou il doit être global." #: netbox/virtualization/models/virtualmachines.py:434 @@ -15780,19 +15782,19 @@ msgstr "GRE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "Wireguard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/requirements.txt b/requirements.txt index bd16b5d10..e5ffe8386 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==5.1.3 +Django==5.1.4 django-cors-headers==4.6.0 django-debug-toolbar==4.4.6 django-filter==24.3 From 14cec518f5fd9e2ac75d6342a476b9250ad8861a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 6 Jan 2025 16:56:58 -0500 Subject: [PATCH 079/190] Closes #18311: Update minimum required version of PostgreSQL --- docs/configuration/required-parameters.md | 2 +- docs/installation/1-postgresql.md | 6 +++--- docs/introduction.md | 2 +- docs/release-notes/version-4.2.md | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/configuration/required-parameters.md b/docs/configuration/required-parameters.md index 90eb8c0cf..f9a5a6f87 100644 --- a/docs/configuration/required-parameters.md +++ b/docs/configuration/required-parameters.md @@ -25,7 +25,7 @@ ALLOWED_HOSTS = ['*'] ## DATABASE -NetBox requires access to a PostgreSQL 12 or later database service to store data. This service can run locally on the NetBox server or on a remote system. The following parameters must be defined within the `DATABASE` dictionary: +NetBox requires access to a PostgreSQL 13 or later database service to store data. This service can run locally on the NetBox server or on a remote system. The following parameters must be defined within the `DATABASE` dictionary: * `NAME` - Database name * `USER` - PostgreSQL username diff --git a/docs/installation/1-postgresql.md b/docs/installation/1-postgresql.md index 9d30f4514..3f826fa8a 100644 --- a/docs/installation/1-postgresql.md +++ b/docs/installation/1-postgresql.md @@ -2,8 +2,8 @@ This section entails the installation and configuration of a local PostgreSQL database. If you already have a PostgreSQL database service in place, skip to [the next section](2-redis.md). -!!! warning "PostgreSQL 12 or later required" - NetBox requires PostgreSQL 12 or later. Please note that MySQL and other relational databases are **not** supported. +!!! warning "PostgreSQL 13 or later required" + NetBox requires PostgreSQL 13 or later. Please note that MySQL and other relational databases are **not** supported. ## Installation @@ -34,7 +34,7 @@ This section entails the installation and configuration of a local PostgreSQL da sudo systemctl enable --now postgresql ``` -Before continuing, verify that you have installed PostgreSQL 12 or later: +Before continuing, verify that you have installed PostgreSQL 13 or later: ```no-highlight psql -V diff --git a/docs/introduction.md b/docs/introduction.md index b8442dad7..75701c119 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -79,5 +79,5 @@ NetBox is built on the [Django](https://djangoproject.com/) Python framework and | HTTP service | nginx or Apache | | WSGI service | gunicorn or uWSGI | | Application | Django/Python | -| Database | PostgreSQL 12+ | +| Database | PostgreSQL 13+ | | Task queuing | Redis/django-rq | diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md index 75a776573..fdbc09114 100644 --- a/docs/release-notes/version-4.2.md +++ b/docs/release-notes/version-4.2.md @@ -5,6 +5,7 @@ ### Breaking Changes * Support for the Django admin UI has been completely removed. (The Django admin UI was disabled by default in NetBox v4.0.) +* This release drops support for PostgreSQL 12. PostgreSQL 13 or later is required to run this release. * NetBox has adopted collation-based natural ordering for many models. This may alter the order in which some objects are listed by default. * Automatic redirects from pre-v4.1 UI views for virtual disks have been removed. * The `site` and `provider_network` foreign key fields on `circuits.CircuitTermination` have been replaced by the `termination` generic foreign key. From ed541220e85ccb1093947d216f3b0e2acd040c20 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 05:02:25 +0000 Subject: [PATCH 080/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 6779 ++++++++++-------- 1 file changed, 3667 insertions(+), 3112 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 5d1188333..8a7614860 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-04 05:02+0000\n" +"POT-Creation-Date: 2025-01-07 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" msgid "Write Enabled" msgstr "" -#: netbox/account/tables.py:35 netbox/core/choices.py:86 +#: netbox/account/tables.py:35 netbox/core/choices.py:100 #: netbox/core/tables/jobs.py:29 netbox/core/tables/tasks.py:79 #: netbox/extras/tables/tables.py:335 netbox/extras/tables/tables.py:566 #: netbox/templates/account/token.html:43 @@ -39,7 +39,9 @@ msgstr "" #: netbox/templates/core/rq_worker.html:14 #: netbox/templates/extras/htmx/script_result.html:12 #: netbox/templates/extras/journalentry.html:22 -#: netbox/templates/generic/object.html:58 netbox/templates/users/token.html:35 +#: netbox/templates/generic/object.html:58 +#: netbox/templates/htmx/quick_add_created.html:7 +#: netbox/templates/users/token.html:35 msgid "Created" msgstr "" @@ -82,24 +84,25 @@ msgstr "" #: netbox/circuits/choices.py:21 netbox/dcim/choices.py:20 #: netbox/dcim/choices.py:102 netbox/dcim/choices.py:185 -#: netbox/dcim/choices.py:237 netbox/dcim/choices.py:1532 -#: netbox/dcim/choices.py:1608 netbox/dcim/choices.py:1658 -#: netbox/virtualization/choices.py:20 netbox/virtualization/choices.py:45 -#: netbox/vpn/choices.py:18 +#: netbox/dcim/choices.py:237 netbox/dcim/choices.py:1534 +#: netbox/dcim/choices.py:1592 netbox/dcim/choices.py:1642 +#: netbox/dcim/choices.py:1664 netbox/virtualization/choices.py:20 +#: netbox/virtualization/choices.py:45 netbox/vpn/choices.py:18 msgid "Planned" msgstr "" -#: netbox/circuits/choices.py:22 netbox/netbox/navigation/menu.py:305 +#: netbox/circuits/choices.py:22 netbox/netbox/navigation/menu.py:326 msgid "Provisioning" msgstr "" #: netbox/circuits/choices.py:23 netbox/core/tables/tasks.py:22 #: netbox/dcim/choices.py:22 netbox/dcim/choices.py:103 #: netbox/dcim/choices.py:184 netbox/dcim/choices.py:236 -#: netbox/dcim/choices.py:1607 netbox/dcim/choices.py:1657 -#: netbox/extras/tables/tables.py:495 netbox/ipam/choices.py:31 -#: netbox/ipam/choices.py:49 netbox/ipam/choices.py:69 -#: netbox/ipam/choices.py:154 netbox/templates/extras/configcontext.html:25 +#: netbox/dcim/choices.py:1591 netbox/dcim/choices.py:1641 +#: netbox/dcim/choices.py:1663 netbox/extras/tables/tables.py:495 +#: netbox/ipam/choices.py:31 netbox/ipam/choices.py:49 +#: netbox/ipam/choices.py:69 netbox/ipam/choices.py:154 +#: netbox/templates/extras/configcontext.html:25 #: netbox/templates/users/user.html:37 netbox/users/forms/bulk_edit.py:38 #: netbox/virtualization/choices.py:22 netbox/virtualization/choices.py:44 #: netbox/vpn/choices.py:19 netbox/wireless/choices.py:25 @@ -107,9 +110,9 @@ msgid "Active" msgstr "" #: netbox/circuits/choices.py:24 netbox/dcim/choices.py:183 -#: netbox/dcim/choices.py:235 netbox/dcim/choices.py:1606 -#: netbox/dcim/choices.py:1659 netbox/virtualization/choices.py:24 -#: netbox/virtualization/choices.py:43 +#: netbox/dcim/choices.py:235 netbox/dcim/choices.py:1590 +#: netbox/dcim/choices.py:1643 netbox/dcim/choices.py:1662 +#: netbox/virtualization/choices.py:24 netbox/virtualization/choices.py:43 msgid "Offline" msgstr "" @@ -121,7 +124,9 @@ msgstr "" msgid "Decommissioned" msgstr "" -#: netbox/circuits/choices.py:90 netbox/dcim/choices.py:1619 +#: netbox/circuits/choices.py:90 netbox/dcim/choices.py:1603 +#: netbox/templates/dcim/interface.html:135 +#: netbox/templates/virtualization/vminterface.html:77 #: netbox/tenancy/choices.py:17 msgid "Primary" msgstr "" @@ -139,195 +144,199 @@ msgstr "" msgid "Inactive" msgstr "" -#: netbox/circuits/filtersets.py:31 netbox/circuits/filtersets.py:198 -#: netbox/dcim/filtersets.py:98 netbox/dcim/filtersets.py:152 -#: netbox/dcim/filtersets.py:212 netbox/dcim/filtersets.py:333 -#: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 -#: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 -#: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 -#: netbox/virtualization/filtersets.py:45 -#: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 +#: netbox/circuits/choices.py:107 netbox/templates/dcim/interface.html:275 +#: netbox/vpn/choices.py:63 +msgid "Peer" +msgstr "" + +#: netbox/circuits/choices.py:108 netbox/vpn/choices.py:64 +msgid "Hub" +msgstr "" + +#: netbox/circuits/choices.py:109 netbox/vpn/choices.py:65 +msgid "Spoke" +msgstr "" + +#: netbox/circuits/filtersets.py:37 netbox/circuits/filtersets.py:204 +#: netbox/circuits/filtersets.py:279 netbox/dcim/base_filtersets.py:22 +#: netbox/dcim/filtersets.py:99 netbox/dcim/filtersets.py:153 +#: netbox/dcim/filtersets.py:213 netbox/dcim/filtersets.py:334 +#: netbox/dcim/filtersets.py:465 netbox/dcim/filtersets.py:1022 +#: netbox/dcim/filtersets.py:1369 netbox/dcim/filtersets.py:2026 +#: netbox/dcim/filtersets.py:2269 netbox/dcim/filtersets.py:2327 +#: netbox/ipam/filtersets.py:928 netbox/virtualization/filtersets.py:139 +#: netbox/vpn/filtersets.py:358 msgid "Region (ID)" msgstr "" -#: netbox/circuits/filtersets.py:38 netbox/circuits/filtersets.py:205 -#: netbox/dcim/filtersets.py:105 netbox/dcim/filtersets.py:158 -#: netbox/dcim/filtersets.py:219 netbox/dcim/filtersets.py:340 -#: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 -#: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 -#: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 -#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 -#: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 +#: netbox/circuits/filtersets.py:44 netbox/circuits/filtersets.py:211 +#: netbox/circuits/filtersets.py:286 netbox/dcim/base_filtersets.py:29 +#: netbox/dcim/filtersets.py:106 netbox/dcim/filtersets.py:159 +#: netbox/dcim/filtersets.py:220 netbox/dcim/filtersets.py:341 +#: netbox/dcim/filtersets.py:472 netbox/dcim/filtersets.py:1029 +#: netbox/dcim/filtersets.py:1376 netbox/dcim/filtersets.py:2033 +#: netbox/dcim/filtersets.py:2276 netbox/dcim/filtersets.py:2334 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:935 +#: netbox/virtualization/filtersets.py:146 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "" -#: netbox/circuits/filtersets.py:44 netbox/circuits/filtersets.py:211 -#: netbox/dcim/filtersets.py:128 netbox/dcim/filtersets.py:225 -#: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 -#: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 -#: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 -#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 -#: netbox/virtualization/filtersets.py:186 +#: netbox/circuits/filtersets.py:50 netbox/circuits/filtersets.py:217 +#: netbox/circuits/filtersets.py:292 netbox/dcim/base_filtersets.py:35 +#: netbox/dcim/filtersets.py:129 netbox/dcim/filtersets.py:226 +#: netbox/dcim/filtersets.py:347 netbox/dcim/filtersets.py:478 +#: netbox/dcim/filtersets.py:1035 netbox/dcim/filtersets.py:1382 +#: netbox/dcim/filtersets.py:2039 netbox/dcim/filtersets.py:2282 +#: netbox/dcim/filtersets.py:2340 netbox/ipam/filtersets.py:941 +#: netbox/virtualization/filtersets.py:152 msgid "Site group (ID)" msgstr "" -#: netbox/circuits/filtersets.py:51 netbox/circuits/filtersets.py:218 -#: netbox/dcim/filtersets.py:135 netbox/dcim/filtersets.py:232 -#: netbox/dcim/filtersets.py:353 netbox/dcim/filtersets.py:484 -#: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 -#: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 -#: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 -#: netbox/virtualization/filtersets.py:65 -#: netbox/virtualization/filtersets.py:193 +#: netbox/circuits/filtersets.py:57 netbox/circuits/filtersets.py:224 +#: netbox/circuits/filtersets.py:299 netbox/dcim/base_filtersets.py:42 +#: netbox/dcim/filtersets.py:136 netbox/dcim/filtersets.py:233 +#: netbox/dcim/filtersets.py:354 netbox/dcim/filtersets.py:485 +#: netbox/dcim/filtersets.py:1042 netbox/dcim/filtersets.py:1389 +#: netbox/dcim/filtersets.py:2046 netbox/dcim/filtersets.py:2289 +#: netbox/dcim/filtersets.py:2347 netbox/extras/filtersets.py:515 +#: netbox/ipam/filtersets.py:948 netbox/virtualization/filtersets.py:159 msgid "Site group (slug)" msgstr "" -#: netbox/circuits/filtersets.py:56 netbox/circuits/forms/bulk_edit.py:188 -#: netbox/circuits/forms/bulk_edit.py:216 -#: netbox/circuits/forms/bulk_import.py:124 -#: netbox/circuits/forms/filtersets.py:51 -#: netbox/circuits/forms/filtersets.py:171 -#: netbox/circuits/forms/filtersets.py:209 -#: netbox/circuits/forms/model_forms.py:138 -#: netbox/circuits/forms/model_forms.py:154 -#: netbox/circuits/tables/circuits.py:113 netbox/dcim/forms/bulk_edit.py:169 -#: netbox/dcim/forms/bulk_edit.py:330 netbox/dcim/forms/bulk_edit.py:683 -#: netbox/dcim/forms/bulk_edit.py:888 netbox/dcim/forms/bulk_import.py:131 -#: netbox/dcim/forms/bulk_import.py:230 netbox/dcim/forms/bulk_import.py:331 -#: netbox/dcim/forms/bulk_import.py:562 netbox/dcim/forms/bulk_import.py:1333 -#: netbox/dcim/forms/bulk_import.py:1361 netbox/dcim/forms/filtersets.py:87 -#: netbox/dcim/forms/filtersets.py:225 netbox/dcim/forms/filtersets.py:342 -#: netbox/dcim/forms/filtersets.py:439 netbox/dcim/forms/filtersets.py:753 -#: netbox/dcim/forms/filtersets.py:997 netbox/dcim/forms/filtersets.py:1021 -#: netbox/dcim/forms/filtersets.py:1111 netbox/dcim/forms/filtersets.py:1149 -#: netbox/dcim/forms/filtersets.py:1584 netbox/dcim/forms/filtersets.py:1608 -#: netbox/dcim/forms/filtersets.py:1632 netbox/dcim/forms/model_forms.py:137 -#: netbox/dcim/forms/model_forms.py:165 netbox/dcim/forms/model_forms.py:238 -#: netbox/dcim/forms/model_forms.py:463 netbox/dcim/forms/model_forms.py:723 -#: netbox/dcim/forms/object_create.py:383 netbox/dcim/tables/devices.py:153 +#: netbox/circuits/filtersets.py:62 netbox/circuits/forms/filtersets.py:59 +#: netbox/circuits/forms/filtersets.py:182 +#: netbox/circuits/forms/filtersets.py:235 +#: netbox/circuits/tables/circuits.py:129 netbox/dcim/forms/bulk_edit.py:172 +#: netbox/dcim/forms/bulk_edit.py:333 netbox/dcim/forms/bulk_edit.py:686 +#: netbox/dcim/forms/bulk_edit.py:891 netbox/dcim/forms/bulk_import.py:133 +#: netbox/dcim/forms/bulk_import.py:232 netbox/dcim/forms/bulk_import.py:333 +#: netbox/dcim/forms/bulk_import.py:567 netbox/dcim/forms/bulk_import.py:1430 +#: netbox/dcim/forms/bulk_import.py:1458 netbox/dcim/forms/filtersets.py:88 +#: netbox/dcim/forms/filtersets.py:226 netbox/dcim/forms/filtersets.py:343 +#: netbox/dcim/forms/filtersets.py:440 netbox/dcim/forms/filtersets.py:754 +#: netbox/dcim/forms/filtersets.py:998 netbox/dcim/forms/filtersets.py:1022 +#: netbox/dcim/forms/filtersets.py:1112 netbox/dcim/forms/filtersets.py:1150 +#: netbox/dcim/forms/filtersets.py:1622 netbox/dcim/forms/filtersets.py:1646 +#: netbox/dcim/forms/filtersets.py:1670 netbox/dcim/forms/model_forms.py:141 +#: netbox/dcim/forms/model_forms.py:169 netbox/dcim/forms/model_forms.py:243 +#: netbox/dcim/forms/model_forms.py:473 netbox/dcim/forms/model_forms.py:734 +#: netbox/dcim/forms/object_create.py:383 netbox/dcim/tables/devices.py:163 #: netbox/dcim/tables/power.py:26 netbox/dcim/tables/power.py:93 -#: netbox/dcim/tables/racks.py:122 netbox/dcim/tables/racks.py:207 +#: netbox/dcim/tables/racks.py:121 netbox/dcim/tables/racks.py:206 #: netbox/dcim/tables/sites.py:134 netbox/extras/filtersets.py:525 -#: netbox/ipam/forms/bulk_edit.py:218 netbox/ipam/forms/bulk_edit.py:285 -#: netbox/ipam/forms/bulk_edit.py:484 netbox/ipam/forms/bulk_import.py:171 -#: netbox/ipam/forms/bulk_import.py:453 netbox/ipam/forms/filtersets.py:153 -#: netbox/ipam/forms/filtersets.py:231 netbox/ipam/forms/filtersets.py:432 -#: netbox/ipam/forms/filtersets.py:489 netbox/ipam/forms/model_forms.py:205 -#: netbox/ipam/forms/model_forms.py:669 netbox/ipam/tables/ip.py:245 -#: netbox/ipam/tables/vlans.py:118 netbox/ipam/tables/vlans.py:221 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:6 -#: netbox/templates/dcim/device.html:22 +#: netbox/ipam/forms/bulk_edit.py:468 netbox/ipam/forms/bulk_import.py:452 +#: netbox/ipam/forms/filtersets.py:155 netbox/ipam/forms/filtersets.py:229 +#: netbox/ipam/forms/filtersets.py:435 netbox/ipam/forms/filtersets.py:530 +#: netbox/ipam/forms/model_forms.py:671 netbox/ipam/tables/vlans.py:87 +#: netbox/ipam/tables/vlans.py:197 netbox/templates/dcim/device.html:22 #: netbox/templates/dcim/inc/cable_termination.html:8 #: netbox/templates/dcim/inc/cable_termination.html:33 #: netbox/templates/dcim/location.html:37 #: netbox/templates/dcim/powerpanel.html:22 netbox/templates/dcim/rack.html:20 #: netbox/templates/dcim/rackreservation.html:28 -#: netbox/templates/dcim/site.html:28 netbox/templates/ipam/prefix.html:56 -#: netbox/templates/ipam/vlan.html:23 netbox/templates/ipam/vlan_edit.html:40 -#: netbox/templates/virtualization/cluster.html:42 +#: netbox/templates/dcim/site.html:28 netbox/templates/ipam/vlan.html:23 +#: netbox/templates/ipam/vlan_edit.html:48 #: netbox/templates/virtualization/virtualmachine.html:95 -#: netbox/virtualization/forms/bulk_edit.py:91 -#: netbox/virtualization/forms/bulk_edit.py:109 -#: netbox/virtualization/forms/bulk_edit.py:124 -#: netbox/virtualization/forms/bulk_import.py:59 -#: netbox/virtualization/forms/bulk_import.py:85 -#: netbox/virtualization/forms/filtersets.py:79 -#: netbox/virtualization/forms/filtersets.py:148 -#: netbox/virtualization/forms/model_forms.py:71 -#: netbox/virtualization/forms/model_forms.py:104 -#: netbox/virtualization/forms/model_forms.py:171 -#: netbox/virtualization/tables/clusters.py:77 -#: netbox/virtualization/tables/virtualmachines.py:63 -#: netbox/vpn/forms/filtersets.py:266 netbox/wireless/forms/model_forms.py:76 -#: netbox/wireless/forms/model_forms.py:118 +#: netbox/virtualization/forms/bulk_edit.py:106 +#: netbox/virtualization/forms/bulk_import.py:60 +#: netbox/virtualization/forms/bulk_import.py:91 +#: netbox/virtualization/forms/filtersets.py:74 +#: netbox/virtualization/forms/filtersets.py:153 +#: netbox/virtualization/forms/model_forms.py:103 +#: netbox/virtualization/forms/model_forms.py:170 +#: netbox/virtualization/tables/virtualmachines.py:33 +#: netbox/vpn/forms/filtersets.py:266 netbox/wireless/forms/filtersets.py:88 +#: netbox/wireless/forms/model_forms.py:79 +#: netbox/wireless/forms/model_forms.py:121 msgid "Site" msgstr "" -#: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 -#: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 -#: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 -#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 -#: netbox/virtualization/filtersets.py:75 -#: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 +#: netbox/circuits/filtersets.py:68 netbox/circuits/filtersets.py:235 +#: netbox/circuits/filtersets.py:310 netbox/dcim/base_filtersets.py:53 +#: netbox/dcim/filtersets.py:243 netbox/dcim/filtersets.py:364 +#: netbox/dcim/filtersets.py:459 netbox/extras/filtersets.py:531 +#: netbox/ipam/filtersets.py:243 netbox/ipam/filtersets.py:958 +#: netbox/virtualization/filtersets.py:169 netbox/vpn/filtersets.py:363 msgid "Site (slug)" msgstr "" -#: netbox/circuits/filtersets.py:67 +#: netbox/circuits/filtersets.py:73 msgid "ASN (ID)" msgstr "" -#: netbox/circuits/filtersets.py:73 netbox/circuits/forms/filtersets.py:31 -#: netbox/ipam/forms/model_forms.py:159 netbox/ipam/models/asns.py:108 -#: netbox/ipam/models/asns.py:125 netbox/ipam/tables/asn.py:41 +#: netbox/circuits/filtersets.py:79 netbox/circuits/forms/filtersets.py:39 +#: netbox/ipam/forms/model_forms.py:165 netbox/ipam/models/asns.py:105 +#: netbox/ipam/models/asns.py:122 netbox/ipam/tables/asn.py:41 #: netbox/templates/ipam/asn.html:20 msgid "ASN" msgstr "" -#: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 -#: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 +#: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 +#: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:333 +#: netbox/circuits/filtersets.py:401 netbox/circuits/filtersets.py:477 +#: netbox/circuits/filtersets.py:545 netbox/ipam/filtersets.py:248 msgid "Provider (ID)" msgstr "" -#: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 -#: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 +#: netbox/circuits/filtersets.py:107 netbox/circuits/filtersets.py:134 +#: netbox/circuits/filtersets.py:168 netbox/circuits/filtersets.py:339 +#: netbox/circuits/filtersets.py:483 netbox/circuits/filtersets.py:551 +#: netbox/ipam/filtersets.py:254 msgid "Provider (slug)" msgstr "" -#: netbox/circuits/filtersets.py:167 +#: netbox/circuits/filtersets.py:173 netbox/circuits/filtersets.py:488 +#: netbox/circuits/filtersets.py:556 msgid "Provider account (ID)" msgstr "" -#: netbox/circuits/filtersets.py:173 +#: netbox/circuits/filtersets.py:179 netbox/circuits/filtersets.py:494 +#: netbox/circuits/filtersets.py:562 msgid "Provider account (account)" msgstr "" -#: netbox/circuits/filtersets.py:178 +#: netbox/circuits/filtersets.py:184 netbox/circuits/filtersets.py:498 +#: netbox/circuits/filtersets.py:567 msgid "Provider network (ID)" msgstr "" -#: netbox/circuits/filtersets.py:182 +#: netbox/circuits/filtersets.py:188 msgid "Circuit type (ID)" msgstr "" -#: netbox/circuits/filtersets.py:188 +#: netbox/circuits/filtersets.py:194 msgid "Circuit type (slug)" msgstr "" -#: netbox/circuits/filtersets.py:223 netbox/circuits/filtersets.py:268 -#: netbox/dcim/filtersets.py:236 netbox/dcim/filtersets.py:357 -#: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 -#: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 -#: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 -#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 -#: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 +#: netbox/circuits/filtersets.py:229 netbox/circuits/filtersets.py:304 +#: netbox/dcim/base_filtersets.py:47 netbox/dcim/filtersets.py:237 +#: netbox/dcim/filtersets.py:358 netbox/dcim/filtersets.py:453 +#: netbox/dcim/filtersets.py:1046 netbox/dcim/filtersets.py:1394 +#: netbox/dcim/filtersets.py:2051 netbox/dcim/filtersets.py:2293 +#: netbox/dcim/filtersets.py:2352 netbox/ipam/filtersets.py:237 +#: netbox/ipam/filtersets.py:952 netbox/virtualization/filtersets.py:163 +#: netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "" -#: netbox/circuits/filtersets.py:233 netbox/circuits/filtersets.py:237 +#: netbox/circuits/filtersets.py:239 netbox/circuits/filtersets.py:243 msgid "Termination A (ID)" msgstr "" -#: netbox/circuits/filtersets.py:260 netbox/circuits/filtersets.py:320 -#: netbox/core/filtersets.py:77 netbox/core/filtersets.py:136 -#: netbox/core/filtersets.py:173 netbox/dcim/filtersets.py:751 -#: netbox/dcim/filtersets.py:1362 netbox/dcim/filtersets.py:2277 -#: netbox/extras/filtersets.py:41 netbox/extras/filtersets.py:63 -#: netbox/extras/filtersets.py:92 netbox/extras/filtersets.py:132 -#: netbox/extras/filtersets.py:181 netbox/extras/filtersets.py:209 -#: netbox/extras/filtersets.py:239 netbox/extras/filtersets.py:276 -#: netbox/extras/filtersets.py:348 netbox/extras/filtersets.py:391 -#: netbox/extras/filtersets.py:438 netbox/extras/filtersets.py:498 -#: netbox/extras/filtersets.py:657 netbox/extras/filtersets.py:703 -#: netbox/ipam/forms/model_forms.py:482 netbox/netbox/filtersets.py:282 -#: netbox/netbox/forms/__init__.py:22 netbox/netbox/forms/base.py:167 +#: netbox/circuits/filtersets.py:268 netbox/circuits/filtersets.py:370 +#: netbox/circuits/filtersets.py:532 netbox/core/filtersets.py:77 +#: netbox/core/filtersets.py:136 netbox/core/filtersets.py:173 +#: netbox/dcim/filtersets.py:752 netbox/dcim/filtersets.py:1363 +#: netbox/dcim/filtersets.py:2400 netbox/extras/filtersets.py:41 +#: netbox/extras/filtersets.py:63 netbox/extras/filtersets.py:92 +#: netbox/extras/filtersets.py:132 netbox/extras/filtersets.py:181 +#: netbox/extras/filtersets.py:209 netbox/extras/filtersets.py:239 +#: netbox/extras/filtersets.py:276 netbox/extras/filtersets.py:348 +#: netbox/extras/filtersets.py:391 netbox/extras/filtersets.py:438 +#: netbox/extras/filtersets.py:498 netbox/extras/filtersets.py:657 +#: netbox/extras/filtersets.py:703 netbox/ipam/forms/model_forms.py:484 +#: netbox/netbox/filtersets.py:286 netbox/netbox/forms/__init__.py:22 +#: netbox/netbox/forms/base.py:167 #: netbox/templates/htmx/object_selector.html:28 #: netbox/templates/inc/filter_list.html:46 #: netbox/templates/ipam/ipaddress_assign.html:29 @@ -339,95 +348,155 @@ msgstr "" msgid "Search" msgstr "" -#: netbox/circuits/filtersets.py:264 netbox/circuits/forms/bulk_edit.py:172 -#: netbox/circuits/forms/bulk_edit.py:246 -#: netbox/circuits/forms/bulk_import.py:115 -#: netbox/circuits/forms/filtersets.py:198 -#: netbox/circuits/forms/filtersets.py:214 -#: netbox/circuits/forms/filtersets.py:260 -#: netbox/circuits/forms/model_forms.py:111 -#: netbox/circuits/forms/model_forms.py:133 -#: netbox/circuits/forms/model_forms.py:199 -#: netbox/circuits/tables/circuits.py:104 -#: netbox/circuits/tables/circuits.py:164 netbox/dcim/forms/connections.py:73 +#: netbox/circuits/filtersets.py:272 netbox/circuits/forms/bulk_edit.py:195 +#: netbox/circuits/forms/bulk_edit.py:284 +#: netbox/circuits/forms/bulk_import.py:128 +#: netbox/circuits/forms/filtersets.py:218 +#: netbox/circuits/forms/filtersets.py:245 +#: netbox/circuits/forms/filtersets.py:291 +#: netbox/circuits/forms/model_forms.py:139 +#: netbox/circuits/forms/model_forms.py:162 +#: netbox/circuits/forms/model_forms.py:262 +#: netbox/circuits/tables/circuits.py:108 +#: netbox/circuits/tables/circuits.py:203 netbox/dcim/forms/connections.py:73 #: netbox/templates/circuits/circuit.html:15 -#: netbox/templates/circuits/circuitgroupassignment.html:26 +#: netbox/templates/circuits/circuitgroupassignment.html:30 #: netbox/templates/circuits/circuittermination.html:19 #: netbox/templates/dcim/inc/cable_termination.html:55 #: netbox/templates/dcim/trace/circuit.html:4 msgid "Circuit" msgstr "" -#: netbox/circuits/filtersets.py:278 +#: netbox/circuits/filtersets.py:316 netbox/dcim/base_filtersets.py:59 +#: netbox/dcim/filtersets.py:259 netbox/dcim/filtersets.py:370 +#: netbox/dcim/filtersets.py:491 netbox/dcim/filtersets.py:1058 +#: netbox/dcim/filtersets.py:1405 netbox/dcim/filtersets.py:2305 +msgid "Location (ID)" +msgstr "" + +#: netbox/circuits/filtersets.py:323 netbox/dcim/base_filtersets.py:66 +#: netbox/dcim/filtersets.py:266 netbox/dcim/filtersets.py:377 +#: netbox/dcim/filtersets.py:498 netbox/dcim/filtersets.py:1411 +#: netbox/extras/filtersets.py:542 +msgid "Location (slug)" +msgstr "" + +#: netbox/circuits/filtersets.py:328 msgid "ProviderNetwork (ID)" msgstr "" -#: netbox/circuits/filtersets.py:335 -msgid "Circuit (ID)" -msgstr "" - -#: netbox/circuits/filtersets.py:341 +#: netbox/circuits/filtersets.py:376 msgid "Circuit (CID)" msgstr "" -#: netbox/circuits/filtersets.py:345 +#: netbox/circuits/filtersets.py:381 +msgid "Circuit (ID)" +msgstr "" + +#: netbox/circuits/filtersets.py:386 +msgid "Virtual circuit (CID)" +msgstr "" + +#: netbox/circuits/filtersets.py:391 netbox/dcim/filtersets.py:1848 +msgid "Virtual circuit (ID)" +msgstr "" + +#: netbox/circuits/filtersets.py:396 +msgid "Provider (name)" +msgstr "" + +#: netbox/circuits/filtersets.py:405 msgid "Circuit group (ID)" msgstr "" -#: netbox/circuits/filtersets.py:351 +#: netbox/circuits/filtersets.py:411 msgid "Circuit group (slug)" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:30 netbox/circuits/forms/filtersets.py:56 -#: netbox/circuits/forms/model_forms.py:29 -#: netbox/circuits/tables/providers.py:33 netbox/dcim/forms/bulk_edit.py:129 -#: netbox/dcim/forms/filtersets.py:195 netbox/dcim/forms/model_forms.py:123 -#: netbox/dcim/tables/sites.py:94 netbox/ipam/models/asns.py:126 -#: netbox/ipam/tables/asn.py:27 netbox/ipam/views.py:213 -#: netbox/netbox/navigation/menu.py:172 netbox/netbox/navigation/menu.py:175 +#: netbox/circuits/filtersets.py:502 +msgid "Virtual circuit type (ID)" +msgstr "" + +#: netbox/circuits/filtersets.py:508 +msgid "Virtual circuit type (slug)" +msgstr "" + +#: netbox/circuits/filtersets.py:536 netbox/circuits/forms/bulk_edit.py:355 +#: netbox/circuits/forms/bulk_import.py:249 +#: netbox/circuits/forms/filtersets.py:367 +#: netbox/circuits/forms/filtersets.py:373 +#: netbox/circuits/forms/model_forms.py:343 +#: netbox/circuits/forms/model_forms.py:358 +#: netbox/circuits/tables/virtual_circuits.py:88 +#: netbox/templates/circuits/virtualcircuit.html:20 +#: netbox/templates/circuits/virtualcircuittermination.html:38 +msgid "Virtual circuit" +msgstr "" + +#: netbox/circuits/filtersets.py:572 netbox/dcim/filtersets.py:1268 +#: netbox/dcim/filtersets.py:1633 netbox/ipam/filtersets.py:601 +#: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 +msgid "Interface (ID)" +msgstr "" + +#: netbox/circuits/forms/bulk_edit.py:42 netbox/circuits/forms/filtersets.py:64 +#: netbox/circuits/forms/model_forms.py:42 +#: netbox/circuits/tables/providers.py:33 netbox/dcim/forms/bulk_edit.py:132 +#: netbox/dcim/forms/filtersets.py:196 netbox/dcim/forms/model_forms.py:127 +#: netbox/dcim/tables/sites.py:94 netbox/ipam/models/asns.py:123 +#: netbox/ipam/tables/asn.py:27 netbox/ipam/views.py:230 +#: netbox/netbox/navigation/menu.py:178 netbox/netbox/navigation/menu.py:181 #: netbox/templates/circuits/provider.html:23 msgid "ASNs" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:34 netbox/circuits/forms/bulk_edit.py:56 -#: netbox/circuits/forms/bulk_edit.py:83 netbox/circuits/forms/bulk_edit.py:104 -#: netbox/circuits/forms/bulk_edit.py:164 -#: netbox/circuits/forms/bulk_edit.py:183 -#: netbox/circuits/forms/bulk_edit.py:228 netbox/core/forms/bulk_edit.py:28 -#: netbox/dcim/forms/bulk_create.py:35 netbox/dcim/forms/bulk_edit.py:74 -#: netbox/dcim/forms/bulk_edit.py:93 netbox/dcim/forms/bulk_edit.py:152 -#: netbox/dcim/forms/bulk_edit.py:193 netbox/dcim/forms/bulk_edit.py:211 -#: netbox/dcim/forms/bulk_edit.py:289 netbox/dcim/forms/bulk_edit.py:438 -#: netbox/dcim/forms/bulk_edit.py:472 netbox/dcim/forms/bulk_edit.py:487 -#: netbox/dcim/forms/bulk_edit.py:546 netbox/dcim/forms/bulk_edit.py:590 -#: netbox/dcim/forms/bulk_edit.py:624 netbox/dcim/forms/bulk_edit.py:648 -#: netbox/dcim/forms/bulk_edit.py:721 netbox/dcim/forms/bulk_edit.py:782 -#: netbox/dcim/forms/bulk_edit.py:834 netbox/dcim/forms/bulk_edit.py:857 -#: netbox/dcim/forms/bulk_edit.py:905 netbox/dcim/forms/bulk_edit.py:975 -#: netbox/dcim/forms/bulk_edit.py:1028 netbox/dcim/forms/bulk_edit.py:1063 -#: netbox/dcim/forms/bulk_edit.py:1103 netbox/dcim/forms/bulk_edit.py:1147 -#: netbox/dcim/forms/bulk_edit.py:1192 netbox/dcim/forms/bulk_edit.py:1219 -#: netbox/dcim/forms/bulk_edit.py:1237 netbox/dcim/forms/bulk_edit.py:1255 -#: netbox/dcim/forms/bulk_edit.py:1273 netbox/dcim/forms/bulk_edit.py:1725 -#: netbox/extras/forms/bulk_edit.py:39 netbox/extras/forms/bulk_edit.py:149 -#: netbox/extras/forms/bulk_edit.py:178 netbox/extras/forms/bulk_edit.py:208 -#: netbox/extras/forms/bulk_edit.py:256 netbox/extras/forms/bulk_edit.py:274 -#: netbox/extras/forms/bulk_edit.py:298 netbox/extras/forms/bulk_edit.py:312 -#: netbox/extras/forms/bulk_edit.py:339 netbox/extras/tables/tables.py:79 -#: netbox/ipam/forms/bulk_edit.py:53 netbox/ipam/forms/bulk_edit.py:73 -#: netbox/ipam/forms/bulk_edit.py:93 netbox/ipam/forms/bulk_edit.py:117 -#: netbox/ipam/forms/bulk_edit.py:146 netbox/ipam/forms/bulk_edit.py:175 -#: netbox/ipam/forms/bulk_edit.py:194 netbox/ipam/forms/bulk_edit.py:276 -#: netbox/ipam/forms/bulk_edit.py:321 netbox/ipam/forms/bulk_edit.py:369 -#: netbox/ipam/forms/bulk_edit.py:412 netbox/ipam/forms/bulk_edit.py:428 -#: netbox/ipam/forms/bulk_edit.py:516 netbox/ipam/forms/bulk_edit.py:547 +#: netbox/circuits/forms/bulk_edit.py:46 netbox/circuits/forms/bulk_edit.py:68 +#: netbox/circuits/forms/bulk_edit.py:95 netbox/circuits/forms/bulk_edit.py:116 +#: netbox/circuits/forms/bulk_edit.py:187 +#: netbox/circuits/forms/bulk_edit.py:207 +#: netbox/circuits/forms/bulk_edit.py:266 +#: netbox/circuits/forms/bulk_edit.py:307 +#: netbox/circuits/forms/bulk_edit.py:347 +#: netbox/circuits/forms/bulk_edit.py:371 netbox/core/forms/bulk_edit.py:28 +#: netbox/dcim/forms/bulk_create.py:35 netbox/dcim/forms/bulk_edit.py:77 +#: netbox/dcim/forms/bulk_edit.py:96 netbox/dcim/forms/bulk_edit.py:155 +#: netbox/dcim/forms/bulk_edit.py:196 netbox/dcim/forms/bulk_edit.py:214 +#: netbox/dcim/forms/bulk_edit.py:292 netbox/dcim/forms/bulk_edit.py:441 +#: netbox/dcim/forms/bulk_edit.py:475 netbox/dcim/forms/bulk_edit.py:490 +#: netbox/dcim/forms/bulk_edit.py:549 netbox/dcim/forms/bulk_edit.py:593 +#: netbox/dcim/forms/bulk_edit.py:627 netbox/dcim/forms/bulk_edit.py:651 +#: netbox/dcim/forms/bulk_edit.py:724 netbox/dcim/forms/bulk_edit.py:785 +#: netbox/dcim/forms/bulk_edit.py:837 netbox/dcim/forms/bulk_edit.py:860 +#: netbox/dcim/forms/bulk_edit.py:908 netbox/dcim/forms/bulk_edit.py:978 +#: netbox/dcim/forms/bulk_edit.py:1031 netbox/dcim/forms/bulk_edit.py:1066 +#: netbox/dcim/forms/bulk_edit.py:1106 netbox/dcim/forms/bulk_edit.py:1150 +#: netbox/dcim/forms/bulk_edit.py:1195 netbox/dcim/forms/bulk_edit.py:1222 +#: netbox/dcim/forms/bulk_edit.py:1240 netbox/dcim/forms/bulk_edit.py:1258 +#: netbox/dcim/forms/bulk_edit.py:1276 netbox/dcim/forms/bulk_edit.py:1744 +#: netbox/dcim/forms/bulk_edit.py:1785 netbox/extras/forms/bulk_edit.py:39 +#: netbox/extras/forms/bulk_edit.py:149 netbox/extras/forms/bulk_edit.py:178 +#: netbox/extras/forms/bulk_edit.py:208 netbox/extras/forms/bulk_edit.py:256 +#: netbox/extras/forms/bulk_edit.py:274 netbox/extras/forms/bulk_edit.py:298 +#: netbox/extras/forms/bulk_edit.py:312 netbox/extras/forms/bulk_edit.py:339 +#: netbox/extras/tables/tables.py:79 netbox/ipam/forms/bulk_edit.py:56 +#: netbox/ipam/forms/bulk_edit.py:76 netbox/ipam/forms/bulk_edit.py:96 +#: netbox/ipam/forms/bulk_edit.py:120 netbox/ipam/forms/bulk_edit.py:149 +#: netbox/ipam/forms/bulk_edit.py:178 netbox/ipam/forms/bulk_edit.py:197 +#: netbox/ipam/forms/bulk_edit.py:260 netbox/ipam/forms/bulk_edit.py:305 +#: netbox/ipam/forms/bulk_edit.py:353 netbox/ipam/forms/bulk_edit.py:396 +#: netbox/ipam/forms/bulk_edit.py:412 netbox/ipam/forms/bulk_edit.py:500 +#: netbox/ipam/forms/bulk_edit.py:532 netbox/ipam/forms/bulk_edit.py:575 +#: netbox/ipam/tables/vlans.py:240 netbox/ipam/tables/vlans.py:267 #: netbox/templates/account/token.html:35 -#: netbox/templates/circuits/circuit.html:59 +#: netbox/templates/circuits/circuit.html:69 #: netbox/templates/circuits/circuitgroup.html:32 #: netbox/templates/circuits/circuittype.html:26 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:88 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:83 #: netbox/templates/circuits/provider.html:33 #: netbox/templates/circuits/providernetwork.html:32 +#: netbox/templates/circuits/virtualcircuit.html:56 +#: netbox/templates/circuits/virtualcircuittermination.html:68 +#: netbox/templates/circuits/virtualcircuittype.html:26 #: netbox/templates/core/datasource.html:54 #: netbox/templates/core/plugin.html:80 netbox/templates/dcim/cable.html:36 #: netbox/templates/dcim/consoleport.html:44 @@ -437,9 +506,10 @@ msgstr "" #: netbox/templates/dcim/devicetype.html:33 #: netbox/templates/dcim/frontport.html:58 #: netbox/templates/dcim/interface.html:69 -#: netbox/templates/dcim/inventoryitem.html:60 +#: netbox/templates/dcim/inventoryitem.html:64 #: netbox/templates/dcim/inventoryitemrole.html:22 #: netbox/templates/dcim/location.html:33 +#: netbox/templates/dcim/macaddress.html:21 #: netbox/templates/dcim/manufacturer.html:40 #: netbox/templates/dcim/module.html:73 netbox/templates/dcim/modulebay.html:42 #: netbox/templates/dcim/moduletype.html:37 @@ -469,12 +539,14 @@ msgstr "" #: netbox/templates/ipam/asnrange.html:38 #: netbox/templates/ipam/fhrpgroup.html:34 #: netbox/templates/ipam/ipaddress.html:55 -#: netbox/templates/ipam/iprange.html:67 netbox/templates/ipam/prefix.html:81 +#: netbox/templates/ipam/iprange.html:67 netbox/templates/ipam/prefix.html:77 #: netbox/templates/ipam/rir.html:26 netbox/templates/ipam/role.html:26 #: netbox/templates/ipam/routetarget.html:21 #: netbox/templates/ipam/service.html:50 #: netbox/templates/ipam/servicetemplate.html:27 #: netbox/templates/ipam/vlan.html:62 netbox/templates/ipam/vlangroup.html:34 +#: netbox/templates/ipam/vlantranslationpolicy.html:18 +#: netbox/templates/ipam/vlantranslationrule.html:26 #: netbox/templates/ipam/vrf.html:33 netbox/templates/tenancy/contact.html:67 #: netbox/templates/tenancy/contactgroup.html:25 #: netbox/templates/tenancy/contactrole.html:22 @@ -488,7 +560,7 @@ msgstr "" #: netbox/templates/virtualization/clustertype.html:26 #: netbox/templates/virtualization/virtualdisk.html:39 #: netbox/templates/virtualization/virtualmachine.html:31 -#: netbox/templates/virtualization/vminterface.html:51 +#: netbox/templates/virtualization/vminterface.html:47 #: netbox/templates/vpn/ikepolicy.html:17 #: netbox/templates/vpn/ikeproposal.html:17 #: netbox/templates/vpn/ipsecpolicy.html:17 @@ -498,113 +570,136 @@ msgstr "" #: netbox/templates/vpn/ipsecproposal.html:17 #: netbox/templates/vpn/l2vpn.html:26 netbox/templates/vpn/tunnel.html:33 #: netbox/templates/vpn/tunnelgroup.html:30 -#: netbox/templates/wireless/wirelesslan.html:26 +#: netbox/templates/wireless/wirelesslan.html:34 #: netbox/templates/wireless/wirelesslangroup.html:33 #: netbox/templates/wireless/wirelesslink.html:34 #: netbox/tenancy/forms/bulk_edit.py:32 netbox/tenancy/forms/bulk_edit.py:80 #: netbox/tenancy/forms/bulk_edit.py:122 netbox/users/forms/bulk_edit.py:64 #: netbox/users/forms/bulk_edit.py:82 netbox/users/forms/bulk_edit.py:112 -#: netbox/virtualization/forms/bulk_edit.py:32 -#: netbox/virtualization/forms/bulk_edit.py:46 -#: netbox/virtualization/forms/bulk_edit.py:100 -#: netbox/virtualization/forms/bulk_edit.py:177 -#: netbox/virtualization/forms/bulk_edit.py:228 -#: netbox/virtualization/forms/bulk_edit.py:337 +#: netbox/virtualization/forms/bulk_edit.py:33 +#: netbox/virtualization/forms/bulk_edit.py:47 +#: netbox/virtualization/forms/bulk_edit.py:82 +#: netbox/virtualization/forms/bulk_edit.py:159 +#: netbox/virtualization/forms/bulk_edit.py:210 +#: netbox/virtualization/forms/bulk_edit.py:319 #: netbox/vpn/forms/bulk_edit.py:28 netbox/vpn/forms/bulk_edit.py:64 #: netbox/vpn/forms/bulk_edit.py:121 netbox/vpn/forms/bulk_edit.py:155 #: netbox/vpn/forms/bulk_edit.py:190 netbox/vpn/forms/bulk_edit.py:215 #: netbox/vpn/forms/bulk_edit.py:247 netbox/vpn/forms/bulk_edit.py:274 -#: netbox/wireless/forms/bulk_edit.py:29 netbox/wireless/forms/bulk_edit.py:82 -#: netbox/wireless/forms/bulk_edit.py:140 +#: netbox/wireless/forms/bulk_edit.py:31 netbox/wireless/forms/bulk_edit.py:84 +#: netbox/wireless/forms/bulk_edit.py:143 msgid "Description" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:51 netbox/circuits/forms/bulk_edit.py:73 -#: netbox/circuits/forms/bulk_edit.py:123 -#: netbox/circuits/forms/bulk_import.py:36 -#: netbox/circuits/forms/bulk_import.py:51 -#: netbox/circuits/forms/bulk_import.py:74 -#: netbox/circuits/forms/filtersets.py:70 -#: netbox/circuits/forms/filtersets.py:88 -#: netbox/circuits/forms/filtersets.py:116 -#: netbox/circuits/forms/filtersets.py:131 -#: netbox/circuits/forms/filtersets.py:199 -#: netbox/circuits/forms/filtersets.py:232 -#: netbox/circuits/forms/filtersets.py:255 -#: netbox/circuits/forms/model_forms.py:47 -#: netbox/circuits/forms/model_forms.py:61 -#: netbox/circuits/forms/model_forms.py:93 -#: netbox/circuits/tables/circuits.py:58 netbox/circuits/tables/circuits.py:108 -#: netbox/circuits/tables/circuits.py:160 +#: netbox/circuits/forms/bulk_edit.py:63 netbox/circuits/forms/bulk_edit.py:85 +#: netbox/circuits/forms/bulk_edit.py:135 +#: netbox/circuits/forms/bulk_import.py:43 +#: netbox/circuits/forms/bulk_import.py:58 +#: netbox/circuits/forms/bulk_import.py:81 +#: netbox/circuits/forms/filtersets.py:78 +#: netbox/circuits/forms/filtersets.py:96 +#: netbox/circuits/forms/filtersets.py:124 +#: netbox/circuits/forms/filtersets.py:142 +#: netbox/circuits/forms/filtersets.py:219 +#: netbox/circuits/forms/filtersets.py:263 +#: netbox/circuits/forms/filtersets.py:286 +#: netbox/circuits/forms/filtersets.py:324 +#: netbox/circuits/forms/filtersets.py:332 +#: netbox/circuits/forms/filtersets.py:368 +#: netbox/circuits/forms/filtersets.py:391 +#: netbox/circuits/forms/model_forms.py:60 +#: netbox/circuits/forms/model_forms.py:76 +#: netbox/circuits/forms/model_forms.py:110 +#: netbox/circuits/tables/circuits.py:57 netbox/circuits/tables/circuits.py:112 +#: netbox/circuits/tables/circuits.py:196 #: netbox/circuits/tables/providers.py:72 #: netbox/circuits/tables/providers.py:103 +#: netbox/circuits/tables/virtual_circuits.py:46 +#: netbox/circuits/tables/virtual_circuits.py:93 #: netbox/templates/circuits/circuit.html:18 +#: netbox/templates/circuits/circuitgroupassignment.html:26 #: netbox/templates/circuits/circuittermination.html:25 #: netbox/templates/circuits/provider.html:20 #: netbox/templates/circuits/provideraccount.html:20 #: netbox/templates/circuits/providernetwork.html:20 +#: netbox/templates/circuits/virtualcircuit.html:23 +#: netbox/templates/circuits/virtualcircuittermination.html:26 #: netbox/templates/dcim/inc/cable_termination.html:51 +#: netbox/templates/dcim/interface.html:166 msgid "Provider" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:80 netbox/circuits/forms/filtersets.py:91 +#: netbox/circuits/forms/bulk_edit.py:92 netbox/circuits/forms/filtersets.py:99 #: netbox/templates/circuits/providernetwork.html:28 msgid "Service ID" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:100 -#: netbox/circuits/forms/filtersets.py:107 netbox/dcim/forms/bulk_edit.py:207 -#: netbox/dcim/forms/bulk_edit.py:610 netbox/dcim/forms/bulk_edit.py:819 -#: netbox/dcim/forms/bulk_edit.py:1188 netbox/dcim/forms/bulk_edit.py:1215 -#: netbox/dcim/forms/bulk_edit.py:1721 netbox/dcim/forms/filtersets.py:1064 -#: netbox/dcim/forms/filtersets.py:1455 netbox/dcim/forms/filtersets.py:1479 -#: netbox/dcim/tables/devices.py:704 netbox/dcim/tables/devices.py:761 -#: netbox/dcim/tables/devices.py:1003 netbox/dcim/tables/devicetypes.py:249 -#: netbox/dcim/tables/devicetypes.py:264 netbox/dcim/tables/racks.py:33 -#: netbox/extras/forms/bulk_edit.py:270 netbox/extras/tables/tables.py:443 +#: netbox/circuits/forms/bulk_edit.py:112 +#: netbox/circuits/forms/bulk_edit.py:303 +#: netbox/circuits/forms/filtersets.py:115 +#: netbox/circuits/forms/filtersets.py:315 netbox/dcim/forms/bulk_edit.py:210 +#: netbox/dcim/forms/bulk_edit.py:613 netbox/dcim/forms/bulk_edit.py:822 +#: netbox/dcim/forms/bulk_edit.py:1191 netbox/dcim/forms/bulk_edit.py:1218 +#: netbox/dcim/forms/bulk_edit.py:1740 netbox/dcim/forms/filtersets.py:1065 +#: netbox/dcim/forms/filtersets.py:1323 netbox/dcim/forms/filtersets.py:1460 +#: netbox/dcim/forms/filtersets.py:1484 netbox/dcim/tables/devices.py:737 +#: netbox/dcim/tables/devices.py:793 netbox/dcim/tables/devices.py:1034 +#: netbox/dcim/tables/devicetypes.py:251 netbox/dcim/tables/devicetypes.py:266 +#: netbox/dcim/tables/racks.py:33 netbox/extras/forms/bulk_edit.py:270 +#: netbox/extras/tables/tables.py:443 #: netbox/templates/circuits/circuittype.html:30 +#: netbox/templates/circuits/virtualcircuittype.html:30 #: netbox/templates/dcim/cable.html:40 netbox/templates/dcim/devicerole.html:34 #: netbox/templates/dcim/frontport.html:40 #: netbox/templates/dcim/inventoryitemrole.html:26 +#: netbox/templates/dcim/poweroutlet.html:44 #: netbox/templates/dcim/rackrole.html:30 #: netbox/templates/dcim/rearport.html:40 netbox/templates/extras/tag.html:26 msgid "Color" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:118 -#: netbox/circuits/forms/bulk_import.py:87 -#: netbox/circuits/forms/filtersets.py:126 netbox/core/forms/bulk_edit.py:18 -#: netbox/core/forms/filtersets.py:33 netbox/core/tables/change_logging.py:32 -#: netbox/core/tables/data.py:20 netbox/core/tables/jobs.py:18 -#: netbox/dcim/forms/bulk_edit.py:797 netbox/dcim/forms/bulk_edit.py:936 -#: netbox/dcim/forms/bulk_edit.py:1004 netbox/dcim/forms/bulk_edit.py:1023 -#: netbox/dcim/forms/bulk_edit.py:1046 netbox/dcim/forms/bulk_edit.py:1088 -#: netbox/dcim/forms/bulk_edit.py:1132 netbox/dcim/forms/bulk_edit.py:1183 -#: netbox/dcim/forms/bulk_edit.py:1210 netbox/dcim/forms/bulk_import.py:188 -#: netbox/dcim/forms/bulk_import.py:267 netbox/dcim/forms/bulk_import.py:730 -#: netbox/dcim/forms/bulk_import.py:756 netbox/dcim/forms/bulk_import.py:782 -#: netbox/dcim/forms/bulk_import.py:802 netbox/dcim/forms/bulk_import.py:885 -#: netbox/dcim/forms/bulk_import.py:979 netbox/dcim/forms/bulk_import.py:1021 -#: netbox/dcim/forms/bulk_import.py:1235 netbox/dcim/forms/bulk_import.py:1398 -#: netbox/dcim/forms/filtersets.py:955 netbox/dcim/forms/filtersets.py:1054 -#: netbox/dcim/forms/filtersets.py:1175 netbox/dcim/forms/filtersets.py:1247 -#: netbox/dcim/forms/filtersets.py:1272 netbox/dcim/forms/filtersets.py:1296 -#: netbox/dcim/forms/filtersets.py:1316 netbox/dcim/forms/filtersets.py:1353 -#: netbox/dcim/forms/filtersets.py:1450 netbox/dcim/forms/filtersets.py:1474 -#: netbox/dcim/forms/model_forms.py:703 netbox/dcim/forms/model_forms.py:709 -#: netbox/dcim/forms/object_import.py:84 netbox/dcim/forms/object_import.py:113 -#: netbox/dcim/forms/object_import.py:145 netbox/dcim/tables/devices.py:178 -#: netbox/dcim/tables/devices.py:814 netbox/dcim/tables/power.py:77 -#: netbox/dcim/tables/racks.py:138 netbox/extras/forms/bulk_import.py:42 +#: netbox/circuits/forms/bulk_edit.py:130 +#: netbox/circuits/forms/bulk_edit.py:331 +#: netbox/circuits/forms/bulk_import.py:94 +#: netbox/circuits/forms/bulk_import.py:221 +#: netbox/circuits/forms/filtersets.py:137 +#: netbox/circuits/forms/filtersets.py:353 +#: netbox/circuits/tables/circuits.py:65 netbox/circuits/tables/circuits.py:200 +#: netbox/circuits/tables/virtual_circuits.py:58 +#: netbox/core/forms/bulk_edit.py:18 netbox/core/forms/filtersets.py:33 +#: netbox/core/tables/change_logging.py:32 netbox/core/tables/data.py:20 +#: netbox/core/tables/jobs.py:18 netbox/dcim/forms/bulk_edit.py:800 +#: netbox/dcim/forms/bulk_edit.py:939 netbox/dcim/forms/bulk_edit.py:1007 +#: netbox/dcim/forms/bulk_edit.py:1026 netbox/dcim/forms/bulk_edit.py:1049 +#: netbox/dcim/forms/bulk_edit.py:1091 netbox/dcim/forms/bulk_edit.py:1135 +#: netbox/dcim/forms/bulk_edit.py:1186 netbox/dcim/forms/bulk_edit.py:1213 +#: netbox/dcim/forms/bulk_import.py:190 netbox/dcim/forms/bulk_import.py:269 +#: netbox/dcim/forms/bulk_import.py:735 netbox/dcim/forms/bulk_import.py:761 +#: netbox/dcim/forms/bulk_import.py:787 netbox/dcim/forms/bulk_import.py:807 +#: netbox/dcim/forms/bulk_import.py:893 netbox/dcim/forms/bulk_import.py:987 +#: netbox/dcim/forms/bulk_import.py:1029 netbox/dcim/forms/bulk_import.py:1332 +#: netbox/dcim/forms/bulk_import.py:1495 netbox/dcim/forms/filtersets.py:956 +#: netbox/dcim/forms/filtersets.py:1055 netbox/dcim/forms/filtersets.py:1176 +#: netbox/dcim/forms/filtersets.py:1248 netbox/dcim/forms/filtersets.py:1273 +#: netbox/dcim/forms/filtersets.py:1297 netbox/dcim/forms/filtersets.py:1317 +#: netbox/dcim/forms/filtersets.py:1358 netbox/dcim/forms/filtersets.py:1455 +#: netbox/dcim/forms/filtersets.py:1479 netbox/dcim/forms/model_forms.py:714 +#: netbox/dcim/forms/model_forms.py:720 netbox/dcim/forms/object_import.py:84 +#: netbox/dcim/forms/object_import.py:113 +#: netbox/dcim/forms/object_import.py:146 netbox/dcim/tables/devices.py:188 +#: netbox/dcim/tables/devices.py:845 netbox/dcim/tables/power.py:77 +#: netbox/dcim/tables/racks.py:137 netbox/extras/forms/bulk_import.py:42 #: netbox/extras/tables/tables.py:405 netbox/extras/tables/tables.py:465 #: netbox/netbox/tables/tables.py:240 netbox/templates/circuits/circuit.html:30 +#: netbox/templates/circuits/virtualcircuit.html:39 +#: netbox/templates/circuits/virtualcircuittermination.html:64 #: netbox/templates/core/datasource.html:38 netbox/templates/dcim/cable.html:15 #: netbox/templates/dcim/consoleport.html:36 #: netbox/templates/dcim/consoleserverport.html:36 #: netbox/templates/dcim/frontport.html:36 #: netbox/templates/dcim/interface.html:46 -#: netbox/templates/dcim/interface.html:169 -#: netbox/templates/dcim/interface.html:311 +#: netbox/templates/dcim/interface.html:226 +#: netbox/templates/dcim/interface.html:368 #: netbox/templates/dcim/powerfeed.html:32 #: netbox/templates/dcim/poweroutlet.html:36 #: netbox/templates/dcim/powerport.html:36 @@ -614,65 +709,78 @@ msgstr "" #: netbox/templates/vpn/l2vpn.html:22 #: netbox/templates/wireless/inc/authentication_attrs.html:8 #: netbox/templates/wireless/inc/wirelesslink_interface.html:14 -#: netbox/virtualization/forms/bulk_edit.py:60 -#: netbox/virtualization/forms/bulk_import.py:41 +#: netbox/virtualization/forms/bulk_edit.py:61 +#: netbox/virtualization/forms/bulk_import.py:42 #: netbox/virtualization/forms/filtersets.py:54 -#: netbox/virtualization/forms/model_forms.py:62 +#: netbox/virtualization/forms/model_forms.py:64 #: netbox/virtualization/tables/clusters.py:66 #: netbox/vpn/forms/bulk_edit.py:264 netbox/vpn/forms/bulk_import.py:264 -#: netbox/vpn/forms/filtersets.py:217 netbox/vpn/forms/model_forms.py:84 -#: netbox/vpn/forms/model_forms.py:119 netbox/vpn/forms/model_forms.py:231 +#: netbox/vpn/forms/filtersets.py:217 netbox/vpn/forms/model_forms.py:85 +#: netbox/vpn/forms/model_forms.py:120 netbox/vpn/forms/model_forms.py:232 msgid "Type" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:128 -#: netbox/circuits/forms/bulk_import.py:80 -#: netbox/circuits/forms/filtersets.py:139 -#: netbox/circuits/forms/model_forms.py:98 +#: netbox/circuits/forms/bulk_edit.py:140 +#: netbox/circuits/forms/bulk_edit.py:326 +#: netbox/circuits/forms/bulk_import.py:87 +#: netbox/circuits/forms/bulk_import.py:214 +#: netbox/circuits/forms/filtersets.py:150 +#: netbox/circuits/forms/filtersets.py:340 +#: netbox/circuits/forms/model_forms.py:116 +#: netbox/circuits/forms/model_forms.py:330 +#: netbox/templates/circuits/virtualcircuit.html:31 +#: netbox/templates/circuits/virtualcircuittermination.html:34 msgid "Provider account" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:136 -#: netbox/circuits/forms/bulk_import.py:93 -#: netbox/circuits/forms/filtersets.py:150 netbox/core/forms/filtersets.py:38 +#: netbox/circuits/forms/bulk_edit.py:148 +#: netbox/circuits/forms/bulk_edit.py:336 +#: netbox/circuits/forms/bulk_import.py:100 +#: netbox/circuits/forms/bulk_import.py:227 +#: netbox/circuits/forms/filtersets.py:161 +#: netbox/circuits/forms/filtersets.py:356 netbox/core/forms/filtersets.py:38 #: netbox/core/forms/filtersets.py:79 netbox/core/tables/data.py:23 #: netbox/core/tables/jobs.py:26 netbox/core/tables/tasks.py:88 -#: netbox/dcim/forms/bulk_edit.py:107 netbox/dcim/forms/bulk_edit.py:182 -#: netbox/dcim/forms/bulk_edit.py:352 netbox/dcim/forms/bulk_edit.py:706 -#: netbox/dcim/forms/bulk_edit.py:771 netbox/dcim/forms/bulk_edit.py:803 -#: netbox/dcim/forms/bulk_edit.py:930 netbox/dcim/forms/bulk_edit.py:1744 -#: netbox/dcim/forms/bulk_import.py:88 netbox/dcim/forms/bulk_import.py:147 -#: netbox/dcim/forms/bulk_import.py:248 netbox/dcim/forms/bulk_import.py:527 -#: netbox/dcim/forms/bulk_import.py:681 netbox/dcim/forms/bulk_import.py:1229 -#: netbox/dcim/forms/bulk_import.py:1393 netbox/dcim/forms/bulk_import.py:1457 -#: netbox/dcim/forms/filtersets.py:178 netbox/dcim/forms/filtersets.py:237 -#: netbox/dcim/forms/filtersets.py:359 netbox/dcim/forms/filtersets.py:799 -#: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 -#: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 -#: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 -#: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 +#: netbox/dcim/forms/bulk_edit.py:110 netbox/dcim/forms/bulk_edit.py:185 +#: netbox/dcim/forms/bulk_edit.py:355 netbox/dcim/forms/bulk_edit.py:709 +#: netbox/dcim/forms/bulk_edit.py:774 netbox/dcim/forms/bulk_edit.py:806 +#: netbox/dcim/forms/bulk_edit.py:933 netbox/dcim/forms/bulk_edit.py:1721 +#: netbox/dcim/forms/bulk_edit.py:1763 netbox/dcim/forms/bulk_import.py:90 +#: netbox/dcim/forms/bulk_import.py:149 netbox/dcim/forms/bulk_import.py:250 +#: netbox/dcim/forms/bulk_import.py:532 netbox/dcim/forms/bulk_import.py:686 +#: netbox/dcim/forms/bulk_import.py:1137 netbox/dcim/forms/bulk_import.py:1326 +#: netbox/dcim/forms/bulk_import.py:1490 netbox/dcim/forms/bulk_import.py:1554 +#: netbox/dcim/forms/filtersets.py:179 netbox/dcim/forms/filtersets.py:238 +#: netbox/dcim/forms/filtersets.py:360 netbox/dcim/forms/filtersets.py:800 +#: netbox/dcim/forms/filtersets.py:925 netbox/dcim/forms/filtersets.py:959 +#: netbox/dcim/forms/filtersets.py:1060 netbox/dcim/forms/filtersets.py:1171 +#: netbox/dcim/forms/filtersets.py:1562 netbox/dcim/tables/devices.py:150 +#: netbox/dcim/tables/devices.py:848 netbox/dcim/tables/devices.py:982 +#: netbox/dcim/tables/devices.py:1094 netbox/dcim/tables/modules.py:70 +#: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:125 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 -#: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 -#: netbox/ipam/forms/bulk_edit.py:354 netbox/ipam/forms/bulk_edit.py:506 -#: netbox/ipam/forms/bulk_import.py:192 netbox/ipam/forms/bulk_import.py:257 -#: netbox/ipam/forms/bulk_import.py:293 netbox/ipam/forms/bulk_import.py:474 -#: netbox/ipam/forms/filtersets.py:210 netbox/ipam/forms/filtersets.py:281 -#: netbox/ipam/forms/filtersets.py:355 netbox/ipam/forms/filtersets.py:501 -#: netbox/ipam/forms/model_forms.py:501 netbox/ipam/tables/ip.py:237 -#: netbox/ipam/tables/ip.py:312 netbox/ipam/tables/ip.py:363 -#: netbox/ipam/tables/ip.py:426 netbox/ipam/tables/ip.py:453 -#: netbox/ipam/tables/vlans.py:126 netbox/ipam/tables/vlans.py:232 +#: netbox/ipam/forms/bulk_edit.py:240 netbox/ipam/forms/bulk_edit.py:290 +#: netbox/ipam/forms/bulk_edit.py:338 netbox/ipam/forms/bulk_edit.py:490 +#: netbox/ipam/forms/bulk_import.py:188 netbox/ipam/forms/bulk_import.py:256 +#: netbox/ipam/forms/bulk_import.py:292 netbox/ipam/forms/bulk_import.py:473 +#: netbox/ipam/forms/filtersets.py:212 netbox/ipam/forms/filtersets.py:284 +#: netbox/ipam/forms/filtersets.py:358 netbox/ipam/forms/filtersets.py:542 +#: netbox/ipam/forms/model_forms.py:503 netbox/ipam/tables/ip.py:183 +#: netbox/ipam/tables/ip.py:262 netbox/ipam/tables/ip.py:313 +#: netbox/ipam/tables/ip.py:376 netbox/ipam/tables/ip.py:403 +#: netbox/ipam/tables/vlans.py:95 netbox/ipam/tables/vlans.py:208 #: netbox/templates/circuits/circuit.html:34 +#: netbox/templates/circuits/virtualcircuit.html:43 #: netbox/templates/core/datasource.html:46 netbox/templates/core/job.html:48 #: netbox/templates/core/rq_task.html:81 netbox/templates/core/system.html:18 #: netbox/templates/dcim/cable.html:19 netbox/templates/dcim/device.html:178 +#: netbox/templates/dcim/inventoryitem.html:36 #: netbox/templates/dcim/location.html:45 netbox/templates/dcim/module.html:69 #: netbox/templates/dcim/powerfeed.html:36 netbox/templates/dcim/rack.html:41 #: netbox/templates/dcim/site.html:43 #: netbox/templates/extras/script_list.html:48 #: netbox/templates/ipam/ipaddress.html:37 -#: netbox/templates/ipam/iprange.html:54 netbox/templates/ipam/prefix.html:73 +#: netbox/templates/ipam/iprange.html:54 netbox/templates/ipam/prefix.html:69 #: netbox/templates/ipam/vlan.html:48 #: netbox/templates/virtualization/cluster.html:21 #: netbox/templates/virtualization/virtualmachine.html:19 @@ -680,62 +788,66 @@ msgstr "" #: netbox/templates/wireless/wirelesslan.html:22 #: netbox/templates/wireless/wirelesslink.html:17 #: netbox/users/forms/filtersets.py:32 netbox/users/forms/model_forms.py:194 -#: netbox/virtualization/forms/bulk_edit.py:70 -#: netbox/virtualization/forms/bulk_edit.py:118 -#: netbox/virtualization/forms/bulk_import.py:54 -#: netbox/virtualization/forms/bulk_import.py:80 -#: netbox/virtualization/forms/filtersets.py:62 -#: netbox/virtualization/forms/filtersets.py:160 +#: netbox/virtualization/forms/bulk_edit.py:71 +#: netbox/virtualization/forms/bulk_edit.py:100 +#: netbox/virtualization/forms/bulk_import.py:55 +#: netbox/virtualization/forms/bulk_import.py:86 +#: netbox/virtualization/forms/filtersets.py:82 +#: netbox/virtualization/forms/filtersets.py:165 #: netbox/virtualization/tables/clusters.py:74 -#: netbox/virtualization/tables/virtualmachines.py:60 +#: netbox/virtualization/tables/virtualmachines.py:30 #: netbox/vpn/forms/bulk_edit.py:39 netbox/vpn/forms/bulk_import.py:37 #: netbox/vpn/forms/filtersets.py:47 netbox/vpn/tables/tunnels.py:48 -#: netbox/wireless/forms/bulk_edit.py:43 netbox/wireless/forms/bulk_edit.py:105 -#: netbox/wireless/forms/bulk_import.py:43 -#: netbox/wireless/forms/bulk_import.py:84 -#: netbox/wireless/forms/filtersets.py:49 -#: netbox/wireless/forms/filtersets.py:83 +#: netbox/wireless/forms/bulk_edit.py:45 netbox/wireless/forms/bulk_edit.py:108 +#: netbox/wireless/forms/bulk_import.py:45 +#: netbox/wireless/forms/bulk_import.py:89 +#: netbox/wireless/forms/filtersets.py:52 +#: netbox/wireless/forms/filtersets.py:111 #: netbox/wireless/tables/wirelesslan.py:52 -#: netbox/wireless/tables/wirelesslink.py:20 +#: netbox/wireless/tables/wirelesslink.py:19 msgid "Status" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:142 -#: netbox/circuits/forms/bulk_edit.py:233 -#: netbox/circuits/forms/bulk_import.py:98 -#: netbox/circuits/forms/bulk_import.py:158 -#: netbox/circuits/forms/filtersets.py:119 -#: netbox/circuits/forms/filtersets.py:241 netbox/dcim/forms/bulk_edit.py:123 -#: netbox/dcim/forms/bulk_edit.py:188 netbox/dcim/forms/bulk_edit.py:347 -#: netbox/dcim/forms/bulk_edit.py:467 netbox/dcim/forms/bulk_edit.py:696 -#: netbox/dcim/forms/bulk_edit.py:809 netbox/dcim/forms/bulk_edit.py:1749 -#: netbox/dcim/forms/bulk_import.py:107 netbox/dcim/forms/bulk_import.py:152 -#: netbox/dcim/forms/bulk_import.py:241 netbox/dcim/forms/bulk_import.py:356 -#: netbox/dcim/forms/bulk_import.py:501 netbox/dcim/forms/bulk_import.py:1241 -#: netbox/dcim/forms/bulk_import.py:1450 netbox/dcim/forms/filtersets.py:173 -#: netbox/dcim/forms/filtersets.py:205 netbox/dcim/forms/filtersets.py:323 -#: netbox/dcim/forms/filtersets.py:399 netbox/dcim/forms/filtersets.py:420 -#: netbox/dcim/forms/filtersets.py:722 netbox/dcim/forms/filtersets.py:916 -#: netbox/dcim/forms/filtersets.py:978 netbox/dcim/forms/filtersets.py:1008 -#: netbox/dcim/forms/filtersets.py:1130 netbox/dcim/tables/power.py:88 +#: netbox/circuits/forms/bulk_edit.py:154 +#: netbox/circuits/forms/bulk_edit.py:271 +#: netbox/circuits/forms/bulk_edit.py:342 +#: netbox/circuits/forms/bulk_import.py:111 +#: netbox/circuits/forms/bulk_import.py:170 +#: netbox/circuits/forms/bulk_import.py:232 +#: netbox/circuits/forms/filtersets.py:130 +#: netbox/circuits/forms/filtersets.py:272 +#: netbox/circuits/forms/filtersets.py:326 netbox/dcim/forms/bulk_edit.py:126 +#: netbox/dcim/forms/bulk_edit.py:191 netbox/dcim/forms/bulk_edit.py:350 +#: netbox/dcim/forms/bulk_edit.py:470 netbox/dcim/forms/bulk_edit.py:699 +#: netbox/dcim/forms/bulk_edit.py:812 netbox/dcim/forms/bulk_edit.py:1768 +#: netbox/dcim/forms/bulk_import.py:109 netbox/dcim/forms/bulk_import.py:154 +#: netbox/dcim/forms/bulk_import.py:243 netbox/dcim/forms/bulk_import.py:358 +#: netbox/dcim/forms/bulk_import.py:506 netbox/dcim/forms/bulk_import.py:1338 +#: netbox/dcim/forms/bulk_import.py:1547 netbox/dcim/forms/filtersets.py:174 +#: netbox/dcim/forms/filtersets.py:206 netbox/dcim/forms/filtersets.py:324 +#: netbox/dcim/forms/filtersets.py:400 netbox/dcim/forms/filtersets.py:421 +#: netbox/dcim/forms/filtersets.py:723 netbox/dcim/forms/filtersets.py:917 +#: netbox/dcim/forms/filtersets.py:979 netbox/dcim/forms/filtersets.py:1009 +#: netbox/dcim/forms/filtersets.py:1131 netbox/dcim/tables/power.py:88 #: netbox/extras/filtersets.py:612 netbox/extras/forms/filtersets.py:323 -#: netbox/extras/forms/filtersets.py:396 netbox/ipam/forms/bulk_edit.py:43 -#: netbox/ipam/forms/bulk_edit.py:68 netbox/ipam/forms/bulk_edit.py:112 -#: netbox/ipam/forms/bulk_edit.py:141 netbox/ipam/forms/bulk_edit.py:166 -#: netbox/ipam/forms/bulk_edit.py:251 netbox/ipam/forms/bulk_edit.py:301 -#: netbox/ipam/forms/bulk_edit.py:349 netbox/ipam/forms/bulk_edit.py:501 -#: netbox/ipam/forms/bulk_import.py:38 netbox/ipam/forms/bulk_import.py:67 -#: netbox/ipam/forms/bulk_import.py:95 netbox/ipam/forms/bulk_import.py:115 -#: netbox/ipam/forms/bulk_import.py:135 netbox/ipam/forms/bulk_import.py:164 -#: netbox/ipam/forms/bulk_import.py:250 netbox/ipam/forms/bulk_import.py:286 -#: netbox/ipam/forms/bulk_import.py:467 netbox/ipam/forms/filtersets.py:48 -#: netbox/ipam/forms/filtersets.py:68 netbox/ipam/forms/filtersets.py:100 -#: netbox/ipam/forms/filtersets.py:120 netbox/ipam/forms/filtersets.py:143 -#: netbox/ipam/forms/filtersets.py:174 netbox/ipam/forms/filtersets.py:267 -#: netbox/ipam/forms/filtersets.py:310 netbox/ipam/forms/filtersets.py:469 -#: netbox/ipam/tables/ip.py:456 netbox/ipam/tables/vlans.py:229 -#: netbox/templates/circuits/circuit.html:38 +#: netbox/extras/forms/filtersets.py:396 netbox/ipam/forms/bulk_edit.py:46 +#: netbox/ipam/forms/bulk_edit.py:71 netbox/ipam/forms/bulk_edit.py:115 +#: netbox/ipam/forms/bulk_edit.py:144 netbox/ipam/forms/bulk_edit.py:169 +#: netbox/ipam/forms/bulk_edit.py:235 netbox/ipam/forms/bulk_edit.py:285 +#: netbox/ipam/forms/bulk_edit.py:333 netbox/ipam/forms/bulk_edit.py:485 +#: netbox/ipam/forms/bulk_import.py:41 netbox/ipam/forms/bulk_import.py:70 +#: netbox/ipam/forms/bulk_import.py:98 netbox/ipam/forms/bulk_import.py:118 +#: netbox/ipam/forms/bulk_import.py:138 netbox/ipam/forms/bulk_import.py:167 +#: netbox/ipam/forms/bulk_import.py:249 netbox/ipam/forms/bulk_import.py:285 +#: netbox/ipam/forms/bulk_import.py:466 netbox/ipam/forms/filtersets.py:50 +#: netbox/ipam/forms/filtersets.py:70 netbox/ipam/forms/filtersets.py:102 +#: netbox/ipam/forms/filtersets.py:122 netbox/ipam/forms/filtersets.py:145 +#: netbox/ipam/forms/filtersets.py:176 netbox/ipam/forms/filtersets.py:270 +#: netbox/ipam/forms/filtersets.py:313 netbox/ipam/forms/filtersets.py:510 +#: netbox/ipam/tables/ip.py:406 netbox/ipam/tables/vlans.py:205 +#: netbox/templates/circuits/circuit.html:48 #: netbox/templates/circuits/circuitgroup.html:36 +#: netbox/templates/circuits/virtualcircuit.html:47 #: netbox/templates/dcim/cable.html:23 netbox/templates/dcim/device.html:79 #: netbox/templates/dcim/location.html:49 #: netbox/templates/dcim/powerfeed.html:44 netbox/templates/dcim/rack.html:32 @@ -751,114 +863,181 @@ msgstr "" #: netbox/templates/virtualization/cluster.html:33 #: netbox/templates/virtualization/virtualmachine.html:39 #: netbox/templates/vpn/l2vpn.html:30 netbox/templates/vpn/tunnel.html:49 -#: netbox/templates/wireless/wirelesslan.html:34 +#: netbox/templates/wireless/wirelesslan.html:42 #: netbox/templates/wireless/wirelesslink.html:25 -#: netbox/tenancy/forms/forms.py:25 netbox/tenancy/forms/forms.py:48 -#: netbox/tenancy/forms/model_forms.py:52 netbox/tenancy/tables/columns.py:64 -#: netbox/virtualization/forms/bulk_edit.py:76 -#: netbox/virtualization/forms/bulk_edit.py:155 -#: netbox/virtualization/forms/bulk_import.py:66 -#: netbox/virtualization/forms/bulk_import.py:115 +#: netbox/tenancy/forms/forms.py:25 netbox/tenancy/forms/forms.py:49 +#: netbox/tenancy/forms/model_forms.py:52 netbox/tenancy/tables/columns.py:49 +#: netbox/virtualization/forms/bulk_edit.py:77 +#: netbox/virtualization/forms/bulk_edit.py:137 +#: netbox/virtualization/forms/bulk_import.py:67 +#: netbox/virtualization/forms/bulk_import.py:121 #: netbox/virtualization/forms/filtersets.py:47 -#: netbox/virtualization/forms/filtersets.py:105 +#: netbox/virtualization/forms/filtersets.py:110 #: netbox/vpn/forms/bulk_edit.py:59 netbox/vpn/forms/bulk_edit.py:269 #: netbox/vpn/forms/bulk_import.py:59 netbox/vpn/forms/bulk_import.py:258 -#: netbox/vpn/forms/filtersets.py:214 netbox/wireless/forms/bulk_edit.py:63 -#: netbox/wireless/forms/bulk_edit.py:110 -#: netbox/wireless/forms/bulk_import.py:55 -#: netbox/wireless/forms/bulk_import.py:97 -#: netbox/wireless/forms/filtersets.py:35 -#: netbox/wireless/forms/filtersets.py:75 +#: netbox/vpn/forms/filtersets.py:214 netbox/wireless/forms/bulk_edit.py:65 +#: netbox/wireless/forms/bulk_edit.py:113 +#: netbox/wireless/forms/bulk_import.py:57 +#: netbox/wireless/forms/bulk_import.py:102 +#: netbox/wireless/forms/filtersets.py:38 +#: netbox/wireless/forms/filtersets.py:103 msgid "Tenant" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:147 -#: netbox/circuits/forms/filtersets.py:174 +#: netbox/circuits/forms/bulk_edit.py:159 +#: netbox/circuits/forms/filtersets.py:185 msgid "Install date" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:152 -#: netbox/circuits/forms/filtersets.py:179 +#: netbox/circuits/forms/bulk_edit.py:164 +#: netbox/circuits/forms/filtersets.py:190 msgid "Termination date" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:158 -#: netbox/circuits/forms/filtersets.py:186 +#: netbox/circuits/forms/bulk_edit.py:170 +#: netbox/circuits/forms/filtersets.py:197 msgid "Commit rate (Kbps)" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:173 -#: netbox/circuits/forms/model_forms.py:112 +#: netbox/circuits/forms/bulk_edit.py:176 +#: netbox/circuits/forms/filtersets.py:203 +#: netbox/circuits/forms/model_forms.py:136 +#: netbox/templates/circuits/circuit.html:38 +#: netbox/templates/wireless/wirelesslink.html:38 +#: netbox/wireless/forms/bulk_edit.py:132 +#: netbox/wireless/forms/filtersets.py:130 +#: netbox/wireless/forms/model_forms.py:168 +msgid "Distance" +msgstr "" + +#: netbox/circuits/forms/bulk_edit.py:181 +#: netbox/circuits/forms/bulk_import.py:105 +#: netbox/circuits/forms/bulk_import.py:108 +#: netbox/circuits/forms/filtersets.py:207 +#: netbox/wireless/forms/bulk_edit.py:137 +#: netbox/wireless/forms/bulk_import.py:121 +#: netbox/wireless/forms/bulk_import.py:124 +#: netbox/wireless/forms/filtersets.py:134 +msgid "Distance unit" +msgstr "" + +#: netbox/circuits/forms/bulk_edit.py:196 +#: netbox/circuits/forms/model_forms.py:141 msgid "Service Parameters" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:174 -#: netbox/circuits/forms/model_forms.py:113 -#: netbox/circuits/forms/model_forms.py:183 -#: netbox/dcim/forms/model_forms.py:139 netbox/dcim/forms/model_forms.py:181 -#: netbox/dcim/forms/model_forms.py:266 netbox/dcim/forms/model_forms.py:323 -#: netbox/dcim/forms/model_forms.py:768 netbox/dcim/forms/model_forms.py:1699 -#: netbox/ipam/forms/model_forms.py:64 netbox/ipam/forms/model_forms.py:81 -#: netbox/ipam/forms/model_forms.py:115 netbox/ipam/forms/model_forms.py:136 -#: netbox/ipam/forms/model_forms.py:160 netbox/ipam/forms/model_forms.py:232 -#: netbox/ipam/forms/model_forms.py:261 netbox/ipam/forms/model_forms.py:320 +#: netbox/circuits/forms/bulk_edit.py:197 +#: netbox/circuits/forms/filtersets.py:73 +#: netbox/circuits/forms/filtersets.py:91 +#: netbox/circuits/forms/filtersets.py:110 +#: netbox/circuits/forms/filtersets.py:127 +#: netbox/circuits/forms/filtersets.py:310 +#: netbox/circuits/forms/filtersets.py:325 netbox/core/forms/filtersets.py:67 +#: netbox/core/forms/filtersets.py:135 netbox/dcim/forms/bulk_edit.py:846 +#: netbox/dcim/forms/filtersets.py:173 netbox/dcim/forms/filtersets.py:205 +#: netbox/dcim/forms/filtersets.py:916 netbox/dcim/forms/filtersets.py:1008 +#: netbox/dcim/forms/filtersets.py:1132 netbox/dcim/forms/filtersets.py:1240 +#: netbox/dcim/forms/filtersets.py:1264 netbox/dcim/forms/filtersets.py:1289 +#: netbox/dcim/forms/filtersets.py:1308 netbox/dcim/forms/filtersets.py:1332 +#: netbox/dcim/forms/filtersets.py:1446 netbox/dcim/forms/filtersets.py:1470 +#: netbox/dcim/forms/filtersets.py:1494 netbox/dcim/forms/filtersets.py:1512 +#: netbox/dcim/forms/filtersets.py:1528 netbox/extras/forms/bulk_edit.py:90 +#: netbox/extras/forms/filtersets.py:44 netbox/extras/forms/filtersets.py:134 +#: netbox/extras/forms/filtersets.py:165 netbox/extras/forms/filtersets.py:205 +#: netbox/extras/forms/filtersets.py:221 netbox/extras/forms/filtersets.py:252 +#: netbox/extras/forms/filtersets.py:276 netbox/extras/forms/filtersets.py:441 +#: netbox/ipam/forms/filtersets.py:101 netbox/ipam/forms/filtersets.py:269 +#: netbox/ipam/forms/filtersets.py:310 netbox/ipam/forms/filtersets.py:385 +#: netbox/ipam/forms/filtersets.py:470 netbox/ipam/forms/filtersets.py:483 +#: netbox/ipam/forms/filtersets.py:508 netbox/ipam/forms/filtersets.py:579 +#: netbox/ipam/forms/filtersets.py:597 netbox/netbox/tables/tables.py:256 +#: netbox/virtualization/forms/filtersets.py:45 +#: netbox/virtualization/forms/filtersets.py:108 +#: netbox/virtualization/forms/filtersets.py:203 +#: netbox/virtualization/forms/filtersets.py:248 +#: netbox/vpn/forms/filtersets.py:213 netbox/wireless/forms/bulk_edit.py:153 +#: netbox/wireless/forms/filtersets.py:36 +#: netbox/wireless/forms/filtersets.py:102 +msgid "Attributes" +msgstr "" + +#: netbox/circuits/forms/bulk_edit.py:198 +#: netbox/circuits/forms/bulk_edit.py:356 +#: netbox/circuits/forms/model_forms.py:142 +#: netbox/circuits/forms/model_forms.py:240 +#: netbox/circuits/forms/model_forms.py:345 +#: netbox/dcim/forms/model_forms.py:143 netbox/dcim/forms/model_forms.py:185 +#: netbox/dcim/forms/model_forms.py:274 netbox/dcim/forms/model_forms.py:331 +#: netbox/dcim/forms/model_forms.py:780 netbox/dcim/forms/model_forms.py:1744 +#: netbox/ipam/forms/model_forms.py:67 netbox/ipam/forms/model_forms.py:84 +#: netbox/ipam/forms/model_forms.py:119 netbox/ipam/forms/model_forms.py:141 +#: netbox/ipam/forms/model_forms.py:166 netbox/ipam/forms/model_forms.py:233 +#: netbox/ipam/forms/model_forms.py:263 netbox/ipam/forms/model_forms.py:322 #: netbox/netbox/navigation/menu.py:24 #: netbox/templates/dcim/device_edit.html:85 #: netbox/templates/dcim/htmx/cable_edit.html:72 #: netbox/templates/ipam/ipaddress_bulk_add.html:27 -#: netbox/templates/ipam/vlan_edit.html:22 -#: netbox/virtualization/forms/model_forms.py:80 -#: netbox/virtualization/forms/model_forms.py:222 +#: netbox/templates/ipam/vlan_edit.html:30 +#: netbox/virtualization/forms/model_forms.py:79 +#: netbox/virtualization/forms/model_forms.py:221 #: netbox/vpn/forms/bulk_edit.py:78 netbox/vpn/forms/filtersets.py:44 -#: netbox/vpn/forms/model_forms.py:62 netbox/vpn/forms/model_forms.py:147 -#: netbox/vpn/forms/model_forms.py:411 netbox/wireless/forms/model_forms.py:54 -#: netbox/wireless/forms/model_forms.py:170 +#: netbox/vpn/forms/model_forms.py:63 netbox/vpn/forms/model_forms.py:148 +#: netbox/vpn/forms/model_forms.py:414 netbox/wireless/forms/model_forms.py:57 +#: netbox/wireless/forms/model_forms.py:173 msgid "Tenancy" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:193 -#: netbox/circuits/forms/bulk_edit.py:217 -#: netbox/circuits/forms/model_forms.py:155 -#: netbox/circuits/tables/circuits.py:117 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:62 -#: netbox/templates/circuits/providernetwork.html:17 -msgid "Provider Network" +#: netbox/circuits/forms/bulk_edit.py:215 +#: netbox/circuits/forms/model_forms.py:170 +#: netbox/dcim/forms/bulk_import.py:1299 netbox/dcim/forms/bulk_import.py:1317 +msgid "Termination type" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:199 +#: netbox/circuits/forms/bulk_edit.py:218 +#: netbox/circuits/forms/bulk_import.py:133 +#: netbox/circuits/forms/filtersets.py:220 +#: netbox/circuits/forms/model_forms.py:173 +#: netbox/templates/circuits/inc/circuit_termination.html:6 +#: netbox/templates/dcim/cable.html:68 netbox/templates/dcim/cable.html:72 +#: netbox/vpn/forms/bulk_import.py:100 netbox/vpn/forms/filtersets.py:77 +msgid "Termination" +msgstr "" + +#: netbox/circuits/forms/bulk_edit.py:226 msgid "Port speed (Kbps)" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:203 +#: netbox/circuits/forms/bulk_edit.py:230 msgid "Upstream speed (Kbps)" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:206 netbox/dcim/forms/bulk_edit.py:966 -#: netbox/dcim/forms/bulk_edit.py:1330 netbox/dcim/forms/bulk_edit.py:1347 -#: netbox/dcim/forms/bulk_edit.py:1364 netbox/dcim/forms/bulk_edit.py:1382 -#: netbox/dcim/forms/bulk_edit.py:1477 netbox/dcim/forms/bulk_edit.py:1637 -#: netbox/dcim/forms/bulk_edit.py:1654 +#: netbox/circuits/forms/bulk_edit.py:233 netbox/dcim/forms/bulk_edit.py:969 +#: netbox/dcim/forms/bulk_edit.py:1333 netbox/dcim/forms/bulk_edit.py:1350 +#: netbox/dcim/forms/bulk_edit.py:1367 netbox/dcim/forms/bulk_edit.py:1385 +#: netbox/dcim/forms/bulk_edit.py:1480 netbox/dcim/forms/bulk_edit.py:1650 +#: netbox/dcim/forms/bulk_edit.py:1667 msgid "Mark connected" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:219 -#: netbox/circuits/forms/model_forms.py:157 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:54 +#: netbox/circuits/forms/bulk_edit.py:243 +#: netbox/circuits/forms/model_forms.py:184 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:55 #: netbox/templates/dcim/frontport.html:121 -#: netbox/templates/dcim/interface.html:193 +#: netbox/templates/dcim/interface.html:250 #: netbox/templates/dcim/rearport.html:111 msgid "Circuit Termination" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:221 -#: netbox/circuits/forms/model_forms.py:159 +#: netbox/circuits/forms/bulk_edit.py:245 +#: netbox/circuits/forms/model_forms.py:186 msgid "Termination Details" msgstr "" -#: netbox/circuits/forms/bulk_edit.py:251 -#: netbox/circuits/forms/filtersets.py:268 -#: netbox/circuits/tables/circuits.py:168 netbox/dcim/forms/model_forms.py:551 -#: netbox/templates/circuits/circuitgroupassignment.html:30 +#: netbox/circuits/forms/bulk_edit.py:289 +#: netbox/circuits/forms/bulk_import.py:188 +#: netbox/circuits/forms/filtersets.py:299 +#: netbox/circuits/tables/circuits.py:207 netbox/dcim/forms/model_forms.py:562 +#: netbox/templates/circuits/circuitgroupassignment.html:34 #: netbox/templates/dcim/device.html:133 #: netbox/templates/dcim/virtualchassis.html:68 #: netbox/templates/dcim/virtualchassis_edit.html:56 @@ -867,226 +1046,309 @@ msgstr "" msgid "Priority" msgstr "" -#: netbox/circuits/forms/bulk_import.py:39 -#: netbox/circuits/forms/bulk_import.py:54 -#: netbox/circuits/forms/bulk_import.py:77 -msgid "Assigned provider" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:83 -msgid "Assigned provider account" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:90 -msgid "Type of circuit" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:95 netbox/dcim/forms/bulk_import.py:90 -#: netbox/dcim/forms/bulk_import.py:149 netbox/dcim/forms/bulk_import.py:250 -#: netbox/dcim/forms/bulk_import.py:529 netbox/dcim/forms/bulk_import.py:683 -#: netbox/dcim/forms/bulk_import.py:1395 netbox/ipam/forms/bulk_import.py:194 -#: netbox/ipam/forms/bulk_import.py:259 netbox/ipam/forms/bulk_import.py:295 -#: netbox/ipam/forms/bulk_import.py:476 -#: netbox/virtualization/forms/bulk_import.py:56 -#: netbox/virtualization/forms/bulk_import.py:82 -#: netbox/vpn/forms/bulk_import.py:39 netbox/wireless/forms/bulk_import.py:45 -msgid "Operational status" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:102 -#: netbox/circuits/forms/bulk_import.py:162 -#: netbox/dcim/forms/bulk_import.py:111 netbox/dcim/forms/bulk_import.py:156 -#: netbox/dcim/forms/bulk_import.py:360 netbox/dcim/forms/bulk_import.py:505 -#: netbox/dcim/forms/bulk_import.py:1245 netbox/dcim/forms/bulk_import.py:1390 -#: netbox/dcim/forms/bulk_import.py:1454 netbox/ipam/forms/bulk_import.py:42 -#: netbox/ipam/forms/bulk_import.py:71 netbox/ipam/forms/bulk_import.py:99 -#: netbox/ipam/forms/bulk_import.py:119 netbox/ipam/forms/bulk_import.py:139 -#: netbox/ipam/forms/bulk_import.py:168 netbox/ipam/forms/bulk_import.py:254 -#: netbox/ipam/forms/bulk_import.py:290 netbox/ipam/forms/bulk_import.py:471 -#: netbox/virtualization/forms/bulk_import.py:70 -#: netbox/virtualization/forms/bulk_import.py:119 -#: netbox/vpn/forms/bulk_import.py:63 netbox/wireless/forms/bulk_import.py:59 -#: netbox/wireless/forms/bulk_import.py:101 -msgid "Assigned tenant" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:120 -#: netbox/templates/circuits/inc/circuit_termination.html:6 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:15 -#: netbox/templates/dcim/cable.html:68 netbox/templates/dcim/cable.html:72 -#: netbox/vpn/forms/bulk_import.py:100 netbox/vpn/forms/filtersets.py:77 -msgid "Termination" -msgstr "" - -#: netbox/circuits/forms/bulk_import.py:130 -#: netbox/circuits/forms/filtersets.py:147 -#: netbox/circuits/forms/filtersets.py:227 -#: netbox/circuits/forms/model_forms.py:144 +#: netbox/circuits/forms/bulk_edit.py:321 +#: netbox/circuits/forms/bulk_import.py:208 +#: netbox/circuits/forms/filtersets.py:158 +#: netbox/circuits/forms/filtersets.py:258 +#: netbox/circuits/forms/filtersets.py:348 +#: netbox/circuits/forms/filtersets.py:386 +#: netbox/circuits/forms/model_forms.py:325 +#: netbox/circuits/tables/virtual_circuits.py:51 +#: netbox/circuits/tables/virtual_circuits.py:99 msgid "Provider network" msgstr "" -#: netbox/circuits/forms/filtersets.py:30 -#: netbox/circuits/forms/filtersets.py:118 -#: netbox/circuits/forms/filtersets.py:200 netbox/dcim/forms/bulk_edit.py:339 -#: netbox/dcim/forms/bulk_edit.py:447 netbox/dcim/forms/bulk_edit.py:688 -#: netbox/dcim/forms/bulk_edit.py:743 netbox/dcim/forms/bulk_edit.py:897 -#: netbox/dcim/forms/bulk_import.py:235 netbox/dcim/forms/bulk_import.py:337 -#: netbox/dcim/forms/bulk_import.py:568 netbox/dcim/forms/bulk_import.py:1339 -#: netbox/dcim/forms/bulk_import.py:1373 netbox/dcim/forms/filtersets.py:95 -#: netbox/dcim/forms/filtersets.py:322 netbox/dcim/forms/filtersets.py:356 -#: netbox/dcim/forms/filtersets.py:396 netbox/dcim/forms/filtersets.py:447 -#: netbox/dcim/forms/filtersets.py:719 netbox/dcim/forms/filtersets.py:762 -#: netbox/dcim/forms/filtersets.py:977 netbox/dcim/forms/filtersets.py:1006 -#: netbox/dcim/forms/filtersets.py:1026 netbox/dcim/forms/filtersets.py:1090 -#: netbox/dcim/forms/filtersets.py:1120 netbox/dcim/forms/filtersets.py:1129 -#: netbox/dcim/forms/filtersets.py:1240 netbox/dcim/forms/filtersets.py:1264 -#: netbox/dcim/forms/filtersets.py:1289 netbox/dcim/forms/filtersets.py:1308 -#: netbox/dcim/forms/filtersets.py:1331 netbox/dcim/forms/filtersets.py:1442 -#: netbox/dcim/forms/filtersets.py:1466 netbox/dcim/forms/filtersets.py:1490 -#: netbox/dcim/forms/filtersets.py:1508 netbox/dcim/forms/filtersets.py:1525 -#: netbox/dcim/forms/model_forms.py:180 netbox/dcim/forms/model_forms.py:243 -#: netbox/dcim/forms/model_forms.py:468 netbox/dcim/forms/model_forms.py:728 -#: netbox/dcim/tables/devices.py:157 netbox/dcim/tables/power.py:30 -#: netbox/dcim/tables/racks.py:118 netbox/dcim/tables/racks.py:212 +#: netbox/circuits/forms/bulk_edit.py:365 +#: netbox/circuits/forms/bulk_import.py:254 +#: netbox/circuits/forms/filtersets.py:376 +#: netbox/circuits/forms/model_forms.py:365 netbox/dcim/forms/bulk_edit.py:361 +#: netbox/dcim/forms/bulk_edit.py:1280 netbox/dcim/forms/bulk_edit.py:1711 +#: netbox/dcim/forms/bulk_import.py:255 netbox/dcim/forms/bulk_import.py:1106 +#: netbox/dcim/forms/filtersets.py:368 netbox/dcim/forms/filtersets.py:778 +#: netbox/dcim/forms/filtersets.py:1539 netbox/dcim/forms/model_forms.py:256 +#: netbox/dcim/forms/model_forms.py:1090 netbox/dcim/forms/model_forms.py:1559 +#: netbox/dcim/forms/object_import.py:182 netbox/dcim/tables/devices.py:179 +#: netbox/dcim/tables/devices.py:840 netbox/dcim/tables/devices.py:966 +#: netbox/dcim/tables/devicetypes.py:306 netbox/dcim/tables/racks.py:128 +#: netbox/extras/filtersets.py:552 netbox/ipam/forms/bulk_edit.py:245 +#: netbox/ipam/forms/bulk_edit.py:295 netbox/ipam/forms/bulk_edit.py:343 +#: netbox/ipam/forms/bulk_edit.py:495 netbox/ipam/forms/bulk_import.py:193 +#: netbox/ipam/forms/bulk_import.py:261 netbox/ipam/forms/bulk_import.py:297 +#: netbox/ipam/forms/bulk_import.py:478 netbox/ipam/forms/filtersets.py:240 +#: netbox/ipam/forms/filtersets.py:292 netbox/ipam/forms/filtersets.py:363 +#: netbox/ipam/forms/filtersets.py:550 netbox/ipam/forms/model_forms.py:194 +#: netbox/ipam/forms/model_forms.py:220 netbox/ipam/forms/model_forms.py:251 +#: netbox/ipam/forms/model_forms.py:678 netbox/ipam/tables/ip.py:207 +#: netbox/ipam/tables/ip.py:266 netbox/ipam/tables/ip.py:317 +#: netbox/ipam/tables/vlans.py:99 netbox/ipam/tables/vlans.py:211 +#: netbox/templates/circuits/virtualcircuittermination.html:42 +#: netbox/templates/dcim/device.html:182 +#: netbox/templates/dcim/inc/panels/inventory_items.html:20 +#: netbox/templates/dcim/interface.html:178 +#: netbox/templates/dcim/interface.html:280 +#: netbox/templates/dcim/inventoryitem.html:40 +#: netbox/templates/dcim/rack.html:49 netbox/templates/ipam/ipaddress.html:41 +#: netbox/templates/ipam/iprange.html:50 netbox/templates/ipam/prefix.html:73 +#: netbox/templates/ipam/role.html:19 netbox/templates/ipam/vlan.html:52 +#: netbox/templates/virtualization/virtualmachine.html:23 +#: netbox/templates/vpn/tunneltermination.html:17 +#: netbox/templates/wireless/inc/wirelesslink_interface.html:20 +#: netbox/tenancy/forms/bulk_edit.py:142 netbox/tenancy/forms/filtersets.py:107 +#: netbox/tenancy/forms/model_forms.py:137 +#: netbox/tenancy/tables/contacts.py:102 +#: netbox/virtualization/forms/bulk_edit.py:127 +#: netbox/virtualization/forms/bulk_import.py:112 +#: netbox/virtualization/forms/filtersets.py:162 +#: netbox/virtualization/forms/model_forms.py:194 +#: netbox/virtualization/tables/virtualmachines.py:45 +#: netbox/vpn/forms/bulk_edit.py:87 netbox/vpn/forms/bulk_import.py:81 +#: netbox/vpn/forms/filtersets.py:85 netbox/vpn/forms/model_forms.py:79 +#: netbox/vpn/forms/model_forms.py:114 netbox/vpn/tables/tunnels.py:82 +msgid "Role" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:46 +#: netbox/circuits/forms/bulk_import.py:61 +#: netbox/circuits/forms/bulk_import.py:84 +msgid "Assigned provider" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:90 +msgid "Assigned provider account" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:97 +msgid "Type of circuit" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:102 +#: netbox/circuits/forms/bulk_import.py:229 netbox/dcim/forms/bulk_import.py:92 +#: netbox/dcim/forms/bulk_import.py:151 netbox/dcim/forms/bulk_import.py:252 +#: netbox/dcim/forms/bulk_import.py:534 netbox/dcim/forms/bulk_import.py:688 +#: netbox/dcim/forms/bulk_import.py:1139 netbox/dcim/forms/bulk_import.py:1492 +#: netbox/ipam/forms/bulk_import.py:190 netbox/ipam/forms/bulk_import.py:258 +#: netbox/ipam/forms/bulk_import.py:294 netbox/ipam/forms/bulk_import.py:475 +#: netbox/ipam/forms/bulk_import.py:488 +#: netbox/virtualization/forms/bulk_import.py:57 +#: netbox/virtualization/forms/bulk_import.py:88 +#: netbox/vpn/forms/bulk_import.py:39 netbox/wireless/forms/bulk_import.py:47 +msgid "Operational status" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:115 +#: netbox/circuits/forms/bulk_import.py:174 +#: netbox/circuits/forms/bulk_import.py:236 +#: netbox/dcim/forms/bulk_import.py:113 netbox/dcim/forms/bulk_import.py:158 +#: netbox/dcim/forms/bulk_import.py:362 netbox/dcim/forms/bulk_import.py:510 +#: netbox/dcim/forms/bulk_import.py:1342 netbox/dcim/forms/bulk_import.py:1487 +#: netbox/dcim/forms/bulk_import.py:1551 netbox/ipam/forms/bulk_import.py:45 +#: netbox/ipam/forms/bulk_import.py:74 netbox/ipam/forms/bulk_import.py:102 +#: netbox/ipam/forms/bulk_import.py:122 netbox/ipam/forms/bulk_import.py:142 +#: netbox/ipam/forms/bulk_import.py:171 netbox/ipam/forms/bulk_import.py:253 +#: netbox/ipam/forms/bulk_import.py:289 netbox/ipam/forms/bulk_import.py:470 +#: netbox/virtualization/forms/bulk_import.py:71 +#: netbox/virtualization/forms/bulk_import.py:125 +#: netbox/vpn/forms/bulk_import.py:63 netbox/wireless/forms/bulk_import.py:61 +#: netbox/wireless/forms/bulk_import.py:106 +msgid "Assigned tenant" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:139 +msgid "Termination type (app & model)" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:151 +#: netbox/circuits/forms/bulk_import.py:164 +msgid "Termination ID" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:185 +msgid "Circuit type (app & model)" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:211 +msgid "The network to which this virtual circuit belongs" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:217 +msgid "Assigned provider account (if any)" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:224 +msgid "Type of virtual circuit" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:256 netbox/vpn/forms/bulk_import.py:83 +msgid "Operational role" +msgstr "" + +#: netbox/circuits/forms/bulk_import.py:259 +#: netbox/circuits/forms/model_forms.py:368 +#: netbox/circuits/tables/virtual_circuits.py:112 +#: netbox/dcim/forms/bulk_import.py:1219 netbox/dcim/forms/model_forms.py:1164 +#: netbox/dcim/forms/model_forms.py:1433 netbox/dcim/forms/model_forms.py:1600 +#: netbox/dcim/forms/model_forms.py:1635 netbox/dcim/forms/model_forms.py:1765 +#: netbox/dcim/tables/connections.py:65 netbox/dcim/tables/devices.py:1140 +#: netbox/ipam/forms/bulk_import.py:317 netbox/ipam/forms/model_forms.py:282 +#: netbox/ipam/forms/model_forms.py:291 netbox/ipam/tables/fhrp.py:64 +#: netbox/ipam/tables/ip.py:322 netbox/ipam/tables/vlans.py:145 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:52 +#: netbox/templates/circuits/virtualcircuittermination.html:53 +#: netbox/templates/circuits/virtualcircuittermination.html:60 +#: netbox/templates/dcim/frontport.html:106 +#: netbox/templates/dcim/interface.html:27 +#: netbox/templates/dcim/interface.html:241 +#: netbox/templates/dcim/interface.html:367 +#: netbox/templates/dcim/rearport.html:102 +#: netbox/templates/virtualization/vminterface.html:18 +#: netbox/templates/vpn/tunneltermination.html:31 +#: netbox/templates/wireless/inc/wirelesslink_interface.html:10 +#: netbox/templates/wireless/wirelesslink.html:10 +#: netbox/templates/wireless/wirelesslink.html:55 +#: netbox/virtualization/forms/model_forms.py:369 +#: netbox/vpn/forms/bulk_import.py:297 netbox/vpn/forms/model_forms.py:439 +#: netbox/vpn/forms/model_forms.py:448 netbox/wireless/forms/model_forms.py:116 +#: netbox/wireless/forms/model_forms.py:158 +msgid "Interface" +msgstr "" + +#: netbox/circuits/forms/filtersets.py:38 +#: netbox/circuits/forms/filtersets.py:129 +#: netbox/circuits/forms/filtersets.py:240 +#: netbox/circuits/tables/circuits.py:144 netbox/dcim/forms/bulk_edit.py:342 +#: netbox/dcim/forms/bulk_edit.py:450 netbox/dcim/forms/bulk_edit.py:691 +#: netbox/dcim/forms/bulk_edit.py:746 netbox/dcim/forms/bulk_edit.py:900 +#: netbox/dcim/forms/bulk_import.py:237 netbox/dcim/forms/bulk_import.py:339 +#: netbox/dcim/forms/bulk_import.py:573 netbox/dcim/forms/bulk_import.py:1436 +#: netbox/dcim/forms/bulk_import.py:1470 netbox/dcim/forms/filtersets.py:96 +#: netbox/dcim/forms/filtersets.py:323 netbox/dcim/forms/filtersets.py:357 +#: netbox/dcim/forms/filtersets.py:397 netbox/dcim/forms/filtersets.py:448 +#: netbox/dcim/forms/filtersets.py:720 netbox/dcim/forms/filtersets.py:763 +#: netbox/dcim/forms/filtersets.py:978 netbox/dcim/forms/filtersets.py:1007 +#: netbox/dcim/forms/filtersets.py:1027 netbox/dcim/forms/filtersets.py:1091 +#: netbox/dcim/forms/filtersets.py:1121 netbox/dcim/forms/filtersets.py:1130 +#: netbox/dcim/forms/filtersets.py:1241 netbox/dcim/forms/filtersets.py:1265 +#: netbox/dcim/forms/filtersets.py:1290 netbox/dcim/forms/filtersets.py:1309 +#: netbox/dcim/forms/filtersets.py:1336 netbox/dcim/forms/filtersets.py:1447 +#: netbox/dcim/forms/filtersets.py:1471 netbox/dcim/forms/filtersets.py:1495 +#: netbox/dcim/forms/filtersets.py:1513 netbox/dcim/forms/filtersets.py:1530 +#: netbox/dcim/forms/model_forms.py:184 netbox/dcim/forms/model_forms.py:248 +#: netbox/dcim/forms/model_forms.py:478 netbox/dcim/forms/model_forms.py:739 +#: netbox/dcim/tables/devices.py:167 netbox/dcim/tables/power.py:30 +#: netbox/dcim/tables/racks.py:117 netbox/dcim/tables/racks.py:211 #: netbox/extras/filtersets.py:536 netbox/extras/forms/filtersets.py:320 -#: netbox/ipam/forms/filtersets.py:173 netbox/ipam/forms/filtersets.py:414 -#: netbox/ipam/forms/filtersets.py:437 netbox/ipam/forms/filtersets.py:467 +#: netbox/ipam/forms/filtersets.py:234 netbox/ipam/forms/filtersets.py:417 +#: netbox/ipam/forms/filtersets.py:440 netbox/ipam/forms/filtersets.py:507 #: netbox/templates/dcim/device.html:26 #: netbox/templates/dcim/device_edit.html:30 #: netbox/templates/dcim/inc/cable_termination.html:12 #: netbox/templates/dcim/location.html:26 #: netbox/templates/dcim/powerpanel.html:26 netbox/templates/dcim/rack.html:24 #: netbox/templates/dcim/rackreservation.html:32 -#: netbox/virtualization/forms/filtersets.py:46 -#: netbox/virtualization/forms/filtersets.py:100 -#: netbox/wireless/forms/model_forms.py:87 -#: netbox/wireless/forms/model_forms.py:129 +#: netbox/virtualization/forms/filtersets.py:79 +#: netbox/virtualization/forms/filtersets.py:105 +#: netbox/wireless/forms/filtersets.py:93 +#: netbox/wireless/forms/model_forms.py:90 +#: netbox/wireless/forms/model_forms.py:132 msgid "Location" msgstr "" -#: netbox/circuits/forms/filtersets.py:32 -#: netbox/circuits/forms/filtersets.py:120 netbox/dcim/forms/filtersets.py:144 -#: netbox/dcim/forms/filtersets.py:158 netbox/dcim/forms/filtersets.py:174 -#: netbox/dcim/forms/filtersets.py:206 netbox/dcim/forms/filtersets.py:328 -#: netbox/dcim/forms/filtersets.py:400 netbox/dcim/forms/filtersets.py:471 -#: netbox/dcim/forms/filtersets.py:723 netbox/dcim/forms/filtersets.py:1091 +#: netbox/circuits/forms/filtersets.py:40 +#: netbox/circuits/forms/filtersets.py:131 netbox/dcim/forms/filtersets.py:145 +#: netbox/dcim/forms/filtersets.py:159 netbox/dcim/forms/filtersets.py:175 +#: netbox/dcim/forms/filtersets.py:207 netbox/dcim/forms/filtersets.py:329 +#: netbox/dcim/forms/filtersets.py:401 netbox/dcim/forms/filtersets.py:472 +#: netbox/dcim/forms/filtersets.py:724 netbox/dcim/forms/filtersets.py:1092 #: netbox/netbox/navigation/menu.py:31 netbox/netbox/navigation/menu.py:33 -#: netbox/tenancy/forms/filtersets.py:42 netbox/tenancy/tables/columns.py:70 +#: netbox/tenancy/forms/filtersets.py:42 netbox/tenancy/tables/columns.py:55 #: netbox/tenancy/tables/contacts.py:25 netbox/tenancy/views.py:19 #: netbox/virtualization/forms/filtersets.py:37 #: netbox/virtualization/forms/filtersets.py:48 -#: netbox/virtualization/forms/filtersets.py:106 +#: netbox/virtualization/forms/filtersets.py:111 msgid "Contacts" msgstr "" -#: netbox/circuits/forms/filtersets.py:37 -#: netbox/circuits/forms/filtersets.py:157 netbox/dcim/forms/bulk_edit.py:113 -#: netbox/dcim/forms/bulk_edit.py:314 netbox/dcim/forms/bulk_edit.py:872 -#: netbox/dcim/forms/bulk_import.py:93 netbox/dcim/forms/filtersets.py:73 -#: netbox/dcim/forms/filtersets.py:185 netbox/dcim/forms/filtersets.py:211 -#: netbox/dcim/forms/filtersets.py:334 netbox/dcim/forms/filtersets.py:425 -#: netbox/dcim/forms/filtersets.py:739 netbox/dcim/forms/filtersets.py:983 -#: netbox/dcim/forms/filtersets.py:1013 netbox/dcim/forms/filtersets.py:1097 -#: netbox/dcim/forms/filtersets.py:1136 netbox/dcim/forms/filtersets.py:1576 -#: netbox/dcim/forms/filtersets.py:1600 netbox/dcim/forms/filtersets.py:1624 -#: netbox/dcim/forms/model_forms.py:112 netbox/dcim/forms/object_create.py:367 -#: netbox/dcim/tables/devices.py:143 netbox/dcim/tables/sites.py:85 -#: netbox/extras/filtersets.py:503 netbox/ipam/forms/bulk_edit.py:208 -#: netbox/ipam/forms/bulk_edit.py:474 netbox/ipam/forms/filtersets.py:217 -#: netbox/ipam/forms/filtersets.py:422 netbox/ipam/forms/filtersets.py:475 -#: netbox/templates/dcim/device.html:18 netbox/templates/dcim/rack.html:16 +#: netbox/circuits/forms/filtersets.py:45 +#: netbox/circuits/forms/filtersets.py:168 +#: netbox/circuits/forms/filtersets.py:225 +#: netbox/circuits/tables/circuits.py:139 netbox/dcim/forms/bulk_edit.py:116 +#: netbox/dcim/forms/bulk_edit.py:317 netbox/dcim/forms/bulk_edit.py:875 +#: netbox/dcim/forms/bulk_import.py:95 netbox/dcim/forms/filtersets.py:74 +#: netbox/dcim/forms/filtersets.py:186 netbox/dcim/forms/filtersets.py:212 +#: netbox/dcim/forms/filtersets.py:335 netbox/dcim/forms/filtersets.py:426 +#: netbox/dcim/forms/filtersets.py:740 netbox/dcim/forms/filtersets.py:984 +#: netbox/dcim/forms/filtersets.py:1014 netbox/dcim/forms/filtersets.py:1098 +#: netbox/dcim/forms/filtersets.py:1137 netbox/dcim/forms/filtersets.py:1614 +#: netbox/dcim/forms/filtersets.py:1638 netbox/dcim/forms/filtersets.py:1662 +#: netbox/dcim/forms/model_forms.py:114 netbox/dcim/forms/object_create.py:367 +#: netbox/dcim/tables/devices.py:153 netbox/dcim/tables/sites.py:85 +#: netbox/extras/filtersets.py:503 netbox/ipam/forms/bulk_edit.py:458 +#: netbox/ipam/forms/filtersets.py:219 netbox/ipam/forms/filtersets.py:425 +#: netbox/ipam/forms/filtersets.py:516 netbox/templates/dcim/device.html:18 +#: netbox/templates/dcim/rack.html:16 #: netbox/templates/dcim/rackreservation.html:22 #: netbox/templates/dcim/region.html:26 netbox/templates/dcim/site.html:31 -#: netbox/templates/ipam/prefix.html:49 netbox/templates/ipam/vlan.html:16 -#: netbox/virtualization/forms/bulk_edit.py:81 +#: netbox/templates/ipam/vlan.html:16 #: netbox/virtualization/forms/filtersets.py:59 -#: netbox/virtualization/forms/filtersets.py:133 -#: netbox/virtualization/forms/model_forms.py:92 -#: netbox/vpn/forms/filtersets.py:257 +#: netbox/virtualization/forms/filtersets.py:138 +#: netbox/virtualization/forms/model_forms.py:91 +#: netbox/vpn/forms/filtersets.py:257 netbox/wireless/forms/filtersets.py:73 msgid "Region" msgstr "" -#: netbox/circuits/forms/filtersets.py:42 -#: netbox/circuits/forms/filtersets.py:162 netbox/dcim/forms/bulk_edit.py:322 -#: netbox/dcim/forms/bulk_edit.py:880 netbox/dcim/forms/filtersets.py:78 -#: netbox/dcim/forms/filtersets.py:190 netbox/dcim/forms/filtersets.py:216 -#: netbox/dcim/forms/filtersets.py:347 netbox/dcim/forms/filtersets.py:430 -#: netbox/dcim/forms/filtersets.py:744 netbox/dcim/forms/filtersets.py:988 -#: netbox/dcim/forms/filtersets.py:1102 netbox/dcim/forms/filtersets.py:1141 +#: netbox/circuits/forms/filtersets.py:50 +#: netbox/circuits/forms/filtersets.py:173 +#: netbox/circuits/forms/filtersets.py:230 netbox/dcim/forms/bulk_edit.py:325 +#: netbox/dcim/forms/bulk_edit.py:883 netbox/dcim/forms/filtersets.py:79 +#: netbox/dcim/forms/filtersets.py:191 netbox/dcim/forms/filtersets.py:217 +#: netbox/dcim/forms/filtersets.py:348 netbox/dcim/forms/filtersets.py:431 +#: netbox/dcim/forms/filtersets.py:745 netbox/dcim/forms/filtersets.py:989 +#: netbox/dcim/forms/filtersets.py:1103 netbox/dcim/forms/filtersets.py:1142 #: netbox/dcim/forms/object_create.py:375 netbox/extras/filtersets.py:520 -#: netbox/ipam/forms/bulk_edit.py:213 netbox/ipam/forms/bulk_edit.py:479 -#: netbox/ipam/forms/filtersets.py:222 netbox/ipam/forms/filtersets.py:427 -#: netbox/ipam/forms/filtersets.py:480 -#: netbox/virtualization/forms/bulk_edit.py:86 -#: netbox/virtualization/forms/filtersets.py:69 -#: netbox/virtualization/forms/filtersets.py:138 -#: netbox/virtualization/forms/model_forms.py:98 +#: netbox/ipam/forms/bulk_edit.py:463 netbox/ipam/forms/filtersets.py:224 +#: netbox/ipam/forms/filtersets.py:430 netbox/ipam/forms/filtersets.py:521 +#: netbox/virtualization/forms/filtersets.py:64 +#: netbox/virtualization/forms/filtersets.py:143 +#: netbox/virtualization/forms/model_forms.py:97 +#: netbox/wireless/forms/filtersets.py:78 msgid "Site group" msgstr "" -#: netbox/circuits/forms/filtersets.py:65 -#: netbox/circuits/forms/filtersets.py:83 -#: netbox/circuits/forms/filtersets.py:102 -#: netbox/circuits/forms/filtersets.py:117 netbox/core/forms/filtersets.py:67 -#: netbox/core/forms/filtersets.py:135 netbox/dcim/forms/bulk_edit.py:843 -#: netbox/dcim/forms/filtersets.py:172 netbox/dcim/forms/filtersets.py:204 -#: netbox/dcim/forms/filtersets.py:915 netbox/dcim/forms/filtersets.py:1007 -#: netbox/dcim/forms/filtersets.py:1131 netbox/dcim/forms/filtersets.py:1239 -#: netbox/dcim/forms/filtersets.py:1263 netbox/dcim/forms/filtersets.py:1288 -#: netbox/dcim/forms/filtersets.py:1307 netbox/dcim/forms/filtersets.py:1327 -#: netbox/dcim/forms/filtersets.py:1441 netbox/dcim/forms/filtersets.py:1465 -#: netbox/dcim/forms/filtersets.py:1489 netbox/dcim/forms/filtersets.py:1507 -#: netbox/dcim/forms/filtersets.py:1523 netbox/extras/forms/bulk_edit.py:90 -#: netbox/extras/forms/filtersets.py:44 netbox/extras/forms/filtersets.py:134 -#: netbox/extras/forms/filtersets.py:165 netbox/extras/forms/filtersets.py:205 -#: netbox/extras/forms/filtersets.py:221 netbox/extras/forms/filtersets.py:252 -#: netbox/extras/forms/filtersets.py:276 netbox/extras/forms/filtersets.py:441 -#: netbox/ipam/forms/filtersets.py:99 netbox/ipam/forms/filtersets.py:266 -#: netbox/ipam/forms/filtersets.py:307 netbox/ipam/forms/filtersets.py:382 -#: netbox/ipam/forms/filtersets.py:468 netbox/ipam/forms/filtersets.py:527 -#: netbox/ipam/forms/filtersets.py:545 netbox/netbox/tables/tables.py:256 -#: netbox/virtualization/forms/filtersets.py:45 -#: netbox/virtualization/forms/filtersets.py:103 -#: netbox/virtualization/forms/filtersets.py:198 -#: netbox/virtualization/forms/filtersets.py:243 -#: netbox/vpn/forms/filtersets.py:213 netbox/wireless/forms/bulk_edit.py:150 -#: netbox/wireless/forms/filtersets.py:34 -#: netbox/wireless/forms/filtersets.py:74 -msgid "Attributes" -msgstr "" - -#: netbox/circuits/forms/filtersets.py:73 netbox/circuits/tables/circuits.py:63 +#: netbox/circuits/forms/filtersets.py:81 netbox/circuits/tables/circuits.py:62 #: netbox/circuits/tables/providers.py:66 +#: netbox/circuits/tables/virtual_circuits.py:55 +#: netbox/circuits/tables/virtual_circuits.py:103 #: netbox/templates/circuits/circuit.html:22 #: netbox/templates/circuits/provideraccount.html:24 msgid "Account" msgstr "" -#: netbox/circuits/forms/filtersets.py:217 +#: netbox/circuits/forms/filtersets.py:248 msgid "Term Side" msgstr "" -#: netbox/circuits/forms/filtersets.py:250 netbox/dcim/forms/bulk_edit.py:1557 -#: netbox/extras/forms/model_forms.py:582 netbox/ipam/forms/filtersets.py:142 -#: netbox/ipam/forms/filtersets.py:546 netbox/ipam/forms/model_forms.py:327 +#: netbox/circuits/forms/filtersets.py:281 netbox/dcim/forms/bulk_edit.py:1570 +#: netbox/extras/forms/model_forms.py:582 netbox/ipam/forms/filtersets.py:144 +#: netbox/ipam/forms/filtersets.py:598 netbox/ipam/forms/model_forms.py:329 +#: netbox/templates/dcim/macaddress.html:25 #: netbox/templates/extras/configcontext.html:60 #: netbox/templates/ipam/ipaddress.html:59 -#: netbox/templates/ipam/vlan_edit.html:30 +#: netbox/templates/ipam/vlan_edit.html:38 #: netbox/tenancy/forms/filtersets.py:87 netbox/users/forms/model_forms.py:314 msgid "Assignment" msgstr "" -#: netbox/circuits/forms/filtersets.py:265 -#: netbox/circuits/forms/model_forms.py:195 -#: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 -#: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 +#: netbox/circuits/forms/filtersets.py:296 +#: netbox/circuits/forms/model_forms.py:252 +#: netbox/circuits/tables/circuits.py:191 netbox/dcim/forms/bulk_edit.py:121 +#: netbox/dcim/forms/bulk_import.py:102 netbox/dcim/forms/model_forms.py:120 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 -#: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 -#: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 -#: netbox/ipam/tables/vlans.py:226 +#: netbox/ipam/filtersets.py:968 netbox/ipam/forms/bulk_edit.py:477 +#: netbox/ipam/forms/bulk_import.py:459 netbox/ipam/forms/model_forms.py:563 +#: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:91 +#: netbox/ipam/tables/vlans.py:202 #: netbox/templates/circuits/circuitgroupassignment.html:22 -#: netbox/templates/dcim/interface.html:284 netbox/templates/dcim/site.html:37 +#: netbox/templates/dcim/interface.html:341 netbox/templates/dcim/site.html:37 #: netbox/templates/ipam/inc/panels/fhrp_groups.html:23 #: netbox/templates/ipam/vlan.html:27 netbox/templates/tenancy/contact.html:21 #: netbox/templates/tenancy/tenant.html:20 netbox/templates/users/group.html:6 @@ -1105,224 +1367,239 @@ msgstr "" #: netbox/users/filtersets.py:62 netbox/users/filtersets.py:185 #: netbox/users/forms/filtersets.py:31 netbox/users/forms/filtersets.py:37 #: netbox/users/forms/filtersets.py:79 -#: netbox/virtualization/forms/bulk_edit.py:65 -#: netbox/virtualization/forms/bulk_import.py:47 -#: netbox/virtualization/forms/filtersets.py:85 -#: netbox/virtualization/forms/model_forms.py:66 +#: netbox/virtualization/forms/bulk_edit.py:66 +#: netbox/virtualization/forms/bulk_import.py:48 +#: netbox/virtualization/forms/filtersets.py:90 +#: netbox/virtualization/forms/model_forms.py:69 #: netbox/virtualization/tables/clusters.py:70 #: netbox/vpn/forms/bulk_edit.py:112 netbox/vpn/forms/bulk_import.py:158 #: netbox/vpn/forms/filtersets.py:116 netbox/vpn/tables/crypto.py:31 -#: netbox/vpn/tables/tunnels.py:44 netbox/wireless/forms/bulk_edit.py:48 -#: netbox/wireless/forms/bulk_import.py:36 -#: netbox/wireless/forms/filtersets.py:46 -#: netbox/wireless/forms/model_forms.py:40 +#: netbox/vpn/tables/tunnels.py:44 netbox/wireless/forms/bulk_edit.py:50 +#: netbox/wireless/forms/bulk_import.py:38 +#: netbox/wireless/forms/filtersets.py:49 +#: netbox/wireless/forms/model_forms.py:41 #: netbox/wireless/tables/wirelesslan.py:48 msgid "Group" msgstr "" -#: netbox/circuits/forms/model_forms.py:182 +#: netbox/circuits/forms/model_forms.py:239 #: netbox/templates/circuits/circuitgroup.html:25 msgid "Circuit Group" msgstr "" -#: netbox/circuits/models/circuits.py:27 netbox/dcim/models/cables.py:67 -#: netbox/dcim/models/device_component_templates.py:517 -#: netbox/dcim/models/device_component_templates.py:617 -#: netbox/dcim/models/device_components.py:975 -#: netbox/dcim/models/device_components.py:1049 -#: netbox/dcim/models/device_components.py:1204 -#: netbox/dcim/models/devices.py:479 netbox/dcim/models/racks.py:224 +#: netbox/circuits/forms/model_forms.py:259 +msgid "Circuit type" +msgstr "" + +#: netbox/circuits/forms/model_forms.py:270 +msgid "Group Assignment" +msgstr "" + +#: netbox/circuits/models/base.py:18 netbox/dcim/models/cables.py:67 +#: netbox/dcim/models/device_component_templates.py:531 +#: netbox/dcim/models/device_component_templates.py:631 +#: netbox/dcim/models/device_components.py:476 +#: netbox/dcim/models/device_components.py:1024 +#: netbox/dcim/models/device_components.py:1095 +#: netbox/dcim/models/device_components.py:1241 +#: netbox/dcim/models/devices.py:477 netbox/dcim/models/racks.py:221 #: netbox/extras/models/tags.py:28 msgid "color" msgstr "" -#: netbox/circuits/models/circuits.py:36 +#: netbox/circuits/models/circuits.py:34 msgid "circuit type" msgstr "" -#: netbox/circuits/models/circuits.py:37 +#: netbox/circuits/models/circuits.py:35 msgid "circuit types" msgstr "" -#: netbox/circuits/models/circuits.py:48 +#: netbox/circuits/models/circuits.py:46 +#: netbox/circuits/models/virtual_circuits.py:38 msgid "circuit ID" msgstr "" -#: netbox/circuits/models/circuits.py:49 +#: netbox/circuits/models/circuits.py:47 +#: netbox/circuits/models/virtual_circuits.py:39 msgid "Unique circuit ID" msgstr "" -#: netbox/circuits/models/circuits.py:69 netbox/core/models/data.py:52 +#: netbox/circuits/models/circuits.py:67 +#: netbox/circuits/models/virtual_circuits.py:59 netbox/core/models/data.py:52 #: netbox/core/models/jobs.py:85 netbox/dcim/models/cables.py:49 -#: netbox/dcim/models/devices.py:653 netbox/dcim/models/devices.py:1173 -#: netbox/dcim/models/devices.py:1404 netbox/dcim/models/power.py:96 -#: netbox/dcim/models/racks.py:297 netbox/dcim/models/sites.py:154 -#: netbox/dcim/models/sites.py:266 netbox/ipam/models/ip.py:253 -#: netbox/ipam/models/ip.py:522 netbox/ipam/models/ip.py:730 -#: netbox/ipam/models/vlans.py:211 netbox/virtualization/models/clusters.py:74 -#: netbox/virtualization/models/virtualmachines.py:84 -#: netbox/vpn/models/tunnels.py:40 netbox/wireless/models.py:95 -#: netbox/wireless/models.py:159 +#: netbox/dcim/models/device_components.py:1281 +#: netbox/dcim/models/devices.py:644 netbox/dcim/models/devices.py:1176 +#: netbox/dcim/models/devices.py:1403 netbox/dcim/models/power.py:94 +#: netbox/dcim/models/racks.py:288 netbox/dcim/models/sites.py:154 +#: netbox/dcim/models/sites.py:270 netbox/ipam/models/ip.py:237 +#: netbox/ipam/models/ip.py:508 netbox/ipam/models/ip.py:729 +#: netbox/ipam/models/vlans.py:210 netbox/virtualization/models/clusters.py:70 +#: netbox/virtualization/models/virtualmachines.py:79 +#: netbox/vpn/models/tunnels.py:38 netbox/wireless/models.py:95 +#: netbox/wireless/models.py:156 msgid "status" msgstr "" -#: netbox/circuits/models/circuits.py:84 netbox/templates/core/plugin.html:20 +#: netbox/circuits/models/circuits.py:82 netbox/templates/core/plugin.html:20 msgid "installed" msgstr "" -#: netbox/circuits/models/circuits.py:89 +#: netbox/circuits/models/circuits.py:87 msgid "terminates" msgstr "" -#: netbox/circuits/models/circuits.py:94 +#: netbox/circuits/models/circuits.py:92 msgid "commit rate (Kbps)" msgstr "" -#: netbox/circuits/models/circuits.py:95 +#: netbox/circuits/models/circuits.py:93 msgid "Committed rate" msgstr "" -#: netbox/circuits/models/circuits.py:137 +#: netbox/circuits/models/circuits.py:142 msgid "circuit" msgstr "" -#: netbox/circuits/models/circuits.py:138 +#: netbox/circuits/models/circuits.py:143 msgid "circuits" msgstr "" -#: netbox/circuits/models/circuits.py:170 +#: netbox/circuits/models/circuits.py:172 msgid "circuit group" msgstr "" -#: netbox/circuits/models/circuits.py:171 +#: netbox/circuits/models/circuits.py:173 msgid "circuit groups" msgstr "" -#: netbox/circuits/models/circuits.py:195 netbox/ipam/models/fhrp.py:93 -#: netbox/tenancy/models/contacts.py:134 +#: netbox/circuits/models/circuits.py:190 +msgid "member ID" +msgstr "" + +#: netbox/circuits/models/circuits.py:202 netbox/ipam/models/fhrp.py:90 +#: netbox/tenancy/models/contacts.py:126 msgid "priority" msgstr "" -#: netbox/circuits/models/circuits.py:213 +#: netbox/circuits/models/circuits.py:220 msgid "Circuit group assignment" msgstr "" -#: netbox/circuits/models/circuits.py:214 +#: netbox/circuits/models/circuits.py:221 msgid "Circuit group assignments" msgstr "" -#: netbox/circuits/models/circuits.py:240 -msgid "termination" -msgstr "" - -#: netbox/circuits/models/circuits.py:257 -msgid "port speed (Kbps)" -msgstr "" - -#: netbox/circuits/models/circuits.py:260 -msgid "Physical circuit speed" -msgstr "" - -#: netbox/circuits/models/circuits.py:265 -msgid "upstream speed (Kbps)" +#: netbox/circuits/models/circuits.py:247 +msgid "termination side" msgstr "" #: netbox/circuits/models/circuits.py:266 +msgid "port speed (Kbps)" +msgstr "" + +#: netbox/circuits/models/circuits.py:269 +msgid "Physical circuit speed" +msgstr "" + +#: netbox/circuits/models/circuits.py:274 +msgid "upstream speed (Kbps)" +msgstr "" + +#: netbox/circuits/models/circuits.py:275 msgid "Upstream speed, if different from port speed" msgstr "" -#: netbox/circuits/models/circuits.py:271 +#: netbox/circuits/models/circuits.py:280 msgid "cross-connect ID" msgstr "" -#: netbox/circuits/models/circuits.py:272 +#: netbox/circuits/models/circuits.py:281 msgid "ID of the local cross-connect" msgstr "" -#: netbox/circuits/models/circuits.py:277 +#: netbox/circuits/models/circuits.py:286 msgid "patch panel/port(s)" msgstr "" -#: netbox/circuits/models/circuits.py:278 +#: netbox/circuits/models/circuits.py:287 msgid "Patch panel ID and port number(s)" msgstr "" -#: netbox/circuits/models/circuits.py:281 -#: netbox/dcim/models/device_component_templates.py:61 -#: netbox/dcim/models/device_components.py:68 netbox/dcim/models/racks.py:685 +#: netbox/circuits/models/circuits.py:290 +#: netbox/circuits/models/virtual_circuits.py:144 +#: netbox/dcim/models/device_component_templates.py:57 +#: netbox/dcim/models/device_components.py:63 netbox/dcim/models/racks.py:676 #: netbox/extras/models/configs.py:45 netbox/extras/models/configs.py:219 #: netbox/extras/models/customfields.py:125 netbox/extras/models/models.py:61 #: netbox/extras/models/models.py:158 netbox/extras/models/models.py:396 #: netbox/extras/models/models.py:511 netbox/extras/models/notifications.py:131 -#: netbox/extras/models/staging.py:31 netbox/extras/models/tags.py:32 -#: netbox/netbox/models/__init__.py:110 netbox/netbox/models/__init__.py:145 -#: netbox/netbox/models/__init__.py:191 netbox/users/models/permissions.py:24 -#: netbox/users/models/tokens.py:57 netbox/users/models/users.py:33 -#: netbox/virtualization/models/virtualmachines.py:289 +#: netbox/extras/models/staging.py:32 netbox/extras/models/tags.py:32 +#: netbox/ipam/models/vlans.py:358 netbox/netbox/models/__init__.py:114 +#: netbox/netbox/models/__init__.py:149 netbox/netbox/models/__init__.py:195 +#: netbox/users/models/permissions.py:24 netbox/users/models/tokens.py:57 +#: netbox/users/models/users.py:33 +#: netbox/virtualization/models/virtualmachines.py:276 msgid "description" msgstr "" -#: netbox/circuits/models/circuits.py:294 +#: netbox/circuits/models/circuits.py:340 msgid "circuit termination" msgstr "" -#: netbox/circuits/models/circuits.py:295 +#: netbox/circuits/models/circuits.py:341 msgid "circuit terminations" msgstr "" -#: netbox/circuits/models/circuits.py:308 -msgid "" -"A circuit termination must attach to either a site or a provider network." +#: netbox/circuits/models/circuits.py:354 +msgid "A circuit termination must attach to termination." msgstr "" -#: netbox/circuits/models/circuits.py:310 -msgid "" -"A circuit termination cannot attach to both a site and a provider network." -msgstr "" - -#: netbox/circuits/models/providers.py:22 -#: netbox/circuits/models/providers.py:66 -#: netbox/circuits/models/providers.py:104 netbox/core/models/data.py:39 +#: netbox/circuits/models/providers.py:21 +#: netbox/circuits/models/providers.py:63 +#: netbox/circuits/models/providers.py:98 netbox/core/models/data.py:39 #: netbox/core/models/jobs.py:46 #: netbox/dcim/models/device_component_templates.py:43 -#: netbox/dcim/models/device_components.py:53 netbox/dcim/models/devices.py:593 -#: netbox/dcim/models/devices.py:1335 netbox/dcim/models/devices.py:1400 -#: netbox/dcim/models/power.py:39 netbox/dcim/models/power.py:92 -#: netbox/dcim/models/racks.py:262 netbox/dcim/models/sites.py:138 +#: netbox/dcim/models/device_components.py:52 netbox/dcim/models/devices.py:588 +#: netbox/dcim/models/devices.py:1335 netbox/dcim/models/devices.py:1398 +#: netbox/dcim/models/power.py:38 netbox/dcim/models/power.py:89 +#: netbox/dcim/models/racks.py:257 netbox/dcim/models/sites.py:142 #: netbox/extras/models/configs.py:36 netbox/extras/models/configs.py:215 #: netbox/extras/models/customfields.py:92 netbox/extras/models/models.py:56 #: netbox/extras/models/models.py:153 netbox/extras/models/models.py:296 #: netbox/extras/models/models.py:392 netbox/extras/models/models.py:501 #: netbox/extras/models/models.py:596 netbox/extras/models/notifications.py:126 -#: netbox/extras/models/scripts.py:30 netbox/extras/models/staging.py:26 -#: netbox/ipam/models/asns.py:18 netbox/ipam/models/fhrp.py:25 -#: netbox/ipam/models/services.py:52 netbox/ipam/models/services.py:88 -#: netbox/ipam/models/vlans.py:36 netbox/ipam/models/vlans.py:200 -#: netbox/ipam/models/vrfs.py:22 netbox/ipam/models/vrfs.py:79 -#: netbox/netbox/models/__init__.py:137 netbox/netbox/models/__init__.py:181 -#: netbox/tenancy/models/contacts.py:64 netbox/tenancy/models/tenants.py:20 -#: netbox/tenancy/models/tenants.py:45 netbox/users/models/permissions.py:20 -#: netbox/users/models/users.py:28 netbox/virtualization/models/clusters.py:57 -#: netbox/virtualization/models/virtualmachines.py:72 -#: netbox/virtualization/models/virtualmachines.py:279 -#: netbox/vpn/models/crypto.py:24 netbox/vpn/models/crypto.py:71 -#: netbox/vpn/models/crypto.py:131 netbox/vpn/models/crypto.py:183 -#: netbox/vpn/models/crypto.py:221 netbox/vpn/models/l2vpn.py:22 -#: netbox/vpn/models/tunnels.py:35 netbox/wireless/models.py:51 +#: netbox/extras/models/scripts.py:30 netbox/extras/models/staging.py:27 +#: netbox/ipam/models/asns.py:17 netbox/ipam/models/fhrp.py:24 +#: netbox/ipam/models/services.py:51 netbox/ipam/models/services.py:84 +#: netbox/ipam/models/vlans.py:37 netbox/ipam/models/vlans.py:199 +#: netbox/ipam/models/vlans.py:337 netbox/ipam/models/vrfs.py:20 +#: netbox/ipam/models/vrfs.py:75 netbox/netbox/models/__init__.py:141 +#: netbox/netbox/models/__init__.py:185 netbox/tenancy/models/contacts.py:58 +#: netbox/tenancy/models/tenants.py:19 netbox/tenancy/models/tenants.py:42 +#: netbox/users/models/permissions.py:20 netbox/users/models/users.py:28 +#: netbox/virtualization/models/clusters.py:52 +#: netbox/virtualization/models/virtualmachines.py:71 +#: netbox/virtualization/models/virtualmachines.py:271 +#: netbox/virtualization/models/virtualmachines.py:305 +#: netbox/vpn/models/crypto.py:23 netbox/vpn/models/crypto.py:69 +#: netbox/vpn/models/crypto.py:128 netbox/vpn/models/crypto.py:180 +#: netbox/vpn/models/crypto.py:216 netbox/vpn/models/l2vpn.py:21 +#: netbox/vpn/models/tunnels.py:32 netbox/wireless/models.py:53 msgid "name" msgstr "" -#: netbox/circuits/models/providers.py:25 +#: netbox/circuits/models/providers.py:24 msgid "Full name of the provider" msgstr "" -#: netbox/circuits/models/providers.py:28 netbox/dcim/models/devices.py:86 +#: netbox/circuits/models/providers.py:28 netbox/dcim/models/devices.py:87 #: netbox/dcim/models/racks.py:137 netbox/dcim/models/sites.py:149 #: netbox/extras/models/models.py:506 netbox/ipam/models/asns.py:23 -#: netbox/ipam/models/vlans.py:40 netbox/netbox/models/__init__.py:141 -#: netbox/netbox/models/__init__.py:186 netbox/tenancy/models/tenants.py:25 -#: netbox/tenancy/models/tenants.py:49 netbox/vpn/models/l2vpn.py:27 -#: netbox/wireless/models.py:56 +#: netbox/ipam/models/vlans.py:42 netbox/netbox/models/__init__.py:145 +#: netbox/netbox/models/__init__.py:190 netbox/tenancy/models/tenants.py:25 +#: netbox/tenancy/models/tenants.py:47 netbox/vpn/models/l2vpn.py:27 +#: netbox/wireless/models.py:59 msgid "slug" msgstr "" @@ -1334,46 +1611,77 @@ msgstr "" msgid "providers" msgstr "" -#: netbox/circuits/models/providers.py:63 +#: netbox/circuits/models/providers.py:60 msgid "account ID" msgstr "" -#: netbox/circuits/models/providers.py:86 +#: netbox/circuits/models/providers.py:83 msgid "provider account" msgstr "" -#: netbox/circuits/models/providers.py:87 +#: netbox/circuits/models/providers.py:84 msgid "provider accounts" msgstr "" -#: netbox/circuits/models/providers.py:115 +#: netbox/circuits/models/providers.py:110 msgid "service ID" msgstr "" -#: netbox/circuits/models/providers.py:126 +#: netbox/circuits/models/providers.py:121 msgid "provider network" msgstr "" -#: netbox/circuits/models/providers.py:127 +#: netbox/circuits/models/providers.py:122 msgid "provider networks" msgstr "" -#: netbox/circuits/tables/circuits.py:32 netbox/circuits/tables/circuits.py:132 +#: netbox/circuits/models/virtual_circuits.py:28 +msgid "virtual circuit type" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:29 +msgid "virtual circuit types" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:99 +msgid "virtual circuit" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:100 +msgid "virtual circuits" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:133 netbox/ipam/models/ip.py:194 +#: netbox/ipam/models/ip.py:736 netbox/vpn/models/tunnels.py:109 +msgid "role" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:151 +msgid "virtual circuit termination" +msgstr "" + +#: netbox/circuits/models/virtual_circuits.py:152 +msgid "virtual circuit terminations" +msgstr "" + +#: netbox/circuits/tables/circuits.py:30 netbox/circuits/tables/circuits.py:168 #: netbox/circuits/tables/providers.py:18 #: netbox/circuits/tables/providers.py:69 -#: netbox/circuits/tables/providers.py:99 netbox/core/tables/data.py:16 +#: netbox/circuits/tables/providers.py:99 +#: netbox/circuits/tables/virtual_circuits.py:18 netbox/core/tables/data.py:16 #: netbox/core/tables/jobs.py:14 netbox/core/tables/plugins.py:44 #: netbox/core/tables/tasks.py:11 netbox/core/tables/tasks.py:115 -#: netbox/dcim/forms/filtersets.py:63 netbox/dcim/forms/object_create.py:43 -#: netbox/dcim/tables/devices.py:52 netbox/dcim/tables/devices.py:92 -#: netbox/dcim/tables/devices.py:134 netbox/dcim/tables/devices.py:289 -#: netbox/dcim/tables/devices.py:392 netbox/dcim/tables/devices.py:433 -#: netbox/dcim/tables/devices.py:482 netbox/dcim/tables/devices.py:531 -#: netbox/dcim/tables/devices.py:648 netbox/dcim/tables/devices.py:731 -#: netbox/dcim/tables/devices.py:778 netbox/dcim/tables/devices.py:841 -#: netbox/dcim/tables/devices.py:911 netbox/dcim/tables/devices.py:974 -#: netbox/dcim/tables/devices.py:994 netbox/dcim/tables/devices.py:1023 -#: netbox/dcim/tables/devices.py:1053 netbox/dcim/tables/devicetypes.py:31 +#: netbox/dcim/forms/filtersets.py:64 netbox/dcim/forms/object_create.py:43 +#: netbox/dcim/tables/devices.py:63 netbox/dcim/tables/devices.py:103 +#: netbox/dcim/tables/devices.py:145 netbox/dcim/tables/devices.py:299 +#: netbox/dcim/tables/devices.py:402 netbox/dcim/tables/devices.py:443 +#: netbox/dcim/tables/devices.py:491 netbox/dcim/tables/devices.py:540 +#: netbox/dcim/tables/devices.py:561 netbox/dcim/tables/devices.py:681 +#: netbox/dcim/tables/devices.py:764 netbox/dcim/tables/devices.py:810 +#: netbox/dcim/tables/devices.py:872 netbox/dcim/tables/devices.py:941 +#: netbox/dcim/tables/devices.py:1006 netbox/dcim/tables/devices.py:1025 +#: netbox/dcim/tables/devices.py:1054 netbox/dcim/tables/devices.py:1084 +#: netbox/dcim/tables/devicetypes.py:31 netbox/dcim/tables/devicetypes.py:222 #: netbox/dcim/tables/power.py:22 netbox/dcim/tables/power.py:62 #: netbox/dcim/tables/racks.py:24 netbox/dcim/tables/racks.py:113 #: netbox/dcim/tables/sites.py:24 netbox/dcim/tables/sites.py:51 @@ -1384,15 +1692,17 @@ msgstr "" #: netbox/extras/tables/tables.py:361 netbox/extras/tables/tables.py:378 #: netbox/extras/tables/tables.py:401 netbox/extras/tables/tables.py:439 #: netbox/extras/tables/tables.py:491 netbox/extras/tables/tables.py:514 -#: netbox/ipam/forms/bulk_edit.py:407 netbox/ipam/forms/filtersets.py:386 -#: netbox/ipam/tables/asn.py:16 netbox/ipam/tables/ip.py:85 -#: netbox/ipam/tables/ip.py:160 netbox/ipam/tables/services.py:15 -#: netbox/ipam/tables/services.py:40 netbox/ipam/tables/vlans.py:64 -#: netbox/ipam/tables/vlans.py:114 netbox/ipam/tables/vrfs.py:26 +#: netbox/ipam/forms/bulk_edit.py:391 netbox/ipam/forms/filtersets.py:389 +#: netbox/ipam/forms/filtersets.py:474 netbox/ipam/tables/asn.py:16 +#: netbox/ipam/tables/ip.py:31 netbox/ipam/tables/ip.py:106 +#: netbox/ipam/tables/services.py:15 netbox/ipam/tables/services.py:40 +#: netbox/ipam/tables/vlans.py:33 netbox/ipam/tables/vlans.py:83 +#: netbox/ipam/tables/vlans.py:231 netbox/ipam/tables/vrfs.py:26 #: netbox/ipam/tables/vrfs.py:68 netbox/templates/circuits/circuitgroup.html:28 #: netbox/templates/circuits/circuittype.html:22 #: netbox/templates/circuits/provideraccount.html:28 #: netbox/templates/circuits/providernetwork.html:24 +#: netbox/templates/circuits/virtualcircuittype.html:22 #: netbox/templates/core/datasource.html:34 netbox/templates/core/job.html:44 #: netbox/templates/core/plugin.html:54 netbox/templates/core/rq_worker.html:43 #: netbox/templates/dcim/consoleport.html:28 @@ -1403,7 +1713,7 @@ msgstr "" #: netbox/templates/dcim/inc/interface_vlans_table.html:5 #: netbox/templates/dcim/inc/panels/inventory_items.html:18 #: netbox/templates/dcim/interface.html:38 -#: netbox/templates/dcim/interface.html:165 +#: netbox/templates/dcim/interface.html:222 #: netbox/templates/dcim/inventoryitem.html:28 #: netbox/templates/dcim/inventoryitemrole.html:18 #: netbox/templates/dcim/location.html:29 @@ -1432,6 +1742,7 @@ msgstr "" #: netbox/templates/ipam/service.html:24 #: netbox/templates/ipam/servicetemplate.html:15 #: netbox/templates/ipam/vlan.html:35 netbox/templates/ipam/vlangroup.html:30 +#: netbox/templates/ipam/vlantranslationpolicy.html:14 #: netbox/templates/tenancy/contact.html:25 #: netbox/templates/tenancy/contactgroup.html:21 #: netbox/templates/tenancy/contactrole.html:18 @@ -1463,81 +1774,113 @@ msgstr "" #: netbox/virtualization/tables/clusters.py:17 #: netbox/virtualization/tables/clusters.py:39 #: netbox/virtualization/tables/clusters.py:62 -#: netbox/virtualization/tables/virtualmachines.py:55 -#: netbox/virtualization/tables/virtualmachines.py:139 -#: netbox/virtualization/tables/virtualmachines.py:194 +#: netbox/virtualization/tables/virtualmachines.py:26 +#: netbox/virtualization/tables/virtualmachines.py:109 +#: netbox/virtualization/tables/virtualmachines.py:165 #: netbox/vpn/tables/crypto.py:18 netbox/vpn/tables/crypto.py:57 #: netbox/vpn/tables/crypto.py:93 netbox/vpn/tables/crypto.py:129 #: netbox/vpn/tables/crypto.py:158 netbox/vpn/tables/l2vpn.py:23 #: netbox/vpn/tables/tunnels.py:18 netbox/vpn/tables/tunnels.py:40 #: netbox/wireless/tables/wirelesslan.py:18 -#: netbox/wireless/tables/wirelesslan.py:79 +#: netbox/wireless/tables/wirelesslan.py:87 msgid "Name" msgstr "" -#: netbox/circuits/tables/circuits.py:41 netbox/circuits/tables/circuits.py:138 +#: netbox/circuits/tables/circuits.py:39 netbox/circuits/tables/circuits.py:174 #: netbox/circuits/tables/providers.py:45 -#: netbox/circuits/tables/providers.py:79 netbox/netbox/navigation/menu.py:266 -#: netbox/netbox/navigation/menu.py:270 netbox/netbox/navigation/menu.py:272 +#: netbox/circuits/tables/providers.py:79 +#: netbox/circuits/tables/virtual_circuits.py:27 +#: netbox/netbox/navigation/menu.py:274 netbox/netbox/navigation/menu.py:278 +#: netbox/netbox/navigation/menu.py:280 #: netbox/templates/circuits/provider.html:57 #: netbox/templates/circuits/provideraccount.html:44 #: netbox/templates/circuits/providernetwork.html:50 msgid "Circuits" msgstr "" -#: netbox/circuits/tables/circuits.py:55 +#: netbox/circuits/tables/circuits.py:54 +#: netbox/circuits/tables/virtual_circuits.py:42 #: netbox/templates/circuits/circuit.html:26 +#: netbox/templates/circuits/virtualcircuit.html:35 +#: netbox/templates/dcim/interface.html:174 msgid "Circuit ID" msgstr "" -#: netbox/circuits/tables/circuits.py:69 -#: netbox/wireless/forms/model_forms.py:160 +#: netbox/circuits/tables/circuits.py:72 +#: netbox/wireless/forms/model_forms.py:163 msgid "Side A" msgstr "" -#: netbox/circuits/tables/circuits.py:74 +#: netbox/circuits/tables/circuits.py:77 msgid "Side Z" msgstr "" -#: netbox/circuits/tables/circuits.py:77 -#: netbox/templates/circuits/circuit.html:55 +#: netbox/circuits/tables/circuits.py:80 +#: netbox/templates/circuits/circuit.html:65 msgid "Commit Rate" msgstr "" -#: netbox/circuits/tables/circuits.py:80 netbox/circuits/tables/providers.py:48 +#: netbox/circuits/tables/circuits.py:84 netbox/circuits/tables/providers.py:48 #: netbox/circuits/tables/providers.py:82 -#: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 -#: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 -#: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 -#: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 -#: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 -#: netbox/ipam/tables/asn.py:69 netbox/ipam/tables/fhrp.py:34 -#: netbox/ipam/tables/ip.py:136 netbox/ipam/tables/ip.py:275 -#: netbox/ipam/tables/ip.py:329 netbox/ipam/tables/ip.py:397 -#: netbox/ipam/tables/services.py:24 netbox/ipam/tables/services.py:54 -#: netbox/ipam/tables/vlans.py:145 netbox/ipam/tables/vrfs.py:47 -#: netbox/ipam/tables/vrfs.py:72 netbox/templates/dcim/htmx/cable_edit.html:89 +#: netbox/circuits/tables/providers.py:107 +#: netbox/circuits/tables/virtual_circuits.py:68 +#: netbox/dcim/tables/devices.py:1067 netbox/dcim/tables/devicetypes.py:92 +#: netbox/dcim/tables/modules.py:29 netbox/dcim/tables/modules.py:73 +#: netbox/dcim/tables/power.py:39 netbox/dcim/tables/power.py:96 +#: netbox/dcim/tables/racks.py:84 netbox/dcim/tables/racks.py:144 +#: netbox/dcim/tables/racks.py:224 netbox/dcim/tables/sites.py:108 +#: netbox/extras/tables/tables.py:582 netbox/ipam/tables/asn.py:69 +#: netbox/ipam/tables/fhrp.py:34 netbox/ipam/tables/ip.py:82 +#: netbox/ipam/tables/ip.py:224 netbox/ipam/tables/ip.py:279 +#: netbox/ipam/tables/ip.py:347 netbox/ipam/tables/services.py:24 +#: netbox/ipam/tables/services.py:54 netbox/ipam/tables/vlans.py:121 +#: netbox/ipam/tables/vrfs.py:47 netbox/ipam/tables/vrfs.py:72 +#: netbox/templates/dcim/htmx/cable_edit.html:89 #: netbox/templates/generic/bulk_edit.html:86 #: netbox/templates/inc/panels/comments.html:5 #: netbox/tenancy/tables/contacts.py:68 netbox/tenancy/tables/tenants.py:46 #: netbox/utilities/forms/fields/fields.py:29 -#: netbox/virtualization/tables/clusters.py:91 -#: netbox/virtualization/tables/virtualmachines.py:82 +#: netbox/virtualization/tables/clusters.py:94 +#: netbox/virtualization/tables/virtualmachines.py:52 #: netbox/vpn/tables/crypto.py:37 netbox/vpn/tables/crypto.py:74 #: netbox/vpn/tables/crypto.py:109 netbox/vpn/tables/crypto.py:140 #: netbox/vpn/tables/crypto.py:173 netbox/vpn/tables/l2vpn.py:37 #: netbox/vpn/tables/tunnels.py:61 netbox/wireless/tables/wirelesslan.py:27 -#: netbox/wireless/tables/wirelesslan.py:58 +#: netbox/wireless/tables/wirelesslan.py:65 msgid "Comments" msgstr "" -#: netbox/circuits/tables/circuits.py:86 +#: netbox/circuits/tables/circuits.py:90 #: netbox/templates/tenancy/contact.html:84 #: netbox/tenancy/tables/contacts.py:73 msgid "Assignments" msgstr "" +#: netbox/circuits/tables/circuits.py:117 netbox/dcim/forms/connections.py:81 +msgid "Side" +msgstr "" + +#: netbox/circuits/tables/circuits.py:120 +msgid "Termination Type" +msgstr "" + +#: netbox/circuits/tables/circuits.py:123 +msgid "Termination Point" +msgstr "" + +#: netbox/circuits/tables/circuits.py:134 netbox/dcim/tables/devices.py:160 +#: netbox/templates/dcim/sitegroup.html:26 +msgid "Site Group" +msgstr "" + +#: netbox/circuits/tables/circuits.py:149 +#: netbox/templates/circuits/providernetwork.html:17 +#: netbox/templates/circuits/virtualcircuit.html:27 +#: netbox/templates/circuits/virtualcircuittermination.html:30 +#: netbox/templates/dcim/interface.html:170 +msgid "Provider Network" +msgstr "" + #: netbox/circuits/tables/providers.py:23 msgid "Accounts" msgstr "" @@ -1550,17 +1893,95 @@ msgstr "" msgid "ASN Count" msgstr "" -#: netbox/circuits/views.py:331 +#: netbox/circuits/tables/virtual_circuits.py:65 +#: netbox/netbox/navigation/menu.py:234 +#: netbox/templates/circuits/virtualcircuit.html:87 +#: netbox/templates/vpn/l2vpn.html:56 netbox/templates/vpn/tunnel.html:72 +#: netbox/vpn/tables/tunnels.py:58 +msgid "Terminations" +msgstr "" + +#: netbox/circuits/tables/virtual_circuits.py:109 +#: netbox/dcim/forms/bulk_edit.py:745 netbox/dcim/forms/bulk_edit.py:1299 +#: netbox/dcim/forms/bulk_edit.py:1706 netbox/dcim/forms/bulk_edit.py:1758 +#: netbox/dcim/forms/bulk_import.py:668 netbox/dcim/forms/bulk_import.py:730 +#: netbox/dcim/forms/bulk_import.py:756 netbox/dcim/forms/bulk_import.py:782 +#: netbox/dcim/forms/bulk_import.py:802 netbox/dcim/forms/bulk_import.py:858 +#: netbox/dcim/forms/bulk_import.py:976 netbox/dcim/forms/bulk_import.py:1024 +#: netbox/dcim/forms/bulk_import.py:1041 netbox/dcim/forms/bulk_import.py:1053 +#: netbox/dcim/forms/bulk_import.py:1101 netbox/dcim/forms/bulk_import.py:1205 +#: netbox/dcim/forms/bulk_import.py:1541 netbox/dcim/forms/connections.py:24 +#: netbox/dcim/forms/filtersets.py:132 netbox/dcim/forms/filtersets.py:922 +#: netbox/dcim/forms/filtersets.py:1052 netbox/dcim/forms/filtersets.py:1243 +#: netbox/dcim/forms/filtersets.py:1268 netbox/dcim/forms/filtersets.py:1292 +#: netbox/dcim/forms/filtersets.py:1312 netbox/dcim/forms/filtersets.py:1339 +#: netbox/dcim/forms/filtersets.py:1449 netbox/dcim/forms/filtersets.py:1474 +#: netbox/dcim/forms/filtersets.py:1498 netbox/dcim/forms/filtersets.py:1516 +#: netbox/dcim/forms/filtersets.py:1533 netbox/dcim/forms/filtersets.py:1630 +#: netbox/dcim/forms/filtersets.py:1654 netbox/dcim/forms/filtersets.py:1678 +#: netbox/dcim/forms/model_forms.py:644 netbox/dcim/forms/model_forms.py:861 +#: netbox/dcim/forms/model_forms.py:1231 netbox/dcim/forms/model_forms.py:1716 +#: netbox/dcim/forms/model_forms.py:1787 netbox/dcim/forms/object_create.py:249 +#: netbox/dcim/tables/connections.py:22 netbox/dcim/tables/connections.py:41 +#: netbox/dcim/tables/connections.py:60 netbox/dcim/tables/devices.py:295 +#: netbox/dcim/tables/devices.py:380 netbox/dcim/tables/devices.py:421 +#: netbox/dcim/tables/devices.py:463 netbox/dcim/tables/devices.py:513 +#: netbox/dcim/tables/devices.py:618 netbox/dcim/tables/devices.py:730 +#: netbox/dcim/tables/devices.py:786 netbox/dcim/tables/devices.py:832 +#: netbox/dcim/tables/devices.py:891 netbox/dcim/tables/devices.py:959 +#: netbox/dcim/tables/devices.py:1088 netbox/dcim/tables/modules.py:53 +#: netbox/extras/forms/filtersets.py:321 netbox/ipam/forms/bulk_import.py:303 +#: netbox/ipam/forms/bulk_import.py:540 netbox/ipam/forms/filtersets.py:603 +#: netbox/ipam/forms/model_forms.py:325 netbox/ipam/forms/model_forms.py:754 +#: netbox/ipam/forms/model_forms.py:787 netbox/ipam/forms/model_forms.py:813 +#: netbox/ipam/tables/vlans.py:156 +#: netbox/templates/circuits/virtualcircuittermination.html:56 +#: netbox/templates/dcim/consoleport.html:20 +#: netbox/templates/dcim/consoleserverport.html:20 +#: netbox/templates/dcim/device.html:15 netbox/templates/dcim/device.html:130 +#: netbox/templates/dcim/device_edit.html:10 +#: netbox/templates/dcim/devicebay.html:20 +#: netbox/templates/dcim/devicebay.html:48 +#: netbox/templates/dcim/frontport.html:20 +#: netbox/templates/dcim/interface.html:30 +#: netbox/templates/dcim/interface.html:218 +#: netbox/templates/dcim/inventoryitem.html:20 +#: netbox/templates/dcim/module.html:57 netbox/templates/dcim/modulebay.html:20 +#: netbox/templates/dcim/poweroutlet.html:20 +#: netbox/templates/dcim/powerport.html:20 +#: netbox/templates/dcim/rearport.html:20 +#: netbox/templates/dcim/virtualchassis.html:65 +#: netbox/templates/dcim/virtualchassis_edit.html:51 +#: netbox/templates/dcim/virtualdevicecontext.html:22 +#: netbox/templates/virtualization/virtualmachine.html:114 +#: netbox/templates/vpn/tunneltermination.html:23 +#: netbox/templates/wireless/inc/wirelesslink_interface.html:6 +#: netbox/virtualization/filtersets.py:133 +#: netbox/virtualization/forms/bulk_edit.py:119 +#: netbox/virtualization/forms/bulk_import.py:105 +#: netbox/virtualization/forms/filtersets.py:133 +#: netbox/virtualization/forms/model_forms.py:184 +#: netbox/virtualization/tables/virtualmachines.py:41 netbox/vpn/choices.py:52 +#: netbox/vpn/forms/bulk_import.py:86 netbox/vpn/forms/bulk_import.py:283 +#: netbox/vpn/forms/filtersets.py:275 netbox/vpn/forms/model_forms.py:91 +#: netbox/vpn/forms/model_forms.py:126 netbox/vpn/forms/model_forms.py:237 +#: netbox/vpn/forms/model_forms.py:456 netbox/wireless/forms/model_forms.py:102 +#: netbox/wireless/forms/model_forms.py:144 +#: netbox/wireless/tables/wirelesslan.py:83 +msgid "Device" +msgstr "" + +#: netbox/circuits/views.py:353 #, python-brace-format msgid "No terminations have been defined for circuit {circuit}." msgstr "" -#: netbox/circuits/views.py:380 +#: netbox/circuits/views.py:402 #, python-brace-format msgid "Swapped terminations for circuit {circuit}." msgstr "" -#: netbox/core/api/views.py:39 +#: netbox/core/api/views.py:51 msgid "This user does not have permission to synchronize this data source." msgstr "" @@ -1585,12 +2006,13 @@ msgstr "" #: netbox/core/choices.py:22 netbox/core/choices.py:59 #: netbox/core/constants.py:20 netbox/core/tables/tasks.py:34 #: netbox/dcim/choices.py:187 netbox/dcim/choices.py:239 -#: netbox/dcim/choices.py:1609 netbox/virtualization/choices.py:47 +#: netbox/dcim/choices.py:1593 netbox/dcim/choices.py:1666 +#: netbox/virtualization/choices.py:47 msgid "Failed" msgstr "" -#: netbox/core/choices.py:35 netbox/netbox/navigation/menu.py:335 -#: netbox/netbox/navigation/menu.py:339 +#: netbox/core/choices.py:35 netbox/netbox/navigation/menu.py:356 +#: netbox/netbox/navigation/menu.py:360 #: netbox/templates/extras/script/base.html:14 #: netbox/templates/extras/script_list.html:7 #: netbox/templates/extras/script_list.html:12 @@ -1620,12 +2042,28 @@ msgstr "" msgid "Errored" msgstr "" -#: netbox/core/choices.py:87 netbox/core/tables/plugins.py:63 +#: netbox/core/choices.py:82 +msgid "Minutely" +msgstr "" + +#: netbox/core/choices.py:83 netbox/extras/choices.py:186 +msgid "Hourly" +msgstr "" + +#: netbox/core/choices.py:84 netbox/extras/choices.py:188 +msgid "Daily" +msgstr "" + +#: netbox/core/choices.py:85 netbox/extras/choices.py:189 +msgid "Weekly" +msgstr "" + +#: netbox/core/choices.py:101 netbox/core/tables/plugins.py:63 #: netbox/templates/generic/object.html:61 msgid "Updated" msgstr "" -#: netbox/core/choices.py:88 +#: netbox/core/choices.py:102 msgid "Deleted" msgstr "" @@ -1653,7 +2091,7 @@ msgstr "" #: netbox/core/data_backends.py:32 netbox/core/tables/plugins.py:51 #: netbox/templates/core/plugin.html:88 -#: netbox/templates/dcim/interface.html:216 +#: netbox/templates/dcim/interface.html:273 msgid "Local" msgstr "" @@ -1727,7 +2165,7 @@ msgstr "" msgid "Data source (name)" msgstr "" -#: netbox/core/filtersets.py:145 netbox/dcim/filtersets.py:501 +#: netbox/core/filtersets.py:145 netbox/dcim/filtersets.py:502 #: netbox/extras/filtersets.py:287 netbox/extras/filtersets.py:331 #: netbox/extras/filtersets.py:353 netbox/extras/filtersets.py:413 #: netbox/users/filtersets.py:28 @@ -1739,9 +2177,9 @@ msgid "User name" msgstr "" #: netbox/core/forms/bulk_edit.py:25 netbox/core/forms/filtersets.py:43 -#: netbox/core/tables/data.py:26 netbox/dcim/forms/bulk_edit.py:1137 -#: netbox/dcim/forms/bulk_edit.py:1415 netbox/dcim/forms/filtersets.py:1370 -#: netbox/dcim/tables/devices.py:553 netbox/dcim/tables/devicetypes.py:224 +#: netbox/core/tables/data.py:26 netbox/dcim/forms/bulk_edit.py:1140 +#: netbox/dcim/forms/bulk_edit.py:1418 netbox/dcim/forms/filtersets.py:1375 +#: netbox/dcim/tables/devices.py:566 netbox/dcim/tables/devicetypes.py:226 #: netbox/extras/forms/bulk_edit.py:123 netbox/extras/forms/bulk_edit.py:187 #: netbox/extras/forms/bulk_edit.py:246 netbox/extras/forms/filtersets.py:142 #: netbox/extras/forms/filtersets.py:229 netbox/extras/forms/filtersets.py:294 @@ -1755,8 +2193,8 @@ msgstr "" #: netbox/templates/users/objectpermission.html:25 #: netbox/templates/virtualization/vminterface.html:29 #: netbox/users/forms/bulk_edit.py:89 netbox/users/forms/filtersets.py:70 -#: netbox/users/tables.py:83 netbox/virtualization/forms/bulk_edit.py:217 -#: netbox/virtualization/forms/filtersets.py:215 +#: netbox/users/tables.py:83 netbox/virtualization/forms/bulk_edit.py:199 +#: netbox/virtualization/forms/filtersets.py:220 msgid "Enabled" msgstr "" @@ -1764,9 +2202,9 @@ msgstr "" #: netbox/templates/extras/savedfilter.html:52 #: netbox/vpn/forms/filtersets.py:97 netbox/vpn/forms/filtersets.py:127 #: netbox/vpn/forms/filtersets.py:151 netbox/vpn/forms/filtersets.py:170 -#: netbox/vpn/forms/model_forms.py:301 netbox/vpn/forms/model_forms.py:321 -#: netbox/vpn/forms/model_forms.py:337 netbox/vpn/forms/model_forms.py:357 -#: netbox/vpn/forms/model_forms.py:380 +#: netbox/vpn/forms/model_forms.py:302 netbox/vpn/forms/model_forms.py:323 +#: netbox/vpn/forms/model_forms.py:339 netbox/vpn/forms/model_forms.py:360 +#: netbox/vpn/forms/model_forms.py:383 msgid "Parameters" msgstr "" @@ -1844,8 +2282,8 @@ msgid "Completed before" msgstr "" #: netbox/core/forms/filtersets.py:126 netbox/core/forms/filtersets.py:155 -#: netbox/dcim/forms/bulk_edit.py:462 netbox/dcim/forms/filtersets.py:418 -#: netbox/dcim/forms/filtersets.py:462 netbox/dcim/forms/model_forms.py:316 +#: netbox/dcim/forms/bulk_edit.py:465 netbox/dcim/forms/filtersets.py:419 +#: netbox/dcim/forms/filtersets.py:463 netbox/dcim/forms/model_forms.py:324 #: netbox/extras/forms/filtersets.py:456 netbox/extras/forms/filtersets.py:475 #: netbox/extras/tables/tables.py:302 netbox/extras/tables/tables.py:342 #: netbox/templates/core/objectchange.html:36 @@ -1909,22 +2347,22 @@ msgstr "" msgid "Rack Elevations" msgstr "" -#: netbox/core/forms/model_forms.py:157 netbox/dcim/choices.py:1520 -#: netbox/dcim/forms/bulk_edit.py:984 netbox/dcim/forms/bulk_edit.py:1372 -#: netbox/dcim/forms/bulk_edit.py:1390 netbox/dcim/tables/racks.py:158 -#: netbox/netbox/navigation/menu.py:291 netbox/netbox/navigation/menu.py:295 +#: netbox/core/forms/model_forms.py:157 netbox/dcim/choices.py:1522 +#: netbox/dcim/forms/bulk_edit.py:987 netbox/dcim/forms/bulk_edit.py:1375 +#: netbox/dcim/forms/bulk_edit.py:1393 netbox/dcim/tables/racks.py:157 +#: netbox/netbox/navigation/menu.py:312 netbox/netbox/navigation/menu.py:316 msgid "Power" msgstr "" -#: netbox/core/forms/model_forms.py:159 netbox/netbox/navigation/menu.py:154 +#: netbox/core/forms/model_forms.py:159 netbox/netbox/navigation/menu.py:160 #: netbox/templates/core/inc/config_data.html:37 msgid "IPAM" msgstr "" -#: netbox/core/forms/model_forms.py:160 netbox/netbox/navigation/menu.py:230 +#: netbox/core/forms/model_forms.py:160 netbox/netbox/navigation/menu.py:238 #: netbox/templates/core/inc/config_data.html:50 #: netbox/vpn/forms/bulk_edit.py:77 netbox/vpn/forms/filtersets.py:43 -#: netbox/vpn/forms/model_forms.py:61 netbox/vpn/forms/model_forms.py:146 +#: netbox/vpn/forms/model_forms.py:62 netbox/vpn/forms/model_forms.py:147 msgid "Security" msgstr "" @@ -1950,7 +2388,7 @@ msgstr "" msgid "User Preferences" msgstr "" -#: netbox/core/forms/model_forms.py:167 netbox/dcim/forms/filtersets.py:732 +#: netbox/core/forms/model_forms.py:167 netbox/dcim/forms/filtersets.py:733 #: netbox/templates/core/inc/config_data.html:127 #: netbox/users/forms/model_forms.py:64 msgid "Miscellaneous" @@ -1985,7 +2423,7 @@ msgstr "" msgid "request ID" msgstr "" -#: netbox/core/models/change_logging.py:52 netbox/extras/models/staging.py:69 +#: netbox/core/models/change_logging.py:52 netbox/extras/models/staging.py:77 msgid "action" msgstr "" @@ -2010,9 +2448,9 @@ msgstr "" msgid "Change logging is not supported for this object type ({type})." msgstr "" -#: netbox/core/models/config.py:18 netbox/core/models/data.py:266 +#: netbox/core/models/config.py:18 netbox/core/models/data.py:263 #: netbox/core/models/files.py:27 netbox/core/models/jobs.py:50 -#: netbox/extras/models/models.py:730 netbox/extras/models/notifications.py:39 +#: netbox/extras/models/models.py:733 netbox/extras/models/notifications.py:39 #: netbox/extras/models/notifications.py:186 #: netbox/netbox/models/features.py:53 netbox/users/models/tokens.py:32 msgid "created" @@ -2047,23 +2485,23 @@ msgstr "" msgid "Config revision #{id}" msgstr "" -#: netbox/core/models/data.py:44 netbox/dcim/models/cables.py:43 -#: netbox/dcim/models/device_component_templates.py:203 -#: netbox/dcim/models/device_component_templates.py:237 -#: netbox/dcim/models/device_component_templates.py:272 -#: netbox/dcim/models/device_component_templates.py:334 -#: netbox/dcim/models/device_component_templates.py:413 -#: netbox/dcim/models/device_component_templates.py:512 -#: netbox/dcim/models/device_component_templates.py:612 -#: netbox/dcim/models/device_components.py:283 -#: netbox/dcim/models/device_components.py:312 -#: netbox/dcim/models/device_components.py:345 -#: netbox/dcim/models/device_components.py:463 -#: netbox/dcim/models/device_components.py:605 -#: netbox/dcim/models/device_components.py:970 -#: netbox/dcim/models/device_components.py:1044 netbox/dcim/models/power.py:102 +#: netbox/core/models/data.py:44 netbox/dcim/models/cables.py:42 +#: netbox/dcim/models/device_component_templates.py:199 +#: netbox/dcim/models/device_component_templates.py:234 +#: netbox/dcim/models/device_component_templates.py:270 +#: netbox/dcim/models/device_component_templates.py:335 +#: netbox/dcim/models/device_component_templates.py:420 +#: netbox/dcim/models/device_component_templates.py:526 +#: netbox/dcim/models/device_component_templates.py:626 +#: netbox/dcim/models/device_components.py:279 +#: netbox/dcim/models/device_components.py:306 +#: netbox/dcim/models/device_components.py:337 +#: netbox/dcim/models/device_components.py:453 +#: netbox/dcim/models/device_components.py:653 +#: netbox/dcim/models/device_components.py:1019 +#: netbox/dcim/models/device_components.py:1090 netbox/dcim/models/power.py:100 #: netbox/extras/models/customfields.py:78 netbox/extras/models/search.py:41 -#: netbox/virtualization/models/clusters.py:61 netbox/vpn/models/l2vpn.py:32 +#: netbox/virtualization/models/clusters.py:57 netbox/vpn/models/l2vpn.py:32 msgid "type" msgstr "" @@ -2075,8 +2513,8 @@ msgid "URL" msgstr "" #: netbox/core/models/data.py:59 -#: netbox/dcim/models/device_component_templates.py:418 -#: netbox/dcim/models/device_components.py:512 +#: netbox/dcim/models/device_component_templates.py:425 +#: netbox/dcim/models/device_components.py:505 #: netbox/extras/models/models.py:70 netbox/extras/models/models.py:301 #: netbox/extras/models/models.py:526 netbox/users/models/permissions.py:29 msgid "enabled" @@ -2106,63 +2544,63 @@ msgstr "" msgid "data sources" msgstr "" -#: netbox/core/models/data.py:122 +#: netbox/core/models/data.py:119 #, python-brace-format msgid "Unknown backend type: {type}" msgstr "" -#: netbox/core/models/data.py:164 +#: netbox/core/models/data.py:161 msgid "Cannot initiate sync; syncing already in progress." msgstr "" -#: netbox/core/models/data.py:177 +#: netbox/core/models/data.py:174 msgid "" "There was an error initializing the backend. A dependency needs to be " "installed: " msgstr "" -#: netbox/core/models/data.py:270 netbox/core/models/files.py:31 +#: netbox/core/models/data.py:267 netbox/core/models/files.py:31 #: netbox/netbox/models/features.py:59 msgid "last updated" msgstr "" -#: netbox/core/models/data.py:280 netbox/dcim/models/cables.py:444 +#: netbox/core/models/data.py:277 netbox/dcim/models/cables.py:442 msgid "path" msgstr "" -#: netbox/core/models/data.py:283 +#: netbox/core/models/data.py:280 msgid "File path relative to the data source's root" msgstr "" -#: netbox/core/models/data.py:287 netbox/ipam/models/ip.py:503 +#: netbox/core/models/data.py:284 netbox/ipam/models/ip.py:489 msgid "size" msgstr "" -#: netbox/core/models/data.py:290 +#: netbox/core/models/data.py:287 msgid "hash" msgstr "" -#: netbox/core/models/data.py:294 +#: netbox/core/models/data.py:291 msgid "Length must be 64 hexadecimal characters." msgstr "" -#: netbox/core/models/data.py:296 +#: netbox/core/models/data.py:293 msgid "SHA256 hash of the file data" msgstr "" -#: netbox/core/models/data.py:313 +#: netbox/core/models/data.py:310 msgid "data file" msgstr "" -#: netbox/core/models/data.py:314 +#: netbox/core/models/data.py:311 msgid "data files" msgstr "" -#: netbox/core/models/data.py:401 +#: netbox/core/models/data.py:398 msgid "auto sync record" msgstr "" -#: netbox/core/models/data.py:402 +#: netbox/core/models/data.py:399 msgid "auto sync records" msgstr "" @@ -2186,6 +2624,11 @@ msgstr "" msgid "managed files" msgstr "" +#: netbox/core/models/files.py:100 +#, python-brace-format +msgid "A {model} with this file path already exists ({path})." +msgstr "" + #: netbox/core/models/jobs.py:54 msgid "scheduled" msgstr "" @@ -2207,7 +2650,7 @@ msgid "completed" msgstr "" #: netbox/core/models/jobs.py:91 netbox/extras/models/models.py:101 -#: netbox/extras/models/staging.py:87 +#: netbox/extras/models/staging.py:95 msgid "data" msgstr "" @@ -2237,7 +2680,7 @@ msgstr "" msgid "Invalid status for job termination. Choices are: {choices}" msgstr "" -#: netbox/core/models/jobs.py:221 +#: netbox/core/models/jobs.py:231 msgid "" "enqueue() cannot be called with values for both schedule_at and immediate." msgstr "" @@ -2288,7 +2731,7 @@ msgstr "" #: netbox/dcim/tables/devicetypes.py:164 netbox/extras/tables/tables.py:216 #: netbox/extras/tables/tables.py:460 netbox/netbox/tables/tables.py:189 #: netbox/templates/dcim/virtualchassis_edit.html:52 -#: netbox/utilities/forms/forms.py:73 netbox/wireless/tables/wirelesslink.py:17 +#: netbox/utilities/forms/forms.py:73 netbox/wireless/tables/wirelesslink.py:16 msgid "ID" msgstr "" @@ -2354,7 +2797,7 @@ msgstr "" msgid "Host" msgstr "" -#: netbox/core/tables/tasks.py:50 netbox/ipam/forms/filtersets.py:535 +#: netbox/core/tables/tasks.py:50 netbox/ipam/forms/filtersets.py:587 msgid "Port" msgstr "" @@ -2402,71 +2845,71 @@ msgstr "" msgid "No workers found" msgstr "" -#: netbox/core/views.py:90 -#, python-brace-format -msgid "Queued job #{id} to sync {datasource}" -msgstr "" - -#: netbox/core/views.py:319 -#, python-brace-format -msgid "Restored configuration revision #{id}" -msgstr "" - -#: netbox/core/views.py:412 netbox/core/views.py:455 netbox/core/views.py:531 +#: netbox/core/utils.py:84 netbox/core/utils.py:150 netbox/core/views.py:396 #, python-brace-format msgid "Job {job_id} not found" msgstr "" -#: netbox/core/views.py:463 -#, python-brace-format -msgid "Job {id} has been deleted." -msgstr "" - -#: netbox/core/views.py:465 -#, python-brace-format -msgid "Error deleting job {id}: {error}" -msgstr "" - -#: netbox/core/views.py:478 netbox/core/views.py:496 +#: netbox/core/utils.py:102 netbox/core/utils.py:118 #, python-brace-format msgid "Job {id} not found." msgstr "" -#: netbox/core/views.py:484 +#: netbox/core/views.py:88 +#, python-brace-format +msgid "Queued job #{id} to sync {datasource}" +msgstr "" + +#: netbox/core/views.py:332 +#, python-brace-format +msgid "Restored configuration revision #{id}" +msgstr "" + +#: netbox/core/views.py:435 +#, python-brace-format +msgid "Job {id} has been deleted." +msgstr "" + +#: netbox/core/views.py:437 +#, python-brace-format +msgid "Error deleting job {id}: {error}" +msgstr "" + +#: netbox/core/views.py:446 #, python-brace-format msgid "Job {id} has been re-enqueued." msgstr "" -#: netbox/core/views.py:519 +#: netbox/core/views.py:455 #, python-brace-format msgid "Job {id} has been enqueued." msgstr "" -#: netbox/core/views.py:538 +#: netbox/core/views.py:464 #, python-brace-format msgid "Job {id} has been stopped." msgstr "" -#: netbox/core/views.py:540 +#: netbox/core/views.py:466 #, python-brace-format msgid "Failed to stop job {id}" msgstr "" -#: netbox/core/views.py:674 +#: netbox/core/views.py:600 msgid "Plugins catalog could not be loaded" msgstr "" -#: netbox/core/views.py:708 +#: netbox/core/views.py:634 #, python-brace-format msgid "Plugin {name} not found" msgstr "" -#: netbox/dcim/api/serializers_/devices.py:49 -#: netbox/dcim/api/serializers_/devicetypes.py:25 +#: netbox/dcim/api/serializers_/devices.py:53 +#: netbox/dcim/api/serializers_/devicetypes.py:26 msgid "Position (U)" msgstr "" -#: netbox/dcim/api/serializers_/racks.py:112 netbox/templates/dcim/rack.html:28 +#: netbox/dcim/api/serializers_/racks.py:113 netbox/templates/dcim/rack.html:28 msgid "Facility ID" msgstr "" @@ -2475,8 +2918,9 @@ msgid "Staging" msgstr "" #: netbox/dcim/choices.py:23 netbox/dcim/choices.py:189 -#: netbox/dcim/choices.py:240 netbox/dcim/choices.py:1533 -#: netbox/virtualization/choices.py:23 netbox/virtualization/choices.py:48 +#: netbox/dcim/choices.py:240 netbox/dcim/choices.py:1535 +#: netbox/dcim/choices.py:1667 netbox/virtualization/choices.py:23 +#: netbox/virtualization/choices.py:48 msgid "Decommissioning" msgstr "" @@ -2539,7 +2983,7 @@ msgstr "" msgid "Millimeters" msgstr "" -#: netbox/dcim/choices.py:115 netbox/dcim/choices.py:1555 +#: netbox/dcim/choices.py:115 netbox/dcim/choices.py:1557 msgid "Inches" msgstr "" @@ -2553,20 +2997,21 @@ msgstr "" msgid "Rear to front" msgstr "" -#: netbox/dcim/choices.py:151 netbox/dcim/forms/bulk_edit.py:69 -#: netbox/dcim/forms/bulk_edit.py:88 netbox/dcim/forms/bulk_edit.py:174 -#: netbox/dcim/forms/bulk_edit.py:1420 netbox/dcim/forms/bulk_import.py:60 -#: netbox/dcim/forms/bulk_import.py:74 netbox/dcim/forms/bulk_import.py:137 -#: netbox/dcim/forms/bulk_import.py:588 netbox/dcim/forms/bulk_import.py:855 -#: netbox/dcim/forms/bulk_import.py:1110 netbox/dcim/forms/filtersets.py:234 -#: netbox/dcim/forms/model_forms.py:74 netbox/dcim/forms/model_forms.py:93 -#: netbox/dcim/forms/model_forms.py:170 netbox/dcim/forms/model_forms.py:1069 -#: netbox/dcim/forms/model_forms.py:1509 netbox/dcim/forms/object_import.py:176 -#: netbox/dcim/tables/devices.py:656 netbox/dcim/tables/devices.py:869 -#: netbox/dcim/tables/devices.py:954 netbox/extras/tables/tables.py:223 -#: netbox/ipam/tables/fhrp.py:59 netbox/ipam/tables/ip.py:378 -#: netbox/ipam/tables/services.py:44 netbox/templates/dcim/interface.html:102 -#: netbox/templates/dcim/interface.html:309 +#: netbox/dcim/choices.py:151 netbox/dcim/forms/bulk_edit.py:72 +#: netbox/dcim/forms/bulk_edit.py:91 netbox/dcim/forms/bulk_edit.py:177 +#: netbox/dcim/forms/bulk_edit.py:1423 netbox/dcim/forms/bulk_import.py:62 +#: netbox/dcim/forms/bulk_import.py:76 netbox/dcim/forms/bulk_import.py:139 +#: netbox/dcim/forms/bulk_import.py:593 netbox/dcim/forms/bulk_import.py:863 +#: netbox/dcim/forms/bulk_import.py:1118 netbox/dcim/forms/filtersets.py:235 +#: netbox/dcim/forms/model_forms.py:76 netbox/dcim/forms/model_forms.py:95 +#: netbox/dcim/forms/model_forms.py:174 netbox/dcim/forms/model_forms.py:1082 +#: netbox/dcim/forms/model_forms.py:1551 netbox/dcim/forms/object_import.py:177 +#: netbox/dcim/tables/devices.py:689 netbox/dcim/tables/devices.py:899 +#: netbox/dcim/tables/devices.py:986 netbox/dcim/tables/devices.py:1146 +#: netbox/extras/tables/tables.py:223 netbox/ipam/tables/fhrp.py:59 +#: netbox/ipam/tables/ip.py:328 netbox/ipam/tables/services.py:44 +#: netbox/templates/dcim/interface.html:108 +#: netbox/templates/dcim/interface.html:366 #: netbox/templates/dcim/location.html:41 netbox/templates/dcim/region.html:37 #: netbox/templates/dcim/sitegroup.html:37 #: netbox/templates/ipam/service.html:28 @@ -2579,12 +3024,12 @@ msgstr "" #: netbox/tenancy/forms/bulk_import.py:58 #: netbox/tenancy/forms/model_forms.py:25 #: netbox/tenancy/forms/model_forms.py:68 -#: netbox/virtualization/forms/bulk_edit.py:207 -#: netbox/virtualization/forms/bulk_import.py:151 -#: netbox/virtualization/tables/virtualmachines.py:162 -#: netbox/wireless/forms/bulk_edit.py:24 -#: netbox/wireless/forms/bulk_import.py:21 -#: netbox/wireless/forms/model_forms.py:21 +#: netbox/virtualization/forms/bulk_edit.py:189 +#: netbox/virtualization/forms/bulk_import.py:157 +#: netbox/virtualization/tables/virtualmachines.py:132 +#: netbox/wireless/forms/bulk_edit.py:26 +#: netbox/wireless/forms/bulk_import.py:23 +#: netbox/wireless/forms/model_forms.py:22 msgid "Parent" msgstr "" @@ -2607,7 +3052,7 @@ msgid "Rear" msgstr "" #: netbox/dcim/choices.py:186 netbox/dcim/choices.py:238 -#: netbox/virtualization/choices.py:46 +#: netbox/dcim/choices.py:1665 netbox/virtualization/choices.py:46 msgid "Staged" msgstr "" @@ -2640,7 +3085,7 @@ msgid "Top to bottom" msgstr "" #: netbox/dcim/choices.py:215 netbox/dcim/choices.py:259 -#: netbox/dcim/choices.py:1305 +#: netbox/dcim/choices.py:1307 msgid "Passive" msgstr "" @@ -2670,8 +3115,8 @@ msgstr "" #: netbox/dcim/choices.py:581 netbox/dcim/choices.py:824 #: netbox/dcim/choices.py:1221 netbox/dcim/choices.py:1223 -#: netbox/dcim/choices.py:1449 netbox/dcim/choices.py:1451 -#: netbox/netbox/navigation/menu.py:200 +#: netbox/dcim/choices.py:1451 netbox/dcim/choices.py:1453 +#: netbox/netbox/navigation/menu.py:208 msgid "Other" msgstr "" @@ -2688,10 +3133,10 @@ msgid "Virtual" msgstr "" #: netbox/dcim/choices.py:856 netbox/dcim/choices.py:1099 -#: netbox/dcim/forms/bulk_edit.py:1563 netbox/dcim/forms/filtersets.py:1330 -#: netbox/dcim/forms/model_forms.py:995 netbox/dcim/forms/model_forms.py:1404 -#: netbox/netbox/navigation/menu.py:140 netbox/netbox/navigation/menu.py:144 -#: netbox/templates/dcim/interface.html:210 +#: netbox/dcim/forms/bulk_edit.py:1576 netbox/dcim/forms/filtersets.py:1335 +#: netbox/dcim/forms/model_forms.py:1007 netbox/dcim/forms/model_forms.py:1445 +#: netbox/netbox/navigation/menu.py:146 netbox/netbox/navigation/menu.py:150 +#: netbox/templates/dcim/interface.html:267 msgid "Wireless" msgstr "" @@ -2699,13 +3144,13 @@ msgstr "" msgid "Virtual interfaces" msgstr "" -#: netbox/dcim/choices.py:1025 netbox/dcim/forms/bulk_edit.py:1428 -#: netbox/dcim/forms/bulk_import.py:862 netbox/dcim/forms/model_forms.py:981 -#: netbox/dcim/tables/devices.py:660 netbox/templates/dcim/interface.html:106 +#: netbox/dcim/choices.py:1025 netbox/dcim/forms/bulk_edit.py:1431 +#: netbox/dcim/forms/bulk_import.py:870 netbox/dcim/forms/model_forms.py:993 +#: netbox/dcim/tables/devices.py:693 netbox/templates/dcim/interface.html:112 #: netbox/templates/virtualization/vminterface.html:43 -#: netbox/virtualization/forms/bulk_edit.py:212 -#: netbox/virtualization/forms/bulk_import.py:158 -#: netbox/virtualization/tables/virtualmachines.py:166 +#: netbox/virtualization/forms/bulk_edit.py:194 +#: netbox/virtualization/forms/bulk_import.py:164 +#: netbox/virtualization/tables/virtualmachines.py:136 msgid "Bridge" msgstr "" @@ -2729,10 +3174,10 @@ msgstr "" msgid "Cellular" msgstr "" -#: netbox/dcim/choices.py:1167 netbox/dcim/forms/filtersets.py:383 -#: netbox/dcim/forms/filtersets.py:809 netbox/dcim/forms/filtersets.py:963 -#: netbox/dcim/forms/filtersets.py:1542 -#: netbox/templates/dcim/inventoryitem.html:52 +#: netbox/dcim/choices.py:1167 netbox/dcim/forms/filtersets.py:384 +#: netbox/dcim/forms/filtersets.py:810 netbox/dcim/forms/filtersets.py:964 +#: netbox/dcim/forms/filtersets.py:1547 +#: netbox/templates/dcim/inventoryitem.html:56 #: netbox/templates/dcim/virtualchassis_edit.html:54 msgid "Serial" msgstr "" @@ -2758,109 +3203,95 @@ msgstr "" msgid "Auto" msgstr "" -#: netbox/dcim/choices.py:1265 +#: netbox/dcim/choices.py:1266 msgid "Access" msgstr "" -#: netbox/dcim/choices.py:1266 netbox/ipam/tables/vlans.py:172 -#: netbox/ipam/tables/vlans.py:217 +#: netbox/dcim/choices.py:1267 netbox/ipam/tables/vlans.py:148 +#: netbox/ipam/tables/vlans.py:193 #: netbox/templates/dcim/inc/interface_vlans_table.html:7 msgid "Tagged" msgstr "" -#: netbox/dcim/choices.py:1267 +#: netbox/dcim/choices.py:1268 msgid "Tagged (All)" msgstr "" -#: netbox/dcim/choices.py:1296 +#: netbox/dcim/choices.py:1269 netbox/templates/ipam/vlan_edit.html:22 +msgid "Q-in-Q (802.1ad)" +msgstr "" + +#: netbox/dcim/choices.py:1298 msgid "IEEE Standard" msgstr "" -#: netbox/dcim/choices.py:1307 +#: netbox/dcim/choices.py:1309 msgid "Passive 24V (2-pair)" msgstr "" -#: netbox/dcim/choices.py:1308 +#: netbox/dcim/choices.py:1310 msgid "Passive 24V (4-pair)" msgstr "" -#: netbox/dcim/choices.py:1309 +#: netbox/dcim/choices.py:1311 msgid "Passive 48V (2-pair)" msgstr "" -#: netbox/dcim/choices.py:1310 +#: netbox/dcim/choices.py:1312 msgid "Passive 48V (4-pair)" msgstr "" -#: netbox/dcim/choices.py:1380 netbox/dcim/choices.py:1490 +#: netbox/dcim/choices.py:1382 netbox/dcim/choices.py:1492 msgid "Copper" msgstr "" -#: netbox/dcim/choices.py:1403 +#: netbox/dcim/choices.py:1405 msgid "Fiber Optic" msgstr "" -#: netbox/dcim/choices.py:1436 netbox/dcim/choices.py:1519 +#: netbox/dcim/choices.py:1438 netbox/dcim/choices.py:1521 msgid "USB" msgstr "" -#: netbox/dcim/choices.py:1506 +#: netbox/dcim/choices.py:1508 msgid "Fiber" msgstr "" -#: netbox/dcim/choices.py:1531 netbox/dcim/forms/filtersets.py:1227 +#: netbox/dcim/choices.py:1533 netbox/dcim/forms/filtersets.py:1228 msgid "Connected" msgstr "" -#: netbox/dcim/choices.py:1550 netbox/wireless/choices.py:497 +#: netbox/dcim/choices.py:1552 netbox/netbox/choices.py:175 msgid "Kilometers" msgstr "" -#: netbox/dcim/choices.py:1551 netbox/templates/dcim/cable_trace.html:65 -#: netbox/wireless/choices.py:498 +#: netbox/dcim/choices.py:1553 netbox/netbox/choices.py:176 +#: netbox/templates/dcim/cable_trace.html:65 msgid "Meters" msgstr "" -#: netbox/dcim/choices.py:1552 +#: netbox/dcim/choices.py:1554 msgid "Centimeters" msgstr "" -#: netbox/dcim/choices.py:1553 netbox/wireless/choices.py:499 +#: netbox/dcim/choices.py:1555 netbox/netbox/choices.py:177 msgid "Miles" msgstr "" -#: netbox/dcim/choices.py:1554 netbox/templates/dcim/cable_trace.html:66 -#: netbox/wireless/choices.py:500 +#: netbox/dcim/choices.py:1556 netbox/netbox/choices.py:178 +#: netbox/templates/dcim/cable_trace.html:66 msgid "Feet" msgstr "" -#: netbox/dcim/choices.py:1570 netbox/templates/dcim/device.html:327 -#: netbox/templates/dcim/rack.html:107 -msgid "Kilograms" -msgstr "" - -#: netbox/dcim/choices.py:1571 -msgid "Grams" -msgstr "" - -#: netbox/dcim/choices.py:1572 netbox/templates/dcim/device.html:328 -#: netbox/templates/dcim/rack.html:108 -msgid "Pounds" -msgstr "" - -#: netbox/dcim/choices.py:1573 -msgid "Ounces" -msgstr "" - -#: netbox/dcim/choices.py:1620 +#: netbox/dcim/choices.py:1604 msgid "Redundant" msgstr "" -#: netbox/dcim/choices.py:1641 +#: netbox/dcim/choices.py:1625 msgid "Single phase" msgstr "" -#: netbox/dcim/choices.py:1642 +#: netbox/dcim/choices.py:1626 msgid "Three-phase" msgstr "" @@ -2874,335 +3305,319 @@ msgstr "" msgid "Invalid WWN format: {value}" msgstr "" -#: netbox/dcim/filtersets.py:86 +#: netbox/dcim/filtersets.py:87 msgid "Parent region (ID)" msgstr "" -#: netbox/dcim/filtersets.py:92 +#: netbox/dcim/filtersets.py:93 msgid "Parent region (slug)" msgstr "" -#: netbox/dcim/filtersets.py:116 +#: netbox/dcim/filtersets.py:117 msgid "Parent site group (ID)" msgstr "" -#: netbox/dcim/filtersets.py:122 +#: netbox/dcim/filtersets.py:123 msgid "Parent site group (slug)" msgstr "" -#: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 +#: netbox/dcim/filtersets.py:165 netbox/extras/filtersets.py:364 +#: netbox/ipam/filtersets.py:810 netbox/ipam/filtersets.py:962 msgid "Group (ID)" msgstr "" -#: netbox/dcim/filtersets.py:170 +#: netbox/dcim/filtersets.py:171 msgid "Group (slug)" msgstr "" -#: netbox/dcim/filtersets.py:176 netbox/dcim/filtersets.py:181 +#: netbox/dcim/filtersets.py:177 netbox/dcim/filtersets.py:182 msgid "AS (ID)" msgstr "" -#: netbox/dcim/filtersets.py:246 +#: netbox/dcim/filtersets.py:247 msgid "Parent location (ID)" msgstr "" -#: netbox/dcim/filtersets.py:252 +#: netbox/dcim/filtersets.py:253 msgid "Parent location (slug)" msgstr "" -#: netbox/dcim/filtersets.py:258 netbox/dcim/filtersets.py:369 -#: netbox/dcim/filtersets.py:490 netbox/dcim/filtersets.py:1057 -#: netbox/dcim/filtersets.py:1404 netbox/dcim/filtersets.py:2182 -msgid "Location (ID)" -msgstr "" - -#: netbox/dcim/filtersets.py:265 netbox/dcim/filtersets.py:376 -#: netbox/dcim/filtersets.py:497 netbox/dcim/filtersets.py:1410 -#: netbox/extras/filtersets.py:542 -msgid "Location (slug)" -msgstr "" - -#: netbox/dcim/filtersets.py:296 netbox/dcim/filtersets.py:381 -#: netbox/dcim/filtersets.py:539 netbox/dcim/filtersets.py:678 -#: netbox/dcim/filtersets.py:882 netbox/dcim/filtersets.py:933 -#: netbox/dcim/filtersets.py:973 netbox/dcim/filtersets.py:1306 -#: netbox/dcim/filtersets.py:1840 +#: netbox/dcim/filtersets.py:297 netbox/dcim/filtersets.py:382 +#: netbox/dcim/filtersets.py:540 netbox/dcim/filtersets.py:679 +#: netbox/dcim/filtersets.py:883 netbox/dcim/filtersets.py:934 +#: netbox/dcim/filtersets.py:974 netbox/dcim/filtersets.py:1307 +#: netbox/dcim/filtersets.py:1959 msgid "Manufacturer (ID)" msgstr "" -#: netbox/dcim/filtersets.py:302 netbox/dcim/filtersets.py:387 -#: netbox/dcim/filtersets.py:545 netbox/dcim/filtersets.py:684 -#: netbox/dcim/filtersets.py:888 netbox/dcim/filtersets.py:939 -#: netbox/dcim/filtersets.py:979 netbox/dcim/filtersets.py:1312 -#: netbox/dcim/filtersets.py:1846 +#: netbox/dcim/filtersets.py:303 netbox/dcim/filtersets.py:388 +#: netbox/dcim/filtersets.py:546 netbox/dcim/filtersets.py:685 +#: netbox/dcim/filtersets.py:889 netbox/dcim/filtersets.py:940 +#: netbox/dcim/filtersets.py:980 netbox/dcim/filtersets.py:1313 +#: netbox/dcim/filtersets.py:1965 msgid "Manufacturer (slug)" msgstr "" -#: netbox/dcim/filtersets.py:393 +#: netbox/dcim/filtersets.py:394 msgid "Rack type (slug)" msgstr "" -#: netbox/dcim/filtersets.py:397 +#: netbox/dcim/filtersets.py:398 msgid "Rack type (ID)" msgstr "" -#: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 -#: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 -#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 +#: netbox/dcim/filtersets.py:412 netbox/dcim/filtersets.py:893 +#: netbox/dcim/filtersets.py:995 netbox/dcim/filtersets.py:1969 +#: netbox/ipam/filtersets.py:350 netbox/ipam/filtersets.py:462 +#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:176 msgid "Role (ID)" msgstr "" -#: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 -#: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 -#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 -#: netbox/virtualization/filtersets.py:216 +#: netbox/dcim/filtersets.py:418 netbox/dcim/filtersets.py:899 +#: netbox/dcim/filtersets.py:1001 netbox/dcim/filtersets.py:1975 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:356 +#: netbox/ipam/filtersets.py:468 netbox/ipam/filtersets.py:978 +#: netbox/virtualization/filtersets.py:182 msgid "Role (slug)" msgstr "" -#: netbox/dcim/filtersets.py:447 netbox/dcim/filtersets.py:1062 -#: netbox/dcim/filtersets.py:1415 netbox/dcim/filtersets.py:2244 +#: netbox/dcim/filtersets.py:448 netbox/dcim/filtersets.py:1063 +#: netbox/dcim/filtersets.py:1416 netbox/dcim/filtersets.py:2367 msgid "Rack (ID)" msgstr "" -#: netbox/dcim/filtersets.py:507 netbox/extras/filtersets.py:293 +#: netbox/dcim/filtersets.py:508 netbox/extras/filtersets.py:293 #: netbox/extras/filtersets.py:337 netbox/extras/filtersets.py:359 #: netbox/extras/filtersets.py:419 netbox/users/filtersets.py:113 #: netbox/users/filtersets.py:180 msgid "User (name)" msgstr "" -#: netbox/dcim/filtersets.py:549 +#: netbox/dcim/filtersets.py:550 msgid "Default platform (ID)" msgstr "" -#: netbox/dcim/filtersets.py:555 +#: netbox/dcim/filtersets.py:556 msgid "Default platform (slug)" msgstr "" -#: netbox/dcim/filtersets.py:558 netbox/dcim/forms/filtersets.py:517 +#: netbox/dcim/filtersets.py:559 netbox/dcim/forms/filtersets.py:518 msgid "Has a front image" msgstr "" -#: netbox/dcim/filtersets.py:562 netbox/dcim/forms/filtersets.py:524 +#: netbox/dcim/filtersets.py:563 netbox/dcim/forms/filtersets.py:525 msgid "Has a rear image" msgstr "" -#: netbox/dcim/filtersets.py:567 netbox/dcim/filtersets.py:688 -#: netbox/dcim/filtersets.py:1131 netbox/dcim/forms/filtersets.py:531 -#: netbox/dcim/forms/filtersets.py:627 netbox/dcim/forms/filtersets.py:848 +#: netbox/dcim/filtersets.py:568 netbox/dcim/filtersets.py:689 +#: netbox/dcim/filtersets.py:1132 netbox/dcim/forms/filtersets.py:532 +#: netbox/dcim/forms/filtersets.py:628 netbox/dcim/forms/filtersets.py:849 msgid "Has console ports" msgstr "" -#: netbox/dcim/filtersets.py:571 netbox/dcim/filtersets.py:692 -#: netbox/dcim/filtersets.py:1135 netbox/dcim/forms/filtersets.py:538 -#: netbox/dcim/forms/filtersets.py:634 netbox/dcim/forms/filtersets.py:855 +#: netbox/dcim/filtersets.py:572 netbox/dcim/filtersets.py:693 +#: netbox/dcim/filtersets.py:1136 netbox/dcim/forms/filtersets.py:539 +#: netbox/dcim/forms/filtersets.py:635 netbox/dcim/forms/filtersets.py:856 msgid "Has console server ports" msgstr "" -#: netbox/dcim/filtersets.py:575 netbox/dcim/filtersets.py:696 -#: netbox/dcim/filtersets.py:1139 netbox/dcim/forms/filtersets.py:545 -#: netbox/dcim/forms/filtersets.py:641 netbox/dcim/forms/filtersets.py:862 +#: netbox/dcim/filtersets.py:576 netbox/dcim/filtersets.py:697 +#: netbox/dcim/filtersets.py:1140 netbox/dcim/forms/filtersets.py:546 +#: netbox/dcim/forms/filtersets.py:642 netbox/dcim/forms/filtersets.py:863 msgid "Has power ports" msgstr "" -#: netbox/dcim/filtersets.py:579 netbox/dcim/filtersets.py:700 -#: netbox/dcim/filtersets.py:1143 netbox/dcim/forms/filtersets.py:552 -#: netbox/dcim/forms/filtersets.py:648 netbox/dcim/forms/filtersets.py:869 +#: netbox/dcim/filtersets.py:580 netbox/dcim/filtersets.py:701 +#: netbox/dcim/filtersets.py:1144 netbox/dcim/forms/filtersets.py:553 +#: netbox/dcim/forms/filtersets.py:649 netbox/dcim/forms/filtersets.py:870 msgid "Has power outlets" msgstr "" -#: netbox/dcim/filtersets.py:583 netbox/dcim/filtersets.py:704 -#: netbox/dcim/filtersets.py:1147 netbox/dcim/forms/filtersets.py:559 -#: netbox/dcim/forms/filtersets.py:655 netbox/dcim/forms/filtersets.py:876 +#: netbox/dcim/filtersets.py:584 netbox/dcim/filtersets.py:705 +#: netbox/dcim/filtersets.py:1148 netbox/dcim/forms/filtersets.py:560 +#: netbox/dcim/forms/filtersets.py:656 netbox/dcim/forms/filtersets.py:877 msgid "Has interfaces" msgstr "" -#: netbox/dcim/filtersets.py:587 netbox/dcim/filtersets.py:708 -#: netbox/dcim/filtersets.py:1151 netbox/dcim/forms/filtersets.py:566 -#: netbox/dcim/forms/filtersets.py:662 netbox/dcim/forms/filtersets.py:883 +#: netbox/dcim/filtersets.py:588 netbox/dcim/filtersets.py:709 +#: netbox/dcim/filtersets.py:1152 netbox/dcim/forms/filtersets.py:567 +#: netbox/dcim/forms/filtersets.py:663 netbox/dcim/forms/filtersets.py:884 msgid "Has pass-through ports" msgstr "" -#: netbox/dcim/filtersets.py:591 netbox/dcim/filtersets.py:1155 -#: netbox/dcim/forms/filtersets.py:580 +#: netbox/dcim/filtersets.py:592 netbox/dcim/filtersets.py:1156 +#: netbox/dcim/forms/filtersets.py:581 msgid "Has module bays" msgstr "" -#: netbox/dcim/filtersets.py:595 netbox/dcim/filtersets.py:1159 -#: netbox/dcim/forms/filtersets.py:573 +#: netbox/dcim/filtersets.py:596 netbox/dcim/filtersets.py:1160 +#: netbox/dcim/forms/filtersets.py:574 msgid "Has device bays" msgstr "" -#: netbox/dcim/filtersets.py:599 netbox/dcim/forms/filtersets.py:587 +#: netbox/dcim/filtersets.py:600 netbox/dcim/forms/filtersets.py:588 msgid "Has inventory items" msgstr "" -#: netbox/dcim/filtersets.py:756 netbox/dcim/filtersets.py:989 -#: netbox/dcim/filtersets.py:1436 +#: netbox/dcim/filtersets.py:757 netbox/dcim/filtersets.py:990 +#: netbox/dcim/filtersets.py:1437 msgid "Device type (ID)" msgstr "" -#: netbox/dcim/filtersets.py:772 netbox/dcim/filtersets.py:1317 +#: netbox/dcim/filtersets.py:773 netbox/dcim/filtersets.py:1318 msgid "Module type (ID)" msgstr "" -#: netbox/dcim/filtersets.py:804 netbox/dcim/filtersets.py:1591 +#: netbox/dcim/filtersets.py:805 netbox/dcim/filtersets.py:1592 msgid "Power port (ID)" msgstr "" -#: netbox/dcim/filtersets.py:878 netbox/dcim/filtersets.py:1836 +#: netbox/dcim/filtersets.py:879 netbox/dcim/filtersets.py:1955 msgid "Parent inventory item (ID)" msgstr "" -#: netbox/dcim/filtersets.py:921 netbox/dcim/filtersets.py:947 -#: netbox/dcim/filtersets.py:1127 netbox/virtualization/filtersets.py:238 +#: netbox/dcim/filtersets.py:922 netbox/dcim/filtersets.py:948 +#: netbox/dcim/filtersets.py:1128 netbox/virtualization/filtersets.py:204 msgid "Config template (ID)" msgstr "" -#: netbox/dcim/filtersets.py:985 +#: netbox/dcim/filtersets.py:986 msgid "Device type (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1005 +#: netbox/dcim/filtersets.py:1006 msgid "Parent Device (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1009 netbox/virtualization/filtersets.py:220 +#: netbox/dcim/filtersets.py:1010 netbox/virtualization/filtersets.py:186 msgid "Platform (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1015 netbox/extras/filtersets.py:569 -#: netbox/virtualization/filtersets.py:226 +#: netbox/dcim/filtersets.py:1016 netbox/extras/filtersets.py:569 +#: netbox/virtualization/filtersets.py:192 msgid "Platform (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1051 netbox/dcim/filtersets.py:1399 -#: netbox/dcim/filtersets.py:1934 netbox/dcim/filtersets.py:2176 -#: netbox/dcim/filtersets.py:2235 +#: netbox/dcim/filtersets.py:1052 netbox/dcim/filtersets.py:1400 +#: netbox/dcim/filtersets.py:2057 netbox/dcim/filtersets.py:2299 +#: netbox/dcim/filtersets.py:2358 msgid "Site name (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1067 +#: netbox/dcim/filtersets.py:1068 msgid "Parent bay (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1071 +#: netbox/dcim/filtersets.py:1072 msgid "VM cluster (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1077 netbox/extras/filtersets.py:591 -#: netbox/virtualization/filtersets.py:136 +#: netbox/dcim/filtersets.py:1078 netbox/extras/filtersets.py:591 +#: netbox/virtualization/filtersets.py:102 msgid "Cluster group (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1082 netbox/virtualization/filtersets.py:130 +#: netbox/dcim/filtersets.py:1083 netbox/virtualization/filtersets.py:96 msgid "Cluster group (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1088 +#: netbox/dcim/filtersets.py:1089 msgid "Device model (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1099 netbox/dcim/forms/bulk_edit.py:522 +#: netbox/dcim/filtersets.py:1100 netbox/dcim/forms/bulk_edit.py:525 msgid "Is full depth" msgstr "" -#: netbox/dcim/filtersets.py:1103 netbox/dcim/forms/common.py:18 -#: netbox/dcim/forms/filtersets.py:818 netbox/dcim/forms/filtersets.py:1385 -#: netbox/dcim/models/device_components.py:518 -#: netbox/virtualization/filtersets.py:230 -#: netbox/virtualization/filtersets.py:301 -#: netbox/virtualization/forms/filtersets.py:172 -#: netbox/virtualization/forms/filtersets.py:223 +#: netbox/dcim/filtersets.py:1104 netbox/dcim/forms/filtersets.py:819 +#: netbox/dcim/forms/filtersets.py:1390 netbox/dcim/forms/filtersets.py:1586 +#: netbox/dcim/forms/filtersets.py:1591 netbox/dcim/forms/model_forms.py:1762 +#: netbox/dcim/models/devices.py:1499 netbox/dcim/models/devices.py:1520 +#: netbox/virtualization/filtersets.py:196 +#: netbox/virtualization/filtersets.py:268 +#: netbox/virtualization/forms/filtersets.py:177 +#: netbox/virtualization/forms/filtersets.py:228 msgid "MAC address" msgstr "" -#: netbox/dcim/filtersets.py:1110 netbox/dcim/filtersets.py:1274 -#: netbox/dcim/forms/filtersets.py:827 netbox/dcim/forms/filtersets.py:930 -#: netbox/virtualization/filtersets.py:234 -#: netbox/virtualization/forms/filtersets.py:176 +#: netbox/dcim/filtersets.py:1111 netbox/dcim/filtersets.py:1275 +#: netbox/dcim/forms/filtersets.py:828 netbox/dcim/forms/filtersets.py:931 +#: netbox/virtualization/filtersets.py:200 +#: netbox/virtualization/forms/filtersets.py:181 msgid "Has a primary IP" msgstr "" -#: netbox/dcim/filtersets.py:1114 +#: netbox/dcim/filtersets.py:1115 msgid "Has an out-of-band IP" msgstr "" -#: netbox/dcim/filtersets.py:1119 +#: netbox/dcim/filtersets.py:1120 msgid "Virtual chassis (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1123 +#: netbox/dcim/filtersets.py:1124 msgid "Is a virtual chassis member" msgstr "" -#: netbox/dcim/filtersets.py:1164 +#: netbox/dcim/filtersets.py:1165 msgid "OOB IP (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1168 +#: netbox/dcim/filtersets.py:1169 msgid "Has virtual device context" msgstr "" -#: netbox/dcim/filtersets.py:1257 +#: netbox/dcim/filtersets.py:1258 msgid "VDC (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1262 +#: netbox/dcim/filtersets.py:1263 msgid "Device model" msgstr "" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 -#: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 -msgid "Interface (ID)" -msgstr "" - -#: netbox/dcim/filtersets.py:1323 +#: netbox/dcim/filtersets.py:1324 msgid "Module type (model)" msgstr "" -#: netbox/dcim/filtersets.py:1329 +#: netbox/dcim/filtersets.py:1330 msgid "Module bay (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 -#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 -#: netbox/vpn/filtersets.py:379 +#: netbox/dcim/filtersets.py:1334 netbox/dcim/filtersets.py:1426 +#: netbox/dcim/filtersets.py:1612 netbox/ipam/filtersets.py:580 +#: netbox/ipam/filtersets.py:820 netbox/ipam/filtersets.py:1142 +#: netbox/virtualization/filtersets.py:127 netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1421 +#: netbox/dcim/filtersets.py:1422 msgid "Rack (name)" msgstr "" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 -#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 -#: netbox/vpn/filtersets.py:374 +#: netbox/dcim/filtersets.py:1432 netbox/dcim/filtersets.py:1607 +#: netbox/ipam/filtersets.py:575 netbox/ipam/filtersets.py:815 +#: netbox/ipam/filtersets.py:1148 netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "" -#: netbox/dcim/filtersets.py:1442 +#: netbox/dcim/filtersets.py:1443 msgid "Device type (model)" msgstr "" -#: netbox/dcim/filtersets.py:1447 +#: netbox/dcim/filtersets.py:1448 msgid "Device role (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1453 +#: netbox/dcim/filtersets.py:1454 msgid "Device role (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1458 +#: netbox/dcim/filtersets.py:1459 msgid "Virtual Chassis (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1464 netbox/dcim/forms/filtersets.py:109 -#: netbox/dcim/tables/devices.py:206 netbox/netbox/navigation/menu.py:79 +#: netbox/dcim/filtersets.py:1465 netbox/dcim/forms/filtersets.py:110 +#: netbox/dcim/tables/devices.py:216 netbox/netbox/navigation/menu.py:79 #: netbox/templates/dcim/device.html:120 #: netbox/templates/dcim/device_edit.html:93 #: netbox/templates/dcim/virtualchassis.html:20 @@ -3211,167 +3626,229 @@ msgstr "" msgid "Virtual Chassis" msgstr "" -#: netbox/dcim/filtersets.py:1488 +#: netbox/dcim/filtersets.py:1489 msgid "Module (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1495 +#: netbox/dcim/filtersets.py:1496 msgid "Cable (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1604 netbox/ipam/forms/bulk_import.py:189 +#: netbox/dcim/filtersets.py:1617 netbox/ipam/filtersets.py:585 +#: netbox/ipam/filtersets.py:825 netbox/ipam/filtersets.py:1158 +#: netbox/vpn/filtersets.py:385 +msgid "Virtual machine (name)" +msgstr "" + +#: netbox/dcim/filtersets.py:1622 netbox/ipam/filtersets.py:590 +#: netbox/ipam/filtersets.py:830 netbox/ipam/filtersets.py:1152 +#: netbox/virtualization/filtersets.py:248 +#: netbox/virtualization/filtersets.py:299 netbox/vpn/filtersets.py:390 +msgid "Virtual machine (ID)" +msgstr "" + +#: netbox/dcim/filtersets.py:1628 netbox/ipam/filtersets.py:596 +#: netbox/vpn/filtersets.py:97 netbox/vpn/filtersets.py:396 +msgid "Interface (name)" +msgstr "" + +#: netbox/dcim/filtersets.py:1639 netbox/ipam/filtersets.py:607 +#: netbox/vpn/filtersets.py:108 netbox/vpn/filtersets.py:407 +msgid "VM interface (name)" +msgstr "" + +#: netbox/dcim/filtersets.py:1644 netbox/ipam/filtersets.py:612 +#: netbox/vpn/filtersets.py:113 +msgid "VM interface (ID)" +msgstr "" + +#: netbox/dcim/filtersets.py:1686 netbox/ipam/forms/bulk_import.py:185 #: netbox/vpn/forms/bulk_import.py:308 msgid "Assigned VLAN" msgstr "" -#: netbox/dcim/filtersets.py:1608 +#: netbox/dcim/filtersets.py:1690 msgid "Assigned VID" msgstr "" -#: netbox/dcim/filtersets.py:1613 netbox/dcim/forms/bulk_edit.py:1531 -#: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 -#: netbox/dcim/forms/model_forms.py:1385 -#: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 -#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 -#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 -#: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 -#: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 -#: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 -#: netbox/ipam/forms/filtersets.py:67 netbox/ipam/forms/filtersets.py:172 -#: netbox/ipam/forms/filtersets.py:309 netbox/ipam/forms/model_forms.py:62 -#: netbox/ipam/forms/model_forms.py:202 netbox/ipam/forms/model_forms.py:247 -#: netbox/ipam/forms/model_forms.py:300 netbox/ipam/forms/model_forms.py:464 -#: netbox/ipam/forms/model_forms.py:478 netbox/ipam/forms/model_forms.py:492 -#: netbox/ipam/models/ip.py:233 netbox/ipam/models/ip.py:512 -#: netbox/ipam/models/ip.py:720 netbox/ipam/models/vrfs.py:62 -#: netbox/ipam/tables/ip.py:242 netbox/ipam/tables/ip.py:309 -#: netbox/ipam/tables/ip.py:360 netbox/ipam/tables/ip.py:450 -#: netbox/templates/dcim/interface.html:133 +#: netbox/dcim/filtersets.py:1695 netbox/dcim/forms/bulk_edit.py:1544 +#: netbox/dcim/forms/bulk_import.py:921 netbox/dcim/forms/filtersets.py:1433 +#: netbox/dcim/forms/model_forms.py:1411 +#: netbox/dcim/models/device_components.py:749 +#: netbox/dcim/tables/devices.py:647 netbox/ipam/filtersets.py:321 +#: netbox/ipam/filtersets.py:332 netbox/ipam/filtersets.py:452 +#: netbox/ipam/filtersets.py:553 netbox/ipam/filtersets.py:564 +#: netbox/ipam/forms/bulk_edit.py:226 netbox/ipam/forms/bulk_edit.py:282 +#: netbox/ipam/forms/bulk_edit.py:324 netbox/ipam/forms/bulk_import.py:160 +#: netbox/ipam/forms/bulk_import.py:242 netbox/ipam/forms/bulk_import.py:278 +#: netbox/ipam/forms/filtersets.py:69 netbox/ipam/forms/filtersets.py:174 +#: netbox/ipam/forms/filtersets.py:312 netbox/ipam/forms/model_forms.py:65 +#: netbox/ipam/forms/model_forms.py:208 netbox/ipam/forms/model_forms.py:248 +#: netbox/ipam/forms/model_forms.py:302 netbox/ipam/forms/model_forms.py:466 +#: netbox/ipam/forms/model_forms.py:480 netbox/ipam/forms/model_forms.py:494 +#: netbox/ipam/models/ip.py:217 netbox/ipam/models/ip.py:498 +#: netbox/ipam/models/ip.py:719 netbox/ipam/models/vrfs.py:61 +#: netbox/ipam/tables/ip.py:188 netbox/ipam/tables/ip.py:259 +#: netbox/ipam/tables/ip.py:310 netbox/ipam/tables/ip.py:400 +#: netbox/templates/dcim/interface.html:152 #: netbox/templates/ipam/ipaddress.html:18 #: netbox/templates/ipam/iprange.html:40 netbox/templates/ipam/prefix.html:19 #: netbox/templates/ipam/vrf.html:7 netbox/templates/ipam/vrf.html:13 -#: netbox/templates/virtualization/vminterface.html:47 -#: netbox/virtualization/forms/bulk_edit.py:261 -#: netbox/virtualization/forms/bulk_import.py:171 -#: netbox/virtualization/forms/filtersets.py:228 -#: netbox/virtualization/forms/model_forms.py:344 -#: netbox/virtualization/models/virtualmachines.py:355 -#: netbox/virtualization/tables/virtualmachines.py:143 +#: netbox/templates/virtualization/vminterface.html:84 +#: netbox/virtualization/forms/bulk_edit.py:243 +#: netbox/virtualization/forms/bulk_import.py:177 +#: netbox/virtualization/forms/filtersets.py:233 +#: netbox/virtualization/forms/model_forms.py:360 +#: netbox/virtualization/models/virtualmachines.py:331 +#: netbox/virtualization/tables/virtualmachines.py:113 msgid "VRF" msgstr "" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 -#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 -#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 +#: netbox/dcim/filtersets.py:1701 netbox/ipam/filtersets.py:327 +#: netbox/ipam/filtersets.py:338 netbox/ipam/filtersets.py:458 +#: netbox/ipam/filtersets.py:559 netbox/ipam/filtersets.py:570 msgid "VRF (RD)" msgstr "" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 +#: netbox/dcim/filtersets.py:1706 netbox/ipam/filtersets.py:1010 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 -#: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 -#: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 +#: netbox/dcim/filtersets.py:1712 netbox/dcim/forms/filtersets.py:1438 +#: netbox/dcim/tables/devices.py:583 netbox/ipam/filtersets.py:1016 +#: netbox/ipam/forms/filtersets.py:570 netbox/ipam/tables/vlans.py:113 +#: netbox/templates/dcim/interface.html:99 netbox/templates/ipam/vlan.html:82 #: netbox/templates/vpn/l2vpntermination.html:12 -#: netbox/virtualization/forms/filtersets.py:233 +#: netbox/virtualization/forms/filtersets.py:238 #: netbox/vpn/forms/bulk_import.py:280 netbox/vpn/forms/filtersets.py:246 -#: netbox/vpn/forms/model_forms.py:409 netbox/vpn/forms/model_forms.py:427 +#: netbox/vpn/forms/model_forms.py:412 netbox/vpn/forms/model_forms.py:430 #: netbox/vpn/models/l2vpn.py:63 netbox/vpn/tables/l2vpn.py:55 msgid "L2VPN" msgstr "" -#: netbox/dcim/filtersets.py:1662 +#: netbox/dcim/filtersets.py:1717 netbox/ipam/filtersets.py:1091 +msgid "VLAN Translation Policy (ID)" +msgstr "" + +#: netbox/dcim/filtersets.py:1723 netbox/dcim/forms/model_forms.py:1428 +#: netbox/dcim/models/device_components.py:568 +#: netbox/ipam/forms/filtersets.py:489 netbox/ipam/forms/model_forms.py:704 +#: netbox/templates/ipam/vlantranslationpolicy.html:11 +#: netbox/virtualization/forms/model_forms.py:365 +msgid "VLAN Translation Policy" +msgstr "" + +#: netbox/dcim/filtersets.py:1757 msgid "Virtual Chassis Interfaces for Device" msgstr "" -#: netbox/dcim/filtersets.py:1667 +#: netbox/dcim/filtersets.py:1762 msgid "Virtual Chassis Interfaces for Device (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1671 +#: netbox/dcim/filtersets.py:1766 msgid "Kind of interface" msgstr "" -#: netbox/dcim/filtersets.py:1676 netbox/virtualization/filtersets.py:293 +#: netbox/dcim/filtersets.py:1771 netbox/virtualization/filtersets.py:259 msgid "Parent interface (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1681 netbox/virtualization/filtersets.py:298 +#: netbox/dcim/filtersets.py:1776 netbox/virtualization/filtersets.py:264 msgid "Bridged interface (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1686 +#: netbox/dcim/filtersets.py:1781 msgid "LAG interface (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1713 netbox/dcim/filtersets.py:1725 -#: netbox/dcim/forms/filtersets.py:1345 netbox/dcim/forms/model_forms.py:1697 +#: netbox/dcim/filtersets.py:1789 netbox/dcim/tables/devices.py:605 +#: netbox/dcim/tables/devices.py:1135 netbox/templates/dcim/interface.html:131 +#: netbox/templates/dcim/macaddress.html:11 +#: netbox/templates/dcim/macaddress.html:14 +#: netbox/templates/virtualization/vminterface.html:73 +msgid "MAC Address" +msgstr "" + +#: netbox/dcim/filtersets.py:1794 netbox/virtualization/filtersets.py:273 +msgid "Primary MAC address (ID)" +msgstr "" + +#: netbox/dcim/filtersets.py:1800 netbox/dcim/forms/model_forms.py:1415 +#: netbox/virtualization/filtersets.py:279 +#: netbox/virtualization/forms/model_forms.py:303 +msgid "Primary MAC address" +msgstr "" + +#: netbox/dcim/filtersets.py:1822 netbox/dcim/filtersets.py:1834 +#: netbox/dcim/forms/filtersets.py:1350 netbox/dcim/forms/model_forms.py:1742 #: netbox/templates/dcim/virtualdevicecontext.html:15 msgid "Virtual Device Context" msgstr "" -#: netbox/dcim/filtersets.py:1719 +#: netbox/dcim/filtersets.py:1828 msgid "Virtual Device Context (Identifier)" msgstr "" -#: netbox/dcim/filtersets.py:1730 netbox/templates/wireless/wirelesslan.html:11 -#: netbox/wireless/forms/model_forms.py:53 +#: netbox/dcim/filtersets.py:1839 netbox/templates/wireless/wirelesslan.html:11 +#: netbox/wireless/forms/model_forms.py:55 msgid "Wireless LAN" msgstr "" -#: netbox/dcim/filtersets.py:1734 netbox/dcim/tables/devices.py:613 +#: netbox/dcim/filtersets.py:1843 netbox/dcim/tables/devices.py:634 msgid "Wireless link" msgstr "" -#: netbox/dcim/filtersets.py:1803 +#: netbox/dcim/filtersets.py:1853 +msgid "Virtual circuit termination (ID)" +msgstr "" + +#: netbox/dcim/filtersets.py:1922 msgid "Parent module bay (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1808 +#: netbox/dcim/filtersets.py:1927 msgid "Installed module (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1819 +#: netbox/dcim/filtersets.py:1938 msgid "Installed device (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1825 +#: netbox/dcim/filtersets.py:1944 msgid "Installed device (name)" msgstr "" -#: netbox/dcim/filtersets.py:1891 +#: netbox/dcim/filtersets.py:2014 msgid "Master (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1897 +#: netbox/dcim/filtersets.py:2020 msgid "Master (name)" msgstr "" -#: netbox/dcim/filtersets.py:1939 netbox/tenancy/filtersets.py:245 +#: netbox/dcim/filtersets.py:2062 netbox/tenancy/filtersets.py:245 msgid "Tenant (ID)" msgstr "" -#: netbox/dcim/filtersets.py:1945 netbox/extras/filtersets.py:618 +#: netbox/dcim/filtersets.py:2068 netbox/extras/filtersets.py:618 #: netbox/tenancy/filtersets.py:251 msgid "Tenant (slug)" msgstr "" -#: netbox/dcim/filtersets.py:1981 netbox/dcim/forms/filtersets.py:1077 +#: netbox/dcim/filtersets.py:2104 netbox/dcim/forms/filtersets.py:1078 msgid "Unterminated" msgstr "" -#: netbox/dcim/filtersets.py:2239 +#: netbox/dcim/filtersets.py:2362 msgid "Power panel (ID)" msgstr "" #: netbox/dcim/forms/bulk_create.py:40 netbox/extras/forms/filtersets.py:401 #: netbox/extras/forms/model_forms.py:567 #: netbox/extras/forms/model_forms.py:619 netbox/netbox/forms/base.py:86 -#: netbox/netbox/forms/mixins.py:81 netbox/netbox/tables/columns.py:478 +#: netbox/netbox/forms/mixins.py:81 netbox/netbox/tables/columns.py:481 #: netbox/templates/circuits/inc/circuit_termination.html:32 #: netbox/templates/generic/bulk_edit.html:65 #: netbox/templates/inc/panels/tags.html:5 @@ -3379,11 +3856,11 @@ msgstr "" msgid "Tags" msgstr "" -#: netbox/dcim/forms/bulk_create.py:112 netbox/dcim/forms/filtersets.py:1498 -#: netbox/dcim/forms/model_forms.py:488 netbox/dcim/forms/model_forms.py:546 +#: netbox/dcim/forms/bulk_create.py:112 netbox/dcim/forms/filtersets.py:1503 +#: netbox/dcim/forms/model_forms.py:498 netbox/dcim/forms/model_forms.py:557 #: netbox/dcim/forms/object_create.py:197 -#: netbox/dcim/forms/object_create.py:345 netbox/dcim/tables/devices.py:165 -#: netbox/dcim/tables/devices.py:707 netbox/dcim/tables/devicetypes.py:246 +#: netbox/dcim/forms/object_create.py:345 netbox/dcim/tables/devices.py:175 +#: netbox/dcim/tables/devices.py:740 netbox/dcim/tables/devicetypes.py:248 #: netbox/templates/dcim/device.html:43 netbox/templates/dcim/device.html:131 #: netbox/templates/dcim/modulebay.html:38 #: netbox/templates/dcim/virtualchassis.html:66 @@ -3397,44 +3874,44 @@ msgid "" "created.)" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:133 +#: netbox/dcim/forms/bulk_edit.py:136 msgid "Contact name" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:138 +#: netbox/dcim/forms/bulk_edit.py:141 msgid "Contact phone" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:144 +#: netbox/dcim/forms/bulk_edit.py:147 msgid "Contact E-mail" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:147 netbox/dcim/forms/bulk_import.py:123 -#: netbox/dcim/forms/model_forms.py:128 +#: netbox/dcim/forms/bulk_edit.py:150 netbox/dcim/forms/bulk_import.py:125 +#: netbox/dcim/forms/model_forms.py:132 msgid "Time zone" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:225 netbox/dcim/forms/bulk_edit.py:501 -#: netbox/dcim/forms/bulk_edit.py:565 netbox/dcim/forms/bulk_edit.py:638 -#: netbox/dcim/forms/bulk_edit.py:662 netbox/dcim/forms/bulk_edit.py:755 -#: netbox/dcim/forms/bulk_edit.py:1282 netbox/dcim/forms/bulk_edit.py:1703 -#: netbox/dcim/forms/bulk_import.py:182 netbox/dcim/forms/bulk_import.py:393 -#: netbox/dcim/forms/bulk_import.py:427 netbox/dcim/forms/bulk_import.py:472 -#: netbox/dcim/forms/bulk_import.py:508 netbox/dcim/forms/bulk_import.py:1104 -#: netbox/dcim/forms/filtersets.py:313 netbox/dcim/forms/filtersets.py:372 -#: netbox/dcim/forms/filtersets.py:494 netbox/dcim/forms/filtersets.py:619 -#: netbox/dcim/forms/filtersets.py:700 netbox/dcim/forms/filtersets.py:782 -#: netbox/dcim/forms/filtersets.py:947 netbox/dcim/forms/filtersets.py:1539 -#: netbox/dcim/forms/model_forms.py:207 netbox/dcim/forms/model_forms.py:337 -#: netbox/dcim/forms/model_forms.py:349 netbox/dcim/forms/model_forms.py:395 -#: netbox/dcim/forms/model_forms.py:436 netbox/dcim/forms/model_forms.py:1082 -#: netbox/dcim/forms/model_forms.py:1522 netbox/dcim/forms/object_import.py:187 -#: netbox/dcim/tables/devices.py:96 netbox/dcim/tables/devices.py:172 -#: netbox/dcim/tables/devices.py:940 netbox/dcim/tables/devicetypes.py:80 -#: netbox/dcim/tables/devicetypes.py:308 netbox/dcim/tables/modules.py:20 +#: netbox/dcim/forms/bulk_edit.py:228 netbox/dcim/forms/bulk_edit.py:504 +#: netbox/dcim/forms/bulk_edit.py:568 netbox/dcim/forms/bulk_edit.py:641 +#: netbox/dcim/forms/bulk_edit.py:665 netbox/dcim/forms/bulk_edit.py:758 +#: netbox/dcim/forms/bulk_edit.py:1285 netbox/dcim/forms/bulk_edit.py:1716 +#: netbox/dcim/forms/bulk_import.py:184 netbox/dcim/forms/bulk_import.py:395 +#: netbox/dcim/forms/bulk_import.py:429 netbox/dcim/forms/bulk_import.py:477 +#: netbox/dcim/forms/bulk_import.py:513 netbox/dcim/forms/bulk_import.py:1112 +#: netbox/dcim/forms/filtersets.py:314 netbox/dcim/forms/filtersets.py:373 +#: netbox/dcim/forms/filtersets.py:495 netbox/dcim/forms/filtersets.py:620 +#: netbox/dcim/forms/filtersets.py:701 netbox/dcim/forms/filtersets.py:783 +#: netbox/dcim/forms/filtersets.py:948 netbox/dcim/forms/filtersets.py:1544 +#: netbox/dcim/forms/model_forms.py:211 netbox/dcim/forms/model_forms.py:345 +#: netbox/dcim/forms/model_forms.py:357 netbox/dcim/forms/model_forms.py:404 +#: netbox/dcim/forms/model_forms.py:445 netbox/dcim/forms/model_forms.py:1095 +#: netbox/dcim/forms/model_forms.py:1564 netbox/dcim/forms/object_import.py:188 +#: netbox/dcim/tables/devices.py:107 netbox/dcim/tables/devices.py:182 +#: netbox/dcim/tables/devices.py:969 netbox/dcim/tables/devicetypes.py:80 +#: netbox/dcim/tables/devicetypes.py:310 netbox/dcim/tables/modules.py:20 #: netbox/dcim/tables/modules.py:61 netbox/dcim/tables/racks.py:58 -#: netbox/dcim/tables/racks.py:132 netbox/templates/dcim/devicetype.html:14 -#: netbox/templates/dcim/inventoryitem.html:44 +#: netbox/dcim/tables/racks.py:131 netbox/templates/dcim/devicetype.html:14 +#: netbox/templates/dcim/inventoryitem.html:48 #: netbox/templates/dcim/manufacturer.html:33 #: netbox/templates/dcim/modulebay.html:62 #: netbox/templates/dcim/moduletype.html:25 @@ -3443,64 +3920,64 @@ msgstr "" msgid "Manufacturer" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:230 netbox/dcim/forms/bulk_edit.py:378 -#: netbox/dcim/forms/bulk_import.py:191 netbox/dcim/forms/bulk_import.py:270 -#: netbox/dcim/forms/filtersets.py:255 +#: netbox/dcim/forms/bulk_edit.py:233 netbox/dcim/forms/bulk_edit.py:381 +#: netbox/dcim/forms/bulk_import.py:193 netbox/dcim/forms/bulk_import.py:272 +#: netbox/dcim/forms/filtersets.py:256 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:6 msgid "Form factor" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:235 netbox/dcim/forms/bulk_edit.py:383 -#: netbox/dcim/forms/bulk_import.py:199 netbox/dcim/forms/bulk_import.py:273 -#: netbox/dcim/forms/filtersets.py:260 +#: netbox/dcim/forms/bulk_edit.py:238 netbox/dcim/forms/bulk_edit.py:386 +#: netbox/dcim/forms/bulk_import.py:201 netbox/dcim/forms/bulk_import.py:275 +#: netbox/dcim/forms/filtersets.py:261 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:10 msgid "Width" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:241 netbox/dcim/forms/bulk_edit.py:389 -#: netbox/dcim/forms/bulk_import.py:280 +#: netbox/dcim/forms/bulk_edit.py:244 netbox/dcim/forms/bulk_edit.py:392 +#: netbox/dcim/forms/bulk_import.py:282 #: netbox/templates/dcim/devicetype.html:37 msgid "Height (U)" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:250 netbox/dcim/forms/bulk_edit.py:394 -#: netbox/dcim/forms/filtersets.py:274 +#: netbox/dcim/forms/bulk_edit.py:253 netbox/dcim/forms/bulk_edit.py:397 +#: netbox/dcim/forms/filtersets.py:275 msgid "Descending units" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:253 netbox/dcim/forms/bulk_edit.py:397 +#: netbox/dcim/forms/bulk_edit.py:256 netbox/dcim/forms/bulk_edit.py:400 msgid "Outer width" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:258 netbox/dcim/forms/bulk_edit.py:402 +#: netbox/dcim/forms/bulk_edit.py:261 netbox/dcim/forms/bulk_edit.py:405 msgid "Outer depth" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:263 netbox/dcim/forms/bulk_edit.py:407 -#: netbox/dcim/forms/bulk_import.py:204 netbox/dcim/forms/bulk_import.py:283 +#: netbox/dcim/forms/bulk_edit.py:266 netbox/dcim/forms/bulk_edit.py:410 +#: netbox/dcim/forms/bulk_import.py:206 netbox/dcim/forms/bulk_import.py:285 msgid "Outer unit" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:268 netbox/dcim/forms/bulk_edit.py:412 +#: netbox/dcim/forms/bulk_edit.py:271 netbox/dcim/forms/bulk_edit.py:415 msgid "Mounting depth" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:273 netbox/dcim/forms/bulk_edit.py:300 -#: netbox/dcim/forms/bulk_edit.py:422 netbox/dcim/forms/bulk_edit.py:452 -#: netbox/dcim/forms/bulk_edit.py:535 netbox/dcim/forms/bulk_edit.py:558 -#: netbox/dcim/forms/bulk_edit.py:579 netbox/dcim/forms/bulk_edit.py:601 -#: netbox/dcim/forms/bulk_import.py:406 netbox/dcim/forms/bulk_import.py:438 -#: netbox/dcim/forms/filtersets.py:285 netbox/dcim/forms/filtersets.py:307 -#: netbox/dcim/forms/filtersets.py:327 netbox/dcim/forms/filtersets.py:401 -#: netbox/dcim/forms/filtersets.py:488 netbox/dcim/forms/filtersets.py:594 -#: netbox/dcim/forms/filtersets.py:613 netbox/dcim/forms/filtersets.py:674 -#: netbox/dcim/forms/model_forms.py:221 netbox/dcim/forms/model_forms.py:298 +#: netbox/dcim/forms/bulk_edit.py:276 netbox/dcim/forms/bulk_edit.py:303 +#: netbox/dcim/forms/bulk_edit.py:425 netbox/dcim/forms/bulk_edit.py:455 +#: netbox/dcim/forms/bulk_edit.py:538 netbox/dcim/forms/bulk_edit.py:561 +#: netbox/dcim/forms/bulk_edit.py:582 netbox/dcim/forms/bulk_edit.py:604 +#: netbox/dcim/forms/bulk_import.py:408 netbox/dcim/forms/bulk_import.py:440 +#: netbox/dcim/forms/filtersets.py:286 netbox/dcim/forms/filtersets.py:308 +#: netbox/dcim/forms/filtersets.py:328 netbox/dcim/forms/filtersets.py:402 +#: netbox/dcim/forms/filtersets.py:489 netbox/dcim/forms/filtersets.py:595 +#: netbox/dcim/forms/filtersets.py:614 netbox/dcim/forms/filtersets.py:675 +#: netbox/dcim/forms/model_forms.py:226 netbox/dcim/forms/model_forms.py:306 #: netbox/dcim/tables/devicetypes.py:106 netbox/dcim/tables/modules.py:35 -#: netbox/dcim/tables/racks.py:74 netbox/dcim/tables/racks.py:172 +#: netbox/dcim/tables/racks.py:74 netbox/dcim/tables/racks.py:171 #: netbox/extras/forms/bulk_edit.py:53 netbox/extras/forms/bulk_edit.py:133 #: netbox/extras/forms/bulk_edit.py:183 netbox/extras/forms/bulk_edit.py:288 #: netbox/extras/forms/filtersets.py:64 netbox/extras/forms/filtersets.py:156 -#: netbox/extras/forms/filtersets.py:243 netbox/ipam/forms/bulk_edit.py:190 +#: netbox/extras/forms/filtersets.py:243 netbox/ipam/forms/bulk_edit.py:193 #: netbox/templates/dcim/device.html:324 #: netbox/templates/dcim/devicetype.html:49 #: netbox/templates/dcim/moduletype.html:45 netbox/templates/dcim/rack.html:81 @@ -3512,341 +3989,232 @@ msgstr "" msgid "Weight" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:278 netbox/dcim/forms/bulk_edit.py:427 -#: netbox/dcim/forms/filtersets.py:290 +#: netbox/dcim/forms/bulk_edit.py:281 netbox/dcim/forms/bulk_edit.py:430 +#: netbox/dcim/forms/filtersets.py:291 msgid "Max weight" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:283 netbox/dcim/forms/bulk_edit.py:432 -#: netbox/dcim/forms/bulk_edit.py:540 netbox/dcim/forms/bulk_edit.py:584 -#: netbox/dcim/forms/bulk_import.py:210 netbox/dcim/forms/bulk_import.py:295 -#: netbox/dcim/forms/bulk_import.py:411 netbox/dcim/forms/bulk_import.py:443 -#: netbox/dcim/forms/filtersets.py:295 netbox/dcim/forms/filtersets.py:598 -#: netbox/dcim/forms/filtersets.py:678 +#: netbox/dcim/forms/bulk_edit.py:286 netbox/dcim/forms/bulk_edit.py:435 +#: netbox/dcim/forms/bulk_edit.py:543 netbox/dcim/forms/bulk_edit.py:587 +#: netbox/dcim/forms/bulk_import.py:212 netbox/dcim/forms/bulk_import.py:297 +#: netbox/dcim/forms/bulk_import.py:413 netbox/dcim/forms/bulk_import.py:445 +#: netbox/dcim/forms/filtersets.py:296 netbox/dcim/forms/filtersets.py:599 +#: netbox/dcim/forms/filtersets.py:679 msgid "Weight unit" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:297 netbox/dcim/forms/filtersets.py:305 -#: netbox/dcim/forms/model_forms.py:217 netbox/dcim/forms/model_forms.py:256 +#: netbox/dcim/forms/bulk_edit.py:300 netbox/dcim/forms/filtersets.py:306 +#: netbox/dcim/forms/model_forms.py:222 netbox/dcim/forms/model_forms.py:261 #: netbox/templates/dcim/rack.html:45 netbox/templates/dcim/racktype.html:13 msgid "Rack Type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:299 netbox/dcim/forms/model_forms.py:220 -#: netbox/dcim/forms/model_forms.py:297 +#: netbox/dcim/forms/bulk_edit.py:302 netbox/dcim/forms/model_forms.py:225 +#: netbox/dcim/forms/model_forms.py:305 msgid "Outer Dimensions" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:302 netbox/dcim/forms/model_forms.py:222 -#: netbox/dcim/forms/model_forms.py:299 netbox/templates/dcim/device.html:315 +#: netbox/dcim/forms/bulk_edit.py:305 netbox/dcim/forms/model_forms.py:227 +#: netbox/dcim/forms/model_forms.py:307 netbox/templates/dcim/device.html:315 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:3 msgid "Dimensions" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:304 netbox/dcim/forms/filtersets.py:306 -#: netbox/dcim/forms/filtersets.py:326 netbox/dcim/forms/model_forms.py:224 +#: netbox/dcim/forms/bulk_edit.py:307 netbox/dcim/forms/filtersets.py:307 +#: netbox/dcim/forms/filtersets.py:327 netbox/dcim/forms/model_forms.py:229 #: netbox/templates/dcim/inc/panels/racktype_numbering.html:3 msgid "Numbering" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:358 netbox/dcim/forms/bulk_edit.py:1277 -#: netbox/dcim/forms/bulk_edit.py:1698 netbox/dcim/forms/bulk_import.py:253 -#: netbox/dcim/forms/bulk_import.py:1098 netbox/dcim/forms/filtersets.py:367 -#: netbox/dcim/forms/filtersets.py:777 netbox/dcim/forms/filtersets.py:1534 -#: netbox/dcim/forms/model_forms.py:251 netbox/dcim/forms/model_forms.py:1077 -#: netbox/dcim/forms/model_forms.py:1517 netbox/dcim/forms/object_import.py:181 -#: netbox/dcim/tables/devices.py:169 netbox/dcim/tables/devices.py:809 -#: netbox/dcim/tables/devices.py:937 netbox/dcim/tables/devicetypes.py:304 -#: netbox/dcim/tables/racks.py:129 netbox/extras/filtersets.py:552 -#: netbox/ipam/forms/bulk_edit.py:261 netbox/ipam/forms/bulk_edit.py:311 -#: netbox/ipam/forms/bulk_edit.py:359 netbox/ipam/forms/bulk_edit.py:511 -#: netbox/ipam/forms/bulk_import.py:197 netbox/ipam/forms/bulk_import.py:262 -#: netbox/ipam/forms/bulk_import.py:298 netbox/ipam/forms/bulk_import.py:479 -#: netbox/ipam/forms/filtersets.py:237 netbox/ipam/forms/filtersets.py:289 -#: netbox/ipam/forms/filtersets.py:360 netbox/ipam/forms/filtersets.py:509 -#: netbox/ipam/forms/model_forms.py:188 netbox/ipam/forms/model_forms.py:221 -#: netbox/ipam/forms/model_forms.py:250 netbox/ipam/forms/model_forms.py:676 -#: netbox/ipam/tables/ip.py:258 netbox/ipam/tables/ip.py:316 -#: netbox/ipam/tables/ip.py:367 netbox/ipam/tables/vlans.py:130 -#: netbox/ipam/tables/vlans.py:235 netbox/templates/dcim/device.html:182 -#: netbox/templates/dcim/inc/panels/inventory_items.html:20 -#: netbox/templates/dcim/interface.html:223 -#: netbox/templates/dcim/inventoryitem.html:36 -#: netbox/templates/dcim/rack.html:49 netbox/templates/ipam/ipaddress.html:41 -#: netbox/templates/ipam/iprange.html:50 netbox/templates/ipam/prefix.html:77 -#: netbox/templates/ipam/role.html:19 netbox/templates/ipam/vlan.html:52 -#: netbox/templates/virtualization/virtualmachine.html:23 -#: netbox/templates/vpn/tunneltermination.html:17 -#: netbox/templates/wireless/inc/wirelesslink_interface.html:20 -#: netbox/tenancy/forms/bulk_edit.py:142 netbox/tenancy/forms/filtersets.py:107 -#: netbox/tenancy/forms/model_forms.py:137 -#: netbox/tenancy/tables/contacts.py:102 -#: netbox/virtualization/forms/bulk_edit.py:145 -#: netbox/virtualization/forms/bulk_import.py:106 -#: netbox/virtualization/forms/filtersets.py:157 -#: netbox/virtualization/forms/model_forms.py:195 -#: netbox/virtualization/tables/virtualmachines.py:75 -#: netbox/vpn/forms/bulk_edit.py:87 netbox/vpn/forms/bulk_import.py:81 -#: netbox/vpn/forms/filtersets.py:85 netbox/vpn/forms/model_forms.py:78 -#: netbox/vpn/forms/model_forms.py:113 netbox/vpn/tables/tunnels.py:82 -msgid "Role" -msgstr "" - -#: netbox/dcim/forms/bulk_edit.py:363 netbox/dcim/forms/bulk_import.py:260 -#: netbox/dcim/forms/filtersets.py:380 +#: netbox/dcim/forms/bulk_edit.py:366 netbox/dcim/forms/bulk_import.py:262 +#: netbox/dcim/forms/filtersets.py:381 msgid "Rack type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:370 netbox/dcim/forms/bulk_edit.py:718 -#: netbox/dcim/forms/bulk_edit.py:779 netbox/templates/dcim/device.html:104 +#: netbox/dcim/forms/bulk_edit.py:373 netbox/dcim/forms/bulk_edit.py:721 +#: netbox/dcim/forms/bulk_edit.py:782 netbox/templates/dcim/device.html:104 #: netbox/templates/dcim/module.html:77 netbox/templates/dcim/modulebay.html:70 #: netbox/templates/dcim/rack.html:57 #: netbox/templates/virtualization/virtualmachine.html:35 msgid "Serial Number" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:373 netbox/dcim/forms/filtersets.py:387 -#: netbox/dcim/forms/filtersets.py:813 netbox/dcim/forms/filtersets.py:967 -#: netbox/dcim/forms/filtersets.py:1546 +#: netbox/dcim/forms/bulk_edit.py:376 netbox/dcim/forms/filtersets.py:388 +#: netbox/dcim/forms/filtersets.py:814 netbox/dcim/forms/filtersets.py:968 +#: netbox/dcim/forms/filtersets.py:1551 msgid "Asset tag" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:417 netbox/dcim/forms/bulk_edit.py:530 -#: netbox/dcim/forms/bulk_edit.py:574 netbox/dcim/forms/bulk_edit.py:711 -#: netbox/dcim/forms/bulk_import.py:289 netbox/dcim/forms/bulk_import.py:432 -#: netbox/dcim/forms/bulk_import.py:602 netbox/dcim/forms/filtersets.py:280 -#: netbox/dcim/forms/filtersets.py:511 netbox/dcim/forms/filtersets.py:669 -#: netbox/dcim/forms/filtersets.py:804 netbox/templates/dcim/device.html:98 +#: netbox/dcim/forms/bulk_edit.py:420 netbox/dcim/forms/bulk_edit.py:533 +#: netbox/dcim/forms/bulk_edit.py:577 netbox/dcim/forms/bulk_edit.py:714 +#: netbox/dcim/forms/bulk_import.py:291 netbox/dcim/forms/bulk_import.py:434 +#: netbox/dcim/forms/bulk_import.py:607 netbox/dcim/forms/filtersets.py:281 +#: netbox/dcim/forms/filtersets.py:512 netbox/dcim/forms/filtersets.py:670 +#: netbox/dcim/forms/filtersets.py:805 netbox/templates/dcim/device.html:98 #: netbox/templates/dcim/devicetype.html:65 #: netbox/templates/dcim/moduletype.html:41 netbox/templates/dcim/rack.html:65 #: netbox/templates/dcim/racktype.html:28 msgid "Airflow" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:446 netbox/dcim/forms/bulk_edit.py:925 -#: netbox/dcim/forms/bulk_import.py:344 netbox/dcim/forms/bulk_import.py:347 -#: netbox/dcim/forms/bulk_import.py:575 netbox/dcim/forms/bulk_import.py:1380 -#: netbox/dcim/forms/bulk_import.py:1384 netbox/dcim/forms/filtersets.py:104 -#: netbox/dcim/forms/filtersets.py:324 netbox/dcim/forms/filtersets.py:405 -#: netbox/dcim/forms/filtersets.py:419 netbox/dcim/forms/filtersets.py:457 -#: netbox/dcim/forms/filtersets.py:772 netbox/dcim/forms/filtersets.py:1035 -#: netbox/dcim/forms/filtersets.py:1167 netbox/dcim/forms/model_forms.py:264 -#: netbox/dcim/forms/model_forms.py:306 netbox/dcim/forms/model_forms.py:479 -#: netbox/dcim/forms/model_forms.py:755 netbox/dcim/forms/object_create.py:392 -#: netbox/dcim/tables/devices.py:161 netbox/dcim/tables/power.py:70 -#: netbox/dcim/tables/racks.py:217 netbox/ipam/forms/filtersets.py:442 +#: netbox/dcim/forms/bulk_edit.py:449 netbox/dcim/forms/bulk_edit.py:928 +#: netbox/dcim/forms/bulk_import.py:346 netbox/dcim/forms/bulk_import.py:349 +#: netbox/dcim/forms/bulk_import.py:580 netbox/dcim/forms/bulk_import.py:1477 +#: netbox/dcim/forms/bulk_import.py:1481 netbox/dcim/forms/filtersets.py:105 +#: netbox/dcim/forms/filtersets.py:325 netbox/dcim/forms/filtersets.py:406 +#: netbox/dcim/forms/filtersets.py:420 netbox/dcim/forms/filtersets.py:458 +#: netbox/dcim/forms/filtersets.py:773 netbox/dcim/forms/filtersets.py:1036 +#: netbox/dcim/forms/filtersets.py:1168 netbox/dcim/forms/model_forms.py:271 +#: netbox/dcim/forms/model_forms.py:314 netbox/dcim/forms/model_forms.py:489 +#: netbox/dcim/forms/model_forms.py:767 netbox/dcim/forms/object_create.py:392 +#: netbox/dcim/tables/devices.py:171 netbox/dcim/tables/power.py:70 +#: netbox/dcim/tables/racks.py:216 netbox/ipam/forms/filtersets.py:445 #: netbox/templates/dcim/device.html:30 #: netbox/templates/dcim/inc/cable_termination.html:16 #: netbox/templates/dcim/powerfeed.html:28 netbox/templates/dcim/rack.html:13 #: netbox/templates/dcim/rack/base.html:4 #: netbox/templates/dcim/rackreservation.html:19 #: netbox/templates/dcim/rackreservation.html:36 -#: netbox/virtualization/forms/model_forms.py:113 +#: netbox/virtualization/forms/model_forms.py:112 msgid "Rack" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:450 netbox/dcim/forms/bulk_edit.py:744 -#: netbox/dcim/forms/filtersets.py:325 netbox/dcim/forms/filtersets.py:398 -#: netbox/dcim/forms/filtersets.py:481 netbox/dcim/forms/filtersets.py:608 -#: netbox/dcim/forms/filtersets.py:721 netbox/dcim/forms/filtersets.py:942 -#: netbox/dcim/forms/model_forms.py:670 netbox/dcim/forms/model_forms.py:1587 +#: netbox/dcim/forms/bulk_edit.py:453 netbox/dcim/forms/bulk_edit.py:747 +#: netbox/dcim/forms/filtersets.py:326 netbox/dcim/forms/filtersets.py:399 +#: netbox/dcim/forms/filtersets.py:482 netbox/dcim/forms/filtersets.py:609 +#: netbox/dcim/forms/filtersets.py:722 netbox/dcim/forms/filtersets.py:943 +#: netbox/dcim/forms/model_forms.py:681 netbox/dcim/forms/model_forms.py:1632 #: netbox/templates/dcim/device_edit.html:20 msgid "Hardware" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:506 netbox/dcim/forms/bulk_import.py:399 -#: netbox/dcim/forms/filtersets.py:499 netbox/dcim/forms/model_forms.py:353 +#: netbox/dcim/forms/bulk_edit.py:509 netbox/dcim/forms/bulk_import.py:401 +#: netbox/dcim/forms/filtersets.py:500 netbox/dcim/forms/model_forms.py:362 msgid "Default platform" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:511 netbox/dcim/forms/bulk_edit.py:570 -#: netbox/dcim/forms/filtersets.py:502 netbox/dcim/forms/filtersets.py:622 +#: netbox/dcim/forms/bulk_edit.py:514 netbox/dcim/forms/bulk_edit.py:573 +#: netbox/dcim/forms/filtersets.py:503 netbox/dcim/forms/filtersets.py:623 msgid "Part number" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:515 +#: netbox/dcim/forms/bulk_edit.py:518 msgid "U height" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:527 netbox/dcim/tables/devicetypes.py:102 +#: netbox/dcim/forms/bulk_edit.py:530 netbox/dcim/tables/devicetypes.py:102 msgid "Exclude from utilization" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:556 netbox/dcim/forms/model_forms.py:368 +#: netbox/dcim/forms/bulk_edit.py:559 netbox/dcim/forms/model_forms.py:377 #: netbox/dcim/tables/devicetypes.py:77 netbox/templates/dcim/device.html:88 #: netbox/templates/dcim/devicebay.html:52 netbox/templates/dcim/module.html:61 msgid "Device Type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 +#: netbox/dcim/forms/bulk_edit.py:601 netbox/dcim/forms/model_forms.py:410 #: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 msgid "Module Type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:602 netbox/dcim/forms/model_forms.py:371 -#: netbox/dcim/forms/model_forms.py:402 +#: netbox/dcim/forms/bulk_edit.py:605 netbox/dcim/forms/model_forms.py:380 +#: netbox/dcim/forms/model_forms.py:411 #: netbox/templates/dcim/devicetype.html:11 msgid "Chassis" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:616 netbox/dcim/models/devices.py:484 -#: netbox/dcim/tables/devices.py:67 +#: netbox/dcim/forms/bulk_edit.py:619 netbox/dcim/models/devices.py:482 +#: netbox/dcim/tables/devices.py:78 msgid "VM role" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:619 netbox/dcim/forms/bulk_edit.py:643 -#: netbox/dcim/forms/bulk_edit.py:726 netbox/dcim/forms/bulk_import.py:456 -#: netbox/dcim/forms/bulk_import.py:460 netbox/dcim/forms/bulk_import.py:479 -#: netbox/dcim/forms/bulk_import.py:483 netbox/dcim/forms/bulk_import.py:608 -#: netbox/dcim/forms/bulk_import.py:612 netbox/dcim/forms/filtersets.py:689 -#: netbox/dcim/forms/filtersets.py:705 netbox/dcim/forms/filtersets.py:823 -#: netbox/dcim/forms/model_forms.py:415 netbox/dcim/forms/model_forms.py:441 -#: netbox/dcim/forms/model_forms.py:555 -#: netbox/virtualization/forms/bulk_import.py:132 -#: netbox/virtualization/forms/bulk_import.py:133 -#: netbox/virtualization/forms/filtersets.py:188 -#: netbox/virtualization/forms/model_forms.py:215 +#: netbox/dcim/forms/bulk_edit.py:622 netbox/dcim/forms/bulk_edit.py:646 +#: netbox/dcim/forms/bulk_edit.py:729 netbox/dcim/forms/bulk_import.py:461 +#: netbox/dcim/forms/bulk_import.py:465 netbox/dcim/forms/bulk_import.py:484 +#: netbox/dcim/forms/bulk_import.py:488 netbox/dcim/forms/bulk_import.py:613 +#: netbox/dcim/forms/bulk_import.py:617 netbox/dcim/forms/filtersets.py:690 +#: netbox/dcim/forms/filtersets.py:706 netbox/dcim/forms/filtersets.py:824 +#: netbox/dcim/forms/model_forms.py:424 netbox/dcim/forms/model_forms.py:451 +#: netbox/dcim/forms/model_forms.py:566 +#: netbox/virtualization/forms/bulk_import.py:138 +#: netbox/virtualization/forms/bulk_import.py:139 +#: netbox/virtualization/forms/filtersets.py:193 +#: netbox/virtualization/forms/model_forms.py:214 msgid "Config template" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:667 netbox/dcim/forms/bulk_edit.py:1076 -#: netbox/dcim/forms/bulk_import.py:514 netbox/dcim/forms/filtersets.py:114 -#: netbox/dcim/forms/model_forms.py:501 netbox/dcim/forms/model_forms.py:872 -#: netbox/dcim/forms/model_forms.py:889 netbox/extras/filtersets.py:547 +#: netbox/dcim/forms/bulk_edit.py:670 netbox/dcim/forms/bulk_edit.py:1079 +#: netbox/dcim/forms/bulk_import.py:519 netbox/dcim/forms/filtersets.py:115 +#: netbox/dcim/forms/model_forms.py:511 netbox/dcim/forms/model_forms.py:884 +#: netbox/dcim/forms/model_forms.py:901 netbox/extras/filtersets.py:547 msgid "Device type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:678 netbox/dcim/forms/bulk_import.py:495 -#: netbox/dcim/forms/filtersets.py:119 netbox/dcim/forms/model_forms.py:509 +#: netbox/dcim/forms/bulk_edit.py:681 netbox/dcim/forms/bulk_import.py:500 +#: netbox/dcim/forms/filtersets.py:120 netbox/dcim/forms/model_forms.py:519 msgid "Device role" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:701 netbox/dcim/forms/bulk_import.py:520 -#: netbox/dcim/forms/filtersets.py:796 netbox/dcim/forms/model_forms.py:451 -#: netbox/dcim/forms/model_forms.py:513 netbox/dcim/tables/devices.py:182 +#: netbox/dcim/forms/bulk_edit.py:704 netbox/dcim/forms/bulk_import.py:525 +#: netbox/dcim/forms/filtersets.py:797 netbox/dcim/forms/model_forms.py:461 +#: netbox/dcim/forms/model_forms.py:524 netbox/dcim/tables/devices.py:192 #: netbox/extras/filtersets.py:563 netbox/templates/dcim/device.html:186 #: netbox/templates/dcim/platform.html:26 #: netbox/templates/virtualization/virtualmachine.html:27 -#: netbox/virtualization/forms/bulk_edit.py:160 -#: netbox/virtualization/forms/bulk_import.py:122 -#: netbox/virtualization/forms/filtersets.py:168 -#: netbox/virtualization/forms/model_forms.py:203 -#: netbox/virtualization/tables/virtualmachines.py:79 +#: netbox/virtualization/forms/bulk_edit.py:142 +#: netbox/virtualization/forms/bulk_import.py:128 +#: netbox/virtualization/forms/filtersets.py:173 +#: netbox/virtualization/forms/model_forms.py:202 +#: netbox/virtualization/tables/virtualmachines.py:49 msgid "Platform" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:731 netbox/dcim/forms/bulk_import.py:539 -#: netbox/dcim/forms/filtersets.py:728 netbox/dcim/forms/filtersets.py:898 -#: netbox/dcim/forms/model_forms.py:522 netbox/dcim/tables/devices.py:202 +#: netbox/dcim/forms/bulk_edit.py:734 netbox/dcim/forms/bulk_import.py:544 +#: netbox/dcim/forms/filtersets.py:729 netbox/dcim/forms/filtersets.py:899 +#: netbox/dcim/forms/model_forms.py:533 netbox/dcim/tables/devices.py:212 #: netbox/extras/filtersets.py:596 netbox/extras/forms/filtersets.py:322 -#: netbox/ipam/forms/filtersets.py:415 netbox/ipam/forms/filtersets.py:447 +#: netbox/ipam/forms/filtersets.py:418 netbox/ipam/forms/filtersets.py:450 #: netbox/templates/dcim/device.html:239 #: netbox/templates/virtualization/cluster.html:10 #: netbox/templates/virtualization/virtualmachine.html:92 #: netbox/templates/virtualization/virtualmachine.html:101 -#: netbox/virtualization/filtersets.py:157 -#: netbox/virtualization/filtersets.py:277 -#: netbox/virtualization/forms/bulk_edit.py:129 -#: netbox/virtualization/forms/bulk_import.py:92 -#: netbox/virtualization/forms/filtersets.py:99 -#: netbox/virtualization/forms/filtersets.py:123 -#: netbox/virtualization/forms/filtersets.py:204 -#: netbox/virtualization/forms/model_forms.py:79 -#: netbox/virtualization/forms/model_forms.py:176 -#: netbox/virtualization/tables/virtualmachines.py:67 +#: netbox/virtualization/filtersets.py:123 +#: netbox/virtualization/filtersets.py:243 +#: netbox/virtualization/forms/bulk_edit.py:111 +#: netbox/virtualization/forms/bulk_import.py:98 +#: netbox/virtualization/forms/filtersets.py:104 +#: netbox/virtualization/forms/filtersets.py:128 +#: netbox/virtualization/forms/filtersets.py:209 +#: netbox/virtualization/forms/model_forms.py:77 +#: netbox/virtualization/forms/model_forms.py:175 +#: netbox/virtualization/tables/virtualmachines.py:37 msgid "Cluster" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:742 netbox/dcim/forms/bulk_edit.py:1296 -#: netbox/dcim/forms/bulk_edit.py:1693 netbox/dcim/forms/bulk_edit.py:1739 -#: netbox/dcim/forms/bulk_import.py:663 netbox/dcim/forms/bulk_import.py:725 -#: netbox/dcim/forms/bulk_import.py:751 netbox/dcim/forms/bulk_import.py:777 -#: netbox/dcim/forms/bulk_import.py:797 netbox/dcim/forms/bulk_import.py:850 -#: netbox/dcim/forms/bulk_import.py:968 netbox/dcim/forms/bulk_import.py:1016 -#: netbox/dcim/forms/bulk_import.py:1033 netbox/dcim/forms/bulk_import.py:1045 -#: netbox/dcim/forms/bulk_import.py:1093 netbox/dcim/forms/bulk_import.py:1444 -#: netbox/dcim/forms/connections.py:24 netbox/dcim/forms/filtersets.py:131 -#: netbox/dcim/forms/filtersets.py:921 netbox/dcim/forms/filtersets.py:1051 -#: netbox/dcim/forms/filtersets.py:1242 netbox/dcim/forms/filtersets.py:1267 -#: netbox/dcim/forms/filtersets.py:1291 netbox/dcim/forms/filtersets.py:1311 -#: netbox/dcim/forms/filtersets.py:1334 netbox/dcim/forms/filtersets.py:1444 -#: netbox/dcim/forms/filtersets.py:1469 netbox/dcim/forms/filtersets.py:1493 -#: netbox/dcim/forms/filtersets.py:1511 netbox/dcim/forms/filtersets.py:1528 -#: netbox/dcim/forms/filtersets.py:1592 netbox/dcim/forms/filtersets.py:1616 -#: netbox/dcim/forms/filtersets.py:1640 netbox/dcim/forms/model_forms.py:633 -#: netbox/dcim/forms/model_forms.py:849 netbox/dcim/forms/model_forms.py:1215 -#: netbox/dcim/forms/model_forms.py:1671 netbox/dcim/forms/object_create.py:249 -#: netbox/dcim/tables/connections.py:22 netbox/dcim/tables/connections.py:41 -#: netbox/dcim/tables/connections.py:60 netbox/dcim/tables/devices.py:285 -#: netbox/dcim/tables/devices.py:371 netbox/dcim/tables/devices.py:412 -#: netbox/dcim/tables/devices.py:454 netbox/dcim/tables/devices.py:505 -#: netbox/dcim/tables/devices.py:597 netbox/dcim/tables/devices.py:697 -#: netbox/dcim/tables/devices.py:754 netbox/dcim/tables/devices.py:801 -#: netbox/dcim/tables/devices.py:861 netbox/dcim/tables/devices.py:930 -#: netbox/dcim/tables/devices.py:1057 netbox/dcim/tables/modules.py:53 -#: netbox/extras/forms/filtersets.py:321 netbox/ipam/forms/bulk_import.py:304 -#: netbox/ipam/forms/bulk_import.py:505 netbox/ipam/forms/filtersets.py:551 -#: netbox/ipam/forms/model_forms.py:323 netbox/ipam/forms/model_forms.py:712 -#: netbox/ipam/forms/model_forms.py:745 netbox/ipam/forms/model_forms.py:771 -#: netbox/ipam/tables/vlans.py:180 netbox/templates/dcim/consoleport.html:20 -#: netbox/templates/dcim/consoleserverport.html:20 -#: netbox/templates/dcim/device.html:15 netbox/templates/dcim/device.html:130 -#: netbox/templates/dcim/device_edit.html:10 -#: netbox/templates/dcim/devicebay.html:20 -#: netbox/templates/dcim/devicebay.html:48 -#: netbox/templates/dcim/frontport.html:20 -#: netbox/templates/dcim/interface.html:30 -#: netbox/templates/dcim/interface.html:161 -#: netbox/templates/dcim/inventoryitem.html:20 -#: netbox/templates/dcim/module.html:57 netbox/templates/dcim/modulebay.html:20 -#: netbox/templates/dcim/poweroutlet.html:20 -#: netbox/templates/dcim/powerport.html:20 -#: netbox/templates/dcim/rearport.html:20 -#: netbox/templates/dcim/virtualchassis.html:65 -#: netbox/templates/dcim/virtualchassis_edit.html:51 -#: netbox/templates/dcim/virtualdevicecontext.html:22 -#: netbox/templates/virtualization/virtualmachine.html:114 -#: netbox/templates/vpn/tunneltermination.html:23 -#: netbox/templates/wireless/inc/wirelesslink_interface.html:6 -#: netbox/virtualization/filtersets.py:167 -#: netbox/virtualization/forms/bulk_edit.py:137 -#: netbox/virtualization/forms/bulk_import.py:99 -#: netbox/virtualization/forms/filtersets.py:128 -#: netbox/virtualization/forms/model_forms.py:185 -#: netbox/virtualization/tables/virtualmachines.py:71 netbox/vpn/choices.py:52 -#: netbox/vpn/forms/bulk_import.py:86 netbox/vpn/forms/bulk_import.py:283 -#: netbox/vpn/forms/filtersets.py:275 netbox/vpn/forms/model_forms.py:90 -#: netbox/vpn/forms/model_forms.py:125 netbox/vpn/forms/model_forms.py:236 -#: netbox/vpn/forms/model_forms.py:453 netbox/wireless/forms/model_forms.py:99 -#: netbox/wireless/forms/model_forms.py:141 -#: netbox/wireless/tables/wirelesslan.py:75 -msgid "Device" -msgstr "" - -#: netbox/dcim/forms/bulk_edit.py:745 +#: netbox/dcim/forms/bulk_edit.py:748 #: netbox/templates/extras/dashboard/widget_config.html:7 -#: netbox/virtualization/forms/bulk_edit.py:191 +#: netbox/virtualization/forms/bulk_edit.py:173 msgid "Configuration" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:746 netbox/netbox/navigation/menu.py:243 +#: netbox/dcim/forms/bulk_edit.py:749 netbox/netbox/navigation/menu.py:251 #: netbox/templates/dcim/device_edit.html:78 msgid "Virtualization" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:760 netbox/dcim/forms/bulk_import.py:675 -#: netbox/dcim/forms/model_forms.py:647 netbox/dcim/forms/model_forms.py:897 +#: netbox/dcim/forms/bulk_edit.py:763 netbox/dcim/forms/bulk_import.py:680 +#: netbox/dcim/forms/model_forms.py:658 netbox/dcim/forms/model_forms.py:909 msgid "Module type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:814 netbox/dcim/forms/bulk_edit.py:999 -#: netbox/dcim/forms/bulk_edit.py:1018 netbox/dcim/forms/bulk_edit.py:1041 -#: netbox/dcim/forms/bulk_edit.py:1083 netbox/dcim/forms/bulk_edit.py:1127 -#: netbox/dcim/forms/bulk_edit.py:1178 netbox/dcim/forms/bulk_edit.py:1205 -#: netbox/dcim/forms/bulk_edit.py:1232 netbox/dcim/forms/bulk_edit.py:1250 -#: netbox/dcim/forms/bulk_edit.py:1268 netbox/dcim/forms/filtersets.py:67 +#: netbox/dcim/forms/bulk_edit.py:817 netbox/dcim/forms/bulk_edit.py:1002 +#: netbox/dcim/forms/bulk_edit.py:1021 netbox/dcim/forms/bulk_edit.py:1044 +#: netbox/dcim/forms/bulk_edit.py:1086 netbox/dcim/forms/bulk_edit.py:1130 +#: netbox/dcim/forms/bulk_edit.py:1181 netbox/dcim/forms/bulk_edit.py:1208 +#: netbox/dcim/forms/bulk_edit.py:1235 netbox/dcim/forms/bulk_edit.py:1253 +#: netbox/dcim/forms/bulk_edit.py:1271 netbox/dcim/forms/filtersets.py:68 #: netbox/dcim/forms/object_create.py:46 netbox/templates/dcim/cable.html:32 #: netbox/templates/dcim/consoleport.html:32 #: netbox/templates/dcim/consoleserverport.html:32 @@ -3864,107 +4232,107 @@ msgstr "" msgid "Label" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:823 netbox/dcim/forms/filtersets.py:1068 +#: netbox/dcim/forms/bulk_edit.py:826 netbox/dcim/forms/filtersets.py:1069 #: netbox/templates/dcim/cable.html:50 msgid "Length" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:828 netbox/dcim/forms/bulk_import.py:1248 -#: netbox/dcim/forms/bulk_import.py:1251 netbox/dcim/forms/filtersets.py:1072 +#: netbox/dcim/forms/bulk_edit.py:831 netbox/dcim/forms/bulk_import.py:1345 +#: netbox/dcim/forms/bulk_import.py:1348 netbox/dcim/forms/filtersets.py:1073 msgid "Length unit" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:852 +#: netbox/dcim/forms/bulk_edit.py:855 #: netbox/templates/dcim/virtualchassis.html:23 msgid "Domain" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:920 netbox/dcim/forms/bulk_import.py:1367 -#: netbox/dcim/forms/filtersets.py:1158 netbox/dcim/forms/model_forms.py:750 +#: netbox/dcim/forms/bulk_edit.py:923 netbox/dcim/forms/bulk_import.py:1464 +#: netbox/dcim/forms/filtersets.py:1159 netbox/dcim/forms/model_forms.py:761 msgid "Power panel" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:942 netbox/dcim/forms/bulk_import.py:1403 -#: netbox/dcim/forms/filtersets.py:1180 netbox/templates/dcim/powerfeed.html:83 +#: netbox/dcim/forms/bulk_edit.py:945 netbox/dcim/forms/bulk_import.py:1500 +#: netbox/dcim/forms/filtersets.py:1181 netbox/templates/dcim/powerfeed.html:83 msgid "Supply" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:948 netbox/dcim/forms/bulk_import.py:1408 -#: netbox/dcim/forms/filtersets.py:1185 netbox/templates/dcim/powerfeed.html:95 +#: netbox/dcim/forms/bulk_edit.py:951 netbox/dcim/forms/bulk_import.py:1505 +#: netbox/dcim/forms/filtersets.py:1186 netbox/templates/dcim/powerfeed.html:95 msgid "Phase" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:954 netbox/dcim/forms/filtersets.py:1190 +#: netbox/dcim/forms/bulk_edit.py:957 netbox/dcim/forms/filtersets.py:1191 #: netbox/templates/dcim/powerfeed.html:87 msgid "Voltage" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:958 netbox/dcim/forms/filtersets.py:1194 +#: netbox/dcim/forms/bulk_edit.py:961 netbox/dcim/forms/filtersets.py:1195 #: netbox/templates/dcim/powerfeed.html:91 msgid "Amperage" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:962 netbox/dcim/forms/filtersets.py:1198 +#: netbox/dcim/forms/bulk_edit.py:965 netbox/dcim/forms/filtersets.py:1199 msgid "Max utilization" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1051 +#: netbox/dcim/forms/bulk_edit.py:1054 msgid "Maximum draw" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1054 -#: netbox/dcim/models/device_component_templates.py:282 -#: netbox/dcim/models/device_components.py:356 +#: netbox/dcim/forms/bulk_edit.py:1057 +#: netbox/dcim/models/device_component_templates.py:281 +#: netbox/dcim/models/device_components.py:349 msgid "Maximum power draw (watts)" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1057 +#: netbox/dcim/forms/bulk_edit.py:1060 msgid "Allocated draw" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1060 -#: netbox/dcim/models/device_component_templates.py:289 -#: netbox/dcim/models/device_components.py:363 +#: netbox/dcim/forms/bulk_edit.py:1063 +#: netbox/dcim/models/device_component_templates.py:288 +#: netbox/dcim/models/device_components.py:356 msgid "Allocated power draw (watts)" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1093 netbox/dcim/forms/bulk_import.py:808 -#: netbox/dcim/forms/model_forms.py:960 netbox/dcim/forms/model_forms.py:1285 -#: netbox/dcim/forms/model_forms.py:1574 netbox/dcim/forms/object_import.py:55 +#: netbox/dcim/forms/bulk_edit.py:1096 netbox/dcim/forms/bulk_import.py:813 +#: netbox/dcim/forms/model_forms.py:972 netbox/dcim/forms/model_forms.py:1301 +#: netbox/dcim/forms/model_forms.py:1616 netbox/dcim/forms/object_import.py:55 msgid "Power port" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1098 netbox/dcim/forms/bulk_import.py:815 +#: netbox/dcim/forms/bulk_edit.py:1101 netbox/dcim/forms/bulk_import.py:820 msgid "Feed leg" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1144 netbox/dcim/forms/bulk_edit.py:1462 +#: netbox/dcim/forms/bulk_edit.py:1147 netbox/dcim/forms/bulk_edit.py:1465 msgid "Management only" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1154 netbox/dcim/forms/bulk_edit.py:1468 -#: netbox/dcim/forms/bulk_import.py:898 netbox/dcim/forms/filtersets.py:1394 +#: netbox/dcim/forms/bulk_edit.py:1157 netbox/dcim/forms/bulk_edit.py:1471 +#: netbox/dcim/forms/bulk_import.py:906 netbox/dcim/forms/filtersets.py:1399 #: netbox/dcim/forms/object_import.py:90 -#: netbox/dcim/models/device_component_templates.py:437 -#: netbox/dcim/models/device_components.py:670 +#: netbox/dcim/models/device_component_templates.py:445 +#: netbox/dcim/models/device_components.py:721 msgid "PoE mode" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1160 netbox/dcim/forms/bulk_edit.py:1474 -#: netbox/dcim/forms/bulk_import.py:904 netbox/dcim/forms/filtersets.py:1399 +#: netbox/dcim/forms/bulk_edit.py:1163 netbox/dcim/forms/bulk_edit.py:1477 +#: netbox/dcim/forms/bulk_import.py:912 netbox/dcim/forms/filtersets.py:1404 #: netbox/dcim/forms/object_import.py:95 -#: netbox/dcim/models/device_component_templates.py:443 -#: netbox/dcim/models/device_components.py:676 +#: netbox/dcim/models/device_component_templates.py:452 +#: netbox/dcim/models/device_components.py:728 msgid "PoE type" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1166 netbox/dcim/forms/filtersets.py:1404 +#: netbox/dcim/forms/bulk_edit.py:1169 netbox/dcim/forms/filtersets.py:1409 #: netbox/dcim/forms/object_import.py:100 msgid "Wireless role" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1303 netbox/dcim/forms/model_forms.py:669 -#: netbox/dcim/forms/model_forms.py:1230 netbox/dcim/tables/devices.py:313 +#: netbox/dcim/forms/bulk_edit.py:1306 netbox/dcim/forms/model_forms.py:680 +#: netbox/dcim/forms/model_forms.py:1246 netbox/dcim/tables/devices.py:322 #: netbox/templates/dcim/consoleport.html:24 #: netbox/templates/dcim/consoleserverport.html:24 #: netbox/templates/dcim/frontport.html:24 @@ -3977,31 +4345,31 @@ msgstr "" msgid "Module" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1442 netbox/dcim/tables/devices.py:665 -#: netbox/templates/dcim/interface.html:110 +#: netbox/dcim/forms/bulk_edit.py:1445 netbox/dcim/tables/devices.py:698 +#: netbox/templates/dcim/interface.html:116 msgid "LAG" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1447 netbox/dcim/forms/model_forms.py:1312 +#: netbox/dcim/forms/bulk_edit.py:1450 netbox/dcim/forms/model_forms.py:1328 msgid "Virtual device contexts" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1453 netbox/dcim/forms/bulk_import.py:736 -#: netbox/dcim/forms/bulk_import.py:762 netbox/dcim/forms/filtersets.py:1252 -#: netbox/dcim/forms/filtersets.py:1277 netbox/dcim/forms/filtersets.py:1358 -#: netbox/dcim/tables/devices.py:610 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:67 +#: netbox/dcim/forms/bulk_edit.py:1456 netbox/dcim/forms/bulk_import.py:741 +#: netbox/dcim/forms/bulk_import.py:767 netbox/dcim/forms/filtersets.py:1253 +#: netbox/dcim/forms/filtersets.py:1278 netbox/dcim/forms/filtersets.py:1363 +#: netbox/dcim/tables/devices.py:631 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:62 #: netbox/templates/dcim/consoleport.html:40 #: netbox/templates/dcim/consoleserverport.html:40 msgid "Speed" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1482 netbox/dcim/forms/bulk_import.py:907 +#: netbox/dcim/forms/bulk_edit.py:1485 netbox/dcim/forms/bulk_import.py:915 #: netbox/templates/vpn/ikepolicy.html:25 #: netbox/templates/vpn/ipsecprofile.html:21 #: netbox/templates/vpn/ipsecprofile.html:48 -#: netbox/virtualization/forms/bulk_edit.py:233 -#: netbox/virtualization/forms/bulk_import.py:165 +#: netbox/virtualization/forms/bulk_edit.py:215 +#: netbox/virtualization/forms/bulk_import.py:171 #: netbox/vpn/forms/bulk_edit.py:146 netbox/vpn/forms/bulk_edit.py:232 #: netbox/vpn/forms/bulk_import.py:176 netbox/vpn/forms/bulk_import.py:234 #: netbox/vpn/forms/filtersets.py:135 netbox/vpn/forms/filtersets.py:178 @@ -4010,594 +4378,636 @@ msgstr "" msgid "Mode" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1490 netbox/dcim/forms/model_forms.py:1361 -#: netbox/ipam/forms/bulk_import.py:178 netbox/ipam/forms/filtersets.py:498 -#: netbox/ipam/models/vlans.py:84 netbox/virtualization/forms/bulk_edit.py:240 -#: netbox/virtualization/forms/model_forms.py:321 +#: netbox/dcim/forms/bulk_edit.py:1493 netbox/dcim/forms/model_forms.py:1377 +#: netbox/ipam/forms/bulk_import.py:174 netbox/ipam/forms/filtersets.py:539 +#: netbox/ipam/models/vlans.py:86 netbox/virtualization/forms/bulk_edit.py:222 +#: netbox/virtualization/forms/model_forms.py:327 msgid "VLAN group" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1499 netbox/dcim/forms/model_forms.py:1367 -#: netbox/dcim/tables/devices.py:579 -#: netbox/virtualization/forms/bulk_edit.py:248 -#: netbox/virtualization/forms/model_forms.py:326 +#: netbox/dcim/forms/bulk_edit.py:1502 netbox/dcim/forms/model_forms.py:1383 +#: netbox/dcim/tables/devices.py:592 +#: netbox/virtualization/forms/bulk_edit.py:230 +#: netbox/virtualization/forms/model_forms.py:332 msgid "Untagged VLAN" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1508 netbox/dcim/forms/model_forms.py:1376 -#: netbox/dcim/tables/devices.py:585 -#: netbox/virtualization/forms/bulk_edit.py:256 -#: netbox/virtualization/forms/model_forms.py:335 +#: netbox/dcim/forms/bulk_edit.py:1511 netbox/dcim/forms/model_forms.py:1392 +#: netbox/dcim/tables/devices.py:598 +#: netbox/virtualization/forms/bulk_edit.py:238 +#: netbox/virtualization/forms/model_forms.py:341 msgid "Tagged VLANs" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1511 +#: netbox/dcim/forms/bulk_edit.py:1514 msgid "Add tagged VLANs" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1520 +#: netbox/dcim/forms/bulk_edit.py:1523 msgid "Remove tagged VLANs" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 +#: netbox/dcim/forms/bulk_edit.py:1534 netbox/dcim/forms/model_forms.py:1401 +#: netbox/virtualization/forms/model_forms.py:350 +msgid "Q-in-Q Service VLAN" +msgstr "" + +#: netbox/dcim/forms/bulk_edit.py:1549 netbox/dcim/forms/model_forms.py:1364 msgid "Wireless LAN group" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1541 netbox/dcim/forms/model_forms.py:1353 -#: netbox/dcim/tables/devices.py:619 netbox/netbox/navigation/menu.py:146 -#: netbox/templates/dcim/interface.html:280 +#: netbox/dcim/forms/bulk_edit.py:1554 netbox/dcim/forms/model_forms.py:1369 +#: netbox/dcim/tables/devices.py:640 netbox/netbox/navigation/menu.py:152 +#: netbox/templates/dcim/interface.html:337 #: netbox/wireless/tables/wirelesslan.py:24 msgid "Wireless LANs" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1550 netbox/dcim/forms/filtersets.py:1328 -#: netbox/dcim/forms/model_forms.py:1397 netbox/ipam/forms/bulk_edit.py:286 -#: netbox/ipam/forms/bulk_edit.py:378 netbox/ipam/forms/filtersets.py:169 -#: netbox/templates/dcim/interface.html:122 -#: netbox/templates/ipam/prefix.html:95 -#: netbox/virtualization/forms/model_forms.py:349 +#: netbox/dcim/forms/bulk_edit.py:1563 netbox/dcim/forms/filtersets.py:1333 +#: netbox/dcim/forms/model_forms.py:1435 netbox/ipam/forms/bulk_edit.py:269 +#: netbox/ipam/forms/bulk_edit.py:362 netbox/ipam/forms/filtersets.py:171 +#: netbox/netbox/navigation/menu.py:108 +#: netbox/templates/dcim/interface.html:128 +#: netbox/templates/ipam/prefix.html:91 +#: netbox/templates/virtualization/vminterface.html:70 +#: netbox/virtualization/forms/model_forms.py:370 msgid "Addressing" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1551 netbox/dcim/forms/filtersets.py:720 -#: netbox/dcim/forms/model_forms.py:1398 -#: netbox/virtualization/forms/model_forms.py:350 +#: netbox/dcim/forms/bulk_edit.py:1564 netbox/dcim/forms/filtersets.py:721 +#: netbox/dcim/forms/model_forms.py:1436 +#: netbox/virtualization/forms/model_forms.py:371 msgid "Operation" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1552 netbox/dcim/forms/filtersets.py:1329 -#: netbox/dcim/forms/model_forms.py:994 netbox/dcim/forms/model_forms.py:1400 +#: netbox/dcim/forms/bulk_edit.py:1565 netbox/dcim/forms/filtersets.py:1334 +#: netbox/dcim/forms/model_forms.py:1006 netbox/dcim/forms/model_forms.py:1438 msgid "PoE" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1553 netbox/dcim/forms/model_forms.py:1399 -#: netbox/templates/dcim/interface.html:99 -#: netbox/virtualization/forms/bulk_edit.py:267 -#: netbox/virtualization/forms/model_forms.py:351 +#: netbox/dcim/forms/bulk_edit.py:1566 netbox/dcim/forms/model_forms.py:1437 +#: netbox/templates/dcim/interface.html:105 +#: netbox/virtualization/forms/bulk_edit.py:249 +#: netbox/virtualization/forms/model_forms.py:372 msgid "Related Interfaces" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1554 netbox/dcim/forms/model_forms.py:1401 -#: netbox/virtualization/forms/bulk_edit.py:268 -#: netbox/virtualization/forms/model_forms.py:352 +#: netbox/dcim/forms/bulk_edit.py:1567 netbox/dcim/forms/model_forms.py:1441 +#: netbox/virtualization/forms/bulk_edit.py:250 +#: netbox/virtualization/forms/model_forms.py:375 msgid "802.1Q Switching" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1558 +#: netbox/dcim/forms/bulk_edit.py:1571 msgid "Add/Remove" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 +#: netbox/dcim/forms/bulk_edit.py:1630 netbox/dcim/forms/bulk_edit.py:1632 msgid "Interface mode must be specified to assign VLANs" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:1624 netbox/dcim/forms/common.py:50 +#: netbox/dcim/forms/bulk_edit.py:1637 netbox/dcim/forms/common.py:51 msgid "An access interface cannot have tagged VLANs assigned." msgstr "" -#: netbox/dcim/forms/bulk_import.py:64 +#: netbox/dcim/forms/bulk_import.py:66 msgid "Name of parent region" msgstr "" -#: netbox/dcim/forms/bulk_import.py:78 +#: netbox/dcim/forms/bulk_import.py:80 msgid "Name of parent site group" msgstr "" -#: netbox/dcim/forms/bulk_import.py:97 +#: netbox/dcim/forms/bulk_import.py:99 msgid "Assigned region" msgstr "" -#: netbox/dcim/forms/bulk_import.py:104 netbox/tenancy/forms/bulk_import.py:44 +#: netbox/dcim/forms/bulk_import.py:106 netbox/tenancy/forms/bulk_import.py:44 #: netbox/tenancy/forms/bulk_import.py:85 -#: netbox/wireless/forms/bulk_import.py:40 +#: netbox/wireless/forms/bulk_import.py:42 msgid "Assigned group" msgstr "" -#: netbox/dcim/forms/bulk_import.py:123 +#: netbox/dcim/forms/bulk_import.py:125 msgid "available options" msgstr "" -#: netbox/dcim/forms/bulk_import.py:134 netbox/dcim/forms/bulk_import.py:565 -#: netbox/dcim/forms/bulk_import.py:1364 netbox/ipam/forms/bulk_import.py:175 -#: netbox/ipam/forms/bulk_import.py:457 -#: netbox/virtualization/forms/bulk_import.py:63 -#: netbox/virtualization/forms/bulk_import.py:89 +#: netbox/dcim/forms/bulk_import.py:136 netbox/dcim/forms/bulk_import.py:570 +#: netbox/dcim/forms/bulk_import.py:1461 netbox/ipam/forms/bulk_import.py:456 +#: netbox/virtualization/forms/bulk_import.py:64 +#: netbox/virtualization/forms/bulk_import.py:95 msgid "Assigned site" msgstr "" -#: netbox/dcim/forms/bulk_import.py:141 +#: netbox/dcim/forms/bulk_import.py:143 msgid "Parent location" msgstr "" -#: netbox/dcim/forms/bulk_import.py:143 +#: netbox/dcim/forms/bulk_import.py:145 msgid "Location not found." msgstr "" -#: netbox/dcim/forms/bulk_import.py:185 +#: netbox/dcim/forms/bulk_import.py:187 msgid "The manufacturer of this rack type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:196 +#: netbox/dcim/forms/bulk_import.py:198 msgid "The lowest-numbered position in the rack" msgstr "" -#: netbox/dcim/forms/bulk_import.py:201 netbox/dcim/forms/bulk_import.py:276 +#: netbox/dcim/forms/bulk_import.py:203 netbox/dcim/forms/bulk_import.py:278 msgid "Rail-to-rail width (in inches)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:207 netbox/dcim/forms/bulk_import.py:286 +#: netbox/dcim/forms/bulk_import.py:209 netbox/dcim/forms/bulk_import.py:288 msgid "Unit for outer dimensions" msgstr "" -#: netbox/dcim/forms/bulk_import.py:213 netbox/dcim/forms/bulk_import.py:298 +#: netbox/dcim/forms/bulk_import.py:215 netbox/dcim/forms/bulk_import.py:300 msgid "Unit for rack weights" msgstr "" -#: netbox/dcim/forms/bulk_import.py:245 +#: netbox/dcim/forms/bulk_import.py:247 msgid "Name of assigned tenant" msgstr "" -#: netbox/dcim/forms/bulk_import.py:257 +#: netbox/dcim/forms/bulk_import.py:259 msgid "Name of assigned role" msgstr "" -#: netbox/dcim/forms/bulk_import.py:264 +#: netbox/dcim/forms/bulk_import.py:266 msgid "Rack type model" msgstr "" -#: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 -#: netbox/dcim/forms/bulk_import.py:605 +#: netbox/dcim/forms/bulk_import.py:294 netbox/dcim/forms/bulk_import.py:437 +#: netbox/dcim/forms/bulk_import.py:610 msgid "Airflow direction" msgstr "" -#: netbox/dcim/forms/bulk_import.py:324 +#: netbox/dcim/forms/bulk_import.py:326 msgid "Width must be set if not specifying a rack type." msgstr "" -#: netbox/dcim/forms/bulk_import.py:326 +#: netbox/dcim/forms/bulk_import.py:328 msgid "U height must be set if not specifying a rack type." msgstr "" -#: netbox/dcim/forms/bulk_import.py:334 +#: netbox/dcim/forms/bulk_import.py:336 msgid "Parent site" msgstr "" -#: netbox/dcim/forms/bulk_import.py:341 netbox/dcim/forms/bulk_import.py:1377 +#: netbox/dcim/forms/bulk_import.py:343 netbox/dcim/forms/bulk_import.py:1474 msgid "Rack's location (if any)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:350 netbox/dcim/forms/model_forms.py:311 -#: netbox/dcim/tables/racks.py:222 +#: netbox/dcim/forms/bulk_import.py:352 netbox/dcim/forms/model_forms.py:319 +#: netbox/dcim/tables/racks.py:221 #: netbox/templates/dcim/rackreservation.html:12 #: netbox/templates/dcim/rackreservation.html:45 msgid "Units" msgstr "" -#: netbox/dcim/forms/bulk_import.py:353 +#: netbox/dcim/forms/bulk_import.py:355 msgid "Comma-separated list of individual unit numbers" msgstr "" -#: netbox/dcim/forms/bulk_import.py:396 +#: netbox/dcim/forms/bulk_import.py:398 msgid "The manufacturer which produces this device type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:403 +#: netbox/dcim/forms/bulk_import.py:405 msgid "The default platform for devices of this type (optional)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:408 +#: netbox/dcim/forms/bulk_import.py:410 msgid "Device weight" msgstr "" -#: netbox/dcim/forms/bulk_import.py:414 +#: netbox/dcim/forms/bulk_import.py:416 msgid "Unit for device weight" msgstr "" -#: netbox/dcim/forms/bulk_import.py:440 +#: netbox/dcim/forms/bulk_import.py:442 msgid "Module weight" msgstr "" -#: netbox/dcim/forms/bulk_import.py:446 +#: netbox/dcim/forms/bulk_import.py:448 msgid "Unit for module weight" msgstr "" -#: netbox/dcim/forms/bulk_import.py:476 +#: netbox/dcim/forms/bulk_import.py:481 msgid "Limit platform assignments to this manufacturer" msgstr "" -#: netbox/dcim/forms/bulk_import.py:498 netbox/dcim/forms/bulk_import.py:1447 +#: netbox/dcim/forms/bulk_import.py:503 netbox/dcim/forms/bulk_import.py:1544 #: netbox/tenancy/forms/bulk_import.py:106 msgid "Assigned role" msgstr "" -#: netbox/dcim/forms/bulk_import.py:511 +#: netbox/dcim/forms/bulk_import.py:516 msgid "Device type manufacturer" msgstr "" -#: netbox/dcim/forms/bulk_import.py:517 +#: netbox/dcim/forms/bulk_import.py:522 msgid "Device type model" msgstr "" -#: netbox/dcim/forms/bulk_import.py:524 -#: netbox/virtualization/forms/bulk_import.py:126 +#: netbox/dcim/forms/bulk_import.py:529 +#: netbox/virtualization/forms/bulk_import.py:132 msgid "Assigned platform" msgstr "" -#: netbox/dcim/forms/bulk_import.py:532 netbox/dcim/forms/bulk_import.py:536 -#: netbox/dcim/forms/model_forms.py:536 +#: netbox/dcim/forms/bulk_import.py:537 netbox/dcim/forms/bulk_import.py:541 +#: netbox/dcim/forms/model_forms.py:547 msgid "Virtual chassis" msgstr "" -#: netbox/dcim/forms/bulk_import.py:543 +#: netbox/dcim/forms/bulk_import.py:548 msgid "Virtualization cluster" msgstr "" -#: netbox/dcim/forms/bulk_import.py:572 +#: netbox/dcim/forms/bulk_import.py:577 msgid "Assigned location (if any)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:579 +#: netbox/dcim/forms/bulk_import.py:584 msgid "Assigned rack (if any)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:582 +#: netbox/dcim/forms/bulk_import.py:587 msgid "Face" msgstr "" -#: netbox/dcim/forms/bulk_import.py:585 +#: netbox/dcim/forms/bulk_import.py:590 msgid "Mounted rack face" msgstr "" -#: netbox/dcim/forms/bulk_import.py:592 +#: netbox/dcim/forms/bulk_import.py:597 msgid "Parent device (for child devices)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:595 +#: netbox/dcim/forms/bulk_import.py:600 msgid "Device bay" msgstr "" -#: netbox/dcim/forms/bulk_import.py:599 +#: netbox/dcim/forms/bulk_import.py:604 msgid "Device bay in which this device is installed (for child devices)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:666 +#: netbox/dcim/forms/bulk_import.py:671 msgid "The device in which this module is installed" msgstr "" -#: netbox/dcim/forms/bulk_import.py:669 netbox/dcim/forms/model_forms.py:640 +#: netbox/dcim/forms/bulk_import.py:674 netbox/dcim/forms/model_forms.py:651 msgid "Module bay" msgstr "" -#: netbox/dcim/forms/bulk_import.py:672 +#: netbox/dcim/forms/bulk_import.py:677 msgid "The module bay in which this module is installed" msgstr "" -#: netbox/dcim/forms/bulk_import.py:678 +#: netbox/dcim/forms/bulk_import.py:683 msgid "The type of module" msgstr "" -#: netbox/dcim/forms/bulk_import.py:686 netbox/dcim/forms/model_forms.py:656 +#: netbox/dcim/forms/bulk_import.py:691 netbox/dcim/forms/model_forms.py:667 msgid "Replicate components" msgstr "" -#: netbox/dcim/forms/bulk_import.py:688 +#: netbox/dcim/forms/bulk_import.py:693 msgid "" "Automatically populate components associated with this module type (enabled " "by default)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:691 netbox/dcim/forms/model_forms.py:662 +#: netbox/dcim/forms/bulk_import.py:696 netbox/dcim/forms/model_forms.py:673 msgid "Adopt components" msgstr "" -#: netbox/dcim/forms/bulk_import.py:693 netbox/dcim/forms/model_forms.py:665 +#: netbox/dcim/forms/bulk_import.py:698 netbox/dcim/forms/model_forms.py:676 msgid "Adopt already existing components" msgstr "" -#: netbox/dcim/forms/bulk_import.py:733 netbox/dcim/forms/bulk_import.py:759 -#: netbox/dcim/forms/bulk_import.py:785 +#: netbox/dcim/forms/bulk_import.py:738 netbox/dcim/forms/bulk_import.py:764 +#: netbox/dcim/forms/bulk_import.py:790 msgid "Port type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:741 netbox/dcim/forms/bulk_import.py:767 +#: netbox/dcim/forms/bulk_import.py:746 netbox/dcim/forms/bulk_import.py:772 msgid "Port speed in bps" msgstr "" -#: netbox/dcim/forms/bulk_import.py:805 +#: netbox/dcim/forms/bulk_import.py:810 msgid "Outlet type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:812 +#: netbox/dcim/forms/bulk_import.py:817 msgid "Local power port which feeds this outlet" msgstr "" -#: netbox/dcim/forms/bulk_import.py:818 +#: netbox/dcim/forms/bulk_import.py:823 msgid "Electrical phase (for three-phase circuits)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:859 netbox/dcim/forms/model_forms.py:1323 -#: netbox/virtualization/forms/bulk_import.py:155 -#: netbox/virtualization/forms/model_forms.py:305 +#: netbox/dcim/forms/bulk_import.py:867 netbox/dcim/forms/model_forms.py:1339 +#: netbox/virtualization/forms/bulk_import.py:161 +#: netbox/virtualization/forms/model_forms.py:311 msgid "Parent interface" msgstr "" -#: netbox/dcim/forms/bulk_import.py:866 netbox/dcim/forms/model_forms.py:1331 -#: netbox/virtualization/forms/bulk_import.py:162 -#: netbox/virtualization/forms/model_forms.py:313 +#: netbox/dcim/forms/bulk_import.py:874 netbox/dcim/forms/model_forms.py:1347 +#: netbox/virtualization/forms/bulk_import.py:168 +#: netbox/virtualization/forms/model_forms.py:319 msgid "Bridged interface" msgstr "" -#: netbox/dcim/forms/bulk_import.py:869 +#: netbox/dcim/forms/bulk_import.py:877 msgid "Lag" msgstr "" -#: netbox/dcim/forms/bulk_import.py:873 +#: netbox/dcim/forms/bulk_import.py:881 msgid "Parent LAG interface" msgstr "" -#: netbox/dcim/forms/bulk_import.py:876 +#: netbox/dcim/forms/bulk_import.py:884 msgid "Vdcs" msgstr "" -#: netbox/dcim/forms/bulk_import.py:881 +#: netbox/dcim/forms/bulk_import.py:889 msgid "VDC names separated by commas, encased with double quotes. Example:" msgstr "" -#: netbox/dcim/forms/bulk_import.py:887 +#: netbox/dcim/forms/bulk_import.py:895 msgid "Physical medium" msgstr "" -#: netbox/dcim/forms/bulk_import.py:890 netbox/dcim/forms/filtersets.py:1365 +#: netbox/dcim/forms/bulk_import.py:898 netbox/dcim/forms/filtersets.py:1370 msgid "Duplex" msgstr "" -#: netbox/dcim/forms/bulk_import.py:895 +#: netbox/dcim/forms/bulk_import.py:903 msgid "Poe mode" msgstr "" -#: netbox/dcim/forms/bulk_import.py:901 +#: netbox/dcim/forms/bulk_import.py:909 msgid "Poe type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:910 -#: netbox/virtualization/forms/bulk_import.py:168 +#: netbox/dcim/forms/bulk_import.py:918 +#: netbox/virtualization/forms/bulk_import.py:174 msgid "IEEE 802.1Q operational mode (for L2 interfaces)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:917 netbox/ipam/forms/bulk_import.py:161 -#: netbox/ipam/forms/bulk_import.py:247 netbox/ipam/forms/bulk_import.py:283 -#: netbox/ipam/forms/filtersets.py:201 netbox/ipam/forms/filtersets.py:277 -#: netbox/ipam/forms/filtersets.py:336 -#: netbox/virtualization/forms/bulk_import.py:175 +#: netbox/dcim/forms/bulk_import.py:925 netbox/ipam/forms/bulk_import.py:164 +#: netbox/ipam/forms/bulk_import.py:246 netbox/ipam/forms/bulk_import.py:282 +#: netbox/ipam/forms/filtersets.py:203 netbox/ipam/forms/filtersets.py:280 +#: netbox/ipam/forms/filtersets.py:339 +#: netbox/virtualization/forms/bulk_import.py:181 msgid "Assigned VRF" msgstr "" -#: netbox/dcim/forms/bulk_import.py:920 +#: netbox/dcim/forms/bulk_import.py:928 msgid "Rf role" msgstr "" -#: netbox/dcim/forms/bulk_import.py:923 +#: netbox/dcim/forms/bulk_import.py:931 msgid "Wireless role (AP/station)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:959 +#: netbox/dcim/forms/bulk_import.py:967 #, python-brace-format msgid "VDC {vdc} is not assigned to device {device}" msgstr "" -#: netbox/dcim/forms/bulk_import.py:973 netbox/dcim/forms/model_forms.py:1007 -#: netbox/dcim/forms/model_forms.py:1582 netbox/dcim/forms/object_import.py:117 +#: netbox/dcim/forms/bulk_import.py:981 netbox/dcim/forms/model_forms.py:1020 +#: netbox/dcim/forms/model_forms.py:1624 netbox/dcim/forms/object_import.py:117 msgid "Rear port" msgstr "" -#: netbox/dcim/forms/bulk_import.py:976 +#: netbox/dcim/forms/bulk_import.py:984 msgid "Corresponding rear port" msgstr "" -#: netbox/dcim/forms/bulk_import.py:981 netbox/dcim/forms/bulk_import.py:1022 -#: netbox/dcim/forms/bulk_import.py:1238 +#: netbox/dcim/forms/bulk_import.py:989 netbox/dcim/forms/bulk_import.py:1030 +#: netbox/dcim/forms/bulk_import.py:1335 msgid "Physical medium classification" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1050 netbox/dcim/tables/devices.py:822 +#: netbox/dcim/forms/bulk_import.py:1058 netbox/dcim/tables/devices.py:853 msgid "Installed device" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1054 +#: netbox/dcim/forms/bulk_import.py:1062 msgid "Child device installed within this bay" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1056 +#: netbox/dcim/forms/bulk_import.py:1064 msgid "Child device not found." msgstr "" -#: netbox/dcim/forms/bulk_import.py:1114 +#: netbox/dcim/forms/bulk_import.py:1122 msgid "Parent inventory item" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1117 +#: netbox/dcim/forms/bulk_import.py:1125 msgid "Component type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1121 +#: netbox/dcim/forms/bulk_import.py:1129 msgid "Component Type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1124 +#: netbox/dcim/forms/bulk_import.py:1132 msgid "Compnent name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1126 +#: netbox/dcim/forms/bulk_import.py:1134 msgid "Component Name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1168 +#: netbox/dcim/forms/bulk_import.py:1181 #, python-brace-format msgid "Component not found: {device} - {component_name}" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1193 +#: netbox/dcim/forms/bulk_import.py:1209 netbox/ipam/forms/bulk_import.py:307 +msgid "Parent device of assigned interface (if any)" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1212 netbox/ipam/forms/bulk_import.py:310 +#: netbox/ipam/forms/bulk_import.py:547 netbox/ipam/forms/model_forms.py:760 +#: netbox/virtualization/filtersets.py:254 +#: netbox/virtualization/filtersets.py:305 +#: netbox/virtualization/forms/bulk_edit.py:182 +#: netbox/virtualization/forms/bulk_edit.py:308 +#: netbox/virtualization/forms/bulk_import.py:152 +#: netbox/virtualization/forms/bulk_import.py:213 +#: netbox/virtualization/forms/filtersets.py:217 +#: netbox/virtualization/forms/filtersets.py:253 +#: netbox/virtualization/forms/model_forms.py:287 +#: netbox/vpn/forms/bulk_import.py:93 netbox/vpn/forms/bulk_import.py:290 +msgid "Virtual machine" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1216 netbox/ipam/forms/bulk_import.py:314 +msgid "Parent VM of assigned interface (if any)" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1223 netbox/ipam/filtersets.py:1021 +#: netbox/ipam/forms/bulk_import.py:321 +msgid "Assigned interface" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1226 netbox/ipam/forms/bulk_import.py:324 +msgid "Is primary" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1227 +msgid "Make this the primary MAC address for the assigned interface" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1264 +msgid "Must specify the parent device or VM when assigning an interface" +msgstr "" + +#: netbox/dcim/forms/bulk_import.py:1290 msgid "Side A device" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1196 netbox/dcim/forms/bulk_import.py:1214 +#: netbox/dcim/forms/bulk_import.py:1293 netbox/dcim/forms/bulk_import.py:1311 msgid "Device name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1199 +#: netbox/dcim/forms/bulk_import.py:1296 msgid "Side A type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1202 netbox/dcim/forms/bulk_import.py:1220 -msgid "Termination type" -msgstr "" - -#: netbox/dcim/forms/bulk_import.py:1205 +#: netbox/dcim/forms/bulk_import.py:1302 msgid "Side A name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1206 netbox/dcim/forms/bulk_import.py:1224 +#: netbox/dcim/forms/bulk_import.py:1303 netbox/dcim/forms/bulk_import.py:1321 msgid "Termination name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1211 +#: netbox/dcim/forms/bulk_import.py:1308 msgid "Side B device" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1217 +#: netbox/dcim/forms/bulk_import.py:1314 msgid "Side B type" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1223 +#: netbox/dcim/forms/bulk_import.py:1320 msgid "Side B name" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1232 -#: netbox/wireless/forms/bulk_import.py:86 +#: netbox/dcim/forms/bulk_import.py:1329 +#: netbox/wireless/forms/bulk_import.py:91 msgid "Connection status" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1284 +#: netbox/dcim/forms/bulk_import.py:1381 #, python-brace-format msgid "Side {side_upper}: {device} {termination_object} is already connected" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1290 +#: netbox/dcim/forms/bulk_import.py:1387 #, python-brace-format msgid "{side_upper} side termination not found: {device} {name}" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1315 netbox/dcim/forms/model_forms.py:785 -#: netbox/dcim/tables/devices.py:1027 netbox/templates/dcim/device.html:132 +#: netbox/dcim/forms/bulk_import.py:1412 netbox/dcim/forms/model_forms.py:797 +#: netbox/dcim/tables/devices.py:1058 netbox/templates/dcim/device.html:132 #: netbox/templates/dcim/virtualchassis.html:27 #: netbox/templates/dcim/virtualchassis.html:67 msgid "Master" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1319 +#: netbox/dcim/forms/bulk_import.py:1416 msgid "Master device" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1336 +#: netbox/dcim/forms/bulk_import.py:1433 msgid "Name of parent site" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1370 +#: netbox/dcim/forms/bulk_import.py:1467 msgid "Upstream power panel" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1400 +#: netbox/dcim/forms/bulk_import.py:1497 msgid "Primary or redundant" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1405 +#: netbox/dcim/forms/bulk_import.py:1502 msgid "Supply type (AC/DC)" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1410 +#: netbox/dcim/forms/bulk_import.py:1507 msgid "Single or three-phase" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1461 netbox/dcim/forms/model_forms.py:1677 +#: netbox/dcim/forms/bulk_import.py:1558 netbox/dcim/forms/model_forms.py:1722 #: netbox/templates/dcim/device.html:190 #: netbox/templates/dcim/virtualdevicecontext.html:30 #: netbox/templates/virtualization/virtualmachine.html:52 msgid "Primary IPv4" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1465 +#: netbox/dcim/forms/bulk_import.py:1562 msgid "IPv4 address with mask, e.g. 1.2.3.4/24" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1468 netbox/dcim/forms/model_forms.py:1686 +#: netbox/dcim/forms/bulk_import.py:1565 netbox/dcim/forms/model_forms.py:1731 #: netbox/templates/dcim/device.html:206 #: netbox/templates/dcim/virtualdevicecontext.html:41 #: netbox/templates/virtualization/virtualmachine.html:68 msgid "Primary IPv6" msgstr "" -#: netbox/dcim/forms/bulk_import.py:1472 +#: netbox/dcim/forms/bulk_import.py:1569 msgid "IPv6 address with prefix length, e.g. 2001:db8::1/64" msgstr "" -#: netbox/dcim/forms/common.py:24 netbox/dcim/models/device_components.py:527 +#: netbox/dcim/forms/common.py:19 netbox/dcim/models/device_components.py:515 #: netbox/templates/dcim/interface.html:57 -#: netbox/templates/virtualization/vminterface.html:55 -#: netbox/virtualization/forms/bulk_edit.py:225 +#: netbox/templates/virtualization/vminterface.html:51 +#: netbox/virtualization/forms/bulk_edit.py:207 msgid "MTU" msgstr "" -#: netbox/dcim/forms/common.py:65 +#: netbox/dcim/forms/common.py:66 #, python-brace-format msgid "" "The tagged VLANs ({vlans}) must belong to the same site as the interface's " "parent device/VM, or they must be global" msgstr "" -#: netbox/dcim/forms/common.py:126 +#: netbox/dcim/forms/common.py:127 msgid "" "Cannot install module with placeholder values in a module bay with no " "position defined." msgstr "" -#: netbox/dcim/forms/common.py:131 +#: netbox/dcim/forms/common.py:133 #, python-brace-format msgid "" "Cannot install module with placeholder values in a module bay tree {level} " "in tree but {tokens} placeholders given." msgstr "" -#: netbox/dcim/forms/common.py:144 +#: netbox/dcim/forms/common.py:148 #, python-brace-format msgid "Cannot adopt {model} {name} as it already belongs to a module" msgstr "" -#: netbox/dcim/forms/common.py:153 +#: netbox/dcim/forms/common.py:157 #, python-brace-format msgid "A {model} named {name} already exists" msgstr "" -#: netbox/dcim/forms/connections.py:49 netbox/dcim/forms/model_forms.py:738 +#: netbox/dcim/forms/connections.py:49 netbox/dcim/forms/model_forms.py:749 #: netbox/dcim/tables/power.py:66 #: netbox/templates/dcim/inc/cable_termination.html:37 #: netbox/templates/dcim/powerfeed.html:24 @@ -4606,135 +5016,133 @@ msgstr "" msgid "Power Panel" msgstr "" -#: netbox/dcim/forms/connections.py:58 netbox/dcim/forms/model_forms.py:765 +#: netbox/dcim/forms/connections.py:58 netbox/dcim/forms/model_forms.py:777 #: netbox/templates/dcim/powerfeed.html:21 #: netbox/templates/dcim/powerport.html:80 msgid "Power Feed" msgstr "" -#: netbox/dcim/forms/connections.py:81 -msgid "Side" -msgstr "" - -#: netbox/dcim/forms/filtersets.py:136 netbox/dcim/tables/devices.py:295 +#: netbox/dcim/forms/filtersets.py:137 netbox/dcim/tables/devices.py:304 msgid "Device Status" msgstr "" -#: netbox/dcim/forms/filtersets.py:149 +#: netbox/dcim/forms/filtersets.py:150 msgid "Parent region" msgstr "" -#: netbox/dcim/forms/filtersets.py:163 netbox/tenancy/forms/bulk_import.py:28 +#: netbox/dcim/forms/filtersets.py:164 netbox/tenancy/forms/bulk_import.py:28 #: netbox/tenancy/forms/bulk_import.py:62 netbox/tenancy/forms/filtersets.py:33 #: netbox/tenancy/forms/filtersets.py:62 -#: netbox/wireless/forms/bulk_import.py:25 -#: netbox/wireless/forms/filtersets.py:25 +#: netbox/wireless/forms/bulk_import.py:27 +#: netbox/wireless/forms/filtersets.py:27 msgid "Parent group" msgstr "" -#: netbox/dcim/forms/filtersets.py:242 netbox/templates/dcim/location.html:58 +#: netbox/dcim/forms/filtersets.py:243 netbox/templates/dcim/location.html:58 #: netbox/templates/dcim/site.html:56 msgid "Facility" msgstr "" -#: netbox/dcim/forms/filtersets.py:397 +#: netbox/dcim/forms/filtersets.py:398 msgid "Function" msgstr "" -#: netbox/dcim/forms/filtersets.py:483 netbox/dcim/forms/model_forms.py:373 +#: netbox/dcim/forms/filtersets.py:484 netbox/dcim/forms/model_forms.py:382 #: netbox/templates/inc/panels/image_attachments.html:6 msgid "Images" msgstr "" -#: netbox/dcim/forms/filtersets.py:486 netbox/dcim/forms/filtersets.py:611 -#: netbox/dcim/forms/filtersets.py:726 +#: netbox/dcim/forms/filtersets.py:487 netbox/dcim/forms/filtersets.py:612 +#: netbox/dcim/forms/filtersets.py:727 msgid "Components" msgstr "" -#: netbox/dcim/forms/filtersets.py:506 +#: netbox/dcim/forms/filtersets.py:507 msgid "Subdevice role" msgstr "" -#: netbox/dcim/forms/filtersets.py:790 netbox/dcim/tables/racks.py:54 +#: netbox/dcim/forms/filtersets.py:791 netbox/dcim/tables/racks.py:54 #: netbox/templates/dcim/racktype.html:20 msgid "Model" msgstr "" -#: netbox/dcim/forms/filtersets.py:834 +#: netbox/dcim/forms/filtersets.py:835 msgid "Has an OOB IP" msgstr "" -#: netbox/dcim/forms/filtersets.py:841 +#: netbox/dcim/forms/filtersets.py:842 msgid "Virtual chassis member" msgstr "" -#: netbox/dcim/forms/filtersets.py:890 +#: netbox/dcim/forms/filtersets.py:891 msgid "Has virtual device contexts" msgstr "" -#: netbox/dcim/forms/filtersets.py:903 netbox/extras/filtersets.py:585 -#: netbox/ipam/forms/filtersets.py:452 -#: netbox/virtualization/forms/filtersets.py:112 +#: netbox/dcim/forms/filtersets.py:904 netbox/extras/filtersets.py:585 +#: netbox/ipam/forms/filtersets.py:455 +#: netbox/virtualization/forms/filtersets.py:117 msgid "Cluster group" msgstr "" -#: netbox/dcim/forms/filtersets.py:1210 +#: netbox/dcim/forms/filtersets.py:1211 msgid "Cabled" msgstr "" -#: netbox/dcim/forms/filtersets.py:1217 +#: netbox/dcim/forms/filtersets.py:1218 msgid "Occupied" msgstr "" -#: netbox/dcim/forms/filtersets.py:1244 netbox/dcim/forms/filtersets.py:1269 -#: netbox/dcim/forms/filtersets.py:1293 netbox/dcim/forms/filtersets.py:1313 -#: netbox/dcim/forms/filtersets.py:1336 netbox/dcim/tables/devices.py:364 +#: netbox/dcim/forms/filtersets.py:1245 netbox/dcim/forms/filtersets.py:1270 +#: netbox/dcim/forms/filtersets.py:1294 netbox/dcim/forms/filtersets.py:1314 +#: netbox/dcim/forms/filtersets.py:1341 netbox/dcim/tables/devices.py:373 +#: netbox/dcim/tables/devices.py:662 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:16 #: netbox/templates/dcim/consoleport.html:55 #: netbox/templates/dcim/consoleserverport.html:55 #: netbox/templates/dcim/frontport.html:69 -#: netbox/templates/dcim/interface.html:140 +#: netbox/templates/dcim/interface.html:197 #: netbox/templates/dcim/powerfeed.html:110 -#: netbox/templates/dcim/poweroutlet.html:59 +#: netbox/templates/dcim/poweroutlet.html:69 #: netbox/templates/dcim/powerport.html:59 #: netbox/templates/dcim/rearport.html:65 msgid "Connection" msgstr "" -#: netbox/dcim/forms/filtersets.py:1348 netbox/extras/forms/bulk_edit.py:326 +#: netbox/dcim/forms/filtersets.py:1353 netbox/extras/forms/bulk_edit.py:326 #: netbox/extras/forms/bulk_import.py:247 netbox/extras/forms/filtersets.py:464 #: netbox/extras/forms/model_forms.py:675 netbox/extras/tables/tables.py:579 #: netbox/templates/extras/journalentry.html:30 msgid "Kind" msgstr "" -#: netbox/dcim/forms/filtersets.py:1377 +#: netbox/dcim/forms/filtersets.py:1382 msgid "Mgmt only" msgstr "" -#: netbox/dcim/forms/filtersets.py:1389 netbox/dcim/forms/model_forms.py:1390 -#: netbox/dcim/models/device_components.py:629 -#: netbox/templates/dcim/interface.html:129 +#: netbox/dcim/forms/filtersets.py:1394 netbox/dcim/forms/model_forms.py:1423 +#: netbox/dcim/models/device_components.py:677 +#: netbox/templates/dcim/interface.html:142 msgid "WWN" msgstr "" -#: netbox/dcim/forms/filtersets.py:1409 +#: netbox/dcim/forms/filtersets.py:1414 msgid "Wireless channel" msgstr "" -#: netbox/dcim/forms/filtersets.py:1413 +#: netbox/dcim/forms/filtersets.py:1418 msgid "Channel frequency (MHz)" msgstr "" -#: netbox/dcim/forms/filtersets.py:1417 +#: netbox/dcim/forms/filtersets.py:1422 msgid "Channel width (MHz)" msgstr "" -#: netbox/dcim/forms/filtersets.py:1421 netbox/templates/dcim/interface.html:85 +#: netbox/dcim/forms/filtersets.py:1426 netbox/templates/dcim/interface.html:91 msgid "Transmit power (dBm)" msgstr "" -#: netbox/dcim/forms/filtersets.py:1446 netbox/dcim/forms/filtersets.py:1471 -#: netbox/dcim/tables/devices.py:327 netbox/templates/dcim/cable.html:12 +#: netbox/dcim/forms/filtersets.py:1451 netbox/dcim/forms/filtersets.py:1476 +#: netbox/dcim/tables/devices.py:336 netbox/templates/dcim/cable.html:12 #: netbox/templates/dcim/cable_trace.html:46 #: netbox/templates/dcim/frontport.html:77 #: netbox/templates/dcim/htmx/cable_edit.html:50 @@ -4744,73 +5152,109 @@ msgstr "" msgid "Cable" msgstr "" -#: netbox/dcim/forms/filtersets.py:1550 netbox/dcim/tables/devices.py:949 +#: netbox/dcim/forms/filtersets.py:1555 netbox/dcim/tables/devices.py:978 msgid "Discovered" msgstr "" +#: netbox/dcim/forms/filtersets.py:1596 netbox/ipam/forms/filtersets.py:350 +msgid "Assigned Device" +msgstr "" + +#: netbox/dcim/forms/filtersets.py:1601 netbox/ipam/forms/filtersets.py:355 +msgid "Assigned VM" +msgstr "" + #: netbox/dcim/forms/formsets.py:20 #, python-brace-format msgid "A virtual chassis member already exists in position {vc_position}." msgstr "" -#: netbox/dcim/forms/model_forms.py:140 +#: netbox/dcim/forms/mixins.py:27 netbox/dcim/forms/mixins.py:75 +#: netbox/ipam/forms/bulk_edit.py:420 netbox/ipam/forms/model_forms.py:610 +msgid "Scope type" +msgstr "" + +#: netbox/dcim/forms/mixins.py:30 netbox/dcim/forms/mixins.py:78 +#: netbox/ipam/forms/bulk_edit.py:270 netbox/ipam/forms/bulk_edit.py:423 +#: netbox/ipam/forms/bulk_edit.py:437 netbox/ipam/forms/filtersets.py:175 +#: netbox/ipam/forms/model_forms.py:231 netbox/ipam/forms/model_forms.py:613 +#: netbox/ipam/forms/model_forms.py:623 netbox/ipam/tables/ip.py:194 +#: netbox/ipam/tables/vlans.py:40 netbox/templates/ipam/prefix.html:48 +#: netbox/templates/ipam/vlangroup.html:38 +#: netbox/templates/virtualization/cluster.html:42 +#: netbox/templates/wireless/wirelesslan.html:26 +#: netbox/virtualization/forms/bulk_edit.py:91 +#: netbox/virtualization/forms/filtersets.py:46 +#: netbox/virtualization/forms/model_forms.py:78 +#: netbox/virtualization/tables/clusters.py:80 +#: netbox/wireless/forms/bulk_edit.py:93 netbox/wireless/forms/filtersets.py:37 +#: netbox/wireless/forms/model_forms.py:56 +#: netbox/wireless/tables/wirelesslan.py:58 +msgid "Scope" +msgstr "" + +#: netbox/dcim/forms/mixins.py:104 netbox/ipam/forms/bulk_import.py:436 +msgid "Scope type (app & model)" +msgstr "" + +#: netbox/dcim/forms/model_forms.py:144 msgid "Contact Info" msgstr "" -#: netbox/dcim/forms/model_forms.py:195 netbox/templates/dcim/rackrole.html:19 +#: netbox/dcim/forms/model_forms.py:199 netbox/templates/dcim/rackrole.html:19 msgid "Rack Role" msgstr "" -#: netbox/dcim/forms/model_forms.py:212 netbox/dcim/forms/model_forms.py:362 -#: netbox/dcim/forms/model_forms.py:446 +#: netbox/dcim/forms/model_forms.py:217 netbox/dcim/forms/model_forms.py:371 +#: netbox/dcim/forms/model_forms.py:456 #: netbox/utilities/forms/fields/fields.py:47 msgid "Slug" msgstr "" -#: netbox/dcim/forms/model_forms.py:259 +#: netbox/dcim/forms/model_forms.py:264 msgid "Select a pre-defined rack type, or set physical characteristics below." msgstr "" -#: netbox/dcim/forms/model_forms.py:265 +#: netbox/dcim/forms/model_forms.py:273 msgid "Inventory Control" msgstr "" -#: netbox/dcim/forms/model_forms.py:313 +#: netbox/dcim/forms/model_forms.py:321 msgid "" "Comma-separated list of numeric unit IDs. A range may be specified using a " "hyphen." msgstr "" -#: netbox/dcim/forms/model_forms.py:322 netbox/dcim/tables/racks.py:202 +#: netbox/dcim/forms/model_forms.py:330 netbox/dcim/tables/racks.py:201 msgid "Reservation" msgstr "" -#: netbox/dcim/forms/model_forms.py:423 +#: netbox/dcim/forms/model_forms.py:432 #: netbox/templates/dcim/devicerole.html:23 msgid "Device Role" msgstr "" -#: netbox/dcim/forms/model_forms.py:490 netbox/dcim/models/devices.py:644 +#: netbox/dcim/forms/model_forms.py:500 netbox/dcim/models/devices.py:634 msgid "The lowest-numbered unit occupied by the device" msgstr "" -#: netbox/dcim/forms/model_forms.py:547 +#: netbox/dcim/forms/model_forms.py:558 msgid "The position in the virtual chassis this device is identified by" msgstr "" -#: netbox/dcim/forms/model_forms.py:552 +#: netbox/dcim/forms/model_forms.py:563 msgid "The priority of the device in the virtual chassis" msgstr "" -#: netbox/dcim/forms/model_forms.py:659 +#: netbox/dcim/forms/model_forms.py:670 msgid "Automatically populate components associated with this module type" msgstr "" -#: netbox/dcim/forms/model_forms.py:767 +#: netbox/dcim/forms/model_forms.py:779 msgid "Characteristics" msgstr "" -#: netbox/dcim/forms/model_forms.py:914 +#: netbox/dcim/forms/model_forms.py:926 #, python-brace-format msgid "" "Alphanumeric ranges are supported for bulk creation. Mixed cases and types " @@ -4819,59 +5263,35 @@ msgid "" "replaced with the position value when creating a new module." msgstr "" -#: netbox/dcim/forms/model_forms.py:1094 +#: netbox/dcim/forms/model_forms.py:1107 msgid "Console port template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1102 +#: netbox/dcim/forms/model_forms.py:1115 msgid "Console server port template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1110 +#: netbox/dcim/forms/model_forms.py:1123 msgid "Front port template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1118 +#: netbox/dcim/forms/model_forms.py:1131 msgid "Interface template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1126 +#: netbox/dcim/forms/model_forms.py:1139 msgid "Power outlet template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1134 +#: netbox/dcim/forms/model_forms.py:1147 msgid "Power port template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1142 +#: netbox/dcim/forms/model_forms.py:1155 msgid "Rear port template" msgstr "" -#: netbox/dcim/forms/model_forms.py:1151 netbox/dcim/forms/model_forms.py:1395 -#: netbox/dcim/forms/model_forms.py:1558 netbox/dcim/forms/model_forms.py:1590 -#: netbox/dcim/tables/connections.py:65 netbox/ipam/forms/bulk_import.py:318 -#: netbox/ipam/forms/model_forms.py:280 netbox/ipam/forms/model_forms.py:289 -#: netbox/ipam/tables/fhrp.py:64 netbox/ipam/tables/ip.py:372 -#: netbox/ipam/tables/vlans.py:169 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:51 -#: netbox/templates/dcim/frontport.html:106 -#: netbox/templates/dcim/interface.html:27 -#: netbox/templates/dcim/interface.html:184 -#: netbox/templates/dcim/interface.html:310 -#: netbox/templates/dcim/rearport.html:102 -#: netbox/templates/virtualization/vminterface.html:18 -#: netbox/templates/vpn/tunneltermination.html:31 -#: netbox/templates/wireless/inc/wirelesslink_interface.html:10 -#: netbox/templates/wireless/wirelesslink.html:10 -#: netbox/templates/wireless/wirelesslink.html:55 -#: netbox/virtualization/forms/model_forms.py:348 -#: netbox/vpn/forms/bulk_import.py:297 netbox/vpn/forms/model_forms.py:436 -#: netbox/vpn/forms/model_forms.py:445 netbox/wireless/forms/model_forms.py:113 -#: netbox/wireless/forms/model_forms.py:155 -msgid "Interface" -msgstr "" - -#: netbox/dcim/forms/model_forms.py:1152 netbox/dcim/forms/model_forms.py:1591 +#: netbox/dcim/forms/model_forms.py:1165 netbox/dcim/forms/model_forms.py:1636 #: netbox/dcim/tables/connections.py:27 #: netbox/templates/dcim/consoleport.html:17 #: netbox/templates/dcim/consoleserverport.html:74 @@ -4879,102 +5299,128 @@ msgstr "" msgid "Console Port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1153 netbox/dcim/forms/model_forms.py:1592 +#: netbox/dcim/forms/model_forms.py:1166 netbox/dcim/forms/model_forms.py:1637 #: netbox/templates/dcim/consoleport.html:73 #: netbox/templates/dcim/consoleserverport.html:17 #: netbox/templates/dcim/frontport.html:109 msgid "Console Server Port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1154 netbox/dcim/forms/model_forms.py:1593 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:52 +#: netbox/dcim/forms/model_forms.py:1167 netbox/dcim/forms/model_forms.py:1638 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:53 #: netbox/templates/dcim/consoleport.html:76 #: netbox/templates/dcim/consoleserverport.html:77 #: netbox/templates/dcim/frontport.html:17 #: netbox/templates/dcim/frontport.html:115 -#: netbox/templates/dcim/interface.html:187 +#: netbox/templates/dcim/interface.html:244 #: netbox/templates/dcim/rearport.html:105 msgid "Front Port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1155 netbox/dcim/forms/model_forms.py:1594 -#: netbox/dcim/tables/devices.py:710 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:53 +#: netbox/dcim/forms/model_forms.py:1168 netbox/dcim/forms/model_forms.py:1639 +#: netbox/dcim/tables/devices.py:743 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:54 #: netbox/templates/dcim/consoleport.html:79 #: netbox/templates/dcim/consoleserverport.html:80 #: netbox/templates/dcim/frontport.html:50 #: netbox/templates/dcim/frontport.html:118 -#: netbox/templates/dcim/interface.html:190 +#: netbox/templates/dcim/interface.html:247 #: netbox/templates/dcim/rearport.html:17 #: netbox/templates/dcim/rearport.html:108 msgid "Rear Port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1156 netbox/dcim/forms/model_forms.py:1595 -#: netbox/dcim/tables/connections.py:46 netbox/dcim/tables/devices.py:512 -#: netbox/templates/dcim/poweroutlet.html:44 +#: netbox/dcim/forms/model_forms.py:1169 netbox/dcim/forms/model_forms.py:1640 +#: netbox/dcim/tables/connections.py:46 netbox/dcim/tables/devices.py:520 +#: netbox/templates/dcim/poweroutlet.html:54 #: netbox/templates/dcim/powerport.html:17 msgid "Power Port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1157 netbox/dcim/forms/model_forms.py:1596 +#: netbox/dcim/forms/model_forms.py:1170 netbox/dcim/forms/model_forms.py:1641 #: netbox/templates/dcim/poweroutlet.html:17 #: netbox/templates/dcim/powerport.html:77 msgid "Power Outlet" msgstr "" -#: netbox/dcim/forms/model_forms.py:1159 netbox/dcim/forms/model_forms.py:1598 +#: netbox/dcim/forms/model_forms.py:1172 netbox/dcim/forms/model_forms.py:1643 msgid "Component Assignment" msgstr "" -#: netbox/dcim/forms/model_forms.py:1202 netbox/dcim/forms/model_forms.py:1645 +#: netbox/dcim/forms/model_forms.py:1218 netbox/dcim/forms/model_forms.py:1690 msgid "An InventoryItem can only be assigned to a single component." msgstr "" -#: netbox/dcim/forms/model_forms.py:1339 +#: netbox/dcim/forms/model_forms.py:1355 msgid "LAG interface" msgstr "" -#: netbox/dcim/forms/model_forms.py:1362 +#: netbox/dcim/forms/model_forms.py:1378 msgid "Filter VLANs available for assignment by group." msgstr "" -#: netbox/dcim/forms/model_forms.py:1491 +#: netbox/dcim/forms/model_forms.py:1533 msgid "Child Device" msgstr "" -#: netbox/dcim/forms/model_forms.py:1492 +#: netbox/dcim/forms/model_forms.py:1534 msgid "" "Child devices must first be created and assigned to the site and rack of the " "parent device." msgstr "" -#: netbox/dcim/forms/model_forms.py:1534 +#: netbox/dcim/forms/model_forms.py:1576 msgid "Console port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1542 +#: netbox/dcim/forms/model_forms.py:1584 msgid "Console server port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1550 +#: netbox/dcim/forms/model_forms.py:1592 msgid "Front port" msgstr "" -#: netbox/dcim/forms/model_forms.py:1566 +#: netbox/dcim/forms/model_forms.py:1608 msgid "Power outlet" msgstr "" -#: netbox/dcim/forms/model_forms.py:1586 +#: netbox/dcim/forms/model_forms.py:1630 #: netbox/templates/dcim/inventoryitem.html:17 msgid "Inventory Item" msgstr "" -#: netbox/dcim/forms/model_forms.py:1659 +#: netbox/dcim/forms/model_forms.py:1704 #: netbox/templates/dcim/inventoryitemrole.html:15 msgid "Inventory Item Role" msgstr "" +#: netbox/dcim/forms/model_forms.py:1773 +msgid "VM Interface" +msgstr "" + +#: netbox/dcim/forms/model_forms.py:1788 netbox/ipam/forms/filtersets.py:608 +#: netbox/ipam/forms/model_forms.py:326 netbox/ipam/forms/model_forms.py:788 +#: netbox/ipam/forms/model_forms.py:814 netbox/ipam/tables/vlans.py:171 +#: netbox/templates/virtualization/virtualdisk.html:21 +#: netbox/templates/virtualization/virtualmachine.html:12 +#: netbox/templates/virtualization/vminterface.html:21 +#: netbox/templates/vpn/tunneltermination.html:25 +#: netbox/virtualization/forms/filtersets.py:202 +#: netbox/virtualization/forms/filtersets.py:247 +#: netbox/virtualization/forms/model_forms.py:219 +#: netbox/virtualization/tables/virtualmachines.py:105 +#: netbox/virtualization/tables/virtualmachines.py:161 netbox/vpn/choices.py:53 +#: netbox/vpn/forms/filtersets.py:293 netbox/vpn/forms/model_forms.py:161 +#: netbox/vpn/forms/model_forms.py:172 netbox/vpn/forms/model_forms.py:274 +#: netbox/vpn/forms/model_forms.py:457 +msgid "Virtual Machine" +msgstr "" + +#: netbox/dcim/forms/model_forms.py:1822 +msgid "A MAC address can only be assigned to a single object." +msgstr "" + #: netbox/dcim/forms/object_create.py:48 netbox/dcim/forms/object_create.py:199 #: netbox/dcim/forms/object_create.py:347 msgid "" @@ -4990,7 +5436,7 @@ msgid "" msgstr "" #: netbox/dcim/forms/object_create.py:110 -#: netbox/dcim/forms/object_create.py:263 netbox/dcim/tables/devices.py:252 +#: netbox/dcim/forms/object_create.py:263 netbox/dcim/tables/devices.py:262 msgid "Rear ports" msgstr "" @@ -5013,7 +5459,7 @@ msgid "" "selected number of rear port positions ({rearport_count})." msgstr "" -#: netbox/dcim/forms/object_create.py:401 netbox/dcim/tables/devices.py:1033 +#: netbox/dcim/forms/object_create.py:401 netbox/dcim/tables/devices.py:1064 #: netbox/ipam/tables/fhrp.py:31 netbox/templates/dcim/virtualchassis.html:53 #: netbox/templates/dcim/virtualchassis_edit.html:47 #: netbox/templates/ipam/fhrpgroup.html:38 @@ -5030,13 +5476,13 @@ msgid "" "member." msgstr "" -#: netbox/dcim/forms/object_create.py:427 +#: netbox/dcim/forms/object_create.py:428 msgid "A position must be specified for the first VC member." msgstr "" #: netbox/dcim/models/cables.py:62 -#: netbox/dcim/models/device_component_templates.py:55 -#: netbox/dcim/models/device_components.py:62 +#: netbox/dcim/models/device_component_templates.py:51 +#: netbox/dcim/models/device_components.py:57 #: netbox/extras/models/customfields.py:111 msgid "label" msgstr "" @@ -5049,80 +5495,80 @@ msgstr "" msgid "length unit" msgstr "" -#: netbox/dcim/models/cables.py:95 +#: netbox/dcim/models/cables.py:96 msgid "cable" msgstr "" -#: netbox/dcim/models/cables.py:96 +#: netbox/dcim/models/cables.py:97 msgid "cables" msgstr "" -#: netbox/dcim/models/cables.py:165 +#: netbox/dcim/models/cables.py:163 msgid "Must specify a unit when setting a cable length" msgstr "" -#: netbox/dcim/models/cables.py:168 +#: netbox/dcim/models/cables.py:166 msgid "Must define A and B terminations when creating a new cable." msgstr "" -#: netbox/dcim/models/cables.py:175 +#: netbox/dcim/models/cables.py:173 msgid "Cannot connect different termination types to same end of cable." msgstr "" -#: netbox/dcim/models/cables.py:183 +#: netbox/dcim/models/cables.py:181 #, python-brace-format msgid "Incompatible termination types: {type_a} and {type_b}" msgstr "" -#: netbox/dcim/models/cables.py:193 +#: netbox/dcim/models/cables.py:191 msgid "A and B terminations cannot connect to the same object." msgstr "" -#: netbox/dcim/models/cables.py:260 netbox/ipam/models/asns.py:37 +#: netbox/dcim/models/cables.py:258 netbox/ipam/models/asns.py:37 msgid "end" msgstr "" -#: netbox/dcim/models/cables.py:313 +#: netbox/dcim/models/cables.py:311 msgid "cable termination" msgstr "" -#: netbox/dcim/models/cables.py:314 +#: netbox/dcim/models/cables.py:312 msgid "cable terminations" msgstr "" -#: netbox/dcim/models/cables.py:333 +#: netbox/dcim/models/cables.py:331 #, python-brace-format msgid "" "Duplicate termination found for {app_label}.{model} {termination_id}: cable " "{cable_pk}" msgstr "" -#: netbox/dcim/models/cables.py:343 +#: netbox/dcim/models/cables.py:341 #, python-brace-format msgid "Cables cannot be terminated to {type_display} interfaces" msgstr "" -#: netbox/dcim/models/cables.py:350 +#: netbox/dcim/models/cables.py:348 msgid "Circuit terminations attached to a provider network may not be cabled." msgstr "" -#: netbox/dcim/models/cables.py:448 netbox/extras/models/configs.py:50 +#: netbox/dcim/models/cables.py:446 netbox/extras/models/configs.py:50 msgid "is active" msgstr "" -#: netbox/dcim/models/cables.py:452 +#: netbox/dcim/models/cables.py:450 msgid "is complete" msgstr "" -#: netbox/dcim/models/cables.py:456 +#: netbox/dcim/models/cables.py:454 msgid "is split" msgstr "" -#: netbox/dcim/models/cables.py:464 +#: netbox/dcim/models/cables.py:462 msgid "cable path" msgstr "" -#: netbox/dcim/models/cables.py:465 +#: netbox/dcim/models/cables.py:463 msgid "cable paths" msgstr "" @@ -5133,696 +5579,715 @@ msgid "" "attached to a module type." msgstr "" -#: netbox/dcim/models/device_component_templates.py:58 -#: netbox/dcim/models/device_components.py:65 +#: netbox/dcim/models/device_component_templates.py:54 +#: netbox/dcim/models/device_components.py:60 msgid "Physical label" msgstr "" -#: netbox/dcim/models/device_component_templates.py:103 +#: netbox/dcim/models/device_component_templates.py:99 msgid "Component templates cannot be moved to a different device type." msgstr "" -#: netbox/dcim/models/device_component_templates.py:154 +#: netbox/dcim/models/device_component_templates.py:150 msgid "" "A component template cannot be associated with both a device type and a " "module type." msgstr "" -#: netbox/dcim/models/device_component_templates.py:158 +#: netbox/dcim/models/device_component_templates.py:154 msgid "" "A component template must be associated with either a device type or a " "module type." msgstr "" -#: netbox/dcim/models/device_component_templates.py:212 +#: netbox/dcim/models/device_component_templates.py:209 msgid "console port template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:213 +#: netbox/dcim/models/device_component_templates.py:210 msgid "console port templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:246 +#: netbox/dcim/models/device_component_templates.py:244 msgid "console server port template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:247 +#: netbox/dcim/models/device_component_templates.py:245 msgid "console server port templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:278 -#: netbox/dcim/models/device_components.py:352 +#: netbox/dcim/models/device_component_templates.py:277 +#: netbox/dcim/models/device_components.py:345 msgid "maximum draw" msgstr "" -#: netbox/dcim/models/device_component_templates.py:285 -#: netbox/dcim/models/device_components.py:359 +#: netbox/dcim/models/device_component_templates.py:284 +#: netbox/dcim/models/device_components.py:352 msgid "allocated draw" msgstr "" -#: netbox/dcim/models/device_component_templates.py:295 +#: netbox/dcim/models/device_component_templates.py:294 msgid "power port template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:296 +#: netbox/dcim/models/device_component_templates.py:295 msgid "power port templates" msgstr "" #: netbox/dcim/models/device_component_templates.py:315 -#: netbox/dcim/models/device_components.py:382 +#: netbox/dcim/models/device_components.py:372 #, python-brace-format msgid "Allocated draw cannot exceed the maximum draw ({maximum_draw}W)." msgstr "" -#: netbox/dcim/models/device_component_templates.py:347 -#: netbox/dcim/models/device_components.py:477 +#: netbox/dcim/models/device_component_templates.py:349 +#: netbox/dcim/models/device_components.py:468 msgid "feed leg" msgstr "" -#: netbox/dcim/models/device_component_templates.py:351 -#: netbox/dcim/models/device_components.py:481 +#: netbox/dcim/models/device_component_templates.py:354 +#: netbox/dcim/models/device_components.py:473 msgid "Phase (for three-phase feeds)" msgstr "" -#: netbox/dcim/models/device_component_templates.py:357 +#: netbox/dcim/models/device_component_templates.py:360 msgid "power outlet template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:358 +#: netbox/dcim/models/device_component_templates.py:361 msgid "power outlet templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:367 +#: netbox/dcim/models/device_component_templates.py:370 #, python-brace-format msgid "Parent power port ({power_port}) must belong to the same device type" msgstr "" -#: netbox/dcim/models/device_component_templates.py:371 +#: netbox/dcim/models/device_component_templates.py:376 #, python-brace-format msgid "Parent power port ({power_port}) must belong to the same module type" msgstr "" -#: netbox/dcim/models/device_component_templates.py:423 -#: netbox/dcim/models/device_components.py:611 +#: netbox/dcim/models/device_component_templates.py:430 +#: netbox/dcim/models/device_components.py:659 msgid "management only" msgstr "" -#: netbox/dcim/models/device_component_templates.py:431 -#: netbox/dcim/models/device_components.py:550 +#: netbox/dcim/models/device_component_templates.py:438 +#: netbox/dcim/models/device_components.py:539 msgid "bridge interface" msgstr "" -#: netbox/dcim/models/device_component_templates.py:449 -#: netbox/dcim/models/device_components.py:636 +#: netbox/dcim/models/device_component_templates.py:459 +#: netbox/dcim/models/device_components.py:685 msgid "wireless role" msgstr "" -#: netbox/dcim/models/device_component_templates.py:455 +#: netbox/dcim/models/device_component_templates.py:465 msgid "interface template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:456 +#: netbox/dcim/models/device_component_templates.py:466 msgid "interface templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:463 -#: netbox/dcim/models/device_components.py:804 -#: netbox/virtualization/models/virtualmachines.py:405 +#: netbox/dcim/models/device_component_templates.py:473 +#: netbox/dcim/models/device_components.py:845 +#: netbox/virtualization/models/virtualmachines.py:385 msgid "An interface cannot be bridged to itself." msgstr "" -#: netbox/dcim/models/device_component_templates.py:466 +#: netbox/dcim/models/device_component_templates.py:477 #, python-brace-format msgid "Bridge interface ({bridge}) must belong to the same device type" msgstr "" -#: netbox/dcim/models/device_component_templates.py:470 +#: netbox/dcim/models/device_component_templates.py:483 #, python-brace-format msgid "Bridge interface ({bridge}) must belong to the same module type" msgstr "" -#: netbox/dcim/models/device_component_templates.py:526 -#: netbox/dcim/models/device_components.py:984 +#: netbox/dcim/models/device_component_templates.py:540 +#: netbox/dcim/models/device_components.py:1033 msgid "rear port position" msgstr "" -#: netbox/dcim/models/device_component_templates.py:551 +#: netbox/dcim/models/device_component_templates.py:565 msgid "front port template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:552 +#: netbox/dcim/models/device_component_templates.py:566 msgid "front port templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:562 +#: netbox/dcim/models/device_component_templates.py:576 #, python-brace-format msgid "Rear port ({name}) must belong to the same device type" msgstr "" -#: netbox/dcim/models/device_component_templates.py:568 +#: netbox/dcim/models/device_component_templates.py:582 #, python-brace-format msgid "" "Invalid rear port position ({position}); rear port {name} has only {count} " "positions" msgstr "" -#: netbox/dcim/models/device_component_templates.py:621 -#: netbox/dcim/models/device_components.py:1053 +#: netbox/dcim/models/device_component_templates.py:635 +#: netbox/dcim/models/device_components.py:1099 msgid "positions" msgstr "" -#: netbox/dcim/models/device_component_templates.py:632 +#: netbox/dcim/models/device_component_templates.py:646 msgid "rear port template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:633 +#: netbox/dcim/models/device_component_templates.py:647 msgid "rear port templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:662 -#: netbox/dcim/models/device_components.py:1103 +#: netbox/dcim/models/device_component_templates.py:676 +#: netbox/dcim/models/device_components.py:1146 msgid "position" msgstr "" -#: netbox/dcim/models/device_component_templates.py:665 -#: netbox/dcim/models/device_components.py:1106 +#: netbox/dcim/models/device_component_templates.py:679 +#: netbox/dcim/models/device_components.py:1149 msgid "Identifier to reference when renaming installed components" msgstr "" -#: netbox/dcim/models/device_component_templates.py:671 +#: netbox/dcim/models/device_component_templates.py:685 msgid "module bay template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:672 +#: netbox/dcim/models/device_component_templates.py:686 msgid "module bay templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:699 +#: netbox/dcim/models/device_component_templates.py:713 msgid "device bay template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:700 +#: netbox/dcim/models/device_component_templates.py:714 msgid "device bay templates" msgstr "" -#: netbox/dcim/models/device_component_templates.py:713 +#: netbox/dcim/models/device_component_templates.py:728 #, python-brace-format msgid "" "Subdevice role of device type ({device_type}) must be set to \"parent\" to " "allow device bays." msgstr "" -#: netbox/dcim/models/device_component_templates.py:768 -#: netbox/dcim/models/device_components.py:1262 +#: netbox/dcim/models/device_component_templates.py:784 +#: netbox/dcim/models/device_components.py:1302 msgid "part ID" msgstr "" -#: netbox/dcim/models/device_component_templates.py:770 -#: netbox/dcim/models/device_components.py:1264 +#: netbox/dcim/models/device_component_templates.py:786 +#: netbox/dcim/models/device_components.py:1304 msgid "Manufacturer-assigned part identifier" msgstr "" -#: netbox/dcim/models/device_component_templates.py:787 +#: netbox/dcim/models/device_component_templates.py:803 msgid "inventory item template" msgstr "" -#: netbox/dcim/models/device_component_templates.py:788 +#: netbox/dcim/models/device_component_templates.py:804 msgid "inventory item templates" msgstr "" -#: netbox/dcim/models/device_components.py:105 +#: netbox/dcim/models/device_components.py:100 msgid "Components cannot be moved to a different device." msgstr "" -#: netbox/dcim/models/device_components.py:144 +#: netbox/dcim/models/device_components.py:139 msgid "cable end" msgstr "" -#: netbox/dcim/models/device_components.py:150 +#: netbox/dcim/models/device_components.py:146 msgid "mark connected" msgstr "" -#: netbox/dcim/models/device_components.py:152 +#: netbox/dcim/models/device_components.py:148 msgid "Treat as if a cable is connected" msgstr "" -#: netbox/dcim/models/device_components.py:170 +#: netbox/dcim/models/device_components.py:166 msgid "Must specify cable end (A or B) when attaching a cable." msgstr "" -#: netbox/dcim/models/device_components.py:174 +#: netbox/dcim/models/device_components.py:170 msgid "Cable end must not be set without a cable." msgstr "" -#: netbox/dcim/models/device_components.py:178 +#: netbox/dcim/models/device_components.py:174 msgid "Cannot mark as connected with a cable attached." msgstr "" -#: netbox/dcim/models/device_components.py:202 +#: netbox/dcim/models/device_components.py:198 #, python-brace-format msgid "{class_name} models must declare a parent_object property" msgstr "" -#: netbox/dcim/models/device_components.py:287 -#: netbox/dcim/models/device_components.py:316 -#: netbox/dcim/models/device_components.py:349 -#: netbox/dcim/models/device_components.py:467 +#: netbox/dcim/models/device_components.py:284 +#: netbox/dcim/models/device_components.py:311 +#: netbox/dcim/models/device_components.py:342 +#: netbox/dcim/models/device_components.py:458 msgid "Physical port type" msgstr "" -#: netbox/dcim/models/device_components.py:290 -#: netbox/dcim/models/device_components.py:319 +#: netbox/dcim/models/device_components.py:287 +#: netbox/dcim/models/device_components.py:314 msgid "speed" msgstr "" -#: netbox/dcim/models/device_components.py:294 -#: netbox/dcim/models/device_components.py:323 +#: netbox/dcim/models/device_components.py:291 +#: netbox/dcim/models/device_components.py:318 msgid "Port speed in bits per second" msgstr "" -#: netbox/dcim/models/device_components.py:300 +#: netbox/dcim/models/device_components.py:297 msgid "console port" msgstr "" -#: netbox/dcim/models/device_components.py:301 +#: netbox/dcim/models/device_components.py:298 msgid "console ports" msgstr "" -#: netbox/dcim/models/device_components.py:329 +#: netbox/dcim/models/device_components.py:324 msgid "console server port" msgstr "" -#: netbox/dcim/models/device_components.py:330 +#: netbox/dcim/models/device_components.py:325 msgid "console server ports" msgstr "" -#: netbox/dcim/models/device_components.py:369 +#: netbox/dcim/models/device_components.py:362 msgid "power port" msgstr "" -#: netbox/dcim/models/device_components.py:370 +#: netbox/dcim/models/device_components.py:363 msgid "power ports" msgstr "" -#: netbox/dcim/models/device_components.py:487 +#: netbox/dcim/models/device_components.py:483 msgid "power outlet" msgstr "" -#: netbox/dcim/models/device_components.py:488 +#: netbox/dcim/models/device_components.py:484 msgid "power outlets" msgstr "" -#: netbox/dcim/models/device_components.py:499 +#: netbox/dcim/models/device_components.py:492 #, python-brace-format msgid "Parent power port ({power_port}) must belong to the same device" msgstr "" -#: netbox/dcim/models/device_components.py:530 netbox/vpn/models/crypto.py:81 -#: netbox/vpn/models/crypto.py:226 +#: netbox/dcim/models/device_components.py:518 netbox/vpn/models/crypto.py:80 +#: netbox/vpn/models/crypto.py:222 msgid "mode" msgstr "" -#: netbox/dcim/models/device_components.py:534 +#: netbox/dcim/models/device_components.py:523 msgid "IEEE 802.1Q tagging strategy" msgstr "" -#: netbox/dcim/models/device_components.py:542 +#: netbox/dcim/models/device_components.py:531 msgid "parent interface" msgstr "" -#: netbox/dcim/models/device_components.py:602 -msgid "parent LAG" -msgstr "" - -#: netbox/dcim/models/device_components.py:612 -msgid "This interface is used only for out-of-band management" -msgstr "" - -#: netbox/dcim/models/device_components.py:617 -msgid "speed (Kbps)" -msgstr "" - -#: netbox/dcim/models/device_components.py:620 -msgid "duplex" -msgstr "" - -#: netbox/dcim/models/device_components.py:630 -msgid "64-bit World Wide Name" -msgstr "" - -#: netbox/dcim/models/device_components.py:642 -msgid "wireless channel" -msgstr "" - -#: netbox/dcim/models/device_components.py:649 -msgid "channel frequency (MHz)" -msgstr "" - -#: netbox/dcim/models/device_components.py:650 -#: netbox/dcim/models/device_components.py:658 -msgid "Populated by selected channel (if set)" -msgstr "" - -#: netbox/dcim/models/device_components.py:664 -msgid "transmit power (dBm)" -msgstr "" - -#: netbox/dcim/models/device_components.py:689 netbox/wireless/models.py:117 -msgid "wireless LANs" -msgstr "" - -#: netbox/dcim/models/device_components.py:697 -#: netbox/virtualization/models/virtualmachines.py:335 +#: netbox/dcim/models/device_components.py:547 msgid "untagged VLAN" msgstr "" -#: netbox/dcim/models/device_components.py:703 -#: netbox/virtualization/models/virtualmachines.py:341 +#: netbox/dcim/models/device_components.py:553 msgid "tagged VLANs" msgstr "" -#: netbox/dcim/models/device_components.py:745 -#: netbox/virtualization/models/virtualmachines.py:377 +#: netbox/dcim/models/device_components.py:561 +#: netbox/dcim/tables/devices.py:601 netbox/ipam/forms/bulk_edit.py:510 +#: netbox/ipam/forms/bulk_import.py:491 netbox/ipam/forms/filtersets.py:565 +#: netbox/ipam/forms/model_forms.py:684 netbox/ipam/tables/vlans.py:106 +#: netbox/templates/dcim/interface.html:86 netbox/templates/ipam/vlan.html:77 +msgid "Q-in-Q SVLAN" +msgstr "" + +#: netbox/dcim/models/device_components.py:576 +msgid "primary MAC address" +msgstr "" + +#: netbox/dcim/models/device_components.py:588 +msgid "Only Q-in-Q interfaces may specify a service VLAN." +msgstr "" + +#: netbox/dcim/models/device_components.py:594 +#, python-brace-format +msgid "MAC address {mac_address} is not assigned to this interface." +msgstr "" + +#: netbox/dcim/models/device_components.py:650 +msgid "parent LAG" +msgstr "" + +#: netbox/dcim/models/device_components.py:660 +msgid "This interface is used only for out-of-band management" +msgstr "" + +#: netbox/dcim/models/device_components.py:665 +msgid "speed (Kbps)" +msgstr "" + +#: netbox/dcim/models/device_components.py:668 +msgid "duplex" +msgstr "" + +#: netbox/dcim/models/device_components.py:678 +msgid "64-bit World Wide Name" +msgstr "" + +#: netbox/dcim/models/device_components.py:692 +msgid "wireless channel" +msgstr "" + +#: netbox/dcim/models/device_components.py:699 +msgid "channel frequency (MHz)" +msgstr "" + +#: netbox/dcim/models/device_components.py:700 +#: netbox/dcim/models/device_components.py:708 +msgid "Populated by selected channel (if set)" +msgstr "" + +#: netbox/dcim/models/device_components.py:714 +msgid "transmit power (dBm)" +msgstr "" + +#: netbox/dcim/models/device_components.py:741 netbox/wireless/models.py:117 +msgid "wireless LANs" +msgstr "" + +#: netbox/dcim/models/device_components.py:789 +#: netbox/virtualization/models/virtualmachines.py:359 msgid "interface" msgstr "" -#: netbox/dcim/models/device_components.py:746 -#: netbox/virtualization/models/virtualmachines.py:378 +#: netbox/dcim/models/device_components.py:790 +#: netbox/virtualization/models/virtualmachines.py:360 msgid "interfaces" msgstr "" -#: netbox/dcim/models/device_components.py:757 +#: netbox/dcim/models/device_components.py:798 #, python-brace-format msgid "{display_type} interfaces cannot have a cable attached." msgstr "" -#: netbox/dcim/models/device_components.py:765 +#: netbox/dcim/models/device_components.py:806 #, python-brace-format msgid "{display_type} interfaces cannot be marked as connected." msgstr "" -#: netbox/dcim/models/device_components.py:774 -#: netbox/virtualization/models/virtualmachines.py:390 +#: netbox/dcim/models/device_components.py:815 +#: netbox/virtualization/models/virtualmachines.py:370 msgid "An interface cannot be its own parent." msgstr "" -#: netbox/dcim/models/device_components.py:778 +#: netbox/dcim/models/device_components.py:819 msgid "Only virtual interfaces may be assigned to a parent interface." msgstr "" -#: netbox/dcim/models/device_components.py:785 +#: netbox/dcim/models/device_components.py:826 #, python-brace-format msgid "" "The selected parent interface ({interface}) belongs to a different device " "({device})" msgstr "" -#: netbox/dcim/models/device_components.py:791 +#: netbox/dcim/models/device_components.py:832 #, python-brace-format msgid "" "The selected parent interface ({interface}) belongs to {device}, which is " "not part of virtual chassis {virtual_chassis}." msgstr "" -#: netbox/dcim/models/device_components.py:811 +#: netbox/dcim/models/device_components.py:852 #, python-brace-format msgid "" "The selected bridge interface ({bridge}) belongs to a different device " "({device})." msgstr "" -#: netbox/dcim/models/device_components.py:817 +#: netbox/dcim/models/device_components.py:858 #, python-brace-format msgid "" "The selected bridge interface ({interface}) belongs to {device}, which is " "not part of virtual chassis {virtual_chassis}." msgstr "" -#: netbox/dcim/models/device_components.py:828 +#: netbox/dcim/models/device_components.py:869 msgid "Virtual interfaces cannot have a parent LAG interface." msgstr "" -#: netbox/dcim/models/device_components.py:832 +#: netbox/dcim/models/device_components.py:873 msgid "A LAG interface cannot be its own parent." msgstr "" -#: netbox/dcim/models/device_components.py:839 +#: netbox/dcim/models/device_components.py:880 #, python-brace-format msgid "" "The selected LAG interface ({lag}) belongs to a different device ({device})." msgstr "" -#: netbox/dcim/models/device_components.py:845 +#: netbox/dcim/models/device_components.py:886 #, python-brace-format msgid "" "The selected LAG interface ({lag}) belongs to {device}, which is not part of " "virtual chassis {virtual_chassis}." msgstr "" -#: netbox/dcim/models/device_components.py:856 +#: netbox/dcim/models/device_components.py:897 msgid "Virtual interfaces cannot have a PoE mode." msgstr "" -#: netbox/dcim/models/device_components.py:860 +#: netbox/dcim/models/device_components.py:901 msgid "Virtual interfaces cannot have a PoE type." msgstr "" -#: netbox/dcim/models/device_components.py:866 +#: netbox/dcim/models/device_components.py:907 msgid "Must specify PoE mode when designating a PoE type." msgstr "" -#: netbox/dcim/models/device_components.py:873 +#: netbox/dcim/models/device_components.py:914 msgid "Wireless role may be set only on wireless interfaces." msgstr "" -#: netbox/dcim/models/device_components.py:875 +#: netbox/dcim/models/device_components.py:916 msgid "Channel may be set only on wireless interfaces." msgstr "" -#: netbox/dcim/models/device_components.py:881 +#: netbox/dcim/models/device_components.py:922 msgid "Channel frequency may be set only on wireless interfaces." msgstr "" -#: netbox/dcim/models/device_components.py:885 +#: netbox/dcim/models/device_components.py:926 msgid "Cannot specify custom frequency with channel selected." msgstr "" -#: netbox/dcim/models/device_components.py:891 +#: netbox/dcim/models/device_components.py:932 msgid "Channel width may be set only on wireless interfaces." msgstr "" -#: netbox/dcim/models/device_components.py:893 +#: netbox/dcim/models/device_components.py:934 msgid "Cannot specify custom width with channel selected." msgstr "" -#: netbox/dcim/models/device_components.py:901 +#: netbox/dcim/models/device_components.py:942 #, python-brace-format msgid "" "The untagged VLAN ({untagged_vlan}) must belong to the same site as the " "interface's parent device, or it must be global." msgstr "" -#: netbox/dcim/models/device_components.py:990 +#: netbox/dcim/models/device_components.py:1039 msgid "Mapped position on corresponding rear port" msgstr "" -#: netbox/dcim/models/device_components.py:1006 +#: netbox/dcim/models/device_components.py:1055 msgid "front port" msgstr "" -#: netbox/dcim/models/device_components.py:1007 +#: netbox/dcim/models/device_components.py:1056 msgid "front ports" msgstr "" -#: netbox/dcim/models/device_components.py:1021 +#: netbox/dcim/models/device_components.py:1067 #, python-brace-format msgid "Rear port ({rear_port}) must belong to the same device" msgstr "" -#: netbox/dcim/models/device_components.py:1029 +#: netbox/dcim/models/device_components.py:1075 #, python-brace-format msgid "" "Invalid rear port position ({rear_port_position}): Rear port {name} has only " "{positions} positions." msgstr "" -#: netbox/dcim/models/device_components.py:1059 +#: netbox/dcim/models/device_components.py:1105 msgid "Number of front ports which may be mapped" msgstr "" -#: netbox/dcim/models/device_components.py:1064 +#: netbox/dcim/models/device_components.py:1110 msgid "rear port" msgstr "" -#: netbox/dcim/models/device_components.py:1065 +#: netbox/dcim/models/device_components.py:1111 msgid "rear ports" msgstr "" -#: netbox/dcim/models/device_components.py:1079 +#: netbox/dcim/models/device_components.py:1122 #, python-brace-format msgid "" "The number of positions cannot be less than the number of mapped front ports " "({frontport_count})" msgstr "" -#: netbox/dcim/models/device_components.py:1120 +#: netbox/dcim/models/device_components.py:1163 msgid "module bay" msgstr "" -#: netbox/dcim/models/device_components.py:1121 +#: netbox/dcim/models/device_components.py:1164 msgid "module bays" msgstr "" -#: netbox/dcim/models/device_components.py:1138 +#: netbox/dcim/models/device_components.py:1178 #: netbox/dcim/models/devices.py:1224 msgid "A module bay cannot belong to a module installed within it." msgstr "" -#: netbox/dcim/models/device_components.py:1164 +#: netbox/dcim/models/device_components.py:1204 msgid "device bay" msgstr "" -#: netbox/dcim/models/device_components.py:1165 +#: netbox/dcim/models/device_components.py:1205 msgid "device bays" msgstr "" -#: netbox/dcim/models/device_components.py:1175 +#: netbox/dcim/models/device_components.py:1212 #, python-brace-format msgid "This type of device ({device_type}) does not support device bays." msgstr "" -#: netbox/dcim/models/device_components.py:1181 +#: netbox/dcim/models/device_components.py:1218 msgid "Cannot install a device into itself." msgstr "" -#: netbox/dcim/models/device_components.py:1189 +#: netbox/dcim/models/device_components.py:1226 #, python-brace-format msgid "" "Cannot install the specified device; device is already installed in {bay}." msgstr "" -#: netbox/dcim/models/device_components.py:1210 +#: netbox/dcim/models/device_components.py:1247 msgid "inventory item role" msgstr "" -#: netbox/dcim/models/device_components.py:1211 +#: netbox/dcim/models/device_components.py:1248 msgid "inventory item roles" msgstr "" -#: netbox/dcim/models/device_components.py:1268 -#: netbox/dcim/models/devices.py:607 netbox/dcim/models/devices.py:1181 -#: netbox/dcim/models/racks.py:313 -#: netbox/virtualization/models/virtualmachines.py:131 +#: netbox/dcim/models/device_components.py:1308 +#: netbox/dcim/models/devices.py:597 netbox/dcim/models/devices.py:1184 +#: netbox/dcim/models/racks.py:304 +#: netbox/virtualization/models/virtualmachines.py:126 msgid "serial number" msgstr "" -#: netbox/dcim/models/device_components.py:1276 -#: netbox/dcim/models/devices.py:615 netbox/dcim/models/devices.py:1188 -#: netbox/dcim/models/racks.py:320 +#: netbox/dcim/models/device_components.py:1316 +#: netbox/dcim/models/devices.py:605 netbox/dcim/models/devices.py:1191 +#: netbox/dcim/models/racks.py:311 msgid "asset tag" msgstr "" -#: netbox/dcim/models/device_components.py:1277 +#: netbox/dcim/models/device_components.py:1317 msgid "A unique tag used to identify this item" msgstr "" -#: netbox/dcim/models/device_components.py:1280 +#: netbox/dcim/models/device_components.py:1320 msgid "discovered" msgstr "" -#: netbox/dcim/models/device_components.py:1282 +#: netbox/dcim/models/device_components.py:1322 msgid "This item was automatically discovered" msgstr "" -#: netbox/dcim/models/device_components.py:1300 +#: netbox/dcim/models/device_components.py:1340 msgid "inventory item" msgstr "" -#: netbox/dcim/models/device_components.py:1301 +#: netbox/dcim/models/device_components.py:1341 msgid "inventory items" msgstr "" -#: netbox/dcim/models/device_components.py:1312 +#: netbox/dcim/models/device_components.py:1349 msgid "Cannot assign self as parent." msgstr "" -#: netbox/dcim/models/device_components.py:1320 +#: netbox/dcim/models/device_components.py:1357 msgid "Parent inventory item does not belong to the same device." msgstr "" -#: netbox/dcim/models/device_components.py:1326 +#: netbox/dcim/models/device_components.py:1363 msgid "Cannot move an inventory item with dependent children" msgstr "" -#: netbox/dcim/models/device_components.py:1334 +#: netbox/dcim/models/device_components.py:1371 msgid "Cannot assign inventory item to component on another device" msgstr "" -#: netbox/dcim/models/devices.py:54 +#: netbox/dcim/models/devices.py:58 msgid "manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:55 +#: netbox/dcim/models/devices.py:59 msgid "manufacturers" msgstr "" -#: netbox/dcim/models/devices.py:82 netbox/dcim/models/devices.py:382 +#: netbox/dcim/models/devices.py:83 netbox/dcim/models/devices.py:382 #: netbox/dcim/models/racks.py:133 msgid "model" msgstr "" -#: netbox/dcim/models/devices.py:95 +#: netbox/dcim/models/devices.py:96 msgid "default platform" msgstr "" -#: netbox/dcim/models/devices.py:98 netbox/dcim/models/devices.py:386 +#: netbox/dcim/models/devices.py:99 netbox/dcim/models/devices.py:386 msgid "part number" msgstr "" -#: netbox/dcim/models/devices.py:101 netbox/dcim/models/devices.py:389 +#: netbox/dcim/models/devices.py:102 netbox/dcim/models/devices.py:389 msgid "Discrete part number (optional)" msgstr "" -#: netbox/dcim/models/devices.py:107 netbox/dcim/models/racks.py:54 +#: netbox/dcim/models/devices.py:108 netbox/dcim/models/racks.py:53 msgid "height (U)" msgstr "" -#: netbox/dcim/models/devices.py:111 +#: netbox/dcim/models/devices.py:112 msgid "exclude from utilization" msgstr "" -#: netbox/dcim/models/devices.py:112 +#: netbox/dcim/models/devices.py:113 msgid "Devices of this type are excluded when calculating rack utilization." msgstr "" -#: netbox/dcim/models/devices.py:116 +#: netbox/dcim/models/devices.py:117 msgid "is full depth" msgstr "" -#: netbox/dcim/models/devices.py:117 +#: netbox/dcim/models/devices.py:118 msgid "Device consumes both front and rear rack faces." msgstr "" -#: netbox/dcim/models/devices.py:123 +#: netbox/dcim/models/devices.py:125 msgid "parent/child status" msgstr "" -#: netbox/dcim/models/devices.py:124 +#: netbox/dcim/models/devices.py:126 msgid "" "Parent devices house child devices in device bays. Leave blank if this " "device type is neither a parent nor a child." msgstr "" -#: netbox/dcim/models/devices.py:128 netbox/dcim/models/devices.py:392 -#: netbox/dcim/models/devices.py:659 netbox/dcim/models/racks.py:324 +#: netbox/dcim/models/devices.py:130 netbox/dcim/models/devices.py:392 +#: netbox/dcim/models/devices.py:650 netbox/dcim/models/racks.py:315 msgid "airflow" msgstr "" -#: netbox/dcim/models/devices.py:204 +#: netbox/dcim/models/devices.py:207 msgid "device type" msgstr "" -#: netbox/dcim/models/devices.py:205 +#: netbox/dcim/models/devices.py:208 msgid "device types" msgstr "" @@ -5854,211 +6319,216 @@ msgstr "" msgid "Child device types must be 0U." msgstr "" -#: netbox/dcim/models/devices.py:411 +#: netbox/dcim/models/devices.py:412 msgid "module type" msgstr "" -#: netbox/dcim/models/devices.py:412 +#: netbox/dcim/models/devices.py:413 msgid "module types" msgstr "" -#: netbox/dcim/models/devices.py:485 +#: netbox/dcim/models/devices.py:483 msgid "Virtual machines may be assigned to this role" msgstr "" -#: netbox/dcim/models/devices.py:497 +#: netbox/dcim/models/devices.py:495 msgid "device role" msgstr "" -#: netbox/dcim/models/devices.py:498 +#: netbox/dcim/models/devices.py:496 msgid "device roles" msgstr "" -#: netbox/dcim/models/devices.py:515 +#: netbox/dcim/models/devices.py:510 msgid "Optionally limit this platform to devices of a certain manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:527 +#: netbox/dcim/models/devices.py:522 msgid "platform" msgstr "" -#: netbox/dcim/models/devices.py:528 +#: netbox/dcim/models/devices.py:523 msgid "platforms" msgstr "" -#: netbox/dcim/models/devices.py:576 +#: netbox/dcim/models/devices.py:571 msgid "The function this device serves" msgstr "" -#: netbox/dcim/models/devices.py:608 +#: netbox/dcim/models/devices.py:598 msgid "Chassis serial number, assigned by the manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:616 netbox/dcim/models/devices.py:1189 +#: netbox/dcim/models/devices.py:606 netbox/dcim/models/devices.py:1192 msgid "A unique tag used to identify this device" msgstr "" -#: netbox/dcim/models/devices.py:643 +#: netbox/dcim/models/devices.py:633 msgid "position (U)" msgstr "" -#: netbox/dcim/models/devices.py:650 +#: netbox/dcim/models/devices.py:641 msgid "rack face" msgstr "" -#: netbox/dcim/models/devices.py:670 netbox/dcim/models/devices.py:1420 -#: netbox/virtualization/models/virtualmachines.py:100 +#: netbox/dcim/models/devices.py:662 netbox/dcim/models/devices.py:1419 +#: netbox/virtualization/models/virtualmachines.py:95 msgid "primary IPv4" msgstr "" -#: netbox/dcim/models/devices.py:678 netbox/dcim/models/devices.py:1428 -#: netbox/virtualization/models/virtualmachines.py:108 +#: netbox/dcim/models/devices.py:670 netbox/dcim/models/devices.py:1427 +#: netbox/virtualization/models/virtualmachines.py:103 msgid "primary IPv6" msgstr "" -#: netbox/dcim/models/devices.py:686 +#: netbox/dcim/models/devices.py:678 msgid "out-of-band IP" msgstr "" -#: netbox/dcim/models/devices.py:703 +#: netbox/dcim/models/devices.py:695 msgid "VC position" msgstr "" -#: netbox/dcim/models/devices.py:706 +#: netbox/dcim/models/devices.py:698 msgid "Virtual chassis position" msgstr "" -#: netbox/dcim/models/devices.py:709 +#: netbox/dcim/models/devices.py:701 msgid "VC priority" msgstr "" -#: netbox/dcim/models/devices.py:713 +#: netbox/dcim/models/devices.py:705 msgid "Virtual chassis master election priority" msgstr "" -#: netbox/dcim/models/devices.py:716 netbox/dcim/models/sites.py:207 +#: netbox/dcim/models/devices.py:708 netbox/dcim/models/sites.py:208 msgid "latitude" msgstr "" -#: netbox/dcim/models/devices.py:721 netbox/dcim/models/devices.py:729 -#: netbox/dcim/models/sites.py:212 netbox/dcim/models/sites.py:220 +#: netbox/dcim/models/devices.py:713 netbox/dcim/models/devices.py:721 +#: netbox/dcim/models/sites.py:213 netbox/dcim/models/sites.py:221 msgid "GPS coordinate in decimal format (xx.yyyyyy)" msgstr "" -#: netbox/dcim/models/devices.py:724 netbox/dcim/models/sites.py:215 +#: netbox/dcim/models/devices.py:716 netbox/dcim/models/sites.py:216 msgid "longitude" msgstr "" -#: netbox/dcim/models/devices.py:797 +#: netbox/dcim/models/devices.py:789 msgid "Device name must be unique per site." msgstr "" -#: netbox/dcim/models/devices.py:808 netbox/ipam/models/services.py:75 +#: netbox/dcim/models/devices.py:800 netbox/ipam/models/services.py:71 msgid "device" msgstr "" -#: netbox/dcim/models/devices.py:809 +#: netbox/dcim/models/devices.py:801 msgid "devices" msgstr "" -#: netbox/dcim/models/devices.py:835 +#: netbox/dcim/models/devices.py:824 #, python-brace-format msgid "Rack {rack} does not belong to site {site}." msgstr "" -#: netbox/dcim/models/devices.py:840 +#: netbox/dcim/models/devices.py:829 #, python-brace-format msgid "Location {location} does not belong to site {site}." msgstr "" -#: netbox/dcim/models/devices.py:846 +#: netbox/dcim/models/devices.py:835 #, python-brace-format msgid "Rack {rack} does not belong to location {location}." msgstr "" -#: netbox/dcim/models/devices.py:853 +#: netbox/dcim/models/devices.py:842 msgid "Cannot select a rack face without assigning a rack." msgstr "" -#: netbox/dcim/models/devices.py:857 +#: netbox/dcim/models/devices.py:846 msgid "Cannot select a rack position without assigning a rack." msgstr "" -#: netbox/dcim/models/devices.py:863 +#: netbox/dcim/models/devices.py:852 msgid "Position must be in increments of 0.5 rack units." msgstr "" -#: netbox/dcim/models/devices.py:867 +#: netbox/dcim/models/devices.py:856 msgid "Must specify rack face when defining rack position." msgstr "" -#: netbox/dcim/models/devices.py:875 +#: netbox/dcim/models/devices.py:864 #, python-brace-format msgid "A 0U device type ({device_type}) cannot be assigned to a rack position." msgstr "" -#: netbox/dcim/models/devices.py:886 +#: netbox/dcim/models/devices.py:875 msgid "" "Child device types cannot be assigned to a rack face. This is an attribute " "of the parent device." msgstr "" -#: netbox/dcim/models/devices.py:893 +#: netbox/dcim/models/devices.py:882 msgid "" "Child device types cannot be assigned to a rack position. This is an " "attribute of the parent device." msgstr "" -#: netbox/dcim/models/devices.py:907 +#: netbox/dcim/models/devices.py:896 #, python-brace-format msgid "" "U{position} is already occupied or does not have sufficient space to " "accommodate this device type: {device_type} ({u_height}U)" msgstr "" -#: netbox/dcim/models/devices.py:922 +#: netbox/dcim/models/devices.py:911 #, python-brace-format msgid "{ip} is not an IPv4 address." msgstr "" -#: netbox/dcim/models/devices.py:931 netbox/dcim/models/devices.py:946 +#: netbox/dcim/models/devices.py:923 netbox/dcim/models/devices.py:941 #, python-brace-format msgid "The specified IP address ({ip}) is not assigned to this device." msgstr "" -#: netbox/dcim/models/devices.py:937 +#: netbox/dcim/models/devices.py:929 #, python-brace-format msgid "{ip} is not an IPv6 address." msgstr "" -#: netbox/dcim/models/devices.py:964 +#: netbox/dcim/models/devices.py:959 #, python-brace-format msgid "" "The assigned platform is limited to {platform_manufacturer} device types, " "but this device's type belongs to {devicetype_manufacturer}." msgstr "" -#: netbox/dcim/models/devices.py:975 +#: netbox/dcim/models/devices.py:970 #, python-brace-format msgid "The assigned cluster belongs to a different site ({site})" msgstr "" -#: netbox/dcim/models/devices.py:983 +#: netbox/dcim/models/devices.py:977 +#, python-brace-format +msgid "The assigned cluster belongs to a different location ({location})" +msgstr "" + +#: netbox/dcim/models/devices.py:985 msgid "A device assigned to a virtual chassis must have its position defined." msgstr "" -#: netbox/dcim/models/devices.py:988 +#: netbox/dcim/models/devices.py:991 #, python-brace-format msgid "" "Device cannot be removed from virtual chassis {virtual_chassis} because it " "is currently designated as its master." msgstr "" -#: netbox/dcim/models/devices.py:1196 +#: netbox/dcim/models/devices.py:1199 msgid "module" msgstr "" -#: netbox/dcim/models/devices.py:1197 +#: netbox/dcim/models/devices.py:1200 msgid "modules" msgstr "" @@ -6069,69 +6539,64 @@ msgid "" "device ({device})." msgstr "" -#: netbox/dcim/models/devices.py:1339 +#: netbox/dcim/models/devices.py:1340 msgid "domain" msgstr "" -#: netbox/dcim/models/devices.py:1352 netbox/dcim/models/devices.py:1353 +#: netbox/dcim/models/devices.py:1353 netbox/dcim/models/devices.py:1354 msgid "virtual chassis" msgstr "" -#: netbox/dcim/models/devices.py:1368 +#: netbox/dcim/models/devices.py:1366 #, python-brace-format msgid "The selected master ({master}) is not assigned to this virtual chassis." msgstr "" -#: netbox/dcim/models/devices.py:1384 +#: netbox/dcim/models/devices.py:1382 #, python-brace-format msgid "" "Unable to delete virtual chassis {self}. There are member interfaces which " "form a cross-chassis LAG interfaces." msgstr "" -#: netbox/dcim/models/devices.py:1409 netbox/vpn/models/l2vpn.py:37 +#: netbox/dcim/models/devices.py:1408 netbox/vpn/models/l2vpn.py:37 msgid "identifier" msgstr "" -#: netbox/dcim/models/devices.py:1410 +#: netbox/dcim/models/devices.py:1409 msgid "Numeric identifier unique to the parent device" msgstr "" -#: netbox/dcim/models/devices.py:1438 netbox/extras/models/customfields.py:225 +#: netbox/dcim/models/devices.py:1437 netbox/extras/models/customfields.py:225 #: netbox/extras/models/models.py:107 netbox/extras/models/models.py:694 -#: netbox/netbox/models/__init__.py:115 +#: netbox/netbox/models/__init__.py:119 msgid "comments" msgstr "" -#: netbox/dcim/models/devices.py:1454 +#: netbox/dcim/models/devices.py:1453 msgid "virtual device context" msgstr "" -#: netbox/dcim/models/devices.py:1455 +#: netbox/dcim/models/devices.py:1454 msgid "virtual device contexts" msgstr "" -#: netbox/dcim/models/devices.py:1487 +#: netbox/dcim/models/devices.py:1483 #, python-brace-format msgid "{ip} is not an IPv{family} address." msgstr "" -#: netbox/dcim/models/devices.py:1493 +#: netbox/dcim/models/devices.py:1489 msgid "Primary IP address must belong to an interface on the assigned device." msgstr "" -#: netbox/dcim/models/mixins.py:15 netbox/extras/models/configs.py:41 -#: netbox/extras/models/models.py:313 netbox/extras/models/models.py:522 -#: netbox/extras/models/search.py:48 netbox/ipam/models/ip.py:194 -msgid "weight" +#: netbox/dcim/models/devices.py:1521 +msgid "MAC addresses" msgstr "" -#: netbox/dcim/models/mixins.py:22 -msgid "weight unit" -msgstr "" - -#: netbox/dcim/models/mixins.py:51 -msgid "Must specify a unit when setting a weight" +#: netbox/dcim/models/mixins.py:94 +#, python-brace-format +msgid "Please select a {scope_type}." msgstr "" #: netbox/dcim/models/power.py:55 @@ -6142,104 +6607,104 @@ msgstr "" msgid "power panels" msgstr "" -#: netbox/dcim/models/power.py:70 +#: netbox/dcim/models/power.py:67 #, python-brace-format msgid "" "Location {location} ({location_site}) is in a different site than {site}" msgstr "" -#: netbox/dcim/models/power.py:108 +#: netbox/dcim/models/power.py:106 msgid "supply" msgstr "" -#: netbox/dcim/models/power.py:114 +#: netbox/dcim/models/power.py:112 msgid "phase" msgstr "" -#: netbox/dcim/models/power.py:120 +#: netbox/dcim/models/power.py:118 msgid "voltage" msgstr "" -#: netbox/dcim/models/power.py:125 +#: netbox/dcim/models/power.py:123 msgid "amperage" msgstr "" -#: netbox/dcim/models/power.py:130 +#: netbox/dcim/models/power.py:128 msgid "max utilization" msgstr "" -#: netbox/dcim/models/power.py:133 +#: netbox/dcim/models/power.py:131 msgid "Maximum permissible draw (percentage)" msgstr "" -#: netbox/dcim/models/power.py:136 +#: netbox/dcim/models/power.py:134 msgid "available power" msgstr "" -#: netbox/dcim/models/power.py:164 +#: netbox/dcim/models/power.py:162 msgid "power feed" msgstr "" -#: netbox/dcim/models/power.py:165 +#: netbox/dcim/models/power.py:163 msgid "power feeds" msgstr "" -#: netbox/dcim/models/power.py:179 +#: netbox/dcim/models/power.py:174 #, python-brace-format msgid "" "Rack {rack} ({rack_site}) and power panel {powerpanel} ({powerpanel_site}) " "are in different sites." msgstr "" -#: netbox/dcim/models/power.py:190 +#: netbox/dcim/models/power.py:185 msgid "Voltage cannot be negative for AC supply" msgstr "" -#: netbox/dcim/models/racks.py:47 +#: netbox/dcim/models/racks.py:46 msgid "width" msgstr "" -#: netbox/dcim/models/racks.py:48 +#: netbox/dcim/models/racks.py:47 msgid "Rail-to-rail width" msgstr "" -#: netbox/dcim/models/racks.py:56 +#: netbox/dcim/models/racks.py:55 msgid "Height in rack units" msgstr "" -#: netbox/dcim/models/racks.py:60 +#: netbox/dcim/models/racks.py:59 msgid "starting unit" msgstr "" -#: netbox/dcim/models/racks.py:62 +#: netbox/dcim/models/racks.py:61 msgid "Starting unit for rack" msgstr "" -#: netbox/dcim/models/racks.py:66 +#: netbox/dcim/models/racks.py:65 msgid "descending units" msgstr "" -#: netbox/dcim/models/racks.py:67 +#: netbox/dcim/models/racks.py:66 msgid "Units are numbered top-to-bottom" msgstr "" -#: netbox/dcim/models/racks.py:72 +#: netbox/dcim/models/racks.py:71 msgid "outer width" msgstr "" -#: netbox/dcim/models/racks.py:75 +#: netbox/dcim/models/racks.py:74 msgid "Outer dimension of rack (width)" msgstr "" -#: netbox/dcim/models/racks.py:78 +#: netbox/dcim/models/racks.py:77 msgid "outer depth" msgstr "" -#: netbox/dcim/models/racks.py:81 +#: netbox/dcim/models/racks.py:80 msgid "Outer dimension of rack (depth)" msgstr "" -#: netbox/dcim/models/racks.py:84 +#: netbox/dcim/models/racks.py:83 msgid "outer unit" msgstr "" @@ -6261,7 +6726,7 @@ msgstr "" msgid "Maximum load capacity for the rack" msgstr "" -#: netbox/dcim/models/racks.py:125 netbox/dcim/models/racks.py:252 +#: netbox/dcim/models/racks.py:125 netbox/dcim/models/racks.py:247 msgid "form factor" msgstr "" @@ -6273,180 +6738,180 @@ msgstr "" msgid "rack types" msgstr "" -#: netbox/dcim/models/racks.py:180 netbox/dcim/models/racks.py:379 +#: netbox/dcim/models/racks.py:177 netbox/dcim/models/racks.py:368 msgid "Must specify a unit when setting an outer width/depth" msgstr "" -#: netbox/dcim/models/racks.py:184 netbox/dcim/models/racks.py:383 +#: netbox/dcim/models/racks.py:181 netbox/dcim/models/racks.py:372 msgid "Must specify a unit when setting a maximum weight" msgstr "" -#: netbox/dcim/models/racks.py:230 +#: netbox/dcim/models/racks.py:227 msgid "rack role" msgstr "" -#: netbox/dcim/models/racks.py:231 +#: netbox/dcim/models/racks.py:228 msgid "rack roles" msgstr "" -#: netbox/dcim/models/racks.py:274 +#: netbox/dcim/models/racks.py:265 msgid "facility ID" msgstr "" -#: netbox/dcim/models/racks.py:275 +#: netbox/dcim/models/racks.py:266 msgid "Locally-assigned identifier" msgstr "" -#: netbox/dcim/models/racks.py:308 netbox/ipam/forms/bulk_import.py:201 -#: netbox/ipam/forms/bulk_import.py:266 netbox/ipam/forms/bulk_import.py:301 -#: netbox/ipam/forms/bulk_import.py:483 -#: netbox/virtualization/forms/bulk_import.py:112 +#: netbox/dcim/models/racks.py:299 netbox/ipam/forms/bulk_import.py:197 +#: netbox/ipam/forms/bulk_import.py:265 netbox/ipam/forms/bulk_import.py:300 +#: netbox/ipam/forms/bulk_import.py:482 +#: netbox/virtualization/forms/bulk_import.py:118 msgid "Functional role" msgstr "" -#: netbox/dcim/models/racks.py:321 +#: netbox/dcim/models/racks.py:312 msgid "A unique tag used to identify this rack" msgstr "" -#: netbox/dcim/models/racks.py:359 +#: netbox/dcim/models/racks.py:351 msgid "rack" msgstr "" -#: netbox/dcim/models/racks.py:360 +#: netbox/dcim/models/racks.py:352 msgid "racks" msgstr "" -#: netbox/dcim/models/racks.py:375 +#: netbox/dcim/models/racks.py:364 #, python-brace-format msgid "Assigned location must belong to parent site ({site})." msgstr "" -#: netbox/dcim/models/racks.py:393 +#: netbox/dcim/models/racks.py:383 #, python-brace-format msgid "" "Rack must be at least {min_height}U tall to house currently installed " "devices." msgstr "" -#: netbox/dcim/models/racks.py:400 +#: netbox/dcim/models/racks.py:391 #, python-brace-format msgid "" "Rack unit numbering must begin at {position} or less to house currently " "installed devices." msgstr "" -#: netbox/dcim/models/racks.py:408 +#: netbox/dcim/models/racks.py:399 #, python-brace-format msgid "Location must be from the same site, {site}." msgstr "" -#: netbox/dcim/models/racks.py:670 +#: netbox/dcim/models/racks.py:661 msgid "units" msgstr "" -#: netbox/dcim/models/racks.py:696 +#: netbox/dcim/models/racks.py:687 msgid "rack reservation" msgstr "" -#: netbox/dcim/models/racks.py:697 +#: netbox/dcim/models/racks.py:688 msgid "rack reservations" msgstr "" -#: netbox/dcim/models/racks.py:714 +#: netbox/dcim/models/racks.py:702 #, python-brace-format msgid "Invalid unit(s) for {height}U rack: {unit_list}" msgstr "" -#: netbox/dcim/models/racks.py:727 +#: netbox/dcim/models/racks.py:715 #, python-brace-format msgid "The following units have already been reserved: {unit_list}" msgstr "" -#: netbox/dcim/models/sites.py:49 +#: netbox/dcim/models/sites.py:53 msgid "A top-level region with this name already exists." msgstr "" -#: netbox/dcim/models/sites.py:59 +#: netbox/dcim/models/sites.py:63 msgid "A top-level region with this slug already exists." msgstr "" -#: netbox/dcim/models/sites.py:62 +#: netbox/dcim/models/sites.py:66 msgid "region" msgstr "" -#: netbox/dcim/models/sites.py:63 +#: netbox/dcim/models/sites.py:67 msgid "regions" msgstr "" -#: netbox/dcim/models/sites.py:102 +#: netbox/dcim/models/sites.py:109 msgid "A top-level site group with this name already exists." msgstr "" -#: netbox/dcim/models/sites.py:112 +#: netbox/dcim/models/sites.py:119 msgid "A top-level site group with this slug already exists." msgstr "" -#: netbox/dcim/models/sites.py:115 +#: netbox/dcim/models/sites.py:122 msgid "site group" msgstr "" -#: netbox/dcim/models/sites.py:116 +#: netbox/dcim/models/sites.py:123 msgid "site groups" msgstr "" -#: netbox/dcim/models/sites.py:141 +#: netbox/dcim/models/sites.py:145 msgid "Full name of the site" msgstr "" -#: netbox/dcim/models/sites.py:181 netbox/dcim/models/sites.py:279 +#: netbox/dcim/models/sites.py:181 netbox/dcim/models/sites.py:283 msgid "facility" msgstr "" -#: netbox/dcim/models/sites.py:184 netbox/dcim/models/sites.py:282 +#: netbox/dcim/models/sites.py:184 netbox/dcim/models/sites.py:286 msgid "Local facility ID or description" msgstr "" -#: netbox/dcim/models/sites.py:195 +#: netbox/dcim/models/sites.py:196 msgid "physical address" msgstr "" -#: netbox/dcim/models/sites.py:198 +#: netbox/dcim/models/sites.py:199 msgid "Physical location of the building" msgstr "" -#: netbox/dcim/models/sites.py:201 +#: netbox/dcim/models/sites.py:202 msgid "shipping address" msgstr "" -#: netbox/dcim/models/sites.py:204 +#: netbox/dcim/models/sites.py:205 msgid "If different from the physical address" msgstr "" -#: netbox/dcim/models/sites.py:238 +#: netbox/dcim/models/sites.py:245 msgid "site" msgstr "" -#: netbox/dcim/models/sites.py:239 +#: netbox/dcim/models/sites.py:246 msgid "sites" msgstr "" -#: netbox/dcim/models/sites.py:309 +#: netbox/dcim/models/sites.py:319 msgid "A location with this name already exists within the specified site." msgstr "" -#: netbox/dcim/models/sites.py:319 +#: netbox/dcim/models/sites.py:329 msgid "A location with this slug already exists within the specified site." msgstr "" -#: netbox/dcim/models/sites.py:322 +#: netbox/dcim/models/sites.py:332 msgid "location" msgstr "" -#: netbox/dcim/models/sites.py:323 +#: netbox/dcim/models/sites.py:333 msgid "locations" msgstr "" -#: netbox/dcim/models/sites.py:337 +#: netbox/dcim/models/sites.py:344 #, python-brace-format msgid "Parent location ({parent}) must belong to the same site ({site})." msgstr "" @@ -6459,11 +6924,11 @@ msgstr "" msgid "Termination B" msgstr "" -#: netbox/dcim/tables/cables.py:66 netbox/wireless/tables/wirelesslink.py:23 +#: netbox/dcim/tables/cables.py:66 netbox/wireless/tables/wirelesslink.py:22 msgid "Device A" msgstr "" -#: netbox/dcim/tables/cables.py:72 netbox/wireless/tables/wirelesslink.py:32 +#: netbox/dcim/tables/cables.py:72 netbox/wireless/tables/wirelesslink.py:31 msgid "Device B" msgstr "" @@ -6497,23 +6962,23 @@ msgstr "" msgid "Reachable" msgstr "" -#: netbox/dcim/tables/devices.py:58 netbox/dcim/tables/devices.py:106 -#: netbox/dcim/tables/racks.py:150 netbox/dcim/tables/sites.py:105 +#: netbox/dcim/tables/devices.py:69 netbox/dcim/tables/devices.py:117 +#: netbox/dcim/tables/racks.py:149 netbox/dcim/tables/sites.py:105 #: netbox/dcim/tables/sites.py:148 netbox/extras/tables/tables.py:545 #: netbox/netbox/navigation/menu.py:69 netbox/netbox/navigation/menu.py:73 #: netbox/netbox/navigation/menu.py:75 -#: netbox/virtualization/forms/model_forms.py:122 -#: netbox/virtualization/tables/clusters.py:83 -#: netbox/virtualization/views.py:204 +#: netbox/virtualization/forms/model_forms.py:121 +#: netbox/virtualization/tables/clusters.py:86 +#: netbox/virtualization/views.py:218 msgid "Devices" msgstr "" -#: netbox/dcim/tables/devices.py:63 netbox/dcim/tables/devices.py:111 -#: netbox/virtualization/tables/clusters.py:88 +#: netbox/dcim/tables/devices.py:74 netbox/dcim/tables/devices.py:122 +#: netbox/virtualization/tables/clusters.py:91 msgid "VMs" msgstr "" -#: netbox/dcim/tables/devices.py:100 netbox/dcim/tables/devices.py:216 +#: netbox/dcim/tables/devices.py:111 netbox/dcim/tables/devices.py:226 #: netbox/extras/forms/model_forms.py:630 netbox/templates/dcim/device.html:112 #: netbox/templates/dcim/device/render_config.html:11 #: netbox/templates/dcim/device/render_config.html:14 @@ -6523,70 +6988,66 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine.html:48 #: netbox/templates/virtualization/virtualmachine/render_config.html:11 #: netbox/templates/virtualization/virtualmachine/render_config.html:14 -#: netbox/virtualization/tables/virtualmachines.py:107 +#: netbox/virtualization/tables/virtualmachines.py:77 msgid "Config Template" msgstr "" -#: netbox/dcim/tables/devices.py:150 netbox/templates/dcim/sitegroup.html:26 -msgid "Site Group" -msgstr "" - -#: netbox/dcim/tables/devices.py:187 netbox/dcim/tables/devices.py:1068 -#: netbox/ipam/forms/bulk_import.py:527 netbox/ipam/forms/model_forms.py:306 -#: netbox/ipam/forms/model_forms.py:319 netbox/ipam/tables/ip.py:356 -#: netbox/ipam/tables/ip.py:423 netbox/ipam/tables/ip.py:446 +#: netbox/dcim/tables/devices.py:197 netbox/dcim/tables/devices.py:1099 +#: netbox/ipam/forms/bulk_import.py:562 netbox/ipam/forms/model_forms.py:308 +#: netbox/ipam/forms/model_forms.py:321 netbox/ipam/tables/ip.py:306 +#: netbox/ipam/tables/ip.py:373 netbox/ipam/tables/ip.py:396 #: netbox/templates/ipam/ipaddress.html:11 -#: netbox/virtualization/tables/virtualmachines.py:95 +#: netbox/virtualization/tables/virtualmachines.py:65 msgid "IP Address" msgstr "" -#: netbox/dcim/tables/devices.py:191 netbox/dcim/tables/devices.py:1072 -#: netbox/virtualization/tables/virtualmachines.py:86 +#: netbox/dcim/tables/devices.py:201 netbox/dcim/tables/devices.py:1103 +#: netbox/virtualization/tables/virtualmachines.py:56 msgid "IPv4 Address" msgstr "" -#: netbox/dcim/tables/devices.py:195 netbox/dcim/tables/devices.py:1076 -#: netbox/virtualization/tables/virtualmachines.py:90 +#: netbox/dcim/tables/devices.py:205 netbox/dcim/tables/devices.py:1107 +#: netbox/virtualization/tables/virtualmachines.py:60 msgid "IPv6 Address" msgstr "" -#: netbox/dcim/tables/devices.py:210 +#: netbox/dcim/tables/devices.py:220 msgid "VC Position" msgstr "" -#: netbox/dcim/tables/devices.py:213 +#: netbox/dcim/tables/devices.py:223 msgid "VC Priority" msgstr "" -#: netbox/dcim/tables/devices.py:220 netbox/templates/dcim/device_edit.html:38 +#: netbox/dcim/tables/devices.py:230 netbox/templates/dcim/device_edit.html:38 #: netbox/templates/dcim/devicebay_populate.html:16 msgid "Parent Device" msgstr "" -#: netbox/dcim/tables/devices.py:225 +#: netbox/dcim/tables/devices.py:235 msgid "Position (Device Bay)" msgstr "" -#: netbox/dcim/tables/devices.py:234 +#: netbox/dcim/tables/devices.py:244 msgid "Console ports" msgstr "" -#: netbox/dcim/tables/devices.py:237 +#: netbox/dcim/tables/devices.py:247 msgid "Console server ports" msgstr "" -#: netbox/dcim/tables/devices.py:240 +#: netbox/dcim/tables/devices.py:250 msgid "Power ports" msgstr "" -#: netbox/dcim/tables/devices.py:243 +#: netbox/dcim/tables/devices.py:253 msgid "Power outlets" msgstr "" -#: netbox/dcim/tables/devices.py:246 netbox/dcim/tables/devices.py:1081 -#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1040 -#: netbox/dcim/views.py:1279 netbox/dcim/views.py:1975 -#: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:250 +#: netbox/dcim/tables/devices.py:256 netbox/dcim/tables/devices.py:1112 +#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1112 +#: netbox/dcim/views.py:1356 netbox/dcim/views.py:2107 +#: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:258 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 #: netbox/templates/dcim/devicetype/base.html:34 @@ -6596,35 +7057,35 @@ msgstr "" #: netbox/templates/dcim/virtualdevicecontext.html:81 #: netbox/templates/virtualization/virtualmachine/base.html:27 #: netbox/templates/virtualization/virtualmachine_list.html:14 -#: netbox/virtualization/tables/virtualmachines.py:101 -#: netbox/virtualization/views.py:364 netbox/wireless/tables/wirelesslan.py:55 +#: netbox/virtualization/tables/virtualmachines.py:71 +#: netbox/virtualization/views.py:383 netbox/wireless/tables/wirelesslan.py:62 msgid "Interfaces" msgstr "" -#: netbox/dcim/tables/devices.py:249 +#: netbox/dcim/tables/devices.py:259 msgid "Front ports" msgstr "" -#: netbox/dcim/tables/devices.py:255 +#: netbox/dcim/tables/devices.py:265 msgid "Device bays" msgstr "" -#: netbox/dcim/tables/devices.py:258 +#: netbox/dcim/tables/devices.py:268 msgid "Module bays" msgstr "" -#: netbox/dcim/tables/devices.py:261 +#: netbox/dcim/tables/devices.py:271 msgid "Inventory items" msgstr "" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 +#: netbox/dcim/tables/devices.py:314 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "" -#: netbox/dcim/tables/devices.py:318 netbox/dcim/tables/devicetypes.py:47 -#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1115 -#: netbox/dcim/views.py:2073 netbox/netbox/navigation/menu.py:103 +#: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:47 +#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1187 +#: netbox/dcim/views.py:2205 netbox/netbox/navigation/menu.py:103 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -6633,85 +7094,89 @@ msgstr "" msgid "Inventory Items" msgstr "" -#: netbox/dcim/tables/devices.py:333 +#: netbox/dcim/tables/devices.py:342 msgid "Cable Color" msgstr "" -#: netbox/dcim/tables/devices.py:339 +#: netbox/dcim/tables/devices.py:348 msgid "Link Peers" msgstr "" -#: netbox/dcim/tables/devices.py:342 +#: netbox/dcim/tables/devices.py:351 msgid "Mark Connected" msgstr "" -#: netbox/dcim/tables/devices.py:461 +#: netbox/dcim/tables/devices.py:470 msgid "Maximum draw (W)" msgstr "" -#: netbox/dcim/tables/devices.py:464 +#: netbox/dcim/tables/devices.py:473 msgid "Allocated draw (W)" msgstr "" -#: netbox/dcim/tables/devices.py:558 netbox/ipam/forms/model_forms.py:734 -#: netbox/ipam/tables/fhrp.py:28 netbox/ipam/views.py:596 -#: netbox/ipam/views.py:696 netbox/netbox/navigation/menu.py:158 -#: netbox/netbox/navigation/menu.py:160 -#: netbox/templates/dcim/interface.html:339 +#: netbox/dcim/tables/devices.py:571 netbox/ipam/forms/model_forms.py:776 +#: netbox/ipam/tables/fhrp.py:28 netbox/ipam/views.py:633 +#: netbox/ipam/views.py:738 netbox/netbox/navigation/menu.py:164 +#: netbox/netbox/navigation/menu.py:166 +#: netbox/templates/dcim/interface.html:396 #: netbox/templates/ipam/ipaddress_bulk_add.html:15 #: netbox/templates/ipam/service.html:40 -#: netbox/templates/virtualization/vminterface.html:85 +#: netbox/templates/virtualization/vminterface.html:101 #: netbox/vpn/tables/tunnels.py:98 msgid "IP Addresses" msgstr "" -#: netbox/dcim/tables/devices.py:564 netbox/netbox/navigation/menu.py:202 +#: netbox/dcim/tables/devices.py:577 netbox/netbox/navigation/menu.py:210 #: netbox/templates/ipam/inc/panels/fhrp_groups.html:6 msgid "FHRP Groups" msgstr "" -#: netbox/dcim/tables/devices.py:576 netbox/templates/dcim/interface.html:89 -#: netbox/templates/virtualization/vminterface.html:67 +#: netbox/dcim/tables/devices.py:589 netbox/templates/dcim/interface.html:95 +#: netbox/templates/virtualization/vminterface.html:59 #: netbox/templates/vpn/tunnel.html:18 #: netbox/templates/vpn/tunneltermination.html:13 #: netbox/vpn/forms/bulk_edit.py:76 netbox/vpn/forms/bulk_import.py:76 #: netbox/vpn/forms/filtersets.py:42 netbox/vpn/forms/filtersets.py:82 -#: netbox/vpn/forms/model_forms.py:60 netbox/vpn/forms/model_forms.py:145 +#: netbox/vpn/forms/model_forms.py:61 netbox/vpn/forms/model_forms.py:146 #: netbox/vpn/tables/tunnels.py:78 msgid "Tunnel" msgstr "" -#: netbox/dcim/tables/devices.py:604 netbox/dcim/tables/devicetypes.py:227 +#: netbox/dcim/tables/devices.py:625 netbox/dcim/tables/devicetypes.py:229 #: netbox/templates/dcim/interface.html:65 msgid "Management Only" msgstr "" -#: netbox/dcim/tables/devices.py:623 +#: netbox/dcim/tables/devices.py:644 msgid "VDCs" msgstr "" -#: netbox/dcim/tables/devices.py:873 netbox/templates/dcim/modulebay.html:53 +#: netbox/dcim/tables/devices.py:651 netbox/templates/dcim/interface.html:163 +msgid "Virtual Circuit" +msgstr "" + +#: netbox/dcim/tables/devices.py:903 netbox/templates/dcim/modulebay.html:53 msgid "Installed Module" msgstr "" -#: netbox/dcim/tables/devices.py:876 +#: netbox/dcim/tables/devices.py:906 msgid "Module Serial" msgstr "" -#: netbox/dcim/tables/devices.py:880 +#: netbox/dcim/tables/devices.py:910 msgid "Module Asset Tag" msgstr "" -#: netbox/dcim/tables/devices.py:889 +#: netbox/dcim/tables/devices.py:919 msgid "Module Status" msgstr "" -#: netbox/dcim/tables/devices.py:944 netbox/dcim/tables/devicetypes.py:312 -#: netbox/templates/dcim/inventoryitem.html:40 +#: netbox/dcim/tables/devices.py:973 netbox/dcim/tables/devicetypes.py:314 +#: netbox/templates/dcim/inventoryitem.html:44 msgid "Component" msgstr "" -#: netbox/dcim/tables/devices.py:1000 +#: netbox/dcim/tables/devices.py:1031 msgid "Items" msgstr "" @@ -6749,8 +7214,8 @@ msgstr "" msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:980 -#: netbox/dcim/views.py:1219 netbox/dcim/views.py:1911 +#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1052 +#: netbox/dcim/views.py:1296 netbox/dcim/views.py:2043 #: netbox/netbox/navigation/menu.py:97 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -6760,8 +7225,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:995 -#: netbox/dcim/views.py:1234 netbox/dcim/views.py:1927 +#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1067 +#: netbox/dcim/views.py:1311 netbox/dcim/views.py:2059 #: netbox/netbox/navigation/menu.py:98 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -6771,8 +7236,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1010 -#: netbox/dcim/views.py:1249 netbox/dcim/views.py:1943 +#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1082 +#: netbox/dcim/views.py:1326 netbox/dcim/views.py:2075 #: netbox/netbox/navigation/menu.py:99 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -6782,8 +7247,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1025 -#: netbox/dcim/views.py:1264 netbox/dcim/views.py:1959 +#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1097 +#: netbox/dcim/views.py:1341 netbox/dcim/views.py:2091 #: netbox/netbox/navigation/menu.py:100 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -6793,8 +7258,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1055 -#: netbox/dcim/views.py:1294 netbox/dcim/views.py:1997 +#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1127 +#: netbox/dcim/views.py:1371 netbox/dcim/views.py:2129 #: netbox/netbox/navigation/menu.py:95 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -6803,8 +7268,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1070 -#: netbox/dcim/views.py:1309 netbox/dcim/views.py:2013 +#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1142 +#: netbox/dcim/views.py:1386 netbox/dcim/views.py:2145 #: netbox/netbox/navigation/menu.py:96 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -6814,16 +7279,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1100 -#: netbox/dcim/views.py:2053 netbox/netbox/navigation/menu.py:102 +#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1172 +#: netbox/dcim/views.py:2185 netbox/netbox/navigation/menu.py:102 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1085 -#: netbox/dcim/views.py:1324 netbox/dcim/views.py:2033 +#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1157 +#: netbox/dcim/views.py:1401 netbox/dcim/views.py:2165 #: netbox/netbox/navigation/menu.py:101 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 @@ -6833,7 +7298,7 @@ msgstr "" msgid "Module Bays" msgstr "" -#: netbox/dcim/tables/power.py:36 netbox/netbox/navigation/menu.py:297 +#: netbox/dcim/tables/power.py:36 netbox/netbox/navigation/menu.py:318 #: netbox/templates/dcim/powerpanel.html:51 msgid "Power Feeds" msgstr "" @@ -6852,39 +7317,39 @@ msgstr "" msgid "Racks" msgstr "" -#: netbox/dcim/tables/racks.py:63 netbox/dcim/tables/racks.py:142 +#: netbox/dcim/tables/racks.py:63 netbox/dcim/tables/racks.py:141 #: netbox/templates/dcim/device.html:318 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:14 msgid "Height" msgstr "" -#: netbox/dcim/tables/racks.py:67 netbox/dcim/tables/racks.py:165 +#: netbox/dcim/tables/racks.py:67 netbox/dcim/tables/racks.py:164 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:18 msgid "Outer Width" msgstr "" -#: netbox/dcim/tables/racks.py:71 netbox/dcim/tables/racks.py:169 +#: netbox/dcim/tables/racks.py:71 netbox/dcim/tables/racks.py:168 #: netbox/templates/dcim/inc/panels/racktype_dimensions.html:28 msgid "Outer Depth" msgstr "" -#: netbox/dcim/tables/racks.py:79 netbox/dcim/tables/racks.py:177 +#: netbox/dcim/tables/racks.py:79 netbox/dcim/tables/racks.py:176 msgid "Max Weight" msgstr "" -#: netbox/dcim/tables/racks.py:154 +#: netbox/dcim/tables/racks.py:153 msgid "Space" msgstr "" #: netbox/dcim/tables/sites.py:30 netbox/dcim/tables/sites.py:57 #: netbox/extras/forms/filtersets.py:351 netbox/extras/forms/model_forms.py:517 -#: netbox/ipam/forms/bulk_edit.py:131 netbox/ipam/forms/model_forms.py:153 +#: netbox/ipam/forms/bulk_edit.py:134 netbox/ipam/forms/model_forms.py:159 #: netbox/ipam/tables/asn.py:66 netbox/netbox/navigation/menu.py:15 #: netbox/netbox/navigation/menu.py:17 msgid "Sites" msgstr "" -#: netbox/dcim/tests/test_api.py:47 +#: netbox/dcim/tests/test_api.py:48 msgid "Test case must set peer_termination_type" msgstr "" @@ -6893,62 +7358,62 @@ msgstr "" msgid "Disconnected {count} {type}" msgstr "" -#: netbox/dcim/views.py:738 netbox/netbox/navigation/menu.py:51 +#: netbox/dcim/views.py:794 netbox/netbox/navigation/menu.py:51 msgid "Reservations" msgstr "" -#: netbox/dcim/views.py:757 netbox/templates/dcim/location.html:90 +#: netbox/dcim/views.py:813 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2086 netbox/extras/forms/model_forms.py:577 +#: netbox/dcim/views.py:2218 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 -#: netbox/virtualization/forms/model_forms.py:225 -#: netbox/virtualization/views.py:405 +#: netbox/virtualization/forms/model_forms.py:224 +#: netbox/virtualization/views.py:424 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2096 netbox/virtualization/views.py:415 +#: netbox/dcim/views.py:2228 netbox/virtualization/views.py:434 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2131 netbox/virtualization/views.py:450 +#: netbox/dcim/views.py:2263 netbox/virtualization/views.py:469 #, python-brace-format msgid "An error occurred while rendering the template: {error}" msgstr "" -#: netbox/dcim/views.py:2149 netbox/extras/tables/tables.py:550 -#: netbox/netbox/navigation/menu.py:247 netbox/netbox/navigation/menu.py:249 -#: netbox/virtualization/views.py:178 +#: netbox/dcim/views.py:2281 netbox/extras/tables/tables.py:550 +#: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 +#: netbox/virtualization/views.py:192 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:2907 +#: netbox/dcim/views.py:3114 #, python-brace-format msgid "Installed device {device} in bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:2948 +#: netbox/dcim/views.py:3155 #, python-brace-format msgid "Removed device {device} from bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3054 netbox/ipam/tables/ip.py:234 +#: netbox/dcim/views.py:3271 netbox/ipam/tables/ip.py:180 msgid "Children" msgstr "" -#: netbox/dcim/views.py:3520 +#: netbox/dcim/views.py:3738 #, python-brace-format msgid "Added member {device}" msgstr "" -#: netbox/dcim/views.py:3567 +#: netbox/dcim/views.py:3787 #, python-brace-format msgid "Unable to remove master device {device} from the virtual chassis." msgstr "" -#: netbox/dcim/views.py:3580 +#: netbox/dcim/views.py:3800 #, python-brace-format msgid "Removed {device} from virtual chassis {chassis}" msgstr "" @@ -7047,7 +7512,7 @@ msgstr "" #: netbox/extras/choices.py:108 netbox/templates/tenancy/contact.html:57 #: netbox/tenancy/forms/bulk_edit.py:118 -#: netbox/wireless/forms/model_forms.py:168 +#: netbox/wireless/forms/model_forms.py:171 msgid "Link" msgstr "" @@ -7087,7 +7552,7 @@ msgstr "" msgid "Debug" msgstr "" -#: netbox/extras/choices.py:166 netbox/netbox/choices.py:101 +#: netbox/extras/choices.py:166 netbox/netbox/choices.py:103 msgid "Default" msgstr "" @@ -7095,22 +7560,10 @@ msgstr "" msgid "Failure" msgstr "" -#: netbox/extras/choices.py:186 -msgid "Hourly" -msgstr "" - #: netbox/extras/choices.py:187 msgid "12 hours" msgstr "" -#: netbox/extras/choices.py:188 -msgid "Daily" -msgstr "" - -#: netbox/extras/choices.py:189 -msgid "Weekly" -msgstr "" - #: netbox/extras/choices.py:190 msgid "30 days" msgstr "" @@ -7120,6 +7573,7 @@ msgstr "" #: netbox/templates/generic/bulk_add_component.html:68 #: netbox/templates/generic/object_edit.html:47 #: netbox/templates/generic/object_edit.html:80 +#: netbox/templates/htmx/quick_add.html:24 #: netbox/templates/ipam/inc/ipaddress_edit_header.html:7 msgid "Create" msgstr "" @@ -7143,67 +7597,67 @@ msgstr "" msgid "Delete" msgstr "" -#: netbox/extras/choices.py:252 netbox/netbox/choices.py:57 -#: netbox/netbox/choices.py:102 +#: netbox/extras/choices.py:252 netbox/netbox/choices.py:59 +#: netbox/netbox/choices.py:104 msgid "Blue" msgstr "" -#: netbox/extras/choices.py:253 netbox/netbox/choices.py:56 -#: netbox/netbox/choices.py:103 +#: netbox/extras/choices.py:253 netbox/netbox/choices.py:58 +#: netbox/netbox/choices.py:105 msgid "Indigo" msgstr "" -#: netbox/extras/choices.py:254 netbox/netbox/choices.py:54 -#: netbox/netbox/choices.py:104 +#: netbox/extras/choices.py:254 netbox/netbox/choices.py:56 +#: netbox/netbox/choices.py:106 msgid "Purple" msgstr "" -#: netbox/extras/choices.py:255 netbox/netbox/choices.py:51 -#: netbox/netbox/choices.py:105 +#: netbox/extras/choices.py:255 netbox/netbox/choices.py:53 +#: netbox/netbox/choices.py:107 msgid "Pink" msgstr "" -#: netbox/extras/choices.py:256 netbox/netbox/choices.py:50 -#: netbox/netbox/choices.py:106 +#: netbox/extras/choices.py:256 netbox/netbox/choices.py:52 +#: netbox/netbox/choices.py:108 msgid "Red" msgstr "" -#: netbox/extras/choices.py:257 netbox/netbox/choices.py:68 -#: netbox/netbox/choices.py:107 +#: netbox/extras/choices.py:257 netbox/netbox/choices.py:70 +#: netbox/netbox/choices.py:109 msgid "Orange" msgstr "" -#: netbox/extras/choices.py:258 netbox/netbox/choices.py:66 -#: netbox/netbox/choices.py:108 +#: netbox/extras/choices.py:258 netbox/netbox/choices.py:68 +#: netbox/netbox/choices.py:110 msgid "Yellow" msgstr "" -#: netbox/extras/choices.py:259 netbox/netbox/choices.py:63 -#: netbox/netbox/choices.py:109 +#: netbox/extras/choices.py:259 netbox/netbox/choices.py:65 +#: netbox/netbox/choices.py:111 msgid "Green" msgstr "" -#: netbox/extras/choices.py:260 netbox/netbox/choices.py:60 -#: netbox/netbox/choices.py:110 +#: netbox/extras/choices.py:260 netbox/netbox/choices.py:62 +#: netbox/netbox/choices.py:112 msgid "Teal" msgstr "" -#: netbox/extras/choices.py:261 netbox/netbox/choices.py:59 -#: netbox/netbox/choices.py:111 +#: netbox/extras/choices.py:261 netbox/netbox/choices.py:61 +#: netbox/netbox/choices.py:113 msgid "Cyan" msgstr "" -#: netbox/extras/choices.py:262 netbox/netbox/choices.py:112 +#: netbox/extras/choices.py:262 netbox/netbox/choices.py:114 msgid "Gray" msgstr "" -#: netbox/extras/choices.py:263 netbox/netbox/choices.py:74 -#: netbox/netbox/choices.py:113 +#: netbox/extras/choices.py:263 netbox/netbox/choices.py:76 +#: netbox/netbox/choices.py:115 msgid "Black" msgstr "" -#: netbox/extras/choices.py:264 netbox/netbox/choices.py:75 -#: netbox/netbox/choices.py:114 +#: netbox/extras/choices.py:264 netbox/netbox/choices.py:77 +#: netbox/netbox/choices.py:116 msgid "White" msgstr "" @@ -7310,29 +7764,33 @@ msgstr "" msgid "RSS Feed" msgstr "" -#: netbox/extras/dashboard/widgets.py:279 +#: netbox/extras/dashboard/widgets.py:280 msgid "Embed an RSS feed from an external website." msgstr "" -#: netbox/extras/dashboard/widgets.py:286 +#: netbox/extras/dashboard/widgets.py:287 msgid "Feed URL" msgstr "" -#: netbox/extras/dashboard/widgets.py:291 -msgid "The maximum number of objects to display" +#: netbox/extras/dashboard/widgets.py:290 +msgid "Requires external connection" msgstr "" #: netbox/extras/dashboard/widgets.py:296 +msgid "The maximum number of objects to display" +msgstr "" + +#: netbox/extras/dashboard/widgets.py:301 msgid "How long to stored the cached content (in seconds)" msgstr "" -#: netbox/extras/dashboard/widgets.py:348 netbox/templates/account/base.html:10 +#: netbox/extras/dashboard/widgets.py:358 netbox/templates/account/base.html:10 #: netbox/templates/account/bookmarks.html:7 -#: netbox/templates/inc/user_menu.html:48 +#: netbox/templates/inc/user_menu.html:43 msgid "Bookmarks" msgstr "" -#: netbox/extras/dashboard/widgets.py:352 +#: netbox/extras/dashboard/widgets.py:362 msgid "Show your personal bookmarks" msgstr "" @@ -7361,17 +7819,17 @@ msgid "Group (name)" msgstr "" #: netbox/extras/filtersets.py:574 -#: netbox/virtualization/forms/filtersets.py:118 +#: netbox/virtualization/forms/filtersets.py:123 msgid "Cluster type" msgstr "" -#: netbox/extras/filtersets.py:580 netbox/virtualization/filtersets.py:95 -#: netbox/virtualization/filtersets.py:147 +#: netbox/extras/filtersets.py:580 netbox/virtualization/filtersets.py:61 +#: netbox/virtualization/filtersets.py:113 msgid "Cluster type (slug)" msgstr "" #: netbox/extras/filtersets.py:601 netbox/tenancy/forms/forms.py:16 -#: netbox/tenancy/forms/forms.py:39 +#: netbox/tenancy/forms/forms.py:40 msgid "Tenant group" msgstr "" @@ -7601,7 +8059,7 @@ msgid "The classification of entry" msgstr "" #: netbox/extras/forms/bulk_import.py:261 -#: netbox/extras/forms/model_forms.py:320 netbox/netbox/navigation/menu.py:390 +#: netbox/extras/forms/model_forms.py:320 netbox/netbox/navigation/menu.py:411 #: netbox/templates/extras/notificationgroup.html:41 #: netbox/templates/users/group.html:29 netbox/users/forms/model_forms.py:236 #: netbox/users/forms/model_forms.py:248 netbox/users/forms/model_forms.py:300 @@ -7614,7 +8072,8 @@ msgid "User names separated by commas, encased with double quotes" msgstr "" #: netbox/extras/forms/bulk_import.py:268 -#: netbox/extras/forms/model_forms.py:315 netbox/netbox/navigation/menu.py:410 +#: netbox/extras/forms/model_forms.py:315 netbox/netbox/navigation/menu.py:294 +#: netbox/netbox/navigation/menu.py:431 #: netbox/templates/extras/notificationgroup.html:31 #: netbox/users/forms/model_forms.py:181 netbox/users/forms/model_forms.py:193 #: netbox/users/forms/model_forms.py:305 netbox/users/tables.py:35 @@ -7647,7 +8106,7 @@ msgid "Data" msgstr "" #: netbox/extras/forms/filtersets.py:175 netbox/extras/forms/filtersets.py:333 -#: netbox/extras/forms/filtersets.py:418 netbox/netbox/choices.py:130 +#: netbox/extras/forms/filtersets.py:418 netbox/netbox/choices.py:132 #: netbox/utilities/forms/bulk_import.py:26 msgid "Data file" msgstr "" @@ -7707,7 +8166,7 @@ msgid "Cluster groups" msgstr "" #: netbox/extras/forms/filtersets.py:386 netbox/extras/forms/model_forms.py:552 -#: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 +#: netbox/netbox/navigation/menu.py:263 netbox/netbox/navigation/menu.py:265 #: netbox/templates/virtualization/clustertype.html:30 #: netbox/virtualization/tables/clusters.py:23 #: netbox/virtualization/tables/clusters.py:45 @@ -7933,10 +8392,16 @@ msgstr "" msgid "Database changes have been reverted due to error." msgstr "" -#: netbox/extras/management/commands/reindex.py:66 +#: netbox/extras/management/commands/reindex.py:67 msgid "No indexers found!" msgstr "" +#: netbox/extras/models/configs.py:41 netbox/extras/models/models.py:313 +#: netbox/extras/models/models.py:522 netbox/extras/models/search.py:48 +#: netbox/ipam/models/ip.py:188 netbox/netbox/models/mixins.py:15 +msgid "weight" +msgstr "" + #: netbox/extras/models/configs.py:130 msgid "config context" msgstr "" @@ -8266,27 +8731,27 @@ msgstr "" msgid "Required field cannot be empty." msgstr "" -#: netbox/extras/models/customfields.py:763 +#: netbox/extras/models/customfields.py:764 msgid "Base set of predefined choices (optional)" msgstr "" -#: netbox/extras/models/customfields.py:775 +#: netbox/extras/models/customfields.py:776 msgid "Choices are automatically ordered alphabetically" msgstr "" -#: netbox/extras/models/customfields.py:782 +#: netbox/extras/models/customfields.py:783 msgid "custom field choice set" msgstr "" -#: netbox/extras/models/customfields.py:783 +#: netbox/extras/models/customfields.py:784 msgid "custom field choice sets" msgstr "" -#: netbox/extras/models/customfields.py:825 +#: netbox/extras/models/customfields.py:826 msgid "Must define base or extra choices." msgstr "" -#: netbox/extras/models/customfields.py:849 +#: netbox/extras/models/customfields.py:850 #, python-brace-format msgid "" "Cannot remove choice {choice} as there are {model} objects which reference " @@ -8556,20 +9021,20 @@ msgstr "" msgid "journal entries" msgstr "" -#: netbox/extras/models/models.py:718 +#: netbox/extras/models/models.py:721 #, python-brace-format msgid "Journaling is not supported for this object type ({type})." msgstr "" -#: netbox/extras/models/models.py:760 +#: netbox/extras/models/models.py:763 msgid "bookmark" msgstr "" -#: netbox/extras/models/models.py:761 +#: netbox/extras/models/models.py:764 msgid "bookmarks" msgstr "" -#: netbox/extras/models/models.py:774 +#: netbox/extras/models/models.py:777 #, python-brace-format msgid "Bookmarks cannot be assigned to this object type ({type})." msgstr "" @@ -8661,19 +9126,19 @@ msgstr "" msgid "cached values" msgstr "" -#: netbox/extras/models/staging.py:44 +#: netbox/extras/models/staging.py:45 msgid "branch" msgstr "" -#: netbox/extras/models/staging.py:45 +#: netbox/extras/models/staging.py:46 msgid "branches" msgstr "" -#: netbox/extras/models/staging.py:97 +#: netbox/extras/models/staging.py:105 msgid "staged change" msgstr "" -#: netbox/extras/models/staging.py:98 +#: netbox/extras/models/staging.py:106 msgid "staged changes" msgstr "" @@ -8874,27 +9339,27 @@ msgstr "" msgid "Invalid attribute \"{name}\" for {model}" msgstr "" -#: netbox/extras/views.py:960 +#: netbox/extras/views.py:1029 msgid "Your dashboard has been reset." msgstr "" -#: netbox/extras/views.py:1006 +#: netbox/extras/views.py:1075 msgid "Added widget: " msgstr "" -#: netbox/extras/views.py:1047 +#: netbox/extras/views.py:1116 msgid "Updated widget: " msgstr "" -#: netbox/extras/views.py:1083 +#: netbox/extras/views.py:1152 msgid "Deleted widget: " msgstr "" -#: netbox/extras/views.py:1085 +#: netbox/extras/views.py:1154 msgid "Error deleting widget: " msgstr "" -#: netbox/extras/views.py:1175 +#: netbox/extras/views.py:1244 msgid "Unable to run script: RQ worker process not running." msgstr "" @@ -8916,7 +9381,7 @@ msgstr "" msgid "Invalid IP prefix format: {data}" msgstr "" -#: netbox/ipam/api/views.py:358 +#: netbox/ipam/api/views.py:370 msgid "" "Insufficient space is available to accommodate the requested prefix size(s)" msgstr "" @@ -8957,182 +9422,174 @@ msgstr "" msgid "Plaintext" msgstr "" +#: netbox/ipam/choices.py:166 netbox/ipam/forms/model_forms.py:792 +#: netbox/ipam/forms/model_forms.py:820 netbox/templates/ipam/service.html:21 +msgid "Service" +msgstr "" + +#: netbox/ipam/choices.py:167 +msgid "Customer" +msgstr "" + #: netbox/ipam/fields.py:36 #, python-brace-format msgid "Invalid IP address format: {address}" msgstr "" -#: netbox/ipam/filtersets.py:48 netbox/vpn/filtersets.py:304 +#: netbox/ipam/filtersets.py:51 netbox/vpn/filtersets.py:304 msgid "Import target" msgstr "" -#: netbox/ipam/filtersets.py:54 netbox/vpn/filtersets.py:310 +#: netbox/ipam/filtersets.py:57 netbox/vpn/filtersets.py:310 msgid "Import target (name)" msgstr "" -#: netbox/ipam/filtersets.py:59 netbox/vpn/filtersets.py:315 +#: netbox/ipam/filtersets.py:62 netbox/vpn/filtersets.py:315 msgid "Export target" msgstr "" -#: netbox/ipam/filtersets.py:65 netbox/vpn/filtersets.py:321 +#: netbox/ipam/filtersets.py:68 netbox/vpn/filtersets.py:321 msgid "Export target (name)" msgstr "" -#: netbox/ipam/filtersets.py:86 +#: netbox/ipam/filtersets.py:89 msgid "Importing VRF" msgstr "" -#: netbox/ipam/filtersets.py:92 +#: netbox/ipam/filtersets.py:95 msgid "Import VRF (RD)" msgstr "" -#: netbox/ipam/filtersets.py:97 +#: netbox/ipam/filtersets.py:100 msgid "Exporting VRF" msgstr "" -#: netbox/ipam/filtersets.py:103 +#: netbox/ipam/filtersets.py:106 msgid "Export VRF (RD)" msgstr "" -#: netbox/ipam/filtersets.py:108 +#: netbox/ipam/filtersets.py:111 msgid "Importing L2VPN" msgstr "" -#: netbox/ipam/filtersets.py:114 +#: netbox/ipam/filtersets.py:117 msgid "Importing L2VPN (identifier)" msgstr "" -#: netbox/ipam/filtersets.py:119 +#: netbox/ipam/filtersets.py:122 msgid "Exporting L2VPN" msgstr "" -#: netbox/ipam/filtersets.py:125 +#: netbox/ipam/filtersets.py:128 msgid "Exporting L2VPN (identifier)" msgstr "" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 -#: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 +#: netbox/ipam/filtersets.py:158 netbox/ipam/filtersets.py:286 +#: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:158 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "" -#: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:223 +#: netbox/ipam/filtersets.py:162 netbox/ipam/filtersets.py:201 +#: netbox/ipam/filtersets.py:226 msgid "RIR (ID)" msgstr "" -#: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:229 +#: netbox/ipam/filtersets.py:168 netbox/ipam/filtersets.py:207 +#: netbox/ipam/filtersets.py:232 msgid "RIR (slug)" msgstr "" -#: netbox/ipam/filtersets.py:287 +#: netbox/ipam/filtersets.py:290 msgid "Within prefix" msgstr "" -#: netbox/ipam/filtersets.py:291 +#: netbox/ipam/filtersets.py:294 msgid "Within and including prefix" msgstr "" -#: netbox/ipam/filtersets.py:295 +#: netbox/ipam/filtersets.py:298 msgid "Prefixes which contain this prefix or IP" msgstr "" -#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 -#: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 -#: netbox/ipam/forms/filtersets.py:331 +#: netbox/ipam/filtersets.py:309 netbox/ipam/filtersets.py:541 +#: netbox/ipam/forms/bulk_edit.py:327 netbox/ipam/forms/filtersets.py:198 +#: netbox/ipam/forms/filtersets.py:334 msgid "Mask length" msgstr "" -#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:342 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "" -#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:346 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "" -#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 -#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:440 netbox/ipam/filtersets.py:444 +#: netbox/ipam/filtersets.py:536 netbox/ipam/forms/model_forms.py:498 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "" -#: netbox/ipam/filtersets.py:481 +#: netbox/ipam/filtersets.py:448 msgid "Ranges which contain this prefix or IP" msgstr "" -#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 +#: netbox/ipam/filtersets.py:476 netbox/ipam/filtersets.py:532 msgid "Parent prefix" msgstr "" -#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 -#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 -msgid "Virtual machine (name)" -msgstr "" - -#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 -#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 -#: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 -msgid "Virtual machine (ID)" -msgstr "" - -#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 -#: netbox/vpn/filtersets.py:396 -msgid "Interface (name)" -msgstr "" - -#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 -#: netbox/vpn/filtersets.py:407 -msgid "VM interface (name)" -msgstr "" - -#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 -msgid "VM interface (ID)" -msgstr "" - -#: netbox/ipam/filtersets.py:650 +#: netbox/ipam/filtersets.py:617 msgid "FHRP group (ID)" msgstr "" -#: netbox/ipam/filtersets.py:654 +#: netbox/ipam/filtersets.py:621 msgid "Is assigned to an interface" msgstr "" -#: netbox/ipam/filtersets.py:658 +#: netbox/ipam/filtersets.py:625 msgid "Is assigned" msgstr "" -#: netbox/ipam/filtersets.py:670 +#: netbox/ipam/filtersets.py:637 msgid "Service (ID)" msgstr "" -#: netbox/ipam/filtersets.py:675 +#: netbox/ipam/filtersets.py:642 msgid "NAT inside IP address (ID)" msgstr "" -#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 -msgid "Assigned interface" +#: netbox/ipam/filtersets.py:1001 +msgid "Q-in-Q SVLAN (ID)" msgstr "" -#: netbox/ipam/filtersets.py:1048 +#: netbox/ipam/filtersets.py:1005 +msgid "Q-in-Q SVLAN number (1-4094)" +msgstr "" + +#: netbox/ipam/filtersets.py:1026 msgid "Assigned VM interface" msgstr "" -#: netbox/ipam/filtersets.py:1138 +#: netbox/ipam/filtersets.py:1097 +msgid "VLAN Translation Policy (name)" +msgstr "" + +#: netbox/ipam/filtersets.py:1163 msgid "IP address (ID)" msgstr "" -#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1169 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "" -#: netbox/ipam/filtersets.py:1169 +#: netbox/ipam/filtersets.py:1194 msgid "Primary IPv4 (ID)" msgstr "" -#: netbox/ipam/filtersets.py:1174 +#: netbox/ipam/filtersets.py:1199 msgid "Primary IPv6 (ID)" msgstr "" @@ -9165,471 +9622,445 @@ msgstr "" msgid "Address pattern" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:50 +#: netbox/ipam/forms/bulk_edit.py:53 msgid "Enforce unique space" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:88 +#: netbox/ipam/forms/bulk_edit.py:91 msgid "Is private" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:109 netbox/ipam/forms/bulk_edit.py:138 -#: netbox/ipam/forms/bulk_edit.py:163 netbox/ipam/forms/bulk_import.py:89 -#: netbox/ipam/forms/bulk_import.py:109 netbox/ipam/forms/bulk_import.py:129 -#: netbox/ipam/forms/filtersets.py:110 netbox/ipam/forms/filtersets.py:125 -#: netbox/ipam/forms/filtersets.py:148 netbox/ipam/forms/model_forms.py:96 -#: netbox/ipam/forms/model_forms.py:109 netbox/ipam/forms/model_forms.py:131 -#: netbox/ipam/forms/model_forms.py:149 netbox/ipam/models/asns.py:31 -#: netbox/ipam/models/asns.py:103 netbox/ipam/models/ip.py:71 -#: netbox/ipam/models/ip.py:90 netbox/ipam/tables/asn.py:20 +#: netbox/ipam/forms/bulk_edit.py:112 netbox/ipam/forms/bulk_edit.py:141 +#: netbox/ipam/forms/bulk_edit.py:166 netbox/ipam/forms/bulk_import.py:92 +#: netbox/ipam/forms/bulk_import.py:112 netbox/ipam/forms/bulk_import.py:132 +#: netbox/ipam/forms/filtersets.py:112 netbox/ipam/forms/filtersets.py:127 +#: netbox/ipam/forms/filtersets.py:150 netbox/ipam/forms/model_forms.py:99 +#: netbox/ipam/forms/model_forms.py:112 netbox/ipam/forms/model_forms.py:135 +#: netbox/ipam/forms/model_forms.py:154 netbox/ipam/models/asns.py:31 +#: netbox/ipam/models/asns.py:100 netbox/ipam/models/ip.py:71 +#: netbox/ipam/models/ip.py:87 netbox/ipam/tables/asn.py:20 #: netbox/ipam/tables/asn.py:45 netbox/templates/ipam/aggregate.html:18 #: netbox/templates/ipam/asn.html:27 netbox/templates/ipam/asnrange.html:19 #: netbox/templates/ipam/rir.html:19 msgid "RIR" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:171 +#: netbox/ipam/forms/bulk_edit.py:174 msgid "Date added" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:229 netbox/ipam/forms/model_forms.py:619 -#: netbox/ipam/forms/model_forms.py:666 netbox/ipam/tables/ip.py:251 -#: netbox/templates/ipam/vlan_edit.html:37 +#: netbox/ipam/forms/bulk_edit.py:213 netbox/ipam/forms/model_forms.py:621 +#: netbox/ipam/forms/model_forms.py:668 netbox/ipam/tables/ip.py:200 +#: netbox/templates/ipam/vlan_edit.html:45 #: netbox/templates/ipam/vlangroup.html:27 msgid "VLAN Group" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:234 netbox/ipam/forms/bulk_import.py:185 -#: netbox/ipam/forms/filtersets.py:256 netbox/ipam/forms/model_forms.py:218 -#: netbox/ipam/models/vlans.py:250 netbox/ipam/tables/ip.py:255 -#: netbox/templates/ipam/prefix.html:60 netbox/templates/ipam/vlan.html:12 +#: netbox/ipam/forms/bulk_edit.py:218 netbox/ipam/forms/bulk_import.py:181 +#: netbox/ipam/forms/filtersets.py:259 netbox/ipam/forms/model_forms.py:217 +#: netbox/ipam/models/vlans.py:272 netbox/ipam/tables/ip.py:204 +#: netbox/templates/ipam/prefix.html:56 netbox/templates/ipam/vlan.html:12 #: netbox/templates/ipam/vlan/base.html:6 #: netbox/templates/ipam/vlan_edit.html:10 -#: netbox/templates/wireless/wirelesslan.html:30 +#: netbox/templates/wireless/wirelesslan.html:38 #: netbox/vpn/forms/bulk_import.py:304 netbox/vpn/forms/filtersets.py:284 -#: netbox/vpn/forms/model_forms.py:433 netbox/vpn/forms/model_forms.py:452 -#: netbox/wireless/forms/bulk_edit.py:55 -#: netbox/wireless/forms/bulk_import.py:48 -#: netbox/wireless/forms/model_forms.py:48 netbox/wireless/models.py:102 +#: netbox/vpn/forms/model_forms.py:436 netbox/vpn/forms/model_forms.py:455 +#: netbox/wireless/forms/bulk_edit.py:57 +#: netbox/wireless/forms/bulk_import.py:50 +#: netbox/wireless/forms/model_forms.py:50 netbox/wireless/models.py:102 msgid "VLAN" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:245 +#: netbox/ipam/forms/bulk_edit.py:229 msgid "Prefix length" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:268 netbox/ipam/forms/filtersets.py:241 -#: netbox/templates/ipam/prefix.html:85 +#: netbox/ipam/forms/bulk_edit.py:252 netbox/ipam/forms/filtersets.py:244 +#: netbox/templates/ipam/prefix.html:81 msgid "Is a pool" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:273 netbox/ipam/forms/bulk_edit.py:318 -#: netbox/ipam/forms/filtersets.py:248 netbox/ipam/forms/filtersets.py:293 -#: netbox/ipam/models/ip.py:272 netbox/ipam/models/ip.py:539 +#: netbox/ipam/forms/bulk_edit.py:257 netbox/ipam/forms/bulk_edit.py:302 +#: netbox/ipam/forms/filtersets.py:251 netbox/ipam/forms/filtersets.py:296 +#: netbox/ipam/models/ip.py:256 netbox/ipam/models/ip.py:525 msgid "Treat as fully utilized" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:287 netbox/ipam/forms/filtersets.py:171 +#: netbox/ipam/forms/bulk_edit.py:271 netbox/ipam/forms/filtersets.py:173 +#: netbox/ipam/forms/model_forms.py:232 msgid "VLAN Assignment" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:366 netbox/ipam/models/ip.py:772 +#: netbox/ipam/forms/bulk_edit.py:350 netbox/ipam/models/ip.py:772 msgid "DNS name" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:387 netbox/ipam/forms/bulk_edit.py:534 -#: netbox/ipam/forms/bulk_import.py:418 netbox/ipam/forms/bulk_import.py:493 -#: netbox/ipam/forms/bulk_import.py:519 netbox/ipam/forms/filtersets.py:390 -#: netbox/ipam/forms/filtersets.py:530 netbox/templates/ipam/fhrpgroup.html:22 +#: netbox/ipam/forms/bulk_edit.py:371 netbox/ipam/forms/bulk_edit.py:562 +#: netbox/ipam/forms/bulk_import.py:417 netbox/ipam/forms/bulk_import.py:528 +#: netbox/ipam/forms/bulk_import.py:554 netbox/ipam/forms/filtersets.py:393 +#: netbox/ipam/forms/filtersets.py:582 netbox/templates/ipam/fhrpgroup.html:22 #: netbox/templates/ipam/inc/panels/fhrp_groups.html:24 #: netbox/templates/ipam/service.html:32 #: netbox/templates/ipam/servicetemplate.html:19 msgid "Protocol" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:394 netbox/ipam/forms/filtersets.py:397 +#: netbox/ipam/forms/bulk_edit.py:378 netbox/ipam/forms/filtersets.py:400 #: netbox/ipam/tables/fhrp.py:22 netbox/templates/ipam/fhrpgroup.html:26 msgid "Group ID" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:399 netbox/ipam/forms/filtersets.py:402 -#: netbox/wireless/forms/bulk_edit.py:68 netbox/wireless/forms/bulk_edit.py:115 -#: netbox/wireless/forms/bulk_import.py:62 -#: netbox/wireless/forms/bulk_import.py:65 -#: netbox/wireless/forms/bulk_import.py:104 -#: netbox/wireless/forms/bulk_import.py:107 -#: netbox/wireless/forms/filtersets.py:54 -#: netbox/wireless/forms/filtersets.py:88 +#: netbox/ipam/forms/bulk_edit.py:383 netbox/ipam/forms/filtersets.py:405 +#: netbox/wireless/forms/bulk_edit.py:70 netbox/wireless/forms/bulk_edit.py:118 +#: netbox/wireless/forms/bulk_import.py:64 +#: netbox/wireless/forms/bulk_import.py:67 +#: netbox/wireless/forms/bulk_import.py:109 +#: netbox/wireless/forms/bulk_import.py:112 +#: netbox/wireless/forms/filtersets.py:57 +#: netbox/wireless/forms/filtersets.py:116 msgid "Authentication type" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:404 netbox/ipam/forms/filtersets.py:406 +#: netbox/ipam/forms/bulk_edit.py:388 netbox/ipam/forms/filtersets.py:409 msgid "Authentication key" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:421 netbox/ipam/forms/filtersets.py:383 -#: netbox/ipam/forms/model_forms.py:507 netbox/netbox/navigation/menu.py:386 +#: netbox/ipam/forms/bulk_edit.py:405 netbox/ipam/forms/filtersets.py:386 +#: netbox/ipam/forms/model_forms.py:509 netbox/netbox/navigation/menu.py:407 #: netbox/templates/ipam/fhrpgroup.html:49 #: netbox/templates/wireless/inc/authentication_attrs.html:5 -#: netbox/wireless/forms/bulk_edit.py:91 netbox/wireless/forms/bulk_edit.py:149 -#: netbox/wireless/forms/filtersets.py:36 -#: netbox/wireless/forms/filtersets.py:76 -#: netbox/wireless/forms/model_forms.py:55 -#: netbox/wireless/forms/model_forms.py:171 +#: netbox/wireless/forms/bulk_edit.py:94 netbox/wireless/forms/bulk_edit.py:152 +#: netbox/wireless/forms/filtersets.py:39 +#: netbox/wireless/forms/filtersets.py:104 +#: netbox/wireless/forms/model_forms.py:58 +#: netbox/wireless/forms/model_forms.py:174 msgid "Authentication" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:436 netbox/ipam/forms/model_forms.py:608 -msgid "Scope type" -msgstr "" - -#: netbox/ipam/forms/bulk_edit.py:439 netbox/ipam/forms/bulk_edit.py:453 -#: netbox/ipam/forms/model_forms.py:611 netbox/ipam/forms/model_forms.py:621 -#: netbox/ipam/tables/vlans.py:71 netbox/templates/ipam/vlangroup.html:38 -msgid "Scope" -msgstr "" - -#: netbox/ipam/forms/bulk_edit.py:446 netbox/ipam/models/vlans.py:60 +#: netbox/ipam/forms/bulk_edit.py:430 netbox/ipam/models/vlans.py:62 msgid "VLAN ID ranges" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:525 +#: netbox/ipam/forms/bulk_edit.py:505 netbox/ipam/forms/bulk_import.py:485 +#: netbox/ipam/forms/filtersets.py:557 netbox/ipam/models/vlans.py:232 +#: netbox/ipam/tables/vlans.py:103 +msgid "Q-in-Q role" +msgstr "" + +#: netbox/ipam/forms/bulk_edit.py:522 +msgid "Q-in-Q" +msgstr "" + +#: netbox/ipam/forms/bulk_edit.py:523 msgid "Site & Group" msgstr "" -#: netbox/ipam/forms/bulk_edit.py:539 netbox/ipam/forms/model_forms.py:692 -#: netbox/ipam/forms/model_forms.py:724 netbox/ipam/tables/services.py:19 +#: netbox/ipam/forms/bulk_edit.py:546 netbox/ipam/forms/bulk_import.py:515 +#: netbox/ipam/forms/model_forms.py:716 netbox/ipam/tables/vlans.py:256 +#: netbox/templates/ipam/vlantranslationrule.html:14 +#: netbox/vpn/forms/model_forms.py:322 netbox/vpn/forms/model_forms.py:359 +msgid "Policy" +msgstr "" + +#: netbox/ipam/forms/bulk_edit.py:567 netbox/ipam/forms/model_forms.py:734 +#: netbox/ipam/forms/model_forms.py:766 netbox/ipam/tables/services.py:19 #: netbox/ipam/tables/services.py:49 netbox/templates/ipam/service.html:36 #: netbox/templates/ipam/servicetemplate.html:23 msgid "Ports" msgstr "" -#: netbox/ipam/forms/bulk_import.py:48 +#: netbox/ipam/forms/bulk_import.py:51 msgid "Import route targets" msgstr "" -#: netbox/ipam/forms/bulk_import.py:54 +#: netbox/ipam/forms/bulk_import.py:57 msgid "Export route targets" msgstr "" -#: netbox/ipam/forms/bulk_import.py:92 netbox/ipam/forms/bulk_import.py:112 -#: netbox/ipam/forms/bulk_import.py:132 +#: netbox/ipam/forms/bulk_import.py:95 netbox/ipam/forms/bulk_import.py:115 +#: netbox/ipam/forms/bulk_import.py:135 msgid "Assigned RIR" msgstr "" -#: netbox/ipam/forms/bulk_import.py:182 +#: netbox/ipam/forms/bulk_import.py:178 msgid "VLAN's group (if any)" msgstr "" -#: netbox/ipam/forms/bulk_import.py:308 -msgid "Parent device of assigned interface (if any)" -msgstr "" - -#: netbox/ipam/forms/bulk_import.py:311 netbox/ipam/forms/bulk_import.py:512 -#: netbox/ipam/forms/model_forms.py:718 netbox/virtualization/filtersets.py:288 -#: netbox/virtualization/filtersets.py:327 -#: netbox/virtualization/forms/bulk_edit.py:200 -#: netbox/virtualization/forms/bulk_edit.py:326 -#: netbox/virtualization/forms/bulk_import.py:146 -#: netbox/virtualization/forms/bulk_import.py:207 -#: netbox/virtualization/forms/filtersets.py:212 -#: netbox/virtualization/forms/filtersets.py:248 -#: netbox/virtualization/forms/model_forms.py:288 -#: netbox/vpn/forms/bulk_import.py:93 netbox/vpn/forms/bulk_import.py:290 -msgid "Virtual machine" -msgstr "" - -#: netbox/ipam/forms/bulk_import.py:315 -msgid "Parent VM of assigned interface (if any)" +#: netbox/ipam/forms/bulk_import.py:207 +#: netbox/virtualization/forms/bulk_import.py:80 +#: netbox/wireless/forms/bulk_import.py:83 +msgid "Scope ID" msgstr "" #: netbox/ipam/forms/bulk_import.py:325 -msgid "Is primary" -msgstr "" - -#: netbox/ipam/forms/bulk_import.py:326 msgid "Make this the primary IP for the assigned device" msgstr "" -#: netbox/ipam/forms/bulk_import.py:330 +#: netbox/ipam/forms/bulk_import.py:329 msgid "Is out-of-band" msgstr "" -#: netbox/ipam/forms/bulk_import.py:331 +#: netbox/ipam/forms/bulk_import.py:330 msgid "Designate this as the out-of-band IP address for the assigned device" msgstr "" -#: netbox/ipam/forms/bulk_import.py:371 +#: netbox/ipam/forms/bulk_import.py:370 msgid "No device or virtual machine specified; cannot set as primary IP" msgstr "" -#: netbox/ipam/forms/bulk_import.py:375 +#: netbox/ipam/forms/bulk_import.py:374 msgid "No device specified; cannot set as out-of-band IP" msgstr "" -#: netbox/ipam/forms/bulk_import.py:379 +#: netbox/ipam/forms/bulk_import.py:378 msgid "Cannot set out-of-band IP for virtual machines" msgstr "" -#: netbox/ipam/forms/bulk_import.py:383 +#: netbox/ipam/forms/bulk_import.py:382 msgid "No interface specified; cannot set as primary IP" msgstr "" -#: netbox/ipam/forms/bulk_import.py:387 +#: netbox/ipam/forms/bulk_import.py:386 msgid "No interface specified; cannot set as out-of-band IP" msgstr "" -#: netbox/ipam/forms/bulk_import.py:422 +#: netbox/ipam/forms/bulk_import.py:421 msgid "Auth type" msgstr "" -#: netbox/ipam/forms/bulk_import.py:437 -msgid "Scope type (app & model)" -msgstr "" - -#: netbox/ipam/forms/bulk_import.py:464 +#: netbox/ipam/forms/bulk_import.py:463 msgid "Assigned VLAN group" msgstr "" -#: netbox/ipam/forms/bulk_import.py:495 netbox/ipam/forms/bulk_import.py:521 +#: netbox/ipam/forms/bulk_import.py:495 +msgid "Service VLAN (for Q-in-Q/802.1ad customer VLANs)" +msgstr "" + +#: netbox/ipam/forms/bulk_import.py:518 netbox/ipam/models/vlans.py:343 +msgid "VLAN translation policy" +msgstr "" + +#: netbox/ipam/forms/bulk_import.py:530 netbox/ipam/forms/bulk_import.py:556 msgid "IP protocol" msgstr "" -#: netbox/ipam/forms/bulk_import.py:509 +#: netbox/ipam/forms/bulk_import.py:544 msgid "Required if not assigned to a VM" msgstr "" -#: netbox/ipam/forms/bulk_import.py:516 +#: netbox/ipam/forms/bulk_import.py:551 msgid "Required if not assigned to a device" msgstr "" -#: netbox/ipam/forms/bulk_import.py:541 +#: netbox/ipam/forms/bulk_import.py:576 #, python-brace-format msgid "{ip} is not assigned to this device/VM." msgstr "" -#: netbox/ipam/forms/filtersets.py:47 netbox/ipam/forms/model_forms.py:63 -#: netbox/netbox/navigation/menu.py:189 netbox/vpn/forms/model_forms.py:410 +#: netbox/ipam/forms/filtersets.py:49 netbox/ipam/forms/model_forms.py:66 +#: netbox/netbox/navigation/menu.py:195 netbox/vpn/forms/model_forms.py:413 msgid "Route Targets" msgstr "" -#: netbox/ipam/forms/filtersets.py:53 netbox/ipam/forms/model_forms.py:50 -#: netbox/vpn/forms/filtersets.py:224 netbox/vpn/forms/model_forms.py:397 +#: netbox/ipam/forms/filtersets.py:55 netbox/ipam/forms/model_forms.py:53 +#: netbox/vpn/forms/filtersets.py:224 netbox/vpn/forms/model_forms.py:400 msgid "Import targets" msgstr "" -#: netbox/ipam/forms/filtersets.py:58 netbox/ipam/forms/model_forms.py:55 -#: netbox/vpn/forms/filtersets.py:229 netbox/vpn/forms/model_forms.py:402 +#: netbox/ipam/forms/filtersets.py:60 netbox/ipam/forms/model_forms.py:58 +#: netbox/vpn/forms/filtersets.py:229 netbox/vpn/forms/model_forms.py:405 msgid "Export targets" msgstr "" -#: netbox/ipam/forms/filtersets.py:73 +#: netbox/ipam/forms/filtersets.py:75 msgid "Imported by VRF" msgstr "" -#: netbox/ipam/forms/filtersets.py:78 +#: netbox/ipam/forms/filtersets.py:80 msgid "Exported by VRF" msgstr "" -#: netbox/ipam/forms/filtersets.py:87 netbox/ipam/tables/ip.py:89 +#: netbox/ipam/forms/filtersets.py:89 netbox/ipam/tables/ip.py:35 #: netbox/templates/ipam/rir.html:30 msgid "Private" msgstr "" -#: netbox/ipam/forms/filtersets.py:105 netbox/ipam/forms/filtersets.py:191 -#: netbox/ipam/forms/filtersets.py:272 netbox/ipam/forms/filtersets.py:326 +#: netbox/ipam/forms/filtersets.py:107 netbox/ipam/forms/filtersets.py:193 +#: netbox/ipam/forms/filtersets.py:275 netbox/ipam/forms/filtersets.py:329 msgid "Address family" msgstr "" -#: netbox/ipam/forms/filtersets.py:119 netbox/templates/ipam/asnrange.html:25 +#: netbox/ipam/forms/filtersets.py:121 netbox/templates/ipam/asnrange.html:25 msgid "Range" msgstr "" -#: netbox/ipam/forms/filtersets.py:128 +#: netbox/ipam/forms/filtersets.py:130 msgid "Start" msgstr "" -#: netbox/ipam/forms/filtersets.py:132 +#: netbox/ipam/forms/filtersets.py:134 msgid "End" msgstr "" -#: netbox/ipam/forms/filtersets.py:186 +#: netbox/ipam/forms/filtersets.py:188 msgid "Search within" msgstr "" -#: netbox/ipam/forms/filtersets.py:207 netbox/ipam/forms/filtersets.py:342 +#: netbox/ipam/forms/filtersets.py:209 netbox/ipam/forms/filtersets.py:345 msgid "Present in VRF" msgstr "" -#: netbox/ipam/forms/filtersets.py:311 +#: netbox/ipam/forms/filtersets.py:314 msgid "Device/VM" msgstr "" -#: netbox/ipam/forms/filtersets.py:321 +#: netbox/ipam/forms/filtersets.py:324 msgid "Parent Prefix" msgstr "" -#: netbox/ipam/forms/filtersets.py:347 -msgid "Assigned Device" -msgstr "" - -#: netbox/ipam/forms/filtersets.py:352 -msgid "Assigned VM" -msgstr "" - -#: netbox/ipam/forms/filtersets.py:366 +#: netbox/ipam/forms/filtersets.py:369 msgid "Assigned to an interface" msgstr "" -#: netbox/ipam/forms/filtersets.py:373 netbox/templates/ipam/ipaddress.html:51 +#: netbox/ipam/forms/filtersets.py:376 netbox/templates/ipam/ipaddress.html:51 msgid "DNS Name" msgstr "" -#: netbox/ipam/forms/filtersets.py:416 netbox/ipam/models/vlans.py:251 -#: netbox/ipam/tables/ip.py:176 netbox/ipam/tables/vlans.py:82 -#: netbox/ipam/views.py:971 netbox/netbox/navigation/menu.py:193 -#: netbox/netbox/navigation/menu.py:195 +#: netbox/ipam/forms/filtersets.py:419 netbox/ipam/models/vlans.py:273 +#: netbox/ipam/tables/ip.py:122 netbox/ipam/tables/vlans.py:51 +#: netbox/ipam/views.py:1029 netbox/netbox/navigation/menu.py:199 +#: netbox/netbox/navigation/menu.py:201 msgid "VLANs" msgstr "" -#: netbox/ipam/forms/filtersets.py:457 +#: netbox/ipam/forms/filtersets.py:460 msgid "Contains VLAN ID" msgstr "" -#: netbox/ipam/forms/filtersets.py:513 netbox/ipam/models/vlans.py:192 +#: netbox/ipam/forms/filtersets.py:494 netbox/ipam/models/vlans.py:363 +msgid "Local VLAN ID" +msgstr "" + +#: netbox/ipam/forms/filtersets.py:499 netbox/ipam/models/vlans.py:371 +msgid "Remote VLAN ID" +msgstr "" + +#: netbox/ipam/forms/filtersets.py:509 +msgid "Q-in-Q/802.1ad" +msgstr "" + +#: netbox/ipam/forms/filtersets.py:554 netbox/ipam/models/vlans.py:191 #: netbox/templates/ipam/vlan.html:31 msgid "VLAN ID" msgstr "" -#: netbox/ipam/forms/filtersets.py:556 netbox/ipam/forms/model_forms.py:324 -#: netbox/ipam/forms/model_forms.py:746 netbox/ipam/forms/model_forms.py:772 -#: netbox/ipam/tables/vlans.py:195 -#: netbox/templates/virtualization/virtualdisk.html:21 -#: netbox/templates/virtualization/virtualmachine.html:12 -#: netbox/templates/virtualization/vminterface.html:21 -#: netbox/templates/vpn/tunneltermination.html:25 -#: netbox/virtualization/forms/filtersets.py:197 -#: netbox/virtualization/forms/filtersets.py:242 -#: netbox/virtualization/forms/model_forms.py:220 -#: netbox/virtualization/tables/virtualmachines.py:135 -#: netbox/virtualization/tables/virtualmachines.py:190 netbox/vpn/choices.py:53 -#: netbox/vpn/forms/filtersets.py:293 netbox/vpn/forms/model_forms.py:160 -#: netbox/vpn/forms/model_forms.py:171 netbox/vpn/forms/model_forms.py:273 -#: netbox/vpn/forms/model_forms.py:454 -msgid "Virtual Machine" -msgstr "" - -#: netbox/ipam/forms/model_forms.py:80 +#: netbox/ipam/forms/model_forms.py:83 #: netbox/templates/ipam/routetarget.html:10 msgid "Route Target" msgstr "" -#: netbox/ipam/forms/model_forms.py:114 netbox/ipam/tables/ip.py:117 +#: netbox/ipam/forms/model_forms.py:118 netbox/ipam/tables/ip.py:63 #: netbox/templates/ipam/aggregate.html:11 netbox/templates/ipam/prefix.html:38 msgid "Aggregate" msgstr "" -#: netbox/ipam/forms/model_forms.py:135 netbox/templates/ipam/asnrange.html:12 +#: netbox/ipam/forms/model_forms.py:140 netbox/templates/ipam/asnrange.html:12 msgid "ASN Range" msgstr "" -#: netbox/ipam/forms/model_forms.py:231 -msgid "Site/VLAN Assignment" -msgstr "" - -#: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 +#: netbox/ipam/forms/model_forms.py:261 netbox/templates/ipam/iprange.html:10 msgid "IP Range" msgstr "" -#: netbox/ipam/forms/model_forms.py:295 netbox/ipam/forms/model_forms.py:325 -#: netbox/ipam/forms/model_forms.py:506 netbox/templates/ipam/fhrpgroup.html:19 +#: netbox/ipam/forms/model_forms.py:297 netbox/ipam/forms/model_forms.py:327 +#: netbox/ipam/forms/model_forms.py:508 netbox/templates/ipam/fhrpgroup.html:19 msgid "FHRP Group" msgstr "" -#: netbox/ipam/forms/model_forms.py:310 +#: netbox/ipam/forms/model_forms.py:312 msgid "Make this the primary IP for the device/VM" msgstr "" -#: netbox/ipam/forms/model_forms.py:314 +#: netbox/ipam/forms/model_forms.py:316 msgid "Make this the out-of-band IP for the device" msgstr "" -#: netbox/ipam/forms/model_forms.py:329 +#: netbox/ipam/forms/model_forms.py:331 msgid "NAT IP (Inside)" msgstr "" -#: netbox/ipam/forms/model_forms.py:391 +#: netbox/ipam/forms/model_forms.py:393 msgid "An IP address can only be assigned to a single object." msgstr "" -#: netbox/ipam/forms/model_forms.py:398 +#: netbox/ipam/forms/model_forms.py:400 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" -#: netbox/ipam/forms/model_forms.py:402 +#: netbox/ipam/forms/model_forms.py:404 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" -#: netbox/ipam/forms/model_forms.py:412 +#: netbox/ipam/forms/model_forms.py:414 msgid "" "Only IP addresses assigned to an interface can be designated as primary IPs." msgstr "" -#: netbox/ipam/forms/model_forms.py:420 +#: netbox/ipam/forms/model_forms.py:422 msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" -#: netbox/ipam/forms/model_forms.py:508 +#: netbox/ipam/forms/model_forms.py:510 msgid "Virtual IP Address" msgstr "" -#: netbox/ipam/forms/model_forms.py:593 +#: netbox/ipam/forms/model_forms.py:595 msgid "Assignment already exists" msgstr "" -#: netbox/ipam/forms/model_forms.py:602 netbox/templates/ipam/vlangroup.html:42 +#: netbox/ipam/forms/model_forms.py:604 netbox/templates/ipam/vlangroup.html:42 msgid "VLAN IDs" msgstr "" -#: netbox/ipam/forms/model_forms.py:620 +#: netbox/ipam/forms/model_forms.py:622 msgid "Child VLANs" msgstr "" -#: netbox/ipam/forms/model_forms.py:697 netbox/ipam/forms/model_forms.py:729 +#: netbox/ipam/forms/model_forms.py:722 +#: netbox/templates/ipam/vlantranslationrule.html:11 +msgid "VLAN Translation Rule" +msgstr "" + +#: netbox/ipam/forms/model_forms.py:739 netbox/ipam/forms/model_forms.py:771 msgid "" "Comma-separated list of one or more port numbers. A range may be specified " "using a hyphen." msgstr "" -#: netbox/ipam/forms/model_forms.py:702 +#: netbox/ipam/forms/model_forms.py:744 #: netbox/templates/ipam/servicetemplate.html:12 msgid "Service Template" msgstr "" -#: netbox/ipam/forms/model_forms.py:749 +#: netbox/ipam/forms/model_forms.py:791 msgid "Port(s)" msgstr "" -#: netbox/ipam/forms/model_forms.py:750 netbox/ipam/forms/model_forms.py:778 -#: netbox/templates/ipam/service.html:21 -msgid "Service" -msgstr "" - -#: netbox/ipam/forms/model_forms.py:763 +#: netbox/ipam/forms/model_forms.py:805 msgid "Service template" msgstr "" -#: netbox/ipam/forms/model_forms.py:775 +#: netbox/ipam/forms/model_forms.py:817 msgid "From Template" msgstr "" -#: netbox/ipam/forms/model_forms.py:776 +#: netbox/ipam/forms/model_forms.py:818 msgid "Custom" msgstr "" -#: netbox/ipam/forms/model_forms.py:806 +#: netbox/ipam/forms/model_forms.py:848 msgid "" "Must specify name, protocol, and port(s) if not using a service template." msgstr "" @@ -9646,28 +10077,28 @@ msgstr "" msgid "ASN ranges" msgstr "" -#: netbox/ipam/models/asns.py:72 +#: netbox/ipam/models/asns.py:69 #, python-brace-format msgid "Starting ASN ({start}) must be lower than ending ASN ({end})." msgstr "" -#: netbox/ipam/models/asns.py:104 +#: netbox/ipam/models/asns.py:101 msgid "Regional Internet Registry responsible for this AS number space" msgstr "" -#: netbox/ipam/models/asns.py:109 +#: netbox/ipam/models/asns.py:106 msgid "16- or 32-bit autonomous system number" msgstr "" -#: netbox/ipam/models/fhrp.py:22 +#: netbox/ipam/models/fhrp.py:21 msgid "group ID" msgstr "" -#: netbox/ipam/models/fhrp.py:30 netbox/ipam/models/services.py:22 +#: netbox/ipam/models/fhrp.py:29 netbox/ipam/models/services.py:21 msgid "protocol" msgstr "" -#: netbox/ipam/models/fhrp.py:38 netbox/wireless/models.py:28 +#: netbox/ipam/models/fhrp.py:38 netbox/wireless/models.py:29 msgid "authentication type" msgstr "" @@ -9683,11 +10114,11 @@ msgstr "" msgid "FHRP groups" msgstr "" -#: netbox/ipam/models/fhrp.py:113 +#: netbox/ipam/models/fhrp.py:110 msgid "FHRP group assignment" msgstr "" -#: netbox/ipam/models/fhrp.py:114 +#: netbox/ipam/models/fhrp.py:111 msgid "FHRP group assignments" msgstr "" @@ -9699,165 +10130,160 @@ msgstr "" msgid "IP space managed by this RIR is considered private" msgstr "" -#: netbox/ipam/models/ip.py:72 netbox/netbox/navigation/menu.py:182 +#: netbox/ipam/models/ip.py:72 netbox/netbox/navigation/menu.py:188 msgid "RIRs" msgstr "" -#: netbox/ipam/models/ip.py:84 +#: netbox/ipam/models/ip.py:81 msgid "IPv4 or IPv6 network" msgstr "" -#: netbox/ipam/models/ip.py:91 +#: netbox/ipam/models/ip.py:88 msgid "Regional Internet Registry responsible for this IP space" msgstr "" -#: netbox/ipam/models/ip.py:101 +#: netbox/ipam/models/ip.py:98 msgid "date added" msgstr "" -#: netbox/ipam/models/ip.py:115 +#: netbox/ipam/models/ip.py:112 msgid "aggregate" msgstr "" -#: netbox/ipam/models/ip.py:116 +#: netbox/ipam/models/ip.py:113 msgid "aggregates" msgstr "" -#: netbox/ipam/models/ip.py:132 +#: netbox/ipam/models/ip.py:126 msgid "Cannot create aggregate with /0 mask." msgstr "" -#: netbox/ipam/models/ip.py:144 +#: netbox/ipam/models/ip.py:138 #, python-brace-format msgid "" "Aggregates cannot overlap. {prefix} is already covered by an existing " "aggregate ({aggregate})." msgstr "" -#: netbox/ipam/models/ip.py:158 +#: netbox/ipam/models/ip.py:152 #, python-brace-format msgid "" "Prefixes cannot overlap aggregates. {prefix} covers an existing aggregate " "({aggregate})." msgstr "" -#: netbox/ipam/models/ip.py:200 netbox/ipam/models/ip.py:737 -#: netbox/vpn/models/tunnels.py:114 -msgid "role" -msgstr "" - -#: netbox/ipam/models/ip.py:201 +#: netbox/ipam/models/ip.py:195 msgid "roles" msgstr "" -#: netbox/ipam/models/ip.py:217 netbox/ipam/models/ip.py:293 +#: netbox/ipam/models/ip.py:208 netbox/ipam/models/ip.py:277 msgid "prefix" msgstr "" -#: netbox/ipam/models/ip.py:218 +#: netbox/ipam/models/ip.py:209 msgid "IPv4 or IPv6 network with mask" msgstr "" -#: netbox/ipam/models/ip.py:254 +#: netbox/ipam/models/ip.py:238 msgid "Operational status of this prefix" msgstr "" -#: netbox/ipam/models/ip.py:262 +#: netbox/ipam/models/ip.py:246 msgid "The primary function of this prefix" msgstr "" -#: netbox/ipam/models/ip.py:265 +#: netbox/ipam/models/ip.py:249 msgid "is a pool" msgstr "" -#: netbox/ipam/models/ip.py:267 +#: netbox/ipam/models/ip.py:251 msgid "All IP addresses within this prefix are considered usable" msgstr "" -#: netbox/ipam/models/ip.py:270 netbox/ipam/models/ip.py:537 +#: netbox/ipam/models/ip.py:254 netbox/ipam/models/ip.py:523 msgid "mark utilized" msgstr "" -#: netbox/ipam/models/ip.py:294 +#: netbox/ipam/models/ip.py:278 msgid "prefixes" msgstr "" -#: netbox/ipam/models/ip.py:317 +#: netbox/ipam/models/ip.py:298 msgid "Cannot create prefix with /0 mask." msgstr "" -#: netbox/ipam/models/ip.py:324 netbox/ipam/models/ip.py:874 +#: netbox/ipam/models/ip.py:305 netbox/ipam/models/ip.py:871 #, python-brace-format msgid "VRF {vrf}" msgstr "" -#: netbox/ipam/models/ip.py:324 netbox/ipam/models/ip.py:874 +#: netbox/ipam/models/ip.py:305 netbox/ipam/models/ip.py:871 msgid "global table" msgstr "" -#: netbox/ipam/models/ip.py:326 +#: netbox/ipam/models/ip.py:307 #, python-brace-format msgid "Duplicate prefix found in {table}: {prefix}" msgstr "" -#: netbox/ipam/models/ip.py:495 +#: netbox/ipam/models/ip.py:481 msgid "start address" msgstr "" -#: netbox/ipam/models/ip.py:496 netbox/ipam/models/ip.py:500 -#: netbox/ipam/models/ip.py:712 +#: netbox/ipam/models/ip.py:482 netbox/ipam/models/ip.py:486 +#: netbox/ipam/models/ip.py:711 msgid "IPv4 or IPv6 address (with mask)" msgstr "" -#: netbox/ipam/models/ip.py:499 +#: netbox/ipam/models/ip.py:485 msgid "end address" msgstr "" -#: netbox/ipam/models/ip.py:526 +#: netbox/ipam/models/ip.py:512 msgid "Operational status of this range" msgstr "" -#: netbox/ipam/models/ip.py:534 +#: netbox/ipam/models/ip.py:520 msgid "The primary function of this range" msgstr "" -#: netbox/ipam/models/ip.py:548 +#: netbox/ipam/models/ip.py:534 msgid "IP range" msgstr "" -#: netbox/ipam/models/ip.py:549 +#: netbox/ipam/models/ip.py:535 msgid "IP ranges" msgstr "" -#: netbox/ipam/models/ip.py:565 +#: netbox/ipam/models/ip.py:548 msgid "Starting and ending IP address versions must match" msgstr "" -#: netbox/ipam/models/ip.py:571 +#: netbox/ipam/models/ip.py:554 msgid "Starting and ending IP address masks must match" msgstr "" -#: netbox/ipam/models/ip.py:578 +#: netbox/ipam/models/ip.py:561 #, python-brace-format msgid "" "Ending address must be greater than the starting address ({start_address})" msgstr "" -#: netbox/ipam/models/ip.py:590 +#: netbox/ipam/models/ip.py:589 #, python-brace-format msgid "Defined addresses overlap with range {overlapping_range} in VRF {vrf}" msgstr "" -#: netbox/ipam/models/ip.py:599 +#: netbox/ipam/models/ip.py:598 #, python-brace-format msgid "Defined range exceeds maximum supported size ({max_size})" msgstr "" -#: netbox/ipam/models/ip.py:711 netbox/tenancy/models/contacts.py:82 +#: netbox/ipam/models/ip.py:710 netbox/tenancy/models/contacts.py:77 msgid "address" msgstr "" -#: netbox/ipam/models/ip.py:734 +#: netbox/ipam/models/ip.py:733 msgid "The operational status of this IP" msgstr "" @@ -9877,167 +10303,188 @@ msgstr "" msgid "Hostname or FQDN (not case-sensitive)" msgstr "" -#: netbox/ipam/models/ip.py:789 netbox/ipam/models/services.py:94 +#: netbox/ipam/models/ip.py:789 netbox/ipam/models/services.py:90 msgid "IP addresses" msgstr "" -#: netbox/ipam/models/ip.py:845 +#: netbox/ipam/models/ip.py:842 msgid "Cannot create IP address with /0 mask." msgstr "" -#: netbox/ipam/models/ip.py:851 +#: netbox/ipam/models/ip.py:848 #, python-brace-format msgid "{ip} is a network ID, which may not be assigned to an interface." msgstr "" -#: netbox/ipam/models/ip.py:862 +#: netbox/ipam/models/ip.py:859 #, python-brace-format msgid "{ip} is a broadcast address, which may not be assigned to an interface." msgstr "" -#: netbox/ipam/models/ip.py:876 +#: netbox/ipam/models/ip.py:873 #, python-brace-format msgid "Duplicate IP address found in {table}: {ipaddress}" msgstr "" -#: netbox/ipam/models/ip.py:897 +#: netbox/ipam/models/ip.py:896 msgid "" "Cannot reassign IP address while it is designated as the primary IP for the " "parent object" msgstr "" -#: netbox/ipam/models/ip.py:903 +#: netbox/ipam/models/ip.py:902 msgid "Only IPv6 addresses can be assigned SLAAC status" msgstr "" -#: netbox/ipam/models/services.py:33 +#: netbox/ipam/models/services.py:32 msgid "port numbers" msgstr "" -#: netbox/ipam/models/services.py:59 +#: netbox/ipam/models/services.py:58 msgid "service template" msgstr "" -#: netbox/ipam/models/services.py:60 +#: netbox/ipam/models/services.py:59 msgid "service templates" msgstr "" -#: netbox/ipam/models/services.py:95 +#: netbox/ipam/models/services.py:91 msgid "The specific IP addresses (if any) to which this service is bound" msgstr "" -#: netbox/ipam/models/services.py:102 +#: netbox/ipam/models/services.py:98 msgid "service" msgstr "" -#: netbox/ipam/models/services.py:103 +#: netbox/ipam/models/services.py:99 msgid "services" msgstr "" -#: netbox/ipam/models/services.py:117 +#: netbox/ipam/models/services.py:110 msgid "" "A service cannot be associated with both a device and a virtual machine." msgstr "" -#: netbox/ipam/models/services.py:119 +#: netbox/ipam/models/services.py:112 msgid "A service must be associated with either a device or a virtual machine." msgstr "" -#: netbox/ipam/models/vlans.py:85 +#: netbox/ipam/models/vlans.py:87 msgid "VLAN groups" msgstr "" -#: netbox/ipam/models/vlans.py:95 +#: netbox/ipam/models/vlans.py:94 msgid "Cannot set scope_type without scope_id." msgstr "" -#: netbox/ipam/models/vlans.py:97 +#: netbox/ipam/models/vlans.py:96 msgid "Cannot set scope_id without scope_type." msgstr "" -#: netbox/ipam/models/vlans.py:105 +#: netbox/ipam/models/vlans.py:104 #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" -#: netbox/ipam/models/vlans.py:111 +#: netbox/ipam/models/vlans.py:110 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" -#: netbox/ipam/models/vlans.py:118 +#: netbox/ipam/models/vlans.py:117 #, python-brace-format msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" -#: netbox/ipam/models/vlans.py:124 +#: netbox/ipam/models/vlans.py:123 msgid "Ranges cannot overlap." msgstr "" -#: netbox/ipam/models/vlans.py:181 +#: netbox/ipam/models/vlans.py:180 msgid "The specific site to which this VLAN is assigned (if any)" msgstr "" -#: netbox/ipam/models/vlans.py:189 +#: netbox/ipam/models/vlans.py:188 msgid "VLAN group (optional)" msgstr "" -#: netbox/ipam/models/vlans.py:197 +#: netbox/ipam/models/vlans.py:196 netbox/ipam/models/vlans.py:368 +#: netbox/ipam/models/vlans.py:376 msgid "Numeric VLAN ID (1-4094)" msgstr "" -#: netbox/ipam/models/vlans.py:215 +#: netbox/ipam/models/vlans.py:214 msgid "Operational status of this VLAN" msgstr "" -#: netbox/ipam/models/vlans.py:223 +#: netbox/ipam/models/vlans.py:222 msgid "The primary function of this VLAN" msgstr "" -#: netbox/ipam/models/vlans.py:266 +#: netbox/ipam/models/vlans.py:237 +msgid "Customer/service VLAN designation (for Q-in-Q/IEEE 802.1ad)" +msgstr "" + +#: netbox/ipam/models/vlans.py:285 #, python-brace-format msgid "" "VLAN is assigned to group {group} (scope: {scope}); cannot also assign to " "site {site}." msgstr "" -#: netbox/ipam/models/vlans.py:275 +#: netbox/ipam/models/vlans.py:294 #, python-brace-format msgid "VID must be in ranges {ranges} for VLANs in group {group}" msgstr "" -#: netbox/ipam/models/vrfs.py:30 +#: netbox/ipam/models/vlans.py:301 +msgid "Only Q-in-Q customer VLANs maybe assigned to a service VLAN." +msgstr "" + +#: netbox/ipam/models/vlans.py:307 +msgid "A Q-in-Q customer VLAN must be assigned to a service VLAN." +msgstr "" + +#: netbox/ipam/models/vlans.py:344 +msgid "VLAN translation policies" +msgstr "" + +#: netbox/ipam/models/vlans.py:385 +msgid "VLAN translation rule" +msgstr "" + +#: netbox/ipam/models/vrfs.py:29 msgid "route distinguisher" msgstr "" -#: netbox/ipam/models/vrfs.py:31 +#: netbox/ipam/models/vrfs.py:30 msgid "Unique route distinguisher (as defined in RFC 4364)" msgstr "" -#: netbox/ipam/models/vrfs.py:42 +#: netbox/ipam/models/vrfs.py:41 msgid "enforce unique space" msgstr "" -#: netbox/ipam/models/vrfs.py:43 +#: netbox/ipam/models/vrfs.py:42 msgid "Prevent duplicate prefixes/IP addresses within this VRF" msgstr "" -#: netbox/ipam/models/vrfs.py:63 netbox/netbox/navigation/menu.py:186 -#: netbox/netbox/navigation/menu.py:188 +#: netbox/ipam/models/vrfs.py:62 netbox/netbox/navigation/menu.py:192 +#: netbox/netbox/navigation/menu.py:194 msgid "VRFs" msgstr "" -#: netbox/ipam/models/vrfs.py:82 +#: netbox/ipam/models/vrfs.py:78 msgid "Route target value (formatted in accordance with RFC 4360)" msgstr "" -#: netbox/ipam/models/vrfs.py:94 +#: netbox/ipam/models/vrfs.py:91 msgid "route target" msgstr "" -#: netbox/ipam/models/vrfs.py:95 +#: netbox/ipam/models/vrfs.py:92 msgid "route targets" msgstr "" @@ -10053,84 +10500,101 @@ msgstr "" msgid "Provider Count" msgstr "" -#: netbox/ipam/tables/ip.py:95 netbox/netbox/navigation/menu.py:179 -#: netbox/netbox/navigation/menu.py:181 +#: netbox/ipam/tables/ip.py:41 netbox/netbox/navigation/menu.py:185 +#: netbox/netbox/navigation/menu.py:187 msgid "Aggregates" msgstr "" -#: netbox/ipam/tables/ip.py:125 +#: netbox/ipam/tables/ip.py:71 msgid "Added" msgstr "" -#: netbox/ipam/tables/ip.py:128 netbox/ipam/tables/ip.py:166 -#: netbox/ipam/tables/vlans.py:142 netbox/ipam/views.py:346 -#: netbox/netbox/navigation/menu.py:165 netbox/netbox/navigation/menu.py:167 -#: netbox/templates/ipam/vlan.html:84 +#: netbox/ipam/tables/ip.py:74 netbox/ipam/tables/ip.py:112 +#: netbox/ipam/tables/vlans.py:118 netbox/ipam/views.py:373 +#: netbox/netbox/navigation/menu.py:171 netbox/netbox/navigation/menu.py:173 +#: netbox/templates/ipam/vlan.html:100 msgid "Prefixes" msgstr "" -#: netbox/ipam/tables/ip.py:131 netbox/ipam/tables/ip.py:270 -#: netbox/ipam/tables/ip.py:324 netbox/ipam/tables/vlans.py:86 +#: netbox/ipam/tables/ip.py:77 netbox/ipam/tables/ip.py:219 +#: netbox/ipam/tables/ip.py:274 netbox/ipam/tables/vlans.py:55 #: netbox/templates/dcim/device.html:260 #: netbox/templates/ipam/aggregate.html:24 -#: netbox/templates/ipam/iprange.html:29 netbox/templates/ipam/prefix.html:106 +#: netbox/templates/ipam/iprange.html:29 netbox/templates/ipam/prefix.html:102 msgid "Utilization" msgstr "" -#: netbox/ipam/tables/ip.py:171 netbox/netbox/navigation/menu.py:161 +#: netbox/ipam/tables/ip.py:117 netbox/netbox/navigation/menu.py:167 msgid "IP Ranges" msgstr "" -#: netbox/ipam/tables/ip.py:221 +#: netbox/ipam/tables/ip.py:167 msgid "Prefix (Flat)" msgstr "" -#: netbox/ipam/tables/ip.py:225 +#: netbox/ipam/tables/ip.py:171 msgid "Depth" msgstr "" -#: netbox/ipam/tables/ip.py:262 +#: netbox/ipam/tables/ip.py:191 netbox/ipam/tables/vlans.py:37 +#: netbox/virtualization/tables/clusters.py:77 +#: netbox/wireless/tables/wirelesslan.py:55 +msgid "Scope Type" +msgstr "" + +#: netbox/ipam/tables/ip.py:211 msgid "Pool" msgstr "" -#: netbox/ipam/tables/ip.py:266 netbox/ipam/tables/ip.py:320 +#: netbox/ipam/tables/ip.py:215 netbox/ipam/tables/ip.py:270 msgid "Marked Utilized" msgstr "" -#: netbox/ipam/tables/ip.py:304 +#: netbox/ipam/tables/ip.py:254 msgid "Start address" msgstr "" -#: netbox/ipam/tables/ip.py:383 +#: netbox/ipam/tables/ip.py:333 msgid "NAT (Inside)" msgstr "" -#: netbox/ipam/tables/ip.py:388 +#: netbox/ipam/tables/ip.py:338 msgid "NAT (Outside)" msgstr "" -#: netbox/ipam/tables/ip.py:393 +#: netbox/ipam/tables/ip.py:343 msgid "Assigned" msgstr "" -#: netbox/ipam/tables/ip.py:429 netbox/templates/vpn/l2vpntermination.html:16 +#: netbox/ipam/tables/ip.py:379 netbox/templates/vpn/l2vpntermination.html:16 #: netbox/vpn/forms/filtersets.py:240 msgid "Assigned Object" msgstr "" -#: netbox/ipam/tables/vlans.py:68 -msgid "Scope Type" -msgstr "" - -#: netbox/ipam/tables/vlans.py:76 +#: netbox/ipam/tables/vlans.py:45 msgid "VID Ranges" msgstr "" -#: netbox/ipam/tables/vlans.py:111 netbox/ipam/tables/vlans.py:214 +#: netbox/ipam/tables/vlans.py:80 netbox/ipam/tables/vlans.py:190 #: netbox/templates/dcim/inc/interface_vlans_table.html:4 msgid "VID" msgstr "" +#: netbox/ipam/tables/vlans.py:237 +#: netbox/templates/ipam/vlantranslationpolicy.html:22 +msgid "Rules" +msgstr "" + +#: netbox/ipam/tables/vlans.py:260 +#: netbox/templates/ipam/vlantranslationrule.html:18 +msgid "Local VID" +msgstr "" + +#: netbox/ipam/tables/vlans.py:264 +#: netbox/templates/ipam/vlantranslationrule.html:22 +msgid "Remote VID" +msgstr "" + #: netbox/ipam/tables/vrfs.py:30 msgid "RD" msgstr "" @@ -10168,23 +10632,23 @@ msgid "" "are allowed in DNS names" msgstr "" -#: netbox/ipam/views.py:533 +#: netbox/ipam/views.py:570 msgid "Child Prefixes" msgstr "" -#: netbox/ipam/views.py:569 +#: netbox/ipam/views.py:606 msgid "Child Ranges" msgstr "" -#: netbox/ipam/views.py:898 +#: netbox/ipam/views.py:951 msgid "Related IPs" msgstr "" -#: netbox/ipam/views.py:1127 +#: netbox/ipam/views.py:1308 msgid "Device Interfaces" msgstr "" -#: netbox/ipam/views.py:1145 +#: netbox/ipam/views.py:1326 msgid "VM Interfaces" msgstr "" @@ -10230,90 +10694,108 @@ msgstr "" msgid "Invalid permission {permission} for model {model}" msgstr "" -#: netbox/netbox/choices.py:49 +#: netbox/netbox/choices.py:51 msgid "Dark Red" msgstr "" -#: netbox/netbox/choices.py:52 +#: netbox/netbox/choices.py:54 msgid "Rose" msgstr "" -#: netbox/netbox/choices.py:53 +#: netbox/netbox/choices.py:55 msgid "Fuchsia" msgstr "" -#: netbox/netbox/choices.py:55 +#: netbox/netbox/choices.py:57 msgid "Dark Purple" msgstr "" -#: netbox/netbox/choices.py:58 +#: netbox/netbox/choices.py:60 msgid "Light Blue" msgstr "" -#: netbox/netbox/choices.py:61 +#: netbox/netbox/choices.py:63 msgid "Aqua" msgstr "" -#: netbox/netbox/choices.py:62 +#: netbox/netbox/choices.py:64 msgid "Dark Green" msgstr "" -#: netbox/netbox/choices.py:64 +#: netbox/netbox/choices.py:66 msgid "Light Green" msgstr "" -#: netbox/netbox/choices.py:65 +#: netbox/netbox/choices.py:67 msgid "Lime" msgstr "" -#: netbox/netbox/choices.py:67 +#: netbox/netbox/choices.py:69 msgid "Amber" msgstr "" -#: netbox/netbox/choices.py:69 +#: netbox/netbox/choices.py:71 msgid "Dark Orange" msgstr "" -#: netbox/netbox/choices.py:70 +#: netbox/netbox/choices.py:72 msgid "Brown" msgstr "" -#: netbox/netbox/choices.py:71 +#: netbox/netbox/choices.py:73 msgid "Light Grey" msgstr "" -#: netbox/netbox/choices.py:72 +#: netbox/netbox/choices.py:74 msgid "Grey" msgstr "" -#: netbox/netbox/choices.py:73 +#: netbox/netbox/choices.py:75 msgid "Dark Grey" msgstr "" -#: netbox/netbox/choices.py:128 +#: netbox/netbox/choices.py:130 msgid "Direct" msgstr "" -#: netbox/netbox/choices.py:129 +#: netbox/netbox/choices.py:131 msgid "Upload" msgstr "" -#: netbox/netbox/choices.py:141 netbox/netbox/choices.py:155 +#: netbox/netbox/choices.py:143 netbox/netbox/choices.py:157 msgid "Auto-detect" msgstr "" -#: netbox/netbox/choices.py:156 +#: netbox/netbox/choices.py:158 msgid "Comma" msgstr "" -#: netbox/netbox/choices.py:157 +#: netbox/netbox/choices.py:159 msgid "Semicolon" msgstr "" -#: netbox/netbox/choices.py:158 +#: netbox/netbox/choices.py:160 msgid "Tab" msgstr "" +#: netbox/netbox/choices.py:193 netbox/templates/dcim/device.html:327 +#: netbox/templates/dcim/rack.html:107 +msgid "Kilograms" +msgstr "" + +#: netbox/netbox/choices.py:194 +msgid "Grams" +msgstr "" + +#: netbox/netbox/choices.py:195 netbox/templates/dcim/device.html:328 +#: netbox/templates/dcim/rack.html:108 +msgid "Pounds" +msgstr "" + +#: netbox/netbox/choices.py:196 +msgid "Ounces" +msgstr "" + #: netbox/netbox/config/__init__.py:67 #, python-brace-format msgid "Invalid configuration parameter: {item}" @@ -10596,6 +11078,26 @@ msgstr "" msgid "{class_name} must implement a sync_data() method." msgstr "" +#: netbox/netbox/models/mixins.py:22 +msgid "weight unit" +msgstr "" + +#: netbox/netbox/models/mixins.py:52 +msgid "Must specify a unit when setting a weight" +msgstr "" + +#: netbox/netbox/models/mixins.py:57 +msgid "distance" +msgstr "" + +#: netbox/netbox/models/mixins.py:64 +msgid "distance unit" +msgstr "" + +#: netbox/netbox/models/mixins.py:99 +msgid "Must specify a unit when setting a distance" +msgstr "" + #: netbox/netbox/navigation/menu.py:11 msgid "Organization" msgstr "" @@ -10655,174 +11157,199 @@ msgstr "" msgid "Inventory Item Roles" msgstr "" -#: netbox/netbox/navigation/menu.py:111 netbox/netbox/navigation/menu.py:115 +#: netbox/netbox/navigation/menu.py:110 +#: netbox/templates/dcim/interface.html:413 +#: netbox/templates/virtualization/vminterface.html:118 +msgid "MAC Addresses" +msgstr "" + +#: netbox/netbox/navigation/menu.py:117 netbox/netbox/navigation/menu.py:121 +#: netbox/templates/dcim/interface.html:182 msgid "Connections" msgstr "" -#: netbox/netbox/navigation/menu.py:117 +#: netbox/netbox/navigation/menu.py:123 msgid "Cables" msgstr "" -#: netbox/netbox/navigation/menu.py:118 +#: netbox/netbox/navigation/menu.py:124 msgid "Wireless Links" msgstr "" -#: netbox/netbox/navigation/menu.py:121 +#: netbox/netbox/navigation/menu.py:127 msgid "Interface Connections" msgstr "" -#: netbox/netbox/navigation/menu.py:126 +#: netbox/netbox/navigation/menu.py:132 msgid "Console Connections" msgstr "" -#: netbox/netbox/navigation/menu.py:131 +#: netbox/netbox/navigation/menu.py:137 msgid "Power Connections" msgstr "" -#: netbox/netbox/navigation/menu.py:147 +#: netbox/netbox/navigation/menu.py:153 msgid "Wireless LAN Groups" msgstr "" -#: netbox/netbox/navigation/menu.py:168 +#: netbox/netbox/navigation/menu.py:174 msgid "Prefix & VLAN Roles" msgstr "" -#: netbox/netbox/navigation/menu.py:174 +#: netbox/netbox/navigation/menu.py:180 msgid "ASN Ranges" msgstr "" -#: netbox/netbox/navigation/menu.py:196 +#: netbox/netbox/navigation/menu.py:202 msgid "VLAN Groups" msgstr "" #: netbox/netbox/navigation/menu.py:203 +msgid "VLAN Translation Policies" +msgstr "" + +#: netbox/netbox/navigation/menu.py:204 +#: netbox/templates/ipam/vlantranslationpolicy.html:46 +msgid "VLAN Translation Rules" +msgstr "" + +#: netbox/netbox/navigation/menu.py:211 msgid "Service Templates" msgstr "" -#: netbox/netbox/navigation/menu.py:204 netbox/templates/dcim/device.html:302 +#: netbox/netbox/navigation/menu.py:212 netbox/templates/dcim/device.html:302 #: netbox/templates/ipam/ipaddress.html:118 #: netbox/templates/virtualization/virtualmachine.html:154 msgid "Services" msgstr "" -#: netbox/netbox/navigation/menu.py:211 +#: netbox/netbox/navigation/menu.py:219 msgid "VPN" msgstr "" -#: netbox/netbox/navigation/menu.py:215 netbox/netbox/navigation/menu.py:217 +#: netbox/netbox/navigation/menu.py:223 netbox/netbox/navigation/menu.py:225 #: netbox/vpn/tables/tunnels.py:24 msgid "Tunnels" msgstr "" -#: netbox/netbox/navigation/menu.py:218 netbox/templates/vpn/tunnelgroup.html:8 +#: netbox/netbox/navigation/menu.py:226 netbox/templates/vpn/tunnelgroup.html:8 msgid "Tunnel Groups" msgstr "" -#: netbox/netbox/navigation/menu.py:219 +#: netbox/netbox/navigation/menu.py:227 msgid "Tunnel Terminations" msgstr "" -#: netbox/netbox/navigation/menu.py:223 netbox/netbox/navigation/menu.py:225 +#: netbox/netbox/navigation/menu.py:231 netbox/netbox/navigation/menu.py:233 #: netbox/vpn/models/l2vpn.py:64 msgid "L2VPNs" msgstr "" -#: netbox/netbox/navigation/menu.py:226 netbox/templates/vpn/l2vpn.html:56 -#: netbox/templates/vpn/tunnel.html:72 netbox/vpn/tables/tunnels.py:58 -msgid "Terminations" -msgstr "" - -#: netbox/netbox/navigation/menu.py:232 +#: netbox/netbox/navigation/menu.py:240 msgid "IKE Proposals" msgstr "" -#: netbox/netbox/navigation/menu.py:233 +#: netbox/netbox/navigation/menu.py:241 #: netbox/templates/vpn/ikeproposal.html:41 msgid "IKE Policies" msgstr "" -#: netbox/netbox/navigation/menu.py:234 +#: netbox/netbox/navigation/menu.py:242 msgid "IPSec Proposals" msgstr "" -#: netbox/netbox/navigation/menu.py:235 +#: netbox/netbox/navigation/menu.py:243 #: netbox/templates/vpn/ipsecproposal.html:37 msgid "IPSec Policies" msgstr "" -#: netbox/netbox/navigation/menu.py:236 netbox/templates/vpn/ikepolicy.html:38 +#: netbox/netbox/navigation/menu.py:244 netbox/templates/vpn/ikepolicy.html:38 #: netbox/templates/vpn/ipsecpolicy.html:25 msgid "IPSec Profiles" msgstr "" -#: netbox/netbox/navigation/menu.py:251 +#: netbox/netbox/navigation/menu.py:259 #: netbox/templates/virtualization/virtualmachine.html:174 #: netbox/templates/virtualization/virtualmachine/base.html:32 #: netbox/templates/virtualization/virtualmachine_list.html:21 -#: netbox/virtualization/tables/virtualmachines.py:104 -#: netbox/virtualization/views.py:386 +#: netbox/virtualization/tables/virtualmachines.py:74 +#: netbox/virtualization/views.py:405 msgid "Virtual Disks" msgstr "" -#: netbox/netbox/navigation/menu.py:258 +#: netbox/netbox/navigation/menu.py:266 msgid "Cluster Types" msgstr "" -#: netbox/netbox/navigation/menu.py:259 +#: netbox/netbox/navigation/menu.py:267 msgid "Cluster Groups" msgstr "" -#: netbox/netbox/navigation/menu.py:273 +#: netbox/netbox/navigation/menu.py:281 msgid "Circuit Types" msgstr "" -#: netbox/netbox/navigation/menu.py:274 -msgid "Circuit Groups" -msgstr "" - -#: netbox/netbox/navigation/menu.py:275 -#: netbox/templates/circuits/circuit.html:66 -msgid "Group Assignments" -msgstr "" - -#: netbox/netbox/navigation/menu.py:276 +#: netbox/netbox/navigation/menu.py:282 msgid "Circuit Terminations" msgstr "" -#: netbox/netbox/navigation/menu.py:280 netbox/netbox/navigation/menu.py:282 +#: netbox/netbox/navigation/menu.py:286 netbox/netbox/navigation/menu.py:288 +#: netbox/templates/circuits/providernetwork.html:55 +msgid "Virtual Circuits" +msgstr "" + +#: netbox/netbox/navigation/menu.py:289 +msgid "Virtual Circuit Types" +msgstr "" + +#: netbox/netbox/navigation/menu.py:290 +msgid "Virtual Circuit Terminations" +msgstr "" + +#: netbox/netbox/navigation/menu.py:296 +msgid "Circuit Groups" +msgstr "" + +#: netbox/netbox/navigation/menu.py:297 +#: netbox/templates/circuits/circuit.html:76 +#: netbox/templates/circuits/virtualcircuit.html:69 +msgid "Group Assignments" +msgstr "" + +#: netbox/netbox/navigation/menu.py:301 netbox/netbox/navigation/menu.py:303 msgid "Providers" msgstr "" -#: netbox/netbox/navigation/menu.py:283 +#: netbox/netbox/navigation/menu.py:304 #: netbox/templates/circuits/provider.html:51 msgid "Provider Accounts" msgstr "" -#: netbox/netbox/navigation/menu.py:284 +#: netbox/netbox/navigation/menu.py:305 msgid "Provider Networks" msgstr "" -#: netbox/netbox/navigation/menu.py:298 +#: netbox/netbox/navigation/menu.py:319 msgid "Power Panels" msgstr "" -#: netbox/netbox/navigation/menu.py:309 +#: netbox/netbox/navigation/menu.py:330 msgid "Configurations" msgstr "" -#: netbox/netbox/navigation/menu.py:311 +#: netbox/netbox/navigation/menu.py:332 msgid "Config Contexts" msgstr "" -#: netbox/netbox/navigation/menu.py:312 +#: netbox/netbox/navigation/menu.py:333 msgid "Config Templates" msgstr "" -#: netbox/netbox/navigation/menu.py:319 netbox/netbox/navigation/menu.py:323 +#: netbox/netbox/navigation/menu.py:340 netbox/netbox/navigation/menu.py:344 msgid "Customization" msgstr "" -#: netbox/netbox/navigation/menu.py:325 +#: netbox/netbox/navigation/menu.py:346 #: netbox/templates/dcim/device_edit.html:103 #: netbox/templates/dcim/htmx/cable_edit.html:81 #: netbox/templates/dcim/virtualchassis_add.html:31 @@ -10831,96 +11358,96 @@ msgstr "" #: netbox/templates/htmx/form.html:19 netbox/templates/inc/filter_list.html:30 #: netbox/templates/inc/panels/custom_fields.html:7 #: netbox/templates/ipam/ipaddress_bulk_add.html:35 -#: netbox/templates/ipam/vlan_edit.html:59 +#: netbox/templates/ipam/vlan_edit.html:67 msgid "Custom Fields" msgstr "" -#: netbox/netbox/navigation/menu.py:326 +#: netbox/netbox/navigation/menu.py:347 msgid "Custom Field Choices" msgstr "" -#: netbox/netbox/navigation/menu.py:327 +#: netbox/netbox/navigation/menu.py:348 msgid "Custom Links" msgstr "" -#: netbox/netbox/navigation/menu.py:328 +#: netbox/netbox/navigation/menu.py:349 msgid "Export Templates" msgstr "" -#: netbox/netbox/navigation/menu.py:329 +#: netbox/netbox/navigation/menu.py:350 msgid "Saved Filters" msgstr "" -#: netbox/netbox/navigation/menu.py:331 +#: netbox/netbox/navigation/menu.py:352 msgid "Image Attachments" msgstr "" -#: netbox/netbox/navigation/menu.py:349 +#: netbox/netbox/navigation/menu.py:370 msgid "Operations" msgstr "" -#: netbox/netbox/navigation/menu.py:353 +#: netbox/netbox/navigation/menu.py:374 msgid "Integrations" msgstr "" -#: netbox/netbox/navigation/menu.py:355 +#: netbox/netbox/navigation/menu.py:376 msgid "Data Sources" msgstr "" -#: netbox/netbox/navigation/menu.py:356 +#: netbox/netbox/navigation/menu.py:377 msgid "Event Rules" msgstr "" -#: netbox/netbox/navigation/menu.py:357 +#: netbox/netbox/navigation/menu.py:378 msgid "Webhooks" msgstr "" -#: netbox/netbox/navigation/menu.py:361 netbox/netbox/navigation/menu.py:365 -#: netbox/netbox/views/generic/feature_views.py:153 +#: netbox/netbox/navigation/menu.py:382 netbox/netbox/navigation/menu.py:386 +#: netbox/netbox/views/generic/feature_views.py:158 #: netbox/templates/extras/report/base.html:37 #: netbox/templates/extras/script/base.html:36 msgid "Jobs" msgstr "" -#: netbox/netbox/navigation/menu.py:371 +#: netbox/netbox/navigation/menu.py:392 msgid "Logging" msgstr "" -#: netbox/netbox/navigation/menu.py:373 +#: netbox/netbox/navigation/menu.py:394 msgid "Notification Groups" msgstr "" -#: netbox/netbox/navigation/menu.py:374 +#: netbox/netbox/navigation/menu.py:395 msgid "Journal Entries" msgstr "" -#: netbox/netbox/navigation/menu.py:375 +#: netbox/netbox/navigation/menu.py:396 #: netbox/templates/core/objectchange.html:9 #: netbox/templates/core/objectchange_list.html:4 msgid "Change Log" msgstr "" -#: netbox/netbox/navigation/menu.py:382 netbox/templates/inc/user_menu.html:29 +#: netbox/netbox/navigation/menu.py:403 netbox/templates/inc/user_menu.html:29 msgid "Admin" msgstr "" -#: netbox/netbox/navigation/menu.py:430 netbox/templates/account/base.html:27 -#: netbox/templates/inc/user_menu.html:57 +#: netbox/netbox/navigation/menu.py:451 netbox/templates/account/base.html:27 +#: netbox/templates/inc/user_menu.html:52 msgid "API Tokens" msgstr "" -#: netbox/netbox/navigation/menu.py:437 netbox/users/forms/model_forms.py:187 +#: netbox/netbox/navigation/menu.py:458 netbox/users/forms/model_forms.py:187 #: netbox/users/forms/model_forms.py:195 netbox/users/forms/model_forms.py:242 #: netbox/users/forms/model_forms.py:249 msgid "Permissions" msgstr "" -#: netbox/netbox/navigation/menu.py:445 netbox/netbox/navigation/menu.py:449 +#: netbox/netbox/navigation/menu.py:466 netbox/netbox/navigation/menu.py:470 #: netbox/templates/core/system.html:7 msgid "System" msgstr "" -#: netbox/netbox/navigation/menu.py:454 netbox/netbox/navigation/menu.py:502 +#: netbox/netbox/navigation/menu.py:475 netbox/netbox/navigation/menu.py:523 #: netbox/templates/500.html:35 netbox/templates/account/preferences.html:22 #: netbox/templates/core/plugin.html:13 #: netbox/templates/core/plugin_list.html:7 @@ -10928,11 +11455,11 @@ msgstr "" msgid "Plugins" msgstr "" -#: netbox/netbox/navigation/menu.py:459 +#: netbox/netbox/navigation/menu.py:480 msgid "Configuration History" msgstr "" -#: netbox/netbox/navigation/menu.py:465 netbox/templates/core/rq_task.html:8 +#: netbox/netbox/navigation/menu.py:486 netbox/templates/core/rq_task.html:8 #: netbox/templates/core/rq_task_list.html:22 msgid "Background Tasks" msgstr "" @@ -10950,30 +11477,30 @@ msgstr "" msgid "Button color must be a choice within ButtonColorChoices." msgstr "" -#: netbox/netbox/plugins/registration.py:25 +#: netbox/netbox/plugins/registration.py:26 #, python-brace-format msgid "" "PluginTemplateExtension class {template_extension} was passed as an instance!" msgstr "" -#: netbox/netbox/plugins/registration.py:31 +#: netbox/netbox/plugins/registration.py:32 #, python-brace-format msgid "" "{template_extension} is not a subclass of netbox.plugins." "PluginTemplateExtension!" msgstr "" -#: netbox/netbox/plugins/registration.py:51 +#: netbox/netbox/plugins/registration.py:57 #, python-brace-format msgid "{item} must be an instance of netbox.plugins.PluginMenuItem" msgstr "" -#: netbox/netbox/plugins/registration.py:62 +#: netbox/netbox/plugins/registration.py:68 #, python-brace-format msgid "{menu_link} must be an instance of netbox.plugins.PluginMenuItem" msgstr "" -#: netbox/netbox/plugins/registration.py:67 +#: netbox/netbox/plugins/registration.py:73 #, python-brace-format msgid "{button} must be an instance of netbox.plugins.PluginMenuButton" msgstr "" @@ -11055,79 +11582,79 @@ msgstr "" msgid "Cannot delete stores from registry" msgstr "" -#: netbox/netbox/settings.py:760 +#: netbox/netbox/settings.py:755 msgid "Czech" msgstr "" -#: netbox/netbox/settings.py:761 +#: netbox/netbox/settings.py:756 msgid "Danish" msgstr "" -#: netbox/netbox/settings.py:762 +#: netbox/netbox/settings.py:757 msgid "German" msgstr "" -#: netbox/netbox/settings.py:763 +#: netbox/netbox/settings.py:758 msgid "English" msgstr "" -#: netbox/netbox/settings.py:764 +#: netbox/netbox/settings.py:759 msgid "Spanish" msgstr "" -#: netbox/netbox/settings.py:765 +#: netbox/netbox/settings.py:760 msgid "French" msgstr "" -#: netbox/netbox/settings.py:766 +#: netbox/netbox/settings.py:761 msgid "Italian" msgstr "" -#: netbox/netbox/settings.py:767 +#: netbox/netbox/settings.py:762 msgid "Japanese" msgstr "" -#: netbox/netbox/settings.py:768 +#: netbox/netbox/settings.py:763 msgid "Dutch" msgstr "" -#: netbox/netbox/settings.py:769 +#: netbox/netbox/settings.py:764 msgid "Polish" msgstr "" -#: netbox/netbox/settings.py:770 +#: netbox/netbox/settings.py:765 msgid "Portuguese" msgstr "" -#: netbox/netbox/settings.py:771 +#: netbox/netbox/settings.py:766 msgid "Russian" msgstr "" -#: netbox/netbox/settings.py:772 +#: netbox/netbox/settings.py:767 msgid "Turkish" msgstr "" -#: netbox/netbox/settings.py:773 +#: netbox/netbox/settings.py:768 msgid "Ukrainian" msgstr "" -#: netbox/netbox/settings.py:774 +#: netbox/netbox/settings.py:769 msgid "Chinese" msgstr "" -#: netbox/netbox/tables/columns.py:176 +#: netbox/netbox/tables/columns.py:177 msgid "Select all" msgstr "" -#: netbox/netbox/tables/columns.py:189 +#: netbox/netbox/tables/columns.py:190 msgid "Toggle all" msgstr "" -#: netbox/netbox/tables/columns.py:300 +#: netbox/netbox/tables/columns.py:302 msgid "Toggle Dropdown" msgstr "" -#: netbox/netbox/tables/columns.py:572 netbox/templates/core/job.html:53 +#: netbox/netbox/tables/columns.py:575 netbox/templates/core/job.html:53 msgid "Error" msgstr "" @@ -11161,19 +11688,19 @@ msgstr "" msgid "Row {i}: Object with ID {id} does not exist" msgstr "" -#: netbox/netbox/views/generic/bulk_views.py:709 -#: netbox/netbox/views/generic/bulk_views.py:910 -#: netbox/netbox/views/generic/bulk_views.py:958 +#: netbox/netbox/views/generic/bulk_views.py:703 +#: netbox/netbox/views/generic/bulk_views.py:904 +#: netbox/netbox/views/generic/bulk_views.py:952 #, python-brace-format msgid "No {object_type} were selected." msgstr "" -#: netbox/netbox/views/generic/bulk_views.py:788 +#: netbox/netbox/views/generic/bulk_views.py:782 #, python-brace-format msgid "Renamed {count} {object_type}" msgstr "" -#: netbox/netbox/views/generic/bulk_views.py:888 +#: netbox/netbox/views/generic/bulk_views.py:882 #, python-brace-format msgid "Deleted {count} {object_type}" msgstr "" @@ -11186,16 +11713,16 @@ msgstr "" msgid "Journal" msgstr "" -#: netbox/netbox/views/generic/feature_views.py:207 +#: netbox/netbox/views/generic/feature_views.py:212 msgid "Unable to synchronize data: No data file set." msgstr "" -#: netbox/netbox/views/generic/feature_views.py:211 +#: netbox/netbox/views/generic/feature_views.py:216 #, python-brace-format msgid "Synchronized data for {object_type} {object}." msgstr "" -#: netbox/netbox/views/generic/feature_views.py:236 +#: netbox/netbox/views/generic/feature_views.py:241 #, python-brace-format msgid "Synced {count} {object_type}" msgstr "" @@ -11267,9 +11794,9 @@ msgstr "" msgid "Home Page" msgstr "" -#: netbox/templates/account/base.html:7 netbox/templates/inc/user_menu.html:45 +#: netbox/templates/account/base.html:7 netbox/templates/inc/user_menu.html:40 #: netbox/vpn/forms/bulk_edit.py:255 netbox/vpn/forms/filtersets.py:189 -#: netbox/vpn/forms/model_forms.py:379 +#: netbox/vpn/forms/model_forms.py:382 msgid "Profile" msgstr "" @@ -11281,11 +11808,11 @@ msgstr "" #: netbox/templates/account/base.html:16 #: netbox/templates/account/subscriptions.html:7 -#: netbox/templates/inc/user_menu.html:51 +#: netbox/templates/inc/user_menu.html:46 msgid "Subscriptions" msgstr "" -#: netbox/templates/account/base.html:19 netbox/templates/inc/user_menu.html:54 +#: netbox/templates/account/base.html:19 netbox/templates/inc/user_menu.html:49 msgid "Preferences" msgstr "" @@ -11313,6 +11840,7 @@ msgstr "" #: netbox/templates/generic/object_edit.html:72 #: netbox/templates/htmx/delete_form.html:53 #: netbox/templates/htmx/delete_form.html:55 +#: netbox/templates/htmx/quick_add.html:21 #: netbox/templates/ipam/ipaddress_assign.html:28 #: netbox/templates/virtualization/cluster_add_devices.html:30 msgid "Cancel" @@ -11408,7 +11936,7 @@ msgstr "" #: netbox/templates/core/objectchange.html:142 #: netbox/templates/dcim/devicebay.html:59 #: netbox/templates/dcim/inc/panels/inventory_items.html:45 -#: netbox/templates/dcim/interface.html:296 +#: netbox/templates/dcim/interface.html:353 #: netbox/templates/dcim/modulebay.html:80 #: netbox/templates/extras/configcontext.html:70 #: netbox/templates/extras/eventrule.html:66 @@ -11495,15 +12023,16 @@ msgstr "" msgid "Community" msgstr "" -#: netbox/templates/circuits/circuit.html:47 +#: netbox/templates/circuits/circuit.html:57 msgid "Install Date" msgstr "" -#: netbox/templates/circuits/circuit.html:51 +#: netbox/templates/circuits/circuit.html:61 msgid "Termination Date" msgstr "" -#: netbox/templates/circuits/circuit.html:70 +#: netbox/templates/circuits/circuit.html:80 +#: netbox/templates/circuits/virtualcircuit.html:73 #: netbox/templates/ipam/inc/panels/fhrp_groups.html:15 msgid "Assign Group" msgstr "" @@ -11551,7 +12080,7 @@ msgid "Add" msgstr "" #: netbox/templates/circuits/inc/circuit_termination.html:15 -#: netbox/templates/circuits/inc/circuit_termination_fields.html:36 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:37 #: netbox/templates/dcim/inc/panels/inventory_items.html:32 #: netbox/templates/dcim/powerpanel.html:56 #: netbox/templates/extras/script_list.html:30 @@ -11566,35 +12095,39 @@ msgstr "" msgid "Swap" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:19 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:5 +msgid "Termination point" +msgstr "" + +#: netbox/templates/circuits/inc/circuit_termination_fields.html:20 #: netbox/templates/dcim/consoleport.html:59 #: netbox/templates/dcim/consoleserverport.html:60 #: netbox/templates/dcim/powerfeed.html:114 msgid "Marked as connected" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:21 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:22 msgid "to" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:31 #: netbox/templates/circuits/inc/circuit_termination_fields.html:32 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:33 #: netbox/templates/dcim/frontport.html:80 #: netbox/templates/dcim/inc/connection_endpoints.html:7 -#: netbox/templates/dcim/interface.html:154 +#: netbox/templates/dcim/interface.html:211 #: netbox/templates/dcim/rearport.html:76 msgid "Trace" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:35 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:36 msgid "Edit cable" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:40 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:41 msgid "Remove cable" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:41 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:42 #: netbox/templates/dcim/bulk_disconnect.html:5 #: netbox/templates/dcim/device/consoleports.html:12 #: netbox/templates/dcim/device/consoleserverports.html:12 @@ -11607,33 +12140,33 @@ msgstr "" msgid "Disconnect" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:48 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:49 #: netbox/templates/dcim/consoleport.html:69 #: netbox/templates/dcim/consoleserverport.html:70 #: netbox/templates/dcim/frontport.html:102 -#: netbox/templates/dcim/interface.html:180 -#: netbox/templates/dcim/interface.html:200 +#: netbox/templates/dcim/interface.html:237 +#: netbox/templates/dcim/interface.html:257 #: netbox/templates/dcim/powerfeed.html:127 -#: netbox/templates/dcim/poweroutlet.html:71 -#: netbox/templates/dcim/poweroutlet.html:72 +#: netbox/templates/dcim/poweroutlet.html:81 +#: netbox/templates/dcim/poweroutlet.html:82 #: netbox/templates/dcim/powerport.html:73 #: netbox/templates/dcim/rearport.html:98 msgid "Connect" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:70 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:65 msgid "Downstream" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:71 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:66 msgid "Upstream" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:80 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:75 msgid "Cross-Connect" msgstr "" -#: netbox/templates/circuits/inc/circuit_termination_fields.html:84 +#: netbox/templates/circuits/inc/circuit_termination_fields.html:79 msgid "Patch Panel/Port" msgstr "" @@ -11645,6 +12178,27 @@ msgstr "" msgid "Provider Account" msgstr "" +#: netbox/templates/circuits/providernetwork.html:59 +msgid "Add a Virtual Circuit" +msgstr "" + +#: netbox/templates/circuits/virtualcircuit.html:91 +#: netbox/templates/vpn/tunnel.html:9 +msgid "Add Termination" +msgstr "" + +#: netbox/templates/circuits/virtualcircuittermination.html:23 +msgid "Virtual Circuit Termination" +msgstr "" + +#: netbox/templates/circuits/virtualcircuittype.html:10 +msgid "Add Virtual Circuit" +msgstr "" + +#: netbox/templates/circuits/virtualcircuittype.html:19 +msgid "Virtual Circuit Type" +msgstr "" + #: netbox/templates/core/configrevision.html:35 msgid "Configuration Data" msgstr "" @@ -11677,7 +12231,7 @@ msgstr "" #: netbox/templates/core/datafile.html:42 netbox/templates/ipam/iprange.html:25 #: netbox/templates/virtualization/virtualdisk.html:29 -#: netbox/virtualization/tables/virtualmachines.py:198 +#: netbox/virtualization/tables/virtualmachines.py:169 msgid "Size" msgstr "" @@ -12115,8 +12669,8 @@ msgstr "" #: netbox/templates/dcim/consoleport.html:65 #: netbox/templates/dcim/consoleserverport.html:66 #: netbox/templates/dcim/frontport.html:98 -#: netbox/templates/dcim/interface.html:176 -#: netbox/templates/dcim/poweroutlet.html:69 +#: netbox/templates/dcim/interface.html:233 +#: netbox/templates/dcim/poweroutlet.html:79 #: netbox/templates/dcim/powerport.html:69 msgid "Not Connected" msgstr "" @@ -12139,7 +12693,7 @@ msgid "Map" msgstr "" #: netbox/templates/dcim/device.html:108 -#: netbox/templates/dcim/inventoryitem.html:56 +#: netbox/templates/dcim/inventoryitem.html:60 #: netbox/templates/dcim/module.html:81 netbox/templates/dcim/modulebay.html:74 #: netbox/templates/dcim/rack.html:61 msgid "Asset Tag" @@ -12155,7 +12709,7 @@ msgstr "" #: netbox/templates/dcim/device.html:175 #: netbox/templates/dcim/device_edit.html:64 -#: netbox/virtualization/forms/model_forms.py:223 +#: netbox/virtualization/forms/model_forms.py:222 msgid "Management" msgstr "" @@ -12395,8 +12949,8 @@ msgid "Rear Port Position" msgstr "" #: netbox/templates/dcim/frontport.html:72 -#: netbox/templates/dcim/interface.html:144 -#: netbox/templates/dcim/poweroutlet.html:63 +#: netbox/templates/dcim/interface.html:201 +#: netbox/templates/dcim/poweroutlet.html:73 #: netbox/templates/dcim/powerport.html:63 #: netbox/templates/dcim/rearport.html:68 msgid "Marked as Connected" @@ -12496,76 +13050,78 @@ msgid "PoE Type" msgstr "" #: netbox/templates/dcim/interface.html:81 -#: netbox/templates/virtualization/vminterface.html:63 +#: netbox/templates/virtualization/vminterface.html:55 +#: netbox/virtualization/forms/model_forms.py:387 msgid "802.1Q Mode" msgstr "" -#: netbox/templates/dcim/interface.html:125 -#: netbox/templates/virtualization/vminterface.html:59 -msgid "MAC Address" +#: netbox/templates/dcim/interface.html:156 +#: netbox/templates/virtualization/vminterface.html:88 +msgid "VLAN Translation" msgstr "" -#: netbox/templates/dcim/interface.html:151 +#: netbox/templates/dcim/interface.html:208 msgid "Wireless Link" msgstr "" -#: netbox/templates/dcim/interface.html:218 netbox/vpn/choices.py:63 -msgid "Peer" -msgstr "" - -#: netbox/templates/dcim/interface.html:230 +#: netbox/templates/dcim/interface.html:287 #: netbox/templates/wireless/inc/wirelesslink_interface.html:26 msgid "Channel" msgstr "" -#: netbox/templates/dcim/interface.html:239 +#: netbox/templates/dcim/interface.html:296 #: netbox/templates/wireless/inc/wirelesslink_interface.html:32 msgid "Channel Frequency" msgstr "" -#: netbox/templates/dcim/interface.html:242 -#: netbox/templates/dcim/interface.html:250 -#: netbox/templates/dcim/interface.html:261 -#: netbox/templates/dcim/interface.html:269 +#: netbox/templates/dcim/interface.html:299 +#: netbox/templates/dcim/interface.html:307 +#: netbox/templates/dcim/interface.html:318 +#: netbox/templates/dcim/interface.html:326 msgid "MHz" msgstr "" -#: netbox/templates/dcim/interface.html:258 +#: netbox/templates/dcim/interface.html:315 #: netbox/templates/wireless/inc/wirelesslink_interface.html:42 msgid "Channel Width" msgstr "" -#: netbox/templates/dcim/interface.html:285 +#: netbox/templates/dcim/interface.html:342 #: netbox/templates/wireless/wirelesslan.html:14 #: netbox/templates/wireless/wirelesslink.html:21 -#: netbox/wireless/forms/bulk_edit.py:60 netbox/wireless/forms/bulk_edit.py:102 -#: netbox/wireless/forms/filtersets.py:40 -#: netbox/wireless/forms/filtersets.py:80 netbox/wireless/models.py:82 -#: netbox/wireless/models.py:156 netbox/wireless/tables/wirelesslan.py:44 +#: netbox/wireless/forms/bulk_edit.py:62 netbox/wireless/forms/bulk_edit.py:105 +#: netbox/wireless/forms/filtersets.py:43 +#: netbox/wireless/forms/filtersets.py:108 netbox/wireless/models.py:82 +#: netbox/wireless/models.py:153 netbox/wireless/tables/wirelesslan.py:44 msgid "SSID" msgstr "" -#: netbox/templates/dcim/interface.html:305 +#: netbox/templates/dcim/interface.html:362 msgid "LAG Members" msgstr "" -#: netbox/templates/dcim/interface.html:323 +#: netbox/templates/dcim/interface.html:380 msgid "No member interfaces" msgstr "" -#: netbox/templates/dcim/interface.html:343 +#: netbox/templates/dcim/interface.html:400 #: netbox/templates/ipam/fhrpgroup.html:73 #: netbox/templates/ipam/iprange/ip_addresses.html:7 #: netbox/templates/ipam/prefix/ip_addresses.html:7 -#: netbox/templates/virtualization/vminterface.html:89 +#: netbox/templates/virtualization/vminterface.html:105 msgid "Add IP Address" msgstr "" +#: netbox/templates/dcim/interface.html:417 +#: netbox/templates/virtualization/vminterface.html:123 +msgid "Add MAC Address" +msgstr "" + #: netbox/templates/dcim/inventoryitem.html:24 msgid "Parent Item" msgstr "" -#: netbox/templates/dcim/inventoryitem.html:48 +#: netbox/templates/dcim/inventoryitem.html:52 msgid "Part ID" msgstr "" @@ -12585,6 +13141,10 @@ msgstr "" msgid "Add a Device" msgstr "" +#: netbox/templates/dcim/macaddress.html:36 +msgid "Primary for interface" +msgstr "" + #: netbox/templates/dcim/manufacturer.html:16 msgid "Add Device Type" msgstr "" @@ -12615,7 +13175,7 @@ msgctxt "Abbreviation for amperes" msgid "A" msgstr "" -#: netbox/templates/dcim/poweroutlet.html:48 +#: netbox/templates/dcim/poweroutlet.html:58 msgid "Feed Leg" msgstr "" @@ -13014,11 +13574,17 @@ msgstr "" msgid "No content found" msgstr "" -#: netbox/templates/extras/dashboard/widgets/rssfeed.html:18 +#: netbox/templates/extras/dashboard/widgets/rssfeed.html:17 +msgid "" +"This RSS feed requires an external connection. Check the ISOLATED_DEPLOYMENT " +"setting." +msgstr "" + +#: netbox/templates/extras/dashboard/widgets/rssfeed.html:22 msgid "There was a problem fetching the RSS feed" msgstr "" -#: netbox/templates/extras/dashboard/widgets/rssfeed.html:21 +#: netbox/templates/extras/dashboard/widgets/rssfeed.html:25 msgid "HTTP" msgstr "" @@ -13441,6 +14007,18 @@ msgstr "" msgid "Select" msgstr "" +#: netbox/templates/htmx/quick_add.html:7 +msgid "Quick Add" +msgstr "" + +#: netbox/templates/htmx/quick_add_created.html:18 +#, python-format +msgid "" +"\n" +" Created %(object_type)s %(object)s\n" +" " +msgstr "" + #: netbox/templates/inc/filter_list.html:43 #: netbox/utilities/templates/helpers/table_config_form.html:39 msgid "Reset" @@ -13510,15 +14088,11 @@ msgstr "" msgid "Help center" msgstr "" -#: netbox/templates/inc/user_menu.html:41 -msgid "Django Admin" -msgstr "" - -#: netbox/templates/inc/user_menu.html:61 +#: netbox/templates/inc/user_menu.html:56 msgid "Log Out" msgstr "" -#: netbox/templates/inc/user_menu.html:68 netbox/templates/login.html:38 +#: netbox/templates/inc/user_menu.html:63 netbox/templates/login.html:38 msgid "Log In" msgstr "" @@ -13615,43 +14189,43 @@ msgstr "" msgid "Ending Address" msgstr "" -#: netbox/templates/ipam/iprange.html:33 netbox/templates/ipam/prefix.html:110 +#: netbox/templates/ipam/iprange.html:33 netbox/templates/ipam/prefix.html:106 msgid "Marked fully utilized" msgstr "" -#: netbox/templates/ipam/prefix.html:99 +#: netbox/templates/ipam/prefix.html:95 msgid "Addressing Details" msgstr "" -#: netbox/templates/ipam/prefix.html:118 +#: netbox/templates/ipam/prefix.html:114 msgid "Child IPs" msgstr "" -#: netbox/templates/ipam/prefix.html:126 +#: netbox/templates/ipam/prefix.html:122 msgid "Available IPs" msgstr "" -#: netbox/templates/ipam/prefix.html:138 +#: netbox/templates/ipam/prefix.html:134 msgid "First available IP" msgstr "" -#: netbox/templates/ipam/prefix.html:179 +#: netbox/templates/ipam/prefix.html:175 msgid "Prefix Details" msgstr "" -#: netbox/templates/ipam/prefix.html:185 +#: netbox/templates/ipam/prefix.html:181 msgid "Network Address" msgstr "" -#: netbox/templates/ipam/prefix.html:189 +#: netbox/templates/ipam/prefix.html:185 msgid "Network Mask" msgstr "" -#: netbox/templates/ipam/prefix.html:193 +#: netbox/templates/ipam/prefix.html:189 msgid "Wildcard Mask" msgstr "" -#: netbox/templates/ipam/prefix.html:197 +#: netbox/templates/ipam/prefix.html:193 msgid "Broadcast Address" msgstr "" @@ -13691,14 +14265,30 @@ msgstr "" msgid "Exporting L2VPNs" msgstr "" -#: netbox/templates/ipam/vlan.html:88 +#: netbox/templates/ipam/vlan.html:66 +msgid "Q-in-Q Role" +msgstr "" + +#: netbox/templates/ipam/vlan.html:104 msgid "Add a Prefix" msgstr "" +#: netbox/templates/ipam/vlan.html:114 +msgid "Customer VLANs" +msgstr "" + +#: netbox/templates/ipam/vlan.html:118 +msgid "Add a VLAN" +msgstr "" + #: netbox/templates/ipam/vlangroup.html:18 msgid "Add VLAN" msgstr "" +#: netbox/templates/ipam/vlantranslationpolicy.html:51 +msgid "Add Rule" +msgstr "" + #: netbox/templates/ipam/vrf.html:16 msgid "Route Distinguisher" msgstr "" @@ -13767,7 +14357,7 @@ msgstr "" #: netbox/templates/tenancy/contact.html:18 netbox/tenancy/filtersets.py:147 #: netbox/tenancy/forms/bulk_edit.py:137 netbox/tenancy/forms/filtersets.py:102 -#: netbox/tenancy/forms/forms.py:56 netbox/tenancy/forms/model_forms.py:106 +#: netbox/tenancy/forms/forms.py:57 netbox/tenancy/forms/model_forms.py:106 #: netbox/tenancy/forms/model_forms.py:130 netbox/tenancy/tables/contacts.py:98 msgid "Contact" msgstr "" @@ -13783,7 +14373,7 @@ msgid "Phone" msgstr "" #: netbox/templates/tenancy/contactgroup.html:18 -#: netbox/tenancy/forms/forms.py:66 netbox/tenancy/forms/model_forms.py:75 +#: netbox/tenancy/forms/forms.py:67 netbox/tenancy/forms/model_forms.py:75 msgid "Contact Group" msgstr "" @@ -13792,7 +14382,7 @@ msgid "Add Contact Group" msgstr "" #: netbox/templates/tenancy/contactrole.html:15 -#: netbox/tenancy/filtersets.py:152 netbox/tenancy/forms/forms.py:61 +#: netbox/tenancy/filtersets.py:152 netbox/tenancy/forms/forms.py:62 #: netbox/tenancy/forms/model_forms.py:87 msgid "Contact Role" msgstr "" @@ -13806,8 +14396,8 @@ msgid "Add Tenant" msgstr "" #: netbox/templates/tenancy/tenantgroup.html:26 -#: netbox/tenancy/forms/model_forms.py:32 netbox/tenancy/tables/columns.py:51 -#: netbox/tenancy/tables/columns.py:61 +#: netbox/tenancy/forms/model_forms.py:32 netbox/tenancy/tables/columns.py:36 +#: netbox/tenancy/tables/columns.py:46 msgid "Tenant Group" msgstr "" @@ -13838,21 +14428,21 @@ msgstr "" msgid "Assigned Users" msgstr "" -#: netbox/templates/virtualization/cluster.html:52 +#: netbox/templates/virtualization/cluster.html:56 msgid "Allocated Resources" msgstr "" -#: netbox/templates/virtualization/cluster.html:55 +#: netbox/templates/virtualization/cluster.html:59 #: netbox/templates/virtualization/virtualmachine.html:125 msgid "Virtual CPUs" msgstr "" -#: netbox/templates/virtualization/cluster.html:59 +#: netbox/templates/virtualization/cluster.html:63 #: netbox/templates/virtualization/virtualmachine.html:129 msgid "Memory" msgstr "" -#: netbox/templates/virtualization/cluster.html:69 +#: netbox/templates/virtualization/cluster.html:73 #: netbox/templates/virtualization/virtualmachine.html:140 msgid "Disk Space" msgstr "" @@ -13888,13 +14478,13 @@ msgid "Add Cluster" msgstr "" #: netbox/templates/virtualization/clustergroup.html:19 -#: netbox/virtualization/forms/model_forms.py:50 +#: netbox/virtualization/forms/model_forms.py:52 msgid "Cluster Group" msgstr "" #: netbox/templates/virtualization/clustertype.html:19 #: netbox/templates/virtualization/virtualmachine.html:110 -#: netbox/virtualization/forms/model_forms.py:36 +#: netbox/virtualization/forms/model_forms.py:38 msgid "Cluster Type" msgstr "" @@ -13903,8 +14493,8 @@ msgid "Virtual Disk" msgstr "" #: netbox/templates/virtualization/virtualmachine.html:122 -#: netbox/virtualization/forms/bulk_edit.py:190 -#: netbox/virtualization/forms/model_forms.py:224 +#: netbox/virtualization/forms/bulk_edit.py:172 +#: netbox/virtualization/forms/model_forms.py:223 msgid "Resources" msgstr "" @@ -13938,7 +14528,7 @@ msgstr "" #: netbox/templates/vpn/ipsecpolicy.html:45 #: netbox/templates/vpn/ipsecprofile.html:52 #: netbox/templates/vpn/ipsecprofile.html:77 -#: netbox/vpn/forms/model_forms.py:316 netbox/vpn/forms/model_forms.py:352 +#: netbox/vpn/forms/model_forms.py:317 netbox/vpn/forms/model_forms.py:354 #: netbox/vpn/tables/crypto.py:68 netbox/vpn/tables/crypto.py:134 msgid "Proposals" msgstr "" @@ -13984,11 +14574,11 @@ msgid "IPSec Policy" msgstr "" #: netbox/templates/vpn/ipsecpolicy.html:21 netbox/vpn/forms/bulk_edit.py:210 -#: netbox/vpn/models/crypto.py:193 +#: netbox/vpn/models/crypto.py:191 msgid "PFS group" msgstr "" -#: netbox/templates/vpn/ipsecprofile.html:10 netbox/vpn/forms/model_forms.py:54 +#: netbox/templates/vpn/ipsecprofile.html:10 netbox/vpn/forms/model_forms.py:55 msgid "IPSec Profile" msgstr "" @@ -14014,10 +14604,6 @@ msgstr "" msgid "Add a Termination" msgstr "" -#: netbox/templates/vpn/tunnel.html:9 -msgid "Add Termination" -msgstr "" - #: netbox/templates/vpn/tunnel.html:37 netbox/vpn/forms/bulk_edit.py:49 #: netbox/vpn/forms/bulk_import.py:48 netbox/vpn/forms/filtersets.py:57 msgid "Encapsulation" @@ -14025,7 +14611,7 @@ msgstr "" #: netbox/templates/vpn/tunnel.html:41 netbox/vpn/forms/bulk_edit.py:55 #: netbox/vpn/forms/bulk_import.py:53 netbox/vpn/forms/filtersets.py:64 -#: netbox/vpn/models/crypto.py:250 netbox/vpn/tables/tunnels.py:51 +#: netbox/vpn/models/crypto.py:246 netbox/vpn/tables/tunnels.py:51 msgid "IPSec profile" msgstr "" @@ -14048,8 +14634,8 @@ msgid "Tunnel Termination" msgstr "" #: netbox/templates/vpn/tunneltermination.html:35 -#: netbox/vpn/forms/bulk_import.py:107 netbox/vpn/forms/model_forms.py:102 -#: netbox/vpn/forms/model_forms.py:138 netbox/vpn/forms/model_forms.py:247 +#: netbox/vpn/forms/bulk_import.py:107 netbox/vpn/forms/model_forms.py:103 +#: netbox/vpn/forms/model_forms.py:139 netbox/vpn/forms/model_forms.py:248 #: netbox/vpn/tables/tunnels.py:101 msgid "Outside IP" msgstr "" @@ -14072,7 +14658,7 @@ msgctxt "Abbreviation for megahertz" msgid "MHz" msgstr "" -#: netbox/templates/wireless/wirelesslan.html:57 +#: netbox/templates/wireless/wirelesslan.html:65 msgid "Attached Interfaces" msgstr "" @@ -14081,7 +14667,7 @@ msgid "Add Wireless LAN" msgstr "" #: netbox/templates/wireless/wirelesslangroup.html:26 -#: netbox/wireless/forms/model_forms.py:28 +#: netbox/wireless/forms/model_forms.py:29 msgid "Wireless LAN Group" msgstr "" @@ -14093,13 +14679,6 @@ msgstr "" msgid "Link Properties" msgstr "" -#: netbox/templates/wireless/wirelesslink.html:38 -#: netbox/wireless/forms/bulk_edit.py:129 -#: netbox/wireless/forms/filtersets.py:102 -#: netbox/wireless/forms/model_forms.py:165 -msgid "Distance" -msgstr "" - #: netbox/tenancy/filtersets.py:28 msgid "Parent contact group (ID)" msgstr "" @@ -14170,47 +14749,47 @@ msgstr "" msgid "contact groups" msgstr "" -#: netbox/tenancy/models/contacts.py:48 +#: netbox/tenancy/models/contacts.py:42 msgid "contact role" msgstr "" -#: netbox/tenancy/models/contacts.py:49 +#: netbox/tenancy/models/contacts.py:43 msgid "contact roles" msgstr "" -#: netbox/tenancy/models/contacts.py:68 +#: netbox/tenancy/models/contacts.py:63 msgid "title" msgstr "" -#: netbox/tenancy/models/contacts.py:73 +#: netbox/tenancy/models/contacts.py:68 msgid "phone" msgstr "" -#: netbox/tenancy/models/contacts.py:78 +#: netbox/tenancy/models/contacts.py:73 msgid "email" msgstr "" -#: netbox/tenancy/models/contacts.py:87 +#: netbox/tenancy/models/contacts.py:82 msgid "link" msgstr "" -#: netbox/tenancy/models/contacts.py:103 +#: netbox/tenancy/models/contacts.py:98 msgid "contact" msgstr "" -#: netbox/tenancy/models/contacts.py:104 +#: netbox/tenancy/models/contacts.py:99 msgid "contacts" msgstr "" -#: netbox/tenancy/models/contacts.py:153 +#: netbox/tenancy/models/contacts.py:146 msgid "contact assignment" msgstr "" -#: netbox/tenancy/models/contacts.py:154 +#: netbox/tenancy/models/contacts.py:147 msgid "contact assignments" msgstr "" -#: netbox/tenancy/models/contacts.py:170 +#: netbox/tenancy/models/contacts.py:163 #, python-brace-format msgid "Contacts cannot be assigned to this object type ({type})." msgstr "" @@ -14223,19 +14802,19 @@ msgstr "" msgid "tenant groups" msgstr "" -#: netbox/tenancy/models/tenants.py:70 +#: netbox/tenancy/models/tenants.py:68 msgid "Tenant name must be unique per group." msgstr "" -#: netbox/tenancy/models/tenants.py:80 +#: netbox/tenancy/models/tenants.py:78 msgid "Tenant slug must be unique per group." msgstr "" -#: netbox/tenancy/models/tenants.py:88 +#: netbox/tenancy/models/tenants.py:86 msgid "tenant" msgstr "" -#: netbox/tenancy/models/tenants.py:89 +#: netbox/tenancy/models/tenants.py:87 msgid "tenants" msgstr "" @@ -14445,7 +15024,7 @@ msgstr "" msgid "tokens" msgstr "" -#: netbox/users/models/users.py:57 netbox/vpn/models/crypto.py:42 +#: netbox/users/models/users.py:57 netbox/vpn/models/crypto.py:43 msgid "group" msgstr "" @@ -14488,25 +15067,25 @@ msgstr "" msgid "{name} has a key defined but CHOICES is not a list" msgstr "" -#: netbox/utilities/conversion.py:19 +#: netbox/utilities/conversion.py:20 msgid "Weight must be a positive number" msgstr "" -#: netbox/utilities/conversion.py:21 +#: netbox/utilities/conversion.py:22 #, python-brace-format msgid "Invalid value '{weight}' for weight (must be a number)" msgstr "" -#: netbox/utilities/conversion.py:32 netbox/utilities/conversion.py:62 +#: netbox/utilities/conversion.py:33 netbox/utilities/conversion.py:63 #, python-brace-format msgid "Unknown unit {unit}. Must be one of the following: {valid_units}" msgstr "" -#: netbox/utilities/conversion.py:45 +#: netbox/utilities/conversion.py:46 msgid "Length must be a positive number" msgstr "" -#: netbox/utilities/conversion.py:47 +#: netbox/utilities/conversion.py:48 #, python-brace-format msgid "Invalid value '{length}' for length (must be a number)" msgstr "" @@ -14522,18 +15101,18 @@ msgstr "" msgid "More than 50" msgstr "" -#: netbox/utilities/fields.py:30 +#: netbox/utilities/fields.py:29 msgid "RGB color in hexadecimal. Example: " msgstr "" -#: netbox/utilities/fields.py:159 +#: netbox/utilities/fields.py:158 #, python-format msgid "" "%s(%r) is invalid. to_model parameter to CounterCacheField must be a string " "in the format 'app.model'" msgstr "" -#: netbox/utilities/fields.py:169 +#: netbox/utilities/fields.py:168 #, python-format msgid "" "%s(%r) is invalid. to_field parameter to CounterCacheField must be a string " @@ -14732,12 +15311,12 @@ msgstr "" msgid "Required column header \"{header}\" not found." msgstr "" -#: netbox/utilities/forms/widgets/apiselect.py:124 +#: netbox/utilities/forms/widgets/apiselect.py:133 #, python-brace-format msgid "Missing required value for dynamic query param: '{dynamic_params}'" msgstr "" -#: netbox/utilities/forms/widgets/apiselect.py:141 +#: netbox/utilities/forms/widgets/apiselect.py:150 #, python-brace-format msgid "Missing required value for static query param: '{static_params}'" msgstr "" @@ -14858,10 +15437,14 @@ msgstr "" msgid "Search NetBox" msgstr "" -#: netbox/utilities/templates/widgets/apiselect.html:7 +#: netbox/utilities/templates/widgets/apiselect.html:8 msgid "Open selector" msgstr "" +#: netbox/utilities/templates/widgets/apiselect.html:22 +msgid "Quick add" +msgstr "" + #: netbox/utilities/templates/widgets/markdown_input.html:6 msgid "Write" msgstr "" @@ -14892,212 +15475,219 @@ msgid "" "be used on views which define a base queryset" msgstr "" -#: netbox/virtualization/filtersets.py:79 +#: netbox/virtualization/filtersets.py:45 msgid "Parent group (ID)" msgstr "" -#: netbox/virtualization/filtersets.py:85 +#: netbox/virtualization/filtersets.py:51 msgid "Parent group (slug)" msgstr "" -#: netbox/virtualization/filtersets.py:89 -#: netbox/virtualization/filtersets.py:141 +#: netbox/virtualization/filtersets.py:55 +#: netbox/virtualization/filtersets.py:107 msgid "Cluster type (ID)" msgstr "" -#: netbox/virtualization/filtersets.py:151 -#: netbox/virtualization/filtersets.py:271 +#: netbox/virtualization/filtersets.py:117 +#: netbox/virtualization/filtersets.py:237 msgid "Cluster (ID)" msgstr "" -#: netbox/virtualization/forms/bulk_edit.py:166 -#: netbox/virtualization/models/virtualmachines.py:115 +#: netbox/virtualization/forms/bulk_edit.py:148 +#: netbox/virtualization/models/virtualmachines.py:110 msgid "vCPUs" msgstr "" -#: netbox/virtualization/forms/bulk_edit.py:170 +#: netbox/virtualization/forms/bulk_edit.py:152 msgid "Memory (MB)" msgstr "" -#: netbox/virtualization/forms/bulk_edit.py:174 +#: netbox/virtualization/forms/bulk_edit.py:156 msgid "Disk (MB)" msgstr "" -#: netbox/virtualization/forms/bulk_edit.py:334 -#: netbox/virtualization/forms/filtersets.py:251 +#: netbox/virtualization/forms/bulk_edit.py:316 +#: netbox/virtualization/forms/filtersets.py:256 msgid "Size (MB)" msgstr "" -#: netbox/virtualization/forms/bulk_import.py:44 +#: netbox/virtualization/forms/bulk_import.py:45 msgid "Type of cluster" msgstr "" -#: netbox/virtualization/forms/bulk_import.py:51 +#: netbox/virtualization/forms/bulk_import.py:52 msgid "Assigned cluster group" msgstr "" -#: netbox/virtualization/forms/bulk_import.py:96 +#: netbox/virtualization/forms/bulk_import.py:102 msgid "Assigned cluster" msgstr "" -#: netbox/virtualization/forms/bulk_import.py:103 +#: netbox/virtualization/forms/bulk_import.py:109 msgid "Assigned device within cluster" msgstr "" -#: netbox/virtualization/forms/filtersets.py:183 +#: netbox/virtualization/forms/filtersets.py:188 msgid "Serial number" msgstr "" -#: netbox/virtualization/forms/model_forms.py:153 +#: netbox/virtualization/forms/model_forms.py:152 #, python-brace-format msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -#: netbox/virtualization/forms/model_forms.py:192 +#: netbox/virtualization/forms/model_forms.py:191 msgid "Optionally pin this VM to a specific host device within the cluster" msgstr "" -#: netbox/virtualization/forms/model_forms.py:221 +#: netbox/virtualization/forms/model_forms.py:220 msgid "Site/Cluster" msgstr "" -#: netbox/virtualization/forms/model_forms.py:244 +#: netbox/virtualization/forms/model_forms.py:243 msgid "Disk size is managed via the attachment of virtual disks." msgstr "" -#: netbox/virtualization/forms/model_forms.py:372 -#: netbox/virtualization/tables/virtualmachines.py:111 +#: netbox/virtualization/forms/model_forms.py:397 +#: netbox/virtualization/tables/virtualmachines.py:81 msgid "Disk" msgstr "" -#: netbox/virtualization/models/clusters.py:25 +#: netbox/virtualization/models/clusters.py:26 msgid "cluster type" msgstr "" -#: netbox/virtualization/models/clusters.py:26 +#: netbox/virtualization/models/clusters.py:27 msgid "cluster types" msgstr "" -#: netbox/virtualization/models/clusters.py:45 +#: netbox/virtualization/models/clusters.py:43 msgid "cluster group" msgstr "" -#: netbox/virtualization/models/clusters.py:46 +#: netbox/virtualization/models/clusters.py:44 msgid "cluster groups" msgstr "" -#: netbox/virtualization/models/clusters.py:121 +#: netbox/virtualization/models/clusters.py:110 msgid "cluster" msgstr "" -#: netbox/virtualization/models/clusters.py:122 +#: netbox/virtualization/models/clusters.py:111 msgid "clusters" msgstr "" -#: netbox/virtualization/models/clusters.py:141 +#: netbox/virtualization/models/clusters.py:137 #, python-brace-format msgid "" "{count} devices are assigned as hosts for this cluster but are not in site " "{site}" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:123 +#: netbox/virtualization/models/clusters.py:144 +#, python-brace-format +msgid "" +"{count} devices are assigned as hosts for this cluster but are not in " +"location {location}" +msgstr "" + +#: netbox/virtualization/models/virtualmachines.py:118 msgid "memory (MB)" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:128 +#: netbox/virtualization/models/virtualmachines.py:123 msgid "disk (MB)" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:166 +#: netbox/virtualization/models/virtualmachines.py:161 msgid "Virtual machine name must be unique per cluster." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:169 +#: netbox/virtualization/models/virtualmachines.py:164 msgid "virtual machine" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:170 +#: netbox/virtualization/models/virtualmachines.py:165 msgid "virtual machines" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:184 +#: netbox/virtualization/models/virtualmachines.py:176 msgid "A virtual machine must be assigned to a site and/or cluster." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:191 +#: netbox/virtualization/models/virtualmachines.py:183 #, python-brace-format msgid "The selected cluster ({cluster}) is not assigned to this site ({site})." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:198 +#: netbox/virtualization/models/virtualmachines.py:190 msgid "Must specify a cluster when assigning a host device." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:203 +#: netbox/virtualization/models/virtualmachines.py:195 #, python-brace-format msgid "" "The selected device ({device}) is not assigned to this cluster ({cluster})." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:215 +#: netbox/virtualization/models/virtualmachines.py:207 #, python-brace-format msgid "" "The specified disk size ({size}) must match the aggregate size of assigned " "virtual disks ({total_size})." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:229 +#: netbox/virtualization/models/virtualmachines.py:221 #, python-brace-format msgid "Must be an IPv{family} address. ({ip} is an IPv{version} address.)" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:238 +#: netbox/virtualization/models/virtualmachines.py:230 #, python-brace-format msgid "The specified IP address ({ip}) is not assigned to this VM." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:396 +#: netbox/virtualization/models/virtualmachines.py:376 #, python-brace-format msgid "" "The selected parent interface ({parent}) belongs to a different virtual " "machine ({virtual_machine})." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:411 +#: netbox/virtualization/models/virtualmachines.py:391 #, python-brace-format msgid "" "The selected bridge interface ({bridge}) belongs to a different virtual " "machine ({virtual_machine})." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:422 +#: netbox/virtualization/models/virtualmachines.py:402 #, python-brace-format msgid "" "The untagged VLAN ({untagged_vlan}) must belong to the same site as the " "interface's parent virtual machine, or it must be global." msgstr "" -#: netbox/virtualization/models/virtualmachines.py:434 +#: netbox/virtualization/models/virtualmachines.py:414 msgid "size (MB)" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:438 +#: netbox/virtualization/models/virtualmachines.py:418 msgid "virtual disk" msgstr "" -#: netbox/virtualization/models/virtualmachines.py:439 +#: netbox/virtualization/models/virtualmachines.py:419 msgid "virtual disks" msgstr "" -#: netbox/virtualization/views.py:273 +#: netbox/virtualization/views.py:291 #, python-brace-format msgid "Added {count} devices to cluster {cluster}" msgstr "" -#: netbox/virtualization/views.py:308 +#: netbox/virtualization/views.py:326 #, python-brace-format msgid "Removed {count} devices from cluster {cluster}" msgstr "" @@ -15134,14 +15724,6 @@ msgstr "" msgid "PPTP" msgstr "" -#: netbox/vpn/choices.py:64 -msgid "Hub" -msgstr "" - -#: netbox/vpn/choices.py:65 -msgid "Spoke" -msgstr "" - #: netbox/vpn/choices.py:88 msgid "Aggressive" msgstr "" @@ -15259,26 +15841,26 @@ msgstr "" msgid "Tunnel group" msgstr "" -#: netbox/vpn/forms/bulk_edit.py:117 netbox/vpn/models/crypto.py:47 +#: netbox/vpn/forms/bulk_edit.py:117 netbox/vpn/models/crypto.py:48 msgid "SA lifetime" msgstr "" -#: netbox/vpn/forms/bulk_edit.py:151 netbox/wireless/forms/bulk_edit.py:79 -#: netbox/wireless/forms/bulk_edit.py:126 -#: netbox/wireless/forms/filtersets.py:64 -#: netbox/wireless/forms/filtersets.py:98 +#: netbox/vpn/forms/bulk_edit.py:151 netbox/wireless/forms/bulk_edit.py:81 +#: netbox/wireless/forms/bulk_edit.py:129 +#: netbox/wireless/forms/filtersets.py:67 +#: netbox/wireless/forms/filtersets.py:126 msgid "Pre-shared key" msgstr "" #: netbox/vpn/forms/bulk_edit.py:237 netbox/vpn/forms/bulk_import.py:239 -#: netbox/vpn/forms/filtersets.py:199 netbox/vpn/forms/model_forms.py:370 +#: netbox/vpn/forms/filtersets.py:199 netbox/vpn/forms/model_forms.py:373 #: netbox/vpn/models/crypto.py:104 msgid "IKE policy" msgstr "" #: netbox/vpn/forms/bulk_edit.py:242 netbox/vpn/forms/bulk_import.py:244 -#: netbox/vpn/forms/filtersets.py:204 netbox/vpn/forms/model_forms.py:374 -#: netbox/vpn/models/crypto.py:209 +#: netbox/vpn/forms/filtersets.py:204 netbox/vpn/forms/model_forms.py:377 +#: netbox/vpn/models/crypto.py:207 msgid "IPSec policy" msgstr "" @@ -15286,10 +15868,6 @@ msgstr "" msgid "Tunnel encapsulation" msgstr "" -#: netbox/vpn/forms/bulk_import.py:83 -msgid "Operational role" -msgstr "" - #: netbox/vpn/forms/bulk_import.py:90 msgid "Parent device of assigned interface" msgstr "" @@ -15306,7 +15884,7 @@ msgstr "" msgid "IKE proposal(s)" msgstr "" -#: netbox/vpn/forms/bulk_import.py:215 netbox/vpn/models/crypto.py:197 +#: netbox/vpn/forms/bulk_import.py:215 netbox/vpn/models/crypto.py:195 msgid "Diffie-Hellman group for Perfect Forward Secrecy" msgstr "" @@ -15351,7 +15929,7 @@ msgid "IKE version" msgstr "" #: netbox/vpn/forms/filtersets.py:142 netbox/vpn/forms/filtersets.py:175 -#: netbox/vpn/forms/model_forms.py:298 netbox/vpn/forms/model_forms.py:334 +#: netbox/vpn/forms/model_forms.py:299 netbox/vpn/forms/model_forms.py:336 msgid "Proposal" msgstr "" @@ -15359,32 +15937,28 @@ msgstr "" msgid "Assigned Object Type" msgstr "" -#: netbox/vpn/forms/model_forms.py:95 netbox/vpn/forms/model_forms.py:130 -#: netbox/vpn/forms/model_forms.py:240 netbox/vpn/tables/tunnels.py:91 +#: netbox/vpn/forms/model_forms.py:96 netbox/vpn/forms/model_forms.py:131 +#: netbox/vpn/forms/model_forms.py:241 netbox/vpn/tables/tunnels.py:91 msgid "Tunnel interface" msgstr "" -#: netbox/vpn/forms/model_forms.py:150 +#: netbox/vpn/forms/model_forms.py:151 msgid "First Termination" msgstr "" -#: netbox/vpn/forms/model_forms.py:153 +#: netbox/vpn/forms/model_forms.py:154 msgid "Second Termination" msgstr "" -#: netbox/vpn/forms/model_forms.py:197 +#: netbox/vpn/forms/model_forms.py:198 msgid "This parameter is required when defining a termination." msgstr "" -#: netbox/vpn/forms/model_forms.py:320 netbox/vpn/forms/model_forms.py:356 -msgid "Policy" -msgstr "" - -#: netbox/vpn/forms/model_forms.py:487 +#: netbox/vpn/forms/model_forms.py:490 msgid "A termination must specify an interface or VLAN." msgstr "" -#: netbox/vpn/forms/model_forms.py:489 +#: netbox/vpn/forms/model_forms.py:492 msgid "" "A termination can only have one terminating object (an interface or VLAN)." msgstr "" @@ -15397,31 +15971,31 @@ msgstr "" msgid "authentication algorithm" msgstr "" -#: netbox/vpn/models/crypto.py:44 +#: netbox/vpn/models/crypto.py:45 msgid "Diffie-Hellman group ID" msgstr "" -#: netbox/vpn/models/crypto.py:50 +#: netbox/vpn/models/crypto.py:51 msgid "Security association lifetime (in seconds)" msgstr "" -#: netbox/vpn/models/crypto.py:59 +#: netbox/vpn/models/crypto.py:60 msgid "IKE proposal" msgstr "" -#: netbox/vpn/models/crypto.py:60 +#: netbox/vpn/models/crypto.py:61 msgid "IKE proposals" msgstr "" -#: netbox/vpn/models/crypto.py:76 +#: netbox/vpn/models/crypto.py:75 msgid "version" msgstr "" -#: netbox/vpn/models/crypto.py:88 netbox/vpn/models/crypto.py:190 +#: netbox/vpn/models/crypto.py:88 netbox/vpn/models/crypto.py:188 msgid "proposals" msgstr "" -#: netbox/vpn/models/crypto.py:91 netbox/wireless/models.py:39 +#: netbox/vpn/models/crypto.py:91 netbox/wireless/models.py:41 msgid "pre-shared key" msgstr "" @@ -15429,19 +16003,19 @@ msgstr "" msgid "IKE policies" msgstr "" -#: netbox/vpn/models/crypto.py:118 +#: netbox/vpn/models/crypto.py:115 msgid "Mode is required for selected IKE version" msgstr "" -#: netbox/vpn/models/crypto.py:122 +#: netbox/vpn/models/crypto.py:119 msgid "Mode cannot be used for selected IKE version" msgstr "" -#: netbox/vpn/models/crypto.py:136 +#: netbox/vpn/models/crypto.py:134 msgid "encryption" msgstr "" -#: netbox/vpn/models/crypto.py:141 +#: netbox/vpn/models/crypto.py:140 msgid "authentication" msgstr "" @@ -15461,32 +16035,32 @@ msgstr "" msgid "IPSec proposals" msgstr "" -#: netbox/vpn/models/crypto.py:178 +#: netbox/vpn/models/crypto.py:175 msgid "Encryption and/or authentication algorithm must be defined" msgstr "" -#: netbox/vpn/models/crypto.py:210 +#: netbox/vpn/models/crypto.py:208 msgid "IPSec policies" msgstr "" -#: netbox/vpn/models/crypto.py:251 +#: netbox/vpn/models/crypto.py:247 msgid "IPSec profiles" msgstr "" -#: netbox/vpn/models/l2vpn.py:116 +#: netbox/vpn/models/l2vpn.py:113 msgid "L2VPN termination" msgstr "" -#: netbox/vpn/models/l2vpn.py:117 +#: netbox/vpn/models/l2vpn.py:114 msgid "L2VPN terminations" msgstr "" -#: netbox/vpn/models/l2vpn.py:135 +#: netbox/vpn/models/l2vpn.py:129 #, python-brace-format msgid "L2VPN Termination already assigned ({assigned_object})" msgstr "" -#: netbox/vpn/models/l2vpn.py:147 +#: netbox/vpn/models/l2vpn.py:141 #, python-brace-format msgid "" "{l2vpn_type} L2VPNs cannot have more than two terminations; found " @@ -15501,35 +16075,35 @@ msgstr "" msgid "tunnel groups" msgstr "" -#: netbox/vpn/models/tunnels.py:53 +#: netbox/vpn/models/tunnels.py:51 msgid "encapsulation" msgstr "" -#: netbox/vpn/models/tunnels.py:72 +#: netbox/vpn/models/tunnels.py:70 msgid "tunnel ID" msgstr "" -#: netbox/vpn/models/tunnels.py:94 +#: netbox/vpn/models/tunnels.py:92 msgid "tunnel" msgstr "" -#: netbox/vpn/models/tunnels.py:95 +#: netbox/vpn/models/tunnels.py:93 msgid "tunnels" msgstr "" -#: netbox/vpn/models/tunnels.py:153 +#: netbox/vpn/models/tunnels.py:148 msgid "An object may be terminated to only one tunnel at a time." msgstr "" -#: netbox/vpn/models/tunnels.py:156 +#: netbox/vpn/models/tunnels.py:151 msgid "tunnel termination" msgstr "" -#: netbox/vpn/models/tunnels.py:157 +#: netbox/vpn/models/tunnels.py:152 msgid "tunnel terminations" msgstr "" -#: netbox/vpn/models/tunnels.py:174 +#: netbox/vpn/models/tunnels.py:169 #, python-brace-format msgid "{name} is already attached to a tunnel ({tunnel})." msgstr "" @@ -15590,50 +16164,43 @@ msgstr "" msgid "WPA Enterprise" msgstr "" -#: netbox/wireless/forms/bulk_edit.py:73 netbox/wireless/forms/bulk_edit.py:120 -#: netbox/wireless/forms/bulk_import.py:68 -#: netbox/wireless/forms/bulk_import.py:71 -#: netbox/wireless/forms/bulk_import.py:110 -#: netbox/wireless/forms/bulk_import.py:113 -#: netbox/wireless/forms/filtersets.py:59 -#: netbox/wireless/forms/filtersets.py:93 +#: netbox/wireless/forms/bulk_edit.py:75 netbox/wireless/forms/bulk_edit.py:123 +#: netbox/wireless/forms/bulk_import.py:70 +#: netbox/wireless/forms/bulk_import.py:73 +#: netbox/wireless/forms/bulk_import.py:115 +#: netbox/wireless/forms/bulk_import.py:118 +#: netbox/wireless/forms/filtersets.py:62 +#: netbox/wireless/forms/filtersets.py:121 msgid "Authentication cipher" msgstr "" -#: netbox/wireless/forms/bulk_edit.py:134 -#: netbox/wireless/forms/bulk_import.py:116 -#: netbox/wireless/forms/bulk_import.py:119 -#: netbox/wireless/forms/filtersets.py:106 -msgid "Distance unit" -msgstr "" - -#: netbox/wireless/forms/bulk_import.py:52 +#: netbox/wireless/forms/bulk_import.py:54 msgid "Bridged VLAN" msgstr "" -#: netbox/wireless/forms/bulk_import.py:89 -#: netbox/wireless/tables/wirelesslink.py:28 +#: netbox/wireless/forms/bulk_import.py:94 +#: netbox/wireless/tables/wirelesslink.py:27 msgid "Interface A" msgstr "" -#: netbox/wireless/forms/bulk_import.py:93 -#: netbox/wireless/tables/wirelesslink.py:37 +#: netbox/wireless/forms/bulk_import.py:98 +#: netbox/wireless/tables/wirelesslink.py:36 msgid "Interface B" msgstr "" -#: netbox/wireless/forms/model_forms.py:161 +#: netbox/wireless/forms/model_forms.py:164 msgid "Side B" msgstr "" -#: netbox/wireless/models.py:31 +#: netbox/wireless/models.py:32 msgid "authentication cipher" msgstr "" -#: netbox/wireless/models.py:69 +#: netbox/wireless/models.py:72 msgid "wireless LAN group" msgstr "" -#: netbox/wireless/models.py:70 +#: netbox/wireless/models.py:73 msgid "wireless LAN groups" msgstr "" @@ -15641,35 +16208,23 @@ msgstr "" msgid "wireless LAN" msgstr "" -#: netbox/wireless/models.py:144 +#: netbox/wireless/models.py:141 msgid "interface A" msgstr "" -#: netbox/wireless/models.py:151 +#: netbox/wireless/models.py:148 msgid "interface B" msgstr "" -#: netbox/wireless/models.py:165 -msgid "distance" -msgstr "" - -#: netbox/wireless/models.py:172 -msgid "distance unit" -msgstr "" - -#: netbox/wireless/models.py:219 +#: netbox/wireless/models.py:196 msgid "wireless link" msgstr "" -#: netbox/wireless/models.py:220 +#: netbox/wireless/models.py:197 msgid "wireless links" msgstr "" -#: netbox/wireless/models.py:236 -msgid "Must specify a unit when setting a wireless distance" -msgstr "" - -#: netbox/wireless/models.py:242 netbox/wireless/models.py:248 +#: netbox/wireless/models.py:212 netbox/wireless/models.py:218 #, python-brace-format msgid "{type} is not a wireless interface." msgstr "" From 9c960c2387fcc50004f4694b199a588098f82df0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Jan 2025 09:15:37 -0500 Subject: [PATCH 081/190] Fixes #18318: Correct navigation breadcrumbs for module type UI view --- netbox/templates/dcim/inc/devicetype_breadcrumbs.html | 2 -- netbox/templates/dcim/moduletype.html | 4 +++- netbox/templates/dcim/moduletype/component_templates.html | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 netbox/templates/dcim/inc/devicetype_breadcrumbs.html diff --git a/netbox/templates/dcim/inc/devicetype_breadcrumbs.html b/netbox/templates/dcim/inc/devicetype_breadcrumbs.html deleted file mode 100644 index 02f326ddc..000000000 --- a/netbox/templates/dcim/inc/devicetype_breadcrumbs.html +++ /dev/null @@ -1,2 +0,0 @@ - -

  • {{ object.manufacturer }}
    • diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html index f57c501cf..b3d53e09b 100644 --- a/netbox/templates/dcim/moduletype.html +++ b/netbox/templates/dcim/moduletype.html @@ -8,7 +8,9 @@ {% block breadcrumbs %} {{ block.super }} - {% include 'dcim/inc/devicetype_breadcrumbs.html' %} +
  • + {{ object.manufacturer }} +
    • {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html index 8f4c24478..3cee0bbd9 100644 --- a/netbox/templates/dcim/moduletype/component_templates.html +++ b/netbox/templates/dcim/moduletype/component_templates.html @@ -3,13 +3,6 @@ {% load helpers %} {% load i18n %} -{% block title %}{{ object.manufacturer }} {{ object.model }}{% endblock %} - -{% block breadcrumbs %} - {{ block.super }} - {% include 'dcim/inc/devicetype_breadcrumbs.html' %} -{% endblock %} - {% block extra_controls %} {% include 'dcim/inc/moduletype_buttons.html' %} {% endblock %} From ef6c89ee5de815e2304e59b6042b7dcc9aea383c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 7 Jan 2025 10:01:05 -0500 Subject: [PATCH 082/190] Fixes #18324: Correct filter names for certain related object listings --- netbox/dcim/views.py | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 9a96b0c7f..0978747d1 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -15,7 +15,7 @@ from jinja2.exceptions import TemplateError from circuits.models import Circuit, CircuitTermination from extras.views import ObjectConfigContextView -from ipam.models import ASN, IPAddress, VLANGroup +from ipam.models import ASN, IPAddress, Prefix, VLANGroup from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable from netbox.constants import DEFAULT_ACTION_PERMISSIONS from netbox.views import generic @@ -30,8 +30,9 @@ from utilities.views import ( ) from virtualization.filtersets import VirtualMachineFilterSet from virtualization.forms import VirtualMachineFilterForm -from virtualization.models import VirtualMachine +from virtualization.models import Cluster, VirtualMachine from virtualization.tables import VirtualMachineTable +from wireless.models import WirelessLAN from . import filtersets, forms, tables from .choices import DeviceFaceChoices, InterfaceModeChoices from .models import * @@ -238,6 +239,7 @@ class RegionView(GetRelatedModelsMixin, generic.ObjectView): 'related_models': self.get_related_models( request, regions, + omit=(Cluster, Prefix, WirelessLAN), extra=( (Location.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), (Rack.objects.restrict(request.user, 'view').filter(site__region__in=regions), 'region_id'), @@ -247,6 +249,11 @@ class RegionView(GetRelatedModelsMixin, generic.ObjectView): ).distinct(), 'region_id' ), + + # Handle these relations manually to avoid erroneous filter name resolution + (Cluster.objects.restrict(request.user, 'view').filter(_region__in=regions), 'region_id'), + (Prefix.objects.restrict(request.user, 'view').filter(_region__in=regions), 'region_id'), + (WirelessLAN.objects.restrict(request.user, 'view').filter(_region__in=regions), 'region_id'), ), ), } @@ -331,6 +338,7 @@ class SiteGroupView(GetRelatedModelsMixin, generic.ObjectView): 'related_models': self.get_related_models( request, groups, + omit=(Cluster, Prefix, WirelessLAN), extra=( (Location.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), (Rack.objects.restrict(request.user, 'view').filter(site__group__in=groups), 'site_group_id'), @@ -340,6 +348,20 @@ class SiteGroupView(GetRelatedModelsMixin, generic.ObjectView): ).distinct(), 'site_group_id' ), + + # Handle these relations manually to avoid erroneous filter name resolution + ( + Cluster.objects.restrict(request.user, 'view').filter(_site_group__in=groups), + 'site_group_id' + ), + ( + Prefix.objects.restrict(request.user, 'view').filter(_site_group__in=groups), + 'site_group_id' + ), + ( + WirelessLAN.objects.restrict(request.user, 'view').filter(_site_group__in=groups), + 'site_group_id' + ), ), ), } @@ -418,8 +440,8 @@ class SiteView(GetRelatedModelsMixin, generic.ObjectView): 'related_models': self.get_related_models( request, instance, - [CableTermination, CircuitTermination], - ( + omit=(CableTermination, CircuitTermination, Cluster, Prefix, WirelessLAN), + extra=( (VLANGroup.objects.restrict(request.user, 'view').filter( scope_type=ContentType.objects.get_for_model(Site), scope_id=instance.pk @@ -429,6 +451,11 @@ class SiteView(GetRelatedModelsMixin, generic.ObjectView): Circuit.objects.restrict(request.user, 'view').filter(terminations___site=instance).distinct(), 'site_id' ), + + # Handle these relations manually to avoid erroneous filter name resolution + (Cluster.objects.restrict(request.user, 'view').filter(_site=instance), 'site_id'), + (Prefix.objects.restrict(request.user, 'view').filter(_site=instance), 'site_id'), + (WirelessLAN.objects.restrict(request.user, 'view').filter(_site=instance), 'site_id'), ), ), } @@ -506,14 +533,19 @@ class LocationView(GetRelatedModelsMixin, generic.ObjectView): 'related_models': self.get_related_models( request, locations, - [CableTermination], - ( + omit=[CableTermination, Cluster, Prefix, WirelessLAN], + extra=( ( Circuit.objects.restrict(request.user, 'view').filter( terminations___location=instance ).distinct(), 'location_id' ), + + # Handle these relations manually to avoid erroneous filter name resolution + (Cluster.objects.restrict(request.user, 'view').filter(_location=instance), 'location_id'), + (Prefix.objects.restrict(request.user, 'view').filter(_location=instance), 'location_id'), + (WirelessLAN.objects.restrict(request.user, 'view').filter(_location=instance), 'location_id'), ), ), } From 4ae552936256f536abe2701a9cec1c9bf565f77c Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Tue, 7 Jan 2025 09:47:11 +0100 Subject: [PATCH 083/190] Fix #18314: Use get to avoid KeyError --- netbox/extras/dashboard/widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/dashboard/widgets.py b/netbox/extras/dashboard/widgets.py index 6bb7f59fb..eeed5414f 100644 --- a/netbox/extras/dashboard/widgets.py +++ b/netbox/extras/dashboard/widgets.py @@ -314,7 +314,7 @@ class RSSFeedWidget(DashboardWidget): return f'dashboard_rss_{url_checksum}' def get_feed(self): - if self.config['requires_internet'] and settings.ISOLATED_DEPLOYMENT: + if self.config.get('requires_internet') and settings.ISOLATED_DEPLOYMENT: return { 'isolated_deployment': True, } From e518f086040e3b5bfc14f70cc63064cd3893c750 Mon Sep 17 00:00:00 2001 From: bctiemann Date: Tue, 7 Jan 2025 10:47:05 -0500 Subject: [PATCH 084/190] Fixes: #18316 - Fix PrefixIndex reference to 'site' (#18322) * Fix PrefixIndex reference to 'site' * Fix ClusterIndex reference to 'site' and add 'scope' to WirelessLANIndex --- netbox/ipam/search.py | 2 +- netbox/virtualization/search.py | 2 +- netbox/wireless/search.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/ipam/search.py b/netbox/ipam/search.py index d200abacf..6e71d44a5 100644 --- a/netbox/ipam/search.py +++ b/netbox/ipam/search.py @@ -79,7 +79,7 @@ class PrefixIndex(SearchIndex): ('description', 500), ('comments', 5000), ) - display_attrs = ('site', 'vrf', 'tenant', 'vlan', 'status', 'role', 'description') + display_attrs = ('scope', 'vrf', 'tenant', 'vlan', 'status', 'role', 'description') @register_search diff --git a/netbox/virtualization/search.py b/netbox/virtualization/search.py index 18cc06519..8614bf6ea 100644 --- a/netbox/virtualization/search.py +++ b/netbox/virtualization/search.py @@ -10,7 +10,7 @@ class ClusterIndex(SearchIndex): ('description', 500), ('comments', 5000), ) - display_attrs = ('type', 'group', 'status', 'tenant', 'site', 'description') + display_attrs = ('type', 'group', 'status', 'tenant', 'scope', 'description') @register_search diff --git a/netbox/wireless/search.py b/netbox/wireless/search.py index c8ac023cc..e1be53c09 100644 --- a/netbox/wireless/search.py +++ b/netbox/wireless/search.py @@ -11,7 +11,7 @@ class WirelessLANIndex(SearchIndex): ('auth_psk', 2000), ('comments', 5000), ) - display_attrs = ('group', 'status', 'vlan', 'tenant', 'description') + display_attrs = ('group', 'status', 'vlan', 'tenant', 'scope', 'description') @register_search From ffac0974dd31c5824f665aa8077f010581a6cfdf Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 05:02:12 +0000 Subject: [PATCH 085/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 82 ++++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 8a7614860..300b70000 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-07 05:02+0000\n" +"POT-Creation-Date: 2025-01-08 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -512,7 +512,7 @@ msgstr "" #: netbox/templates/dcim/macaddress.html:21 #: netbox/templates/dcim/manufacturer.html:40 #: netbox/templates/dcim/module.html:73 netbox/templates/dcim/modulebay.html:42 -#: netbox/templates/dcim/moduletype.html:37 +#: netbox/templates/dcim/moduletype.html:39 #: netbox/templates/dcim/platform.html:33 #: netbox/templates/dcim/powerfeed.html:40 #: netbox/templates/dcim/poweroutlet.html:40 @@ -3914,7 +3914,7 @@ msgstr "" #: netbox/templates/dcim/inventoryitem.html:48 #: netbox/templates/dcim/manufacturer.html:33 #: netbox/templates/dcim/modulebay.html:62 -#: netbox/templates/dcim/moduletype.html:25 +#: netbox/templates/dcim/moduletype.html:27 #: netbox/templates/dcim/platform.html:37 #: netbox/templates/dcim/racktype.html:16 msgid "Manufacturer" @@ -3980,7 +3980,7 @@ msgstr "" #: netbox/extras/forms/filtersets.py:243 netbox/ipam/forms/bulk_edit.py:193 #: netbox/templates/dcim/device.html:324 #: netbox/templates/dcim/devicetype.html:49 -#: netbox/templates/dcim/moduletype.html:45 netbox/templates/dcim/rack.html:81 +#: netbox/templates/dcim/moduletype.html:47 netbox/templates/dcim/rack.html:81 #: netbox/templates/dcim/racktype.html:41 #: netbox/templates/extras/configcontext.html:17 #: netbox/templates/extras/customlink.html:25 @@ -4052,7 +4052,7 @@ msgstr "" #: netbox/dcim/forms/filtersets.py:512 netbox/dcim/forms/filtersets.py:670 #: netbox/dcim/forms/filtersets.py:805 netbox/templates/dcim/device.html:98 #: netbox/templates/dcim/devicetype.html:65 -#: netbox/templates/dcim/moduletype.html:41 netbox/templates/dcim/rack.html:65 +#: netbox/templates/dcim/moduletype.html:43 netbox/templates/dcim/rack.html:65 #: netbox/templates/dcim/racktype.html:28 msgid "Airflow" msgstr "" @@ -4115,7 +4115,7 @@ msgstr "" #: netbox/dcim/forms/bulk_edit.py:601 netbox/dcim/forms/model_forms.py:410 #: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 netbox/templates/dcim/modulebay.html:66 -#: netbox/templates/dcim/moduletype.html:22 +#: netbox/templates/dcim/moduletype.html:24 msgid "Module Type" msgstr "" @@ -7045,8 +7045,8 @@ msgid "Power outlets" msgstr "" #: netbox/dcim/tables/devices.py:256 netbox/dcim/tables/devices.py:1112 -#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1112 -#: netbox/dcim/views.py:1356 netbox/dcim/views.py:2107 +#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1144 +#: netbox/dcim/views.py:1388 netbox/dcim/views.py:2139 #: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:258 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 @@ -7084,8 +7084,8 @@ msgid "Module Bay" msgstr "" #: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:47 -#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1187 -#: netbox/dcim/views.py:2205 netbox/netbox/navigation/menu.py:103 +#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1219 +#: netbox/dcim/views.py:2237 netbox/netbox/navigation/menu.py:103 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -7214,8 +7214,8 @@ msgstr "" msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1052 -#: netbox/dcim/views.py:1296 netbox/dcim/views.py:2043 +#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1084 +#: netbox/dcim/views.py:1328 netbox/dcim/views.py:2075 #: netbox/netbox/navigation/menu.py:97 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -7225,8 +7225,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1067 -#: netbox/dcim/views.py:1311 netbox/dcim/views.py:2059 +#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1099 +#: netbox/dcim/views.py:1343 netbox/dcim/views.py:2091 #: netbox/netbox/navigation/menu.py:98 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -7236,8 +7236,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1082 -#: netbox/dcim/views.py:1326 netbox/dcim/views.py:2075 +#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1114 +#: netbox/dcim/views.py:1358 netbox/dcim/views.py:2107 #: netbox/netbox/navigation/menu.py:99 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -7247,8 +7247,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1097 -#: netbox/dcim/views.py:1341 netbox/dcim/views.py:2091 +#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1129 +#: netbox/dcim/views.py:1373 netbox/dcim/views.py:2123 #: netbox/netbox/navigation/menu.py:100 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -7258,8 +7258,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1127 -#: netbox/dcim/views.py:1371 netbox/dcim/views.py:2129 +#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1159 +#: netbox/dcim/views.py:1403 netbox/dcim/views.py:2161 #: netbox/netbox/navigation/menu.py:95 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -7268,8 +7268,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1142 -#: netbox/dcim/views.py:1386 netbox/dcim/views.py:2145 +#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1174 +#: netbox/dcim/views.py:1418 netbox/dcim/views.py:2177 #: netbox/netbox/navigation/menu.py:96 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -7279,16 +7279,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1172 -#: netbox/dcim/views.py:2185 netbox/netbox/navigation/menu.py:102 +#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1204 +#: netbox/dcim/views.py:2217 netbox/netbox/navigation/menu.py:102 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1157 -#: netbox/dcim/views.py:1401 netbox/dcim/views.py:2165 +#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1189 +#: netbox/dcim/views.py:1433 netbox/dcim/views.py:2197 #: netbox/netbox/navigation/menu.py:101 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 @@ -7353,67 +7353,67 @@ msgstr "" msgid "Test case must set peer_termination_type" msgstr "" -#: netbox/dcim/views.py:138 +#: netbox/dcim/views.py:139 #, python-brace-format msgid "Disconnected {count} {type}" msgstr "" -#: netbox/dcim/views.py:794 netbox/netbox/navigation/menu.py:51 +#: netbox/dcim/views.py:826 netbox/netbox/navigation/menu.py:51 msgid "Reservations" msgstr "" -#: netbox/dcim/views.py:813 netbox/templates/dcim/location.html:90 +#: netbox/dcim/views.py:845 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2218 netbox/extras/forms/model_forms.py:577 +#: netbox/dcim/views.py:2250 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 #: netbox/virtualization/forms/model_forms.py:224 #: netbox/virtualization/views.py:424 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2228 netbox/virtualization/views.py:434 +#: netbox/dcim/views.py:2260 netbox/virtualization/views.py:434 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2263 netbox/virtualization/views.py:469 +#: netbox/dcim/views.py:2295 netbox/virtualization/views.py:469 #, python-brace-format msgid "An error occurred while rendering the template: {error}" msgstr "" -#: netbox/dcim/views.py:2281 netbox/extras/tables/tables.py:550 +#: netbox/dcim/views.py:2313 netbox/extras/tables/tables.py:550 #: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 #: netbox/virtualization/views.py:192 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:3114 +#: netbox/dcim/views.py:3146 #, python-brace-format msgid "Installed device {device} in bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3155 +#: netbox/dcim/views.py:3187 #, python-brace-format msgid "Removed device {device} from bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3271 netbox/ipam/tables/ip.py:180 +#: netbox/dcim/views.py:3303 netbox/ipam/tables/ip.py:180 msgid "Children" msgstr "" -#: netbox/dcim/views.py:3738 +#: netbox/dcim/views.py:3770 #, python-brace-format msgid "Added member {device}" msgstr "" -#: netbox/dcim/views.py:3787 +#: netbox/dcim/views.py:3819 #, python-brace-format msgid "Unable to remove master device {device} from the virtual chassis." msgstr "" -#: netbox/dcim/views.py:3800 +#: netbox/dcim/views.py:3832 #, python-brace-format msgid "Removed {device} from virtual chassis {chassis}" msgstr "" @@ -12919,12 +12919,12 @@ msgid "VM Role" msgstr "" #: netbox/templates/dcim/devicetype.html:18 -#: netbox/templates/dcim/moduletype.html:29 +#: netbox/templates/dcim/moduletype.html:31 msgid "Model Name" msgstr "" #: netbox/templates/dcim/devicetype.html:25 -#: netbox/templates/dcim/moduletype.html:33 +#: netbox/templates/dcim/moduletype.html:35 msgid "Part Number" msgstr "" From 53aa2c862495999c1b7223602abad9a1cf397d9b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 8 Jan 2025 08:43:17 -0500 Subject: [PATCH 086/190] Fixes #18329: Pin strawberry-graphql-django to v0.52.0 to resolve upstream bug --- base_requirements.txt | 3 ++- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/base_requirements.txt b/base_requirements.txt index 169f4196d..4cb355dd5 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -134,7 +134,8 @@ strawberry-graphql # Strawberry GraphQL Django extension # https://github.com/strawberry-graphql/strawberry-django/releases -strawberry-graphql-django +# Pinned to v0.52.0 for suspected upstream bug; see #18329 +strawberry-graphql-django==0.52.0 # SVG image rendering (used for rack elevations) # https://github.com/mozman/svgwrite/blob/master/NEWS.rst diff --git a/requirements.txt b/requirements.txt index e5ffe8386..b875ae5a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,7 +32,7 @@ rq==2.1.0 social-auth-app-django==5.4.2 social-auth-core==4.5.4 strawberry-graphql==0.256.1 -strawberry-graphql-django==0.53.1 +strawberry-graphql-django==0.52.0 svgwrite==1.4.3 tablib==3.7.0 tzdata==2024.2 From 4456c488f106614ddf98c406018024f9c86add50 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 7 Jan 2025 15:58:42 -0500 Subject: [PATCH 087/190] Change PrefixTable.vlan to represent the VLAN ID rather than the VLAN object, to enable more useful sorting by VLAN ID rather than site-grouped VLAN objects --- netbox/ipam/tables/ip.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index dbbeb3454..bc343b175 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -200,8 +200,9 @@ class PrefixTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('VLAN Group') ) vlan = tables.Column( + accessor='vlan__vid', linkify=True, - verbose_name=_('VLAN') + verbose_name=_('VLAN ID') ) role = tables.Column( verbose_name=_('Role'), From f6b8c1966def51cece2a007f8008b9be1a1fc344 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 8 Jan 2025 09:38:24 -0500 Subject: [PATCH 088/190] Use order_by to change ordering behavior of VLAN column rather than changing accessor --- netbox/ipam/tables/ip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index bc343b175..17ba36de9 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -200,9 +200,9 @@ class PrefixTable(TenancyColumnsMixin, NetBoxTable): verbose_name=_('VLAN Group') ) vlan = tables.Column( - accessor='vlan__vid', + order_by=('vlan__vid', 'vlan__pk'), linkify=True, - verbose_name=_('VLAN ID') + verbose_name=_('VLAN') ) role = tables.Column( verbose_name=_('Role'), From d04fc11c61684b8ebfcace4328087a14458bf747 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 8 Jan 2025 10:19:28 -0500 Subject: [PATCH 089/190] Release v4.2.1 (#18346) * Release v4.2.1 * Add changelog for #18282 --- .../ISSUE_TEMPLATE/01-feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/02-bug_report.yaml | 2 +- docs/release-notes/version-4.2.md | 13 ++ netbox/release.yaml | 4 +- netbox/translations/cs/LC_MESSAGES/django.mo | Bin 229001 -> 230181 bytes netbox/translations/cs/LC_MESSAGES/django.po | 174 +++++++++--------- 6 files changed, 105 insertions(+), 90 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index 7cb6057ea..f415f933a 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v4.2.0 + placeholder: v4.2.1 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index e2145543d..0e0839849 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -39,7 +39,7 @@ body: attributes: label: NetBox Version description: What version of NetBox are you currently running? - placeholder: v4.2.0 + placeholder: v4.2.1 validations: required: true - type: dropdown diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md index fdbc09114..a1dafaf14 100644 --- a/docs/release-notes/version-4.2.md +++ b/docs/release-notes/version-4.2.md @@ -1,5 +1,18 @@ # NetBox v4.2 +## v4.2.1 (2025-01-08) + +### Bug Fixes + +* [#18282](https://github.com/netbox-community/netbox/issues/18282) - Fix ordering of prefixes list by assigned VLAN +* [#18314](https://github.com/netbox-community/netbox/issues/18314) - Fix KeyError exception when rendering pre-saved dashboard (`requires_internet` missing) +* [#18316](https://github.com/netbox-community/netbox/issues/18316) - Fix AttributeError exception when global search results include prefixes and/or clusters +* [#18318](https://github.com/netbox-community/netbox/issues/18318) - Correct navigation breadcrumbs for module type UI view +* [#18324](https://github.com/netbox-community/netbox/issues/18324) - Correct filtering for certain related object listings +* [#18329](https://github.com/netbox-community/netbox/issues/18329) - Address upstream bug in GraphQL API where only one primary IP address is returned within a device/VM list + +--- + ## v4.2.0 (2025-01-06) ### Breaking Changes diff --git a/netbox/release.yaml b/netbox/release.yaml index c7919b91e..4127b0253 100644 --- a/netbox/release.yaml +++ b/netbox/release.yaml @@ -1,3 +1,3 @@ -version: "4.2.0" +version: "4.2.1" edition: "Community" -published: "2025-01-06" +published: "2025-01-08" diff --git a/netbox/translations/cs/LC_MESSAGES/django.mo b/netbox/translations/cs/LC_MESSAGES/django.mo index d5a4db33b04995480ff2dc5c859441221e56be14..964d8f54c07d09f825b4212b35d61b079f85033e 100644 GIT binary patch delta 67285 zcmXuscfgj@|G@FPr;LVDk%sc5y@z(%N=rkfMI{xfl+2{=B9V{~Nk#~vFACX;A`y|Y zg(wOsigzJ#WFEqY@L9YH2Nf!iIUP4+Ev#@vfy|NE8JlBI z?2far8-9T8u-uUaGW~Hd_QU_-1p3e99aSLHg^Edd0j|PMn16I~6gH;(Soj6Drd+&m zfy^N6jxF#ZY>HoETP#(iK&C79MFUl7tW`p-1xq9IO0Q~SU08??bv#gbjo z5l=^_jOCR|9hE`ftBh{n#^}hpp#hy0<ytz0-4_hLDGBFgK~ z2REY~ZbJjxk9JtFbPDV^bi@_W#at8JCH2t&24QVHAI

    ;Zkhr{(pgsX59D<8(^*D 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≷&UU^DQLoiR&kx=r9QPR|;jE>pmE?^g?;-OEXpUxH z)J-Q>nH;KGu&+qdB{~M@~_6%2{qk@DA&O z6uw~14JLn;_qP->qI92KY(wNF#B7kdS;0A0=okL<_&+eNTZ3w#niYwRctS=a8jv+G zP8@V2;OmRdWb|8E1LAbl&;R zY%c3F%w^>bYto!Qv2?b6XqXb6(ePu~iFlIiwEWONPu%nTD^QfN7RN>ivuG%r6&?uj zF}~1=LFX_5^L&7ySX< zK19P>@CixX89fMIr$bqNcD>NVUeI6~3IrJcExF@tr{bnZJTbTu{#C|v#u|#3RI?O4 z!F&N4kMW<>Wzt7!ujR!tf?`!YzY8+SdQ|ic<+_q0n*yUR%z>b+JCaqIH^kT04!Hy^ z#fM*qEzBkU(EKZOmiUL^uZ3Usl-#KJev%W#Y8=-OW(q;dgJV9um!yFx6j%k;A>ksv zIf%(hGs;mQEjR+-UWC`f`D#U@_?!PJu3Hdv_ z_F70gqTdv#jemp%Hj$XhF4-jJ&4?G_6k2jp$MhSXkEI zS+BJkwg*=L{)1@0*MqqjqO2vm_-n+KBz;5B*Y?_a7rZ3!+95ENW=hjQHj8~EAvy8x zG#8BTn(3{9_n0~x$+-b$h1U&VQhhK#KsN^{7z{bT?e-SFXeN4y`32&+!4D)xF@F?x zUmCIbwt)cFb;*y1aA*q2im47`_lLw#e?>8z&@U6*yB|`_NneA83Ke*RizXCCWk8bn} z9VYm}4!;u-gSQ;>OIxK6 z&YC^AM{57aF~b~L*!9rbu5Ee+k16QCCUbC52meG-gGUeWuOA^e+*tpr8G Date: Thu, 9 Jan 2025 05:02:09 +0000 Subject: [PATCH 090/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 300b70000..2c22df58a 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-08 05:02+0000\n" +"POT-Creation-Date: 2025-01-09 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -766,8 +766,8 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:212 netbox/ipam/forms/filtersets.py:284 #: netbox/ipam/forms/filtersets.py:358 netbox/ipam/forms/filtersets.py:542 #: netbox/ipam/forms/model_forms.py:503 netbox/ipam/tables/ip.py:183 -#: netbox/ipam/tables/ip.py:262 netbox/ipam/tables/ip.py:313 -#: netbox/ipam/tables/ip.py:376 netbox/ipam/tables/ip.py:403 +#: netbox/ipam/tables/ip.py:263 netbox/ipam/tables/ip.py:314 +#: netbox/ipam/tables/ip.py:377 netbox/ipam/tables/ip.py:404 #: netbox/ipam/tables/vlans.py:95 netbox/ipam/tables/vlans.py:208 #: netbox/templates/circuits/circuit.html:34 #: netbox/templates/circuits/virtualcircuit.html:43 @@ -844,7 +844,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:122 netbox/ipam/forms/filtersets.py:145 #: netbox/ipam/forms/filtersets.py:176 netbox/ipam/forms/filtersets.py:270 #: netbox/ipam/forms/filtersets.py:313 netbox/ipam/forms/filtersets.py:510 -#: netbox/ipam/tables/ip.py:406 netbox/ipam/tables/vlans.py:205 +#: netbox/ipam/tables/ip.py:407 netbox/ipam/tables/vlans.py:205 #: netbox/templates/circuits/circuit.html:48 #: netbox/templates/circuits/circuitgroup.html:36 #: netbox/templates/circuits/virtualcircuit.html:47 @@ -1078,8 +1078,8 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:292 netbox/ipam/forms/filtersets.py:363 #: netbox/ipam/forms/filtersets.py:550 netbox/ipam/forms/model_forms.py:194 #: netbox/ipam/forms/model_forms.py:220 netbox/ipam/forms/model_forms.py:251 -#: netbox/ipam/forms/model_forms.py:678 netbox/ipam/tables/ip.py:207 -#: netbox/ipam/tables/ip.py:266 netbox/ipam/tables/ip.py:317 +#: netbox/ipam/forms/model_forms.py:678 netbox/ipam/tables/ip.py:208 +#: netbox/ipam/tables/ip.py:267 netbox/ipam/tables/ip.py:318 #: netbox/ipam/tables/vlans.py:99 netbox/ipam/tables/vlans.py:211 #: netbox/templates/circuits/virtualcircuittermination.html:42 #: netbox/templates/dcim/device.html:182 @@ -1191,7 +1191,7 @@ msgstr "" #: netbox/dcim/tables/connections.py:65 netbox/dcim/tables/devices.py:1140 #: netbox/ipam/forms/bulk_import.py:317 netbox/ipam/forms/model_forms.py:282 #: netbox/ipam/forms/model_forms.py:291 netbox/ipam/tables/fhrp.py:64 -#: netbox/ipam/tables/ip.py:322 netbox/ipam/tables/vlans.py:145 +#: netbox/ipam/tables/ip.py:323 netbox/ipam/tables/vlans.py:145 #: netbox/templates/circuits/inc/circuit_termination_fields.html:52 #: netbox/templates/circuits/virtualcircuittermination.html:53 #: netbox/templates/circuits/virtualcircuittermination.html:60 @@ -1831,8 +1831,8 @@ msgstr "" #: netbox/dcim/tables/racks.py:224 netbox/dcim/tables/sites.py:108 #: netbox/extras/tables/tables.py:582 netbox/ipam/tables/asn.py:69 #: netbox/ipam/tables/fhrp.py:34 netbox/ipam/tables/ip.py:82 -#: netbox/ipam/tables/ip.py:224 netbox/ipam/tables/ip.py:279 -#: netbox/ipam/tables/ip.py:347 netbox/ipam/tables/services.py:24 +#: netbox/ipam/tables/ip.py:225 netbox/ipam/tables/ip.py:280 +#: netbox/ipam/tables/ip.py:348 netbox/ipam/tables/services.py:24 #: netbox/ipam/tables/services.py:54 netbox/ipam/tables/vlans.py:121 #: netbox/ipam/tables/vrfs.py:47 netbox/ipam/tables/vrfs.py:72 #: netbox/templates/dcim/htmx/cable_edit.html:89 @@ -3009,7 +3009,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:689 netbox/dcim/tables/devices.py:899 #: netbox/dcim/tables/devices.py:986 netbox/dcim/tables/devices.py:1146 #: netbox/extras/tables/tables.py:223 netbox/ipam/tables/fhrp.py:59 -#: netbox/ipam/tables/ip.py:328 netbox/ipam/tables/services.py:44 +#: netbox/ipam/tables/ip.py:329 netbox/ipam/tables/services.py:44 #: netbox/templates/dcim/interface.html:108 #: netbox/templates/dcim/interface.html:366 #: netbox/templates/dcim/location.html:41 netbox/templates/dcim/region.html:37 @@ -3688,8 +3688,8 @@ msgstr "" #: netbox/ipam/forms/model_forms.py:480 netbox/ipam/forms/model_forms.py:494 #: netbox/ipam/models/ip.py:217 netbox/ipam/models/ip.py:498 #: netbox/ipam/models/ip.py:719 netbox/ipam/models/vrfs.py:61 -#: netbox/ipam/tables/ip.py:188 netbox/ipam/tables/ip.py:259 -#: netbox/ipam/tables/ip.py:310 netbox/ipam/tables/ip.py:400 +#: netbox/ipam/tables/ip.py:188 netbox/ipam/tables/ip.py:260 +#: netbox/ipam/tables/ip.py:311 netbox/ipam/tables/ip.py:401 #: netbox/templates/dcim/interface.html:152 #: netbox/templates/ipam/ipaddress.html:18 #: netbox/templates/ipam/iprange.html:40 netbox/templates/ipam/prefix.html:19 @@ -6994,8 +6994,8 @@ msgstr "" #: netbox/dcim/tables/devices.py:197 netbox/dcim/tables/devices.py:1099 #: netbox/ipam/forms/bulk_import.py:562 netbox/ipam/forms/model_forms.py:308 -#: netbox/ipam/forms/model_forms.py:321 netbox/ipam/tables/ip.py:306 -#: netbox/ipam/tables/ip.py:373 netbox/ipam/tables/ip.py:396 +#: netbox/ipam/forms/model_forms.py:321 netbox/ipam/tables/ip.py:307 +#: netbox/ipam/tables/ip.py:374 netbox/ipam/tables/ip.py:397 #: netbox/templates/ipam/ipaddress.html:11 #: netbox/virtualization/tables/virtualmachines.py:65 msgid "IP Address" @@ -9658,7 +9658,7 @@ msgstr "" #: netbox/ipam/forms/bulk_edit.py:218 netbox/ipam/forms/bulk_import.py:181 #: netbox/ipam/forms/filtersets.py:259 netbox/ipam/forms/model_forms.py:217 -#: netbox/ipam/models/vlans.py:272 netbox/ipam/tables/ip.py:204 +#: netbox/ipam/models/vlans.py:272 netbox/ipam/tables/ip.py:205 #: netbox/templates/ipam/prefix.html:56 netbox/templates/ipam/vlan.html:12 #: netbox/templates/ipam/vlan/base.html:6 #: netbox/templates/ipam/vlan_edit.html:10 @@ -10516,8 +10516,8 @@ msgstr "" msgid "Prefixes" msgstr "" -#: netbox/ipam/tables/ip.py:77 netbox/ipam/tables/ip.py:219 -#: netbox/ipam/tables/ip.py:274 netbox/ipam/tables/vlans.py:55 +#: netbox/ipam/tables/ip.py:77 netbox/ipam/tables/ip.py:220 +#: netbox/ipam/tables/ip.py:275 netbox/ipam/tables/vlans.py:55 #: netbox/templates/dcim/device.html:260 #: netbox/templates/ipam/aggregate.html:24 #: netbox/templates/ipam/iprange.html:29 netbox/templates/ipam/prefix.html:102 @@ -10542,31 +10542,31 @@ msgstr "" msgid "Scope Type" msgstr "" -#: netbox/ipam/tables/ip.py:211 +#: netbox/ipam/tables/ip.py:212 msgid "Pool" msgstr "" -#: netbox/ipam/tables/ip.py:215 netbox/ipam/tables/ip.py:270 +#: netbox/ipam/tables/ip.py:216 netbox/ipam/tables/ip.py:271 msgid "Marked Utilized" msgstr "" -#: netbox/ipam/tables/ip.py:254 +#: netbox/ipam/tables/ip.py:255 msgid "Start address" msgstr "" -#: netbox/ipam/tables/ip.py:333 +#: netbox/ipam/tables/ip.py:334 msgid "NAT (Inside)" msgstr "" -#: netbox/ipam/tables/ip.py:338 +#: netbox/ipam/tables/ip.py:339 msgid "NAT (Outside)" msgstr "" -#: netbox/ipam/tables/ip.py:343 +#: netbox/ipam/tables/ip.py:344 msgid "Assigned" msgstr "" -#: netbox/ipam/tables/ip.py:379 netbox/templates/vpn/l2vpntermination.html:16 +#: netbox/ipam/tables/ip.py:380 netbox/templates/vpn/l2vpntermination.html:16 #: netbox/vpn/forms/filtersets.py:240 msgid "Assigned Object" msgstr "" From 80e1fd02bbcde9ab8082cc093536bb6b81f63b76 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 9 Jan 2025 10:26:17 -0500 Subject: [PATCH 091/190] Update docs to indicate PostgreSQL 13+ requirement --- docs/installation/index.md | 2 +- docs/installation/upgrading.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installation/index.md b/docs/installation/index.md index 76160068a..33888e274 100644 --- a/docs/installation/index.md +++ b/docs/installation/index.md @@ -21,7 +21,7 @@ The following sections detail how to set up a new instance of NetBox: | Dependency | Supported Versions | |------------|--------------------| | Python | 3.10, 3.11, 3.12 | -| PostgreSQL | 12+ | +| PostgreSQL | 13+ | | Redis | 4.0+ | Below is a simplified overview of the NetBox application stack for reference: diff --git a/docs/installation/upgrading.md b/docs/installation/upgrading.md index 5b844f1c3..e6d05738f 100644 --- a/docs/installation/upgrading.md +++ b/docs/installation/upgrading.md @@ -20,7 +20,7 @@ NetBox requires the following dependencies: | Dependency | Supported Versions | |------------|--------------------| | Python | 3.10, 3.11, 3.12 | -| PostgreSQL | 12+ | +| PostgreSQL | 13+ | | Redis | 4.0+ | ## 3. Install the Latest Release From b11f17952732904472279ac4238c1ba0b849c186 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2025 09:53:28 -0500 Subject: [PATCH 092/190] Closes #18362: Create a system job for census reporting --- netbox/core/jobs.py | 48 +++++++++++++++++++++++++++++++++++++-- netbox/netbox/settings.py | 13 ----------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/netbox/core/jobs.py b/netbox/core/jobs.py index d2b846398..891b1cbdb 100644 --- a/netbox/core/jobs.py +++ b/netbox/core/jobs.py @@ -1,8 +1,11 @@ import logging +import requests +import sys -from netbox.jobs import JobRunner +from django.conf import settings +from netbox.jobs import JobRunner, system_job from netbox.search.backends import search_backend -from .choices import DataSourceStatusChoices +from .choices import DataSourceStatusChoices, JobIntervalChoices from .exceptions import SyncError from .models import DataSource @@ -31,3 +34,44 @@ class SyncDataSourceJob(JobRunner): if type(e) is SyncError: logging.error(e) raise e + + +@system_job(interval=JobIntervalChoices.INTERVAL_DAILY) +class SystemHousekeepingJob(JobRunner): + """ + Perform daily system housekeeping functions. + """ + class Meta: + name = "System Housekeeping" + + def run(self, *args, **kwargs): + # Skip if running in development or test mode + if settings.DEBUG or 'test' in sys.argv: + return + + # TODO: Migrate other housekeeping functions from the `housekeeping` management command. + self.send_census_report() + + @staticmethod + def send_census_report(): + """ + Send a census report (if enabled). + """ + # Skip if census reporting is disabled + if settings.ISOLATED_DEPLOYMENT or not settings.CENSUS_REPORTING_ENABLED: + return + + census_data = { + 'version': settings.RELEASE.full_version, + 'python_version': sys.version.split()[0], + 'deployment_id': settings.DEPLOYMENT_ID, + } + try: + requests.get( + url=settings.CENSUS_URL, + params=census_data, + timeout=3, + proxies=settings.HTTP_PROXIES + ) + except requests.exceptions.RequestException: + pass diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 0682e713d..581cd9ef4 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -5,9 +5,7 @@ import os import platform import sys import warnings -from urllib.parse import urlencode -import requests from django.contrib.messages import constants as messages from django.core.exceptions import ImproperlyConfigured, ValidationError from django.core.validators import URLValidator @@ -583,17 +581,6 @@ if SENTRY_ENABLED: # Calculate a unique deployment ID from the secret key DEPLOYMENT_ID = hashlib.sha256(SECRET_KEY.encode('utf-8')).hexdigest()[:16] CENSUS_URL = 'https://census.netbox.oss.netboxlabs.com/api/v1/' -CENSUS_PARAMS = { - 'version': RELEASE.full_version, - 'python_version': sys.version.split()[0], - 'deployment_id': DEPLOYMENT_ID, -} -if CENSUS_REPORTING_ENABLED and not ISOLATED_DEPLOYMENT and not DEBUG and 'test' not in sys.argv: - try: - # Report anonymous census data - requests.get(f'{CENSUS_URL}?{urlencode(CENSUS_PARAMS)}', timeout=3, proxies=HTTP_PROXIES) - except requests.exceptions.RequestException: - pass # From b12c8c880f77acb5dac4e95c237a2cb654e72e6d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2025 13:55:19 -0500 Subject: [PATCH 093/190] Fixes #18363: Fix assignment of MAC addresses to interfaces via REST API (#18367) * Fixes #18363: Fix assignment of MAC addresses to interfaces via REST API * Add missing API & view tests --- netbox/dcim/api/serializers_/devices.py | 4 +- netbox/dcim/tests/test_api.py | 43 +++++++++++++++++++++ netbox/dcim/tests/test_views.py | 51 +++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/api/serializers_/devices.py b/netbox/dcim/api/serializers_/devices.py index eb6c4f9bc..1ad51caaa 100644 --- a/netbox/dcim/api/serializers_/devices.py +++ b/netbox/dcim/api/serializers_/devices.py @@ -170,8 +170,8 @@ class MACAddressSerializer(NetBoxModelSerializer): class Meta: model = MACAddress fields = [ - 'id', 'url', 'display_url', 'display', 'mac_address', 'assigned_object_type', 'assigned_object', - 'description', 'comments', + 'id', 'url', 'display_url', 'display', 'mac_address', 'assigned_object_type', 'assigned_object_id', + 'assigned_object', 'description', 'comments', ] brief_fields = ('id', 'url', 'display', 'mac_address', 'description') diff --git a/netbox/dcim/tests/test_api.py b/netbox/dcim/tests/test_api.py index c273e02dd..99a446aef 100644 --- a/netbox/dcim/tests/test_api.py +++ b/netbox/dcim/tests/test_api.py @@ -2447,3 +2447,46 @@ class VirtualDeviceContextTest(APIViewTestCases.APIViewTestCase): # Omit identifier to test uniqueness constraint }, ] + + +class MACAddressTest(APIViewTestCases.APIViewTestCase): + model = MACAddress + brief_fields = ['description', 'display', 'id', 'mac_address', 'url'] + bulk_update_data = { + 'description': 'New description', + } + + @classmethod + def setUpTestData(cls): + device = create_test_device(name='Device 1') + interfaces = ( + Interface(device=device, name='Interface 1', type='1000base-t'), + Interface(device=device, name='Interface 2', type='1000base-t'), + Interface(device=device, name='Interface 3', type='1000base-t'), + Interface(device=device, name='Interface 4', type='1000base-t'), + Interface(device=device, name='Interface 5', type='1000base-t'), + ) + Interface.objects.bulk_create(interfaces) + + mac_addresses = ( + MACAddress(mac_address='00:00:00:00:00:01', assigned_object=interfaces[0]), + MACAddress(mac_address='00:00:00:00:00:02', assigned_object=interfaces[1]), + MACAddress(mac_address='00:00:00:00:00:03', assigned_object=interfaces[2]), + ) + MACAddress.objects.bulk_create(mac_addresses) + + cls.create_data = [ + { + 'mac_address': '00:00:00:00:00:04', + 'assigned_object_type': 'dcim.interface', + 'assigned_object_id': interfaces[3].pk, + }, + { + 'mac_address': '00:00:00:00:00:05', + 'assigned_object_type': 'dcim.interface', + 'assigned_object_id': interfaces[4].pk, + }, + { + 'mac_address': '00:00:00:00:00:06', + }, + ] diff --git a/netbox/dcim/tests/test_views.py b/netbox/dcim/tests/test_views.py index bb942c685..b84217882 100644 --- a/netbox/dcim/tests/test_views.py +++ b/netbox/dcim/tests/test_views.py @@ -3470,3 +3470,54 @@ class VirtualDeviceContextTestCase(ViewTestCases.PrimaryObjectViewTestCase): cls.bulk_edit_data = { 'status': VirtualDeviceContextStatusChoices.STATUS_OFFLINE, } + + +class MACAddressTestCase(ViewTestCases.PrimaryObjectViewTestCase): + model = MACAddress + + @classmethod + def setUpTestData(cls): + device = create_test_device(name='Device 1') + interfaces = ( + Interface(device=device, name='Interface 1', type='1000base-t'), + Interface(device=device, name='Interface 2', type='1000base-t'), + Interface(device=device, name='Interface 3', type='1000base-t'), + Interface(device=device, name='Interface 4', type='1000base-t'), + Interface(device=device, name='Interface 5', type='1000base-t'), + Interface(device=device, name='Interface 6', type='1000base-t'), + ) + Interface.objects.bulk_create(interfaces) + + mac_addresses = ( + MACAddress(mac_address='00:00:00:00:00:01', assigned_object=interfaces[0]), + MACAddress(mac_address='00:00:00:00:00:02', assigned_object=interfaces[1]), + MACAddress(mac_address='00:00:00:00:00:03', assigned_object=interfaces[2]), + ) + MACAddress.objects.bulk_create(mac_addresses) + + tags = create_tags('Alpha', 'Bravo', 'Charlie') + + cls.form_data = { + 'mac_address': EUI('00:00:00:00:00:04'), + 'description': 'New MAC address', + 'interface_id': interfaces[3].pk, + 'tags': [t.pk for t in tags], + } + + cls.csv_data = ( + "mac_address,device,interface", + "00:00:00:00:00:04,Device 1,Interface 4", + "00:00:00:00:00:05,Device 1,Interface 5", + "00:00:00:00:00:06,Device 1,Interface 6", + ) + + cls.csv_update_data = ( + "id,mac_address", + f"{mac_addresses[0].pk},00:00:00:00:00:0a", + f"{mac_addresses[1].pk},00:00:00:00:00:0b", + f"{mac_addresses[2].pk},00:00:00:00:00:0c", + ) + + cls.bulk_edit_data = { + 'description': 'New description', + } From 571f604ce88d06630b463341eb76f043ec8c53e4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2025 14:05:23 -0500 Subject: [PATCH 094/190] Fixes #18368: Restore missing fields on REST API serializer for MAC addresses --- netbox/dcim/api/serializers_/devices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/api/serializers_/devices.py b/netbox/dcim/api/serializers_/devices.py index 1ad51caaa..c1e9c5f51 100644 --- a/netbox/dcim/api/serializers_/devices.py +++ b/netbox/dcim/api/serializers_/devices.py @@ -171,7 +171,7 @@ class MACAddressSerializer(NetBoxModelSerializer): model = MACAddress fields = [ 'id', 'url', 'display_url', 'display', 'mac_address', 'assigned_object_type', 'assigned_object_id', - 'assigned_object', 'description', 'comments', + 'assigned_object', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'mac_address', 'description') From 32422d16832b0f30792a3f273b28d531470f4dce Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 9 Jan 2025 14:04:03 -0500 Subject: [PATCH 095/190] Don't cache CACHE_KEY_CATALOG_ERROR if ISOLATED_DEPLOYMENT is True --- netbox/core/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index 713807a82..83914bcee 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -594,7 +594,7 @@ class BasePluginView(UserPassesTestMixin, View): catalog_plugins_error = cache.get(self.CACHE_KEY_CATALOG_ERROR, default=False) if not catalog_plugins_error: catalog_plugins = get_catalog_plugins() - if not catalog_plugins: + if not catalog_plugins and not settings.ISOLATED_DEPLOYMENT: # Cache for 5 minutes to avoid spamming connection cache.set(self.CACHE_KEY_CATALOG_ERROR, True, 300) messages.warning(request, _("Plugins catalog could not be loaded")) From a79d869bd8fa7f3d711873a471cab016afad6aed Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 05:02:08 +0000 Subject: [PATCH 096/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 2c22df58a..8d07440be 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-09 05:01+0000\n" +"POT-Creation-Date: 2025-01-10 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -11582,63 +11582,63 @@ msgstr "" msgid "Cannot delete stores from registry" msgstr "" -#: netbox/netbox/settings.py:755 +#: netbox/netbox/settings.py:742 msgid "Czech" msgstr "" -#: netbox/netbox/settings.py:756 +#: netbox/netbox/settings.py:743 msgid "Danish" msgstr "" -#: netbox/netbox/settings.py:757 +#: netbox/netbox/settings.py:744 msgid "German" msgstr "" -#: netbox/netbox/settings.py:758 +#: netbox/netbox/settings.py:745 msgid "English" msgstr "" -#: netbox/netbox/settings.py:759 +#: netbox/netbox/settings.py:746 msgid "Spanish" msgstr "" -#: netbox/netbox/settings.py:760 +#: netbox/netbox/settings.py:747 msgid "French" msgstr "" -#: netbox/netbox/settings.py:761 +#: netbox/netbox/settings.py:748 msgid "Italian" msgstr "" -#: netbox/netbox/settings.py:762 +#: netbox/netbox/settings.py:749 msgid "Japanese" msgstr "" -#: netbox/netbox/settings.py:763 +#: netbox/netbox/settings.py:750 msgid "Dutch" msgstr "" -#: netbox/netbox/settings.py:764 +#: netbox/netbox/settings.py:751 msgid "Polish" msgstr "" -#: netbox/netbox/settings.py:765 +#: netbox/netbox/settings.py:752 msgid "Portuguese" msgstr "" -#: netbox/netbox/settings.py:766 +#: netbox/netbox/settings.py:753 msgid "Russian" msgstr "" -#: netbox/netbox/settings.py:767 +#: netbox/netbox/settings.py:754 msgid "Turkish" msgstr "" -#: netbox/netbox/settings.py:768 +#: netbox/netbox/settings.py:755 msgid "Ukrainian" msgstr "" -#: netbox/netbox/settings.py:769 +#: netbox/netbox/settings.py:756 msgid "Chinese" msgstr "" From e75d327f384d0b22ffb17f7e790d953ac81530ca Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 10 Jan 2025 08:22:35 -0500 Subject: [PATCH 097/190] Fixes #18376: Include tagged VLANs in interfaces list for Q-in-Q interfaces --- netbox/dcim/tables/template_code.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index 449d55e14..4b51cd06a 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -69,16 +69,18 @@ INTERFACE_FHRPGROUPS = """ """ INTERFACE_TAGGED_VLANS = """ -{% if record.mode == 'tagged' %} +{% load i18n %} +{% if record.mode == 'access' %} +{% elif record.mode == 'tagged-all' %} + {% trans "All" %} +{% else %} {% if value.count > 3 %} {{ value.count }} VLANs {% else %} {% for vlan in value.all %} - {{ vlan }}
    + {{ vlan }}
    {% endfor %} {% endif %} -{% elif record.mode == 'tagged-all' %} - All {% endif %} """ From a75fa53d4d2c84cb4c129571a6da83b0f304ec20 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 9 Jan 2025 08:48:08 -0500 Subject: [PATCH 098/190] Closes #18348: Disable legacy pre-commit hook script --- scripts/git-hooks/pre-commit | 53 +++--------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/scripts/git-hooks/pre-commit b/scripts/git-hooks/pre-commit index da746b64f..90842a6bd 100755 --- a/scripts/git-hooks/pre-commit +++ b/scripts/git-hooks/pre-commit @@ -1,11 +1,6 @@ #!/bin/sh -# Create a link to this file at .git/hooks/pre-commit to -# force PEP8 validation prior to committing -# -# Ignored violations: -# -# W504: Line break after binary operator -# E501: Line too long +# TODO: Remove this file in NetBox v4.3 +# This script has been maintained to ease transition to the pre-commit tool. exec 1>&2 @@ -14,48 +9,8 @@ RED='\033[0;31m' YELLOW='\033[0;33m' NOCOLOR='\033[0m' -printf "${YELLOW}This script is obsolete and will be removed in a future release.\n" -printf "Please use pre-commit instead:\n" +printf "${YELLOW}The pre-commit hook script is obsolete. Please use pre-commit instead:${NOCOLOR}\n" printf " pip install pre-commit\n" printf " pre-commit install${NOCOLOR}\n" -if [ -d ./venv/ ]; then - VENV="$PWD/venv" - if [ -e $VENV/bin/python ]; then - PATH=$VENV/bin:$PATH - elif [ -e $VENV/Scripts/python.exe ]; then - PATH=$VENV/Scripts:$PATH - fi -fi - -if [ ${NOVALIDATE} ]; then - echo "${YELLOW}Skipping validation checks${NOCOLOR}" - exit $EXIT -fi - -echo "Linting with ruff..." -ruff check netbox/ -if [ $? != 0 ]; then - EXIT=1 -fi - -echo "Checking for missing migrations..." -python netbox/manage.py makemigrations --dry-run --check -if [ $? != 0 ]; then - EXIT=1 -fi - -git diff --cached --name-only | if grep --quiet 'netbox/project-static/' -then - echo "Checking UI ESLint, TypeScript, and Prettier compliance..." - yarn --cwd "$PWD/netbox/project-static" validate - if [ $? != 0 ]; then - EXIT=1 - fi -fi - -if [ $EXIT != 0 ]; then - printf "${RED}COMMIT FAILED${NOCOLOR}\n" -fi - -exit $EXIT +exit 1 From c3efa2149c14f6b55ebb79be72eef6e37c86a072 Mon Sep 17 00:00:00 2001 From: bctiemann Date: Fri, 17 Jan 2025 08:28:43 -0500 Subject: [PATCH 099/190] Fixes: #18350 - Remove 'site' and 'provider_network' from CircuitTerminationIndex.display_attrs (#18351) * Remove 'site' and 'provider_network' from CircuitTerminationIndex.display_attrs * Use '_site' and '_provider_network' in display_attrs * Replace private fields with 'termination' --- netbox/circuits/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/circuits/search.py b/netbox/circuits/search.py index 2ea11b7fd..486656933 100644 --- a/netbox/circuits/search.py +++ b/netbox/circuits/search.py @@ -34,7 +34,7 @@ class CircuitTerminationIndex(SearchIndex): ('port_speed', 2000), ('upstream_speed', 2000), ) - display_attrs = ('circuit', 'site', 'provider_network', 'description') + display_attrs = ('circuit', 'termination', 'description') @register_search From 993d8f1480be287b4f7347011a6d8af7e1a22150 Mon Sep 17 00:00:00 2001 From: bctiemann Date: Fri, 17 Jan 2025 08:35:17 -0500 Subject: [PATCH 100/190] Fixes: #18373 - Fix validation of site in Assign Device to Cluster flow (#18375) * Fix validation of site in Assign Device to Cluster flow * Validate Location as well as Site scope --- netbox/virtualization/forms/model_forms.py | 32 ++++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 9edda1fe0..9d53c9382 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -1,4 +1,5 @@ from django import forms +from django.apps import apps from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ @@ -143,19 +144,26 @@ class ClusterAddDevicesForm(forms.Form): def clean(self): super().clean() - # If the Cluster is assigned to a Site, all Devices must be assigned to that Site. - if self.cluster.site is not None: + # If the Cluster is assigned to a Site or Location, all Devices must be assigned to that same scope. + if self.cluster.scope is not None: for device in self.cleaned_data.get('devices', []): - if device.site != self.cluster.site: - raise ValidationError({ - 'devices': _( - "{device} belongs to a different site ({device_site}) than the cluster ({cluster_site})" - ).format( - device=device, - device_site=device.site, - cluster_site=self.cluster.site - ) - }) + for scope_field in ['site', 'location']: + device_scope = getattr(device, scope_field) + if ( + self.cluster.scope_type.model_class() == apps.get_model('dcim', scope_field) + and device_scope != self.cluster.scope + ): + raise ValidationError({ + 'devices': _( + "{device} belongs to a different {scope_field} ({device_scope}) than the " + "cluster ({cluster_scope})" + ).format( + device=device, + scope_field=scope_field, + device_scope=device_scope, + cluster_scope=self.cluster.scope + ) + }) class ClusterRemoveDevicesForm(ConfirmationForm): From 4a1fea3504769b4eaed2eee14430200c7f89f45d Mon Sep 17 00:00:00 2001 From: bctiemann Date: Fri, 17 Jan 2025 08:45:17 -0500 Subject: [PATCH 101/190] Fixes: #18336 - Perform Rack object validation of u_height and starting_unit on rack_type if present (#18395) * Perform Rack object validation of u_height and starting_unit on rack_type if present * Calculate effective values before doing validation --- netbox/dcim/models/racks.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/models/racks.py b/netbox/dcim/models/racks.py index 78eb0ea4a..7ecbd5d5f 100644 --- a/netbox/dcim/models/racks.py +++ b/netbox/dcim/models/racks.py @@ -374,22 +374,27 @@ class Rack(ContactsMixin, ImageAttachmentsMixin, RackBase): if not self._state.adding: mounted_devices = Device.objects.filter(rack=self).exclude(position__isnull=True).order_by('position') + effective_u_height = self.rack_type.u_height if self.rack_type else self.u_height + effective_starting_unit = self.rack_type.starting_unit if self.rack_type else self.starting_unit + # Validate that Rack is tall enough to house the highest mounted Device if top_device := mounted_devices.last(): - min_height = top_device.position + top_device.device_type.u_height - self.starting_unit - if self.u_height < min_height: + min_height = top_device.position + top_device.device_type.u_height - effective_starting_unit + if effective_u_height < min_height: + field = 'rack_type' if self.rack_type else 'u_height' raise ValidationError({ - 'u_height': _( + field: _( "Rack must be at least {min_height}U tall to house currently installed devices." ).format(min_height=min_height) }) # Validate that the Rack's starting unit is less than or equal to the position of the lowest mounted Device if last_device := mounted_devices.first(): - if self.starting_unit > last_device.position: + if effective_starting_unit > last_device.position: + field = 'rack_type' if self.rack_type else 'starting_unit' raise ValidationError({ - 'starting_unit': _("Rack unit numbering must begin at {position} or less to house " - "currently installed devices.").format(position=last_device.position) + field: _("Rack unit numbering must begin at {position} or less to house " + "currently installed devices.").format(position=last_device.position) }) # Validate that Rack was assigned a Location of its same site, if applicable From 07ad4c1321e77cf46c8b29f87a0f371efa38adc0 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 16 Jan 2025 13:04:26 -0500 Subject: [PATCH 102/190] Make GFK scope field sortable=False on tables where it appears --- netbox/ipam/tables/ip.py | 3 ++- netbox/virtualization/tables/clusters.py | 3 ++- netbox/wireless/tables/wirelesslan.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index 17ba36de9..1eefa6b3a 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -192,7 +192,8 @@ class PrefixTable(TenancyColumnsMixin, NetBoxTable): ) scope = tables.Column( verbose_name=_('Scope'), - linkify=True + linkify=True, + orderable=False ) vlan_group = tables.Column( accessor='vlan__group', diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index d07bb4519..665f8fa8b 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -78,7 +78,8 @@ class ClusterTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): ) scope = tables.Column( verbose_name=_('Scope'), - linkify=True + linkify=True, + orderable=False ) device_count = columns.LinkedCountColumn( viewname='dcim:device_list', diff --git a/netbox/wireless/tables/wirelesslan.py b/netbox/wireless/tables/wirelesslan.py index fe9c0f5fa..ca37b152f 100644 --- a/netbox/wireless/tables/wirelesslan.py +++ b/netbox/wireless/tables/wirelesslan.py @@ -56,7 +56,8 @@ class WirelessLANTable(TenancyColumnsMixin, NetBoxTable): ) scope = tables.Column( verbose_name=_('Scope'), - linkify=True + linkify=True, + orderable=False ) interface_count = tables.Column( verbose_name=_('Interfaces') From 50b7f46fc0971ebe6d6ea6c8a6eaf6d4de3c035d Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 15 Jan 2025 10:18:30 -0500 Subject: [PATCH 103/190] Migrate DEFAULT_FILE_STORAGE to STORAGES --- netbox/netbox/settings.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 581cd9ef4..84b86ba13 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -222,8 +222,18 @@ DATABASES = { # Storage backend # +# Default STORAGES for Django +STORAGES = { + "default": { + "BACKEND": "django.core.files.storage.FileSystemStorage", + }, + "staticfiles": { + "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage", + }, +} + if STORAGE_BACKEND is not None: - DEFAULT_FILE_STORAGE = STORAGE_BACKEND + STORAGES['default']['BACKEND'] = STORAGE_BACKEND # django-storages if STORAGE_BACKEND.startswith('storages.'): From a9f3c74b0c462e4788a7ed364039fc63c3943a21 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 17 Jan 2025 10:08:25 -0500 Subject: [PATCH 104/190] Fixes #18379: Ensure RSS feed content within dashboard widget is sanitized --- netbox/templates/extras/dashboard/widgets/rssfeed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/extras/dashboard/widgets/rssfeed.html b/netbox/templates/extras/dashboard/widgets/rssfeed.html index fa602a112..2528c5fc7 100644 --- a/netbox/templates/extras/dashboard/widgets/rssfeed.html +++ b/netbox/templates/extras/dashboard/widgets/rssfeed.html @@ -5,7 +5,7 @@

    {{ entry.title }}
    - {{ entry.summary|safe }} + {{ entry.summary }}
    {% empty %} From 4a13664e0f68701d4aacc9fefe82038f1cb7ea22 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 17 Jan 2025 10:36:22 -0500 Subject: [PATCH 105/190] Closes #18425: Remove the triage priority field from GitHub issue templates --- .github/ISSUE_TEMPLATE/01-feature_request.yaml | 13 ------------- .github/ISSUE_TEMPLATE/02-bug_report.yaml | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index f415f933a..2215ab7a1 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -27,19 +27,6 @@ body: - Other validations: required: true - - type: dropdown - attributes: - label: Triage priority - description: > - Issue triage may be prioritized in some cases. Select whichever of the following - conditions applies, if any. - options: - - I volunteer to perform this work (if approved) - - I'm a NetBox Labs customer - - N/A - default: 2 - validations: - required: true - type: textarea attributes: label: Proposed functionality diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index 0e0839849..f007b67cc 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -22,19 +22,6 @@ body: - Self-hosted validations: required: true - - type: dropdown - attributes: - label: Triage priority - description: > - Issue triage may be prioritized in some cases. Select whichever of the following - conditions applies, if any. - options: - - I volunteer to perform this work (if approved) - - I'm a NetBox Labs customer - - N/A - default: 2 - validations: - required: true - type: input attributes: label: NetBox Version From 5b9210dfa5f9288a55686c86e582f65dea0386de Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 17 Jan 2025 12:20:24 -0500 Subject: [PATCH 106/190] Fixes #18392: Exclude config contexts assigned to locations for VMs --- netbox/extras/querysets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py index 9b3722eef..59be85734 100644 --- a/netbox/extras/querysets.py +++ b/netbox/extras/querysets.py @@ -120,11 +120,12 @@ class ConfigContextModelQuerySet(RestrictedQuerySet): is_active=True, ) + # Apply Location & DeviceType filters only for VirtualMachines if self.model._meta.model_name == 'device': base_query.add((Q(locations=OuterRef('location')) | Q(locations=None)), Q.AND) base_query.add((Q(device_types=OuterRef('device_type')) | Q(device_types=None)), Q.AND) - elif self.model._meta.model_name == 'virtualmachine': + base_query.add(Q(locations=None), Q.AND) base_query.add(Q(device_types=None), Q.AND) base_query.add((Q(roles=OuterRef('role')) | Q(roles=None)), Q.AND) From 2ed4a2b0054887daa7bc46eddc429a452c5ca422 Mon Sep 17 00:00:00 2001 From: atownson <52260120+atownson@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:02:12 -0600 Subject: [PATCH 107/190] Fixes: #18369 - Remove the json filter for protection rules (#18388) * Remove the json filter for protection rules * Configure PROTECTION_RULE config attribute to use ConfigJSONEncoder as serializer * Tweak getattr() --------- Co-authored-by: Jeremy Stretch --- netbox/core/views.py | 5 +++-- netbox/templates/core/inc/config_data.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index 83914bcee..cd9cd6c67 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -570,8 +570,9 @@ class SystemView(UserPassesTestMixin, View): return response # Serialize any CustomValidator classes - if hasattr(config, 'CUSTOM_VALIDATORS') and config.CUSTOM_VALIDATORS: - config.CUSTOM_VALIDATORS = json.dumps(config.CUSTOM_VALIDATORS, cls=ConfigJSONEncoder, indent=4) + for attr in ['CUSTOM_VALIDATORS', 'PROTECTION_RULES']: + if hasattr(config, attr) and getattr(config, attr, None): + setattr(config, attr, json.dumps(getattr(config, attr), cls=ConfigJSONEncoder, indent=4)) return render(request, 'core/system.html', { 'stats': stats, diff --git a/netbox/templates/core/inc/config_data.html b/netbox/templates/core/inc/config_data.html index 41471a103..939b8588f 100644 --- a/netbox/templates/core/inc/config_data.html +++ b/netbox/templates/core/inc/config_data.html @@ -103,7 +103,7 @@ {% trans "Protection rules" %} {% if config.PROTECTION_RULES %} - 
    {{ config.PROTECTION_RULES|json }}
    + 
    {{ config.PROTECTION_RULES }}
    {% else %} {{ ''|placeholder }} {% endif %} From f845b2cf07cd65a109c46632a2540d3647c1c492 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 17 Jan 2025 14:49:37 -0500 Subject: [PATCH 108/190] Release v4.2.2 --- .../ISSUE_TEMPLATE/01-feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/02-bug_report.yaml | 2 +- base_requirements.txt | 2 -- docs/release-notes/version-4.2.md | 20 ++++++++++++++++++ netbox/project-static/dist/netbox.js | Bin 390886 -> 391058 bytes netbox/project-static/dist/netbox.js.map | Bin 525356 -> 525511 bytes netbox/project-static/package.json | 4 ++-- netbox/project-static/yarn.lock | 16 +++++++------- netbox/release.yaml | 4 ++-- netbox/translations/ru/LC_MESSAGES/django.mo | Bin 301883 -> 301870 bytes netbox/translations/ru/LC_MESSAGES/django.po | 10 ++++----- requirements.txt | 10 ++++----- 12 files changed, 44 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index 2215ab7a1..6212af3b8 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -14,7 +14,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v4.2.1 + placeholder: v4.2.2 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index f007b67cc..4382a9b76 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -26,7 +26,7 @@ body: attributes: label: NetBox Version description: What version of NetBox are you currently running? - placeholder: v4.2.1 + placeholder: v4.2.2 validations: required: true - type: dropdown diff --git a/base_requirements.txt b/base_requirements.txt index 4cb355dd5..9cf0fbf8b 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -8,8 +8,6 @@ django-cors-headers # Runtime UI tool for debugging Django # https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst -# Pinned for DNS looukp bug; see https://github.com/netbox-community/netbox/issues/16454 -# and https://github.com/jazzband/django-debug-toolbar/issues/1927 django-debug-toolbar # Library for writing reusable URL query filters diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md index a1dafaf14..61f043f3d 100644 --- a/docs/release-notes/version-4.2.md +++ b/docs/release-notes/version-4.2.md @@ -1,5 +1,25 @@ # NetBox v4.2 +## v4.2.2 (2025-01-17) + +### Bug Fixes + +* [#18336](https://github.com/netbox-community/netbox/issues/18336) - Validate new rack height against installed devices when changing a rack's type +* [#18350](https://github.com/netbox-community/netbox/issues/18350) - Fix `FieldDoesNotExist` exception when global search results include a circuit termination +* [#18353](https://github.com/netbox-community/netbox/issues/18353) - Disable fetching of plugin catalog data when `ISOLATED_DEPLOYMENT` is enabled +* [#18362](https://github.com/netbox-community/netbox/issues/18362) - Avoid transmitting census data on every worker restart +* [#18363](https://github.com/netbox-community/netbox/issues/18363) - Fix support for assigning a MAC address to an interface via the REST API +* [#18368](https://github.com/netbox-community/netbox/issues/18368) - Restore missing attributes from REST API serializer for MAC addresses (`tags`, `created`, `last_updated`, and custom fields) +* [#18369](https://github.com/netbox-community/netbox/issues/18369) - Fix `TypeError` exception when rendering the system configuration view with one or more custom classes defined under `PROTECTION_RULES` +* [#18373](https://github.com/netbox-community/netbox/issues/18373) - Fix `AttributeError` exception when attempting to assign host devices to a cluster +* [#18376](https://github.com/netbox-community/netbox/issues/18376) - Fix the display of tagged VLANs in interfaces list for Q-in-Q interfaces +* [#18379](https://github.com/netbox-community/netbox/issues/18379) - Ensure RSS feed dashboard widget content is sanitized +* [#18392](https://github.com/netbox-community/netbox/issues/18392) - Virtual machines should not inherit config contexts assigned to locations +* [#18400](https://github.com/netbox-community/netbox/issues/18400) - Fix support for `STORAGE_BACKEND` configuration parameter +* [#18406](https://github.com/netbox-community/netbox/issues/18406) - Scope column headers in object lists should not be orderable + +--- + ## v4.2.1 (2025-01-08) ### Bug Fixes diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 4661582a3ffd9468ca9a0efe8fdc95c5c3855d0d..7e516f7f4859ffcafee6698af56ca52c89acb58c 100644 GIT binary patch delta 3121 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 diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index d94269b5df242edad06ee43c5e12a766b88bf50c..a8b2c9569b82fa6c60f5703fae5613871fccf82c 100644 GIT binary patch delta 6452 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 delta 6314 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 a%*uYN@4sOEe`D&)(+jOdM^5iK^M3&90&bcB diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index 8416d4b4b..f216a4107 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -27,10 +27,10 @@ "bootstrap": "5.3.3", "clipboard": "2.0.11", "flatpickr": "4.6.13", - "gridstack": "11.2.0", + "gridstack": "11.3.0", "htmx.org": "1.9.12", "query-string": "9.1.1", - "sass": "1.83.1", + "sass": "1.83.4", "tom-select": "2.4.1", "typeface-inter": "3.18.1", "typeface-roboto-mono": "1.1.13" diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index a3ded9bdb..588935331 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -1905,10 +1905,10 @@ graphql@16.10.0: resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.10.0.tgz#24c01ae0af6b11ea87bf55694429198aaa8e220c" integrity sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ== -gridstack@11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-11.2.0.tgz#8977a6632c521260f064ef171b92c7a8df4f58a9" - integrity sha512-ajwUzd9spR8NXDxfJotHWq9WOYoDOV9o6UJR3ksevNz8cvXNxDtI9H/lC+RN6ijM2DexureLlsG0RpYjBZiOtg== +gridstack@11.3.0: + version "11.3.0" + resolved "https://registry.yarnpkg.com/gridstack/-/gridstack-11.3.0.tgz#b110c66bafc64c920fc54933e2c9df4f7b2cfffe" + integrity sha512-Z0eRovKcZTRTs3zetJwjO6CNwrgIy845WfOeZGk8ybpeMCE8fMA8tScyKU72Y2M6uGHkjgwnjflglvPiv+RcBQ== has-bigints@^1.0.1, has-bigints@^1.0.2: version "1.0.2" @@ -2667,10 +2667,10 @@ safe-regex-test@^1.0.3: es-errors "^1.3.0" is-regex "^1.1.4" -sass@1.83.1: - version "1.83.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846" - integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA== +sass@1.83.4: + version "1.83.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.4.tgz#5ccf60f43eb61eeec300b780b8dcb85f16eec6d1" + integrity sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA== dependencies: chokidar "^4.0.0" immutable "^5.0.2" diff --git a/netbox/release.yaml b/netbox/release.yaml index 4127b0253..2619279a9 100644 --- a/netbox/release.yaml +++ b/netbox/release.yaml @@ -1,3 +1,3 @@ -version: "4.2.1" +version: "4.2.2" edition: "Community" -published: "2025-01-08" +published: "2025-01-17" diff --git a/netbox/translations/ru/LC_MESSAGES/django.mo b/netbox/translations/ru/LC_MESSAGES/django.mo index 4b62c2a5b1419eab25391b91fe2a9bd4a23066ac..d6454046422926e787cf5958a72490eec887d402 100644 GIT binary patch delta 25062 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 L_}_$3sl5LOtnkw~ diff --git a/netbox/translations/ru/LC_MESSAGES/django.po b/netbox/translations/ru/LC_MESSAGES/django.po index 2cb2074cd..7980f7202 100644 --- a/netbox/translations/ru/LC_MESSAGES/django.po +++ b/netbox/translations/ru/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ # Alexander Ryazanov (alryaz) , 2024 # Vladyslav V. Prodan, 2024 # Jeremy Stretch, 2024 -# Michail Tatarinov, 2024 # Artem Kotik, 2025 +# Michail Tatarinov, 2025 # #, fuzzy msgid "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Artem Kotik, 2025\n" +"Last-Translator: Michail Tatarinov, 2025\n" "Language-Team: Russian (https://app.transifex.com/netbox-community/teams/178115/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6334,7 +6334,7 @@ msgstr "распределительный щит" #: netbox/dcim/models/power.py:56 msgid "power panels" -msgstr "распределительный щиты" +msgstr "распределительные щиты" #: netbox/dcim/models/power.py:70 #, python-brace-format @@ -9256,7 +9256,7 @@ msgstr "SLAAC" #: netbox/ipam/choices.py:89 msgid "Loopback" -msgstr "Обратная петля" +msgstr "Loopback" #: netbox/ipam/choices.py:91 msgid "Anycast" @@ -11185,7 +11185,7 @@ msgstr "Сети провайдеров" #: netbox/netbox/navigation/menu.py:298 msgid "Power Panels" -msgstr "Распределительный щиты" +msgstr "Распределительные щиты" #: netbox/netbox/navigation/menu.py:309 msgid "Configurations" diff --git a/requirements.txt b/requirements.txt index b875ae5a2..903e4e7fd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Django==5.1.4 +Django==5.1.5 django-cors-headers==4.6.0 -django-debug-toolbar==4.4.6 +django-debug-toolbar==5.0.1 django-filter==24.3 django-htmx==1.21.0 django-graphiql-debug-toolbar==0.2.0 @@ -12,7 +12,7 @@ django-rich==1.13.0 django-rq==3.0 django-taggit==6.1.0 django-tables2==2.7.5 -django-timezone-field==7.0 +django-timezone-field==7.1 djangorestframework==3.15.2 drf-spectacular==0.28.0 drf-spectacular-sidecar==2024.12.1 @@ -25,13 +25,13 @@ mkdocstrings[python-legacy]==0.27.0 netaddr==1.3.0 nh3==0.2.20 Pillow==11.1.0 -psycopg[c,pool]==3.2.3 +psycopg[c,pool]==3.2.4 PyYAML==6.0.2 requests==2.32.3 rq==2.1.0 social-auth-app-django==5.4.2 social-auth-core==4.5.4 -strawberry-graphql==0.256.1 +strawberry-graphql==0.258.0 strawberry-graphql-django==0.52.0 svgwrite==1.4.3 tablib==3.7.0 From d11deb66788c35ccb50eccdbd6bd2518733e2801 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 05:02:12 +0000 Subject: [PATCH 109/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 208 +++++++++---------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 8d07440be..6b0b5e1d0 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-10 05:01+0000\n" +"POT-Creation-Date: 2025-01-18 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,8 +242,8 @@ msgstr "" #: netbox/virtualization/forms/bulk_import.py:91 #: netbox/virtualization/forms/filtersets.py:74 #: netbox/virtualization/forms/filtersets.py:153 -#: netbox/virtualization/forms/model_forms.py:103 -#: netbox/virtualization/forms/model_forms.py:170 +#: netbox/virtualization/forms/model_forms.py:104 +#: netbox/virtualization/forms/model_forms.py:178 #: netbox/virtualization/tables/virtualmachines.py:33 #: netbox/vpn/forms/filtersets.py:266 netbox/wireless/forms/filtersets.py:88 #: netbox/wireless/forms/model_forms.py:79 @@ -712,7 +712,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:61 #: netbox/virtualization/forms/bulk_import.py:42 #: netbox/virtualization/forms/filtersets.py:54 -#: netbox/virtualization/forms/model_forms.py:64 +#: netbox/virtualization/forms/model_forms.py:65 #: netbox/virtualization/tables/clusters.py:66 #: netbox/vpn/forms/bulk_edit.py:264 netbox/vpn/forms/bulk_import.py:264 #: netbox/vpn/forms/filtersets.py:217 netbox/vpn/forms/model_forms.py:85 @@ -766,8 +766,8 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:212 netbox/ipam/forms/filtersets.py:284 #: netbox/ipam/forms/filtersets.py:358 netbox/ipam/forms/filtersets.py:542 #: netbox/ipam/forms/model_forms.py:503 netbox/ipam/tables/ip.py:183 -#: netbox/ipam/tables/ip.py:263 netbox/ipam/tables/ip.py:314 -#: netbox/ipam/tables/ip.py:377 netbox/ipam/tables/ip.py:404 +#: netbox/ipam/tables/ip.py:264 netbox/ipam/tables/ip.py:315 +#: netbox/ipam/tables/ip.py:378 netbox/ipam/tables/ip.py:405 #: netbox/ipam/tables/vlans.py:95 netbox/ipam/tables/vlans.py:208 #: netbox/templates/circuits/circuit.html:34 #: netbox/templates/circuits/virtualcircuit.html:43 @@ -844,7 +844,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:122 netbox/ipam/forms/filtersets.py:145 #: netbox/ipam/forms/filtersets.py:176 netbox/ipam/forms/filtersets.py:270 #: netbox/ipam/forms/filtersets.py:313 netbox/ipam/forms/filtersets.py:510 -#: netbox/ipam/tables/ip.py:407 netbox/ipam/tables/vlans.py:205 +#: netbox/ipam/tables/ip.py:408 netbox/ipam/tables/vlans.py:205 #: netbox/templates/circuits/circuit.html:48 #: netbox/templates/circuits/circuitgroup.html:36 #: netbox/templates/circuits/virtualcircuit.html:47 @@ -978,8 +978,8 @@ msgstr "" #: netbox/templates/dcim/htmx/cable_edit.html:72 #: netbox/templates/ipam/ipaddress_bulk_add.html:27 #: netbox/templates/ipam/vlan_edit.html:30 -#: netbox/virtualization/forms/model_forms.py:79 -#: netbox/virtualization/forms/model_forms.py:221 +#: netbox/virtualization/forms/model_forms.py:80 +#: netbox/virtualization/forms/model_forms.py:229 #: netbox/vpn/forms/bulk_edit.py:78 netbox/vpn/forms/filtersets.py:44 #: netbox/vpn/forms/model_forms.py:63 netbox/vpn/forms/model_forms.py:148 #: netbox/vpn/forms/model_forms.py:414 netbox/wireless/forms/model_forms.py:57 @@ -1078,8 +1078,8 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:292 netbox/ipam/forms/filtersets.py:363 #: netbox/ipam/forms/filtersets.py:550 netbox/ipam/forms/model_forms.py:194 #: netbox/ipam/forms/model_forms.py:220 netbox/ipam/forms/model_forms.py:251 -#: netbox/ipam/forms/model_forms.py:678 netbox/ipam/tables/ip.py:208 -#: netbox/ipam/tables/ip.py:267 netbox/ipam/tables/ip.py:318 +#: netbox/ipam/forms/model_forms.py:678 netbox/ipam/tables/ip.py:209 +#: netbox/ipam/tables/ip.py:268 netbox/ipam/tables/ip.py:319 #: netbox/ipam/tables/vlans.py:99 netbox/ipam/tables/vlans.py:211 #: netbox/templates/circuits/virtualcircuittermination.html:42 #: netbox/templates/dcim/device.html:182 @@ -1099,7 +1099,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:127 #: netbox/virtualization/forms/bulk_import.py:112 #: netbox/virtualization/forms/filtersets.py:162 -#: netbox/virtualization/forms/model_forms.py:194 +#: netbox/virtualization/forms/model_forms.py:202 #: netbox/virtualization/tables/virtualmachines.py:45 #: netbox/vpn/forms/bulk_edit.py:87 netbox/vpn/forms/bulk_import.py:81 #: netbox/vpn/forms/filtersets.py:85 netbox/vpn/forms/model_forms.py:79 @@ -1191,7 +1191,7 @@ msgstr "" #: netbox/dcim/tables/connections.py:65 netbox/dcim/tables/devices.py:1140 #: netbox/ipam/forms/bulk_import.py:317 netbox/ipam/forms/model_forms.py:282 #: netbox/ipam/forms/model_forms.py:291 netbox/ipam/tables/fhrp.py:64 -#: netbox/ipam/tables/ip.py:323 netbox/ipam/tables/vlans.py:145 +#: netbox/ipam/tables/ip.py:324 netbox/ipam/tables/vlans.py:145 #: netbox/templates/circuits/inc/circuit_termination_fields.html:52 #: netbox/templates/circuits/virtualcircuittermination.html:53 #: netbox/templates/circuits/virtualcircuittermination.html:60 @@ -1205,7 +1205,7 @@ msgstr "" #: netbox/templates/wireless/inc/wirelesslink_interface.html:10 #: netbox/templates/wireless/wirelesslink.html:10 #: netbox/templates/wireless/wirelesslink.html:55 -#: netbox/virtualization/forms/model_forms.py:369 +#: netbox/virtualization/forms/model_forms.py:377 #: netbox/vpn/forms/bulk_import.py:297 netbox/vpn/forms/model_forms.py:439 #: netbox/vpn/forms/model_forms.py:448 netbox/wireless/forms/model_forms.py:116 #: netbox/wireless/forms/model_forms.py:158 @@ -1291,7 +1291,7 @@ msgstr "" #: netbox/templates/ipam/vlan.html:16 #: netbox/virtualization/forms/filtersets.py:59 #: netbox/virtualization/forms/filtersets.py:138 -#: netbox/virtualization/forms/model_forms.py:91 +#: netbox/virtualization/forms/model_forms.py:92 #: netbox/vpn/forms/filtersets.py:257 netbox/wireless/forms/filtersets.py:73 msgid "Region" msgstr "" @@ -1309,7 +1309,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:430 netbox/ipam/forms/filtersets.py:521 #: netbox/virtualization/forms/filtersets.py:64 #: netbox/virtualization/forms/filtersets.py:143 -#: netbox/virtualization/forms/model_forms.py:97 +#: netbox/virtualization/forms/model_forms.py:98 #: netbox/wireless/forms/filtersets.py:78 msgid "Site group" msgstr "" @@ -1370,7 +1370,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:66 #: netbox/virtualization/forms/bulk_import.py:48 #: netbox/virtualization/forms/filtersets.py:90 -#: netbox/virtualization/forms/model_forms.py:69 +#: netbox/virtualization/forms/model_forms.py:70 #: netbox/virtualization/tables/clusters.py:70 #: netbox/vpn/forms/bulk_edit.py:112 netbox/vpn/forms/bulk_import.py:158 #: netbox/vpn/forms/filtersets.py:116 netbox/vpn/tables/crypto.py:31 @@ -1529,7 +1529,7 @@ msgstr "" #: netbox/circuits/models/circuits.py:290 #: netbox/circuits/models/virtual_circuits.py:144 #: netbox/dcim/models/device_component_templates.py:57 -#: netbox/dcim/models/device_components.py:63 netbox/dcim/models/racks.py:676 +#: netbox/dcim/models/device_components.py:63 netbox/dcim/models/racks.py:681 #: netbox/extras/models/configs.py:45 netbox/extras/models/configs.py:219 #: netbox/extras/models/customfields.py:125 netbox/extras/models/models.py:61 #: netbox/extras/models/models.py:158 netbox/extras/models/models.py:396 @@ -1782,7 +1782,7 @@ msgstr "" #: netbox/vpn/tables/crypto.py:158 netbox/vpn/tables/l2vpn.py:23 #: netbox/vpn/tables/tunnels.py:18 netbox/vpn/tables/tunnels.py:40 #: netbox/wireless/tables/wirelesslan.py:18 -#: netbox/wireless/tables/wirelesslan.py:87 +#: netbox/wireless/tables/wirelesslan.py:88 msgid "Name" msgstr "" @@ -1831,8 +1831,8 @@ msgstr "" #: netbox/dcim/tables/racks.py:224 netbox/dcim/tables/sites.py:108 #: netbox/extras/tables/tables.py:582 netbox/ipam/tables/asn.py:69 #: netbox/ipam/tables/fhrp.py:34 netbox/ipam/tables/ip.py:82 -#: netbox/ipam/tables/ip.py:225 netbox/ipam/tables/ip.py:280 -#: netbox/ipam/tables/ip.py:348 netbox/ipam/tables/services.py:24 +#: netbox/ipam/tables/ip.py:226 netbox/ipam/tables/ip.py:281 +#: netbox/ipam/tables/ip.py:349 netbox/ipam/tables/services.py:24 #: netbox/ipam/tables/services.py:54 netbox/ipam/tables/vlans.py:121 #: netbox/ipam/tables/vrfs.py:47 netbox/ipam/tables/vrfs.py:72 #: netbox/templates/dcim/htmx/cable_edit.html:89 @@ -1840,13 +1840,13 @@ msgstr "" #: netbox/templates/inc/panels/comments.html:5 #: netbox/tenancy/tables/contacts.py:68 netbox/tenancy/tables/tenants.py:46 #: netbox/utilities/forms/fields/fields.py:29 -#: netbox/virtualization/tables/clusters.py:94 +#: netbox/virtualization/tables/clusters.py:95 #: netbox/virtualization/tables/virtualmachines.py:52 #: netbox/vpn/tables/crypto.py:37 netbox/vpn/tables/crypto.py:74 #: netbox/vpn/tables/crypto.py:109 netbox/vpn/tables/crypto.py:140 #: netbox/vpn/tables/crypto.py:173 netbox/vpn/tables/l2vpn.py:37 #: netbox/vpn/tables/tunnels.py:61 netbox/wireless/tables/wirelesslan.py:27 -#: netbox/wireless/tables/wirelesslan.py:65 +#: netbox/wireless/tables/wirelesslan.py:66 msgid "Comments" msgstr "" @@ -1960,14 +1960,14 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:119 #: netbox/virtualization/forms/bulk_import.py:105 #: netbox/virtualization/forms/filtersets.py:133 -#: netbox/virtualization/forms/model_forms.py:184 +#: netbox/virtualization/forms/model_forms.py:192 #: netbox/virtualization/tables/virtualmachines.py:41 netbox/vpn/choices.py:52 #: netbox/vpn/forms/bulk_import.py:86 netbox/vpn/forms/bulk_import.py:283 #: netbox/vpn/forms/filtersets.py:275 netbox/vpn/forms/model_forms.py:91 #: netbox/vpn/forms/model_forms.py:126 netbox/vpn/forms/model_forms.py:237 #: netbox/vpn/forms/model_forms.py:456 netbox/wireless/forms/model_forms.py:102 #: netbox/wireless/forms/model_forms.py:144 -#: netbox/wireless/tables/wirelesslan.py:83 +#: netbox/wireless/tables/wirelesslan.py:84 msgid "Device" msgstr "" @@ -2895,11 +2895,11 @@ msgstr "" msgid "Failed to stop job {id}" msgstr "" -#: netbox/core/views.py:600 +#: netbox/core/views.py:601 msgid "Plugins catalog could not be loaded" msgstr "" -#: netbox/core/views.py:634 +#: netbox/core/views.py:635 #, python-brace-format msgid "Plugin {name} not found" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:689 netbox/dcim/tables/devices.py:899 #: netbox/dcim/tables/devices.py:986 netbox/dcim/tables/devices.py:1146 #: netbox/extras/tables/tables.py:223 netbox/ipam/tables/fhrp.py:59 -#: netbox/ipam/tables/ip.py:329 netbox/ipam/tables/services.py:44 +#: netbox/ipam/tables/ip.py:330 netbox/ipam/tables/services.py:44 #: netbox/templates/dcim/interface.html:108 #: netbox/templates/dcim/interface.html:366 #: netbox/templates/dcim/location.html:41 netbox/templates/dcim/region.html:37 @@ -3688,8 +3688,8 @@ msgstr "" #: netbox/ipam/forms/model_forms.py:480 netbox/ipam/forms/model_forms.py:494 #: netbox/ipam/models/ip.py:217 netbox/ipam/models/ip.py:498 #: netbox/ipam/models/ip.py:719 netbox/ipam/models/vrfs.py:61 -#: netbox/ipam/tables/ip.py:188 netbox/ipam/tables/ip.py:260 -#: netbox/ipam/tables/ip.py:311 netbox/ipam/tables/ip.py:401 +#: netbox/ipam/tables/ip.py:188 netbox/ipam/tables/ip.py:261 +#: netbox/ipam/tables/ip.py:312 netbox/ipam/tables/ip.py:402 #: netbox/templates/dcim/interface.html:152 #: netbox/templates/ipam/ipaddress.html:18 #: netbox/templates/ipam/iprange.html:40 netbox/templates/ipam/prefix.html:19 @@ -3698,7 +3698,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:243 #: netbox/virtualization/forms/bulk_import.py:177 #: netbox/virtualization/forms/filtersets.py:233 -#: netbox/virtualization/forms/model_forms.py:360 +#: netbox/virtualization/forms/model_forms.py:368 #: netbox/virtualization/models/virtualmachines.py:331 #: netbox/virtualization/tables/virtualmachines.py:113 msgid "VRF" @@ -3735,7 +3735,7 @@ msgstr "" #: netbox/dcim/models/device_components.py:568 #: netbox/ipam/forms/filtersets.py:489 netbox/ipam/forms/model_forms.py:704 #: netbox/templates/ipam/vlantranslationpolicy.html:11 -#: netbox/virtualization/forms/model_forms.py:365 +#: netbox/virtualization/forms/model_forms.py:373 msgid "VLAN Translation Policy" msgstr "" @@ -3777,7 +3777,7 @@ msgstr "" #: netbox/dcim/filtersets.py:1800 netbox/dcim/forms/model_forms.py:1415 #: netbox/virtualization/filtersets.py:279 -#: netbox/virtualization/forms/model_forms.py:303 +#: netbox/virtualization/forms/model_forms.py:311 msgid "Primary MAC address" msgstr "" @@ -4075,7 +4075,7 @@ msgstr "" #: netbox/templates/dcim/rack/base.html:4 #: netbox/templates/dcim/rackreservation.html:19 #: netbox/templates/dcim/rackreservation.html:36 -#: netbox/virtualization/forms/model_forms.py:112 +#: netbox/virtualization/forms/model_forms.py:113 msgid "Rack" msgstr "" @@ -4141,7 +4141,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_import.py:138 #: netbox/virtualization/forms/bulk_import.py:139 #: netbox/virtualization/forms/filtersets.py:193 -#: netbox/virtualization/forms/model_forms.py:214 +#: netbox/virtualization/forms/model_forms.py:222 msgid "Config template" msgstr "" @@ -4166,7 +4166,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_edit.py:142 #: netbox/virtualization/forms/bulk_import.py:128 #: netbox/virtualization/forms/filtersets.py:173 -#: netbox/virtualization/forms/model_forms.py:202 +#: netbox/virtualization/forms/model_forms.py:210 #: netbox/virtualization/tables/virtualmachines.py:49 msgid "Platform" msgstr "" @@ -4187,8 +4187,8 @@ msgstr "" #: netbox/virtualization/forms/filtersets.py:104 #: netbox/virtualization/forms/filtersets.py:128 #: netbox/virtualization/forms/filtersets.py:209 -#: netbox/virtualization/forms/model_forms.py:77 -#: netbox/virtualization/forms/model_forms.py:175 +#: netbox/virtualization/forms/model_forms.py:78 +#: netbox/virtualization/forms/model_forms.py:183 #: netbox/virtualization/tables/virtualmachines.py:37 msgid "Cluster" msgstr "" @@ -4381,21 +4381,21 @@ msgstr "" #: netbox/dcim/forms/bulk_edit.py:1493 netbox/dcim/forms/model_forms.py:1377 #: netbox/ipam/forms/bulk_import.py:174 netbox/ipam/forms/filtersets.py:539 #: netbox/ipam/models/vlans.py:86 netbox/virtualization/forms/bulk_edit.py:222 -#: netbox/virtualization/forms/model_forms.py:327 +#: netbox/virtualization/forms/model_forms.py:335 msgid "VLAN group" msgstr "" #: netbox/dcim/forms/bulk_edit.py:1502 netbox/dcim/forms/model_forms.py:1383 #: netbox/dcim/tables/devices.py:592 #: netbox/virtualization/forms/bulk_edit.py:230 -#: netbox/virtualization/forms/model_forms.py:332 +#: netbox/virtualization/forms/model_forms.py:340 msgid "Untagged VLAN" msgstr "" #: netbox/dcim/forms/bulk_edit.py:1511 netbox/dcim/forms/model_forms.py:1392 #: netbox/dcim/tables/devices.py:598 #: netbox/virtualization/forms/bulk_edit.py:238 -#: netbox/virtualization/forms/model_forms.py:341 +#: netbox/virtualization/forms/model_forms.py:349 msgid "Tagged VLANs" msgstr "" @@ -4408,7 +4408,7 @@ msgid "Remove tagged VLANs" msgstr "" #: netbox/dcim/forms/bulk_edit.py:1534 netbox/dcim/forms/model_forms.py:1401 -#: netbox/virtualization/forms/model_forms.py:350 +#: netbox/virtualization/forms/model_forms.py:358 msgid "Q-in-Q Service VLAN" msgstr "" @@ -4430,13 +4430,13 @@ msgstr "" #: netbox/templates/dcim/interface.html:128 #: netbox/templates/ipam/prefix.html:91 #: netbox/templates/virtualization/vminterface.html:70 -#: netbox/virtualization/forms/model_forms.py:370 +#: netbox/virtualization/forms/model_forms.py:378 msgid "Addressing" msgstr "" #: netbox/dcim/forms/bulk_edit.py:1564 netbox/dcim/forms/filtersets.py:721 #: netbox/dcim/forms/model_forms.py:1436 -#: netbox/virtualization/forms/model_forms.py:371 +#: netbox/virtualization/forms/model_forms.py:379 msgid "Operation" msgstr "" @@ -4448,13 +4448,13 @@ msgstr "" #: netbox/dcim/forms/bulk_edit.py:1566 netbox/dcim/forms/model_forms.py:1437 #: netbox/templates/dcim/interface.html:105 #: netbox/virtualization/forms/bulk_edit.py:249 -#: netbox/virtualization/forms/model_forms.py:372 +#: netbox/virtualization/forms/model_forms.py:380 msgid "Related Interfaces" msgstr "" #: netbox/dcim/forms/bulk_edit.py:1567 netbox/dcim/forms/model_forms.py:1441 #: netbox/virtualization/forms/bulk_edit.py:250 -#: netbox/virtualization/forms/model_forms.py:375 +#: netbox/virtualization/forms/model_forms.py:383 msgid "802.1Q Switching" msgstr "" @@ -4711,13 +4711,13 @@ msgstr "" #: netbox/dcim/forms/bulk_import.py:867 netbox/dcim/forms/model_forms.py:1339 #: netbox/virtualization/forms/bulk_import.py:161 -#: netbox/virtualization/forms/model_forms.py:311 +#: netbox/virtualization/forms/model_forms.py:319 msgid "Parent interface" msgstr "" #: netbox/dcim/forms/bulk_import.py:874 netbox/dcim/forms/model_forms.py:1347 #: netbox/virtualization/forms/bulk_import.py:168 -#: netbox/virtualization/forms/model_forms.py:319 +#: netbox/virtualization/forms/model_forms.py:327 msgid "Bridged interface" msgstr "" @@ -4844,7 +4844,7 @@ msgstr "" #: netbox/virtualization/forms/bulk_import.py:213 #: netbox/virtualization/forms/filtersets.py:217 #: netbox/virtualization/forms/filtersets.py:253 -#: netbox/virtualization/forms/model_forms.py:287 +#: netbox/virtualization/forms/model_forms.py:295 #: netbox/vpn/forms/bulk_import.py:93 netbox/vpn/forms/bulk_import.py:290 msgid "Virtual machine" msgstr "" @@ -5185,7 +5185,7 @@ msgstr "" #: netbox/templates/wireless/wirelesslan.html:26 #: netbox/virtualization/forms/bulk_edit.py:91 #: netbox/virtualization/forms/filtersets.py:46 -#: netbox/virtualization/forms/model_forms.py:78 +#: netbox/virtualization/forms/model_forms.py:79 #: netbox/virtualization/tables/clusters.py:80 #: netbox/wireless/forms/bulk_edit.py:93 netbox/wireless/forms/filtersets.py:37 #: netbox/wireless/forms/model_forms.py:56 @@ -5408,7 +5408,7 @@ msgstr "" #: netbox/templates/vpn/tunneltermination.html:25 #: netbox/virtualization/forms/filtersets.py:202 #: netbox/virtualization/forms/filtersets.py:247 -#: netbox/virtualization/forms/model_forms.py:219 +#: netbox/virtualization/forms/model_forms.py:227 #: netbox/virtualization/tables/virtualmachines.py:105 #: netbox/virtualization/tables/virtualmachines.py:161 netbox/vpn/choices.py:53 #: netbox/vpn/forms/filtersets.py:293 netbox/vpn/forms/model_forms.py:161 @@ -6786,43 +6786,43 @@ msgstr "" msgid "Assigned location must belong to parent site ({site})." msgstr "" -#: netbox/dcim/models/racks.py:383 +#: netbox/dcim/models/racks.py:387 #, python-brace-format msgid "" "Rack must be at least {min_height}U tall to house currently installed " "devices." msgstr "" -#: netbox/dcim/models/racks.py:391 +#: netbox/dcim/models/racks.py:396 #, python-brace-format msgid "" "Rack unit numbering must begin at {position} or less to house currently " "installed devices." msgstr "" -#: netbox/dcim/models/racks.py:399 +#: netbox/dcim/models/racks.py:404 #, python-brace-format msgid "Location must be from the same site, {site}." msgstr "" -#: netbox/dcim/models/racks.py:661 +#: netbox/dcim/models/racks.py:666 msgid "units" msgstr "" -#: netbox/dcim/models/racks.py:687 +#: netbox/dcim/models/racks.py:692 msgid "rack reservation" msgstr "" -#: netbox/dcim/models/racks.py:688 +#: netbox/dcim/models/racks.py:693 msgid "rack reservations" msgstr "" -#: netbox/dcim/models/racks.py:702 +#: netbox/dcim/models/racks.py:707 #, python-brace-format msgid "Invalid unit(s) for {height}U rack: {unit_list}" msgstr "" -#: netbox/dcim/models/racks.py:715 +#: netbox/dcim/models/racks.py:720 #, python-brace-format msgid "The following units have already been reserved: {unit_list}" msgstr "" @@ -6967,14 +6967,14 @@ msgstr "" #: netbox/dcim/tables/sites.py:148 netbox/extras/tables/tables.py:545 #: netbox/netbox/navigation/menu.py:69 netbox/netbox/navigation/menu.py:73 #: netbox/netbox/navigation/menu.py:75 -#: netbox/virtualization/forms/model_forms.py:121 -#: netbox/virtualization/tables/clusters.py:86 +#: netbox/virtualization/forms/model_forms.py:122 +#: netbox/virtualization/tables/clusters.py:87 #: netbox/virtualization/views.py:218 msgid "Devices" msgstr "" #: netbox/dcim/tables/devices.py:74 netbox/dcim/tables/devices.py:122 -#: netbox/virtualization/tables/clusters.py:91 +#: netbox/virtualization/tables/clusters.py:92 msgid "VMs" msgstr "" @@ -6994,8 +6994,8 @@ msgstr "" #: netbox/dcim/tables/devices.py:197 netbox/dcim/tables/devices.py:1099 #: netbox/ipam/forms/bulk_import.py:562 netbox/ipam/forms/model_forms.py:308 -#: netbox/ipam/forms/model_forms.py:321 netbox/ipam/tables/ip.py:307 -#: netbox/ipam/tables/ip.py:374 netbox/ipam/tables/ip.py:397 +#: netbox/ipam/forms/model_forms.py:321 netbox/ipam/tables/ip.py:308 +#: netbox/ipam/tables/ip.py:375 netbox/ipam/tables/ip.py:398 #: netbox/templates/ipam/ipaddress.html:11 #: netbox/virtualization/tables/virtualmachines.py:65 msgid "IP Address" @@ -7058,7 +7058,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine/base.html:27 #: netbox/templates/virtualization/virtualmachine_list.html:14 #: netbox/virtualization/tables/virtualmachines.py:71 -#: netbox/virtualization/views.py:383 netbox/wireless/tables/wirelesslan.py:62 +#: netbox/virtualization/views.py:383 netbox/wireless/tables/wirelesslan.py:63 msgid "Interfaces" msgstr "" @@ -7369,7 +7369,7 @@ msgstr "" #: netbox/dcim/views.py:2250 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 -#: netbox/virtualization/forms/model_forms.py:224 +#: netbox/virtualization/forms/model_forms.py:232 #: netbox/virtualization/views.py:424 msgid "Config Context" msgstr "" @@ -9650,7 +9650,7 @@ msgid "Date added" msgstr "" #: netbox/ipam/forms/bulk_edit.py:213 netbox/ipam/forms/model_forms.py:621 -#: netbox/ipam/forms/model_forms.py:668 netbox/ipam/tables/ip.py:200 +#: netbox/ipam/forms/model_forms.py:668 netbox/ipam/tables/ip.py:201 #: netbox/templates/ipam/vlan_edit.html:45 #: netbox/templates/ipam/vlangroup.html:27 msgid "VLAN Group" @@ -9658,7 +9658,7 @@ msgstr "" #: netbox/ipam/forms/bulk_edit.py:218 netbox/ipam/forms/bulk_import.py:181 #: netbox/ipam/forms/filtersets.py:259 netbox/ipam/forms/model_forms.py:217 -#: netbox/ipam/models/vlans.py:272 netbox/ipam/tables/ip.py:205 +#: netbox/ipam/models/vlans.py:272 netbox/ipam/tables/ip.py:206 #: netbox/templates/ipam/prefix.html:56 netbox/templates/ipam/vlan.html:12 #: netbox/templates/ipam/vlan/base.html:6 #: netbox/templates/ipam/vlan_edit.html:10 @@ -10516,8 +10516,8 @@ msgstr "" msgid "Prefixes" msgstr "" -#: netbox/ipam/tables/ip.py:77 netbox/ipam/tables/ip.py:220 -#: netbox/ipam/tables/ip.py:275 netbox/ipam/tables/vlans.py:55 +#: netbox/ipam/tables/ip.py:77 netbox/ipam/tables/ip.py:221 +#: netbox/ipam/tables/ip.py:276 netbox/ipam/tables/vlans.py:55 #: netbox/templates/dcim/device.html:260 #: netbox/templates/ipam/aggregate.html:24 #: netbox/templates/ipam/iprange.html:29 netbox/templates/ipam/prefix.html:102 @@ -10542,31 +10542,31 @@ msgstr "" msgid "Scope Type" msgstr "" -#: netbox/ipam/tables/ip.py:212 +#: netbox/ipam/tables/ip.py:213 msgid "Pool" msgstr "" -#: netbox/ipam/tables/ip.py:216 netbox/ipam/tables/ip.py:271 +#: netbox/ipam/tables/ip.py:217 netbox/ipam/tables/ip.py:272 msgid "Marked Utilized" msgstr "" -#: netbox/ipam/tables/ip.py:255 +#: netbox/ipam/tables/ip.py:256 msgid "Start address" msgstr "" -#: netbox/ipam/tables/ip.py:334 +#: netbox/ipam/tables/ip.py:335 msgid "NAT (Inside)" msgstr "" -#: netbox/ipam/tables/ip.py:339 +#: netbox/ipam/tables/ip.py:340 msgid "NAT (Outside)" msgstr "" -#: netbox/ipam/tables/ip.py:344 +#: netbox/ipam/tables/ip.py:345 msgid "Assigned" msgstr "" -#: netbox/ipam/tables/ip.py:380 netbox/templates/vpn/l2vpntermination.html:16 +#: netbox/ipam/tables/ip.py:381 netbox/templates/vpn/l2vpntermination.html:16 #: netbox/vpn/forms/filtersets.py:240 msgid "Assigned Object" msgstr "" @@ -11582,63 +11582,63 @@ msgstr "" msgid "Cannot delete stores from registry" msgstr "" -#: netbox/netbox/settings.py:742 +#: netbox/netbox/settings.py:752 msgid "Czech" msgstr "" -#: netbox/netbox/settings.py:743 +#: netbox/netbox/settings.py:753 msgid "Danish" msgstr "" -#: netbox/netbox/settings.py:744 +#: netbox/netbox/settings.py:754 msgid "German" msgstr "" -#: netbox/netbox/settings.py:745 +#: netbox/netbox/settings.py:755 msgid "English" msgstr "" -#: netbox/netbox/settings.py:746 +#: netbox/netbox/settings.py:756 msgid "Spanish" msgstr "" -#: netbox/netbox/settings.py:747 +#: netbox/netbox/settings.py:757 msgid "French" msgstr "" -#: netbox/netbox/settings.py:748 +#: netbox/netbox/settings.py:758 msgid "Italian" msgstr "" -#: netbox/netbox/settings.py:749 +#: netbox/netbox/settings.py:759 msgid "Japanese" msgstr "" -#: netbox/netbox/settings.py:750 +#: netbox/netbox/settings.py:760 msgid "Dutch" msgstr "" -#: netbox/netbox/settings.py:751 +#: netbox/netbox/settings.py:761 msgid "Polish" msgstr "" -#: netbox/netbox/settings.py:752 +#: netbox/netbox/settings.py:762 msgid "Portuguese" msgstr "" -#: netbox/netbox/settings.py:753 +#: netbox/netbox/settings.py:763 msgid "Russian" msgstr "" -#: netbox/netbox/settings.py:754 +#: netbox/netbox/settings.py:764 msgid "Turkish" msgstr "" -#: netbox/netbox/settings.py:755 +#: netbox/netbox/settings.py:765 msgid "Ukrainian" msgstr "" -#: netbox/netbox/settings.py:756 +#: netbox/netbox/settings.py:766 msgid "Chinese" msgstr "" @@ -12709,7 +12709,7 @@ msgstr "" #: netbox/templates/dcim/device.html:175 #: netbox/templates/dcim/device_edit.html:64 -#: netbox/virtualization/forms/model_forms.py:222 +#: netbox/virtualization/forms/model_forms.py:230 msgid "Management" msgstr "" @@ -13051,7 +13051,7 @@ msgstr "" #: netbox/templates/dcim/interface.html:81 #: netbox/templates/virtualization/vminterface.html:55 -#: netbox/virtualization/forms/model_forms.py:387 +#: netbox/virtualization/forms/model_forms.py:395 msgid "802.1Q Mode" msgstr "" @@ -14478,13 +14478,13 @@ msgid "Add Cluster" msgstr "" #: netbox/templates/virtualization/clustergroup.html:19 -#: netbox/virtualization/forms/model_forms.py:52 +#: netbox/virtualization/forms/model_forms.py:53 msgid "Cluster Group" msgstr "" #: netbox/templates/virtualization/clustertype.html:19 #: netbox/templates/virtualization/virtualmachine.html:110 -#: netbox/virtualization/forms/model_forms.py:38 +#: netbox/virtualization/forms/model_forms.py:39 msgid "Cluster Type" msgstr "" @@ -14494,7 +14494,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine.html:122 #: netbox/virtualization/forms/bulk_edit.py:172 -#: netbox/virtualization/forms/model_forms.py:223 +#: netbox/virtualization/forms/model_forms.py:231 msgid "Resources" msgstr "" @@ -15531,26 +15531,26 @@ msgstr "" msgid "Serial number" msgstr "" -#: netbox/virtualization/forms/model_forms.py:152 +#: netbox/virtualization/forms/model_forms.py:158 #, python-brace-format msgid "" -"{device} belongs to a different site ({device_site}) than the cluster " -"({cluster_site})" +"{device} belongs to a different {scope_field} ({device_scope}) than the " +"cluster ({cluster_scope})" msgstr "" -#: netbox/virtualization/forms/model_forms.py:191 +#: netbox/virtualization/forms/model_forms.py:199 msgid "Optionally pin this VM to a specific host device within the cluster" msgstr "" -#: netbox/virtualization/forms/model_forms.py:220 +#: netbox/virtualization/forms/model_forms.py:228 msgid "Site/Cluster" msgstr "" -#: netbox/virtualization/forms/model_forms.py:243 +#: netbox/virtualization/forms/model_forms.py:251 msgid "Disk size is managed via the attachment of virtual disks." msgstr "" -#: netbox/virtualization/forms/model_forms.py:397 +#: netbox/virtualization/forms/model_forms.py:405 #: netbox/virtualization/tables/virtualmachines.py:81 msgid "Disk" msgstr "" From 51a79505fe10b0599b47eacced2f31622dbc9606 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 20 Jan 2025 22:21:36 -0600 Subject: [PATCH 110/190] Fixes: #18433 - Fix missing is_primary property on MACAddress model --- netbox/dcim/models/devices.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index dbcd91ea0..49fd46d23 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1522,3 +1522,10 @@ class MACAddress(PrimaryModel): def __str__(self): return str(self.mac_address) + + @property + def is_primary(self): + if self.assigned_object and hasattr(self.assigned_object, 'primary_mac_address'): + if self.assigned_object.primary_mac_address and self.assigned_object.primary_mac_address.pk == self.pk: + return True + return False From 277acd3a3198da87f4e87816bf497be6b66e528e Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 20 Jan 2025 22:49:55 -0600 Subject: [PATCH 111/190] Fixes: #18436 - Prevent unassigning mac address when primary on an interface --- netbox/dcim/models/devices.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index dbcd91ea0..d202d5d9e 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -15,6 +15,7 @@ from django.urls import reverse from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ +from core.models import ObjectType from dcim.choices import * from dcim.constants import * from dcim.fields import MACAddressField @@ -1522,3 +1523,26 @@ class MACAddress(PrimaryModel): def __str__(self): return str(self.mac_address) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Denote the original assigned object (if any) for validation in clean() + self._original_assigned_object_id = self.__dict__.get('assigned_object_id') + self._original_assigned_object_type_id = self.__dict__.get('assigned_object_type_id') + + def clean(self, *args, **kwargs): + super().clean() + if self._original_assigned_object_id and self._original_assigned_object_type_id: + assigned_object = getattr(self.assigned_object, 'parent_object', None) + ct = ObjectType.objects.get_for_id(self._original_assigned_object_type_id) + original_assigned_object = ct.get_object_for_this_type(pk=self._original_assigned_object_id) + + if original_assigned_object and not assigned_object: + raise ValidationError( + _("Cannot unassign MAC Address while it is designated as the primary MAC for an object") + ) + elif original_assigned_object and original_assigned_object != assigned_object: + raise ValidationError( + _("Cannot reassign MAC Address while it is designated as the primary MAC for an object") + ) From 22e320084a9906159fdf2770a3c951cd80fc782b Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 20 Jan 2025 23:06:29 -0600 Subject: [PATCH 112/190] Update UI to disable interface assignment when assigned as primary --- netbox/dcim/forms/model_forms.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index 9bc69e991..5a3a27d25 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -1810,6 +1810,11 @@ class MACAddressForm(NetBoxModelForm): super().__init__(*args, **kwargs) + if instance and instance.assigned_object and instance.assigned_object.primary_mac_address: + if instance.assigned_object.primary_mac_address.pk == instance.pk: + self.fields['interface'].disabled = True + self.fields['vminterface'].disabled = True + def clean(self): super().clean() From bec97df2426e95987959713670eb9debbb3669cf Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Mon, 20 Jan 2025 23:44:36 -0600 Subject: [PATCH 113/190] Fix Tests --- netbox/dcim/models/devices.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index d202d5d9e..6ef5ab488 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1534,15 +1534,16 @@ class MACAddress(PrimaryModel): def clean(self, *args, **kwargs): super().clean() if self._original_assigned_object_id and self._original_assigned_object_type_id: - assigned_object = getattr(self.assigned_object, 'parent_object', None) + assigned_object = self.assigned_object ct = ObjectType.objects.get_for_id(self._original_assigned_object_type_id) original_assigned_object = ct.get_object_for_this_type(pk=self._original_assigned_object_id) - if original_assigned_object and not assigned_object: - raise ValidationError( - _("Cannot unassign MAC Address while it is designated as the primary MAC for an object") - ) - elif original_assigned_object and original_assigned_object != assigned_object: - raise ValidationError( - _("Cannot reassign MAC Address while it is designated as the primary MAC for an object") - ) + if original_assigned_object.primary_mac_address: + if not assigned_object: + raise ValidationError( + _("Cannot unassign MAC Address while it is designated as the primary MAC for an object") + ) + elif original_assigned_object != assigned_object: + raise ValidationError( + _("Cannot reassign MAC Address while it is designated as the primary MAC for an object") + ) From b91366129783d34b474d36e5dbf65e0d09016983 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 20 Jan 2025 14:34:20 -0500 Subject: [PATCH 114/190] Fixes #18438: Specify batch_size for migrations which run bulk_update() --- .../migrations/0048_circuitterminations_cached_relations.py | 3 +-- netbox/ipam/migrations/0072_prefix_cached_relations.py | 2 +- .../migrations/0045_clusters_cached_relations.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py index fc1cef0e5..9be254d54 100644 --- a/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py +++ b/netbox/circuits/migrations/0048_circuitterminations_cached_relations.py @@ -1,4 +1,3 @@ -# Generated by Django 5.0.9 on 2024-10-21 17:34 import django.db.models.deletion from django.db import migrations, models @@ -16,7 +15,7 @@ def populate_denormalized_fields(apps, schema_editor): termination._site_id = termination.site_id # Note: Location cannot be set prior to migration - CircuitTermination.objects.bulk_update(terminations, ['_region', '_site_group', '_site']) + CircuitTermination.objects.bulk_update(terminations, ['_region', '_site_group', '_site'], batch_size=100) class Migration(migrations.Migration): diff --git a/netbox/ipam/migrations/0072_prefix_cached_relations.py b/netbox/ipam/migrations/0072_prefix_cached_relations.py index e4a789704..58cefb12d 100644 --- a/netbox/ipam/migrations/0072_prefix_cached_relations.py +++ b/netbox/ipam/migrations/0072_prefix_cached_relations.py @@ -15,7 +15,7 @@ def populate_denormalized_fields(apps, schema_editor): prefix._site_id = prefix.site_id # Note: Location cannot be set prior to migration - Prefix.objects.bulk_update(prefixes, ['_region', '_site_group', '_site']) + Prefix.objects.bulk_update(prefixes, ['_region', '_site_group', '_site'], batch_size=100) class Migration(migrations.Migration): diff --git a/netbox/virtualization/migrations/0045_clusters_cached_relations.py b/netbox/virtualization/migrations/0045_clusters_cached_relations.py index 6d0c8ff33..9918bf594 100644 --- a/netbox/virtualization/migrations/0045_clusters_cached_relations.py +++ b/netbox/virtualization/migrations/0045_clusters_cached_relations.py @@ -15,7 +15,7 @@ def populate_denormalized_fields(apps, schema_editor): cluster._site_id = cluster.site_id # Note: Location cannot be set prior to migration - Cluster.objects.bulk_update(clusters, ['_region', '_site_group', '_site']) + Cluster.objects.bulk_update(clusters, ['_region', '_site_group', '_site'], batch_size=100) class Migration(migrations.Migration): From d1914595f6f30e8fa45e873ec1fa88998e8d89f0 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 21 Jan 2025 10:15:33 -0600 Subject: [PATCH 115/190] Fixes: #18447 - Fix sorting by `mac_address` field * Disable sorting by `mac_address` for legacy `mac_address` field for Device and VM Interfaces * Ensure `primary_mac_address` field is included in field list for Device and VM Interfaces --- netbox/dcim/tables/devices.py | 12 ++++++++---- netbox/virtualization/tables/virtualmachines.py | 8 ++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 087132331..4949bec82 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -697,6 +697,10 @@ class DeviceInterfaceTable(InterfaceTable): linkify=True, verbose_name=_('LAG') ) + mac_address = tables.Column( + verbose_name=_('MAC Address'), + orderable=False, + ) actions = columns.ActionsColumn( extra_buttons=INTERFACE_BUTTONS ) @@ -705,10 +709,10 @@ class DeviceInterfaceTable(InterfaceTable): model = models.Interface fields = ( 'pk', 'id', 'name', 'module_bay', 'module', 'label', 'enabled', 'type', 'parent', 'bridge', 'lag', - 'mgmt_only', 'mtu', 'mode', 'mac_address', 'wwn', 'rf_role', 'rf_channel', 'rf_channel_frequency', - 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', 'cable_color', 'wireless_link', - 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', - 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', + 'mgmt_only', 'mtu', 'mode', 'mac_address', 'primary_mac_address', 'wwn', 'rf_role', 'rf_channel', + 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', + 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', + 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', ) default_columns = ( 'pk', 'name', 'label', 'enabled', 'type', 'parent', 'lag', 'mtu', 'mode', 'description', 'ip_addresses', diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 116051037..c6fb6cb86 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -113,6 +113,10 @@ class VMInterfaceTable(BaseInterfaceTable): verbose_name=_('VRF'), linkify=True ) + mac_address = tables.Column( + verbose_name=_('MAC Address'), + orderable=False, + ) tags = columns.TagColumn( url_name='virtualization:vminterface_list' ) @@ -120,8 +124,8 @@ class VMInterfaceTable(BaseInterfaceTable): class Meta(NetBoxTable.Meta): model = VMInterface fields = ( - 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags', - 'vrf', 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', + 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mtu', 'mode', 'description', 'tags', 'vrf', + 'mac_address', 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'description') From c56a39a1687a7e4787e31f8d7694c81b2acc1e80 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 21 Jan 2025 10:44:46 -0600 Subject: [PATCH 116/190] Fixes: #18449 - Clean up some formatting errors --- netbox/dcim/base_filtersets.py | 8 ++++---- netbox/dcim/filtersets.py | 4 ++-- netbox/extras/tests/test_customfields.py | 4 ++-- netbox/ipam/models/vlans.py | 4 ++-- netbox/virtualization/forms/model_forms.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/netbox/dcim/base_filtersets.py b/netbox/dcim/base_filtersets.py index c007c0120..df2a6b650 100644 --- a/netbox/dcim/base_filtersets.py +++ b/netbox/dcim/base_filtersets.py @@ -53,10 +53,10 @@ class ScopedFilterSet(BaseFilterSet): label=_('Site (slug)'), ) location_id = TreeNodeMultipleChoiceFilter( - queryset=Location.objects.all(), - field_name='_location', - lookup_expr='in', - label=_('Location (ID)'), + queryset=Location.objects.all(), + field_name='_location', + lookup_expr='in', + label=_('Location (ID)'), ) location = TreeNodeMultipleChoiceFilter( queryset=Location.objects.all(), diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index 90a9993c2..60c3c4d38 100644 --- a/netbox/dcim/filtersets.py +++ b/netbox/dcim/filtersets.py @@ -1652,8 +1652,8 @@ class MACAddressFilterSet(NetBoxModelFilterSet): if not value.strip(): return queryset qs_filter = ( - Q(mac_address__icontains=value) | - Q(description__icontains=value) + Q(mac_address__icontains=value) | + Q(description__icontains=value) ) return queryset.filter(qs_filter) diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index d36477da8..8bae8dfc9 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -660,8 +660,8 @@ class CustomFieldAPITest(APITestCase): CustomField( type=CustomFieldTypeChoices.TYPE_BOOLEAN, name='boolean_field', - default=False) - , + default=False + ), CustomField( type=CustomFieldTypeChoices.TYPE_DATE, name='date_field', diff --git a/netbox/ipam/models/vlans.py b/netbox/ipam/models/vlans.py index 4c7f191c9..91e39c6d3 100644 --- a/netbox/ipam/models/vlans.py +++ b/netbox/ipam/models/vlans.py @@ -361,7 +361,7 @@ class VLANTranslationRule(NetBoxModel): ) local_vid = models.PositiveSmallIntegerField( verbose_name=_('Local VLAN ID'), - validators=( + validators=( MinValueValidator(VLAN_VID_MIN), MaxValueValidator(VLAN_VID_MAX) ), @@ -369,7 +369,7 @@ class VLANTranslationRule(NetBoxModel): ) remote_vid = models.PositiveSmallIntegerField( verbose_name=_('Remote VLAN ID'), - validators=( + validators=( MinValueValidator(VLAN_VID_MIN), MaxValueValidator(VLAN_VID_MAX) ), diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index 9d53c9382..291d6dbe8 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -150,8 +150,8 @@ class ClusterAddDevicesForm(forms.Form): for scope_field in ['site', 'location']: device_scope = getattr(device, scope_field) if ( - self.cluster.scope_type.model_class() == apps.get_model('dcim', scope_field) - and device_scope != self.cluster.scope + self.cluster.scope_type.model_class() == apps.get_model('dcim', scope_field) and + device_scope != self.cluster.scope ): raise ValidationError({ 'devices': _( From ad4e4e89a7a0124beaa5776ae8c4a459258d2336 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 21 Jan 2025 11:15:33 -0600 Subject: [PATCH 117/190] Update `VirtualMachineVMInterfaceTable` --- netbox/virtualization/tables/virtualmachines.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index c6fb6cb86..87296ce0d 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -148,11 +148,11 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): class Meta(NetBoxTable.Meta): model = VMInterface fields = ( - 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'mac_address', 'mtu', 'mode', 'description', 'tags', - 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', - 'actions', + 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'mac_address', 'primary_mac_address', 'mtu', 'mode', + 'description', 'tags', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', + 'tagged_vlans', 'qinq_svlan', 'actions', ) - default_columns = ('pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'ip_addresses') + default_columns = ('pk', 'name', 'enabled', 'primary_mac_address', 'mtu', 'mode', 'description', 'ip_addresses') row_attrs = { 'data-name': lambda record: record.name, 'data-virtual': lambda record: "true", From adcb6bebd2d5f35de33a698b4b765645aa0a0314 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Wed, 22 Jan 2025 14:14:56 -0600 Subject: [PATCH 118/190] Remove `mac_address` from tables. --- netbox/dcim/tables/devices.py | 12 ++++-------- netbox/virtualization/tables/virtualmachines.py | 14 +++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 4949bec82..d4f2f74b3 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -697,10 +697,6 @@ class DeviceInterfaceTable(InterfaceTable): linkify=True, verbose_name=_('LAG') ) - mac_address = tables.Column( - verbose_name=_('MAC Address'), - orderable=False, - ) actions = columns.ActionsColumn( extra_buttons=INTERFACE_BUTTONS ) @@ -709,10 +705,10 @@ class DeviceInterfaceTable(InterfaceTable): model = models.Interface fields = ( 'pk', 'id', 'name', 'module_bay', 'module', 'label', 'enabled', 'type', 'parent', 'bridge', 'lag', - 'mgmt_only', 'mtu', 'mode', 'mac_address', 'primary_mac_address', 'wwn', 'rf_role', 'rf_channel', - 'rf_channel_frequency', 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', - 'cable_color', 'wireless_link', 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', - 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', + 'mgmt_only', 'mtu', 'mode', 'primary_mac_address', 'wwn', 'rf_role', 'rf_channel', 'rf_channel_frequency', + 'rf_channel_width', 'tx_power', 'description', 'mark_connected', 'cable', 'cable_color', 'wireless_link', + 'wireless_lans', 'link_peer', 'connection', 'tags', 'vdcs', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', + 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', 'qinq_svlan', 'actions', ) default_columns = ( 'pk', 'name', 'label', 'enabled', 'type', 'parent', 'lag', 'mtu', 'mode', 'description', 'ip_addresses', diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index 87296ce0d..335d1de7d 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -113,10 +113,6 @@ class VMInterfaceTable(BaseInterfaceTable): verbose_name=_('VRF'), linkify=True ) - mac_address = tables.Column( - verbose_name=_('MAC Address'), - orderable=False, - ) tags = columns.TagColumn( url_name='virtualization:vminterface_list' ) @@ -125,8 +121,8 @@ class VMInterfaceTable(BaseInterfaceTable): model = VMInterface fields = ( 'pk', 'id', 'name', 'virtual_machine', 'enabled', 'mtu', 'mode', 'description', 'tags', 'vrf', - 'mac_address', 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', - 'tagged_vlans', 'qinq_svlan', 'created', 'last_updated', + 'primary_mac_address', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', + 'qinq_svlan', 'created', 'last_updated', ) default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'description') @@ -148,9 +144,9 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): class Meta(NetBoxTable.Meta): model = VMInterface fields = ( - 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'mac_address', 'primary_mac_address', 'mtu', 'mode', - 'description', 'tags', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', - 'tagged_vlans', 'qinq_svlan', 'actions', + 'pk', 'id', 'name', 'enabled', 'parent', 'bridge', 'primary_mac_address', 'mtu', 'mode', 'description', + 'tags', 'vrf', 'l2vpn', 'tunnel', 'ip_addresses', 'fhrp_groups', 'untagged_vlan', 'tagged_vlans', + 'qinq_svlan', 'actions', ) default_columns = ('pk', 'name', 'enabled', 'primary_mac_address', 'mtu', 'mode', 'description', 'ip_addresses') row_attrs = { From 32196092536abc6c8141ad5c3aa974f14922674a Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Thu, 23 Jan 2025 18:30:54 -0600 Subject: [PATCH 119/190] Change to `@cached_property` --- netbox/dcim/models/devices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 49fd46d23..87a87c90b 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1523,7 +1523,7 @@ class MACAddress(PrimaryModel): def __str__(self): return str(self.mac_address) - @property + @cached_property def is_primary(self): if self.assigned_object and hasattr(self.assigned_object, 'primary_mac_address'): if self.assigned_object.primary_mac_address and self.assigned_object.primary_mac_address.pk == self.pk: From da9b4523276a3e8a644ffa718ec91cda0421a581 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 05:02:20 +0000 Subject: [PATCH 120/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 204 ++++++++++--------- 1 file changed, 108 insertions(+), 96 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 6b0b5e1d0..d63e1dd34 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-18 05:01+0000\n" +"POT-Creation-Date: 2025-01-24 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1402,7 +1402,7 @@ msgstr "" #: netbox/dcim/models/device_components.py:1024 #: netbox/dcim/models/device_components.py:1095 #: netbox/dcim/models/device_components.py:1241 -#: netbox/dcim/models/devices.py:477 netbox/dcim/models/racks.py:221 +#: netbox/dcim/models/devices.py:478 netbox/dcim/models/racks.py:221 #: netbox/extras/models/tags.py:28 msgid "color" msgstr "" @@ -1429,8 +1429,8 @@ msgstr "" #: netbox/circuits/models/virtual_circuits.py:59 netbox/core/models/data.py:52 #: netbox/core/models/jobs.py:85 netbox/dcim/models/cables.py:49 #: netbox/dcim/models/device_components.py:1281 -#: netbox/dcim/models/devices.py:644 netbox/dcim/models/devices.py:1176 -#: netbox/dcim/models/devices.py:1403 netbox/dcim/models/power.py:94 +#: netbox/dcim/models/devices.py:645 netbox/dcim/models/devices.py:1177 +#: netbox/dcim/models/devices.py:1404 netbox/dcim/models/power.py:94 #: netbox/dcim/models/racks.py:288 netbox/dcim/models/sites.py:154 #: netbox/dcim/models/sites.py:270 netbox/ipam/models/ip.py:237 #: netbox/ipam/models/ip.py:508 netbox/ipam/models/ip.py:729 @@ -1560,8 +1560,8 @@ msgstr "" #: netbox/circuits/models/providers.py:98 netbox/core/models/data.py:39 #: netbox/core/models/jobs.py:46 #: netbox/dcim/models/device_component_templates.py:43 -#: netbox/dcim/models/device_components.py:52 netbox/dcim/models/devices.py:588 -#: netbox/dcim/models/devices.py:1335 netbox/dcim/models/devices.py:1398 +#: netbox/dcim/models/device_components.py:52 netbox/dcim/models/devices.py:589 +#: netbox/dcim/models/devices.py:1336 netbox/dcim/models/devices.py:1399 #: netbox/dcim/models/power.py:38 netbox/dcim/models/power.py:89 #: netbox/dcim/models/racks.py:257 netbox/dcim/models/sites.py:142 #: netbox/extras/models/configs.py:36 netbox/extras/models/configs.py:215 @@ -1593,7 +1593,7 @@ msgstr "" msgid "Full name of the provider" msgstr "" -#: netbox/circuits/models/providers.py:28 netbox/dcim/models/devices.py:87 +#: netbox/circuits/models/providers.py:28 netbox/dcim/models/devices.py:88 #: netbox/dcim/models/racks.py:137 netbox/dcim/models/sites.py:149 #: netbox/extras/models/models.py:506 netbox/ipam/models/asns.py:23 #: netbox/ipam/models/vlans.py:42 netbox/netbox/models/__init__.py:145 @@ -3532,7 +3532,7 @@ msgstr "" #: netbox/dcim/filtersets.py:1104 netbox/dcim/forms/filtersets.py:819 #: netbox/dcim/forms/filtersets.py:1390 netbox/dcim/forms/filtersets.py:1586 #: netbox/dcim/forms/filtersets.py:1591 netbox/dcim/forms/model_forms.py:1762 -#: netbox/dcim/models/devices.py:1499 netbox/dcim/models/devices.py:1520 +#: netbox/dcim/models/devices.py:1500 netbox/dcim/models/devices.py:1521 #: netbox/virtualization/filtersets.py:196 #: netbox/virtualization/filtersets.py:268 #: netbox/virtualization/forms/filtersets.py:177 @@ -4125,7 +4125,7 @@ msgstr "" msgid "Chassis" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:619 netbox/dcim/models/devices.py:482 +#: netbox/dcim/forms/bulk_edit.py:619 netbox/dcim/models/devices.py:483 #: netbox/dcim/tables/devices.py:78 msgid "VM role" msgstr "" @@ -5234,7 +5234,7 @@ msgstr "" msgid "Device Role" msgstr "" -#: netbox/dcim/forms/model_forms.py:500 netbox/dcim/models/devices.py:634 +#: netbox/dcim/forms/model_forms.py:500 netbox/dcim/models/devices.py:635 msgid "The lowest-numbered unit occupied by the device" msgstr "" @@ -5417,7 +5417,7 @@ msgstr "" msgid "Virtual Machine" msgstr "" -#: netbox/dcim/forms/model_forms.py:1822 +#: netbox/dcim/forms/model_forms.py:1827 msgid "A MAC address can only be assigned to a single object." msgstr "" @@ -6139,7 +6139,7 @@ msgid "module bays" msgstr "" #: netbox/dcim/models/device_components.py:1178 -#: netbox/dcim/models/devices.py:1224 +#: netbox/dcim/models/devices.py:1225 msgid "A module bay cannot belong to a module installed within it." msgstr "" @@ -6175,14 +6175,14 @@ msgid "inventory item roles" msgstr "" #: netbox/dcim/models/device_components.py:1308 -#: netbox/dcim/models/devices.py:597 netbox/dcim/models/devices.py:1184 +#: netbox/dcim/models/devices.py:598 netbox/dcim/models/devices.py:1185 #: netbox/dcim/models/racks.py:304 #: netbox/virtualization/models/virtualmachines.py:126 msgid "serial number" msgstr "" #: netbox/dcim/models/device_components.py:1316 -#: netbox/dcim/models/devices.py:605 netbox/dcim/models/devices.py:1191 +#: netbox/dcim/models/devices.py:606 netbox/dcim/models/devices.py:1192 #: netbox/dcim/models/racks.py:311 msgid "asset tag" msgstr "" @@ -6223,377 +6223,389 @@ msgstr "" msgid "Cannot assign inventory item to component on another device" msgstr "" -#: netbox/dcim/models/devices.py:58 +#: netbox/dcim/models/devices.py:59 msgid "manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:59 +#: netbox/dcim/models/devices.py:60 msgid "manufacturers" msgstr "" -#: netbox/dcim/models/devices.py:83 netbox/dcim/models/devices.py:382 +#: netbox/dcim/models/devices.py:84 netbox/dcim/models/devices.py:383 #: netbox/dcim/models/racks.py:133 msgid "model" msgstr "" -#: netbox/dcim/models/devices.py:96 +#: netbox/dcim/models/devices.py:97 msgid "default platform" msgstr "" -#: netbox/dcim/models/devices.py:99 netbox/dcim/models/devices.py:386 +#: netbox/dcim/models/devices.py:100 netbox/dcim/models/devices.py:387 msgid "part number" msgstr "" -#: netbox/dcim/models/devices.py:102 netbox/dcim/models/devices.py:389 +#: netbox/dcim/models/devices.py:103 netbox/dcim/models/devices.py:390 msgid "Discrete part number (optional)" msgstr "" -#: netbox/dcim/models/devices.py:108 netbox/dcim/models/racks.py:53 +#: netbox/dcim/models/devices.py:109 netbox/dcim/models/racks.py:53 msgid "height (U)" msgstr "" -#: netbox/dcim/models/devices.py:112 +#: netbox/dcim/models/devices.py:113 msgid "exclude from utilization" msgstr "" -#: netbox/dcim/models/devices.py:113 +#: netbox/dcim/models/devices.py:114 msgid "Devices of this type are excluded when calculating rack utilization." msgstr "" -#: netbox/dcim/models/devices.py:117 +#: netbox/dcim/models/devices.py:118 msgid "is full depth" msgstr "" -#: netbox/dcim/models/devices.py:118 +#: netbox/dcim/models/devices.py:119 msgid "Device consumes both front and rear rack faces." msgstr "" -#: netbox/dcim/models/devices.py:125 +#: netbox/dcim/models/devices.py:126 msgid "parent/child status" msgstr "" -#: netbox/dcim/models/devices.py:126 +#: netbox/dcim/models/devices.py:127 msgid "" "Parent devices house child devices in device bays. Leave blank if this " "device type is neither a parent nor a child." msgstr "" -#: netbox/dcim/models/devices.py:130 netbox/dcim/models/devices.py:392 -#: netbox/dcim/models/devices.py:650 netbox/dcim/models/racks.py:315 +#: netbox/dcim/models/devices.py:131 netbox/dcim/models/devices.py:393 +#: netbox/dcim/models/devices.py:651 netbox/dcim/models/racks.py:315 msgid "airflow" msgstr "" -#: netbox/dcim/models/devices.py:207 +#: netbox/dcim/models/devices.py:208 msgid "device type" msgstr "" -#: netbox/dcim/models/devices.py:208 +#: netbox/dcim/models/devices.py:209 msgid "device types" msgstr "" -#: netbox/dcim/models/devices.py:290 +#: netbox/dcim/models/devices.py:291 msgid "U height must be in increments of 0.5 rack units." msgstr "" -#: netbox/dcim/models/devices.py:307 +#: netbox/dcim/models/devices.py:308 #, python-brace-format msgid "" "Device {device} in rack {rack} does not have sufficient space to accommodate " "a height of {height}U" msgstr "" -#: netbox/dcim/models/devices.py:322 +#: netbox/dcim/models/devices.py:323 #, python-brace-format msgid "" "Unable to set 0U height: Found {racked_instance_count} " "instances already mounted within racks." msgstr "" -#: netbox/dcim/models/devices.py:331 +#: netbox/dcim/models/devices.py:332 msgid "" "Must delete all device bay templates associated with this device before " "declassifying it as a parent device." msgstr "" -#: netbox/dcim/models/devices.py:337 +#: netbox/dcim/models/devices.py:338 msgid "Child device types must be 0U." msgstr "" -#: netbox/dcim/models/devices.py:412 +#: netbox/dcim/models/devices.py:413 msgid "module type" msgstr "" -#: netbox/dcim/models/devices.py:413 +#: netbox/dcim/models/devices.py:414 msgid "module types" msgstr "" -#: netbox/dcim/models/devices.py:483 +#: netbox/dcim/models/devices.py:484 msgid "Virtual machines may be assigned to this role" msgstr "" -#: netbox/dcim/models/devices.py:495 +#: netbox/dcim/models/devices.py:496 msgid "device role" msgstr "" -#: netbox/dcim/models/devices.py:496 +#: netbox/dcim/models/devices.py:497 msgid "device roles" msgstr "" -#: netbox/dcim/models/devices.py:510 +#: netbox/dcim/models/devices.py:511 msgid "Optionally limit this platform to devices of a certain manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:522 +#: netbox/dcim/models/devices.py:523 msgid "platform" msgstr "" -#: netbox/dcim/models/devices.py:523 +#: netbox/dcim/models/devices.py:524 msgid "platforms" msgstr "" -#: netbox/dcim/models/devices.py:571 +#: netbox/dcim/models/devices.py:572 msgid "The function this device serves" msgstr "" -#: netbox/dcim/models/devices.py:598 +#: netbox/dcim/models/devices.py:599 msgid "Chassis serial number, assigned by the manufacturer" msgstr "" -#: netbox/dcim/models/devices.py:606 netbox/dcim/models/devices.py:1192 +#: netbox/dcim/models/devices.py:607 netbox/dcim/models/devices.py:1193 msgid "A unique tag used to identify this device" msgstr "" -#: netbox/dcim/models/devices.py:633 +#: netbox/dcim/models/devices.py:634 msgid "position (U)" msgstr "" -#: netbox/dcim/models/devices.py:641 +#: netbox/dcim/models/devices.py:642 msgid "rack face" msgstr "" -#: netbox/dcim/models/devices.py:662 netbox/dcim/models/devices.py:1419 +#: netbox/dcim/models/devices.py:663 netbox/dcim/models/devices.py:1420 #: netbox/virtualization/models/virtualmachines.py:95 msgid "primary IPv4" msgstr "" -#: netbox/dcim/models/devices.py:670 netbox/dcim/models/devices.py:1427 +#: netbox/dcim/models/devices.py:671 netbox/dcim/models/devices.py:1428 #: netbox/virtualization/models/virtualmachines.py:103 msgid "primary IPv6" msgstr "" -#: netbox/dcim/models/devices.py:678 +#: netbox/dcim/models/devices.py:679 msgid "out-of-band IP" msgstr "" -#: netbox/dcim/models/devices.py:695 +#: netbox/dcim/models/devices.py:696 msgid "VC position" msgstr "" -#: netbox/dcim/models/devices.py:698 +#: netbox/dcim/models/devices.py:699 msgid "Virtual chassis position" msgstr "" -#: netbox/dcim/models/devices.py:701 +#: netbox/dcim/models/devices.py:702 msgid "VC priority" msgstr "" -#: netbox/dcim/models/devices.py:705 +#: netbox/dcim/models/devices.py:706 msgid "Virtual chassis master election priority" msgstr "" -#: netbox/dcim/models/devices.py:708 netbox/dcim/models/sites.py:208 +#: netbox/dcim/models/devices.py:709 netbox/dcim/models/sites.py:208 msgid "latitude" msgstr "" -#: netbox/dcim/models/devices.py:713 netbox/dcim/models/devices.py:721 +#: netbox/dcim/models/devices.py:714 netbox/dcim/models/devices.py:722 #: netbox/dcim/models/sites.py:213 netbox/dcim/models/sites.py:221 msgid "GPS coordinate in decimal format (xx.yyyyyy)" msgstr "" -#: netbox/dcim/models/devices.py:716 netbox/dcim/models/sites.py:216 +#: netbox/dcim/models/devices.py:717 netbox/dcim/models/sites.py:216 msgid "longitude" msgstr "" -#: netbox/dcim/models/devices.py:789 +#: netbox/dcim/models/devices.py:790 msgid "Device name must be unique per site." msgstr "" -#: netbox/dcim/models/devices.py:800 netbox/ipam/models/services.py:71 +#: netbox/dcim/models/devices.py:801 netbox/ipam/models/services.py:71 msgid "device" msgstr "" -#: netbox/dcim/models/devices.py:801 +#: netbox/dcim/models/devices.py:802 msgid "devices" msgstr "" -#: netbox/dcim/models/devices.py:824 +#: netbox/dcim/models/devices.py:825 #, python-brace-format msgid "Rack {rack} does not belong to site {site}." msgstr "" -#: netbox/dcim/models/devices.py:829 +#: netbox/dcim/models/devices.py:830 #, python-brace-format msgid "Location {location} does not belong to site {site}." msgstr "" -#: netbox/dcim/models/devices.py:835 +#: netbox/dcim/models/devices.py:836 #, python-brace-format msgid "Rack {rack} does not belong to location {location}." msgstr "" -#: netbox/dcim/models/devices.py:842 +#: netbox/dcim/models/devices.py:843 msgid "Cannot select a rack face without assigning a rack." msgstr "" -#: netbox/dcim/models/devices.py:846 +#: netbox/dcim/models/devices.py:847 msgid "Cannot select a rack position without assigning a rack." msgstr "" -#: netbox/dcim/models/devices.py:852 +#: netbox/dcim/models/devices.py:853 msgid "Position must be in increments of 0.5 rack units." msgstr "" -#: netbox/dcim/models/devices.py:856 +#: netbox/dcim/models/devices.py:857 msgid "Must specify rack face when defining rack position." msgstr "" -#: netbox/dcim/models/devices.py:864 +#: netbox/dcim/models/devices.py:865 #, python-brace-format msgid "A 0U device type ({device_type}) cannot be assigned to a rack position." msgstr "" -#: netbox/dcim/models/devices.py:875 +#: netbox/dcim/models/devices.py:876 msgid "" "Child device types cannot be assigned to a rack face. This is an attribute " "of the parent device." msgstr "" -#: netbox/dcim/models/devices.py:882 +#: netbox/dcim/models/devices.py:883 msgid "" "Child device types cannot be assigned to a rack position. This is an " "attribute of the parent device." msgstr "" -#: netbox/dcim/models/devices.py:896 +#: netbox/dcim/models/devices.py:897 #, python-brace-format msgid "" "U{position} is already occupied or does not have sufficient space to " "accommodate this device type: {device_type} ({u_height}U)" msgstr "" -#: netbox/dcim/models/devices.py:911 +#: netbox/dcim/models/devices.py:912 #, python-brace-format msgid "{ip} is not an IPv4 address." msgstr "" -#: netbox/dcim/models/devices.py:923 netbox/dcim/models/devices.py:941 +#: netbox/dcim/models/devices.py:924 netbox/dcim/models/devices.py:942 #, python-brace-format msgid "The specified IP address ({ip}) is not assigned to this device." msgstr "" -#: netbox/dcim/models/devices.py:929 +#: netbox/dcim/models/devices.py:930 #, python-brace-format msgid "{ip} is not an IPv6 address." msgstr "" -#: netbox/dcim/models/devices.py:959 +#: netbox/dcim/models/devices.py:960 #, python-brace-format msgid "" "The assigned platform is limited to {platform_manufacturer} device types, " "but this device's type belongs to {devicetype_manufacturer}." msgstr "" -#: netbox/dcim/models/devices.py:970 +#: netbox/dcim/models/devices.py:971 #, python-brace-format msgid "The assigned cluster belongs to a different site ({site})" msgstr "" -#: netbox/dcim/models/devices.py:977 +#: netbox/dcim/models/devices.py:978 #, python-brace-format msgid "The assigned cluster belongs to a different location ({location})" msgstr "" -#: netbox/dcim/models/devices.py:985 +#: netbox/dcim/models/devices.py:986 msgid "A device assigned to a virtual chassis must have its position defined." msgstr "" -#: netbox/dcim/models/devices.py:991 +#: netbox/dcim/models/devices.py:992 #, python-brace-format msgid "" "Device cannot be removed from virtual chassis {virtual_chassis} because it " "is currently designated as its master." msgstr "" -#: netbox/dcim/models/devices.py:1199 +#: netbox/dcim/models/devices.py:1200 msgid "module" msgstr "" -#: netbox/dcim/models/devices.py:1200 +#: netbox/dcim/models/devices.py:1201 msgid "modules" msgstr "" -#: netbox/dcim/models/devices.py:1213 +#: netbox/dcim/models/devices.py:1214 #, python-brace-format msgid "" "Module must be installed within a module bay belonging to the assigned " "device ({device})." msgstr "" -#: netbox/dcim/models/devices.py:1340 +#: netbox/dcim/models/devices.py:1341 msgid "domain" msgstr "" -#: netbox/dcim/models/devices.py:1353 netbox/dcim/models/devices.py:1354 +#: netbox/dcim/models/devices.py:1354 netbox/dcim/models/devices.py:1355 msgid "virtual chassis" msgstr "" -#: netbox/dcim/models/devices.py:1366 +#: netbox/dcim/models/devices.py:1367 #, python-brace-format msgid "The selected master ({master}) is not assigned to this virtual chassis." msgstr "" -#: netbox/dcim/models/devices.py:1382 +#: netbox/dcim/models/devices.py:1383 #, python-brace-format msgid "" "Unable to delete virtual chassis {self}. There are member interfaces which " "form a cross-chassis LAG interfaces." msgstr "" -#: netbox/dcim/models/devices.py:1408 netbox/vpn/models/l2vpn.py:37 +#: netbox/dcim/models/devices.py:1409 netbox/vpn/models/l2vpn.py:37 msgid "identifier" msgstr "" -#: netbox/dcim/models/devices.py:1409 +#: netbox/dcim/models/devices.py:1410 msgid "Numeric identifier unique to the parent device" msgstr "" -#: netbox/dcim/models/devices.py:1437 netbox/extras/models/customfields.py:225 +#: netbox/dcim/models/devices.py:1438 netbox/extras/models/customfields.py:225 #: netbox/extras/models/models.py:107 netbox/extras/models/models.py:694 #: netbox/netbox/models/__init__.py:119 msgid "comments" msgstr "" -#: netbox/dcim/models/devices.py:1453 +#: netbox/dcim/models/devices.py:1454 msgid "virtual device context" msgstr "" -#: netbox/dcim/models/devices.py:1454 +#: netbox/dcim/models/devices.py:1455 msgid "virtual device contexts" msgstr "" -#: netbox/dcim/models/devices.py:1483 +#: netbox/dcim/models/devices.py:1484 #, python-brace-format msgid "{ip} is not an IPv{family} address." msgstr "" -#: netbox/dcim/models/devices.py:1489 +#: netbox/dcim/models/devices.py:1490 msgid "Primary IP address must belong to an interface on the assigned device." msgstr "" -#: netbox/dcim/models/devices.py:1521 +#: netbox/dcim/models/devices.py:1522 msgid "MAC addresses" msgstr "" +#: netbox/dcim/models/devices.py:1544 +msgid "" +"Cannot unassign MAC Address while it is designated as the primary MAC for an " +"object" +msgstr "" + +#: netbox/dcim/models/devices.py:1548 +msgid "" +"Cannot reassign MAC Address while it is designated as the primary MAC for an " +"object" +msgstr "" + #: netbox/dcim/models/mixins.py:94 #, python-brace-format msgid "Please select a {scope_type}." From b1e753029527fd55dc32e59817f87e11fabd60c8 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 22 Jan 2025 19:57:51 -0500 Subject: [PATCH 121/190] Add warning about UTF8 encoding in PostgreSQL --- docs/installation/1-postgresql.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/installation/1-postgresql.md b/docs/installation/1-postgresql.md index 3f826fa8a..aee2baff6 100644 --- a/docs/installation/1-postgresql.md +++ b/docs/installation/1-postgresql.md @@ -62,6 +62,9 @@ GRANT CREATE ON SCHEMA public TO netbox; !!! danger "Use a strong password" **Do not use the password from the example.** Choose a strong, random password to ensure secure database authentication for your NetBox installation. +!!! danger "Use UTF8 encoding" + Make sure that your database uses `UTF8` encoding (the default for new installations). Especially do not use `SQL_ASCII` encoding, as it can lead to unpredictable and unrecoverable errors. + Once complete, enter `\q` to exit the PostgreSQL shell. ## Verify Service Status From 5fce4eef8ef03c2a746bf7f4752f631fb0294b31 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 23 Jan 2025 19:41:12 -0500 Subject: [PATCH 122/190] Add note about \l command --- docs/installation/1-postgresql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/1-postgresql.md b/docs/installation/1-postgresql.md index aee2baff6..8ba302909 100644 --- a/docs/installation/1-postgresql.md +++ b/docs/installation/1-postgresql.md @@ -63,7 +63,7 @@ GRANT CREATE ON SCHEMA public TO netbox; **Do not use the password from the example.** Choose a strong, random password to ensure secure database authentication for your NetBox installation. !!! danger "Use UTF8 encoding" - Make sure that your database uses `UTF8` encoding (the default for new installations). Especially do not use `SQL_ASCII` encoding, as it can lead to unpredictable and unrecoverable errors. + Make sure that your database uses `UTF8` encoding (the default for new installations). Especially do not use `SQL_ASCII` encoding, as it can lead to unpredictable and unrecoverable errors. Enter `\l` to check your encoding. Once complete, enter `\q` to exit the PostgreSQL shell. From c2daa7009937e5a878ef9b5ce0b9e56d491653d0 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Thu, 23 Jan 2025 20:13:42 -0500 Subject: [PATCH 123/190] Fix typo in Site Groups docs --- docs/features/facilities.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/features/facilities.md b/docs/features/facilities.md index 4c8dfe265..1421281eb 100644 --- a/docs/features/facilities.md +++ b/docs/features/facilities.md @@ -46,7 +46,7 @@ Regions will always be listed alphabetically by name within each parent, and the Like regions, site groups can be arranged in a recursive hierarchy for grouping sites. However, whereas regions are intended for geographic organization, site groups may be used for functional grouping. For example, you might classify sites as corporate, branch, or customer sites in addition to where they are physically located. -The use of both regions and site groups affords to independent but complementary dimensions across which sites can be organized. +The use of both regions and site groups affords two independent but complementary dimensions across which sites can be organized. ## Sites From 313f44646b82acf8af6d99a58d2fd248ccd62cd2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 24 Jan 2025 09:18:16 -0500 Subject: [PATCH 124/190] Assign GitHub issue type on creation --- .github/ISSUE_TEMPLATE/01-feature_request.yaml | 1 + .github/ISSUE_TEMPLATE/02-bug_report.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index 6212af3b8..48a3a859c 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -1,5 +1,6 @@ --- name: ✨ Feature Request +type: Feature description: Propose a new NetBox feature or enhancement labels: ["type: feature", "status: needs triage"] body: diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index 4382a9b76..83397944c 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -1,5 +1,6 @@ --- name: 🐛 Bug Report +type: Bug description: Report a reproducible bug in the current release of NetBox labels: ["type: bug", "status: needs triage"] body: From b2b47ac740648383ea713369e5b0678461d16f7c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 24 Jan 2025 09:30:54 -0500 Subject: [PATCH 125/190] Closes #18484: Exempt changes to GitHub templates from CI --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aab8bc34f..85070d98e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,11 +3,15 @@ name: CI on: push: paths-ignore: + - '.github/ISSUE_TEMPLATE/**' + - '.github/PULL_REQUEST_TEMPLATE.md' - 'contrib/**' - 'docs/**' - 'netbox/translations/**' pull_request: paths-ignore: + - '.github/ISSUE_TEMPLATE/**' + - '.github/PULL_REQUEST_TEMPLATE.md' - 'contrib/**' - 'docs/**' - 'netbox/translations/**' From 57fa1dd18dbaa5c927ceae37b5879044b9f154e1 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 24 Jan 2025 09:58:43 -0500 Subject: [PATCH 126/190] Add remaining issue types --- .github/ISSUE_TEMPLATE/03-documentation_change.yaml | 1 + .github/ISSUE_TEMPLATE/04-translation.yaml | 1 + .github/ISSUE_TEMPLATE/05-housekeeping.yaml | 1 + .github/ISSUE_TEMPLATE/06-deprecation.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/03-documentation_change.yaml b/.github/ISSUE_TEMPLATE/03-documentation_change.yaml index b5a970782..2dea61acc 100644 --- a/.github/ISSUE_TEMPLATE/03-documentation_change.yaml +++ b/.github/ISSUE_TEMPLATE/03-documentation_change.yaml @@ -1,5 +1,6 @@ --- name: 📖 Documentation Change +type: Documentation description: Suggest an addition or modification to the NetBox documentation labels: ["type: documentation", "status: needs triage"] body: diff --git a/.github/ISSUE_TEMPLATE/04-translation.yaml b/.github/ISSUE_TEMPLATE/04-translation.yaml index d07bc399d..72130ae47 100644 --- a/.github/ISSUE_TEMPLATE/04-translation.yaml +++ b/.github/ISSUE_TEMPLATE/04-translation.yaml @@ -1,5 +1,6 @@ --- name: 🌍 Translation +type: Translation description: Request support for a new language in the user interface labels: ["type: translation"] body: diff --git a/.github/ISSUE_TEMPLATE/05-housekeeping.yaml b/.github/ISSUE_TEMPLATE/05-housekeeping.yaml index 777871395..65b983e18 100644 --- a/.github/ISSUE_TEMPLATE/05-housekeeping.yaml +++ b/.github/ISSUE_TEMPLATE/05-housekeeping.yaml @@ -1,5 +1,6 @@ --- name: 🏡 Housekeeping +type: Housekeeping description: A change pertaining to the codebase itself (developers only) labels: ["type: housekeeping"] body: diff --git a/.github/ISSUE_TEMPLATE/06-deprecation.yaml b/.github/ISSUE_TEMPLATE/06-deprecation.yaml index 27e13e5c0..83905a39a 100644 --- a/.github/ISSUE_TEMPLATE/06-deprecation.yaml +++ b/.github/ISSUE_TEMPLATE/06-deprecation.yaml @@ -1,5 +1,6 @@ --- name: 🗑️ Deprecation +type: Deprecation description: The removal of an existing feature or resource labels: ["type: deprecation"] body: From 968214b64afda95c2e69e59eb1673ef6ba4a1d2b Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 05:02:09 +0000 Subject: [PATCH 127/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index d63e1dd34..5e3785d63 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-24 05:02+0000\n" +"POT-Creation-Date: 2025-01-28 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6594,13 +6594,13 @@ msgstr "" msgid "MAC addresses" msgstr "" -#: netbox/dcim/models/devices.py:1544 +#: netbox/dcim/models/devices.py:1551 msgid "" "Cannot unassign MAC Address while it is designated as the primary MAC for an " "object" msgstr "" -#: netbox/dcim/models/devices.py:1548 +#: netbox/dcim/models/devices.py:1555 msgid "" "Cannot reassign MAC Address while it is designated as the primary MAC for an " "object" From 7a6bb34d21634f4b6870c442e2bbb8bb5c8c88f5 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 27 Jan 2025 21:48:07 -0500 Subject: [PATCH 128/190] Reword references to develop and master branches --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a760b8371..100d996c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Poli * It's very important that you not submit a pull request until a relevant issue has been opened **and** assigned to you. Otherwise, you risk wasting time on work that may ultimately not be needed. -* New pull requests should generally be based off of the `develop` branch, rather than `master`. The `develop` branch is used for ongoing development, while `master` is used for tracking stable releases. (If you're developing for an upcoming minor release, use `feature` instead.) +* New pull requests should generally be based off of the `main` branch. This branch, in keeping with the [trunk-based development](https://trunkbaseddevelopment.com/) approach, is used for ongoing development and bug fixes and always represents the newest stable code, from which releases are periodically branched. (If you're developing for an upcoming minor release, use `feature` instead.) * In most cases, it is not necessary to add a changelog entry: A maintainer will take care of this when the PR is merged. (This helps avoid merge conflicts resulting from multiple PRs being submitted simultaneously.) From 34fa3835be9d25d9d8fd712e6314ab7ed1b4ae9f Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 27 Jan 2025 21:56:38 -0500 Subject: [PATCH 129/190] NB-717 Update dashboard news feed URL to eliminate multiple 301 redirects --- netbox/extras/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 994586aca..123b771f6 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -76,7 +76,7 @@ DEFAULT_DASHBOARD = [ 'height': 4, 'title': 'NetBox News', 'config': { - 'feed_url': 'http://netbox.dev/rss/', + 'feed_url': 'https://api.netbox.oss.netboxlabs.com/v1/newsfeed/', 'max_entries': 10, 'cache_timeout': 14400, 'requires_internet': True, From 80e466dab7250bb43727b427a6b888e449b0891c Mon Sep 17 00:00:00 2001 From: mr1716 Date: Tue, 28 Jan 2025 09:06:37 -0500 Subject: [PATCH 130/190] #18512 Update required-parameters spelling --- docs/configuration/required-parameters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/required-parameters.md b/docs/configuration/required-parameters.md index f9a5a6f87..f7e5d71ce 100644 --- a/docs/configuration/required-parameters.md +++ b/docs/configuration/required-parameters.md @@ -2,7 +2,7 @@ ## ALLOWED_HOSTS -This is a list of valid fully-qualified domain names (FQDNs) and/or IP addresses that can be used to reach the NetBox service. Usually this is the same as the hostname for the NetBox server, but can also be different; for example, when using a reverse proxy serving the NetBox website under a different FQDN than the hostname of the NetBox server. To help guard against [HTTP Host header attackes](https://docs.djangoproject.com/en/3.0/topics/security/#host-headers-virtual-hosting), NetBox will not permit access to the server via any other hostnames (or IPs). +This is a list of valid fully-qualified domain names (FQDNs) and/or IP addresses that can be used to reach the NetBox service. Usually this is the same as the hostname for the NetBox server, but can also be different; for example, when using a reverse proxy serving the NetBox website under a different FQDN than the hostname of the NetBox server. To help guard against [HTTP Host header attacks](https://docs.djangoproject.com/en/3.0/topics/security/#host-headers-virtual-hosting), NetBox will not permit access to the server via any other hostnames (or IPs). !!! note This parameter must always be defined as a list or tuple, even if only a single value is provided. From 07403f690a6b155db963dfeedc9e7e9a4d8fa22a Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Tue, 28 Jan 2025 19:19:34 +0100 Subject: [PATCH 131/190] Fix #18515: Don't fail in DEBUG mode When no Redis server is reachable management commands failed without this try...except block. --- netbox/core/apps.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/netbox/core/apps.py b/netbox/core/apps.py index 9674860b9..b1337c7ed 100644 --- a/netbox/core/apps.py +++ b/netbox/core/apps.py @@ -28,4 +28,7 @@ class CoreConfig(AppConfig): # Clear Redis cache on startup in development mode if settings.DEBUG: - cache.clear() + try: + cache.clear() + except Exception: + pass From 5cd7c6d167ea3b0a23651823adbcd44c103b63c4 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 28 Jan 2025 15:43:21 -0500 Subject: [PATCH 132/190] Add tag reflecting settings.HOSTNAME --- netbox/templates/base/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index aad03cdb0..7ca2f575d 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -17,6 +17,7 @@ + {# Page title #} {% block title %}{% trans "Home" %}{% endblock %} | NetBox From 5514df9dee3134d7f72b59d6dcd104281a1f59bb Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 05:02:02 +0000 Subject: [PATCH 133/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 5e3785d63..5410c413d 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-28 05:01+0000\n" +"POT-Creation-Date: 2025-01-30 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -11993,7 +11993,7 @@ msgstr "" msgid "Add a Token" msgstr "" -#: netbox/templates/base/base.html:22 netbox/templates/home.html:27 +#: netbox/templates/base/base.html:23 netbox/templates/home.html:27 msgid "Home" msgstr "" From 22af6dd05fc0d05bb01b0756a2aaab6327885ae9 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Thu, 30 Jan 2025 21:09:36 +0000 Subject: [PATCH 134/190] Add default user preferences tables testing in BaseTable --- netbox/netbox/tables/tables.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index f95263f6c..9523772b5 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -2,6 +2,7 @@ from copy import deepcopy from functools import cached_property import django_tables2 as tables +from django.conf import settings from django.contrib.auth.models import AnonymousUser from django.contrib.contenttypes.fields import GenericForeignKey from django.core.exceptions import FieldDoesNotExist @@ -13,6 +14,7 @@ from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ from django_tables2.data import TableQuerysetData + from core.models import ObjectType from extras.choices import * from extras.models import CustomField, CustomLink @@ -64,6 +66,11 @@ class BaseTable(tables.Table): selected_columns = None if user is not None and not isinstance(user, AnonymousUser): selected_columns = user.config.get(f"tables.{self.name}.columns") + elif isinstance(user, AnonymousUser): + default_user_preferences = settings.DEFAULT_USER_PREFERENCES + default_table = default_user_preferences.get('tables', {}).get(self.name, {}).get('columns', {}) + if default_table != {}: + selected_columns = default_table if not selected_columns: selected_columns = getattr(self.Meta, 'default_columns', self.Meta.fields) From 62148bb83c5aa2dabdc3617d88759b7ea6ddc2c6 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Thu, 30 Jan 2025 21:51:37 +0000 Subject: [PATCH 135/190] Check if DEFAULT_USER_PREFERENCES are configured --- netbox/netbox/tables/tables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 9523772b5..975411075 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -66,7 +66,7 @@ class BaseTable(tables.Table): selected_columns = None if user is not None and not isinstance(user, AnonymousUser): selected_columns = user.config.get(f"tables.{self.name}.columns") - elif isinstance(user, AnonymousUser): + elif isinstance(user, AnonymousUser) and hasattr(settings, 'DEFAULT_USER_PREFERENCES'): default_user_preferences = settings.DEFAULT_USER_PREFERENCES default_table = default_user_preferences.get('tables', {}).get(self.name, {}).get('columns', {}) if default_table != {}: From 2a8728544c7fd1d3399f51d7de87c14b46f8a2d5 Mon Sep 17 00:00:00 2001 From: Antoine Keranflec'h Date: Fri, 31 Jan 2025 08:48:35 +0100 Subject: [PATCH 136/190] fix(pep) fix pep8 compliancy --- netbox/vpn/views.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netbox/vpn/views.py b/netbox/vpn/views.py index 55d47ca62..1bcb99716 100644 --- a/netbox/vpn/views.py +++ b/netbox/vpn/views.py @@ -67,6 +67,7 @@ class TunnelGroupBulkDeleteView(generic.BulkDeleteView): filterset = filtersets.TunnelGroupFilterSet table = tables.TunnelGroupTable + @register_model_view(Tunnel, 'contacts') class TunnelGroupContactsView(ObjectContactsView): queryset = TunnelGroup.objects.all() @@ -75,6 +76,7 @@ class TunnelGroupContactsView(ObjectContactsView): # Tunnels # + @register_model_view(Tunnel, 'list', path='', detail=False) class TunnelListView(generic.ObjectListView): queryset = Tunnel.objects.annotate( @@ -134,6 +136,7 @@ class TunnelBulkDeleteView(generic.BulkDeleteView): filterset = filtersets.TunnelFilterSet table = tables.TunnelTable + @register_model_view(Tunnel, 'contacts') class TunnelContactsView(ObjectContactsView): queryset = Tunnel.objects.all() @@ -142,6 +145,7 @@ class TunnelContactsView(ObjectContactsView): # Tunnel terminations # + @register_model_view(TunnelTermination, 'list', path='', detail=False) class TunnelTerminationListView(generic.ObjectListView): queryset = TunnelTermination.objects.all() From f5bdf7b593da5c35b6686f241fb72976471272fd Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Fri, 31 Jan 2025 18:03:55 +0000 Subject: [PATCH 137/190] Simplify Anon user logic --- netbox/netbox/tables/tables.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 975411075..648881d3f 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -67,10 +67,7 @@ class BaseTable(tables.Table): if user is not None and not isinstance(user, AnonymousUser): selected_columns = user.config.get(f"tables.{self.name}.columns") elif isinstance(user, AnonymousUser) and hasattr(settings, 'DEFAULT_USER_PREFERENCES'): - default_user_preferences = settings.DEFAULT_USER_PREFERENCES - default_table = default_user_preferences.get('tables', {}).get(self.name, {}).get('columns', {}) - if default_table != {}: - selected_columns = default_table + selected_columns = settings.DEFAULT_USER_PREFERENCES.get('tables', {}).get(self.name, {}).get('columns') if not selected_columns: selected_columns = getattr(self.Meta, 'default_columns', self.Meta.fields) From 7d6089775e0982d6830acb1a5b535c508f8eece1 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Fri, 31 Jan 2025 18:48:50 +0000 Subject: [PATCH 138/190] remove extra line --- netbox/netbox/tables/tables.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 648881d3f..2d2c430aa 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -14,7 +14,6 @@ from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ from django_tables2.data import TableQuerysetData - from core.models import ObjectType from extras.choices import * from extras.models import CustomField, CustomLink From 8aecf53d0e448cbe856067edf84aa3e05fc70937 Mon Sep 17 00:00:00 2001 From: mr1716 Date: Fri, 31 Jan 2025 09:55:26 -0500 Subject: [PATCH 139/190] #18513 Updating Documentation Relating To Strawberry-Django Links --- docs/integrations/graphql-api.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/integrations/graphql-api.md b/docs/integrations/graphql-api.md index 425c3adda..c02045f34 100644 --- a/docs/integrations/graphql-api.md +++ b/docs/integrations/graphql-api.md @@ -1,6 +1,6 @@ # GraphQL API Overview -NetBox provides a read-only [GraphQL](https://graphql.org/) API to complement its REST API. This API is powered by [Strawberry Django](https://strawberry-graphql.github.io/strawberry-django/). +NetBox provides a read-only [GraphQL](https://graphql.org/) API to complement its REST API. This API is powered by [Strawberry Django](https://strawberry.rocks/). ## Queries @@ -47,7 +47,7 @@ NetBox provides both a singular and plural query field for each object type: For example, query `device(id:123)` to fetch a specific device (identified by its unique ID), and query `device_list` (with an optional set of filters) to fetch all devices. -For more detail on constructing GraphQL queries, see the [GraphQL queries documentation](https://graphql.org/learn/queries/). For filtering and lookup syntax, please refer to the [Strawberry Django documentation](https://strawberry-graphql.github.io/strawberry-django/guide/filters/). +For more detail on constructing GraphQL queries, see the [GraphQL queries documentation](https://graphql.org/learn/queries/). For filtering and lookup syntax, please refer to the [Strawberry Django documentation](https://strawberry.rocks/docs/django/guide/filters). ## Filtering From e12a5d2edc9f93bfb7651c13fd9bf5d2d9abf9c9 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Thu, 30 Jan 2025 18:26:17 +0000 Subject: [PATCH 140/190] Add get_extra_addanother_params method in IPAddressEditView --- netbox/ipam/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index c606c1088..007a652ca 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -863,6 +863,12 @@ class IPAddressEditView(generic.ObjectEditView): return obj + def get_extra_addanother_params(self, request): + if 'interface' in request.GET: + return {'interface': request.GET['interface']} + elif 'vminterface' in request.GET: + return {'vminterface': request.GET['vminterface']} + # TODO: Standardize or remove this view @register_model_view(IPAddress, 'assign', path='assign', detail=False) From c8decf4c210e5bca57aa8294b2b828f7f9874812 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 29 Jan 2025 13:10:27 -0500 Subject: [PATCH 141/190] Add auth_required attrib on PluginMenuItem --- netbox/netbox/plugins/navigation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/plugins/navigation.py b/netbox/netbox/plugins/navigation.py index 01b8a0442..fc86b134a 100644 --- a/netbox/netbox/plugins/navigation.py +++ b/netbox/netbox/plugins/navigation.py @@ -38,9 +38,10 @@ class PluginMenuItem: permissions = [] buttons = [] - def __init__(self, link, link_text, staff_only=False, permissions=None, buttons=None): + def __init__(self, link, link_text, auth_required=False, staff_only=False, permissions=None, buttons=None): self.link = link self.link_text = link_text + self.auth_required = auth_required self.staff_only = staff_only if permissions is not None: if type(permissions) not in (list, tuple): From b2bc842f1cd8acd68e0bf3539b8e77c059fd10dc Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 29 Jan 2025 13:42:20 -0500 Subject: [PATCH 142/190] Remove 'provider' from VirtualCircuitIndex.display_attrs --- netbox/circuits/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/circuits/search.py b/netbox/circuits/search.py index 486656933..f7654e328 100644 --- a/netbox/circuits/search.py +++ b/netbox/circuits/search.py @@ -90,7 +90,7 @@ class VirtualCircuitIndex(SearchIndex): ('description', 500), ('comments', 5000), ) - display_attrs = ('provider', 'provider_network', 'provider_account', 'status', 'tenant', 'description') + display_attrs = ('provider_network', 'provider_account', 'status', 'tenant', 'description') @register_search From 0b794de40e8a356ac03a8f3aba6d5ed0a76197f9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Feb 2025 05:02:11 +0000 Subject: [PATCH 143/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 5410c413d..357406505 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-01-30 05:01+0000\n" +"POT-Creation-Date: 2025-02-01 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -690,7 +690,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:845 netbox/dcim/tables/power.py:77 #: netbox/dcim/tables/racks.py:137 netbox/extras/forms/bulk_import.py:42 #: netbox/extras/tables/tables.py:405 netbox/extras/tables/tables.py:465 -#: netbox/netbox/tables/tables.py:240 netbox/templates/circuits/circuit.html:30 +#: netbox/netbox/tables/tables.py:243 netbox/templates/circuits/circuit.html:30 #: netbox/templates/circuits/virtualcircuit.html:39 #: netbox/templates/circuits/virtualcircuittermination.html:64 #: netbox/templates/core/datasource.html:38 netbox/templates/dcim/cable.html:15 @@ -950,7 +950,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:310 netbox/ipam/forms/filtersets.py:385 #: netbox/ipam/forms/filtersets.py:470 netbox/ipam/forms/filtersets.py:483 #: netbox/ipam/forms/filtersets.py:508 netbox/ipam/forms/filtersets.py:579 -#: netbox/ipam/forms/filtersets.py:597 netbox/netbox/tables/tables.py:256 +#: netbox/ipam/forms/filtersets.py:597 netbox/netbox/tables/tables.py:259 #: netbox/virtualization/forms/filtersets.py:45 #: netbox/virtualization/forms/filtersets.py:108 #: netbox/virtualization/forms/filtersets.py:203 @@ -2700,7 +2700,7 @@ msgstr "" #: netbox/extras/tables/tables.py:297 netbox/extras/tables/tables.py:329 #: netbox/extras/tables/tables.py:409 netbox/extras/tables/tables.py:470 #: netbox/extras/tables/tables.py:576 netbox/extras/tables/tables.py:616 -#: netbox/extras/tables/tables.py:653 netbox/netbox/tables/tables.py:244 +#: netbox/extras/tables/tables.py:653 netbox/netbox/tables/tables.py:247 #: netbox/templates/core/objectchange.html:58 #: netbox/templates/extras/eventrule.html:78 #: netbox/templates/extras/journalentry.html:18 @@ -2729,7 +2729,7 @@ msgstr "" #: netbox/core/tables/jobs.py:10 netbox/core/tables/tasks.py:76 #: netbox/dcim/tables/devicetypes.py:164 netbox/extras/tables/tables.py:216 -#: netbox/extras/tables/tables.py:460 netbox/netbox/tables/tables.py:189 +#: netbox/extras/tables/tables.py:460 netbox/netbox/tables/tables.py:192 #: netbox/templates/dcim/virtualchassis_edit.html:52 #: netbox/utilities/forms/forms.py:73 netbox/wireless/tables/wirelesslink.py:16 msgid "ID" @@ -9940,7 +9940,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:419 netbox/ipam/models/vlans.py:273 #: netbox/ipam/tables/ip.py:122 netbox/ipam/tables/vlans.py:51 -#: netbox/ipam/views.py:1029 netbox/netbox/navigation/menu.py:199 +#: netbox/ipam/views.py:1035 netbox/netbox/navigation/menu.py:199 #: netbox/netbox/navigation/menu.py:201 msgid "VLANs" msgstr "" @@ -10652,15 +10652,15 @@ msgstr "" msgid "Child Ranges" msgstr "" -#: netbox/ipam/views.py:951 +#: netbox/ipam/views.py:957 msgid "Related IPs" msgstr "" -#: netbox/ipam/views.py:1308 +#: netbox/ipam/views.py:1314 msgid "Device Interfaces" msgstr "" -#: netbox/ipam/views.py:1326 +#: netbox/ipam/views.py:1332 msgid "VM Interfaces" msgstr "" @@ -11476,16 +11476,16 @@ msgstr "" msgid "Background Tasks" msgstr "" -#: netbox/netbox/plugins/navigation.py:47 -#: netbox/netbox/plugins/navigation.py:69 +#: netbox/netbox/plugins/navigation.py:48 +#: netbox/netbox/plugins/navigation.py:70 msgid "Permissions must be passed as a tuple or list." msgstr "" -#: netbox/netbox/plugins/navigation.py:51 +#: netbox/netbox/plugins/navigation.py:52 msgid "Buttons must be passed as a tuple or list." msgstr "" -#: netbox/netbox/plugins/navigation.py:73 +#: netbox/netbox/plugins/navigation.py:74 msgid "Button color must be a choice within ButtonColorChoices." msgstr "" @@ -11670,17 +11670,17 @@ msgstr "" msgid "Error" msgstr "" -#: netbox/netbox/tables/tables.py:58 +#: netbox/netbox/tables/tables.py:59 #, python-brace-format msgid "No {model_name} found" msgstr "" -#: netbox/netbox/tables/tables.py:249 +#: netbox/netbox/tables/tables.py:252 #: netbox/templates/generic/bulk_import.html:117 msgid "Field" msgstr "" -#: netbox/netbox/tables/tables.py:252 +#: netbox/netbox/tables/tables.py:255 msgid "Value" msgstr "" From f829f34b4366b214a5d4f1e1a47b48717872dba0 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 3 Feb 2025 09:44:00 -0500 Subject: [PATCH 144/190] Closes #18559: Add a `build` parameter to ReleaseInfo (#18560) * Closes #18559: Add a build parameter to ReleaseInfo * Adjust dataclass typing --- netbox/utilities/release.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/release.py b/netbox/utilities/release.py index f389e8009..78dbe25d1 100644 --- a/netbox/utilities/release.py +++ b/netbox/utilities/release.py @@ -30,13 +30,17 @@ class ReleaseInfo: edition: str published: Union[datetime.date, None] = None designation: Union[str, None] = None + build: Union[str, None] = None features: FeatureSet = field(default_factory=FeatureSet) @property def full_version(self): + output = self.version if self.designation: - return f"{self.version}-{self.designation}" - return self.version + output = f"{output}-{self.designation}" + if self.build: + output = f"{output}-{self.build}" + return output @property def name(self): From 29f405d27e3224db4168813a19bc997a3ff6289b Mon Sep 17 00:00:00 2001 From: mr1716 Date: Fri, 31 Jan 2025 15:19:10 -0500 Subject: [PATCH 145/190] #18496 Fixing Broken Link For Custom Links Documentation --- docs/customization/custom-links.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customization/custom-links.md b/docs/customization/custom-links.md index baae1db4f..265efe669 100644 --- a/docs/customization/custom-links.md +++ b/docs/customization/custom-links.md @@ -2,7 +2,7 @@ Custom links allow users to display arbitrary hyperlinks to external content within NetBox object views. These are helpful for cross-referencing related records in systems outside NetBox. For example, you might create a custom link on the device view which links to the current device in a Network Monitoring System (NMS). -Custom links are created by navigating to Customization > Custom Links. Each link is associated with a particular NetBox object type (site, device, prefix, etc.) and will be displayed on relevant views. Each link has display text and a URL, and data from the NetBox item being viewed can be included in the link using [Jinja2 template code](https://jinja2docs.readthedocs.io/en/stable/) through the variable `object`, and custom fields through `object.cf`. +Custom links are created by navigating to Customization > Custom Links. Each link is associated with a particular NetBox object type (site, device, prefix, etc.) and will be displayed on relevant views. Each link has display text and a URL, and data from the NetBox item being viewed can be included in the link using [Jinja template code](https://jinja.palletsprojects.com/en/stable/) through the variable `object`, and custom fields through `object.cf`. For example, you might define a link like this: From 6e165435e23c959c1876d08e8b3c156e2413cc67 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 4 Feb 2025 15:09:37 -0500 Subject: [PATCH 146/190] Release 4.2.3 --- .../ISSUE_TEMPLATE/01-feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/02-bug_report.yaml | 2 +- base_requirements.txt | 3 +- docs/release-notes/version-4.2.md | 20 ++ netbox/project-static/package.json | 2 +- netbox/project-static/yarn.lock | 8 +- netbox/release.yaml | 4 +- netbox/translations/da/LC_MESSAGES/django.mo | Bin 221815 -> 225478 bytes netbox/translations/da/LC_MESSAGES/django.po | 222 +++++++------- netbox/translations/de/LC_MESSAGES/django.mo | Bin 237305 -> 237308 bytes netbox/translations/de/LC_MESSAGES/django.po | 158 +++++----- netbox/translations/es/LC_MESSAGES/django.mo | Bin 235309 -> 239192 bytes netbox/translations/es/LC_MESSAGES/django.po | 204 +++++++------ netbox/translations/it/LC_MESSAGES/django.mo | Bin 233546 -> 237392 bytes netbox/translations/it/LC_MESSAGES/django.po | 203 +++++++------ netbox/translations/ja/LC_MESSAGES/django.mo | Bin 254765 -> 254773 bytes netbox/translations/ja/LC_MESSAGES/django.po | 24 +- netbox/translations/nl/LC_MESSAGES/django.mo | Bin 229707 -> 233233 bytes netbox/translations/nl/LC_MESSAGES/django.po | 278 ++++++++++-------- netbox/translations/pl/LC_MESSAGES/django.mo | Bin 231288 -> 235040 bytes netbox/translations/pl/LC_MESSAGES/django.po | 207 +++++++------ netbox/translations/pt/LC_MESSAGES/django.mo | Bin 235682 -> 235452 bytes netbox/translations/pt/LC_MESSAGES/django.po | 88 +++--- netbox/translations/tr/LC_MESSAGES/django.mo | Bin 225979 -> 229529 bytes netbox/translations/tr/LC_MESSAGES/django.po | 209 ++++++------- netbox/translations/uk/LC_MESSAGES/django.mo | Bin 299267 -> 302307 bytes netbox/translations/uk/LC_MESSAGES/django.po | 203 +++++++------ netbox/translations/zh/LC_MESSAGES/django.mo | Bin 208819 -> 212098 bytes netbox/translations/zh/LC_MESSAGES/django.po | 218 +++++++------- requirements.txt | 8 +- 30 files changed, 1103 insertions(+), 960 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index 48a3a859c..62c33b424 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -15,7 +15,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v4.2.2 + placeholder: v4.2.3 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index 83397944c..0fa8b4084 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -27,7 +27,7 @@ body: attributes: label: NetBox Version description: What version of NetBox are you currently running? - placeholder: v4.2.2 + placeholder: v4.2.3 validations: required: true - type: dropdown diff --git a/base_requirements.txt b/base_requirements.txt index 9cf0fbf8b..75ee4bbfd 100644 --- a/base_requirements.txt +++ b/base_requirements.txt @@ -88,7 +88,8 @@ mkdocs-material # Introspection for embedded code # https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md -mkdocstrings[python-legacy] +# See #18568 +mkdocstrings[python-legacy]==0.27.0 # Library for manipulating IP prefixes and addresses # https://github.com/netaddr/netaddr/blob/master/CHANGELOG.rst diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md index 61f043f3d..c6c99be7f 100644 --- a/docs/release-notes/version-4.2.md +++ b/docs/release-notes/version-4.2.md @@ -1,5 +1,25 @@ # NetBox v4.2 +## v4.2.3 (2025-02-04) + +### Enhancements + +* [#18518](https://github.com/netbox-community/netbox/issues/18518) - Add a "hostname" `` tag to the page header + +### Bug Fixes + +* [#18497](https://github.com/netbox-community/netbox/issues/18497) - Fix unhandled `FieldDoesNotExist` exception when search results include virtual circuit +* [#18433](https://github.com/netbox-community/netbox/issues/18433) - Fix MAC address not shown as "primary for interface" in MAC address detail view +* [#18154](https://github.com/netbox-community/netbox/issues/18154) - Allow anonymous users to change default table preferences +* [#18515](https://github.com/netbox-community/netbox/issues/18515) - Fix Django `collectstatic` management command in debug mode with Redis not running +* [#18456](https://github.com/netbox-community/netbox/issues/18456) - Avoid duplicate MAC Address column in interface tables +* [#18447](https://github.com/netbox-community/netbox/issues/18447) - Fix `FieldError` exception when sorting interface tables on MAC Address columns +* [#18438](https://github.com/netbox-community/netbox/issues/18438) - Improve performance in IPAM migration `0072_prefix_cached_relations` when upgrading from v4.1 or earlier +* [#18436](https://github.com/netbox-community/netbox/issues/18436) - Reset primary MAC address when unassigning MAC address from interface +* [#18181](https://github.com/netbox-community/netbox/issues/18181) - Fix "Create & Add Another" workflow when adding IP addresses to interfaces + +--- + ## v4.2.2 (2025-01-17) ### Bug Fixes diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index f216a4107..636ce51a2 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -31,7 +31,7 @@ "htmx.org": "1.9.12", "query-string": "9.1.1", "sass": "1.83.4", - "tom-select": "2.4.1", + "tom-select": "2.4.2", "typeface-inter": "3.18.1", "typeface-roboto-mono": "1.1.13" }, diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index 588935331..c9b42df33 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -2876,10 +2876,10 @@ toggle-selection@^1.0.6: resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== -tom-select@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.4.1.tgz#6a0b6df8af3df7b09b22dd965eb75ce4d1c547bc" - integrity sha512-adI8H8+wk8RRzHYLQ3bXSk2Q+FAq/kzAATrcWlJ2fbIrEzb0VkwaXzKHTAlBwSJrhqbPJvhV/0eypFkED/nAug== +tom-select@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.4.2.tgz#9764faf6cba51f6571d03a79bb7c1cac1cac7a5a" + integrity sha512-2RWjkL3gMDz9E+u8w+tQy9JWsYq8gaSytEVeugKYDeMus6ZtxT1HttLPnXsfHCnBPlsNubVyj5gtUeN+S+bcpA== dependencies: "@orchidjs/sifter" "^1.1.0" "@orchidjs/unicode-variants" "^1.1.2" diff --git a/netbox/release.yaml b/netbox/release.yaml index 2619279a9..420e71a20 100644 --- a/netbox/release.yaml +++ b/netbox/release.yaml @@ -1,3 +1,3 @@ -version: "4.2.2" +version: "4.2.3" edition: "Community" -published: "2025-01-17" +published: "2025-02-04" diff --git a/netbox/translations/da/LC_MESSAGES/django.mo b/netbox/translations/da/LC_MESSAGES/django.mo index ea7f83ac38e0e50b6903fdc9ae8fe0b96ccf6d28..2988b90ff53d5fc83b2065306d44c9252733fecc 100644 GIT binary patch delta 69227 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 qQ}_e3O;h`xU)&GQC$oNhdFAD+0 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 diff --git a/netbox/translations/da/LC_MESSAGES/django.po b/netbox/translations/da/LC_MESSAGES/django.po index bf9f12abe..1b48b5849 100644 --- a/netbox/translations/da/LC_MESSAGES/django.po +++ b/netbox/translations/da/LC_MESSAGES/django.po @@ -7,16 +7,16 @@ # Jeff Gehlbach, 2024 # ch, 2024 # Frederik Spang Thomsen , 2024 -# Jeremy Stretch, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Danish (https://app.transifex.com/netbox-community/teams/178115/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +152,7 @@ msgstr "Inaktiv" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -164,8 +164,8 @@ msgstr "Område (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Region (slug)" @@ -175,8 +175,8 @@ msgstr "Region (slug)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Områdegruppe (ID)" @@ -187,7 +187,7 @@ msgstr "Områdegruppe (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -257,8 +257,8 @@ msgstr "Område" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -277,13 +277,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Leverandør (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Leverandør (slug)" @@ -312,8 +312,8 @@ msgstr "Kredsløbstype (slug)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Område (ID)" @@ -667,7 +667,7 @@ msgstr "Leverandørkonto" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1102,7 +1102,7 @@ msgstr "Opgave" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1235,7 +1235,7 @@ msgstr "Kredsløbsgruppeopgaver" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "afslutning" +msgstr "opsigelse" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1297,15 +1297,15 @@ msgstr "kredsløbsafslutninger" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"En kredsløbsafslutning skal tilsluttes enten et område eller et " -"leverandørnetværk." +"En kredsløbsafslutning skal tilsluttes enten et websted eller et " +"udbydernetværk." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"En kredsløbsafslutning kan ikke knyttes til både et område og et " -"lerverandørnetværk." +"En kredsløbsafslutning kan ikke knyttes til både et websted og et " +"udbydernetværk." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -1542,7 +1542,7 @@ msgstr "Forpligtelsesrate" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2935,7 +2935,7 @@ msgid "Parent site group (slug)" msgstr "Overordnet områdegruppe (slug)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Gruppe (ID)" @@ -2993,15 +2993,15 @@ msgstr "Racktype (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Rolle (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rolle (slug)" @@ -3199,7 +3199,7 @@ msgstr "VDC (ID)" msgid "Device model" msgstr "Enhedsmodel" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Grænseflade (ID)" @@ -3213,8 +3213,8 @@ msgid "Module bay (ID)" msgstr "Modulplads (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Enhed (ID)" @@ -3223,8 +3223,8 @@ msgstr "Enhed (ID)" msgid "Rack (name)" msgstr "Rack (navn)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Enhed (navn)" @@ -3276,9 +3276,9 @@ msgstr "Tildelt VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3305,19 +3305,19 @@ msgstr "Tildelt VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RED.)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3479,7 +3479,7 @@ msgstr "Tidszone" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3730,7 +3730,7 @@ msgid "Device Type" msgstr "Enhedstype" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3838,7 +3838,7 @@ msgstr "Klynge" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4090,11 +4090,11 @@ msgstr "Mærkede VLAN'er" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Tilføj taggede VLAN'er" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Fjern mærkede VLAN'er" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4142,7 +4142,7 @@ msgstr "802.1Q-skift" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Tilføj/fjern" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4220,7 +4220,7 @@ msgstr "Navn på tildelt rolle" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Model af racktype" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4229,11 +4229,11 @@ msgstr "Luftstrømsretning" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "Bredden skal indstilles, hvis der ikke angives en racktype." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "U-højde skal indstilles, hvis der ikke angives en racktype." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4894,6 +4894,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Alfanumeriske intervaller understøttes til masseoprettelse. Blandede sager " +"og typer inden for et enkelt område understøttes ikke (eksempel: [ge, " +"xe] -0/0/ [0-9]). Tokenet {module}, hvis den er til " +"stede, erstattes automatisk med positionsværdien, når du opretter et nyt " +"modul." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6782,7 +6787,7 @@ msgstr "Modulpladser" msgid "Inventory items" msgstr "Lagervarer" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Modulbugt" @@ -7505,12 +7510,12 @@ msgstr "Bogmærker" msgid "Show your personal bookmarks" msgstr "Vis dine personlige bogmærker" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Ukendt handlingstype for en hændelsesregel: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Kan ikke importere hændelsespipeline {name} fejl: {error}" @@ -9268,129 +9273,129 @@ msgstr "Eksport af L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Eksport af L2VPN (identifikator)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Præfiks" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (slug)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "Inden for præfiks" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "Inden for og med præfiks" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Præfikser, der indeholder dette præfiks eller IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Maskelængde" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "VLAN-nummer (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Adresse" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Intervaller, der indeholder dette præfiks eller IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Forældrepræfiks" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Virtuel maskine (navn)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Virtuel maskine (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Grænseflade (navn)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "VM-grænseflade (navn)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "VM-grænseflade (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "FHRP-gruppe (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Tildeles til en grænseflade" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Er tildelt" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Tjeneste (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "NAT inde i IP-adresse (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Tildelt grænseflade" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Tildelt VM grænseflade" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "IP-adresse (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "IP adresse" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "Primær IPv4 (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "Primær IPv6 (ID)" @@ -9614,11 +9619,11 @@ msgstr "Gør dette til den primære IP for den tildelte enhed" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Er uden for båndet" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "Angiv dette som IP-adressen uden for båndet for den tildelte enhed" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9627,11 +9632,11 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Ingen enhed angivet; kan ikke indstilles som IP uden for båndet" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Kan ikke angive IP uden for båndet til virtuelle maskiner" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9639,7 +9644,7 @@ msgstr "Ingen grænseflade angivet; kan ikke indstilles som primær IP" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Ingen grænseflade angivet; kan ikke indstilles som IP uden for båndet" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9798,7 +9803,7 @@ msgstr "ASN-rækkevidde" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Område/VLAN-tildeling" +msgstr "Websted/VLAN-tildeling" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -9816,7 +9821,7 @@ msgstr "Gør dette til den primære IP for enheden/VM" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Gør dette til enhedens off-band IP" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9828,11 +9833,13 @@ msgstr "En IP-adresse kan kun tildeles et enkelt objekt." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" -msgstr "" +msgstr "Kan ikke omtildele primær IP-adresse til den overordnede enhed/VM" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"Det er ikke muligt at omfordele IP-adressen uden for båndet til den " +"overordnede enhed" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9846,6 +9853,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Kun IP-adresser, der er tildelt en enhedsgrænseflade, kan betegnes som en " +"enheds off-band IP." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10245,11 +10254,15 @@ msgstr "Kan ikke indstille scope_id uden scope_type." #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" +"Start af VLAN-ID inden for rækkevidde ({value}) kan ikke være mindre end " +"{minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" +"Afslutning af VLAN-ID inden for rækkevidde ({value}) kan ikke overstige " +"{maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10257,6 +10270,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"Afsluttende VLAN-id inden for rækkevidde skal være større end eller lig med " +"det startende VLAN-id ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12616,11 +12631,11 @@ msgstr "Hent" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Fejl ved gengivelse af skabelon" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "Der er ikke tildelt nogen konfigurationsskabelon til denne enhed." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13488,7 +13503,7 @@ msgstr "Kør igen" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "Kunne ikke indlæse scripts fra modulet %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -14302,6 +14317,8 @@ msgstr "Tilføj virtuel disk" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" +"Der er ikke tildelt nogen konfigurationsskabelon til denne virtuelle " +"maskine." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15371,12 +15388,12 @@ msgstr "Hukommelse (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Disk (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Størrelse (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15404,8 +15421,7 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} tilhører et andet område ({device_site}) end cluster " -"({cluster_site})" +"{device} tilhører et andet sted ({device_site}) end klyngen ({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -15583,19 +15599,19 @@ msgstr "GREE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/de/LC_MESSAGES/django.mo b/netbox/translations/de/LC_MESSAGES/django.mo index 1a628bec87937af98a2bc2a07851275a1995b8f0..aa2135609c1e4c4c6f2a435002584b79166c4203 100644 GIT binary patch delta 22246 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 delta 22223 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 C@QdjH delta 66406 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, YEAR. # # Translators: -# Jeremy Stretch, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Spanish (https://app.transifex.com/netbox-community/teams/178115/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,7 +151,7 @@ msgstr "Inactivo" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -163,8 +163,8 @@ msgstr "Región (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Región (slug)" @@ -174,8 +174,8 @@ msgstr "Región (slug)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Grupo de sitios (ID)" @@ -186,7 +186,7 @@ msgstr "Grupo de sitios (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -256,8 +256,8 @@ msgstr "Sitio" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -276,13 +276,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Proveedor (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Proveedor (babosa)" @@ -311,8 +311,8 @@ msgstr "Tipo de circuito (slug)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Sitio (ID)" @@ -666,7 +666,7 @@ msgstr "Cuenta de proveedor" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1101,7 +1101,7 @@ msgstr "Asignación" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1541,7 +1541,7 @@ msgstr "Tasa de compromiso" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2941,7 +2941,7 @@ msgid "Parent site group (slug)" msgstr "Grupo de sitios principal (slug)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Grupo (ID)" @@ -2999,15 +2999,15 @@ msgstr "Tipo de bastidor (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Función (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rol (babosa)" @@ -3205,7 +3205,7 @@ msgstr "VDC (IDENTIFICACIÓN)" msgid "Device model" msgstr "Modelo de dispositivo" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Interfaz (ID)" @@ -3219,8 +3219,8 @@ msgid "Module bay (ID)" msgstr "Bahía de módulos (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Dispositivo (ID)" @@ -3229,8 +3229,8 @@ msgstr "Dispositivo (ID)" msgid "Rack (name)" msgstr "Rack (nombre)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Dispositivo (nombre)" @@ -3282,9 +3282,9 @@ msgstr "VID asignado" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3311,19 +3311,19 @@ msgstr "VID asignado" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (ROJO)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3485,7 +3485,7 @@ msgstr "Zona horaria" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3736,7 +3736,7 @@ msgid "Device Type" msgstr "Tipo de dispositivo" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3844,7 +3844,7 @@ msgstr "Clúster" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4096,11 +4096,11 @@ msgstr "VLAN etiquetadas" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Agregar VLAN etiquetadas" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Eliminar las VLAN etiquetadas" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4148,7 +4148,7 @@ msgstr "Conmutación 802.1Q" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Añadir/eliminar" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4226,7 +4226,7 @@ msgstr "Nombre de la función asignada" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Modelo tipo bastidor" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4235,11 +4235,12 @@ msgstr "Dirección del flujo de aire" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "Se debe establecer el ancho si no se especifica un tipo de bastidor." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." msgstr "" +"Se debe establecer la altura en U si no se especifica un tipo de bastidor." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4905,6 +4906,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Se admiten rangos alfanuméricos para la creación masiva. No se admiten " +"mayúsculas y minúsculas ni tipos mezclados dentro de un mismo rango (por " +"ejemplo: [edad, ex] -0/0/ [0-9]). El token " +"{module}, si está presente, se reemplazará automáticamente por " +"el valor de posición al crear un nuevo módulo." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6844,7 +6850,7 @@ msgstr "Bahías de módulos" msgid "Inventory items" msgstr "Artículos de inventario" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Bahía de módulos" @@ -7573,12 +7579,12 @@ msgstr "Marcadores" msgid "Show your personal bookmarks" msgstr "Muestra tus marcadores personales" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Tipo de acción desconocido para una regla de evento: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "No se puede importar la canalización de eventos {name} error: {error}" @@ -9368,129 +9374,129 @@ msgstr "Exportación de L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Exportación de L2VPN (identificador)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Prefijo" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (babosa)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "Dentro del prefijo" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "Dentro del prefijo e incluído" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Prefijos que contienen este prefijo o IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Longitud de la máscara" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "Número de VLAN (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Dirección" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Intervalos que contienen este prefijo o IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Prefijo principal" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Máquina virtual (nombre)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Máquina virtual (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Interfaz (nombre)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "Interfaz VM (nombre)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "Interfaz de máquina virtual (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "Grupo FHRP (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Está asignado a una interfaz" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Está asignado" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Servicio (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "Dirección IP interna de NAT (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Interfaz asignada" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Interfaz VM asignada" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "Dirección IP (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "dirección IP" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "IPv4 principal (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "IPv6 principal (ID)" @@ -9714,11 +9720,13 @@ msgstr "Conviértase en la IP principal del dispositivo asignado" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Está fuera de banda" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" msgstr "" +"Designe esto como la dirección IP fuera de banda para el dispositivo " +"asignado" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9729,10 +9737,13 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" msgstr "" +"No se especificó ningún dispositivo; no se puede configurar como IP fuera de" +" banda" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" msgstr "" +"No se puede configurar la IP fuera de banda para las máquinas virtuales" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9742,6 +9753,8 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" msgstr "" +"No se especificó ninguna interfaz; no se puede configurar como IP fuera de " +"banda" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9918,7 +9931,7 @@ msgstr "Haga que esta sea la IP principal del dispositivo/VM" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Convierta esta en la IP fuera de banda del dispositivo" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9931,10 +9944,14 @@ msgstr "Solo se puede asignar una dirección IP a un único objeto." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"No se puede reasignar la dirección IP principal para el dispositivo o " +"máquina virtual principal" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"No se puede reasignar la dirección IP fuera de banda para el dispositivo " +"principal" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9948,6 +9965,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Solo las direcciones IP asignadas a la interfaz de un dispositivo se pueden " +"designar como IP fuera de banda de un dispositivo." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10352,11 +10371,15 @@ msgstr "No se puede establecer scope_id sin scope_type." #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" +"El ID de VLAN inicial está dentro del rango ({value}) no puede ser inferior " +"a {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" +"El ID de VLAN final está dentro del rango ({value}) no puede superar " +"{maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10364,6 +10387,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"El ID de VLAN final dentro del rango debe ser mayor o igual que el ID de " +"VLAN inicial ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12739,11 +12764,12 @@ msgstr "Descargar" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Error al renderizar la plantilla" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." msgstr "" +"No se ha asignado ninguna plantilla de configuración para este dispositivo." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13612,7 +13638,7 @@ msgstr "Corre otra vez" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "No se pudieron cargar los scripts desde el módulo %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -14428,6 +14454,8 @@ msgstr "Agregar disco virtual" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" +"No se ha asignado ninguna plantilla de configuración para esta máquina " +"virtual." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15515,12 +15543,12 @@ msgstr "Memoria (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Disco (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Tamaño (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15735,19 +15763,19 @@ msgstr "GRIS" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/it/LC_MESSAGES/django.mo b/netbox/translations/it/LC_MESSAGES/django.mo index 01dc8e853d56c94c280475ccbde0ba7dcae6a248..4d0136d1a2ef1a420b051f6250f6484365f01259 100644 GIT binary patch delta 69055 zcmXWkcfi%tAHebZJZZ|PB<-iY_uf;fvFNcMH!K@ zB9##d{oe0;KEHon=bZ2Pp7S~L-sdU(-d%d+N3R{3-B$Xrg&F==v1BGw34b4#$<#VJ zlX>qAOEZ~q`FWW-I37#j_1Fw=!;bhC_QOJj@-pLbAWpy)SPaV@mY1oG1xOc}-dGfe z;gOk4HZwXNOu=J$FcS~Qn~^v&cj5iG952B^h4V7KaXr?#or?3YeS3Efyo0DG}Zp04ciR-<(Du%X^7GO5=AftH)@&3kMFV&Wo!U3i2Hy|A zL|@#E?umb*ym{#qSaS@@(ch60XHUERXj`{#CT%dbGn& z(ZGH}13icaR`QrM; z*P)x~Ikdr7(Lmlqr}_)D;qTD^{zlh6b8HHWz6*^NrBY!d)*hK7#m!MbtE9lH_!R!JOJ4r0Xi;m07 z9D~P|PYpE+yP*vY56{B8$zO_<^SB2pZm4qA=O7WVH2Ez9q|Nw z68(_+6G!35s+@n<?dtCrp?hn|X>=rL>+`4iDAcnsR^ zEOaU7qMI~(4+-z;Rp?TDjz(6xdfJ3_!glEK?1y$R0UhBiG{AY`;wXOvy(wQrcl!qP z{V&h~>_^_uX7X#KPpQ&qgKg1~o`AkMI-H0u$+?&t3Fbaj&=Ea=&d3Ys`|ro|?NR5?bw$laOl)can z2cXA!Ji0{ZMfn^o>iJ(pq8{EGzJu=a-_QpC#Ig7vy17oRop$@g@N6{j^U#21qV=vp z1HKvCoUEgoWy)j!T8dVHciP4acIJ^xPJJF7oqHDGlozh+C+Wv+%crYwdKRqvnwo?HeST$^p z4X_iQiVbiH`W%xZ^0(yzd*k~lx&=r8Hw5MB)p54pb>4w0a&(4>fj9YYxN!27(c=~cqpvX zG~F8m(UD$*2KEv6VIe?`~+u;%Hrq%`{3Q6HUwGtl>M!&aXEM@ZQ5HngK(&=KrME7ot3 z0_=?L>OSa528N^2z$T&XoQGaeSH<%MXh8R(Gw}qv#4lkv&;QpX#^GOh299i*?(Em_ z6!Kr9Q`xRn3a~pmV|~Nn=&m0Z&u3#(@;6{ZdG|R1Xh7GY-wzg{4L*gww;!$l4;omJwrQryp!teupmou9T1WZuZ8`rw7!no6 zp(B}wj`T|Oh1=1F9z;j*3_2rg(D%2X1Njc!LwnG`{zNz5zfs<%T`KQ_ZpP!YB!-Z< z0R2X?4sD=D`_y0q^a5&$Zl2@OfCi%<*W)lZ^-=y9IukF2tIc@D#4}HIAr_@2Eun}6XGdeT9qI?jR@cfS_ z;hIhjFGr_(KDx$B(6xUW4eZq@UypY9RXqP44K%NFs#gwuzZUwnyB%781ls--%zge} zM8XcT=*Z?_uH*1&bmVK$05*o(qkIqg{(s@&T~fW{(DK@mZxMD22V&MK9z(*&&Ou+e zIw~wcXJ#oH&@<>Re+%8!AEHxQyla~BGU!y-L<4Pzw$~or8@bdv!dd9o@Mq8&*nqyj zBTK^XV*4<6lVLvjf6%Eu6wizGNckheW6{8>qVF|E18y01Ku6vkU84SIpeKc=qwQy> zlQ4jpXvNE-!nNp#Z;kxYc)lF%`1vSbi?zvbK)*5l73Ix(rajRK-D3l=IgZC>cpFyq z{J%xQsrV+`iw5)`8gZfH(@2gAD_}3mYhg>AihhAvhJMA`hR#T(UTLpXM+2^pp00LL z-UpBN{0}B!0H@^&I0aah{FUgYS%&V`7toP@h_2y&^d>9TJJlEmfq;c@+pzO z482irL1*MmY(oE;%_Iz<@CoS`kY&(FXQ7*B9y)c8qiePekH_!PW7w!qTKkFUd(+TU zayc5{HRyNDMd)UH4h!%n%$g|KH%)P)uq`@eJBv=w=*^1~Lh4@RE3bT|B=HZEqQN z#pUsQH_jk`0Gr^H6H|M4oyhrjtsbGk09Im6T!%Gqca)dvpE|CLu3claezz#^kG6Aa zJUG<5Skg6@H*aUi~qweYAx>6o=b zJ3J2!U=}*U8_@R_p_}v}w8Nj#8Qq5lUUqQq=Z$Qp5(yhR8Es%ZaxrA4p^@JZT&4OO~;e)QS6I(Bhnh5h+bqPFn433?JvWu9Y0S( zUqff$EqoC_#AbNiN$F?5m(d1(46B@+zJv}%r}hTyif?0gEH*N|*ALGpe+jxYd(d`z zjpF?Ki-Su?r4cQ_0`hmDQ}hxV=?3&TeTN2m2;B=sPf5>@MDK+f=<#eB<-O67k4Bf^ zT=XWq8FNc`3g_Q*{2~RqCLVkg`Ond*{yy@%(PMJ}4XDuQWF<7vR%n2I(Ex{_OEeO_ zn$JQ5of-M-vm|`+PIT>`jQmRU#SQ3-Ux$0qkz~fig@nG>7_HwC8)83ngfr2BT^0G8 z(e@UjGn0LcgiEjrt@tT=Ja(Xa;fE;ShmPo9bOeW;nwF?6I^ss?OtnJmbwJH~?A(fY&kWCM2Qs4_s(GFWhh0f@19~6#9r}|uU3a>yrxE-B| zN6-M?z})dgm+EVD&3}*QrO!;Ku6mY)4YWgF?1z5XoPvG|UWkrt0XhSBqW8rEXuvO_ zBYO?4_bwXP1~ky`(f0p9M_zPd@)$JWY&8-#)E=G6E|Kqpwa5=Z8$KUBc9)`i;z`WM zXV8&7hfQ%KdO;m_RtlgR+Hn(f039RWJ3Y^4hLLatr^SP5XvIs>8My{?QykA9iSp;r z5w1nw--y2V724r0bSeKt2bP(Xo|iz|EsG^R|FuZiKy&nk&gcuh(Gd@h@;T^C-H5L3 z0<@!LXdq8U`O0uT+R)+M{dSAMNP0a0dF~6==f? zqWr!nUlIA$Xh$Do9sCLlu;`T3Ze8@}icXmO{oiO3Eh(6Uc5n|ml~1GJXkNkExF1_# z<*DiT4Mq3H&G-P`j&|JP>~!8wK-(LDejgZz*1tc>A3K}#@6@l12kX!ge~6B78`|J6 z=!_ghXX@x_DPIMx-vX`QJsg5=!qd>>n?>K7kJi5jUFs*MasG|yc?ulatLVso!`Ap; zapf}p^iRjHX2EBSuM+2S`&P4ap)oA^j!=>oVtjI>eYV_Q0LcjU!!p4|? zPAYGPxlM`vC?AYX@NTr@_tB0wqxHT)NBT3`@j-N^OU_6hhxV7PNunu<_UPuDg3iF@ z=*@LK8tL8Wls$#+l^4U^XhYS{O+Puc#cJfoU_H!Y0X~Wi@Llxhfc=>J`M<(>>F@Ql zMmO1ta0}YdAuPaZ=ckUlV;k}pp}YGjtcjmuUHk{_pwu><&Z(}b!_Cg29 z`5QxGCicWK%K)iCRWMkH*Y4|+^SpaGnL?uGNh%hAntJ-X{}K~KXXtdC3ZReT!_z z32#Eb89j~8=ti84l`rG`yLpygmY2BzpT}eJxCt*$A2R-W&VY`OkLjUkKx5GvnHg)ALSrV9%mA-A7Tr2c6LpSEP^MDpye82wG9l3frS2JO`cXnP>plp*P{}=%?QX z^hVo^E%3N2^D-;(M05#@&rVBI5e>K&+D}vTd8^3x&XRB{PedyYL6>3-dTuA97ty8Y zi_f6PbPZbnQ}hD+1`X^-^qlWT13!S)FM3t_l3M}oZ!B6bJAs5R&Oq1f0<_`FBY!;_ z&;oR`-5WlNHt@fA{(6+ZhwhzE&;Y(gFSOs#Ko6gj?uF7=K>wMJBy4C58rdXt38tfg zTolh|NB$;sD(^&(**%f}Al!)F{aeuY|3H^Ab9EZP(da-cU|Y|B4H9-Z8V%qK^lS2D ztcr8+4153!u=q9UoYzM;*-*5>>F9`Oq8(m?25@`03>%VPj&8!Oc!KADHwiaU>uXbl zlhG+WA6=TO(5br?4fH0oqubF_@IaKmgf7(^X#Ee+z&4`;+lKvdCpzQJujBli=uDy} z_C-6Kj;{52;bl>NEjsmc(M>fU-K6(p1AG>}*}lg5SnB#T10B&B=^dVg20HP2&cD0* zd}q{fo{}ksFd_(FSWqz8TtKSG3(h;ThOo|*^HoAEX5ig`DscDthioPZ6n zKi2d7UlJ7_K&SXIbOg_#fviL~*}8bXHOhCQf$a_di}I2;ryx78Y?2bS`3u;8Z!$Qu#Q$CmiH_rrgZL(pFqX8X28z^#n>ZnTC z2o0zsTJJ=3Gmk_EG!|XD)6x6m0`wlZ{C3X2Yj+z3ZkBt(N6}6AEINW$FdtXN^VR4` zKS0;|OSFSuuo`9-rQe8F$K%P4Me99?UGaHrhJR*BI92uTNNd;;U6L8--F_b$=?iFw z@1slg1-e&uq4kcqGtEGCw4>%|{T|^EbTf`eXK*oEFZ&D$J6Mf=+HFMxI)IM6G|`rc(|d)J{$bR*JFHnW(7YyCtj$h?6@xCtHU&*(1y z8(pfJccoq282t^#Ol*v|pdGJ5m+n3E{f%hA+rzzRy+gU@oWH}Dq=NEcEi}Sr=!>1h z{%9bh(a-&B(1z|qkL8o-(rrWEJL>M#P8BrY06i`3(c|77i+TPpj|bPHk>89qd^@_C z?!z;24W5V%?nxcZ#CGH##nW*Ix+i+yn||_{j86HZ=uA9`2Cx#H$u*dD6MR6zHUA3T z1HYmjmtLB_@w7zOa5(nBap41Kz(1gya1VOC4qKK+egyiw0(u;)MZOL?z{bls{|3-L z3i^d7p@EzpUWEp5e>{IOd>I|lTWCigp!GJR_rcd_Kzq><9|#NGm+pll?#rerDisCC zqH9$Fjj&$iTZKK*4u+yLb}G7gXP_Ni9nWt@16myUW#|$tN8fuHZU6l&38!vrRQLrQ z`9D|}E8U+)ay)uN4o5fNbaaX4qQ8E70&C!UY>0dCJgoFUT8jDT1$8$X@KcyO|Eo!O z{x^lY(7QbIVA@<2(WxAc208)#Mso>v!&@T15xbDzg*~zUL&@pr$e#`0L}%b5q`hor z2MMR*FSOyq9!}@FV%QQ5s6W=mv(V#tGrIOm(Dxq*pGG@e8PDHE1OGVuKKv(VmT#$# zq)k#Ay_1`uQ$IfPH(+NQM5pW^I`t(VO?#&?x@TITfpkar$N+4PBe4_Ci|6m6$MO>_ zMgN)4NjQ?-=x+T3ZQwt2>We>?8ZM8G$=AYGI1F3h4e0TD4c!ZCBL5BA-VbQt`_LKA ze>??T9kZTO+^sqn?{jqu%YBYMof2zQ_X?~3Pp&^_~4lvjNs zor0R^OtpT3^Y5`3MuCx^iAHt~I;AtwrMMgo?0WRHEI>EmBj}!a4hQ4+XglqmOjF(i zoylQnpcBz{r=k6xpCw@j*Pxr{7PR5J(W!kb%3qA~HE8_}QT_$m&<~OS8-2gXQz_6g zXgl@L_S>L)p$FPdb{GlQZY+8+Oh+qTg+_iedhy(ccC-?${{gzT+rr)9Kk@wVr&Bu> z(F?6kxh>Eon}XIqFY>dn z7x_8pjI2iouqE=la(T|*pCr5>ia(PYsDd_FCu|bsZP2ytiq249bSg*0^NHa(=zuOp zXX;wC-Xb)BN6-PhY`N$Eop|t>1>}E5H`%}F%~$4ssk|{--USVKI2zDobcE+e{z`O; z=b{}gz}~nF-F!dB^F5gR`F}r&T0F>qHoaIEZLkT>!H(#+-#5@HUV~mF@1w_eCwhE~ zJ(r%BL^oGi^f(qoz7`r#Q?#8f&vE{(Z~_I6q(3^fC!r%aJ)DeA;QT|ty7kVlE-tdU9CtB}P^!=OAO`5%vglqjUIs?yQ0j`PiZ_%~=6%A-V zS}*f*8tKvKQXPv%Z0(Qjf(fV)UE%+JE#Hp{wOrZh)g|+EFbBKf^s{LAgD4;Vk z3~gvUI{2VehylHX5_C6=c6ON1Kqq2q3u162J#%{PRSc_{@h7HL-j5fRp4Qv}4@Q>j>w8I1Fu`awi?U`fI@`kIk z=|S6g&?g>@MSqDr1&#DNbR;*Sr{Pv~b1p&~ekgnat+x){#P6dWeT@$6XLMi(B40GS zCRI2F-CPA>KXhalqEmbY+R=Qpfo15DJQexP=nU*Y+xZ0zy!_f!UNx+bURbTrJ(e9n z!U%_>H`Dm=GIW>UiH>9)Ho(u(AJ2=vm8QBX+E5)du*T@jbc}qza3ngQiD-K>Qa+oR zL&64bLO0_=bZzfJN3tI4;C}RrNR_u!y|(Ck-LM~?fal?D=*Miab?H=8z+U9rqce0R zcE@>``}@Bi<`S$?xDSmq|DANMOQQLXXotPfk@gQyLDzN?y7?}Q{N-qebI}psjxOP& zXn-%9_x!&{!jXR&eus9n#|pSV%8S06IzAem;wtFUH9|LQJFJZ(&`o$5+Rkh=;Oo)) zi^BUc_uv0L6&0S32W!HQ&<4IhN4Nuz$GzxCTdz;YsWbX~7~1jp$e)SM+<9onm!a)l zAI@LT`FDyIQK0ul#U~>F61w}>pi{Ofo_~kV%&%w%h2Bd69D&}X70}(^1P!QFJa3QI z?;YiX-{br{k`WXb*{Nux6VQ%lpbcG#25>D}|4#H*FUznievYSOrT5cc!Mpf}CEiZ)z zP##agx@f&Q=+w_e17C>L&t~o?VF!<=g3Kzk;yN_)kI@Eppq~-Duo?b`u5Hr|>0W4s zP00_$26zSfd^y_Q3bdV9(9`lJHuCfTD-uS2#K);ZSv0~*=uFf{@BG&2jI>7s>52wE zES^t7H}Tmx7-ym#zKgE;26PW?i~L^9{r>;oC@8rxT@>Zf$Qy>u(6w)k2G#|8Vt;gG z3(x^9K|6c^4g7Jm{tIXTYtaBcMhCDHvsU;kDiqn2DwIJh)Iy)P!&=xoJR9xsRy2US z&<-C&>#sm>yw@ZDF}jprqwVgCeBsTUe;*vXIaR2GM%oq~@$r!#fOW~Ag3inww8QIh zEiOd`SoV|gQ9L;h`SjsreTGj=8RBmWlqVOM$!=ii1KZ^_Hd#glL`?m)kIT)s6u ze+lj28}!@kF`uOmss7lQ{3SRUA4QMXF`wsU7UBqe7=K3V-S$QL-S2AjE8C$g34cJS z`emxn8QYLQ8x8D1^qhWx)$u=cmsi`Co)1CumttpJjyK^?cr{+~RbFNsX1-4K#-o8O zz?PVOgM?GGAHA{aZBJi9hha7Hmt$94igvIadtkvgsr(GI-h)^J-$n!d37xScccj1b z-4(632v5Y9aJuKe$jfpV{aYyaWy8WxP6%&4sPWpSv%8{y&P-$bW?0vCFS%Pt8VW=4EsV|H144 z5?z1G%S^(X(PMQ0J!XY}Pv^Ttcno^(t6*WQjox?-@hEH)`QGt-2o|FJVQoQY;>U0wI%5aWfd31R+@JPT z6*SPX;aTVs&d8EzLE?Ti;!n{j-4Xd;BL6o!m4*LId!RU)uM;*vN7Mv|Vmq9UH)13F z7wchzztSEUj=A%{h{U-(cn_`E-EZ$wA2(lO?p1MC+49`a|;^KUFc?i7<1qMpC@4eZ=)4Ap&vfmtbpbJ%gY?V`e?^B z52Yz=gf`d$y*IkxZDD2~9f=oCL6 z&)1`yXFIz2zDLjZ0d&cV=BEITLZ4T~GT01#empv${^8*KY$_N|ff0>FM|2uG15?ok zW}qXw8eNk4;j-`yQ+@9!$o`#WF8_&y8#;4QLPgUa`XYxjmOXnuHBhMk_YL zTG$=y<5}qDx)p2SW9aVw0Nu3Tp-b=^dXwfAN$nhiE@eHm{Z{DA9Uu7-NPpSPnI!7+ z;8L`s2hd1gK|9)nHvBUh(4nw?(fr(}-f*;odFTL^pzW-{rnnBh*bbnZuTHV_yfqf} z^S^&C!LCOG8G}~52JLuZls|%Qo(*V6o6)7&h1M%kJU{pGTp69>4(RuR9+97o&B@<@ z4)9gX{rUeVB)oXO3ctew^1IO~JhDW7=0dE1@8T`^DULooKjY_n%aUpHU4(A7htW;= z3HtsQk^cdmkzddyt9nF!ChI0?M8e(Q23^yx=!p8GyMJ8d&qrUpHe86#)cxq%J`?4u z!wp!0@~^NJ{*8X^ZhB;D=fop9|BieV1x7j^ow~EpV{!pHlAFw{zQLUc2Kauny^hW@6&^PP8e%9lg~Dud2MRWz{X=!~^T z>-R(h7#PooqBC*|`u=2eW-mkskVW6W5v{k#0yo1$=neQf+Tmt&>VH6QvVYJiKC)EY zY+*BW_xC_M7>af{9_?r{I>7Uz{8F@?Ip|Vn7m{#_?+YJ6UwjfB;fv@;-1UbOyy=m3kBN$(wjmY2oSp8qN&9C0%=;tuG@dZ7*XN2hpnI2E13 zS&_dn@^_;%^CTL`8|adLfL=&D(SaO92U`3Xu6p{d-qYYn) zzIYqj&?9Jo&!Zi#jq;Dt5q^!n|05dkKD1tb*|bDQVb;x8hlCAwMLQmVRvd-S%tUl% zW}qKFv!eXUD4!eo+tK%zqVF${=PyP18ua~-(7-mA<@_7jmlPPlFKGTBw4o!8O-oT8 z4WIy>fd=SIbwTS53&)`yPmTP=k-r-4Z~@xRVsu~+9?SW63ZJ6DDSHhKW@T$-t}Se<-rbO3$O_lHFORJ5as=s?d#M?NdeUPHnun~%PDHyX&J=u|(8 zj$mCp{}QeLBiitOwBvu!_X?L!Gj}w)*5%OhN?{%J{pQG0XER+$c(DwM2dANdOh+TV zG`u>>Zw~K5PsPJ%pf95xeSikE6&>+6@q8aTkir$x?yrEydH$P|a7z239i9?SKqH+V z&O!sb9$ou|;r(cbE6~q^m(jiR8ae}O(e~d(-}?-$_k+(p|38y(D)*rs{E2p4sA3A} zXtaY0Xu~za`e^-TXh)sUdfm~1^o#uP$e$XXg|>e#=6?T|C1Hd&#)G@jNFPI|@Wsf# zjn>*S4!`fLj$XY4zNBtfTrmCZ7Om8UAyiSxHcou2Bw4;p&eX> z?*92`KzD=>qa8etHuwr!|1ETHY((4t4js_nVX?}oontF={(Yeq1x{J>c+e3Iq#xSw zNs&J-^3%eL(FZ8v)M)~pR0EVFNk48H>8x3S8`u-gBL+KXuBFa8Y!l`);t@s{VaSPhOx9G_B zqDypG)l{!Mx)*ApOVSEm+n#7({m^!Xh2x`q8ahK4ApvJI*?4e$xBwl&UFb-cNB*_Q ze~6BBJ36I5MSd^(-rwkZhZm%JmC=FJiG1_Ocf`V;|K22QsDD%#f^MGC;dFEcW}^+= zj*fI0I+91C{AqOLub}O%L6`O&^!*Rf8QFo(_+Im#|No-k@M>cF;BR>YMKOxGeM)@UZz_Zbrxe=Y2d(c3i#@wI(y%ZHzVQ!bAFMfjViS3x%r1AVW zbP4{7e17%xyeK-tBhbJrpn=zo=WU|A6FQK7)j9uG97=&B7>_n^R#dzo%CADN%p2nQ zO=w_uMgCzl@MqD$UP9Yljkdc1ZFftQe~Sk2TlH)j=|Ku?ut<&6P-(QGa_Gpbp}$h8 zgEm+{%9};L4SG5{M}8>!{wTELGthu$pnEHe?ui8^jN~D71W%$J{ttcOCG@<$9nZf+ z8~z4e)1T4$|AvKXrt;!wc?Gon0`$1nMbCX(^r!3WKoUkc5$*7NwBl^Eg9T^<_lJ+8 zo9BP%Osqs_ZZ$dsAEF)aMBCkkj`&Y>#3gE_eySktXEP0>pcA@T`bB7FUcXNIv3>*&raX%ya0BN4`@gz%^K*aXG9G*L z;7;s{+tFXeRIiupf;GsG#yWTf`UeY-;6&VsUGc>F`I*!3Mr@9I!x|0JUK@c9U_5sB z{NF{QEp9_2EY~pov^ojx@OJb!m@lIv+=`3xxQZL4K$bL4KUS|n8~z$wV}&O9>HqNn zr;>jN&%rWH)6&hsY+VZGl5lOFMK{+vbS*!Q^6$}2a}eDVrJJStHSi7cZSV>_fMf8I z=J~n5C$I(GJ5^ewUsTjaXJ!(fjPJGJ{P!hMt7U%f&t%TQQ^{||8?kMxe0~|p=Q&=F zm0IWL{w(OB@K@|kdFM9yxj)&s5>Fz(8ZX3(ZPTw{7NC1*1KMAycB$UzcAWqI6g*2o zPt0$hBJPdD$PdJh_y9V!+rx?-@^inU9gbZopO2kzLzExYF)cw~Y()8$cmh6!?yB%+66Nt)G{R+Q$Nxj0zlAQrm*|upLhBvVGyS5n zHri3|a146)pN9_Y3e0U@Y)F1F`u^KJIsdIlY^A`+jygU)sDpjTw+pXAkKz01uT)F) zO2?`XdI~N=1Go}hvPI}-dmNpSmm|L!3&`(8>lN;uO&`1Ed#8q~gmv*ODm0J$UFcLl zh;FX`p~v$>bflYcD1L*^T@yih(u zKZHI6ghJunqaC=u$j@kKmK&eR9&ETEqi$$}gV4QjCi>oaXuWx8 z`-{=NvmD(M>#&jM|8o+Kp!l%VPz9_@zA3sVMxsk_DH_-+w8PKPhW4U+q0sPj&a0pu zc0lim{%D|M(0-<(^)JKRzyEVb6g-Gd(JFL`-$k#=uh5PTACbzdpy#;-TE8Q@n|ood zBXp!w(V4g|T!z+rIi7DA!TC3m-BF>~N$G`ZXvOyEZXJw=;mJ`x278e|AE)Ch=%#9L za@qrJ&_Md30gOW1IS<{Gm!LB^`()0)BfEnFH_7AZ3#-u=zQDG)1M6d@ktvYg=x#m{ z&%hz*TEBpHuoeyYee`4aV|402K{w_1;jdW|CsOb)8d2X-X==xzYc~mf@nXzf7-+-G z&;TC70k|Cd;6e1g<4;NL4M%5q3c7c$K?7Wh9_Q>MBs@0j!Y|N{_M$UWbacvBKsQx0 zw7ds8;t}B)IEehY*b-Nxd+4w5h%xEPu8t095HgT#W;_Wu(V1xE=b%%41$x&%jz+u- z9r>^5SFJzMKw6!ej@=39`@_+|CZK!ZJT&mxXgjx|{Vl<6e*Qm1!p-ypcEBcM(*-mI ztCL@iC*yb68oP|keRIiNh|S4AhMtly@eC|JK7A>jhAzztY=Qita_&D!Xo=^MeG7B{ z|3B?dPv`qi^d{VfW3l=fX-a3K`HgrQwwRFC`gU~he2rbO(V6K=K0CYz2U7lFSao6w zY&tpv&tTTwxRQj&=k0JKy8FLEPs4ZU)E+{Y=BTsM47Eq!Ux3!T8$I{WqXB)4wo`gi z+6(2w#^|Q(F^TivpTwyY`1!s(9{h-wA2vC4JOpj%G<0)KLO1C>XaLWlYr6_P#_P~E z{~Fx`zoMHiZ%PWJH2S>Glx*7l?I^H9e{?ULiZ$>-oQ3b;wb*NFTFVb`D*61gQ^(WM z053u}-{t6M!94UTzcZe{iS5b1gU--l*=gy#_YC`^5s$#!E{^I*O1Q&{Yr6j%Xz(bPjbY=Q>ZA?%9= zG!kp#R2+i0pzrNOH`^|BK)<7(9r-hIGsM6DM#2Vph7! z^gcSpUtm@IEy~MWltx+|4WuRd1*QvHZ#=rUu0)sW&WkwzZiXi*&==ytDs;1LMqk(- z9*FW%Gt-4r8QoN^!=7lvL&AwsJ`25|ZixK-@qEQh&cDa%tti-q?uA2WKt(T39UP5r zx+-WxEyMoklAMWd#)~6AH@pX}zXDz2chLYpN9*s+Mk4=`wD!lK4c0|R-T_^jq38=| zqYY%yCAbak;BhqIHP{#5M`!T3OH+F_(aqNeZKoR=PcsF{E zH=^~nq8)BSJNOgrxX`S0tV*ICl|i3ZMsLD;QQjI2yeqPovYC^j;7qjQW$8iY2DGC) zYYG7IvGR+ItM0v6Zvq{I8|J zi{%4!2EIf){1F{t-c@PS9D}vVH$ZQ)A?R;L&c=p#0~X*5==)pZ`CfEy95E-g(-7;C z?=godakrmML2tYfy|Ff9AN&&ypxf0<6%Ip>-zKzyAJLJPxhCz2lkg<+E6TBDQEFYp%{Rui{+tHcYh0fFgw4uV+C67bP8-#7J zC;1-e9=a~d7h>-GFC$?C&!B6$Hr$AgbUXTMwf*RnA9H=O33~kchU3uFb7AD?qsQ-| z@MW}}5AbySIpwqb+idxn*%VAer+go}b{*!XH5-ZsaxQuyU5gFyRWyJf(ZCL&d!fR- z)Nvd1{^*Bxd7lkj*vheo~$N8uNdZ*xnEybC&& z{m^=o&<1CqfnABM@jC2+uVYs{gl_7t3-WXSkkL74{ZALf`QJuCCknntBd>L9n!3j5 zrtE?4-ofbcITh>TS?E;Wg0*ltI&&YR9ejz6a3^-f(zm7KITZb7_4sX^|28Dvroi2M z2wjTu3)7T!Mmrpa9=lV~dS{2%VlVQ`(5w0fbO5{2hz|vvsh%=f4RFFPuK%cr@aRu{Pd-uK5bAf$Jl`2d!89-V{Iuw0=|c8_r4Sh^K|K z(HXoQUHkXd^S?C;zC|0{hh8lCOH;>H(HGjGo9uXWq4hYnzF0FR{dY&jCHX_Y9b88$#)XpRQhIXn>!a1=Tt zGtkd~OT)S7H=?`HnfnS2U>D{#H@YPGkLKFRW{Q%qqbleK>!$~qc2PbE4RAC%Bd4Lq zbqYF?tI#Q4h@OV0(5YRCo}vv{6@S6Hc;sX8X^6S=-=9QF9!x~f_Y(9NtwI~vhEC-{ ztc{f)Pan5E(WyTN9l%U9kU40;_n-kjfCm0N`o-gQG{A4v^ZzFaZ@iMr(+gG64x6D< zH58rVlhLU>3q5wz(T1Ny@AwzcJyH0H^n*%qG~klxac&X$iRjYYgt@=}cP9y_?&0v+ z@Qv^TbPs$U`5)1d?MKgdu_x2}mC!)zMZR6wD;ye*L)$z1NzT8COXI=yXv4Qh{*kEo zT(~;ifZh*Zp)*kasWem7(e~<~d#P3Adxk@zd|Wu)AB}wB@+g>xj_5A*L**&-`C4>| zHll0yU6db0J1YKk3j8?CZDMq{w~O+=Q9e4Hg3Wn;NtQ%S5>KEne2i|s9cV*&E7D)3 zI2sLL1X?}`hu};s!1d_W`!n{#de5XKxd2y@pN+QP<9}(!hM@z=jv;X}iF4z@dUWKQ z(2?&#cllrF?#?`$8mfTa0}aq!-5q^C0Sho2`K4&bFQe_QM>pkmbN+^qa3o{U z&38V!2d;_o#pu<%0$rN-u`T`-&uhMr0_}h!Der;3@osbmzeNN44ZSBaFQyqOiKRXN zl}T8!Y1kS45IGV1;6yaQ73d7Ci~L4(q`RX0Uu;gk*h}fWcR&N5j((`k#fJC_dg1+m z+4>|Zznp%8IRP7!zXZK9AH}Qi9kgEmSJD+a6YG#)7QTaSzI|cim8qR6Xorij8NQ9K z{Q(?|1+Q}c`;s{K)%5xPD*B+tYiR~9z_H}#V|(0-^=t>{{B!!1~5ZL0q>HYK0^lSBg&b>B*V)oK_%K>jhb!+~$-XBOa@ z*eZ{;LyudNchYHTjc(o((7;BZYdit{L1rHMneZUGr=CLxycz3x{tu9Fq&416FLXn9 z?Ian` z;jhti{{uR8|Dd1adGDtwD~c{nX>>$Yu@yE!kKu%HCb}eZ(SUA8+rJwP{6X~nXEFEr zzlMand@H&K+I^5J_CQ}8f;KcN%EzODoP*xsm!SgN2QJT?X(Qi~0 z(a(yuA94QeUr{vGJY>?7zVd<`A>C+HIYfCly_vKRROfA}-;&B3pyeIW_xoT4fBqj$!pJU)3fEv`^0(q5d=qVW z)Ykab47%CopdBnnPs@8)fPbOwmH#Z&uZwQpZs>qcKm!?sxqts}3<)osiRhG0MPE1< z9r4AHzZRYPo6sq|GoJqs-6L;Aeh=Etzvyu;^m+RAUOOB^{$w12&tvZV7ylw{hNG}I z56WXZ9FInP7div?qk%n(9?MtI^ZYg%*iLj0>_KPX5c=McU#5K3ura#CoxbG!d-sos zg7fiw@;64s{B3ECOQA2+LObY;1~LHccsRP*#$j&ngtwrZ@iBC-tU?3YgdOnPZJd8M zL$$BcCTfX&$@hxpPY%Z8$={8ga7UC^`zHP3@oaSJ z*J2kuF1sVX-J)wVA5X$xus`Y@S5gp-nbm@LYXZUaQlpObM zx?$_1doJ6Bgj3cNtvDv~mxi~YSLqWt7B`?*bhGc$9_WPzGz9(F9)~W`tZ*LM@e(w! zC((htj%?CwW;F@d=pA$|ze2zL?m~}A;qTMtDIHcr%bTKCXeZ3aUT6n>(6t_g-h|V_ ztI=b+1P9!(Dz#6-J@E`h2X5^ROyDhpz2rbZWoE+_6J9 z^C5JGO8=amS4H#9!p`XN?1x!j97V#-Fd3cF>F5;B4CjSQ(SV*sKRn*UmiP&J9~{0r z{VmvX=m@7^C%hVcz8VeuLv*P=-Oc$ok{>8=B!8m$;=iOlaU2?XV>HkXVL!CqDd>BX zu?5aTr~GNO{)gBczrwCqdQYl96n#EnPc}{21r!+Bb?7&j`RGi%ALXB*FKk2C_!q2+ zh4<#?{_UswIEwsobi_sXC6C85$zO$yaTgB8^1r4FY)Y1dBRLlh;7arqT#t5mTlfGv zvS-mBI5whtVLw{`*x%B!f2QXx&{Huw^0#0!@-L&u{AYX`8~(+B=s)u%38!u^ z8hQSK6i`Jppyue8$pKg!&p|J!Md*9qq8H4c=s-&To&Hd&1{&~W9ErE$c-)Qdk%0#} z|BiGy38!`ydcHTJ4gQ2~!puKuvmK2F(iHtn7=pF%LUea8LF=za_r&MuIo}l?3`_o- zHecm`IsZmnivsN!4h<)xYjq`hrQU!IadqVPVh{55{!6FhY;=a^q3`_;uSC@n{K?VI8I=*YI9GxvSu52E)*3AXNV?2TRVZnV8^ zSb#gwzz)kRlsgqiWJx$h$DkiJwIbgGJ>SF7DLo$xa1OdO526jf9M4}z&-aJn=V-g% zqa*(-$`8*kl>1dqIdlNo?j)R|5jYIbLC@=2Y=G~f$MG-pc>RNpphTgRFN5Z*MZSLI z+lJlHi>Pln1Z{s5vS;}Fza+eX=A*m$cJyL-1S{c3Xve$Jh7O|j3msM{w=~7k^L-3j zzY1Ev1GdLLI0WaQ^*%*sdOPO+|343ra0F!vrw%Hi4b?;&>W0qHKs3Nf;iXZ2WB4$- zx!wr3pnGT!`XN@hNP53C=Gr&!`R_);4u+z4{Ml$j^U(8uKYHw5kMiwN{ueruV~VEt zo1^&?(Y2k7Zq~~qe`B}|-BZtDwh@W7B;4h{p)>Ix8hO!TDdNg#z6l!G@o2r#I1wkH z$MSu&;lHsvmMEU4yg%ChN$7j0p?hsg@j~hM|Enl)mwtdw`S!@~K|9Vbks3M<-2>Ib z`e=jA!w%?F_e4+0V6@{i(Y2p}wtp!a==CMCX@qxDU`LOmQ}+gXd^V$N{$2PNTCc?6 zg>s(_1!%nvX!(iZX=sNt(SglI16hb}-lb>&4`oU8C-FRbo)0UTMpztOyHeO33()67 zqx@vNgZxCa!ORh9CW@d}_)+MR)IpE$uy}qlIz!{5JUfkqQ*tgE@fGNl-hf^xx1uAw zH}X%T^;d@PqBFJy4ftntqzBQCiX53NgVrkuTPCxa6G)8Z!D#e_mFSeelPY9BkNh6= z(=qR;Lg`<_LO-5w!HaP@cEs987s`Fyo{k0N7or1s9v#@5=R_5A$*frJs4E|rc? zW%NU(19}l5&+I!%33^!?W82)m&(HXIG`%*bCEF2KH&-;cdL|G$v% zoVPBMUL1n%-qRyL6P=Oku_oSy&eSS&?cYZO*obbnZBf1tJuQEt^$(#-RPvZYxgSz1 zV%8}ePr{1#pdCMiTksVej<=Of4eUan|A_`v^4N6oR6+A?(E$3QOEm`j;DvZRu0k)m zBIOEYUc`cOod26iY^A^kCLNaoxfE-WzY3kwMQ~rUj?J?!kZZE)AaVhjc6?8;3(Op~*z59EHr(j$1=VD!a z9DCs=^kcVTmDJt{G_cdrz-OTCUyLjr|NaLFkIP(igiFwfpGJ4D$pmPH3tD{PL|?}9Gz@wsx&-*^&sG%dU=oQHOJ7kWw_4tGX*wSp9Q zBXm=CMmrpY&d3;aK-Zw{FGe@#qv$uFuPpcce-{=0KzH?F)zXyJKpSp`p8Fo?^Ruui zUW;zN7qKC(#{&Ed?Vx=1G~xm@u-fQnLko28^uyfW{~bZXDL)Hsa7I*^gRa@l=%!kP zEpQn&$IaLTi`7VhwME-G39Ua4PsYi31+K>29;%tXgq~89^FM+I*HGY^eTl_!@Lc=A-Yuj|Tc>gd!aLCb9zv(`=_p@^ZsN`841R~M`2qCD^o@jucs$u97jm(npg>h&^=b@YK zs;F>tJik54A4Tgu7thy5{ypqQ`4>@MrEY4s7P=&D(T=;JGtdhiNOl+rJ3JMQXmU6s z%4eb-&IxY|A3!gdXVEo%C(6H$^1bMc6|R>ojn=D*2GSbokH7y#!ZqrSb~G$K$ee-h z(kbY(Dh^fOdR8Ix|nk^OrGqrJ`%QHT(hX_)j#TOv5zwMbYvK=#jUTvm1&ZmS4KbI>!Ib{G53Q9b|ya=?f6kNuodWW{REp} znWkx`do<t6hdu2a*=ND-fBgRVPONEWm0Q;dc zJRHa4S!jFjHjDHBF$Iq3N3`Mm=E>6NF0PKA_a>}S)v!|A^r_Yv7m%NVZ{mO03Eya!MtlhU zs@1f8IxSPtfSy73&`zB3|H{q+I;!kh_uU=b-KEjsu7kU~J0a;L4KZRkjk{ap?(U5a zgF6iFgS*4v1KeNrspj8z)_eEeS8MHjyX>pld!MrtLI_~$3Pzpb;5778;6{1>{VEy+ zsVe!n|JJK9Scrg8pcUK(mIW_^4Z&oU4dM=P5!Q1Y`^F&b?MO5PZ7 z8F&Sp4GyTv#U$^4hH6H~gF$&cwtzx>AC$ArR^9k?*$k9M`h(fQtzc8|A}CLFo*Kp< zEJlJ2(9eT;z-%?;Pda?*2Id9Bz>?r}(9xX9aVGMGMV4B|*ZUQ~Ug(p-4q(FCKJFj0 zv4Mlo&w)~)c^%`^^?XoP_#Tu-s@C;!|G$BY!EkindOq&Irgwspm#e;UPlVU!{jY*y zJ%+mAD{v%OwtkMboOSapQFY<*N2m35fv{TnDZVv=^o4VVR#LZv`?|0{xW_csCMs6rK|ffBbHi~}A7rLkk6@Sg>_ zCmg05#>Dg#ltwN7wovyv}_#=%m>P+-x6SLFb0$}-UG^~+ncI?Ry{*UV=GI6h4GhDJy5Yb zC_51b%G(hO_64tk)g4S)bTXdK8KAsIH$izD@^|)e|33dnuqygnP&zNs#aMZDP_EWi zpsaKpDE=v6dT=o)H{~v{Jop*R36|(;99b*SA!irGBojCpl&xC}76Z3{vJ(%$f}pRT z@szg!g{T)OPxow4cIq~m2h7{e&>Mm&(Wio9Uk2s|Pl9q}Z@TgR3sGEu z97bYu3{s#oC=XQ#D4jb%X=E}e1r~y`m21`i2+Y8H{#pGg0}bM=pnOG@88ja1!YG| zfwGY5pgf!n)ZYQ5p2HNb0mDJrnhBt+aI)fbP*yMtl$9=1`vy=N*rNVppsesBC=EOU z`^2KM;?#9v72jz8c29}r4|2>(=!?FhS1g3y&nta01tpAzz3?Q4>KOx@}O*aT~PAdDu#iwqr*V=pZ_N@k&YIFQgACM z35P-Xw0Z-Sdm?qX@fA^VPzpB(Wvin>`4VgtSQ3XLA^X6t?s_kye&b%Bb1*(JcIt~QoY{!F=zYvtIzXb}UI%5%9)PlCg?btG%Ao8-T~HF5 zfwJXY6{8hLfpVeD1?A{gDeePh2QI1p5EPzopzM$%QE#KLFDPdk4$2u#24$;OgYsE# zo9gF4NxTV4V_!gN$kNBabfB!T04PUN9F(`EG$>cF4V3tWAUo+WZPkDqUdZR#-!^4JZ#~4^Vcrzv4(R zzP$fan8?F58~%XRBe6;%ZQ~cnc_7c0%zIDDihdS;=EX3$L-PG^=7oP#W%_7y}C5L{L_~ z9F(Kn>R=*I^J#TF1LYa`49X{oq=Sq*zc48FW}q|>2+9gVK`9gq3gIMBc5ap89#D4T ztm0iz^4^2O^N)jxG~hGXC}0KiqL&8c;p(XNA)uVSQ*jL_PyIf{>P<<VP+qSlpqzCOC~>{jKUUER%IAh9U_Nla;xo0U z9%?+4#TDy-vXD*&I!ry8NWtNt`=J2k%x8mAaGBb7sJSngYMt|U!6%S3>`o@<4vFt9#K3EN+TB)AA@q{UqRWSG{cQA zzYBq)mr$$^`l5FOWyNDaIhy&PJdA6=xbprV(12s0JS;asd0k$C(&-Pyvww;~3;iu;-xY$wnDi3>2c~pfqR) zWktPJ9|FpjP6nls`Jgni8kD>ppv0e5|25Sgg0e%eNAaEu@kb1@<#9(Fj|Bp7e_lY)|%4wR$vRV)cgqg6n;%A0`FNC+rf9jp2H+7}7R z`@eyStY9xF1ZNdrs6F8X?IQP2wB z0)_X-MBaayB%EYCwP_S{fYL}2#WJ95ePz%JHUZ^Jvk1j;>R$;;-cH5+pfqqClsY%T zxZq>Omy>w^97zk))PY>Kg!=|FkUt)M)NDqPoNa| z0!m)|X$B?-71?7`R15gUK1?9aBRvZWl z;WSXlDswH@>5C|BKASnVI+KDhJ0u)iG7UnS&RYf4J~V z*bKJ}=Hm@~_2tl!vJi?imG>5@L&5FXcEOdI{K@iEB2AdLU?kRt_JQvDTz;l>jBf`u#4ULf z81>!C3mhUTwc9!bwZry=#NX7%|G;e;iGRPwbYlf=*@Y$lDm<3>tK|J7M*zk}zsFo2 z?s4*J{1V-Nd96kfC~{Cf5cz{5SD7Xzfq$99|J%tImb&GCVk?O)32|}QiC4sKr@%1g z8L?f_hF!vi3?VN&`I8uzbr)l#X{rBHw|bd&c0-HYS8TyfOk{pdw@nD&Ky;M&E1<}7 zMiF>gD7o9nhe3?X%6kBgD-^9qb7Qf$1s%K9iEaufxdlO$b$e6lD#YiHZ;lsvYOiKe zF`q{xRoRhM6sWC@-^AWb=WVe6178Yuc^9!ZVi9Bim*8liyO5va14+7!F7NIH0%ubA zs1ij$l!CdRHhB!cpB~*m*k$#}$(?L)l2sU9n zsh#hkfpF~C8Q&N`Al;>_#bwG!{3T)wLRyf#RO&nE6*G{S?!?Td@tx#{f#(?sC_0oJ0k)13%aWXXy8v`t`VP`CYQVI#`EV+sP6vA*KiQXXTLFw0|XZ(u?oZ^ z(5I5P7k??5T8}Rnd=6S6Mwt!fXR>bf2T10nZ?~v;jPyJIEovg-8a3hlM zkg$O6Gs-?9Z6QvtglFiyB5@w6!`931@y0`rd@w^kWlzTMk-v%Yh+{he zZuRPt&yc1N#%GPpOLJiq=3h;krqW<{eA9^!C$9^(bK2-U8e2)+-^8CJhABVo z&X4$@zXsQk`vKcPqZYsagXAcbof7FK9qG6iBLrJ3{HY<>;pO*-JR|lRU?|1UK`v5| zxSDXLC-)h}-lL1;2g_i4pt{%&xWE2ll0>(puF;igJ%r`4t%cO4zT_k>rPxeJtFp?k zkclkDK8E3kPvklFRy5#(;|!RP*qn^>*vq4P%Vqifi%&GsNX(EOX$vGI$ zwYk2`J<^SND5M)1x5&!|*BWj3i^i8AI4QfkgP60_i^rlW(3~H0#}^3d5D<DiZHzJ~b}!)Y2#!3vDuAgisbF0ABc>{T^Sip7EWE4Jdq?V;#V^xj}fno39` z*(kn--2V6=6+8vJ+2rH~Lb@Bk>`6LxcR2 zLASKx<0IlKsV>F?@cP2{C)f-WY010{yqUB~_x-aFveJ;Hg5WSsbf&52j63LaND$#4 zLz{kR_v7%z!S@mzOWq6oiJ70pR+P9wH0n?69*y4&=N{rVV!!LPJ88|_|F3XXrn~QK z`&WW8Yr(|?H-zjkz6})kNCA=Z#ALvi5xphzR?J1(LL3d(3wXxjYfbURjMl^i5YwOL zM7}fcDZ7BZvHbl@Q6(1VKHa|Skohw&&WI$T3Be*+DIiiti%wI!*e-d^MgNO&nEd^W zY{c)Qfe>nq0teHiNH;nEc970Nxu7c-M@br32jM9a-=bfJq`#hFJbdX`*?4V2;zjQ0 zcFWu;ACRTQw1W2)zCGk!ho=PfCNdXsY^Ixh7>81<5nbITa3x6tw8JALza!z16xA&} z&%6jR5j2!qiF}E#1jp~_{o(V-pV(Szqir#c!ry_|hen>mbPOZkV{}U$Eh17jp3&s$d`b&$y$GI)ZIiCvMWMKiUoyRs>hsf`J2|^d#OoINMB=b#VUR>cGAG#_#R*zM1FM&++x)t zU(vhJuuWGShW(cE)PkqC#vKJ6V<5Usa2*ZqhQ1Je0)$oETf`?Hk_%x^#-D70iF-@Y zn%J6R^GGD|zZ1{DEjC@H@wCeKmDnffBHbu>6K;=`bN~OVXdmggG|pO(mW61L61OGU ziY*Ic5cB-RR;0)?a2)y?VzV=9Qmi4mNCAqSXP%ch`5uBuxGv-nJb!3o*=b}$JkGx< z#dqQ;3{iv@ZiFr}8sB=7tI^yJ?R*8kr#jEC@e|Q~7$xBNgZN(L#?yxU6thvdAoKqC zE^!PZ%jEq(4dH7N)04Oak|DZXGc<9UcDxl|5%o#(b8RvOx$THaLNj5^r_*$MFda=d z#om&fxy(h9VNXt80`!IOJ8BW|CjkX8egu0EG#bYtNJMfoP7pi;JsZjO86rIyr&&b? zx5h<7b4^)*FSeS*hr^YNc^T#_@O{u`e>z&$YC3`=4uvOCs0i~V zBxVF}K(ZTK14!~hx`6l%#JR8)Vu*Yrt~DG981slL1L<4l+lfy^>^vPK2N^^Bv$ylJ8=>OvCFK{fHHLrum5= z4nrTQdI(L31l#4i&vMnU|0 z(KCVbw2|Dp$^!6B$CePzNsOAriFBdCt>Aa!@+IW_*D|R~U}`QGk;9N>L7%G~=BLml zhMk?dM)Cog5t#@6j_r5icN71e0s{<}sQ|t&*#DvM6>QhwstP_N<|p&@#EX2Aum3ti z@|h;`ko1#)SY1Id#pK(j{v;&8R*n_5CsyPG4NV|^BPbHdSf#$S6kbMrGie&WGx+4Y zog$s#e8E^xuE;fc|3&0)GvbiAkB&>yT?Op%*pVRJg%yzRg|M|2c|q)PMmGGpv9;DX zANBv#^DjiPSoKMrB+@X={Z5@s%pDo{unn7h*VE2ugwq1?B0BF134d2)Iu3yyqI394 z(by_-Y|I0hpQYIc;d5quZ}0+8=|ZELcuJMJ-~JaqE(QKRM+@%hH838u|DL?CN{46;*sl-e#~!?`^^3O zw+R}Ba+ai05D!IP!m4|qd!!JP7`8T@HWE(UcSs5|G77*vD$WpnoFp zFt$7B$!Xw|?hIzPtb(*3zSI;Gsfy!}#+dO%X;Uqj4`V(LUm$UQa{q57crBzSNG^>d z89^ex5Ej(LYQ&7B>ptlJ7;e)*Z11scW+YWx8FD*g52WdpMQg4l(kph#;HrqYy0KGK~0g+fZmJW^a^bCX|@_|3%pt_5U6Ycu9(%sFkq zlRK6sMJ~$w{|16LblO7;oFM@TQ~f3^jSLz|6uw0ubdW+C1EVim5|SeBua}3=|XJHbt^>=BH3GNKz>zM zxtV!oxQ5ekBy*7-)cC`zp(yOnh(9my|62-;(eB$)s6EajU^qAoUndH8Go5hQK35c6!jl9Cvmu6!b7ql4*_WaC`!{?YvVq$e% zSDdUQaVa(ug2Y}=eGn_@3Be!uhB3-eC?6c_uzO2(IBM!KH70I6+)naR5kHy27YP0; zfB$m_qex=|Oalqr#rzmSA0R%VesP~dzsrh`DzVu5;V(z=0~8rb?s5Db$=!%O5%wM6 zO%}15`A}jS;uCqqs4Rc}&qSv)aa!msGXd3^4<|unEMy{C6l)Xnj3!((u!*_I7vgI| zTAAF|_&lu|DxnuuQWU#;tFttYk^nH9}!;;j^e~-g?lizf?hk*oW=OUdr`jsAM52< zs^lLjG>Um)iv9+XN6JCAf#g0ICNf_H@l!3l6nzw9G_2m8U4v9x>B&LAK3`sGHoMtCn%;j&ZMZOc;2BH`xksn?W z*$>%6;uGTEKzvthjmQ-_$wI1N6Y0xHPFzvO5B!csbYGdI_Y}?z@fnQCyc&|Ek?4zv zlZKb!Z^OJ1v8%Dq$CeHKJ@%7YL~>T(Zz>by0u9K&lIaS;eef*tDh^Y73O^uNq#5&j zIEO;^jHHXKGMaH7-xtXXl4oXNNn@H3MYZ^Eb)uAf#nqB$B0bny>_Y> z`YDD;dYUUh%|z65j6pdKSr&qKL%fva77+c-s77!Nil)PUfM!I_5cdSV8{+{nNg+L< z#Ntl?UmZ9SF*?KhH-*|@m!AppNG7-%6IU*t`}yb3^^kUlun-;DnOBr8lnx0@K?5RH zAiHQxe|@}3k@gf%LrfoCy*Qf@`v*J;;VgpQi(*f_{1Q`#9QU6;CPJ`XkDwh1artal zPjv~bgg=fg(G>rYzX3(TlRW3(S)cID(ioQh@n6=JMPG5Wk1vg17+j2Z=W^G7@tS zOisg6?nDayeE&)aak$Q%rKiiD#oYC0&<=aR~; zTObhmn|WjA>1D;pdm0lNPq9734xq?EZ0Q*B^^2FM8ncMp_sSC_-~SUi0nriy`2C}% zm5d$)ZPTDU%nLJ~u!^k24aYtLeGz#96iQ0Lub@aF?7uU%YVHX|@kNl^9iN?@5m`yI zPWi^MKjR@sAd(+r8uYuYegXwgFyiB@M{+vd#<&pNrr;ONc}tO0 zjrisf7a!dt>(Gahm)&Ckqtri+g$|2P{Vo*0Nmui5W`^j97eQ-mmkF$>wxsy$(mB8A z(iBgdTt<=p6c4~AQi@&KLD50j;*+}rT&Fv=2D`{&V*ds=%lh+SY)liKz+;e}V$>%g z4*^NE@N9~_rpfG}NHJoQNi&eIM}G&Ng0va9i=rOMP0keMSVqoNn)iqwlQi=GZ!LiI zC&{-dTA!dyj8%{irKvO8c^7Q)AZ|?DDoFZbUjlKg5+1^z5S|`1AQG4S=FCeIe}f@X z7i@MsBu|0zC2DUR&lUiHk>%U<*OA|axR~p3pJ>w>NXYG77dOs!iQ`>cHKEz~) zSmZSGK#1q7o(7$tymZTbY-Y`?r8|}v{f(S|R&@-gvz&TXze5xVK@55?wpQc_4NM{V zAI2?mIzk#pFP8?`g2}JSs7uk=}KG@9rTOXuY#}9Q)zMW*T$9(YyxRX^54MO5$;#SkH#L0{RT}%(DY}mC3%kZ zC>e2hWIci6k0tR4!P{u42t*$sOoi_%<36^DeM+#GGH!)k_SnJ*e&OZ)a9U&+QqXHxznW$u|u?=OunkF*PSQ_Gc5t|U( zFoK-|b+nMnZ!Xd2o82P1Hoyc5lt%yyF{h?uUe{4eoQ)px`K1T@> z+`=}BOeQ$J*Y=BT1%b&mZYKUeA^4_6qG-$?n}|j6F%9QsoFFF@-rU58dg>4tsPngS z{tXE9ND0VNlaNe`Fc%p`@j0yU9tAg{PbRqrgwI*sYkV*9t$9jhU}ZQHkTU|`Vfp*tBqUD3*#vxv(Icz88WP(n{B^alSNPKFd;#|5%&TBa z?Uhqa=h-}jiuGwiI~ zG0C-vUB-MlqXCUvfV>`rcZrR!g)cFmOq{n2MM>m!Jipc-1W8eX_fhDk2Hb~qpLYM5 z6)vW+!jMl>TU#xZhMeB`j)5I$PQIlpl8c<=>}q^aBt)ADhrg~KO)q)xcQRh6b1T80 zndhPSbH*^phJ!bC>#I|s79l9;^Aw^Dov zK9PRtj~E?vd&QQW!hg{~Dq@nUeVL+P8$~06#&wcZ<6dg6`~2lYHVkDcP@lxRtjfYRrl5Nt?2*`O z5;KOPPmOak^~8QkNy>wPwdvr@`MK7AcQyJ}YVhM(UYPg(oq3UpVg5gvdVT=gEmc@1Q%=o|rA3 zpZ|PC&=ClZ)732Iuj#ra2`eBUMRExeE2H0H9MwV@waGoiw!y!hQJ3K@f#l!8aF*4l zWk=%?>ydWEPM6EVpOF=1A;b@rRD$A@yqv^h_)coqJ83|qr2(e9tU{z795yXp7LJ?f z8_|2hQIZ|;$W-DRFh*-54kv`;DeObgBOIY5F2@;%!^)wrJzVk^agOvWnP@P&%{MDioi94_`J;5%isU}L0~7wb{e=%@J5PkA~6di zE~mB*J9hm{3*5+|Y6oE(Nd8n}A*e{;XX45d_nwgtlJQ^y@Ecz$G$-ahBY5pdStFCpMhiuZ%;?^Rd7tX1V&1wGb45Ft-wltq)0S zDEx`SB0ZT$gJnUN+T0F4OoTL-?$~YS7is1%_zn=882bXoL--ccPzg|^HGcQ~-(AUS z6Euh9vy8DcG)|jo#C#jU4L`jo5tmP8e52t` zuRHXXxnma{&0^#xxFwDl=Ajg*Al)IQ7=IIJ!=6%C*csn3=FN%E#(WvYgIVztn(I#y zk)_zr!g&bYg1@t2c7I&Yg15t2RnC7OrcVTBCm{!xGmZ^n2EmSVgm zR%D=JWeBHW_m)ZIrlFw-@9%tI)d^UFF*W$oZ8SdIrR%>T?SwrK zxQnL7Q>Ym8_1Lm7dJyB06}me$C^~@H#<~+8zhGLLDD7>R=kFOr+aUT2@&_~$LC{R} z$&h5#6=ug44RHYR<-Cd(&{bDZEJoa1hDa@JjWl2M(adjRdkc@qH0F-)6ciap6GJH| z(g#OM4eAY!MSo868yegS`5YR^OkQWOA*)Hp%4d;3n3yNnJAkcqH@?9)iae3K@Ob1K zJe}n4f5S+WTW|wGhw(n7i7DW4NVnZywjA@W8^ zXKSosIG zdQLm9P4HzBMK)l|!6-n1?!;Ho)tD$gL7Jtx9oq15IOf8YkN6S9wo{IUgTp27 zzsP1yN=pNI32Xvx7c#~)<|1o!tA{~Y%rO1>SY3TC;uDg8g`BeL{iwbH6wQY%9!-gy zp@C-n`(slpCbc0QNN0P%#{`PlnEzYS=`qy6k$|oA$QX*Yp=d!kQtGbMg4e0>K5#A5 z;8D8RQ^co`KmT>c5I~pFBvfJEgrxhBeAmvyAn(RFi2V<`PmHgk?#dsmcmTGz#Qp`> zY;Yl182=E8KGC9q#Iz&t2DWOY*P)7kMmy|Mr~3J|s0KIW6;Z z1idC82gx1@f~+M3gNfOQF{hWWGIobo(|x^s4QRw8PvOo^ox{3w_whx^^Y;wn3<|8K z=x%9-m02NqL|`FC1!d@kzc9^-6d>mh@HYA!QUR; zP91&zIS+zAP+TMg=V3-FR+V0YkkPDMBq0yo0tja?JaT|yKKO4Fzn4`#)*OGuG5DWQ zcpBpmwMp(uhGPOBnh@ZTpAa2_{2&c<#9j^3DNeW&Wj9`mui8u_yQQiggUpwS%Yi= z*47QHHI6b>3ka}A`vtitMVs3~!((l(sVU8w<2h5LH}?;)whXpeqr-dH!mJhj!vk!U z`-O%F#Dv%eR4nRN3t8=f)`&=3lr1c}khPaRB*fayX7!7S4iEKy z{HfT>9vy6rhA<*L${uYG53|Plg~ZsLUB{Z!#y5D2IB%ynS9YC9Z!VrX+%GE19u#H` zkBKfE9$2`#Us!;(UQ?@IKmhfktbyT?2AN+Z#jOFhSi8T?RKqVUEIgW;nj8^n5A}=e z^Z!gN+PabRZ2|MqTw1N0R+B2R_Q>cMzYuGvpMS7D%ogQZThKfpMS+k2tCR`}_Y1H_ z`A6C#qG>8JJk)9|#hNFdG07k0%2Uz&I$?em;}^|#2HT^oeo^k`|5Z)b=Bzx_oY9rC zws};XIQbe?&+nRA-<&31eK|2}y_!~gm^IQbEXZcf*U!Cy1M*w_jb+<<``g&)exZK7 z?V&ND15CBT0_^|At zqM*TQjf$}O+XL;kfC`??jIu?`F?lV+xqY&^QZg?C>vEl%Y>tZSoVU{)-&xgZw*H@v zRaW5VY2TIIX`XJ56V|$EW7o!+<|Y=Orfk{w+2$%~5=Hlku*u_N3vrd%U{0DK;jb6f zRnBF;m^8k7B0jmW+u5W5Oft zR=GL+obB&evO8C`xA;0IAGZ`vL}&Iee|v;qh%0^vODc2z5MOyE{*z#huti!!ID9{U z_a)=GbnMQ(O?=Y3GIq3NO6$DW*e9(uD8#PUjWs|nCAp8oy)T;*JuT5m3d&`J-9J3k z#)T1JkF@vg8}5D&|5el;;=EhflFqewfTeo8L^bVE{^9b7<#*j5YAF@p(b5*lQ)FzA zFPD$|48zzhUpxB~$@Wp@KNnFLryCJ-aI-Zkh81x&dtF8if8__-Y0hT-Hw~|%&C1*FNL z2Vd_~ay{N*X`Fx?%gK$E-PLTrX+X@#i^lzsMoZbB8TyD#-EnjIl-G{102W+(Q35f`q>aoIR`h zq;~GTVHxba(aw_5ndGJ=r}v_qWo}x!{WrtHo0haL`%TNrc*$iuyy`ns+_&V+{_hpj zx>rmQ*X?_jYkFaAePG#VTv$CHTb5-^*+}jx9)M_jM7aCfaHTc-d{3B;gYmrV(UG2g zvAGf^_NkU4Sxq}HV-&BM-F=tU&Fs_Ir%<)nSUYYQ|NVIUddi&pOZa3-#FOQ@ z-lk{si7Jw~p|4*^w5@MnKWi&zgO-+zS-9E4tWmr!#@+7kCvUI2)d0K8+{mYB<|GaM jc*P@wf+fwJl=FW|axbxnvuLnSdP|)cSLI-zB>Daer_2Os delta 66406 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 diff --git a/netbox/translations/it/LC_MESSAGES/django.po b/netbox/translations/it/LC_MESSAGES/django.po index 21a038c55..3e8dffd16 100644 --- a/netbox/translations/it/LC_MESSAGES/django.po +++ b/netbox/translations/it/LC_MESSAGES/django.po @@ -7,16 +7,16 @@ # Jeff Gehlbach, 2024 # Francesco Lombardo, 2024 # rizlas, 2024 -# Jeremy Stretch, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Italian (https://app.transifex.com/netbox-community/teams/178115/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +154,7 @@ msgstr "Inattivo" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -166,8 +166,8 @@ msgstr "Regione (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Regione (slug)" @@ -177,8 +177,8 @@ msgstr "Regione (slug)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Gruppo del sito (ID)" @@ -189,7 +189,7 @@ msgstr "Gruppo del sito (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -259,8 +259,8 @@ msgstr "Sito" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -279,13 +279,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Provider (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Provider (slug)" @@ -314,8 +314,8 @@ msgstr "Tipo di circuito (slug)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Sito (ID)" @@ -669,7 +669,7 @@ msgstr "Provider account " #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1104,7 +1104,7 @@ msgstr "Assegnazione" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1544,7 +1544,7 @@ msgstr "Tasso di impegno" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2947,7 +2947,7 @@ msgid "Parent site group (slug)" msgstr "Gruppo del sito principale (slug)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Gruppo (ID)" @@ -3005,15 +3005,15 @@ msgstr "Tipo di rack (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Ruolo (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Ruolo (slug)" @@ -3211,7 +3211,7 @@ msgstr "VDC (ID)" msgid "Device model" msgstr "Modello del dispositivo" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Interfaccia (ID)" @@ -3225,8 +3225,8 @@ msgid "Module bay (ID)" msgstr "Alloggiamento per moduli (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Dispositivo (ID)" @@ -3235,8 +3235,8 @@ msgstr "Dispositivo (ID)" msgid "Rack (name)" msgstr "Rack (nome)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Dispositivo (nome)" @@ -3288,9 +3288,9 @@ msgstr "VID assegnato" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3317,19 +3317,19 @@ msgstr "VID assegnato" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (ROSSO)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3491,7 +3491,7 @@ msgstr "Fuso orario" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3742,7 +3742,7 @@ msgid "Device Type" msgstr "Tipo di dispositivo" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3850,7 +3850,7 @@ msgstr "Grappolo" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4102,11 +4102,11 @@ msgstr "Taggato VLAN" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Aggiungi VLAN con tag" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Rimuovi le VLAN contrassegnate" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4154,7 +4154,7 @@ msgstr "Commutazione 802.1Q" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Aggiungi/Rimuovi" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4234,7 +4234,7 @@ msgstr "Nome del ruolo assegnato" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Modello tipo rack" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4244,10 +4244,12 @@ msgstr "Direzione del flusso d'aria" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." msgstr "" +"La larghezza deve essere impostata se non si specifica un tipo di rack." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." msgstr "" +"L'altezza U deve essere impostata se non si specifica un tipo di rack." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4914,6 +4916,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Gli intervalli alfanumerici sono supportati per la creazione in blocco. I " +"casi e i tipi misti all'interno di un unico intervallo non sono supportati " +"(esempio: [età, ex] -0/0/ [0-9]). Il token " +"{module}, se presente, verrà automaticamente sostituito con il " +"valore della posizione durante la creazione di un nuovo modulo." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6869,7 +6876,7 @@ msgstr "Alloggiamenti per moduli" msgid "Inventory items" msgstr "Articoli di inventario" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Modulo Bay" @@ -7601,12 +7608,12 @@ msgstr "Segnalibri" msgid "Show your personal bookmarks" msgstr "Mostra i tuoi segnalibri personali" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Tipo di azione sconosciuto per una regola di evento: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Impossibile importare la pipeline di eventi {name} errore: {error}" @@ -9394,129 +9401,129 @@ msgstr "Esportazione di L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Esportazione di L2VPN (identificatore)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Prefisso" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (lumaca)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "All'interno del prefisso" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "All'interno e incluso il prefisso" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Prefissi che contengono questo prefisso o IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Lunghezza della maschera" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "Numero VLAN (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Indirizzo" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Intervalli che contengono questo prefisso o IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Prefisso principale" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Macchina virtuale (nome)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Macchina virtuale (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Interfaccia (nome)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "Interfaccia VM (nome)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "Interfaccia VM (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "Gruppo FHRP (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "È assegnato a un'interfaccia" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "È assegnato" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Servizio (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "Indirizzo IP interno (ID) NAT" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Interfaccia assegnata" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Interfaccia VM assegnata" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "Indirizzo IP (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "indirizzo IP" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "IPv4 (ID) primario" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "IPv6 primario (ID)" @@ -9740,11 +9747,11 @@ msgstr "Imposta questo indirizzo IP primario per il dispositivo assegnato" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "È fuori banda" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "Designalo come indirizzo IP fuori banda per il dispositivo assegnato" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9755,10 +9762,11 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" msgstr "" +"Nessun dispositivo specificato; non può essere impostato come IP fuori banda" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Impossibile impostare l'IP fuori banda per le macchine virtuali" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9768,6 +9776,8 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" msgstr "" +"Nessuna interfaccia specificata; non può essere impostato come IP fuori " +"banda" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9945,7 +9955,7 @@ msgstr "" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Imposta questo indirizzo IP fuori banda per il dispositivo" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9958,10 +9968,14 @@ msgstr "Un indirizzo IP può essere assegnato a un solo oggetto." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"Impossibile riassegnare l'indirizzo IP primario per il dispositivo/macchina " +"virtuale principale" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"Impossibile riassegnare l'indirizzo IP fuori banda per il dispositivo " +"principale" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9975,6 +9989,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Solo gli indirizzi IP assegnati a un'interfaccia del dispositivo possono " +"essere designati come IP fuori banda per un dispositivo." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10382,11 +10398,14 @@ msgstr "Impossibile impostare scope_id senza scope_type." #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" +"Avvio dell'ID VLAN nell'intervallo ({value}) non può essere inferiore a " +"{minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" +"Termine dell'ID VLAN nell'intervallo ({value}) non può superare {maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10394,6 +10413,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"L'ID VLAN finale nell'intervallo deve essere maggiore o uguale all'ID VLAN " +"iniziale ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12771,11 +12792,13 @@ msgstr "Scarica" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Errore nel rendering del modello" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." msgstr "" +"Non è stato assegnato alcun modello di configurazione per questo " +"dispositivo." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13645,7 +13668,7 @@ msgstr "Corri ancora" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "Impossibile caricare gli script dal modulo %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -14462,6 +14485,8 @@ msgstr "Aggiungi disco virtuale" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" +"Non è stato assegnato alcun modello di configurazione per questa macchina " +"virtuale." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15542,12 +15567,12 @@ msgstr "Memoria (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Disco (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Dimensioni (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15764,19 +15789,19 @@ msgstr "GRE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/ja/LC_MESSAGES/django.mo b/netbox/translations/ja/LC_MESSAGES/django.mo index c7b76e8cbea012b5cbbf5d3bf07a41e953b315b8..09ec7de6950d2cd960b7ab7879fc91cd4b8ba790 100644 GIT binary patch delta 25044 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 Bv5^1( delta 25036 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, 2024 -# Jeremy Stretch, 2024 # teapot, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-13 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: teapot, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Japanese (https://app.transifex.com/netbox-community/teams/178115/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -666,7 +666,7 @@ msgstr "プロバイダアカウント" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1234,7 +1234,7 @@ msgstr "割当回線グループ" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "終端" +msgstr "終了" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1537,7 +1537,7 @@ msgstr "保証帯域" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -3467,7 +3467,7 @@ msgstr "タイムゾーン" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3718,7 +3718,7 @@ msgid "Device Type" msgstr "デバイスタイプ" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3826,7 +3826,7 @@ msgstr "クラスタ" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -6695,7 +6695,7 @@ msgstr "モジュールベイ" msgid "Inventory items" msgstr "在庫品目" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "モジュールベイ" @@ -7415,12 +7415,12 @@ msgstr "ブックマーク" msgid "Show your personal bookmarks" msgstr "個人用のブックマークを表示する" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "イベントルールのアクションタイプが不明です: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "イベントパイプラインをインポートできません {name} エラー: {error}" diff --git a/netbox/translations/nl/LC_MESSAGES/django.mo b/netbox/translations/nl/LC_MESSAGES/django.mo index 1af769697221b49f6de684283729fd35b23d2b5c..0b5dc9bc87f418743282fee8e57c6160d2e595c2 100644 GIT binary patch delta 69629 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℘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%0ApP T-yLu, 2024 -# Jeremy Stretch, 2024 -# Jorg de Jong, 2024 # Sebastian Berm, 2024 +# Jorg de Jong, 2025 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Sebastian Berm, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Dutch (https://app.transifex.com/netbox-community/teams/178115/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -156,7 +156,7 @@ msgstr "Inactief" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -168,8 +168,8 @@ msgstr "Regio (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Regio (slug)" @@ -179,8 +179,8 @@ msgstr "Regio (slug)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Sitegroep (ID)" @@ -191,7 +191,7 @@ msgstr "Sitegroep (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -261,8 +261,8 @@ msgstr "Site" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -281,13 +281,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Provider (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Provider (slug)" @@ -316,8 +316,8 @@ msgstr "Circuittype (slug)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Locatie (ID)" @@ -671,7 +671,7 @@ msgstr "Provideraccount" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -837,7 +837,7 @@ msgstr "Serviceparameters" #: netbox/vpn/forms/model_forms.py:411 netbox/wireless/forms/model_forms.py:54 #: netbox/wireless/forms/model_forms.py:170 msgid "Tenancy" -msgstr "Huurovereenkomst" +msgstr "Tenants" #: netbox/circuits/forms/bulk_edit.py:193 #: netbox/circuits/forms/bulk_edit.py:217 @@ -1106,7 +1106,7 @@ msgstr "Opdracht" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1546,7 +1546,7 @@ msgstr "Vastleggingspercentage" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2949,7 +2949,7 @@ msgid "Parent site group (slug)" msgstr "Bovenliggende sitegroep (slug)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Groep (ID)" @@ -3007,15 +3007,15 @@ msgstr "Racktype (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Rol (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rol (slug)" @@ -3213,7 +3213,7 @@ msgstr "VDC (ID)" msgid "Device model" msgstr "Model van het apparaat" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Interface (ID)" @@ -3227,8 +3227,8 @@ msgid "Module bay (ID)" msgstr "Modulevak (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Apparaat (ID)" @@ -3237,8 +3237,8 @@ msgstr "Apparaat (ID)" msgid "Rack (name)" msgstr "Rack (naam)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Apparaat (naam)" @@ -3290,9 +3290,9 @@ msgstr "Toegewezen VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3319,19 +3319,19 @@ msgstr "Toegewezen VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3493,7 +3493,7 @@ msgstr "Tijdzone" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3744,7 +3744,7 @@ msgid "Device Type" msgstr "Soort apparaat" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3852,7 +3852,7 @@ msgstr "Cluster" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4104,11 +4104,11 @@ msgstr "Getagde VLAN's" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Getagde VLAN's toevoegen" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Getagde VLAN's verwijderen" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4156,7 +4156,7 @@ msgstr "802.1Q-omschakeling" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Toevoegen/verwijderen" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4235,7 +4235,7 @@ msgstr "Naam van de toegewezen rol" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Model van het type rack" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4245,10 +4245,12 @@ msgstr "Richting van de luchtstroom" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." msgstr "" +"De breedte moet worden ingesteld als er geen racktype wordt gespecificeerd." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." msgstr "" +"De U-hoogte moet worden ingesteld als er geen racktype wordt gespecificeerd." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4792,7 +4794,7 @@ msgstr "Verbinding" #: netbox/extras/forms/model_forms.py:675 netbox/extras/tables/tables.py:579 #: netbox/templates/extras/journalentry.html:30 msgid "Kind" -msgstr "Vriendelijk" +msgstr "Soort" #: netbox/dcim/forms/filtersets.py:1377 msgid "Mgmt only" @@ -4915,6 +4917,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Alfanumerieke reeksen worden ondersteund voor bulkaanmaak. Gemengde gevallen" +" en typen binnen één bereik worden niet ondersteund (bijvoorbeeld: " +"[leeftijd, ex] -0/0/ [0-9]). Het token {module}, " +"indien aanwezig, wordt automatisch vervangen door de positiewaarde bij het " +"aanmaken van een nieuwe module." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6848,7 +6855,7 @@ msgstr "Modulebays" msgid "Inventory items" msgstr "Inventarisartikelen" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Modulebaai" @@ -7577,12 +7584,12 @@ msgstr "Bladwijzers" msgid "Show your personal bookmarks" msgstr "Laat je persoonlijke bladwijzers zien" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Onbekend actietype voor een evenementregel: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "" @@ -8907,15 +8914,15 @@ msgstr "" #: netbox/extras/models/models.py:688 msgid "kind" -msgstr "vriendelijk" +msgstr "soort" #: netbox/extras/models/models.py:702 msgid "journal entry" -msgstr "journaalboeking" +msgstr "journaalpost" #: netbox/extras/models/models.py:703 msgid "journal entries" -msgstr "journaalboekingen" +msgstr "journaalposten" #: netbox/extras/models/models.py:718 #, python-brace-format @@ -9272,8 +9279,7 @@ msgstr "Ongeldig formaat van het IP-adres: {data}" #: netbox/ipam/api/field_serializers.py:37 msgid "Enter a valid IPv4 or IPv6 prefix and mask in CIDR notation." -msgstr "" -"Voer een geldig IPv4- of IPv6-voorvoegsel en masker in de CIDR-notatie in." +msgstr "Voer een geldig IPv4- of IPv6-prefix en masker in de CIDR-notatie in." #: netbox/ipam/api/field_serializers.py:44 #, python-brace-format @@ -9375,129 +9381,129 @@ msgstr "L2VPN exporteren" msgid "Exporting L2VPN (identifier)" msgstr "L2VPN exporteren (identifier)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" -msgstr "Voorvoegsel" +msgstr "Prefix" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (slak)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" -msgstr "Binnen het voorvoegsel" +msgstr "Binnen deze prefix" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" -msgstr "Binnen en inclusief voorvoegsel" +msgstr "Binnen en inclusief prefix" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" -msgstr "Prefixen die dit voorvoegsel of IP-adres bevatten" +msgstr "Prefixen die deze prefix of IP-adres bevatten" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Lengte van het masker" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "VLAN-nummer (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Adres" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" -msgstr "Bereiken die dit voorvoegsel of IP-adres bevatten" +msgstr "Bereiken die deze prefix of IP-adres bevatten" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Oudervoorvoegsel" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Virtuele machine (naam)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Virtuele machine (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Interface (naam)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "VM-interface (naam)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "VM-interface (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "FHRP-groep (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Is toegewezen aan een interface" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Is toegewezen" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Service (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "NAT binnen IP-adres (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Toegewezen interface" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Toegewezen VM-interface" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "IP-adres (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "IP-adres" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "Primaire IPv4 (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "Primaire IPv6 (ID)" @@ -9581,7 +9587,7 @@ msgstr "VLAN" #: netbox/ipam/forms/bulk_edit.py:245 msgid "Prefix length" -msgstr "Lengte van het voorvoegsel" +msgstr "Lengte van de prefix" #: netbox/ipam/forms/bulk_edit.py:268 netbox/ipam/forms/filtersets.py:241 #: netbox/templates/ipam/prefix.html:85 @@ -9721,11 +9727,12 @@ msgstr "Maak dit het primaire IP-adres voor het toegewezen apparaat" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Is buiten de band" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" msgstr "" +"Wijs dit aan als het out-of-band IP-adres voor het toegewezen apparaat" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9736,10 +9743,12 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" msgstr "" +"Geen apparaat gespecificeerd; kan niet worden ingesteld als IP-adres buiten " +"de band" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Kan niet-band-IP niet instellen voor virtuele machines" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9750,6 +9759,8 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" msgstr "" +"Geen interface gespecificeerd; kan niet worden ingesteld als IP-adres buiten" +" de band" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9839,7 +9850,7 @@ msgstr "Apparaat/VM" #: netbox/ipam/forms/filtersets.py:321 msgid "Parent Prefix" -msgstr "Voorvoegsel voor ouders" +msgstr "Prefix voor ouders" #: netbox/ipam/forms/filtersets.py:347 msgid "Assigned Device" @@ -9926,7 +9937,7 @@ msgstr "Maak dit het primaire IP-adres voor het apparaat/VM" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Maak dit het IP-adres buiten de band voor het apparaat" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9939,10 +9950,12 @@ msgstr "Een IP-adres kan slechts aan één object worden toegewezen." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"Kan het primaire IP-adres niet opnieuw toewijzen aan het ouderapparaat/de VM" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"Kan het Out-of-Band IP-adres niet opnieuw toewijzen aan het ouderapparaat" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9956,6 +9969,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Alleen IP-adressen die aan een apparaatinterface zijn toegewezen, kunnen " +"worden aangeduid als het IP-adres buiten de band voor een apparaat." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10104,7 +10119,7 @@ msgstr "totaal" #: netbox/ipam/models/ip.py:116 msgid "aggregates" -msgstr "totalen" +msgstr "aggregaten" #: netbox/ipam/models/ip.py:132 msgid "Cannot create aggregate with /0 mask." @@ -10125,7 +10140,7 @@ msgid "" "Prefixes cannot overlap aggregates. {prefix} covers an existing aggregate " "({aggregate})." msgstr "" -"Voorvoegsels mogen aggregaten niet overlappen. {prefix} omvat een bestaand " +"Prefixen mogen aggregaten niet overlappen. {prefix} omvat een bestaand " "aggregaat ({aggregate})." #: netbox/ipam/models/ip.py:200 netbox/ipam/models/ip.py:737 @@ -10139,7 +10154,7 @@ msgstr "rollen" #: netbox/ipam/models/ip.py:217 netbox/ipam/models/ip.py:293 msgid "prefix" -msgstr "voorvoegsel" +msgstr "prefix" #: netbox/ipam/models/ip.py:218 msgid "IPv4 or IPv6 network with mask" @@ -10147,11 +10162,11 @@ msgstr "IPv4- of IPv6-netwerk met masker" #: netbox/ipam/models/ip.py:254 msgid "Operational status of this prefix" -msgstr "Operationele status van dit voorvoegsel" +msgstr "Operationele status van deze prefix" #: netbox/ipam/models/ip.py:262 msgid "The primary function of this prefix" -msgstr "De primaire functie van dit voorvoegsel" +msgstr "De primaire functie van deze prefix" #: netbox/ipam/models/ip.py:265 msgid "is a pool" @@ -10159,8 +10174,7 @@ msgstr "is een pool" #: netbox/ipam/models/ip.py:267 msgid "All IP addresses within this prefix are considered usable" -msgstr "" -"Alle IP-adressen binnen dit voorvoegsel worden als bruikbaar beschouwd" +msgstr "Alle IP-adressen binnen deze prefix worden als bruikbaar beschouwd" #: netbox/ipam/models/ip.py:270 netbox/ipam/models/ip.py:537 msgid "mark utilized" @@ -10168,11 +10182,11 @@ msgstr "merk gebruikt" #: netbox/ipam/models/ip.py:294 msgid "prefixes" -msgstr "voorvoegsels" +msgstr "prefixen" #: netbox/ipam/models/ip.py:317 msgid "Cannot create prefix with /0 mask." -msgstr "Kan geen voorvoegsel aanmaken met het masker /0." +msgstr "Kan geen prefix aanmaken met het masker /0." #: netbox/ipam/models/ip.py:324 netbox/ipam/models/ip.py:874 #, python-brace-format @@ -10186,7 +10200,7 @@ msgstr "globale tabel" #: netbox/ipam/models/ip.py:326 #, python-brace-format msgid "Duplicate prefix found in {table}: {prefix}" -msgstr "Duplicaat voorvoegsel gevonden in {table}: {prefix}" +msgstr "Duplicaat prefix gevonden in {table}: {prefix}" #: netbox/ipam/models/ip.py:495 msgid "start address" @@ -10363,11 +10377,13 @@ msgstr "Kan scope_id niet instellen zonder scope_type." #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" +"VLAN-id starten binnen bereik ({value}) kan niet minder zijn dan {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" +"VLAN-id binnen bereik beëindigen ({value}) kan niet hoger zijn dan {maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10375,6 +10391,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"Het einde van de VLAN-id binnen het bereik moet groter zijn dan of gelijk " +"zijn aan de start-VLAN-id ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -10428,7 +10446,7 @@ msgstr "unieke ruimte afdwingen" #: netbox/ipam/models/vrfs.py:43 msgid "Prevent duplicate prefixes/IP addresses within this VRF" -msgstr "Voorkom dubbele voorvoegsels/IP-adressen in deze VRF" +msgstr "Voorkom dubbele prefixen/IP-adressen in deze VRF" #: netbox/ipam/models/vrfs.py:63 netbox/netbox/navigation/menu.py:186 #: netbox/netbox/navigation/menu.py:188 @@ -10463,7 +10481,7 @@ msgstr "Aantal providers" #: netbox/ipam/tables/ip.py:95 netbox/netbox/navigation/menu.py:179 #: netbox/netbox/navigation/menu.py:181 msgid "Aggregates" -msgstr "Totalen" +msgstr "Aggregaten" #: netbox/ipam/tables/ip.py:125 msgid "Added" @@ -10474,7 +10492,7 @@ msgstr "Toegevoegd" #: netbox/netbox/navigation/menu.py:165 netbox/netbox/navigation/menu.py:167 #: netbox/templates/ipam/vlan.html:84 msgid "Prefixes" -msgstr "Voorvoegsels" +msgstr "Prefixen" #: netbox/ipam/tables/ip.py:131 netbox/ipam/tables/ip.py:270 #: netbox/ipam/tables/ip.py:324 netbox/ipam/tables/vlans.py:86 @@ -10490,7 +10508,7 @@ msgstr "IP-bereiken" #: netbox/ipam/tables/ip.py:221 msgid "Prefix (Flat)" -msgstr "Voorvoegsel (plat)" +msgstr "Prefix (plat)" #: netbox/ipam/tables/ip.py:225 msgid "Depth" @@ -10557,20 +10575,19 @@ msgstr "Doelen exporteren" #: netbox/ipam/validators.py:9 #, python-brace-format msgid "{prefix} is not a valid prefix. Did you mean {suggested}?" -msgstr "{prefix} is geen geldig voorvoegsel. Bedoelde je {suggested}?" +msgstr "{prefix} is geen geldige prefix. Bedoelde je {suggested}?" #: netbox/ipam/validators.py:16 #, python-format msgid "The prefix length must be less than or equal to %(limit_value)s." msgstr "" -"De lengte van het voorvoegsel moet kleiner zijn dan of gelijk aan " -"%(limit_value)s." +"De lengte van de prefix moet kleiner zijn dan of gelijk aan %(limit_value)s." #: netbox/ipam/validators.py:24 #, python-format msgid "The prefix length must be greater than or equal to %(limit_value)s." msgstr "" -"De lengte van het voorvoegsel moet groter zijn dan of gelijk zijn aan " +"De lengte van de prefix moet groter zijn dan of gelijk zijn aan " "%(limit_value)s." #: netbox/ipam/validators.py:33 @@ -10583,7 +10600,7 @@ msgstr "" #: netbox/ipam/views.py:533 msgid "Child Prefixes" -msgstr "Voorvoegsels voor kinderen" +msgstr "Prefixen voor kinderen" #: netbox/ipam/views.py:569 msgid "Child Ranges" @@ -11320,7 +11337,7 @@ msgstr "Meldingsgroepen" #: netbox/netbox/navigation/menu.py:374 msgid "Journal Entries" -msgstr "Journaalboekingen" +msgstr "Journaalposten" #: netbox/netbox/navigation/menu.py:375 #: netbox/templates/core/objectchange.html:9 @@ -11571,7 +11588,7 @@ msgstr "Fout" #: netbox/netbox/tables/tables.py:58 #, python-brace-format msgid "No {model_name} found" -msgstr "Nee {model_name} gevonden" +msgstr "Geen {model_name} gevonden" #: netbox/netbox/tables/tables.py:249 #: netbox/templates/generic/bulk_import.html:117 @@ -11605,7 +11622,7 @@ msgstr "Rij {i}: Object met ID {id} bestaat niet" #: netbox/netbox/views/generic/bulk_views.py:958 #, python-brace-format msgid "No {object_type} were selected." -msgstr "Nee {object_type} zijn geselecteerd." +msgstr "Geen {object_type} zijn geselecteerd." #: netbox/netbox/views/generic/bulk_views.py:788 #, python-brace-format @@ -11623,7 +11640,7 @@ msgstr "Log met wijzigingen" #: netbox/netbox/views/generic/feature_views.py:93 msgid "Journal" -msgstr "Tijdschrift" +msgstr "Journaal" #: netbox/netbox/views/generic/feature_views.py:207 msgid "Unable to synchronize data: No data file set." @@ -12751,11 +12768,11 @@ msgstr "Downloaden" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Sjabloon voor weergave van fouten" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "Er is geen configuratiesjabloon toegewezen voor dit apparaat." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13558,7 +13575,7 @@ msgstr "Resultaten in behandeling" #: netbox/templates/extras/journalentry.html:15 msgid "Journal Entry" -msgstr "Dagboekinvoer" +msgstr "Journaalpost" #: netbox/templates/extras/notificationgroup.html:11 msgid "Notification Group" @@ -14051,7 +14068,7 @@ msgstr "Datum toegevoegd" #: netbox/templates/ipam/prefix/prefixes.html:8 #: netbox/templates/ipam/role.html:10 msgid "Add Prefix" -msgstr "Voorvoegsel toevoegen" +msgstr "Prefix toevoegen" #: netbox/templates/ipam/asn.html:23 msgid "AS Number" @@ -14152,7 +14169,7 @@ msgstr "Eerste beschikbare IP" #: netbox/templates/ipam/prefix.html:179 msgid "Prefix Details" -msgstr "Details van het voorvoegsel" +msgstr "Details van de prefix" #: netbox/templates/ipam/prefix.html:185 msgid "Network Address" @@ -14208,7 +14225,7 @@ msgstr "L2VPN's exporteren" #: netbox/templates/ipam/vlan.html:88 msgid "Add a Prefix" -msgstr "Een voorvoegsel toevoegen" +msgstr "Een prefix toevoegen" #: netbox/templates/ipam/vlangroup.html:18 msgid "Add VLAN" @@ -14442,6 +14459,7 @@ msgstr "Virtuele schijf toevoegen" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" +"Er is geen configuratiesjabloon toegewezen voor deze virtuele machine." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15523,12 +15541,12 @@ msgstr "Geheugen (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Schijf (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Grootte (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15743,19 +15761,19 @@ msgstr "GRE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/pl/LC_MESSAGES/django.mo b/netbox/translations/pl/LC_MESSAGES/django.mo index e0e9273fad9a9f24c369aeddbf96cabc25093979..035533187556f7f3a72f82e428f3b4528b4e76ac 100644 GIT binary patch delta 69114 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 F{{>u%MoRzy delta 66438 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 diff --git a/netbox/translations/pl/LC_MESSAGES/django.po b/netbox/translations/pl/LC_MESSAGES/django.po index 92dde3ca4..5eb68b319 100644 --- a/netbox/translations/pl/LC_MESSAGES/django.po +++ b/netbox/translations/pl/LC_MESSAGES/django.po @@ -6,17 +6,17 @@ # Translators: # Jeff Gehlbach, 2024 # Simplicity sp. z o.o., 2024 -# Jeremy Stretch, 2024 # Grzegorz Szymaszek, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Grzegorz Szymaszek, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Polish (https://app.transifex.com/netbox-community/teams/178115/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +154,7 @@ msgstr "Nieaktywny" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -166,8 +166,8 @@ msgstr "Region (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Region (identyfikator)" @@ -177,8 +177,8 @@ msgstr "Region (identyfikator)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Grupa witryn (ID)" @@ -189,7 +189,7 @@ msgstr "Grupa witryn (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -259,8 +259,8 @@ msgstr "Teren" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -279,13 +279,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Dostawca (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Dostawca (identyfikator)" @@ -314,8 +314,8 @@ msgstr "Typ obwodu (identyfikator)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Teren (ID)" @@ -669,7 +669,7 @@ msgstr "Konto dostawcy" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1104,7 +1104,7 @@ msgstr "Zlecenie" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1542,7 +1542,7 @@ msgstr "Współczynnik zatwierdzania" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2937,7 +2937,7 @@ msgid "Parent site group (slug)" msgstr "Nadrzędna grupa terenów (identyfikator)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Grupa (ID)" @@ -2995,15 +2995,15 @@ msgstr "Typ szafy (numer identyfikacyjny)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Rola (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rola (identyfikator)" @@ -3201,7 +3201,7 @@ msgstr "VDC (ID)" msgid "Device model" msgstr "Model urządzenia" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Interfejs (ID)" @@ -3215,8 +3215,8 @@ msgid "Module bay (ID)" msgstr "Osłona modułu (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Urządzenie (ID)" @@ -3225,8 +3225,8 @@ msgstr "Urządzenie (ID)" msgid "Rack (name)" msgstr "Szafa (nazwa)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Urządzenie (nazwa)" @@ -3278,9 +3278,9 @@ msgstr "Przypisany VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3307,19 +3307,19 @@ msgstr "Przypisany VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3481,7 +3481,7 @@ msgstr "Strefa czasowa" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3732,7 +3732,7 @@ msgid "Device Type" msgstr "Typ urządzenia" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3840,7 +3840,7 @@ msgstr "Klaster" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4092,11 +4092,11 @@ msgstr "Oznaczone sieci VLAN" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Dodaj oznaczone sieci VLAN" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Usuń oznaczone sieci VLAN" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4144,7 +4144,7 @@ msgstr "Przełączanie 802.1Q" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Dodaj/Usuń" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4222,7 +4222,7 @@ msgstr "Nazwa przypisanej roli" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Model typu stelaża" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4231,11 +4231,11 @@ msgstr "Kierunek przepływu powietrza" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "Szerokość musi być ustawiona, jeśli nie określa się typu stelaża." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "Wysokość U musi być ustawiona, jeśli nie określa się typu stelaża." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4897,6 +4897,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Zakresy alfanumeryczne są obsługiwane do tworzenia zbiorczych. Mieszane " +"przypadki i typy w jednym zakresie nie są obsługiwane (przykład: [ge, " +"xe] -0/0/ [0-9]). Żeton {module}, jeśli jest obecny, " +"zostanie automatycznie zastąpiony wartością pozycji podczas tworzenia nowego" +" modułu." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6810,7 +6815,7 @@ msgstr "Wnęsy modułowe" msgid "Inventory items" msgstr "Elementy inwentaryzacyjne" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Moduł Bay" @@ -7537,12 +7542,12 @@ msgstr "Zakładki" msgid "Show your personal bookmarks" msgstr "Pokaż swoje osobiste zakładki" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Nieznany typ akcji dla reguły zdarzenia: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Nie można importować pociągu zdarzeń {name} błąd: {error}" @@ -9309,129 +9314,129 @@ msgstr "Eksportowanie L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Eksportowanie L2VPN (identyfikator)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Prefiks" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (identyfikator)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "W prefiksie" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "W i włącznie z prefiksem" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Prefiksy zawierające ten prefiks lub adres IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Długość maski" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "Numer VLAN (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Adres" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Zakresy zawierające ten prefiks lub adres IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Prefiks nadrzędny" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Maszyna wirtualna (nazwa)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Maszyna wirtualna (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Interfejs (nazwa)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "Interfejs maszyny wirtualnej (nazwa)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "Interfejs maszyny wirtualnej (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "Grupa FHRP (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Jest przypisany do interfejsu" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Jest przypisany" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Usługa (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "NAT wewnątrz adresu IP (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Przypisany interfejs" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Przypisany interfejs maszyny wirtualnej" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "Adres IP (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "Adres IP" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "Podstawowy IPv4 (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "Podstawowy IPv6 (ID)" @@ -9655,11 +9660,11 @@ msgstr "Ustaw to podstawowy adres IP przypisanego urządzenia" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Jest poza pasmem" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "Oznacz to jako adres IP poza pasmem przypisanego urządzenia" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9669,11 +9674,11 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Brak określonego urządzenia; nie można ustawić jako IP poza pasmem" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Nie można ustawić adresu IP poza pasmem dla maszyn wirtualnych" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9682,7 +9687,7 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Nie określono interfejsu; nie można ustawić jako IP poza pasmem" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9859,7 +9864,7 @@ msgstr "Ustaw to podstawowy adres IP urządzenia/maszyny wirtualnej" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Ustaw to poza pasmem IP urządzenia" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9872,10 +9877,14 @@ msgstr "Adres IP może być przypisany tylko do jednego obiektu." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"Nie można ponownie przypisać głównego adresu IP urządzenia " +"nadrzędnego/maszyny wirtualnej" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"Nie można ponownie przypisać adresu IP poza pasmem dla urządzenia " +"nadrzędnego" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9889,6 +9898,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Tylko adresy IP przypisane do interfejsu urządzenia mogą być oznaczone jako " +"adres IP poza pasmem dla urządzenia." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10290,11 +10301,15 @@ msgstr "Nie można ustawić scope_id bez scope_type." #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" msgstr "" +"Uruchamianie identyfikatora VLAN w zakresie ({value}) nie może być mniejszy " +"niż {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" msgstr "" +"Zakończenie identyfikatora VLAN w zakresie ({value}) nie może przekroczyć " +"{maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10302,6 +10317,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"Kończący identyfikator VLAN w zakresie musi być większy lub równy " +"początkowemu identyfikatorowi VLAN ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12665,11 +12682,11 @@ msgstr "Ściągnij" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Szablon renderowania błędu" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "Dla tego urządzenia nie przypisano szablonu konfiguracji." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13536,7 +13553,7 @@ msgstr "Uruchom ponownie" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "Nie można załadować skryptów z modułu %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -14351,7 +14368,7 @@ msgstr "Dodaj dysk wirtualny" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." -msgstr "" +msgstr "Dla tej maszyny wirtualnej nie przypisano szablonu konfiguracji." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15430,12 +15447,12 @@ msgstr "Pamięć (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Dysk (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Rozmiar (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15646,19 +15663,19 @@ msgstr "GREE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/pt/LC_MESSAGES/django.mo b/netbox/translations/pt/LC_MESSAGES/django.mo index e6d410f9aded3682f2deff92278b880cc7ebea54..b5d32e4cdf62750456dbd48ec94ed63d2e10b49c 100644 GIT binary patch delta 25153 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%0AXIm5^dof<(@Bb1cT*DfejzF{nI*=adi2I{U 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 diff --git a/netbox/translations/pt/LC_MESSAGES/django.po b/netbox/translations/pt/LC_MESSAGES/django.po index 496b8dda1..71250e297 100644 --- a/netbox/translations/pt/LC_MESSAGES/django.po +++ b/netbox/translations/pt/LC_MESSAGES/django.po @@ -6,17 +6,17 @@ # Translators: # Renato Almeida de Oliveira, 2023 # Fer22f , 2024 -# Jeremy Stretch, 2024 -# Fabricio Maciel, 2024 +# Jeremy Stretch, 2025 +# Fabricio Maciel, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-13 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Fabricio Maciel, 2024\n" +"Last-Translator: Fabricio Maciel, 2025\n" "Language-Team: Portuguese (https://app.transifex.com/netbox-community/teams/178115/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -669,7 +669,7 @@ msgstr "Conta do provedor" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -984,7 +984,7 @@ msgstr "Rede do provedor" #: netbox/wireless/forms/model_forms.py:87 #: netbox/wireless/forms/model_forms.py:129 msgid "Location" -msgstr "Localização" +msgstr "Local" #: netbox/circuits/forms/filtersets.py:32 #: netbox/circuits/forms/filtersets.py:120 netbox/dcim/forms/filtersets.py:144 @@ -1299,15 +1299,15 @@ msgstr "terminações dos circuitos" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"Uma terminação de circuito deve ser conectada a um site ou a uma rede do " +"Uma terminação de circuito deve ser conectada a um site ou a uma rede de " "provedor." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"Uma terminação de circuito não pode ser conectada ao mesmo tempo a um site e" -" a uma rede do provedor." +"Uma terminação de circuito não pode ser conectada a um site e a uma rede de " +"provedor ao mesmo tempo." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -1544,7 +1544,7 @@ msgstr "Taxa Garantida" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2958,23 +2958,23 @@ msgstr "AS (ID)" #: netbox/dcim/filtersets.py:246 msgid "Parent location (ID)" -msgstr "Localização principal (ID)" +msgstr "Local pai (ID)" #: netbox/dcim/filtersets.py:252 msgid "Parent location (slug)" -msgstr "Localização principal (slug)" +msgstr "Local pai (slug)" #: netbox/dcim/filtersets.py:258 netbox/dcim/filtersets.py:369 #: netbox/dcim/filtersets.py:490 netbox/dcim/filtersets.py:1057 #: netbox/dcim/filtersets.py:1404 netbox/dcim/filtersets.py:2182 msgid "Location (ID)" -msgstr "Localização (ID)" +msgstr "Local (ID)" #: netbox/dcim/filtersets.py:265 netbox/dcim/filtersets.py:376 #: netbox/dcim/filtersets.py:497 netbox/dcim/filtersets.py:1410 #: netbox/extras/filtersets.py:542 msgid "Location (slug)" -msgstr "Localização (slug)" +msgstr "Local (slug)" #: netbox/dcim/filtersets.py:296 netbox/dcim/filtersets.py:381 #: netbox/dcim/filtersets.py:539 netbox/dcim/filtersets.py:678 @@ -3488,7 +3488,7 @@ msgstr "Fuso horário" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3739,7 +3739,7 @@ msgid "Device Type" msgstr "Tipo de Dispositivo" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3847,7 +3847,7 @@ msgstr "Cluster" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4193,11 +4193,11 @@ msgstr "Site designado" #: netbox/dcim/forms/bulk_import.py:141 msgid "Parent location" -msgstr "Localização principal" +msgstr "Local pai" #: netbox/dcim/forms/bulk_import.py:143 msgid "Location not found." -msgstr "Localização não encontrada." +msgstr "Local não encontrado." #: netbox/dcim/forms/bulk_import.py:185 msgid "The manufacturer of this rack type" @@ -6155,12 +6155,12 @@ msgstr "Rack {rack} não pertence ao site {site}." #: netbox/dcim/models/devices.py:840 #, python-brace-format msgid "Location {location} does not belong to site {site}." -msgstr "Localização {location} não pertence ao site {site}." +msgstr "Local {location} não pertence ao site {site}." #: netbox/dcim/models/devices.py:846 #, python-brace-format msgid "Rack {rack} does not belong to location {location}." -msgstr "Rack {rack} não pertence à localização {location}." +msgstr "Rack {rack} não pertence ao local {location}." #: netbox/dcim/models/devices.py:853 msgid "Cannot select a rack face without assigning a rack." @@ -6357,7 +6357,7 @@ msgstr "quadros de alimentação" msgid "" "Location {location} ({location_site}) is in a different site than {site}" msgstr "" -"Localização {location} ({location_site}) está em um site diferente do {site}" +"Local {location} ({location_site}) está em um site diferente do {site}" #: netbox/dcim/models/power.py:108 msgid "supply" @@ -6536,7 +6536,7 @@ msgstr "racks" #: netbox/dcim/models/racks.py:375 #, python-brace-format msgid "Assigned location must belong to parent site ({site})." -msgstr "A localização definida deve pertencer ao site principal ({site})." +msgstr "O local definido deve pertencer ao site principal ({site})." #: netbox/dcim/models/racks.py:393 #, python-brace-format @@ -6559,7 +6559,7 @@ msgstr "" #: netbox/dcim/models/racks.py:408 #, python-brace-format msgid "Location must be from the same site, {site}." -msgstr "A localização deve ser do mesmo site, {site}." +msgstr "O local deve ser do mesmo site, {site}." #: netbox/dcim/models/racks.py:670 msgid "units" @@ -6653,25 +6653,24 @@ msgstr "sites" #: netbox/dcim/models/sites.py:309 msgid "A location with this name already exists within the specified site." -msgstr "Já existe uma localização com este nome no site especificado." +msgstr "Já existe um local com este nome no site especificado." #: netbox/dcim/models/sites.py:319 msgid "A location with this slug already exists within the specified site." -msgstr "Já existe uma localização com este slug no site especificado." +msgstr "Já existe um local com este slug no site especificado." #: netbox/dcim/models/sites.py:322 msgid "location" -msgstr "localização" +msgstr "local" #: netbox/dcim/models/sites.py:323 msgid "locations" -msgstr "localizações" +msgstr "locais" #: netbox/dcim/models/sites.py:337 #, python-brace-format msgid "Parent location ({parent}) must belong to the same site ({site})." -msgstr "" -"Localização principal ({parent}) deve pertencer ao mesmo site ({site})." +msgstr "Local principal ({parent}) deve pertencer ao mesmo site ({site})." #: netbox/dcim/tables/cables.py:55 msgid "Termination A" @@ -6691,11 +6690,11 @@ msgstr "Dispositivo B" #: netbox/dcim/tables/cables.py:78 msgid "Location A" -msgstr "Localização A" +msgstr "Local A" #: netbox/dcim/tables/cables.py:84 msgid "Location B" -msgstr "Localização B" +msgstr "Local B" #: netbox/dcim/tables/cables.py:90 msgid "Rack A" @@ -6840,7 +6839,7 @@ msgstr "Compartimentos de módulos" msgid "Inventory items" msgstr "Itens de inventário" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Compartimento de módulo" @@ -7571,12 +7570,12 @@ msgstr "Favoritos" msgid "Show your personal bookmarks" msgstr "Exibe seus favoritos pessoais" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Tipo de ação desconhecido para uma regra de evento: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Não é possível importar o pipeline de eventos {name}: {error}" @@ -7937,7 +7936,7 @@ msgstr "Grupos de sites" #: netbox/extras/forms/model_forms.py:522 netbox/netbox/navigation/menu.py:20 #: netbox/templates/dcim/site.html:127 msgid "Locations" -msgstr "Localizações" +msgstr "Locais" #: netbox/extras/forms/filtersets.py:361 #: netbox/extras/forms/model_forms.py:527 @@ -9887,7 +9886,7 @@ msgstr "Intervalo de ASN" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Atribuição de Site/VLAN" +msgstr "Atribuição de site/VLAN" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -12995,11 +12994,11 @@ msgstr "Part ID" #: netbox/templates/dcim/location.html:17 msgid "Add Child Location" -msgstr "Adicionar Sub-Localização" +msgstr "Adicionar Local Filho" #: netbox/templates/dcim/location.html:77 msgid "Child Locations" -msgstr "Sub-Localizações" +msgstr "Locais Filhos" #: netbox/templates/dcim/location.html:81 netbox/templates/dcim/site.html:131 msgid "Add a Location" @@ -13129,7 +13128,7 @@ msgstr "Adicionar Site" #: netbox/templates/dcim/region.html:55 msgid "Child Regions" -msgstr "Regiões de Sub-Localizações" +msgstr "Regiões Filhas" #: netbox/templates/dcim/region.html:59 msgid "Add Region" @@ -13160,7 +13159,7 @@ msgstr "Endereço de Entrega" #: netbox/templates/tenancy/tenantgroup.html:55 #: netbox/templates/wireless/wirelesslangroup.html:55 msgid "Child Groups" -msgstr "Grupos de Sub-Localizações" +msgstr "Grupos Filhos" #: netbox/templates/dcim/sitegroup.html:59 msgid "Add Site Group" @@ -15513,8 +15512,8 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} pertence ao site ({device_site}), diferente do que pertence o " -"cluster ({cluster_site})" +"{device} pertence a um site diferente ({device_site}) do que o cluster " +"({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -16249,8 +16248,7 @@ msgstr "links wireless" #: netbox/wireless/models.py:236 msgid "Must specify a unit when setting a wireless distance" -msgstr "" -"É necessário especificar uma unidade ao definir uma distância sem fio." +msgstr "É necessário especificar uma unidade ao definir uma distância sem fio" #: netbox/wireless/models.py:242 netbox/wireless/models.py:248 #, python-brace-format diff --git a/netbox/translations/tr/LC_MESSAGES/django.mo b/netbox/translations/tr/LC_MESSAGES/django.mo index 0455483e341d22e0cc83af209e5287d448ff34cf..fa94a7573093e28f94b118bc3da173cd820e343c 100644 GIT binary patch delta 69148 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

    2_ zX3fjDoV*Q;m^2a_49l)p27MbLi)={^jd+;N-`RF;1hX;D(7-K-)7nZ!>`w!USY>*O z%@5Vg0Xa--pO}~*7_cgAC4lY%kfazxjEPqy{|WCQ7N zD&r4q2_U*?+h3FBDxwFIw1wo$9EPy0;5Yg>^kDSbR!F2D8S#mKOR*h{A#lxrcRw+C z7;UV06yj9hvl$XeT%08!Eel~?iiXAh5_>xmzJPvUE`0ZF`=>y>l9&w21JhGXvfTww z9qdWqc|u%vuo?am@-zPzoE45I!qrGjNm0pfBe;)Ek^)QviDWBDms!;e8rWjCn5-&9 zw%`xote#1e#o?Pk-0VofP5u4KWe!T3&2MjT#O!|K69(U?=od43u(y$4tK`9b2KrqJ z8(ej`U$3x1$;SD`3OZKNFM4o{aencl2CWP7s}_`bj$huOS3!PJgICP)D;g%K$UwhH z!F3k-b@U59zSysle{j5|ennyjx8C7bym;{SFMjdkM(W(URf`_2lUHfcvr};1DE=jr zC#c)GMeF`OJGbbQyl&Ry)q8Yn-J)yeW z_=_Vh?7gu2;_#praRcH7*E!)|F>+9!n7fXGpTljIF39W^LpnSc~QbMgj6-BBjsNt~eijRIl?1vLza6IFd(9CmT| zh0PcCUYs3Ne1SK1(4@xRa6yme`X>sy)F7Z~@Tf)s^}+{TY#p#YC|TQpkwM+s&_cs@ z0be2p=ja)bEg-mkpMXW)puO`0vIZ9z7|=9Z(2~^w@q5aTGgU2@XPRbr>H+}8B iu>IobixY#>Pw<9~7}TM8K!PB?$vRAM!CBrl;r<_#GlGr) diff --git a/netbox/translations/uk/LC_MESSAGES/django.po b/netbox/translations/uk/LC_MESSAGES/django.po index 1588a5495..7b9ad8767 100644 --- a/netbox/translations/uk/LC_MESSAGES/django.po +++ b/netbox/translations/uk/LC_MESSAGES/django.po @@ -5,17 +5,17 @@ # # Translators: # Volodymyr Pidgornyi, 2024 -# Jeremy Stretch, 2024 # Vladyslav V. Prodan, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Vladyslav V. Prodan, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Ukrainian (https://app.transifex.com/netbox-community/teams/178115/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,7 +152,7 @@ msgstr "Неактивний" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -164,8 +164,8 @@ msgstr "Регіон (ідентифікатор)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Регіон (скорочення)" @@ -175,8 +175,8 @@ msgstr "Регіон (скорочення)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Група тех. майданчиків (ідентифікатор)" @@ -187,7 +187,7 @@ msgstr "Група тех. майданчиків (ідентифікатор)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -257,8 +257,8 @@ msgstr "Тех. майданчик" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -277,13 +277,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Провайдер (ідентифікатор)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Провайдер (скорочення)" @@ -312,8 +312,8 @@ msgstr "Тип каналу зв'язку (скорочення)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Тех. майданчик (ідентифікатор)" @@ -667,7 +667,7 @@ msgstr "Обліковий запис постачальника" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1102,7 +1102,7 @@ msgstr "Призначення" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1235,7 +1235,7 @@ msgstr "Призначення групи каналів зв'язку" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "кінець" +msgstr "припинення" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1298,15 +1298,14 @@ msgstr "кінці каналу зв'язку" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"Кінець каналу зв'язку повинно приєднатися або до тех. майданчику, або до " -"мережі провайдера." +"Припинення схеми повинно приєднатися або до сайту, або до мережі провайдера." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"Обідви кінці каналу зв'язку не може приєднатися як до тех. майданчику, так і" -" до мережі провайдера." +"Припинення схеми не може приєднатися як до сайту, так і до мережі " +"провайдера." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -1543,7 +1542,7 @@ msgstr "Гарантований процент чи коефіцієнт дос #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2937,7 +2936,7 @@ msgid "Parent site group (slug)" msgstr "Батьківська група тех. майданчиків (скорочення)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Група (ідентифікатор)" @@ -2995,15 +2994,15 @@ msgstr "Тип стійки (ідентифікатор)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Роль (ідентифікатор)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Роль (скорочення)" @@ -3201,7 +3200,7 @@ msgstr "Імпульсне джерело живлення (ідентифіка msgid "Device model" msgstr "Модель пристрою" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Інтерфейс (ідентифікатор)" @@ -3215,8 +3214,8 @@ msgid "Module bay (ID)" msgstr "Відсік модуля (ідентифікатор)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Пристрій (ідентифікатор)" @@ -3225,8 +3224,8 @@ msgstr "Пристрій (ідентифікатор)" msgid "Rack (name)" msgstr "Стійка (назва)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Пристрій (назва)" @@ -3278,9 +3277,9 @@ msgstr "Призначений VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3307,19 +3306,19 @@ msgstr "Призначений VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ідентифікатор)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3481,7 +3480,7 @@ msgstr "Часовий пояс" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3732,7 +3731,7 @@ msgid "Device Type" msgstr "Тип пристрою" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3840,7 +3839,7 @@ msgstr "Кластер" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4222,7 +4221,7 @@ msgstr "Назва призначеної ролі" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Модель типу стійки" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4231,11 +4230,11 @@ msgstr "Напрямок повітряного потоку" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "Ширина повинна бути встановлена, якщо не вказано тип стійки." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "Висота U повинна бути встановлена, якщо не вказано тип стійки." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -6826,7 +6825,7 @@ msgstr "Модульні відсіки" msgid "Inventory items" msgstr "Елементи інвентаря" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Резервуар модулів" @@ -7554,12 +7553,12 @@ msgstr "Закладки" msgid "Show your personal bookmarks" msgstr "Показувати особисті закладки" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Невідомий тип дії для правила події: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Не вдається імпортувати конвеєр подій {name} Помилка: {error}" @@ -9324,129 +9323,129 @@ msgstr "Експорт L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "Експорт L2VPN (ідентифікатор)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Префікс" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR (ідентифікатор)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (скорочення)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "У межах префікса" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "У межах та включаючи префікс" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Мережеві префікси, які містять цей префікс або IP" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Довжина маски" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ідентифікатор)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "Номер VLAN (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Адреса" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Діапазони, які містять цей префікс або IP" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Батьківський префікс" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Віртуальна машина (назва)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Віртуальна машина (ідентифікатор)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Інтерфейс (назва)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "Інтерфейс віртуальної машини (назва)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "Інтерфейс віртуальної машини (ідентифікатор)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "Група FHRP/VRRP (ідентифікатор)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Призначений до інтерфейсу" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "призначається" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Сервіс (ідентифікатор)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "NAT внутрішня IP-адреса (ідентифікатор)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Призначений інтерфейс" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Призначений інтерфейс віртуальної машини" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "IP-адреса (ідентифікатор)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "IP-адреса" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "Первинна адреса IPv4 (ідентифікатор)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "Первинна адреса IPv6 (ідентифікатор)" @@ -9670,11 +9669,13 @@ msgstr "Зробіть це основним IP для призначеного #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Це для зовнішнього незалежного керування" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" msgstr "" +"Позначте це як IP-адресу для зовнішнього незалежного керування призначеного " +"пристрою" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9685,10 +9686,14 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" msgstr "" +"Пристрій не вказано; неможливо встановити IP для зовнішнього незалежного " +"керування" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" msgstr "" +"Не вдається встановити IP для зовнішнього незалежного керування віртуальних " +"машин" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9697,6 +9702,8 @@ msgstr "Інтерфейс не вказано; неможливо встано #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" msgstr "" +"Інтерфейс не вказано; неможливо встановити як IP для зовнішнього незалежного" +" керування" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9855,7 +9862,7 @@ msgstr "Діапазон ASN" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Призначення тех. майданчику/VLAN" +msgstr "Призначення сайту/VLAN" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -9873,7 +9880,7 @@ msgstr "Зробіть це основним IP для пристрою/вірт #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Зробіть це IP для зовнішнього незалежного керування пристрою" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9886,10 +9893,14 @@ msgstr "IP-адреса може бути призначена лише одно #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"Не вдається перепризначити первинну IP-адресу для батьківського " +"пристрою/віртуальної машини" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" msgstr "" +"Не вдається перепризначити IP-адресу для зовнішнього незалежного керування " +"батьківського пристрою" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9903,6 +9914,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Лише IP-адреси, призначені інтерфейсу пристрою, можуть бути позначені як IP " +"для зовнішнього незалежного керування пристрою." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -12675,11 +12688,11 @@ msgstr "Завантажити" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Помилка візуалізації шаблону" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "Для цього пристрою не призначено жодного шаблону конфігурації." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13945,7 +13958,7 @@ msgstr "Довідковий центр" #: netbox/templates/inc/user_menu.html:41 msgid "Django Admin" -msgstr "Адміністратор Django" +msgstr "Джанго Адміністратор" #: netbox/templates/inc/user_menu.html:61 msgid "Log Out" @@ -14358,7 +14371,7 @@ msgstr "Додати віртуальний диск" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." -msgstr "" +msgstr "Жоден шаблон конфігурації не призначено для цієї віртуальної машини." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15465,7 +15478,7 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} належить до іншого тех. майданчику ({device_site}) ніж кластер " +"{device} належить до іншого сайту ({device_site}) ніж кластер " "({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 @@ -15653,19 +15666,19 @@ msgstr "GRE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" @@ -16205,9 +16218,7 @@ msgstr "бездротові канали зв'язку" #: netbox/wireless/models.py:236 msgid "Must specify a unit when setting a wireless distance" -msgstr "" -"Необхідно вказати одиницю виміру при установці відстані бездротового каналу " -"зв'язку" +msgstr "Необхідно вказати одиницю при установці бездротової відстані" #: netbox/wireless/models.py:242 netbox/wireless/models.py:248 #, python-brace-format diff --git a/netbox/translations/zh/LC_MESSAGES/django.mo b/netbox/translations/zh/LC_MESSAGES/django.mo index 52e676825ea6e94e0278b6a72e72fe212ae91efc..c61e80243b7706192b9a6596a4dc4f16cc01e1a0 100644 GIT binary patch delta 69210 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
    >sS;2!YNp}URt#Cu@~v@ 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 diff --git a/netbox/translations/zh/LC_MESSAGES/django.po b/netbox/translations/zh/LC_MESSAGES/django.po index c5d1f3032..81fdaaa67 100644 --- a/netbox/translations/zh/LC_MESSAGES/django.po +++ b/netbox/translations/zh/LC_MESSAGES/django.po @@ -13,17 +13,17 @@ # Bubu, 2024 # 夏小正, 2024 # 闻寄云, 2024 -# jiyin luo, 2024 -# Jeremy Stretch, 2024 +# luo jiyin, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Chinese (https://app.transifex.com/netbox-community/teams/178115/zh/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -159,7 +159,7 @@ msgstr "已失效" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -171,8 +171,8 @@ msgstr "区域（ID）" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "地区（缩写）" @@ -182,8 +182,8 @@ msgstr "地区（缩写）" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "站点组（ID）" @@ -194,7 +194,7 @@ msgstr "站点组（ID）" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -264,8 +264,8 @@ msgstr "站点" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -284,13 +284,13 @@ msgstr "自治系统编号/AS编号" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "运营商（ID）" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "运营商(缩写)" @@ -319,8 +319,8 @@ msgstr "线路类型(缩写)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "站点（ID）" @@ -674,7 +674,7 @@ msgstr "运营商账户" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1109,7 +1109,7 @@ msgstr "分配" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1242,7 +1242,7 @@ msgstr "电路组分配" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "接入终端" +msgstr "终止" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1303,12 +1303,12 @@ msgstr "线路接入" #: netbox/circuits/models/circuits.py:308 msgid "" "A circuit termination must attach to either a site or a provider network." -msgstr "线路终结必须连接到站点或运营商网络。" +msgstr "电路终端必须连接到站点或提供商网络。" #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." -msgstr "线路终结不能同时连接到站点和运营商网络。" +msgstr "电路终端不能同时连接到站点和提供商网络。" #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -1545,7 +1545,7 @@ msgstr "承诺速率" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2933,7 +2933,7 @@ msgid "Parent site group (slug)" msgstr "上一级站点组(缩写)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "组（ID）" @@ -2991,15 +2991,15 @@ msgstr "机架类型 (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "角色（ID）" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "角色 (缩写)" @@ -3197,7 +3197,7 @@ msgstr "VDC (ID)" msgid "Device model" msgstr "设备型号" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "接口(ID)" @@ -3211,8 +3211,8 @@ msgid "Module bay (ID)" msgstr "模块托架 (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "设备（ID）" @@ -3221,8 +3221,8 @@ msgstr "设备（ID）" msgid "Rack (name)" msgstr "机柜（名称）" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "设备（名称）" @@ -3274,9 +3274,9 @@ msgstr "指定VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3303,19 +3303,19 @@ msgstr "指定VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (ID)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3475,7 +3475,7 @@ msgstr "时区" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3726,7 +3726,7 @@ msgid "Device Type" msgstr "设备型号" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3834,7 +3834,7 @@ msgstr "集群" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4086,11 +4086,11 @@ msgstr "已标记 VLANs" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "添加带标签的 VLAN" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "移除带标签的 VLAN" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4138,7 +4138,7 @@ msgstr "802.1Q 交换" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "添加/删除" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4216,7 +4216,7 @@ msgstr "指定规则名称" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "机架类型型号" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4225,11 +4225,11 @@ msgstr "风道方向" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "如果未指定机架类型，则必须设置宽度。" #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "如果未指定机架类型，则必须设置 U 高度。" #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4875,6 +4875,8 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"批量创建支持字母数字范围。不支持单个范围内的混合大小写和类型（例如： [ge，xe] -0/0/ [0-9]）。代币 " +"{module}，如果存在，将在创建新模块时自动替换为位置值。" #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6680,7 +6682,7 @@ msgstr "设备板卡插槽" msgid "Inventory items" msgstr "库存项" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "设备板卡插槽" @@ -7400,12 +7402,12 @@ msgstr "书签" msgid "Show your personal bookmarks" msgstr "显示您的个人书签" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "事件规则的未知操作类型: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "无法导入事件管道 {name}错误: {error}" @@ -9107,129 +9109,129 @@ msgstr "导出 L2VPN" msgid "Exporting L2VPN (identifier)" msgstr "导出L2VPN(标识符)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "前缀" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RIR(ID)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIP(缩写)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "此前缀包含的" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "此前缀包含的(包含此前缀)" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "包含此前缀或IP的前缀" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "掩码长度" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (ID)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "VLAN 号(1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "地址" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "包含此前缀或IP的范围" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "上级前缀" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "虚拟机（名称）" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "虚拟机（ID）" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "接口（名称）" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "虚拟接口(名称)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "虚拟接口(ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "FHRP 组 (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "分配给接口" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "已分配" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "服务 (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "NAT 内部 IP 地址 (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "分配的接口" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "分配的虚拟机接口" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "IP 地址 (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "IP 地址" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "首选 IPv4（ID）" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "首选IPv6（ID）" @@ -9453,11 +9455,11 @@ msgstr "设置为设备的首选 IP" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "处于带外状态" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "将其指定为分配设备的带外 IP 地址" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9465,11 +9467,11 @@ msgstr "未指定设备或虚拟机；无法设置为首选 IP" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" -msgstr "" +msgstr "未指定设备；无法设置为带外 IP" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "无法为虚拟机设置带外 IP" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9477,7 +9479,7 @@ msgstr "未指定接口；无法设置为首选 IP" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" -msgstr "" +msgstr "未指定接口；无法设置为带外 IP" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9636,7 +9638,7 @@ msgstr "ASN范围" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Site/VLAN 分配" +msgstr "站点/VLAN 分配" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -9654,7 +9656,7 @@ msgstr "将此IP设置为分配设备/虚拟机的首选 IP" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "将此设为设备的带外 IP" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9666,11 +9668,11 @@ msgstr "IP 地址只能分配给单个对象。" #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" -msgstr "" +msgstr "无法为父设备/虚拟机重新分配主 IP 地址" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" -msgstr "" +msgstr "无法为父设备重新分配带外 IP 地址" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9681,7 +9683,7 @@ msgstr "只有分配给接口的 IP 地址才能指定为首选 IP。" msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." -msgstr "" +msgstr "只有分配给设备接口的 IP 地址才能指定为设备的带外 IP。" #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10063,19 +10065,19 @@ msgstr "没有作用域类型，无法设置作用域。" #: netbox/ipam/models/vlans.py:105 #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" -msgstr "" +msgstr "范围内的起始 VLAN ID ({value}) 不能小于 {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" -msgstr "" +msgstr "在范围内结束 VLAN ID ({value}) 不能超过 {maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" -msgstr "" +msgstr "范围内的结束 VLAN ID 必须大于或等于起始 VLAN ID ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12408,11 +12410,11 @@ msgstr "下载" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "渲染模板时出错" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "尚未为此设备分配任何配置模板。" #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13255,7 +13257,7 @@ msgstr "重新运行" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "无法从模块加载脚本 %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -13643,7 +13645,7 @@ msgstr "帮助中心" #: netbox/templates/inc/user_menu.html:41 msgid "Django Admin" -msgstr "Django Admin" +msgstr "Django 管理员" #: netbox/templates/inc/user_menu.html:61 msgid "Log Out" @@ -14049,7 +14051,7 @@ msgstr "增加虚拟硬盘" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." -msgstr "" +msgstr "尚未为此虚拟机分配任何配置模板。" #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15066,12 +15068,12 @@ msgstr "内存 (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "磁盘 (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "大小 (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15098,7 +15100,7 @@ msgstr "序列号" msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" -msgstr "{device} 属于与集群({cluster_site})不同的站点({device_site})" +msgstr "{device} 属于另一个站点 ({device_site}) 而不是集群 ({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -15266,19 +15268,19 @@ msgstr "GRE" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "openVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/requirements.txt b/requirements.txt index 903e4e7fd..cb62f6e6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,12 +15,12 @@ django-tables2==2.7.5 django-timezone-field==7.1 djangorestframework==3.15.2 drf-spectacular==0.28.0 -drf-spectacular-sidecar==2024.12.1 +drf-spectacular-sidecar==2025.2.1 feedparser==6.0.11 gunicorn==23.0.0 Jinja2==3.1.5 Markdown==3.7 -mkdocs-material==9.5.49 +mkdocs-material==9.6.2 mkdocstrings[python-legacy]==0.27.0 netaddr==1.3.0 nh3==0.2.20 @@ -34,5 +34,5 @@ social-auth-core==4.5.4 strawberry-graphql==0.258.0 strawberry-graphql-django==0.52.0 svgwrite==1.4.3 -tablib==3.7.0 -tzdata==2024.2 +tablib==3.8.0 +tzdata==2025.1 From 9391f48d628c9e940122bf3d05e65d5b503f30bf Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 4 Feb 2025 15:20:08 -0500 Subject: [PATCH 147/190] Update static bundle --- netbox/project-static/dist/netbox.css | Bin 554811 -> 554815 bytes netbox/project-static/package.json | 2 +- netbox/project-static/yarn.lock | 254 +++++++++++++------------- 3 files changed, 131 insertions(+), 125 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index cee6eda688f62b50695a128811bbdd7c68cfffca..2cb549a0d2013315c376bcc38be6f4856c7d6fec 100644 GIT binary patch delta 53 zcmdn}PI3P`#fBEf7N!>F7M2#)7Pc1lEgW*%q6HP!y1FIBx&=kL$%#d&B~}Us1r^)% IwK;fv00fm0eEF7M2#)7Pc1lEgW*%g4VjaCB?c0MY_p}MX4oL3I^MawK;fv E0Jks?tpET3 diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index 636ce51a2..361af0112 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -41,7 +41,7 @@ "@types/node": "^22.3.0", "@typescript-eslint/eslint-plugin": "^8.1.0", "@typescript-eslint/parser": "^8.1.0", - "esbuild": "^0.23.1", + "esbuild": "^0.24.2", "esbuild-sass-plugin": "^3.3.1", "eslint": "<9.0", "eslint-config-prettier": "^9.1.0", diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index c9b42df33..92e7e7bd1 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -21,125 +21,130 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== -"@esbuild/aix-ppc64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz#51299374de171dbd80bb7d838e1cfce9af36f353" - integrity sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ== +"@esbuild/aix-ppc64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz#38848d3e25afe842a7943643cbcd387cc6e13461" + integrity sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA== -"@esbuild/android-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz#58565291a1fe548638adb9c584237449e5e14018" - integrity sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw== +"@esbuild/android-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz#f592957ae8b5643129fa889c79e69cd8669bb894" + integrity sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg== -"@esbuild/android-arm@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.1.tgz#5eb8c652d4c82a2421e3395b808e6d9c42c862ee" - integrity sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ== +"@esbuild/android-arm@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.24.2.tgz#72d8a2063aa630308af486a7e5cbcd1e134335b3" + integrity sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q== -"@esbuild/android-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.1.tgz#ae19d665d2f06f0f48a6ac9a224b3f672e65d517" - integrity sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg== +"@esbuild/android-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.24.2.tgz#9a7713504d5f04792f33be9c197a882b2d88febb" + integrity sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw== -"@esbuild/darwin-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz#05b17f91a87e557b468a9c75e9d85ab10c121b16" - integrity sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q== +"@esbuild/darwin-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz#02ae04ad8ebffd6e2ea096181b3366816b2b5936" + integrity sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA== -"@esbuild/darwin-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz#c58353b982f4e04f0d022284b8ba2733f5ff0931" - integrity sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw== +"@esbuild/darwin-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz#9ec312bc29c60e1b6cecadc82bd504d8adaa19e9" + integrity sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA== -"@esbuild/freebsd-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz#f9220dc65f80f03635e1ef96cfad5da1f446f3bc" - integrity sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA== +"@esbuild/freebsd-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz#5e82f44cb4906d6aebf24497d6a068cfc152fa00" + integrity sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg== -"@esbuild/freebsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz#69bd8511fa013b59f0226d1609ac43f7ce489730" - integrity sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g== +"@esbuild/freebsd-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz#3fb1ce92f276168b75074b4e51aa0d8141ecce7f" + integrity sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q== -"@esbuild/linux-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz#8050af6d51ddb388c75653ef9871f5ccd8f12383" - integrity sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g== +"@esbuild/linux-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz#856b632d79eb80aec0864381efd29de8fd0b1f43" + integrity sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg== -"@esbuild/linux-arm@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz#ecaabd1c23b701070484990db9a82f382f99e771" - integrity sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ== +"@esbuild/linux-arm@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz#c846b4694dc5a75d1444f52257ccc5659021b736" + integrity sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA== -"@esbuild/linux-ia32@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz#3ed2273214178109741c09bd0687098a0243b333" - integrity sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ== +"@esbuild/linux-ia32@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz#f8a16615a78826ccbb6566fab9a9606cfd4a37d5" + integrity sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw== -"@esbuild/linux-loong64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz#a0fdf440b5485c81b0fbb316b08933d217f5d3ac" - integrity sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw== +"@esbuild/linux-loong64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz#1c451538c765bf14913512c76ed8a351e18b09fc" + integrity sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ== -"@esbuild/linux-mips64el@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz#e11a2806346db8375b18f5e104c5a9d4e81807f6" - integrity sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q== +"@esbuild/linux-mips64el@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz#0846edeefbc3d8d50645c51869cc64401d9239cb" + integrity sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw== -"@esbuild/linux-ppc64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz#06a2744c5eaf562b1a90937855b4d6cf7c75ec96" - integrity sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw== +"@esbuild/linux-ppc64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz#8e3fc54505671d193337a36dfd4c1a23b8a41412" + integrity sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw== -"@esbuild/linux-riscv64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz#65b46a2892fc0d1af4ba342af3fe0fa4a8fe08e7" - integrity sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA== +"@esbuild/linux-riscv64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz#6a1e92096d5e68f7bb10a0d64bb5b6d1daf9a694" + integrity sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q== -"@esbuild/linux-s390x@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz#e71ea18c70c3f604e241d16e4e5ab193a9785d6f" - integrity sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw== +"@esbuild/linux-s390x@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz#ab18e56e66f7a3c49cb97d337cd0a6fea28a8577" + integrity sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw== -"@esbuild/linux-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz#d47f97391e80690d4dfe811a2e7d6927ad9eed24" - integrity sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ== +"@esbuild/linux-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz#8140c9b40da634d380b0b29c837a0b4267aff38f" + integrity sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q== -"@esbuild/netbsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz#44e743c9778d57a8ace4b72f3c6b839a3b74a653" - integrity sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA== +"@esbuild/netbsd-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz#65f19161432bafb3981f5f20a7ff45abb2e708e6" + integrity sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw== -"@esbuild/openbsd-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz#05c5a1faf67b9881834758c69f3e51b7dee015d7" - integrity sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q== +"@esbuild/netbsd-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz#7a3a97d77abfd11765a72f1c6f9b18f5396bcc40" + integrity sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw== -"@esbuild/openbsd-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz#2e58ae511bacf67d19f9f2dcd9e8c5a93f00c273" - integrity sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA== +"@esbuild/openbsd-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz#58b00238dd8f123bfff68d3acc53a6ee369af89f" + integrity sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A== -"@esbuild/sunos-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz#adb022b959d18d3389ac70769cef5a03d3abd403" - integrity sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA== +"@esbuild/openbsd-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz#0ac843fda0feb85a93e288842936c21a00a8a205" + integrity sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA== -"@esbuild/win32-arm64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz#84906f50c212b72ec360f48461d43202f4c8b9a2" - integrity sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A== +"@esbuild/sunos-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz#8b7aa895e07828d36c422a4404cc2ecf27fb15c6" + integrity sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig== -"@esbuild/win32-ia32@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz#5e3eacc515820ff729e90d0cb463183128e82fac" - integrity sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ== +"@esbuild/win32-arm64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz#c023afb647cabf0c3ed13f0eddfc4f1d61c66a85" + integrity sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ== -"@esbuild/win32-x64@0.23.1": - version "0.23.1" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699" - integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg== +"@esbuild/win32-ia32@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz#96c356132d2dda990098c8b8b951209c3cd743c2" + integrity sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA== + +"@esbuild/win32-x64@0.24.2": + version "0.24.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz#34aa0b52d0fbb1a654b596acfa595f0c7b77a77b" + integrity sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg== "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" @@ -1429,35 +1434,36 @@ esbuild-sass-plugin@^3.3.1: safe-identifier "^0.4.2" sass "^1.71.1" -esbuild@^0.23.1: - version "0.23.1" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.23.1.tgz#40fdc3f9265ec0beae6f59824ade1bd3d3d2dab8" - integrity sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg== +esbuild@^0.24.2: + version "0.24.2" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.2.tgz#b5b55bee7de017bff5fb8a4e3e44f2ebe2c3567d" + integrity sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA== optionalDependencies: - "@esbuild/aix-ppc64" "0.23.1" - "@esbuild/android-arm" "0.23.1" - "@esbuild/android-arm64" "0.23.1" - "@esbuild/android-x64" "0.23.1" - "@esbuild/darwin-arm64" "0.23.1" - "@esbuild/darwin-x64" "0.23.1" - "@esbuild/freebsd-arm64" "0.23.1" - "@esbuild/freebsd-x64" "0.23.1" - "@esbuild/linux-arm" "0.23.1" - "@esbuild/linux-arm64" "0.23.1" - "@esbuild/linux-ia32" "0.23.1" - "@esbuild/linux-loong64" "0.23.1" - "@esbuild/linux-mips64el" "0.23.1" - "@esbuild/linux-ppc64" "0.23.1" - "@esbuild/linux-riscv64" "0.23.1" - "@esbuild/linux-s390x" "0.23.1" - "@esbuild/linux-x64" "0.23.1" - "@esbuild/netbsd-x64" "0.23.1" - "@esbuild/openbsd-arm64" "0.23.1" - "@esbuild/openbsd-x64" "0.23.1" - "@esbuild/sunos-x64" "0.23.1" - "@esbuild/win32-arm64" "0.23.1" - "@esbuild/win32-ia32" "0.23.1" - "@esbuild/win32-x64" "0.23.1" + "@esbuild/aix-ppc64" "0.24.2" + "@esbuild/android-arm" "0.24.2" + "@esbuild/android-arm64" "0.24.2" + "@esbuild/android-x64" "0.24.2" + "@esbuild/darwin-arm64" "0.24.2" + "@esbuild/darwin-x64" "0.24.2" + "@esbuild/freebsd-arm64" "0.24.2" + "@esbuild/freebsd-x64" "0.24.2" + "@esbuild/linux-arm" "0.24.2" + "@esbuild/linux-arm64" "0.24.2" + "@esbuild/linux-ia32" "0.24.2" + "@esbuild/linux-loong64" "0.24.2" + "@esbuild/linux-mips64el" "0.24.2" + "@esbuild/linux-ppc64" "0.24.2" + "@esbuild/linux-riscv64" "0.24.2" + "@esbuild/linux-s390x" "0.24.2" + "@esbuild/linux-x64" "0.24.2" + "@esbuild/netbsd-arm64" "0.24.2" + "@esbuild/netbsd-x64" "0.24.2" + "@esbuild/openbsd-arm64" "0.24.2" + "@esbuild/openbsd-x64" "0.24.2" + "@esbuild/sunos-x64" "0.24.2" + "@esbuild/win32-arm64" "0.24.2" + "@esbuild/win32-ia32" "0.24.2" + "@esbuild/win32-x64" "0.24.2" escape-string-regexp@^4.0.0: version "4.0.0" From 8e91db0394634921741942959c3b6c630e4f47d9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 5 Feb 2025 09:40:22 -0500 Subject: [PATCH 148/190] Misc cleanup of the release checklist --- docs/development/release-checklist.md | 27 ++++++++++++++++++++++++--- docs/development/translations.md | 5 ++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/docs/development/release-checklist.md b/docs/development/release-checklist.md index c74fcf8f6..5b31a6391 100644 --- a/docs/development/release-checklist.md +++ b/docs/development/release-checklist.md @@ -8,6 +8,8 @@ This documentation describes the process of packaging and publishing a new NetBo While major releases generally introduce some very substantial change to the application, they are typically treated the same as minor version increments for the purpose of release packaging. +For patch releases (e.g. upgrading from v4.2.2 to v4.2.3), begin at the [patch releases](#patch-releases) heading below. For minor or major releases, complete the entire checklist. + ## Minor Version Releases ### Address Constrained Dependencies @@ -85,7 +87,20 @@ In cases where upgrading a dependency to its most recent release is breaking, it ### Update UI Dependencies -Check whether any UI dependencies (JavaScript packages, fonts, etc.) need to be updated by running `yarn outdated` from within the `project-static/` directory. [Upgrade these dependencies](./web-ui.md#updating-dependencies) as necessary, then run `yarn bundle` to generate the necessary files for distribution. +Check whether any UI dependencies (JavaScript packages, fonts, etc.) need to be updated by running `yarn outdated` from within the `project-static/` directory. [Upgrade these dependencies](./web-ui.md#updating-dependencies) as necessary, then run `yarn bundle` to generate the necessary files for distribution: + +``` +$ yarn bundle +yarn run v1.22.19 +$ node bundle.js +✅ Bundled source file 'styles/external.scss' to 'netbox-external.css' +✅ Bundled source file 'styles/netbox.scss' to 'netbox.css' +✅ Bundled source file 'styles/svg/rack_elevation.scss' to 'rack_elevation.css' +✅ Bundled source file 'styles/svg/cable_trace.scss' to 'cable_trace.css' +✅ Bundled source file 'index.ts' to 'netbox.js' +✅ Copied graphiql files +Done in 1.00s. +``` ### Rebuild the Device Type Definition Schema @@ -116,9 +131,12 @@ Then, compile these portable (`.po`) files for use in the application: ### Update Version and Changelog -* Update the version and published date in `release.yaml` with the current version & date. Add a designation (e.g.g `beta1`) if applicable. +* Update the version number and date in `netbox/release.yaml`. Add or remove the designation (e.g. `beta1`) if applicable. * Update the example version numbers in the feature request and bug report templates under `.github/ISSUE_TEMPLATES/`. -* Replace the "FUTURE" placeholder in the release notes with the current date. +* Add a section for this release at the top of the changelog page for the minor version (e.g. `docs/release-notes/version-4.2.md`) listing all relevant changes made in this release. + +!!! tip + Put yourself in the shoes of the user when recording change notes. Focus on the effect that each change has for the end user, rather than the specific bits of code that were modified in a PR. Ensure that each message conveys meaning absent context of the initial feature request or bug report. Remember to include key words or phrases (such as exception names) that can be easily searched. ### Submit a Pull Request @@ -126,6 +144,9 @@ Commit the above changes and submit a pull request titled **"Release vX.Y.Z"** t Once CI has completed and a colleague has reviewed the PR, merge it. This effects a new release in the `main` branch. +!!! warning + To ensure a streamlined review process, the pull request for a release **must** be limited to the changes outlined in this document. A release PR must never include functional changes to the application: Any unrelated "cleanup" needs to be captured in a separate PR prior to the release being shipped. + ### Create a New Release Create a [new release](https://github.com/netbox-community/netbox/releases/new) on GitHub with the following parameters. diff --git a/docs/development/translations.md b/docs/development/translations.md index de8545b97..81b80662f 100644 --- a/docs/development/translations.md +++ b/docs/development/translations.md @@ -30,7 +30,7 @@ To download translated strings automatically, you'll need to: 1. Install the [Transifex CLI client](https://github.com/transifex/cli) 2. Generate a [Transifex API token](https://app.transifex.com/user/settings/api/) -Once you have the client set up, run the following command: +Once you have the client set up, run the following command from the project root (e.g. `/opt/netbox/`): ```no-highlight TX_TOKEN=$TOKEN tx pull @@ -46,6 +46,9 @@ Once retrieved, the updated strings need to be compiled into new `.mo` files so Once any new `.mo` files have been generated, they need to be committed and pushed back up to GitHub. (Again, this is typically done as part of publishing a new NetBox release.) +!!! tip + Run `git status` to check that both `*.mo` & `*.po` files have been updated as expected. + ## Proposing New Languages If you'd like to add support for a new language to NetBox, the first step is to [submit a GitHub issue](https://github.com/netbox-community/netbox/issues/new?assignees=&labels=type%3A+translation&projects=&template=translation.yaml) to capture the proposal. While we'd like to add as many languages as possible, we do need to limit the rate at which new languages are added. New languages will be selected according to community interest and the number of volunteers who sign up as translators. From efa939d0c22471ea2082714ee6a942c761271d80 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Date: Thu, 6 Feb 2025 18:30:25 -0300 Subject: [PATCH 149/190] Fixes: #18241 - Script results log_threshold should default to Default (#18501) * Changed LogLevelChoices order; Changed ScriptResultView to select LogLevelChoices to LOG_DEFAULT and setup the html template to put (All) in the last one * Change LogLevelChoices in ScriptResultView get_table method * Remove default option, add Default string to INFO * Fix scripts.py and reports.py to reflect removing DEFAULT level * fix linting --- netbox/extras/choices.py | 4 +--- netbox/extras/constants.py | 9 ++++----- netbox/extras/reports.py | 2 +- netbox/extras/scripts.py | 2 +- netbox/extras/views.py | 12 ++++++------ netbox/templates/extras/script_result.html | 2 +- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 4525d8689..3cd7daab4 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -155,7 +155,6 @@ class JournalEntryKindChoices(ChoiceSet): class LogLevelChoices(ChoiceSet): LOG_DEBUG = 'debug' - LOG_DEFAULT = 'default' LOG_INFO = 'info' LOG_SUCCESS = 'success' LOG_WARNING = 'warning' @@ -163,16 +162,15 @@ class LogLevelChoices(ChoiceSet): CHOICES = ( (LOG_DEBUG, _('Debug'), 'teal'), - (LOG_DEFAULT, _('Default'), 'gray'), (LOG_INFO, _('Info'), 'cyan'), (LOG_SUCCESS, _('Success'), 'green'), (LOG_WARNING, _('Warning'), 'yellow'), (LOG_FAILURE, _('Failure'), 'red'), + ) SYSTEM_LEVELS = { LOG_DEBUG: logging.DEBUG, - LOG_DEFAULT: logging.INFO, LOG_INFO: logging.INFO, LOG_SUCCESS: logging.INFO, LOG_WARNING: logging.WARNING, diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 123b771f6..fadf59c25 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -138,9 +138,8 @@ DEFAULT_DASHBOARD = [ LOG_LEVEL_RANK = { LogLevelChoices.LOG_DEBUG: 0, - LogLevelChoices.LOG_DEFAULT: 1, - LogLevelChoices.LOG_INFO: 2, - LogLevelChoices.LOG_SUCCESS: 3, - LogLevelChoices.LOG_WARNING: 4, - LogLevelChoices.LOG_FAILURE: 5, + LogLevelChoices.LOG_INFO: 1, + LogLevelChoices.LOG_SUCCESS: 2, + LogLevelChoices.LOG_WARNING: 3, + LogLevelChoices.LOG_FAILURE: 4, } diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py index a70447364..8e58b8aa0 100644 --- a/netbox/extras/reports.py +++ b/netbox/extras/reports.py @@ -15,7 +15,7 @@ class Report(BaseScript): # There is no generic log() equivalent on BaseScript def log(self, message): - self._log(message, None, level=LogLevelChoices.LOG_DEFAULT) + self._log(message, None, level=LogLevelChoices.LOG_INFO) def log_success(self, obj=None, message=None): super().log_success(message, obj) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index f2bd75a1d..0d9c2181f 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -460,7 +460,7 @@ class BaseScript: # Logging # - def _log(self, message, obj=None, level=LogLevelChoices.LOG_DEFAULT): + def _log(self, message, obj=None, level=LogLevelChoices.LOG_INFO): """ Log a message. Do not call this method directly; use one of the log_* wrappers below. """ diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 9cb9dd54a..3672e5336 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1315,9 +1315,9 @@ class ScriptResultView(TableMixin, generic.ObjectView): index = 0 try: - log_threshold = LOG_LEVEL_RANK[request.GET.get('log_threshold', LogLevelChoices.LOG_DEBUG)] + log_threshold = LOG_LEVEL_RANK[request.GET.get('log_threshold', LogLevelChoices.LOG_INFO)] except KeyError: - log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_DEBUG] + log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_INFO] if job.data: if 'log' in job.data: @@ -1325,7 +1325,7 @@ class ScriptResultView(TableMixin, generic.ObjectView): tests = job.data['tests'] for log in job.data['log']: - log_level = LOG_LEVEL_RANK.get(log.get('status'), LogLevelChoices.LOG_DEFAULT) + log_level = LOG_LEVEL_RANK.get(log.get('status'), LogLevelChoices.LOG_INFO) if log_level >= log_threshold: index += 1 result = { @@ -1348,7 +1348,7 @@ class ScriptResultView(TableMixin, generic.ObjectView): for method, test_data in tests.items(): if 'log' in test_data: for time, status, obj, url, message in test_data['log']: - log_level = LOG_LEVEL_RANK.get(status, LogLevelChoices.LOG_DEFAULT) + log_level = LOG_LEVEL_RANK.get(status, LogLevelChoices.LOG_INFO) if log_level >= log_threshold: index += 1 result = { @@ -1374,9 +1374,9 @@ class ScriptResultView(TableMixin, generic.ObjectView): if job.completed: table = self.get_table(job, request, bulk_actions=False) - log_threshold = request.GET.get('log_threshold', LogLevelChoices.LOG_DEBUG) + log_threshold = request.GET.get('log_threshold', LogLevelChoices.LOG_INFO) if log_threshold not in LOG_LEVEL_RANK: - log_threshold = LogLevelChoices.LOG_DEBUG + log_threshold = LogLevelChoices.LOG_INFO context = { 'script': job.object, diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html index 18a28998f..4630640a7 100644 --- a/netbox/templates/extras/script_result.html +++ b/netbox/templates/extras/script_result.html @@ -53,7 +53,7 @@

    {% trans "Tagged Item Types" %}

    - + - - - + {% with viewname=object_type.content_type.model_class|validated_viewname:"list" %} + {% if viewname %} + + {{ object_type.content_type.name|bettertitle }} + {{ object_type.item_count }} + + {% else %} +
  • + {{ object_type.content_type.name|bettertitle }} + {{ object_type.item_count }} +
    • + {% endif %} + {% endwith %} {% endfor %} -
    {{ object_type.content_type.name|bettertitle }} - {% with viewname=object_type.content_type.model_class|validated_viewname:"list" %} - {% if viewname %} - {{ object_type.item_count }} - {% else %} - {{ object_type.item_count }} - {% endif %} - {% endwith %} -
    +
    {% plugin_right_page object %}
    {% for level, name in log_levels.items %} - {{ name }}{% if forloop.first %} ({% trans "All" %}){% endif %} + {{ name }}{% if forloop.counter == 1 %} ({% trans "All" %}){% elif forloop.counter == 2 %} ({% trans "Default" %}){% endif %} {% if level == log_threshold %}{% endif %} {% endfor %} From 7794b6718abfa9f3da0df2613d7893d148a5bb57 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Date: Thu, 6 Feb 2025 19:21:46 -0300 Subject: [PATCH 150/190] Fixes: #18013 - All saved filters showing up for Change Log table, regardless of defined object type (#18551) * Setup ObjectChangeFilterForm __init__ to add query_param to filter_id * code lint, move __init__ to end of class * Move filter_id widget setup to SavedFiltersMixin, and add model attributes to Models FilterForms * Add missing model declarations for filter forms --------- Co-authored-by: Jeremy Stretch --- netbox/core/forms/filtersets.py | 2 ++ netbox/extras/forms/filtersets.py | 9 +++++++++ netbox/netbox/forms/base.py | 9 --------- netbox/netbox/forms/mixins.py | 10 ++++++++++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/netbox/core/forms/filtersets.py b/netbox/core/forms/filtersets.py index ab4b869b7..f9564a76f 100644 --- a/netbox/core/forms/filtersets.py +++ b/netbox/core/forms/filtersets.py @@ -62,6 +62,7 @@ class DataFileFilterForm(NetBoxModelFilterSetForm): class JobFilterForm(SavedFiltersMixin, FilterForm): + model = Job fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('object_type', 'status', name=_('Attributes')), @@ -162,6 +163,7 @@ class ObjectChangeFilterForm(SavedFiltersMixin, FilterForm): class ConfigRevisionFilterForm(SavedFiltersMixin, FilterForm): + model = ConfigRevision fieldsets = ( FieldSet('q', 'filter_id'), ) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 05dcf96c4..9dc024128 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -37,6 +37,7 @@ __all__ = ( class CustomFieldFilterForm(SavedFiltersMixin, FilterForm): + model = CustomField fieldsets = ( FieldSet('q', 'filter_id'), FieldSet( @@ -115,6 +116,7 @@ class CustomFieldFilterForm(SavedFiltersMixin, FilterForm): class CustomFieldChoiceSetFilterForm(SavedFiltersMixin, FilterForm): + model = CustomFieldChoiceSet fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('base_choices', 'choice', name=_('Choices')), @@ -129,6 +131,7 @@ class CustomFieldChoiceSetFilterForm(SavedFiltersMixin, FilterForm): class CustomLinkFilterForm(SavedFiltersMixin, FilterForm): + model = CustomLink fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('object_type', 'enabled', 'new_window', 'weight', name=_('Attributes')), @@ -159,6 +162,7 @@ class CustomLinkFilterForm(SavedFiltersMixin, FilterForm): class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm): + model = ExportTemplate fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('data_source_id', 'data_file_id', name=_('Data')), @@ -200,6 +204,7 @@ class ExportTemplateFilterForm(SavedFiltersMixin, FilterForm): class ImageAttachmentFilterForm(SavedFiltersMixin, FilterForm): + model = ImageAttachment fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('object_type_id', 'name', name=_('Attributes')), @@ -216,6 +221,7 @@ class ImageAttachmentFilterForm(SavedFiltersMixin, FilterForm): class SavedFilterFilterForm(SavedFiltersMixin, FilterForm): + model = SavedFilter fieldsets = ( FieldSet('q', 'filter_id'), FieldSet('object_type', 'enabled', 'shared', 'weight', name=_('Attributes')), @@ -314,6 +320,7 @@ class TagFilterForm(SavedFiltersMixin, FilterForm): class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): + model = ConfigContext fieldsets = ( FieldSet('q', 'filter_id', 'tag_id'), FieldSet('data_source_id', 'data_file_id', name=_('Data')), @@ -403,6 +410,7 @@ class ConfigContextFilterForm(SavedFiltersMixin, FilterForm): class ConfigTemplateFilterForm(SavedFiltersMixin, FilterForm): + model = ConfigTemplate fieldsets = ( FieldSet('q', 'filter_id', 'tag'), FieldSet('data_source_id', 'data_file_id', name=_('Data')), @@ -469,6 +477,7 @@ class JournalEntryFilterForm(NetBoxModelFilterSetForm): class NotificationGroupFilterForm(SavedFiltersMixin, FilterForm): + model = NotificationGroup user_id = DynamicModelMultipleChoiceField( queryset=User.objects.all(), required=False, diff --git a/netbox/netbox/forms/base.py b/netbox/netbox/forms/base.py index 74ac4b0e0..632d5ecb1 100644 --- a/netbox/netbox/forms/base.py +++ b/netbox/netbox/forms/base.py @@ -169,15 +169,6 @@ class NetBoxModelFilterSetForm(CustomFieldsMixin, SavedFiltersMixin, forms.Form) selector_fields = ('filter_id', 'q') - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # Limit saved filters to those applicable to the form's model - object_type = ObjectType.objects.get_for_model(self.model) - self.fields['filter_id'].widget.add_query_params({ - 'object_type_id': object_type.pk, - }) - def _get_custom_fields(self, content_type): return super()._get_custom_fields(content_type).exclude( Q(filter_logic=CustomFieldFilterLogicChoices.FILTER_DISABLED) | diff --git a/netbox/netbox/forms/mixins.py b/netbox/netbox/forms/mixins.py index 6b1f31265..c569343ee 100644 --- a/netbox/netbox/forms/mixins.py +++ b/netbox/netbox/forms/mixins.py @@ -73,6 +73,16 @@ class SavedFiltersMixin(forms.Form): } ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Limit saved filters to those applicable to the form's model + if hasattr(self, 'model'): + object_type = ObjectType.objects.get_for_model(self.model) + self.fields['filter_id'].widget.add_query_params({ + 'object_type_id': object_type.pk, + }) + class TagsMixin(forms.Form): tags = DynamicModelMultipleChoiceField( From 72e93b04daf38b0a5f7dab70e96a9f96edd02649 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 05:02:00 +0000 Subject: [PATCH 151/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 244 +++++++++---------- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 357406505..148ae8b68 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-01 05:01+0000\n" +"POT-Creation-Date: 2025-02-07 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -739,7 +739,7 @@ msgstr "" #: netbox/circuits/forms/bulk_import.py:227 #: netbox/circuits/forms/filtersets.py:161 #: netbox/circuits/forms/filtersets.py:356 netbox/core/forms/filtersets.py:38 -#: netbox/core/forms/filtersets.py:79 netbox/core/tables/data.py:23 +#: netbox/core/forms/filtersets.py:80 netbox/core/tables/data.py:23 #: netbox/core/tables/jobs.py:26 netbox/core/tables/tasks.py:88 #: netbox/dcim/forms/bulk_edit.py:110 netbox/dcim/forms/bulk_edit.py:185 #: netbox/dcim/forms/bulk_edit.py:355 netbox/dcim/forms/bulk_edit.py:709 @@ -829,8 +829,8 @@ msgstr "" #: netbox/dcim/forms/filtersets.py:723 netbox/dcim/forms/filtersets.py:917 #: netbox/dcim/forms/filtersets.py:979 netbox/dcim/forms/filtersets.py:1009 #: netbox/dcim/forms/filtersets.py:1131 netbox/dcim/tables/power.py:88 -#: netbox/extras/filtersets.py:612 netbox/extras/forms/filtersets.py:323 -#: netbox/extras/forms/filtersets.py:396 netbox/ipam/forms/bulk_edit.py:46 +#: netbox/extras/filtersets.py:612 netbox/extras/forms/filtersets.py:330 +#: netbox/extras/forms/filtersets.py:403 netbox/ipam/forms/bulk_edit.py:46 #: netbox/ipam/forms/bulk_edit.py:71 netbox/ipam/forms/bulk_edit.py:115 #: netbox/ipam/forms/bulk_edit.py:144 netbox/ipam/forms/bulk_edit.py:169 #: netbox/ipam/forms/bulk_edit.py:235 netbox/ipam/forms/bulk_edit.py:285 @@ -932,8 +932,8 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:110 #: netbox/circuits/forms/filtersets.py:127 #: netbox/circuits/forms/filtersets.py:310 -#: netbox/circuits/forms/filtersets.py:325 netbox/core/forms/filtersets.py:67 -#: netbox/core/forms/filtersets.py:135 netbox/dcim/forms/bulk_edit.py:846 +#: netbox/circuits/forms/filtersets.py:325 netbox/core/forms/filtersets.py:68 +#: netbox/core/forms/filtersets.py:136 netbox/dcim/forms/bulk_edit.py:846 #: netbox/dcim/forms/filtersets.py:173 netbox/dcim/forms/filtersets.py:205 #: netbox/dcim/forms/filtersets.py:916 netbox/dcim/forms/filtersets.py:1008 #: netbox/dcim/forms/filtersets.py:1132 netbox/dcim/forms/filtersets.py:1240 @@ -942,10 +942,10 @@ msgstr "" #: netbox/dcim/forms/filtersets.py:1446 netbox/dcim/forms/filtersets.py:1470 #: netbox/dcim/forms/filtersets.py:1494 netbox/dcim/forms/filtersets.py:1512 #: netbox/dcim/forms/filtersets.py:1528 netbox/extras/forms/bulk_edit.py:90 -#: netbox/extras/forms/filtersets.py:44 netbox/extras/forms/filtersets.py:134 -#: netbox/extras/forms/filtersets.py:165 netbox/extras/forms/filtersets.py:205 -#: netbox/extras/forms/filtersets.py:221 netbox/extras/forms/filtersets.py:252 -#: netbox/extras/forms/filtersets.py:276 netbox/extras/forms/filtersets.py:441 +#: netbox/extras/forms/filtersets.py:45 netbox/extras/forms/filtersets.py:137 +#: netbox/extras/forms/filtersets.py:169 netbox/extras/forms/filtersets.py:210 +#: netbox/extras/forms/filtersets.py:227 netbox/extras/forms/filtersets.py:258 +#: netbox/extras/forms/filtersets.py:282 netbox/extras/forms/filtersets.py:449 #: netbox/ipam/forms/filtersets.py:101 netbox/ipam/forms/filtersets.py:269 #: netbox/ipam/forms/filtersets.py:310 netbox/ipam/forms/filtersets.py:385 #: netbox/ipam/forms/filtersets.py:470 netbox/ipam/forms/filtersets.py:483 @@ -1236,7 +1236,7 @@ msgstr "" #: netbox/dcim/forms/model_forms.py:478 netbox/dcim/forms/model_forms.py:739 #: netbox/dcim/tables/devices.py:167 netbox/dcim/tables/power.py:30 #: netbox/dcim/tables/racks.py:117 netbox/dcim/tables/racks.py:211 -#: netbox/extras/filtersets.py:536 netbox/extras/forms/filtersets.py:320 +#: netbox/extras/filtersets.py:536 netbox/extras/forms/filtersets.py:327 #: netbox/ipam/forms/filtersets.py:234 netbox/ipam/forms/filtersets.py:417 #: netbox/ipam/forms/filtersets.py:440 netbox/ipam/forms/filtersets.py:507 #: netbox/templates/dcim/device.html:26 @@ -1342,7 +1342,7 @@ msgstr "" #: netbox/circuits/forms/model_forms.py:252 #: netbox/circuits/tables/circuits.py:191 netbox/dcim/forms/bulk_edit.py:121 #: netbox/dcim/forms/bulk_import.py:102 netbox/dcim/forms/model_forms.py:120 -#: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 +#: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:489 #: netbox/ipam/filtersets.py:968 netbox/ipam/forms/bulk_edit.py:477 #: netbox/ipam/forms/bulk_import.py:459 netbox/ipam/forms/model_forms.py:563 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:91 @@ -1686,7 +1686,7 @@ msgstr "" #: netbox/dcim/tables/racks.py:24 netbox/dcim/tables/racks.py:113 #: netbox/dcim/tables/sites.py:24 netbox/dcim/tables/sites.py:51 #: netbox/dcim/tables/sites.py:78 netbox/dcim/tables/sites.py:130 -#: netbox/extras/forms/filtersets.py:213 netbox/extras/tables/tables.py:58 +#: netbox/extras/forms/filtersets.py:218 netbox/extras/tables/tables.py:58 #: netbox/extras/tables/tables.py:122 netbox/extras/tables/tables.py:155 #: netbox/extras/tables/tables.py:180 netbox/extras/tables/tables.py:246 #: netbox/extras/tables/tables.py:361 netbox/extras/tables/tables.py:378 @@ -1930,7 +1930,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:786 netbox/dcim/tables/devices.py:832 #: netbox/dcim/tables/devices.py:891 netbox/dcim/tables/devices.py:959 #: netbox/dcim/tables/devices.py:1088 netbox/dcim/tables/modules.py:53 -#: netbox/extras/forms/filtersets.py:321 netbox/ipam/forms/bulk_import.py:303 +#: netbox/extras/forms/filtersets.py:328 netbox/ipam/forms/bulk_import.py:303 #: netbox/ipam/forms/bulk_import.py:540 netbox/ipam/forms/filtersets.py:603 #: netbox/ipam/forms/model_forms.py:325 netbox/ipam/forms/model_forms.py:754 #: netbox/ipam/forms/model_forms.py:787 netbox/ipam/forms/model_forms.py:813 @@ -2046,15 +2046,15 @@ msgstr "" msgid "Minutely" msgstr "" -#: netbox/core/choices.py:83 netbox/extras/choices.py:186 +#: netbox/core/choices.py:83 netbox/extras/choices.py:184 msgid "Hourly" msgstr "" -#: netbox/core/choices.py:84 netbox/extras/choices.py:188 +#: netbox/core/choices.py:84 netbox/extras/choices.py:186 msgid "Daily" msgstr "" -#: netbox/core/choices.py:85 netbox/extras/choices.py:189 +#: netbox/core/choices.py:85 netbox/extras/choices.py:187 msgid "Weekly" msgstr "" @@ -2181,8 +2181,8 @@ msgstr "" #: netbox/dcim/forms/bulk_edit.py:1418 netbox/dcim/forms/filtersets.py:1375 #: netbox/dcim/tables/devices.py:566 netbox/dcim/tables/devicetypes.py:226 #: netbox/extras/forms/bulk_edit.py:123 netbox/extras/forms/bulk_edit.py:187 -#: netbox/extras/forms/bulk_edit.py:246 netbox/extras/forms/filtersets.py:142 -#: netbox/extras/forms/filtersets.py:229 netbox/extras/forms/filtersets.py:294 +#: netbox/extras/forms/bulk_edit.py:246 netbox/extras/forms/filtersets.py:145 +#: netbox/extras/forms/filtersets.py:235 netbox/extras/forms/filtersets.py:300 #: netbox/extras/tables/tables.py:162 netbox/extras/tables/tables.py:253 #: netbox/extras/tables/tables.py:415 netbox/netbox/preferences.py:22 #: netbox/templates/core/datasource.html:42 @@ -2231,17 +2231,17 @@ msgid "File" msgstr "" #: netbox/core/forms/filtersets.py:60 netbox/core/forms/mixins.py:16 -#: netbox/extras/forms/filtersets.py:170 netbox/extras/forms/filtersets.py:328 -#: netbox/extras/forms/filtersets.py:413 +#: netbox/extras/forms/filtersets.py:174 netbox/extras/forms/filtersets.py:335 +#: netbox/extras/forms/filtersets.py:421 msgid "Data source" msgstr "" -#: netbox/core/forms/filtersets.py:70 netbox/extras/forms/filtersets.py:440 +#: netbox/core/forms/filtersets.py:71 netbox/extras/forms/filtersets.py:448 msgid "Creation" msgstr "" -#: netbox/core/forms/filtersets.py:74 netbox/core/forms/filtersets.py:160 -#: netbox/extras/forms/filtersets.py:461 netbox/extras/tables/tables.py:220 +#: netbox/core/forms/filtersets.py:75 netbox/core/forms/filtersets.py:161 +#: netbox/extras/forms/filtersets.py:469 netbox/extras/tables/tables.py:220 #: netbox/extras/tables/tables.py:294 netbox/extras/tables/tables.py:326 #: netbox/extras/tables/tables.py:571 netbox/templates/core/job.html:38 #: netbox/templates/core/objectchange.html:52 @@ -2249,42 +2249,42 @@ msgstr "" msgid "Object Type" msgstr "" -#: netbox/core/forms/filtersets.py:84 +#: netbox/core/forms/filtersets.py:85 msgid "Created after" msgstr "" -#: netbox/core/forms/filtersets.py:89 +#: netbox/core/forms/filtersets.py:90 msgid "Created before" msgstr "" -#: netbox/core/forms/filtersets.py:94 +#: netbox/core/forms/filtersets.py:95 msgid "Scheduled after" msgstr "" -#: netbox/core/forms/filtersets.py:99 +#: netbox/core/forms/filtersets.py:100 msgid "Scheduled before" msgstr "" -#: netbox/core/forms/filtersets.py:104 +#: netbox/core/forms/filtersets.py:105 msgid "Started after" msgstr "" -#: netbox/core/forms/filtersets.py:109 +#: netbox/core/forms/filtersets.py:110 msgid "Started before" msgstr "" -#: netbox/core/forms/filtersets.py:114 +#: netbox/core/forms/filtersets.py:115 msgid "Completed after" msgstr "" -#: netbox/core/forms/filtersets.py:119 +#: netbox/core/forms/filtersets.py:120 msgid "Completed before" msgstr "" -#: netbox/core/forms/filtersets.py:126 netbox/core/forms/filtersets.py:155 +#: netbox/core/forms/filtersets.py:127 netbox/core/forms/filtersets.py:156 #: netbox/dcim/forms/bulk_edit.py:465 netbox/dcim/forms/filtersets.py:419 #: netbox/dcim/forms/filtersets.py:463 netbox/dcim/forms/model_forms.py:324 -#: netbox/extras/forms/filtersets.py:456 netbox/extras/forms/filtersets.py:475 +#: netbox/extras/forms/filtersets.py:464 netbox/extras/forms/filtersets.py:484 #: netbox/extras/tables/tables.py:302 netbox/extras/tables/tables.py:342 #: netbox/templates/core/objectchange.html:36 #: netbox/templates/dcim/rackreservation.html:58 @@ -2298,21 +2298,21 @@ msgstr "" msgid "User" msgstr "" -#: netbox/core/forms/filtersets.py:134 netbox/core/tables/change_logging.py:15 +#: netbox/core/forms/filtersets.py:135 netbox/core/tables/change_logging.py:15 #: netbox/extras/tables/tables.py:609 netbox/extras/tables/tables.py:646 #: netbox/templates/core/objectchange.html:32 msgid "Time" msgstr "" -#: netbox/core/forms/filtersets.py:139 netbox/extras/forms/filtersets.py:445 +#: netbox/core/forms/filtersets.py:140 netbox/extras/forms/filtersets.py:453 msgid "After" msgstr "" -#: netbox/core/forms/filtersets.py:144 netbox/extras/forms/filtersets.py:450 +#: netbox/core/forms/filtersets.py:145 netbox/extras/forms/filtersets.py:458 msgid "Before" msgstr "" -#: netbox/core/forms/filtersets.py:148 netbox/core/tables/change_logging.py:29 +#: netbox/core/forms/filtersets.py:149 netbox/core/tables/change_logging.py:29 #: netbox/extras/forms/model_forms.py:396 #: netbox/templates/core/objectchange.html:46 #: netbox/templates/extras/eventrule.html:71 @@ -2377,7 +2377,7 @@ msgid "Pagination" msgstr "" #: netbox/core/forms/model_forms.py:163 netbox/extras/forms/bulk_edit.py:92 -#: netbox/extras/forms/filtersets.py:47 netbox/extras/forms/model_forms.py:116 +#: netbox/extras/forms/filtersets.py:48 netbox/extras/forms/model_forms.py:116 #: netbox/extras/forms/model_forms.py:129 #: netbox/templates/core/inc/config_data.html:93 msgid "Validation" @@ -3845,10 +3845,10 @@ msgstr "" msgid "Power panel (ID)" msgstr "" -#: netbox/dcim/forms/bulk_create.py:40 netbox/extras/forms/filtersets.py:401 +#: netbox/dcim/forms/bulk_create.py:40 netbox/extras/forms/filtersets.py:408 #: netbox/extras/forms/model_forms.py:567 #: netbox/extras/forms/model_forms.py:619 netbox/netbox/forms/base.py:86 -#: netbox/netbox/forms/mixins.py:81 netbox/netbox/tables/columns.py:481 +#: netbox/netbox/forms/mixins.py:91 netbox/netbox/tables/columns.py:481 #: netbox/templates/circuits/inc/circuit_termination.html:32 #: netbox/templates/generic/bulk_edit.html:65 #: netbox/templates/inc/panels/tags.html:5 @@ -3976,8 +3976,8 @@ msgstr "" #: netbox/dcim/tables/racks.py:74 netbox/dcim/tables/racks.py:171 #: netbox/extras/forms/bulk_edit.py:53 netbox/extras/forms/bulk_edit.py:133 #: netbox/extras/forms/bulk_edit.py:183 netbox/extras/forms/bulk_edit.py:288 -#: netbox/extras/forms/filtersets.py:64 netbox/extras/forms/filtersets.py:156 -#: netbox/extras/forms/filtersets.py:243 netbox/ipam/forms/bulk_edit.py:193 +#: netbox/extras/forms/filtersets.py:65 netbox/extras/forms/filtersets.py:159 +#: netbox/extras/forms/filtersets.py:249 netbox/ipam/forms/bulk_edit.py:193 #: netbox/templates/dcim/device.html:324 #: netbox/templates/dcim/devicetype.html:49 #: netbox/templates/dcim/moduletype.html:47 netbox/templates/dcim/rack.html:81 @@ -4174,7 +4174,7 @@ msgstr "" #: netbox/dcim/forms/bulk_edit.py:734 netbox/dcim/forms/bulk_import.py:544 #: netbox/dcim/forms/filtersets.py:729 netbox/dcim/forms/filtersets.py:899 #: netbox/dcim/forms/model_forms.py:533 netbox/dcim/tables/devices.py:212 -#: netbox/extras/filtersets.py:596 netbox/extras/forms/filtersets.py:322 +#: netbox/extras/filtersets.py:596 netbox/extras/forms/filtersets.py:329 #: netbox/ipam/forms/filtersets.py:418 netbox/ipam/forms/filtersets.py:450 #: netbox/templates/dcim/device.html:239 #: netbox/templates/virtualization/cluster.html:10 @@ -5109,7 +5109,7 @@ msgid "Connection" msgstr "" #: netbox/dcim/forms/filtersets.py:1353 netbox/extras/forms/bulk_edit.py:326 -#: netbox/extras/forms/bulk_import.py:247 netbox/extras/forms/filtersets.py:464 +#: netbox/extras/forms/bulk_import.py:247 netbox/extras/forms/filtersets.py:472 #: netbox/extras/forms/model_forms.py:675 netbox/extras/tables/tables.py:579 #: netbox/templates/extras/journalentry.html:30 msgid "Kind" @@ -7201,7 +7201,7 @@ msgstr "" msgid "Module Types" msgstr "" -#: netbox/dcim/tables/devicetypes.py:52 netbox/extras/forms/filtersets.py:371 +#: netbox/dcim/tables/devicetypes.py:52 netbox/extras/forms/filtersets.py:378 #: netbox/extras/forms/model_forms.py:537 netbox/extras/tables/tables.py:540 #: netbox/netbox/navigation/menu.py:78 msgid "Platforms" @@ -7354,7 +7354,7 @@ msgid "Space" msgstr "" #: netbox/dcim/tables/sites.py:30 netbox/dcim/tables/sites.py:57 -#: netbox/extras/forms/filtersets.py:351 netbox/extras/forms/model_forms.py:517 +#: netbox/extras/forms/filtersets.py:358 netbox/extras/forms/model_forms.py:517 #: netbox/ipam/forms/bulk_edit.py:134 netbox/ipam/forms/model_forms.py:159 #: netbox/ipam/tables/asn.py:66 netbox/netbox/navigation/menu.py:15 #: netbox/netbox/navigation/menu.py:17 @@ -7544,15 +7544,15 @@ msgstr "" msgid "Alphabetical (Z-A)" msgstr "" -#: netbox/extras/choices.py:144 netbox/extras/choices.py:167 +#: netbox/extras/choices.py:144 netbox/extras/choices.py:165 msgid "Info" msgstr "" -#: netbox/extras/choices.py:145 netbox/extras/choices.py:168 +#: netbox/extras/choices.py:145 netbox/extras/choices.py:166 msgid "Success" msgstr "" -#: netbox/extras/choices.py:146 netbox/extras/choices.py:169 +#: netbox/extras/choices.py:146 netbox/extras/choices.py:167 msgid "Warning" msgstr "" @@ -7560,27 +7560,23 @@ msgstr "" msgid "Danger" msgstr "" -#: netbox/extras/choices.py:165 +#: netbox/extras/choices.py:164 msgid "Debug" msgstr "" -#: netbox/extras/choices.py:166 netbox/netbox/choices.py:103 -msgid "Default" -msgstr "" - -#: netbox/extras/choices.py:170 +#: netbox/extras/choices.py:168 msgid "Failure" msgstr "" -#: netbox/extras/choices.py:187 +#: netbox/extras/choices.py:185 msgid "12 hours" msgstr "" -#: netbox/extras/choices.py:190 +#: netbox/extras/choices.py:188 msgid "30 days" msgstr "" -#: netbox/extras/choices.py:226 +#: netbox/extras/choices.py:224 #: netbox/templates/dcim/virtualchassis_edit.html:107 #: netbox/templates/generic/bulk_add_component.html:68 #: netbox/templates/generic/object_edit.html:47 @@ -7590,11 +7586,11 @@ msgstr "" msgid "Create" msgstr "" -#: netbox/extras/choices.py:227 +#: netbox/extras/choices.py:225 msgid "Update" msgstr "" -#: netbox/extras/choices.py:228 +#: netbox/extras/choices.py:226 #: netbox/templates/circuits/inc/circuit_termination.html:23 #: netbox/templates/dcim/inc/panels/inventory_items.html:37 #: netbox/templates/dcim/powerpanel.html:66 @@ -7609,82 +7605,82 @@ msgstr "" msgid "Delete" msgstr "" -#: netbox/extras/choices.py:252 netbox/netbox/choices.py:59 +#: netbox/extras/choices.py:250 netbox/netbox/choices.py:59 #: netbox/netbox/choices.py:104 msgid "Blue" msgstr "" -#: netbox/extras/choices.py:253 netbox/netbox/choices.py:58 +#: netbox/extras/choices.py:251 netbox/netbox/choices.py:58 #: netbox/netbox/choices.py:105 msgid "Indigo" msgstr "" -#: netbox/extras/choices.py:254 netbox/netbox/choices.py:56 +#: netbox/extras/choices.py:252 netbox/netbox/choices.py:56 #: netbox/netbox/choices.py:106 msgid "Purple" msgstr "" -#: netbox/extras/choices.py:255 netbox/netbox/choices.py:53 +#: netbox/extras/choices.py:253 netbox/netbox/choices.py:53 #: netbox/netbox/choices.py:107 msgid "Pink" msgstr "" -#: netbox/extras/choices.py:256 netbox/netbox/choices.py:52 +#: netbox/extras/choices.py:254 netbox/netbox/choices.py:52 #: netbox/netbox/choices.py:108 msgid "Red" msgstr "" -#: netbox/extras/choices.py:257 netbox/netbox/choices.py:70 +#: netbox/extras/choices.py:255 netbox/netbox/choices.py:70 #: netbox/netbox/choices.py:109 msgid "Orange" msgstr "" -#: netbox/extras/choices.py:258 netbox/netbox/choices.py:68 +#: netbox/extras/choices.py:256 netbox/netbox/choices.py:68 #: netbox/netbox/choices.py:110 msgid "Yellow" msgstr "" -#: netbox/extras/choices.py:259 netbox/netbox/choices.py:65 +#: netbox/extras/choices.py:257 netbox/netbox/choices.py:65 #: netbox/netbox/choices.py:111 msgid "Green" msgstr "" -#: netbox/extras/choices.py:260 netbox/netbox/choices.py:62 +#: netbox/extras/choices.py:258 netbox/netbox/choices.py:62 #: netbox/netbox/choices.py:112 msgid "Teal" msgstr "" -#: netbox/extras/choices.py:261 netbox/netbox/choices.py:61 +#: netbox/extras/choices.py:259 netbox/netbox/choices.py:61 #: netbox/netbox/choices.py:113 msgid "Cyan" msgstr "" -#: netbox/extras/choices.py:262 netbox/netbox/choices.py:114 +#: netbox/extras/choices.py:260 netbox/netbox/choices.py:114 msgid "Gray" msgstr "" -#: netbox/extras/choices.py:263 netbox/netbox/choices.py:76 +#: netbox/extras/choices.py:261 netbox/netbox/choices.py:76 #: netbox/netbox/choices.py:115 msgid "Black" msgstr "" -#: netbox/extras/choices.py:264 netbox/netbox/choices.py:77 +#: netbox/extras/choices.py:262 netbox/netbox/choices.py:77 #: netbox/netbox/choices.py:116 msgid "White" msgstr "" -#: netbox/extras/choices.py:279 netbox/extras/forms/model_forms.py:353 +#: netbox/extras/choices.py:277 netbox/extras/forms/model_forms.py:353 #: netbox/extras/forms/model_forms.py:430 #: netbox/templates/extras/webhook.html:10 msgid "Webhook" msgstr "" -#: netbox/extras/choices.py:280 netbox/extras/forms/model_forms.py:418 +#: netbox/extras/choices.py:278 netbox/extras/forms/model_forms.py:418 #: netbox/templates/extras/script/base.html:29 msgid "Script" msgstr "" -#: netbox/extras/choices.py:281 +#: netbox/extras/choices.py:279 msgid "Notification" msgstr "" @@ -7859,60 +7855,60 @@ msgstr "" msgid "Tag (slug)" msgstr "" -#: netbox/extras/filtersets.py:689 netbox/extras/forms/filtersets.py:429 +#: netbox/extras/filtersets.py:689 netbox/extras/forms/filtersets.py:437 msgid "Has local config context data" msgstr "" -#: netbox/extras/forms/bulk_edit.py:35 netbox/extras/forms/filtersets.py:60 +#: netbox/extras/forms/bulk_edit.py:35 netbox/extras/forms/filtersets.py:61 msgid "Group name" msgstr "" -#: netbox/extras/forms/bulk_edit.py:43 netbox/extras/forms/filtersets.py:68 +#: netbox/extras/forms/bulk_edit.py:43 netbox/extras/forms/filtersets.py:69 #: netbox/extras/tables/tables.py:65 #: netbox/templates/extras/customfield.html:38 #: netbox/templates/generic/bulk_import.html:118 msgid "Required" msgstr "" -#: netbox/extras/forms/bulk_edit.py:48 netbox/extras/forms/filtersets.py:75 +#: netbox/extras/forms/bulk_edit.py:48 netbox/extras/forms/filtersets.py:76 msgid "Must be unique" msgstr "" #: netbox/extras/forms/bulk_edit.py:61 netbox/extras/forms/bulk_import.py:60 -#: netbox/extras/forms/filtersets.py:89 +#: netbox/extras/forms/filtersets.py:90 #: netbox/extras/models/customfields.py:209 msgid "UI visible" msgstr "" #: netbox/extras/forms/bulk_edit.py:66 netbox/extras/forms/bulk_import.py:66 -#: netbox/extras/forms/filtersets.py:94 +#: netbox/extras/forms/filtersets.py:95 #: netbox/extras/models/customfields.py:216 msgid "UI editable" msgstr "" -#: netbox/extras/forms/bulk_edit.py:71 netbox/extras/forms/filtersets.py:97 +#: netbox/extras/forms/bulk_edit.py:71 netbox/extras/forms/filtersets.py:98 msgid "Is cloneable" msgstr "" -#: netbox/extras/forms/bulk_edit.py:76 netbox/extras/forms/filtersets.py:104 +#: netbox/extras/forms/bulk_edit.py:76 netbox/extras/forms/filtersets.py:105 msgid "Minimum value" msgstr "" -#: netbox/extras/forms/bulk_edit.py:80 netbox/extras/forms/filtersets.py:108 +#: netbox/extras/forms/bulk_edit.py:80 netbox/extras/forms/filtersets.py:109 msgid "Maximum value" msgstr "" -#: netbox/extras/forms/bulk_edit.py:84 netbox/extras/forms/filtersets.py:112 +#: netbox/extras/forms/bulk_edit.py:84 netbox/extras/forms/filtersets.py:113 msgid "Validation regex" msgstr "" -#: netbox/extras/forms/bulk_edit.py:91 netbox/extras/forms/filtersets.py:46 +#: netbox/extras/forms/bulk_edit.py:91 netbox/extras/forms/filtersets.py:47 #: netbox/extras/forms/model_forms.py:76 #: netbox/templates/extras/customfield.html:70 msgid "Behavior" msgstr "" -#: netbox/extras/forms/bulk_edit.py:128 netbox/extras/forms/filtersets.py:149 +#: netbox/extras/forms/bulk_edit.py:128 netbox/extras/forms/filtersets.py:152 msgid "New window" msgstr "" @@ -7920,31 +7916,31 @@ msgstr "" msgid "Button class" msgstr "" -#: netbox/extras/forms/bulk_edit.py:154 netbox/extras/forms/filtersets.py:187 +#: netbox/extras/forms/bulk_edit.py:154 netbox/extras/forms/filtersets.py:191 #: netbox/extras/models/models.py:409 msgid "MIME type" msgstr "" -#: netbox/extras/forms/bulk_edit.py:159 netbox/extras/forms/filtersets.py:190 +#: netbox/extras/forms/bulk_edit.py:159 netbox/extras/forms/filtersets.py:194 msgid "File extension" msgstr "" -#: netbox/extras/forms/bulk_edit.py:164 netbox/extras/forms/filtersets.py:194 +#: netbox/extras/forms/bulk_edit.py:164 netbox/extras/forms/filtersets.py:198 msgid "As attachment" msgstr "" -#: netbox/extras/forms/bulk_edit.py:192 netbox/extras/forms/filtersets.py:236 +#: netbox/extras/forms/bulk_edit.py:192 netbox/extras/forms/filtersets.py:242 #: netbox/extras/tables/tables.py:256 #: netbox/templates/extras/savedfilter.html:29 msgid "Shared" msgstr "" -#: netbox/extras/forms/bulk_edit.py:215 netbox/extras/forms/filtersets.py:265 +#: netbox/extras/forms/bulk_edit.py:215 netbox/extras/forms/filtersets.py:271 #: netbox/extras/models/models.py:174 msgid "HTTP method" msgstr "" -#: netbox/extras/forms/bulk_edit.py:219 netbox/extras/forms/filtersets.py:259 +#: netbox/extras/forms/bulk_edit.py:219 netbox/extras/forms/filtersets.py:265 #: netbox/templates/extras/webhook.html:30 msgid "Payload URL" msgstr "" @@ -7973,8 +7969,8 @@ msgstr "" #: netbox/extras/forms/bulk_import.py:37 netbox/extras/forms/bulk_import.py:118 #: netbox/extras/forms/bulk_import.py:139 #: netbox/extras/forms/bulk_import.py:162 -#: netbox/extras/forms/bulk_import.py:186 netbox/extras/forms/filtersets.py:137 -#: netbox/extras/forms/filtersets.py:224 netbox/extras/forms/model_forms.py:47 +#: netbox/extras/forms/bulk_import.py:186 netbox/extras/forms/filtersets.py:140 +#: netbox/extras/forms/filtersets.py:230 netbox/extras/forms/model_forms.py:47 #: netbox/extras/forms/model_forms.py:205 #: netbox/extras/forms/model_forms.py:237 #: netbox/extras/forms/model_forms.py:278 @@ -7995,8 +7991,8 @@ msgstr "" msgid "Field data type (e.g. text, integer, etc.)" msgstr "" -#: netbox/extras/forms/bulk_import.py:47 netbox/extras/forms/filtersets.py:208 -#: netbox/extras/forms/filtersets.py:281 netbox/extras/forms/model_forms.py:304 +#: netbox/extras/forms/bulk_import.py:47 netbox/extras/forms/filtersets.py:213 +#: netbox/extras/forms/filtersets.py:287 netbox/extras/forms/model_forms.py:304 #: netbox/extras/forms/model_forms.py:341 netbox/tenancy/forms/filtersets.py:92 msgid "Object type" msgstr "" @@ -8005,7 +8001,7 @@ msgstr "" msgid "Object type (for object or multi-object fields)" msgstr "" -#: netbox/extras/forms/bulk_import.py:53 netbox/extras/forms/filtersets.py:84 +#: netbox/extras/forms/bulk_import.py:53 netbox/extras/forms/filtersets.py:85 msgid "Choice set" msgstr "" @@ -8097,87 +8093,87 @@ msgstr "" msgid "Group names separated by commas, encased with double quotes" msgstr "" -#: netbox/extras/forms/filtersets.py:52 netbox/extras/forms/model_forms.py:56 +#: netbox/extras/forms/filtersets.py:53 netbox/extras/forms/model_forms.py:56 msgid "Related object type" msgstr "" -#: netbox/extras/forms/filtersets.py:57 +#: netbox/extras/forms/filtersets.py:58 msgid "Field type" msgstr "" -#: netbox/extras/forms/filtersets.py:120 netbox/extras/forms/model_forms.py:157 +#: netbox/extras/forms/filtersets.py:122 netbox/extras/forms/model_forms.py:157 #: netbox/extras/tables/tables.py:91 #: netbox/templates/generic/bulk_import.html:154 msgid "Choices" msgstr "" -#: netbox/extras/forms/filtersets.py:164 netbox/extras/forms/filtersets.py:319 -#: netbox/extras/forms/filtersets.py:408 netbox/extras/forms/model_forms.py:572 +#: netbox/extras/forms/filtersets.py:168 netbox/extras/forms/filtersets.py:326 +#: netbox/extras/forms/filtersets.py:416 netbox/extras/forms/model_forms.py:572 #: netbox/templates/core/job.html:96 netbox/templates/extras/eventrule.html:84 msgid "Data" msgstr "" -#: netbox/extras/forms/filtersets.py:175 netbox/extras/forms/filtersets.py:333 -#: netbox/extras/forms/filtersets.py:418 netbox/netbox/choices.py:132 +#: netbox/extras/forms/filtersets.py:179 netbox/extras/forms/filtersets.py:340 +#: netbox/extras/forms/filtersets.py:426 netbox/netbox/choices.py:132 #: netbox/utilities/forms/bulk_import.py:26 msgid "Data file" msgstr "" -#: netbox/extras/forms/filtersets.py:183 +#: netbox/extras/forms/filtersets.py:187 msgid "Content types" msgstr "" -#: netbox/extras/forms/filtersets.py:255 netbox/extras/models/models.py:179 +#: netbox/extras/forms/filtersets.py:261 netbox/extras/models/models.py:179 msgid "HTTP content type" msgstr "" -#: netbox/extras/forms/filtersets.py:286 +#: netbox/extras/forms/filtersets.py:292 msgid "Event type" msgstr "" -#: netbox/extras/forms/filtersets.py:291 +#: netbox/extras/forms/filtersets.py:297 msgid "Action type" msgstr "" -#: netbox/extras/forms/filtersets.py:307 +#: netbox/extras/forms/filtersets.py:313 msgid "Tagged object type" msgstr "" -#: netbox/extras/forms/filtersets.py:312 +#: netbox/extras/forms/filtersets.py:318 msgid "Allowed object type" msgstr "" -#: netbox/extras/forms/filtersets.py:341 netbox/extras/forms/model_forms.py:507 +#: netbox/extras/forms/filtersets.py:348 netbox/extras/forms/model_forms.py:507 #: netbox/netbox/navigation/menu.py:18 msgid "Regions" msgstr "" -#: netbox/extras/forms/filtersets.py:346 netbox/extras/forms/model_forms.py:512 +#: netbox/extras/forms/filtersets.py:353 netbox/extras/forms/model_forms.py:512 msgid "Site groups" msgstr "" -#: netbox/extras/forms/filtersets.py:356 netbox/extras/forms/model_forms.py:522 +#: netbox/extras/forms/filtersets.py:363 netbox/extras/forms/model_forms.py:522 #: netbox/netbox/navigation/menu.py:20 netbox/templates/dcim/site.html:127 msgid "Locations" msgstr "" -#: netbox/extras/forms/filtersets.py:361 netbox/extras/forms/model_forms.py:527 +#: netbox/extras/forms/filtersets.py:368 netbox/extras/forms/model_forms.py:527 msgid "Device types" msgstr "" -#: netbox/extras/forms/filtersets.py:366 netbox/extras/forms/model_forms.py:532 +#: netbox/extras/forms/filtersets.py:373 netbox/extras/forms/model_forms.py:532 msgid "Roles" msgstr "" -#: netbox/extras/forms/filtersets.py:376 netbox/extras/forms/model_forms.py:542 +#: netbox/extras/forms/filtersets.py:383 netbox/extras/forms/model_forms.py:542 msgid "Cluster types" msgstr "" -#: netbox/extras/forms/filtersets.py:381 netbox/extras/forms/model_forms.py:547 +#: netbox/extras/forms/filtersets.py:388 netbox/extras/forms/model_forms.py:547 msgid "Cluster groups" msgstr "" -#: netbox/extras/forms/filtersets.py:386 netbox/extras/forms/model_forms.py:552 +#: netbox/extras/forms/filtersets.py:393 netbox/extras/forms/model_forms.py:552 #: netbox/netbox/navigation/menu.py:263 netbox/netbox/navigation/menu.py:265 #: netbox/templates/virtualization/clustertype.html:30 #: netbox/virtualization/tables/clusters.py:23 @@ -8185,7 +8181,7 @@ msgstr "" msgid "Clusters" msgstr "" -#: netbox/extras/forms/filtersets.py:391 netbox/extras/forms/model_forms.py:557 +#: netbox/extras/forms/filtersets.py:398 netbox/extras/forms/model_forms.py:557 msgid "Tenant groups" msgstr "" @@ -10766,6 +10762,10 @@ msgstr "" msgid "Dark Grey" msgstr "" +#: netbox/netbox/choices.py:103 netbox/templates/extras/script_result.html:56 +msgid "Default" +msgstr "" + #: netbox/netbox/choices.py:130 msgid "Direct" msgstr "" From 0b194e363eee42af03d7fa6dcc414efaf379902a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 7 Feb 2025 12:44:21 -0500 Subject: [PATCH 152/190] Docs cleanup --- docs/development/style-guide.md | 2 +- mkdocs.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/development/style-guide.md b/docs/development/style-guide.md index 9d6630de0..d7a7ad9da 100644 --- a/docs/development/style-guide.md +++ b/docs/development/style-guide.md @@ -22,7 +22,7 @@ NetBox generally follows the [Django style guide](https://docs.djangoproject.com ### Linting -The [ruff](https://docs.astral.sh/ruff/) linter is used to enforce code style. A [pre-commit hook](./getting-started.md#3-enable-pre-commit-hooks) which runs this automatically is included with NetBox. To invoke `ruff` manually, run: +The [ruff](https://docs.astral.sh/ruff/) linter is used to enforce code style, and is run automatically by [pre-commit](./getting-started.md#5-install-pre-commit). To invoke `ruff` manually, run: ``` ruff check netbox/ diff --git a/mkdocs.yml b/mkdocs.yml index db6798eae..193d10700 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -64,6 +64,8 @@ markdown_extensions: format: !!python/name:pymdownx.superfences.fence_code_format - pymdownx.tabbed: alternate_style: true +not_in_nav: | + /index.md nav: - Introduction: 'introduction.md' - Features: From e4753869363aa16ee5353b6a443366935c8f1f5e Mon Sep 17 00:00:00 2001 From: Antoine Keranflec'h <52744345+antoinekh@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:41:45 +0100 Subject: [PATCH 153/190] Fixes: #18408 add STATUS_PAUSED to VirtualMachine (#18595) * feat(vm): add extra status * keep only usefull status --------- Co-authored-by: Antoine Keranflec'h --- netbox/virtualization/choices.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/virtualization/choices.py b/netbox/virtualization/choices.py index f8ec42171..b60a6e1ff 100644 --- a/netbox/virtualization/choices.py +++ b/netbox/virtualization/choices.py @@ -38,6 +38,7 @@ class VirtualMachineStatusChoices(ChoiceSet): STATUS_STAGED = 'staged' STATUS_FAILED = 'failed' STATUS_DECOMMISSIONING = 'decommissioning' + STATUS_PAUSED = 'paused' CHOICES = [ (STATUS_OFFLINE, _('Offline'), 'gray'), @@ -46,4 +47,5 @@ class VirtualMachineStatusChoices(ChoiceSet): (STATUS_STAGED, _('Staged'), 'blue'), (STATUS_FAILED, _('Failed'), 'red'), (STATUS_DECOMMISSIONING, _('Decommissioning'), 'yellow'), + (STATUS_PAUSED, _('Paused'), 'orange'), ] From 13dc6854c29be25a7462c73b2a292c7c99565cd7 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 8 Feb 2025 05:02:19 +0000 Subject: [PATCH 154/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 148ae8b68..3a6dff6c2 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-07 05:01+0000\n" +"POT-Creation-Date: 2025-02-08 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,7 +87,7 @@ msgstr "" #: netbox/dcim/choices.py:237 netbox/dcim/choices.py:1534 #: netbox/dcim/choices.py:1592 netbox/dcim/choices.py:1642 #: netbox/dcim/choices.py:1664 netbox/virtualization/choices.py:20 -#: netbox/virtualization/choices.py:45 netbox/vpn/choices.py:18 +#: netbox/virtualization/choices.py:46 netbox/vpn/choices.py:18 msgid "Planned" msgstr "" @@ -104,7 +104,7 @@ msgstr "" #: netbox/ipam/choices.py:69 netbox/ipam/choices.py:154 #: netbox/templates/extras/configcontext.html:25 #: netbox/templates/users/user.html:37 netbox/users/forms/bulk_edit.py:38 -#: netbox/virtualization/choices.py:22 netbox/virtualization/choices.py:44 +#: netbox/virtualization/choices.py:22 netbox/virtualization/choices.py:45 #: netbox/vpn/choices.py:19 netbox/wireless/choices.py:25 msgid "Active" msgstr "" @@ -112,7 +112,7 @@ msgstr "" #: netbox/circuits/choices.py:24 netbox/dcim/choices.py:183 #: netbox/dcim/choices.py:235 netbox/dcim/choices.py:1590 #: netbox/dcim/choices.py:1643 netbox/dcim/choices.py:1662 -#: netbox/virtualization/choices.py:24 netbox/virtualization/choices.py:43 +#: netbox/virtualization/choices.py:24 netbox/virtualization/choices.py:44 msgid "Offline" msgstr "" @@ -2007,7 +2007,7 @@ msgstr "" #: netbox/core/constants.py:20 netbox/core/tables/tasks.py:34 #: netbox/dcim/choices.py:187 netbox/dcim/choices.py:239 #: netbox/dcim/choices.py:1593 netbox/dcim/choices.py:1666 -#: netbox/virtualization/choices.py:47 +#: netbox/virtualization/choices.py:48 msgid "Failed" msgstr "" @@ -2920,7 +2920,7 @@ msgstr "" #: netbox/dcim/choices.py:23 netbox/dcim/choices.py:189 #: netbox/dcim/choices.py:240 netbox/dcim/choices.py:1535 #: netbox/dcim/choices.py:1667 netbox/virtualization/choices.py:23 -#: netbox/virtualization/choices.py:48 +#: netbox/virtualization/choices.py:49 msgid "Decommissioning" msgstr "" @@ -3052,7 +3052,7 @@ msgid "Rear" msgstr "" #: netbox/dcim/choices.py:186 netbox/dcim/choices.py:238 -#: netbox/dcim/choices.py:1665 netbox/virtualization/choices.py:46 +#: netbox/dcim/choices.py:1665 netbox/virtualization/choices.py:47 msgid "Staged" msgstr "" @@ -15487,6 +15487,10 @@ msgid "" "be used on views which define a base queryset" msgstr "" +#: netbox/virtualization/choices.py:50 +msgid "Paused" +msgstr "" + #: netbox/virtualization/filtersets.py:45 msgid "Parent group (ID)" msgstr "" From a33fb2a0a99a560dfdae390e4a54d74db833c00e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 6 Feb 2025 14:43:02 -0500 Subject: [PATCH 155/190] Closes #17918: Fix styling of "tagged items" list under tag view --- netbox/templates/extras/tag.html | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index 4e1379fed..5f259e124 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -55,22 +55,23 @@

    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 delta 66479 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 YYTF_(m>$rqZI2#pyLp59`}>9dKO21T!~g&Q diff --git a/netbox/translations/tr/LC_MESSAGES/django.po b/netbox/translations/tr/LC_MESSAGES/django.po index 18fd06563..f5af5eed0 100644 --- a/netbox/translations/tr/LC_MESSAGES/django.po +++ b/netbox/translations/tr/LC_MESSAGES/django.po @@ -6,16 +6,16 @@ # Translators: # Burak Senturk, 2024 # Hamdi Suat Aknar, 2024 -# Jeremy Stretch, 2024 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-12 05:02+0000\n" +"POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Jeremy Stretch, 2024\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Turkish (https://app.transifex.com/netbox-community/teams/178115/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -153,7 +153,7 @@ msgstr "Etkin Olmayan" #: netbox/dcim/filtersets.py:464 netbox/dcim/filtersets.py:1021 #: netbox/dcim/filtersets.py:1368 netbox/dcim/filtersets.py:1903 #: netbox/dcim/filtersets.py:2146 netbox/dcim/filtersets.py:2204 -#: netbox/ipam/filtersets.py:339 netbox/ipam/filtersets.py:959 +#: netbox/ipam/filtersets.py:341 netbox/ipam/filtersets.py:961 #: netbox/virtualization/filtersets.py:45 #: netbox/virtualization/filtersets.py:173 netbox/vpn/filtersets.py:358 msgid "Region (ID)" @@ -165,8 +165,8 @@ msgstr "Bölge (ID)" #: netbox/dcim/filtersets.py:471 netbox/dcim/filtersets.py:1028 #: netbox/dcim/filtersets.py:1375 netbox/dcim/filtersets.py:1910 #: netbox/dcim/filtersets.py:2153 netbox/dcim/filtersets.py:2211 -#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:346 -#: netbox/ipam/filtersets.py:966 netbox/virtualization/filtersets.py:52 +#: netbox/extras/filtersets.py:509 netbox/ipam/filtersets.py:348 +#: netbox/ipam/filtersets.py:968 netbox/virtualization/filtersets.py:52 #: netbox/virtualization/filtersets.py:180 netbox/vpn/filtersets.py:353 msgid "Region (slug)" msgstr "Bölge (kısa ad)" @@ -176,8 +176,8 @@ msgstr "Bölge (kısa ad)" #: netbox/dcim/filtersets.py:346 netbox/dcim/filtersets.py:477 #: netbox/dcim/filtersets.py:1034 netbox/dcim/filtersets.py:1381 #: netbox/dcim/filtersets.py:1916 netbox/dcim/filtersets.py:2159 -#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:352 -#: netbox/ipam/filtersets.py:972 netbox/virtualization/filtersets.py:58 +#: netbox/dcim/filtersets.py:2217 netbox/ipam/filtersets.py:354 +#: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" msgstr "Site grubu (ID)" @@ -188,7 +188,7 @@ msgstr "Site grubu (ID)" #: netbox/dcim/filtersets.py:1041 netbox/dcim/filtersets.py:1388 #: netbox/dcim/filtersets.py:1923 netbox/dcim/filtersets.py:2166 #: netbox/dcim/filtersets.py:2224 netbox/extras/filtersets.py:515 -#: netbox/ipam/filtersets.py:359 netbox/ipam/filtersets.py:979 +#: netbox/ipam/filtersets.py:361 netbox/ipam/filtersets.py:981 #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" @@ -258,8 +258,8 @@ msgstr "Site" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 #: netbox/dcim/filtersets.py:363 netbox/dcim/filtersets.py:458 -#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:238 -#: netbox/ipam/filtersets.py:369 netbox/ipam/filtersets.py:989 +#: netbox/extras/filtersets.py:531 netbox/ipam/filtersets.py:240 +#: netbox/ipam/filtersets.py:371 netbox/ipam/filtersets.py:991 #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" @@ -278,13 +278,13 @@ msgstr "ASN" #: netbox/circuits/filtersets.py:95 netbox/circuits/filtersets.py:122 #: netbox/circuits/filtersets.py:156 netbox/circuits/filtersets.py:283 -#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:243 +#: netbox/circuits/filtersets.py:325 netbox/ipam/filtersets.py:245 msgid "Provider (ID)" msgstr "Sağlayıcı (ID)" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 #: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:289 -#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:249 +#: netbox/circuits/filtersets.py:331 netbox/ipam/filtersets.py:251 msgid "Provider (slug)" msgstr "Sağlayıcı (kısa ad)" @@ -313,8 +313,8 @@ msgstr "Devre tipi (kısa ad)" #: netbox/dcim/filtersets.py:452 netbox/dcim/filtersets.py:1045 #: netbox/dcim/filtersets.py:1393 netbox/dcim/filtersets.py:1928 #: netbox/dcim/filtersets.py:2170 netbox/dcim/filtersets.py:2229 -#: netbox/ipam/filtersets.py:232 netbox/ipam/filtersets.py:363 -#: netbox/ipam/filtersets.py:983 netbox/virtualization/filtersets.py:69 +#: netbox/ipam/filtersets.py:234 netbox/ipam/filtersets.py:365 +#: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" msgstr "Site (ID)" @@ -668,7 +668,7 @@ msgstr "Sağlayıcı hesabı" #: netbox/dcim/forms/filtersets.py:924 netbox/dcim/forms/filtersets.py:958 #: netbox/dcim/forms/filtersets.py:1059 netbox/dcim/forms/filtersets.py:1170 #: netbox/dcim/tables/devices.py:140 netbox/dcim/tables/devices.py:817 -#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:69 +#: netbox/dcim/tables/devices.py:1063 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:126 #: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 #: netbox/ipam/forms/bulk_edit.py:256 netbox/ipam/forms/bulk_edit.py:306 @@ -1103,7 +1103,7 @@ msgstr "Ödev" #: netbox/circuits/tables/circuits.py:155 netbox/dcim/forms/bulk_edit.py:118 #: netbox/dcim/forms/bulk_import.py:100 netbox/dcim/forms/model_forms.py:117 #: netbox/dcim/tables/sites.py:89 netbox/extras/forms/filtersets.py:480 -#: netbox/ipam/filtersets.py:999 netbox/ipam/forms/bulk_edit.py:493 +#: netbox/ipam/filtersets.py:1001 netbox/ipam/forms/bulk_edit.py:493 #: netbox/ipam/forms/bulk_import.py:460 netbox/ipam/forms/model_forms.py:561 #: netbox/ipam/tables/fhrp.py:67 netbox/ipam/tables/vlans.py:122 #: netbox/ipam/tables/vlans.py:226 @@ -1540,7 +1540,7 @@ msgstr "Taahhüt Oranı" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1036 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 -#: netbox/dcim/tables/modules.py:72 netbox/dcim/tables/power.py:39 +#: netbox/dcim/tables/modules.py:73 netbox/dcim/tables/power.py:39 #: netbox/dcim/tables/power.py:96 netbox/dcim/tables/racks.py:84 #: netbox/dcim/tables/racks.py:145 netbox/dcim/tables/racks.py:225 #: netbox/dcim/tables/sites.py:108 netbox/extras/tables/tables.py:582 @@ -2935,7 +2935,7 @@ msgid "Parent site group (slug)" msgstr "Ana site grubu (kısa ad)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 -#: netbox/ipam/filtersets.py:841 netbox/ipam/filtersets.py:993 +#: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 msgid "Group (ID)" msgstr "Grup (ID)" @@ -2993,15 +2993,15 @@ msgstr "Raf tipi (ID)" #: netbox/dcim/filtersets.py:411 netbox/dcim/filtersets.py:892 #: netbox/dcim/filtersets.py:994 netbox/dcim/filtersets.py:1850 -#: netbox/ipam/filtersets.py:381 netbox/ipam/filtersets.py:493 -#: netbox/ipam/filtersets.py:1003 netbox/virtualization/filtersets.py:210 +#: netbox/ipam/filtersets.py:383 netbox/ipam/filtersets.py:495 +#: netbox/ipam/filtersets.py:1005 netbox/virtualization/filtersets.py:210 msgid "Role (ID)" msgstr "Rol (ID)" #: netbox/dcim/filtersets.py:417 netbox/dcim/filtersets.py:898 #: netbox/dcim/filtersets.py:1000 netbox/dcim/filtersets.py:1856 -#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:387 -#: netbox/ipam/filtersets.py:499 netbox/ipam/filtersets.py:1009 +#: netbox/extras/filtersets.py:558 netbox/ipam/filtersets.py:389 +#: netbox/ipam/filtersets.py:501 netbox/ipam/filtersets.py:1011 #: netbox/virtualization/filtersets.py:216 msgid "Role (slug)" msgstr "Rol (kısa ad)" @@ -3199,7 +3199,7 @@ msgstr "VDC (KİMLİK)" msgid "Device model" msgstr "Cihaz modeli" -#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:632 +#: netbox/dcim/filtersets.py:1267 netbox/ipam/filtersets.py:634 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" msgstr "Arayüz (ID)" @@ -3213,8 +3213,8 @@ msgid "Module bay (ID)" msgstr "Modül yuvası (ID)" #: netbox/dcim/filtersets.py:1333 netbox/dcim/filtersets.py:1425 -#: netbox/ipam/filtersets.py:611 netbox/ipam/filtersets.py:851 -#: netbox/ipam/filtersets.py:1115 netbox/virtualization/filtersets.py:161 +#: netbox/ipam/filtersets.py:613 netbox/ipam/filtersets.py:853 +#: netbox/ipam/filtersets.py:1117 netbox/virtualization/filtersets.py:161 #: netbox/vpn/filtersets.py:379 msgid "Device (ID)" msgstr "Cihaz (ID)" @@ -3223,8 +3223,8 @@ msgstr "Cihaz (ID)" msgid "Rack (name)" msgstr "Raf (isim)" -#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:606 -#: netbox/ipam/filtersets.py:846 netbox/ipam/filtersets.py:1121 +#: netbox/dcim/filtersets.py:1431 netbox/ipam/filtersets.py:608 +#: netbox/ipam/filtersets.py:848 netbox/ipam/filtersets.py:1123 #: netbox/vpn/filtersets.py:374 msgid "Device (name)" msgstr "Cihaz (isim)" @@ -3276,9 +3276,9 @@ msgstr "Atanmış VID" #: netbox/dcim/forms/bulk_import.py:913 netbox/dcim/forms/filtersets.py:1428 #: netbox/dcim/forms/model_forms.py:1385 #: netbox/dcim/models/device_components.py:711 -#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:316 -#: netbox/ipam/filtersets.py:327 netbox/ipam/filtersets.py:483 -#: netbox/ipam/filtersets.py:584 netbox/ipam/filtersets.py:595 +#: netbox/dcim/tables/devices.py:626 netbox/ipam/filtersets.py:318 +#: netbox/ipam/filtersets.py:329 netbox/ipam/filtersets.py:485 +#: netbox/ipam/filtersets.py:586 netbox/ipam/filtersets.py:597 #: netbox/ipam/forms/bulk_edit.py:242 netbox/ipam/forms/bulk_edit.py:298 #: netbox/ipam/forms/bulk_edit.py:340 netbox/ipam/forms/bulk_import.py:157 #: netbox/ipam/forms/bulk_import.py:243 netbox/ipam/forms/bulk_import.py:279 @@ -3305,19 +3305,19 @@ msgstr "Atanmış VID" msgid "VRF" msgstr "VRF" -#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:322 -#: netbox/ipam/filtersets.py:333 netbox/ipam/filtersets.py:489 -#: netbox/ipam/filtersets.py:590 netbox/ipam/filtersets.py:601 +#: netbox/dcim/filtersets.py:1619 netbox/ipam/filtersets.py:324 +#: netbox/ipam/filtersets.py:335 netbox/ipam/filtersets.py:491 +#: netbox/ipam/filtersets.py:592 netbox/ipam/filtersets.py:603 msgid "VRF (RD)" msgstr "VRF (RD)" -#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1030 +#: netbox/dcim/filtersets.py:1624 netbox/ipam/filtersets.py:1032 #: netbox/vpn/filtersets.py:342 msgid "L2VPN (ID)" msgstr "L2VPN (KİMLİĞİ)" #: netbox/dcim/filtersets.py:1630 netbox/dcim/forms/filtersets.py:1433 -#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1036 +#: netbox/dcim/tables/devices.py:570 netbox/ipam/filtersets.py:1038 #: netbox/ipam/forms/filtersets.py:518 netbox/ipam/tables/vlans.py:137 #: netbox/templates/dcim/interface.html:93 netbox/templates/ipam/vlan.html:66 #: netbox/templates/vpn/l2vpntermination.html:12 @@ -3479,7 +3479,7 @@ msgstr "Saat dilimi" #: netbox/dcim/forms/object_import.py:187 netbox/dcim/tables/devices.py:96 #: netbox/dcim/tables/devices.py:172 netbox/dcim/tables/devices.py:940 #: netbox/dcim/tables/devicetypes.py:80 netbox/dcim/tables/devicetypes.py:308 -#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:60 +#: netbox/dcim/tables/modules.py:20 netbox/dcim/tables/modules.py:61 #: netbox/dcim/tables/racks.py:58 netbox/dcim/tables/racks.py:132 #: netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:44 @@ -3730,7 +3730,7 @@ msgid "Device Type" msgstr "Cihaz Türü" #: netbox/dcim/forms/bulk_edit.py:598 netbox/dcim/forms/model_forms.py:401 -#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:65 +#: netbox/dcim/tables/modules.py:17 netbox/dcim/tables/modules.py:66 #: netbox/templates/dcim/module.html:65 #: netbox/templates/dcim/modulebay.html:66 #: netbox/templates/dcim/moduletype.html:22 @@ -3838,7 +3838,7 @@ msgstr "Küme" #: netbox/dcim/tables/devices.py:697 netbox/dcim/tables/devices.py:754 #: netbox/dcim/tables/devices.py:801 netbox/dcim/tables/devices.py:861 #: netbox/dcim/tables/devices.py:930 netbox/dcim/tables/devices.py:1057 -#: netbox/dcim/tables/modules.py:52 netbox/extras/forms/filtersets.py:321 +#: netbox/dcim/tables/modules.py:53 netbox/extras/forms/filtersets.py:321 #: netbox/ipam/forms/bulk_import.py:304 netbox/ipam/forms/bulk_import.py:505 #: netbox/ipam/forms/filtersets.py:551 netbox/ipam/forms/model_forms.py:323 #: netbox/ipam/forms/model_forms.py:712 netbox/ipam/forms/model_forms.py:745 @@ -4090,11 +4090,11 @@ msgstr "Etiketli VLAN'lar" #: netbox/dcim/forms/bulk_edit.py:1511 msgid "Add tagged VLANs" -msgstr "" +msgstr "Etiketli VLAN'lar ekle" #: netbox/dcim/forms/bulk_edit.py:1520 msgid "Remove tagged VLANs" -msgstr "" +msgstr "Etiketli VLAN'ları kaldır" #: netbox/dcim/forms/bulk_edit.py:1536 netbox/dcim/forms/model_forms.py:1348 msgid "Wireless LAN group" @@ -4142,7 +4142,7 @@ msgstr "802.1Q Anahtarlama" #: netbox/dcim/forms/bulk_edit.py:1558 msgid "Add/Remove" -msgstr "" +msgstr "Ekle/Kaldır" #: netbox/dcim/forms/bulk_edit.py:1617 netbox/dcim/forms/bulk_edit.py:1619 msgid "Interface mode must be specified to assign VLANs" @@ -4220,7 +4220,7 @@ msgstr "Atanan rolün adı" #: netbox/dcim/forms/bulk_import.py:264 msgid "Rack type model" -msgstr "" +msgstr "Raf tipi modeli" #: netbox/dcim/forms/bulk_import.py:292 netbox/dcim/forms/bulk_import.py:435 #: netbox/dcim/forms/bulk_import.py:605 @@ -4229,11 +4229,11 @@ msgstr "Hava akışı yönü" #: netbox/dcim/forms/bulk_import.py:324 msgid "Width must be set if not specifying a rack type." -msgstr "" +msgstr "Bir raf tipi belirtilmiyorsa genişlik ayarlanmalıdır." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "Bir raf tipi belirtilmiyorsa U yüksekliği ayarlanmalıdır." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4893,6 +4893,10 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Toplu oluşturma için alfanümerik aralıklar desteklenir. Tek bir aralıktaki " +"karışık durumlar ve türler desteklenmez (örnek: [ge, xe] -0/0/ " +"[0-9]). Simge {module}, varsa, yeni bir modül " +"oluştururken otomatik olarak konum değeri ile değiştirilecektir." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -6765,7 +6769,7 @@ msgstr "Modül bölmeleri" msgid "Inventory items" msgstr "Envanter kalemleri" -#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:56 +#: netbox/dcim/tables/devices.py:305 netbox/dcim/tables/modules.py:57 #: netbox/templates/dcim/modulebay.html:17 msgid "Module Bay" msgstr "Modül Yuvası" @@ -7490,12 +7494,12 @@ msgstr "Yer İşaretleri" msgid "Show your personal bookmarks" msgstr "Kişisel yer imlerinizi gösterin" -#: netbox/extras/events.py:147 +#: netbox/extras/events.py:151 #, python-brace-format msgid "Unknown action type for an event rule: {action_type}" msgstr "Bir olay kuralı için bilinmeyen eylem türü: {action_type}" -#: netbox/extras/events.py:192 +#: netbox/extras/events.py:196 #, python-brace-format msgid "Cannot import events pipeline {name} error: {error}" msgstr "Olaylar boru hattı içe aktarılamıyor {name} hata: {error}" @@ -9260,129 +9264,129 @@ msgstr "L2VPN'i dışa aktarma" msgid "Exporting L2VPN (identifier)" msgstr "L2VPN'i dışa aktarma (tanımlayıcı)" -#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:281 +#: netbox/ipam/filtersets.py:155 netbox/ipam/filtersets.py:283 #: netbox/ipam/forms/model_forms.py:229 netbox/ipam/tables/ip.py:212 #: netbox/templates/ipam/prefix.html:12 msgid "Prefix" msgstr "Önek" #: netbox/ipam/filtersets.py:159 netbox/ipam/filtersets.py:198 -#: netbox/ipam/filtersets.py:221 +#: netbox/ipam/filtersets.py:223 msgid "RIR (ID)" msgstr "RİR (İD)" #: netbox/ipam/filtersets.py:165 netbox/ipam/filtersets.py:204 -#: netbox/ipam/filtersets.py:227 +#: netbox/ipam/filtersets.py:229 msgid "RIR (slug)" msgstr "RIR (kısa ad)" -#: netbox/ipam/filtersets.py:285 +#: netbox/ipam/filtersets.py:287 msgid "Within prefix" msgstr "Önek içinde" -#: netbox/ipam/filtersets.py:289 +#: netbox/ipam/filtersets.py:291 msgid "Within and including prefix" msgstr "Önek içinde ve dahil olmak üzere" -#: netbox/ipam/filtersets.py:293 +#: netbox/ipam/filtersets.py:295 msgid "Prefixes which contain this prefix or IP" msgstr "Bu önek veya IP'yi içeren önekler" -#: netbox/ipam/filtersets.py:304 netbox/ipam/filtersets.py:572 +#: netbox/ipam/filtersets.py:306 netbox/ipam/filtersets.py:574 #: netbox/ipam/forms/bulk_edit.py:343 netbox/ipam/forms/filtersets.py:196 #: netbox/ipam/forms/filtersets.py:331 msgid "Mask length" msgstr "Maske uzunluğu" -#: netbox/ipam/filtersets.py:373 netbox/vpn/filtersets.py:427 +#: netbox/ipam/filtersets.py:375 netbox/vpn/filtersets.py:427 msgid "VLAN (ID)" msgstr "VLAN (KİMLİĞİ)" -#: netbox/ipam/filtersets.py:377 netbox/vpn/filtersets.py:422 +#: netbox/ipam/filtersets.py:379 netbox/vpn/filtersets.py:422 msgid "VLAN number (1-4094)" msgstr "VLAN numarası (1-4094)" -#: netbox/ipam/filtersets.py:471 netbox/ipam/filtersets.py:475 -#: netbox/ipam/filtersets.py:567 netbox/ipam/forms/model_forms.py:496 +#: netbox/ipam/filtersets.py:473 netbox/ipam/filtersets.py:477 +#: netbox/ipam/filtersets.py:569 netbox/ipam/forms/model_forms.py:496 #: netbox/templates/tenancy/contact.html:53 #: netbox/tenancy/forms/bulk_edit.py:113 msgid "Address" msgstr "Adres" -#: netbox/ipam/filtersets.py:479 +#: netbox/ipam/filtersets.py:481 msgid "Ranges which contain this prefix or IP" msgstr "Bu önek veya IP'yi içeren aralıklar" -#: netbox/ipam/filtersets.py:507 netbox/ipam/filtersets.py:563 +#: netbox/ipam/filtersets.py:509 netbox/ipam/filtersets.py:565 msgid "Parent prefix" msgstr "Ebeveyn öneki" -#: netbox/ipam/filtersets.py:616 netbox/ipam/filtersets.py:856 -#: netbox/ipam/filtersets.py:1131 netbox/vpn/filtersets.py:385 +#: netbox/ipam/filtersets.py:618 netbox/ipam/filtersets.py:858 +#: netbox/ipam/filtersets.py:1133 netbox/vpn/filtersets.py:385 msgid "Virtual machine (name)" msgstr "Sanal makine (isim)" -#: netbox/ipam/filtersets.py:621 netbox/ipam/filtersets.py:861 -#: netbox/ipam/filtersets.py:1125 netbox/virtualization/filtersets.py:282 +#: netbox/ipam/filtersets.py:623 netbox/ipam/filtersets.py:863 +#: netbox/ipam/filtersets.py:1127 netbox/virtualization/filtersets.py:282 #: netbox/virtualization/filtersets.py:321 netbox/vpn/filtersets.py:390 msgid "Virtual machine (ID)" msgstr "Sanal makine (ID)" -#: netbox/ipam/filtersets.py:627 netbox/vpn/filtersets.py:97 +#: netbox/ipam/filtersets.py:629 netbox/vpn/filtersets.py:97 #: netbox/vpn/filtersets.py:396 msgid "Interface (name)" msgstr "Arayüz (isim)" -#: netbox/ipam/filtersets.py:638 netbox/vpn/filtersets.py:108 +#: netbox/ipam/filtersets.py:640 netbox/vpn/filtersets.py:108 #: netbox/vpn/filtersets.py:407 msgid "VM interface (name)" msgstr "VM arabirimi (isim)" -#: netbox/ipam/filtersets.py:643 netbox/vpn/filtersets.py:113 +#: netbox/ipam/filtersets.py:645 netbox/vpn/filtersets.py:113 msgid "VM interface (ID)" msgstr "VM arabirimi (ID)" -#: netbox/ipam/filtersets.py:648 +#: netbox/ipam/filtersets.py:650 msgid "FHRP group (ID)" msgstr "FHRP grubu (ID)" -#: netbox/ipam/filtersets.py:652 +#: netbox/ipam/filtersets.py:654 msgid "Is assigned to an interface" msgstr "Bir arayüze atanır" -#: netbox/ipam/filtersets.py:656 +#: netbox/ipam/filtersets.py:658 msgid "Is assigned" msgstr "Atanmıştır" -#: netbox/ipam/filtersets.py:668 +#: netbox/ipam/filtersets.py:670 msgid "Service (ID)" msgstr "Hizmet (ID)" -#: netbox/ipam/filtersets.py:673 +#: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" msgstr "IP adresi içinde NAT (ID)" -#: netbox/ipam/filtersets.py:1041 netbox/ipam/forms/bulk_import.py:322 +#: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" msgstr "Atanmış arayüz" -#: netbox/ipam/filtersets.py:1046 +#: netbox/ipam/filtersets.py:1048 msgid "Assigned VM interface" msgstr "Atanmış VM arabirimi" -#: netbox/ipam/filtersets.py:1136 +#: netbox/ipam/filtersets.py:1138 msgid "IP address (ID)" msgstr "IP adresi (ID)" -#: netbox/ipam/filtersets.py:1142 netbox/ipam/models/ip.py:788 +#: netbox/ipam/filtersets.py:1144 netbox/ipam/models/ip.py:788 msgid "IP address" msgstr "IP adresi" -#: netbox/ipam/filtersets.py:1167 +#: netbox/ipam/filtersets.py:1169 msgid "Primary IPv4 (ID)" msgstr "Birincil IPv4 (ID)" -#: netbox/ipam/filtersets.py:1172 +#: netbox/ipam/filtersets.py:1174 msgid "Primary IPv6 (ID)" msgstr "Birincil IPv6 (ID)" @@ -9606,11 +9610,11 @@ msgstr "Bunu atanan cihaz için birincil IP yapın" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Bant dışı" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "Bunu atanan aygıtın bant dışı IP adresi olarak belirleyin" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9619,11 +9623,11 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Aygıt belirtilmemiş; bant dışı IP olarak ayarlanamıyor" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Sanal makineler için bant dışı IP ayarlanamıyor" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9631,7 +9635,7 @@ msgstr "Arayüz belirtilmedi; birincil IP olarak ayarlanamıyor" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Arayüz belirtilmedi; bant dışı IP olarak ayarlanamıyor" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9808,7 +9812,7 @@ msgstr "Bunu cihaz/VM için birincil IP yapın" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Bunu cihaz için bant dışı IP yapın" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9820,11 +9824,11 @@ msgstr "IP adresi yalnızca tek bir nesneye atanabilir." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" -msgstr "" +msgstr "Ana aygıt/sanal makine için birincil IP adresi yeniden atanamıyor" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" -msgstr "" +msgstr "Ana aygıt için bant dışı IP adresi yeniden atanamıyor" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9837,6 +9841,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Yalnızca bir cihaz arayüzüne atanan IP adresleri, bir aygıt için bant dışı " +"IP olarak belirlenebilir." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10229,12 +10235,12 @@ msgstr "scope_type olmadan scope_id ayarlanamıyor." #: netbox/ipam/models/vlans.py:105 #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" -msgstr "" +msgstr "Menzilde VLAN Kimliğini Başlatma ({value}) daha az olamaz {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" -msgstr "" +msgstr "Menzilde VLAN Kimliğini Sonlandırma ({value}) geçemez {maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10242,6 +10248,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"Aralıktaki bitiş VLAN kimliği, başlangıç VLAN kimliğinden daha büyük veya " +"ona eşit olmalıdır ({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12605,11 +12613,11 @@ msgstr "İndir" #: netbox/templates/dcim/device/render_config.html:64 #: netbox/templates/virtualization/virtualmachine/render_config.html:64 msgid "Error rendering template" -msgstr "" +msgstr "Hata oluşturma şablonu" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "" +msgstr "Bu aygıt için herhangi bir yapılandırma şablonu atanmadı." #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13476,7 +13484,7 @@ msgstr "Tekrar koş" #: netbox/templates/extras/script_list.html:133 #, python-format msgid "Could not load scripts from module %(module)s" -msgstr "" +msgstr "Modülden komut dosyaları yüklenemedi %(module)s" #: netbox/templates/extras/script_list.html:141 msgid "No Scripts Found" @@ -14288,7 +14296,7 @@ msgstr "Sanal Disk Ekle" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." -msgstr "" +msgstr "Bu sanal makine için herhangi bir yapılandırma şablonu atanmadı." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15352,12 +15360,12 @@ msgstr "Bellek (MB)" #: netbox/virtualization/forms/bulk_edit.py:174 msgid "Disk (MB)" -msgstr "" +msgstr "Disk (MB)" #: netbox/virtualization/forms/bulk_edit.py:334 #: netbox/virtualization/forms/filtersets.py:251 msgid "Size (MB)" -msgstr "" +msgstr "Boyut (MB)" #: netbox/virtualization/forms/bulk_import.py:44 msgid "Type of cluster" @@ -15385,8 +15393,7 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} adlı aygıt, ({cluster_site}) kümesinden farklı bir siteye " -"({device_site}) aittir" +"{device} farklı bir siteye aittir ({device_site}) kümeden ({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -15566,19 +15573,19 @@ msgstr "GREC" #: netbox/vpn/choices.py:39 msgid "WireGuard" -msgstr "" +msgstr "Tel Koruma" #: netbox/vpn/choices.py:40 msgid "OpenVPN" -msgstr "" +msgstr "OpenVPN" #: netbox/vpn/choices.py:41 msgid "L2TP" -msgstr "" +msgstr "L2TP" #: netbox/vpn/choices.py:42 msgid "PPTP" -msgstr "" +msgstr "PPTP" #: netbox/vpn/choices.py:64 msgid "Hub" diff --git a/netbox/translations/uk/LC_MESSAGES/django.mo b/netbox/translations/uk/LC_MESSAGES/django.mo index 04eed761adf8c299fb359b7d1d2a13cb99121eeb..f3c93f2d04f56a963a4e55cc52d36d41d6086377 100644 GIT binary patch delta 68293 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 delta 66726 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    y0qT&o2i5p=P|pL_f;tpuK`rFA&7Xt1 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

    @@ -79,7 +80,7 @@

    {% trans "Tagged Objects" %}

    -
    +
    {% render_table taggeditem_table 'inc/table.html' %} {% include 'inc/paginator.html' with paginator=taggeditem_table.paginator page=taggeditem_table.page %}
    From 4b98f74943fcde3d3dad31335cf9a8137e46a03c Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Mon, 10 Feb 2025 15:42:08 +0100 Subject: [PATCH 156/190] Fixes 18247: Fix dark mode button classes (#18617) --- netbox/dcim/tables/template_code.py | 42 +++++++++---------- .../templates/extras/inc/format_toggle.html | 4 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py index 4b51cd06a..1c526649b 100644 --- a/netbox/dcim/tables/template_code.py +++ b/netbox/dcim/tables/template_code.py @@ -159,8 +159,8 @@ CONSOLEPORT_BUTTONS = """ {% endif %} {% elif perms.dcim.add_cable %} - - + +
    diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index b3334ca87..b9a5f85fb 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -196,7 +196,10 @@ class GetRelatedModelsMixin: ] related_models.extend(extra) - return sorted(related_models, key=lambda x: x[0].model._meta.verbose_name.lower()) + return sorted( + filter(lambda qs: qs[0].exists(), related_models), + key=lambda qs: qs[0].model._meta.verbose_name.lower(), + ) class ViewTab: From 3e1cc0d7f388ae6ffa7442f3b0f9d5deb3b520cf Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Mon, 10 Feb 2025 17:03:08 +0100 Subject: [PATCH 159/190] Fixes 18208: Consolidate rendering configuration templates (#18604) --- netbox/dcim/views.py | 50 +------------ netbox/extras/views.py | 56 ++++++++++++++ .../object_render_config.html} | 5 +- .../virtualmachine/render_config.html | 75 ------------------- netbox/virtualization/views.py | 50 +------------ 5 files changed, 67 insertions(+), 169 deletions(-) rename netbox/templates/{dcim/device/render_config.html => extras/object_render_config.html} (95%) delete mode 100644 netbox/templates/virtualization/virtualmachine/render_config.html diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 0978747d1..6efdb63f0 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -4,17 +4,15 @@ from django.core.paginator import EmptyPage, PageNotAnInteger from django.db import transaction from django.db.models import Prefetch from django.forms import ModelMultipleChoiceField, MultipleHiddenInput, modelformset_factory -from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.html import escape from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ from django.views.generic import View -from jinja2.exceptions import TemplateError from circuits.models import Circuit, CircuitTermination -from extras.views import ObjectConfigContextView +from extras.views import ObjectConfigContextView, ObjectRenderConfigView from ipam.models import ASN, IPAddress, Prefix, VLANGroup from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable from netbox.constants import DEFAULT_ACTION_PERMISSIONS @@ -2253,54 +2251,14 @@ class DeviceConfigContextView(ObjectConfigContextView): @register_model_view(Device, 'render-config') -class DeviceRenderConfigView(generic.ObjectView): +class DeviceRenderConfigView(ObjectRenderConfigView): queryset = Device.objects.all() - template_name = 'dcim/device/render_config.html' + base_template = 'dcim/device/base.html' tab = ViewTab( label=_('Render Config'), - weight=2100 + weight=2100, ) - def get(self, request, **kwargs): - instance = self.get_object(**kwargs) - context = self.get_extra_context(request, instance) - - # If a direct export has been requested, return the rendered template content as a - # downloadable file. - if request.GET.get('export'): - content = context['rendered_config'] or context['error_message'] - response = HttpResponse(content, content_type='text') - filename = f"{instance.name or 'config'}.txt" - response['Content-Disposition'] = f'attachment; filename="{filename}"' - return response - - return render(request, self.get_template_name(), { - 'object': instance, - 'tab': self.tab, - **context, - }) - - def get_extra_context(self, request, instance): - # Compile context data - context_data = instance.get_config_context() - context_data.update({'device': instance}) - - # Render the config template - rendered_config = None - error_message = None - if config_template := instance.get_config_template(): - try: - rendered_config = config_template.render(context=context_data) - except TemplateError as e: - error_message = _("An error occurred while rendering the template: {error}").format(error=e) - - return { - 'config_template': config_template, - 'context_data': context_data, - 'rendered_config': rendered_config, - 'error_message': error_message, - } - @register_model_view(Device, 'virtual-machines') class DeviceVirtualMachinesView(generic.ObjectChildrenView): diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 3672e5336..86e7f214a 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -10,6 +10,7 @@ from django.utils import timezone from django.utils.module_loading import import_string from django.utils.translation import gettext as _ from django.views.generic import View +from jinja2.exceptions import TemplateError from core.choices import ManagedFileRootPathChoices from core.forms import ManagedFileForm @@ -885,6 +886,61 @@ class ConfigTemplateBulkSyncDataView(generic.BulkSyncDataView): queryset = ConfigTemplate.objects.all() +class ObjectRenderConfigView(generic.ObjectView): + base_template = None + template_name = 'extras/object_render_config.html' + + def get(self, request, **kwargs): + instance = self.get_object(**kwargs) + context = self.get_extra_context(request, instance) + + # If a direct export has been requested, return the rendered template content as a + # downloadable file. + if request.GET.get('export'): + content = context['rendered_config'] or context['error_message'] + response = HttpResponse(content, content_type='text') + filename = f"{instance.name or 'config'}.txt" + response['Content-Disposition'] = f'attachment; filename="{filename}"' + return response + + return render( + request, + self.get_template_name(), + { + 'object': instance, + 'tab': self.tab, + **context, + }, + ) + + def get_extra_context_data(self, request, instance): + return { + f'{instance._meta.model_name}': instance, + } + + def get_extra_context(self, request, instance): + # Compile context data + context_data = instance.get_config_context() + context_data.update(self.get_extra_context_data(request, instance)) + + # Render the config template + rendered_config = None + error_message = None + if config_template := instance.get_config_template(): + try: + rendered_config = config_template.render(context=context_data) + except TemplateError as e: + error_message = _("An error occurred while rendering the template: {error}").format(error=e) + + return { + 'base_template': self.base_template, + 'config_template': config_template, + 'context_data': context_data, + 'rendered_config': rendered_config, + 'error_message': error_message, + } + + # # Image attachments # diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/extras/object_render_config.html similarity index 95% rename from netbox/templates/dcim/device/render_config.html rename to netbox/templates/extras/object_render_config.html index ab2f1c531..b28146ff4 100644 --- a/netbox/templates/dcim/device/render_config.html +++ b/netbox/templates/extras/object_render_config.html @@ -1,4 +1,5 @@ -{% extends 'dcim/device/base.html' %} +{% extends base_template %} +{% load helpers %} {% load static %} {% load i18n %} @@ -67,7 +68,7 @@ {% endif %} {% else %}
    - {% trans "No configuration template has been assigned for this device." %} + {% trans "No configuration template has been assigned." %}
    {% endif %}
    diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html deleted file mode 100644 index fa6f1723b..000000000 --- a/netbox/templates/virtualization/virtualmachine/render_config.html +++ /dev/null @@ -1,75 +0,0 @@ -{% extends 'virtualization/virtualmachine/base.html' %} -{% load static %} -{% load i18n %} - -{% block title %}{{ object }} - {% trans "Config" %}{% endblock %} - -{% block content %} -
    -
    -
    -

    {% trans "Config Template" %}

    - - - - - - - - - - - - - -
    {% trans "Config Template" %}{{ config_template|linkify|placeholder }}
    {% trans "Data Source" %}{{ config_template.data_file.source|linkify|placeholder }}
    {% trans "Data File" %}{{ config_template.data_file|linkify|placeholder }}
    -
    -
    -
    -
    -
    -
    -
    -

    - -

    -
    -
    - 
    {{ context_data|pprint }}
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - {% if config_template %} - {% if rendered_config %} -
    -

    - {% trans "Rendered Config" %} - - {% trans "Download" %} - -

    - 
    {{ rendered_config }}
    -
    - {% else %} -
    -

    {% trans "Error rendering template" %}

    - {% trans error_message %} -
    - {% endif %} - {% else %} -
    - {% trans "No configuration template has been assigned for this virtual machine." %} -
    - {% endif %} -
    -
    -{% endblock %} diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 7682d0fc8..343d346e4 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -1,17 +1,15 @@ from django.contrib import messages from django.db import transaction from django.db.models import Prefetch, Sum -from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse from django.utils.translation import gettext_lazy as _ -from jinja2.exceptions import TemplateError from dcim.filtersets import DeviceFilterSet from dcim.forms import DeviceFilterForm from dcim.models import Device from dcim.tables import DeviceTable -from extras.views import ObjectConfigContextView +from extras.views import ObjectConfigContextView, ObjectRenderConfigView from ipam.models import IPAddress from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable from netbox.constants import DEFAULT_ACTION_PERMISSIONS @@ -427,54 +425,14 @@ class VirtualMachineConfigContextView(ObjectConfigContextView): @register_model_view(VirtualMachine, 'render-config') -class VirtualMachineRenderConfigView(generic.ObjectView): +class VirtualMachineRenderConfigView(ObjectRenderConfigView): queryset = VirtualMachine.objects.all() - template_name = 'virtualization/virtualmachine/render_config.html' + base_template = 'virtualization/virtualmachine/base.html' tab = ViewTab( label=_('Render Config'), - weight=2100 + weight=2100, ) - def get(self, request, **kwargs): - instance = self.get_object(**kwargs) - context = self.get_extra_context(request, instance) - - # If a direct export has been requested, return the rendered template content as a - # downloadable file. - if request.GET.get('export'): - content = context['rendered_config'] or context['error_message'] - response = HttpResponse(content, content_type='text') - filename = f"{instance.name or 'config'}.txt" - response['Content-Disposition'] = f'attachment; filename="{filename}"' - return response - - return render(request, self.get_template_name(), { - 'object': instance, - 'tab': self.tab, - **context, - }) - - def get_extra_context(self, request, instance): - # Compile context data - context_data = instance.get_config_context() - context_data.update({'virtualmachine': instance}) - - # Render the config template - rendered_config = None - error_message = None - if config_template := instance.get_config_template(): - try: - rendered_config = config_template.render(context=context_data) - except TemplateError as e: - error_message = _("An error occurred while rendering the template: {error}").format(error=e) - - return { - 'config_template': config_template, - 'context_data': context_data, - 'rendered_config': rendered_config, - 'error_message': error_message, - } - @register_model_view(VirtualMachine, 'add', detail=False) @register_model_view(VirtualMachine, 'edit') From 015ef25ca03291ab111c0e86169013f79269a57d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 18:34:35 +0000 Subject: [PATCH 160/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 174 +++++++++---------- 1 file changed, 81 insertions(+), 93 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 3a6dff6c2..52257d7f2 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-08 05:02+0000\n" +"POT-Creation-Date: 2025-02-10 18:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2218,11 +2218,10 @@ msgstr "" #: netbox/extras/forms/model_forms.py:632 netbox/extras/tables/tables.py:191 #: netbox/extras/tables/tables.py:483 netbox/extras/tables/tables.py:518 #: netbox/templates/core/datasource.html:31 -#: netbox/templates/dcim/device/render_config.html:18 #: netbox/templates/extras/configcontext.html:29 #: netbox/templates/extras/configtemplate.html:21 #: netbox/templates/extras/exporttemplate.html:35 -#: netbox/templates/virtualization/virtualmachine/render_config.html:18 +#: netbox/templates/extras/object_render_config.html:19 msgid "Data Source" msgstr "" @@ -6981,7 +6980,7 @@ msgstr "" #: netbox/netbox/navigation/menu.py:75 #: netbox/virtualization/forms/model_forms.py:122 #: netbox/virtualization/tables/clusters.py:87 -#: netbox/virtualization/views.py:218 +#: netbox/virtualization/views.py:216 msgid "Devices" msgstr "" @@ -6992,14 +6991,12 @@ msgstr "" #: netbox/dcim/tables/devices.py:111 netbox/dcim/tables/devices.py:226 #: netbox/extras/forms/model_forms.py:630 netbox/templates/dcim/device.html:112 -#: netbox/templates/dcim/device/render_config.html:11 -#: netbox/templates/dcim/device/render_config.html:14 #: netbox/templates/dcim/devicerole.html:44 #: netbox/templates/dcim/platform.html:41 #: netbox/templates/extras/configtemplate.html:10 +#: netbox/templates/extras/object_render_config.html:12 +#: netbox/templates/extras/object_render_config.html:15 #: netbox/templates/virtualization/virtualmachine.html:48 -#: netbox/templates/virtualization/virtualmachine/render_config.html:11 -#: netbox/templates/virtualization/virtualmachine/render_config.html:14 #: netbox/virtualization/tables/virtualmachines.py:77 msgid "Config Template" msgstr "" @@ -7057,8 +7054,8 @@ msgid "Power outlets" msgstr "" #: netbox/dcim/tables/devices.py:256 netbox/dcim/tables/devices.py:1112 -#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1144 -#: netbox/dcim/views.py:1388 netbox/dcim/views.py:2139 +#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1142 +#: netbox/dcim/views.py:1386 netbox/dcim/views.py:2137 #: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:258 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 @@ -7070,7 +7067,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine/base.html:27 #: netbox/templates/virtualization/virtualmachine_list.html:14 #: netbox/virtualization/tables/virtualmachines.py:71 -#: netbox/virtualization/views.py:383 netbox/wireless/tables/wirelesslan.py:63 +#: netbox/virtualization/views.py:381 netbox/wireless/tables/wirelesslan.py:63 msgid "Interfaces" msgstr "" @@ -7096,8 +7093,8 @@ msgid "Module Bay" msgstr "" #: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:47 -#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1219 -#: netbox/dcim/views.py:2237 netbox/netbox/navigation/menu.py:103 +#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1217 +#: netbox/dcim/views.py:2235 netbox/netbox/navigation/menu.py:103 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -7226,8 +7223,8 @@ msgstr "" msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1084 -#: netbox/dcim/views.py:1328 netbox/dcim/views.py:2075 +#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1082 +#: netbox/dcim/views.py:1326 netbox/dcim/views.py:2073 #: netbox/netbox/navigation/menu.py:97 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -7237,8 +7234,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1099 -#: netbox/dcim/views.py:1343 netbox/dcim/views.py:2091 +#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1097 +#: netbox/dcim/views.py:1341 netbox/dcim/views.py:2089 #: netbox/netbox/navigation/menu.py:98 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -7248,8 +7245,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1114 -#: netbox/dcim/views.py:1358 netbox/dcim/views.py:2107 +#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1112 +#: netbox/dcim/views.py:1356 netbox/dcim/views.py:2105 #: netbox/netbox/navigation/menu.py:99 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -7259,8 +7256,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1129 -#: netbox/dcim/views.py:1373 netbox/dcim/views.py:2123 +#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1127 +#: netbox/dcim/views.py:1371 netbox/dcim/views.py:2121 #: netbox/netbox/navigation/menu.py:100 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -7270,8 +7267,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1159 -#: netbox/dcim/views.py:1403 netbox/dcim/views.py:2161 +#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1157 +#: netbox/dcim/views.py:1401 netbox/dcim/views.py:2159 #: netbox/netbox/navigation/menu.py:95 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -7280,8 +7277,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1174 -#: netbox/dcim/views.py:1418 netbox/dcim/views.py:2177 +#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1172 +#: netbox/dcim/views.py:1416 netbox/dcim/views.py:2175 #: netbox/netbox/navigation/menu.py:96 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -7291,16 +7288,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1204 -#: netbox/dcim/views.py:2217 netbox/netbox/navigation/menu.py:102 +#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1202 +#: netbox/dcim/views.py:2215 netbox/netbox/navigation/menu.py:102 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1189 -#: netbox/dcim/views.py:1433 netbox/dcim/views.py:2197 +#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1187 +#: netbox/dcim/views.py:1431 netbox/dcim/views.py:2195 #: netbox/netbox/navigation/menu.py:101 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 @@ -7365,67 +7362,62 @@ msgstr "" msgid "Test case must set peer_termination_type" msgstr "" -#: netbox/dcim/views.py:139 +#: netbox/dcim/views.py:137 #, python-brace-format msgid "Disconnected {count} {type}" msgstr "" -#: netbox/dcim/views.py:826 netbox/netbox/navigation/menu.py:51 +#: netbox/dcim/views.py:824 netbox/netbox/navigation/menu.py:51 msgid "Reservations" msgstr "" -#: netbox/dcim/views.py:845 netbox/templates/dcim/location.html:90 +#: netbox/dcim/views.py:843 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2250 netbox/extras/forms/model_forms.py:577 +#: netbox/dcim/views.py:2248 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 #: netbox/virtualization/forms/model_forms.py:232 -#: netbox/virtualization/views.py:424 +#: netbox/virtualization/views.py:422 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2260 netbox/virtualization/views.py:434 +#: netbox/dcim/views.py:2258 netbox/virtualization/views.py:432 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2295 netbox/virtualization/views.py:469 -#, python-brace-format -msgid "An error occurred while rendering the template: {error}" -msgstr "" - -#: netbox/dcim/views.py:2313 netbox/extras/tables/tables.py:550 +#: netbox/dcim/views.py:2271 netbox/extras/tables/tables.py:550 #: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 -#: netbox/virtualization/views.py:192 +#: netbox/virtualization/views.py:190 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:3146 +#: netbox/dcim/views.py:3104 #, python-brace-format msgid "Installed device {device} in bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3187 +#: netbox/dcim/views.py:3145 #, python-brace-format msgid "Removed device {device} from bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3303 netbox/ipam/tables/ip.py:180 +#: netbox/dcim/views.py:3261 netbox/ipam/tables/ip.py:180 msgid "Children" msgstr "" -#: netbox/dcim/views.py:3770 +#: netbox/dcim/views.py:3728 #, python-brace-format msgid "Added member {device}" msgstr "" -#: netbox/dcim/views.py:3819 +#: netbox/dcim/views.py:3777 #, python-brace-format msgid "Unable to remove master device {device} from the virtual chassis." msgstr "" -#: netbox/dcim/views.py:3832 +#: netbox/dcim/views.py:3790 #, python-brace-format msgid "Removed {device} from virtual chassis {chassis}" msgstr "" @@ -9251,12 +9243,11 @@ msgstr "" #: netbox/extras/tables/tables.py:195 netbox/extras/tables/tables.py:487 #: netbox/extras/tables/tables.py:522 netbox/templates/core/datafile.html:24 -#: netbox/templates/dcim/device/render_config.html:22 #: netbox/templates/extras/configcontext.html:39 #: netbox/templates/extras/configtemplate.html:31 #: netbox/templates/extras/exporttemplate.html:45 +#: netbox/templates/extras/object_render_config.html:23 #: netbox/templates/generic/bulk_import.html:35 -#: netbox/templates/virtualization/virtualmachine/render_config.html:22 msgid "Data File" msgstr "" @@ -9347,27 +9338,32 @@ msgstr "" msgid "Invalid attribute \"{name}\" for {model}" msgstr "" -#: netbox/extras/views.py:1029 +#: netbox/extras/views.py:933 +#, python-brace-format +msgid "An error occurred while rendering the template: {error}" +msgstr "" + +#: netbox/extras/views.py:1085 msgid "Your dashboard has been reset." msgstr "" -#: netbox/extras/views.py:1075 +#: netbox/extras/views.py:1131 msgid "Added widget: " msgstr "" -#: netbox/extras/views.py:1116 +#: netbox/extras/views.py:1172 msgid "Updated widget: " msgstr "" -#: netbox/extras/views.py:1152 +#: netbox/extras/views.py:1208 msgid "Deleted widget: " msgstr "" -#: netbox/extras/views.py:1154 +#: netbox/extras/views.py:1210 msgid "Error deleting widget: " msgstr "" -#: netbox/extras/views.py:1244 +#: netbox/extras/views.py:1300 msgid "Unable to run script: RQ worker process not running." msgstr "" @@ -11285,7 +11281,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine/base.html:32 #: netbox/templates/virtualization/virtualmachine_list.html:21 #: netbox/virtualization/tables/virtualmachines.py:74 -#: netbox/virtualization/views.py:405 +#: netbox/virtualization/views.py:403 msgid "Virtual Disks" msgstr "" @@ -11957,6 +11953,7 @@ msgstr "" #: netbox/templates/extras/webhook.html:75 #: netbox/templates/inc/panel_table.html:13 #: netbox/templates/inc/panels/comments.html:10 +#: netbox/templates/inc/panels/related_objects.html:23 #: netbox/templates/ipam/inc/panels/fhrp_groups.html:56 #: netbox/templates/users/group.html:34 netbox/templates/users/group.html:44 #: netbox/templates/users/objectpermission.html:77 @@ -12838,35 +12835,6 @@ msgstr "" msgid "Add Rear Ports" msgstr "" -#: netbox/templates/dcim/device/render_config.html:5 -#: netbox/templates/virtualization/virtualmachine/render_config.html:5 -msgid "Config" -msgstr "" - -#: netbox/templates/dcim/device/render_config.html:35 -#: netbox/templates/virtualization/virtualmachine/render_config.html:35 -msgid "Context Data" -msgstr "" - -#: netbox/templates/dcim/device/render_config.html:55 -#: netbox/templates/virtualization/virtualmachine/render_config.html:55 -msgid "Rendered Config" -msgstr "" - -#: netbox/templates/dcim/device/render_config.html:57 -#: netbox/templates/virtualization/virtualmachine/render_config.html:57 -msgid "Download" -msgstr "" - -#: netbox/templates/dcim/device/render_config.html:64 -#: netbox/templates/virtualization/virtualmachine/render_config.html:64 -msgid "Error rendering template" -msgstr "" - -#: netbox/templates/dcim/device/render_config.html:70 -msgid "No configuration template has been assigned for this device." -msgstr "" - #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" msgstr "" @@ -13666,6 +13634,30 @@ msgstr "" msgid "New Journal Entry" msgstr "" +#: netbox/templates/extras/object_render_config.html:6 +msgid "Config" +msgstr "" + +#: netbox/templates/extras/object_render_config.html:36 +msgid "Context Data" +msgstr "" + +#: netbox/templates/extras/object_render_config.html:56 +msgid "Rendered Config" +msgstr "" + +#: netbox/templates/extras/object_render_config.html:58 +msgid "Download" +msgstr "" + +#: netbox/templates/extras/object_render_config.html:65 +msgid "Error rendering template" +msgstr "" + +#: netbox/templates/extras/object_render_config.html:71 +msgid "No configuration template has been assigned." +msgstr "" + #: netbox/templates/extras/report/base.html:30 msgid "Report" msgstr "" @@ -13750,7 +13742,7 @@ msgstr "" msgid "Tagged Item Types" msgstr "" -#: netbox/templates/extras/tag.html:81 +#: netbox/templates/extras/tag.html:82 msgid "Tagged Objects" msgstr "" @@ -14514,10 +14506,6 @@ msgstr "" msgid "Add Virtual Disk" msgstr "" -#: netbox/templates/virtualization/virtualmachine/render_config.html:70 -msgid "No configuration template has been assigned for this virtual machine." -msgstr "" - #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 msgid "IKE Policy" @@ -15698,12 +15686,12 @@ msgstr "" msgid "virtual disks" msgstr "" -#: netbox/virtualization/views.py:291 +#: netbox/virtualization/views.py:289 #, python-brace-format msgid "Added {count} devices to cluster {cluster}" msgstr "" -#: netbox/virtualization/views.py:326 +#: netbox/virtualization/views.py:324 #, python-brace-format msgid "Removed {count} devices from cluster {cluster}" msgstr "" From 154b3a7abbbcb0d700257a250af82315644206cb Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Date: Tue, 11 Feb 2025 10:31:40 -0300 Subject: [PATCH 161/190] Fixes: 18593 - "Create & Add Another" broken for new IP addresses (#18602) * update IPAddressEditView get_extra_addanother_params * Simplify get_extra_addanother_params --- netbox/ipam/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 007a652ca..d9ee0e685 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -868,6 +868,7 @@ class IPAddressEditView(generic.ObjectEditView): return {'interface': request.GET['interface']} elif 'vminterface' in request.GET: return {'vminterface': request.GET['vminterface']} + return {} # TODO: Standardize or remove this view From 81144926730bf82bc7636279c2aac4a7c716b51f Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 9 Jan 2025 09:38:01 +0100 Subject: [PATCH 162/190] Close #18357: Display author name for plugins --- netbox/core/plugins.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/netbox/core/plugins.py b/netbox/core/plugins.py index 1fcb37f2b..66580c936 100644 --- a/netbox/core/plugins.py +++ b/netbox/core/plugins.py @@ -80,6 +80,13 @@ def get_local_plugins(plugins=None): plugin = importlib.import_module(plugin_name) plugin_config: PluginConfig = plugin.config + if plugin_config.author: + author = PluginAuthor( + name=plugin_config.author, + ) + else: + author = None + local_plugins[plugin_config.name] = Plugin( config_name=plugin_config.name, title_short=plugin_config.verbose_name, @@ -88,6 +95,7 @@ def get_local_plugins(plugins=None): description_short=plugin_config.description, is_local=True, is_installed=True, + author=author, installed_version=plugin_config.version, ) From f8022040b245790796a82b38a67570335a320b74 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 05:02:12 +0000 Subject: [PATCH 163/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 52257d7f2..a6af44ae7 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-10 18:34+0000\n" +"POT-Creation-Date: 2025-02-12 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -9932,7 +9932,7 @@ msgstr "" #: netbox/ipam/forms/filtersets.py:419 netbox/ipam/models/vlans.py:273 #: netbox/ipam/tables/ip.py:122 netbox/ipam/tables/vlans.py:51 -#: netbox/ipam/views.py:1035 netbox/netbox/navigation/menu.py:199 +#: netbox/ipam/views.py:1036 netbox/netbox/navigation/menu.py:199 #: netbox/netbox/navigation/menu.py:201 msgid "VLANs" msgstr "" @@ -10644,15 +10644,15 @@ msgstr "" msgid "Child Ranges" msgstr "" -#: netbox/ipam/views.py:957 +#: netbox/ipam/views.py:958 msgid "Related IPs" msgstr "" -#: netbox/ipam/views.py:1314 +#: netbox/ipam/views.py:1315 msgid "Device Interfaces" msgstr "" -#: netbox/ipam/views.py:1332 +#: netbox/ipam/views.py:1333 msgid "VM Interfaces" msgstr "" From b1ac20ac19fdd44bf01c2d693ec87d4fc8364382 Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Fri, 14 Feb 2025 00:01:11 +0000 Subject: [PATCH 164/190] Update ModuleBay instance name before saving it --- netbox/dcim/models/devices.py | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/dcim/models/devices.py b/netbox/dcim/models/devices.py index 2acd98801..12b0dae18 100644 --- a/netbox/dcim/models/devices.py +++ b/netbox/dcim/models/devices.py @@ -1298,6 +1298,7 @@ class Module(PrimaryModel, ConfigContextModel): else: # ModuleBays must be saved individually for MPTT for instance in create_instances: + instance.name = instance.name.replace(MODULE_TOKEN, str(self.module_bay.position)) instance.save() update_fields = ['module'] From f9431f1c293931046753c145fc7d2b2869667adf Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Thu, 13 Feb 2025 22:39:11 +0100 Subject: [PATCH 165/190] Replace DurationChoices by JobIntervalChoices --- netbox/core/choices.py | 2 ++ netbox/extras/choices.py | 11 ----------- netbox/extras/forms/reports.py | 4 ++-- netbox/extras/forms/scripts.py | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/netbox/core/choices.py b/netbox/core/choices.py index 442acc26b..6603a7d4f 100644 --- a/netbox/core/choices.py +++ b/netbox/core/choices.py @@ -81,8 +81,10 @@ class JobIntervalChoices(ChoiceSet): CHOICES = ( (INTERVAL_MINUTELY, _('Minutely')), (INTERVAL_HOURLY, _('Hourly')), + (INTERVAL_HOURLY * 12, _('12 hours')), (INTERVAL_DAILY, _('Daily')), (INTERVAL_WEEKLY, _('Weekly')), + (INTERVAL_DAILY * 30, _('30 days')), ) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 3cd7daab4..8258f4aaf 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -178,17 +178,6 @@ class LogLevelChoices(ChoiceSet): } -class DurationChoices(ChoiceSet): - - CHOICES = ( - (60, _('Hourly')), - (720, _('12 hours')), - (1440, _('Daily')), - (10080, _('Weekly')), - (43200, _('30 days')), - ) - - # # Webhooks # diff --git a/netbox/extras/forms/reports.py b/netbox/extras/forms/reports.py index 95692b3f6..72d0417f2 100644 --- a/netbox/extras/forms/reports.py +++ b/netbox/extras/forms/reports.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from extras.choices import DurationChoices +from core.choices import JobIntervalChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions from utilities.datetime import local_now @@ -22,7 +22,7 @@ class ReportForm(forms.Form): min_value=1, label=_("Recurs every"), widget=NumberWithOptions( - options=DurationChoices + options=JobIntervalChoices ), help_text=_("Interval at which this report is re-run (in minutes)") ) diff --git a/netbox/extras/forms/scripts.py b/netbox/extras/forms/scripts.py index 331f7f01f..8ac476544 100644 --- a/netbox/extras/forms/scripts.py +++ b/netbox/extras/forms/scripts.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from extras.choices import DurationChoices +from core.choices import JobIntervalChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions from utilities.datetime import local_now @@ -28,7 +28,7 @@ class ScriptForm(forms.Form): min_value=1, label=_("Recurs every"), widget=NumberWithOptions( - options=DurationChoices + options=JobIntervalChoices ), help_text=_("Interval at which this script is re-run (in minutes)") ) From c324d23634b1a2d192969996ef99f269d5baa66c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Feb 2025 05:02:03 +0000 Subject: [PATCH 166/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 106 +++++++++---------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index a6af44ae7..cab5ed729 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-12 05:01+0000\n" +"POT-Creation-Date: 2025-02-15 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" msgid "Write Enabled" msgstr "" -#: netbox/account/tables.py:35 netbox/core/choices.py:100 +#: netbox/account/tables.py:35 netbox/core/choices.py:102 #: netbox/core/tables/jobs.py:29 netbox/core/tables/tasks.py:79 #: netbox/extras/tables/tables.py:335 netbox/extras/tables/tables.py:566 #: netbox/templates/account/token.html:43 @@ -1430,7 +1430,7 @@ msgstr "" #: netbox/core/models/jobs.py:85 netbox/dcim/models/cables.py:49 #: netbox/dcim/models/device_components.py:1281 #: netbox/dcim/models/devices.py:645 netbox/dcim/models/devices.py:1177 -#: netbox/dcim/models/devices.py:1404 netbox/dcim/models/power.py:94 +#: netbox/dcim/models/devices.py:1405 netbox/dcim/models/power.py:94 #: netbox/dcim/models/racks.py:288 netbox/dcim/models/sites.py:154 #: netbox/dcim/models/sites.py:270 netbox/ipam/models/ip.py:237 #: netbox/ipam/models/ip.py:508 netbox/ipam/models/ip.py:729 @@ -1561,7 +1561,7 @@ msgstr "" #: netbox/core/models/jobs.py:46 #: netbox/dcim/models/device_component_templates.py:43 #: netbox/dcim/models/device_components.py:52 netbox/dcim/models/devices.py:589 -#: netbox/dcim/models/devices.py:1336 netbox/dcim/models/devices.py:1399 +#: netbox/dcim/models/devices.py:1337 netbox/dcim/models/devices.py:1400 #: netbox/dcim/models/power.py:38 netbox/dcim/models/power.py:89 #: netbox/dcim/models/racks.py:257 netbox/dcim/models/sites.py:142 #: netbox/extras/models/configs.py:36 netbox/extras/models/configs.py:215 @@ -2046,24 +2046,32 @@ msgstr "" msgid "Minutely" msgstr "" -#: netbox/core/choices.py:83 netbox/extras/choices.py:184 +#: netbox/core/choices.py:83 msgid "Hourly" msgstr "" -#: netbox/core/choices.py:84 netbox/extras/choices.py:186 +#: netbox/core/choices.py:84 +msgid "12 hours" +msgstr "" + +#: netbox/core/choices.py:85 msgid "Daily" msgstr "" -#: netbox/core/choices.py:85 netbox/extras/choices.py:187 +#: netbox/core/choices.py:86 msgid "Weekly" msgstr "" -#: netbox/core/choices.py:101 netbox/core/tables/plugins.py:63 +#: netbox/core/choices.py:87 +msgid "30 days" +msgstr "" + +#: netbox/core/choices.py:103 netbox/core/tables/plugins.py:63 #: netbox/templates/generic/object.html:61 msgid "Updated" msgstr "" -#: netbox/core/choices.py:102 +#: netbox/core/choices.py:104 msgid "Deleted" msgstr "" @@ -3531,7 +3539,7 @@ msgstr "" #: netbox/dcim/filtersets.py:1104 netbox/dcim/forms/filtersets.py:819 #: netbox/dcim/forms/filtersets.py:1390 netbox/dcim/forms/filtersets.py:1586 #: netbox/dcim/forms/filtersets.py:1591 netbox/dcim/forms/model_forms.py:1762 -#: netbox/dcim/models/devices.py:1500 netbox/dcim/models/devices.py:1521 +#: netbox/dcim/models/devices.py:1501 netbox/dcim/models/devices.py:1522 #: netbox/virtualization/filtersets.py:196 #: netbox/virtualization/filtersets.py:268 #: netbox/virtualization/forms/filtersets.py:177 @@ -6370,12 +6378,12 @@ msgstr "" msgid "rack face" msgstr "" -#: netbox/dcim/models/devices.py:663 netbox/dcim/models/devices.py:1420 +#: netbox/dcim/models/devices.py:663 netbox/dcim/models/devices.py:1421 #: netbox/virtualization/models/virtualmachines.py:95 msgid "primary IPv4" msgstr "" -#: netbox/dcim/models/devices.py:671 netbox/dcim/models/devices.py:1428 +#: netbox/dcim/models/devices.py:671 netbox/dcim/models/devices.py:1429 #: netbox/virtualization/models/virtualmachines.py:103 msgid "primary IPv6" msgstr "" @@ -6538,68 +6546,68 @@ msgid "" "device ({device})." msgstr "" -#: netbox/dcim/models/devices.py:1341 +#: netbox/dcim/models/devices.py:1342 msgid "domain" msgstr "" -#: netbox/dcim/models/devices.py:1354 netbox/dcim/models/devices.py:1355 +#: netbox/dcim/models/devices.py:1355 netbox/dcim/models/devices.py:1356 msgid "virtual chassis" msgstr "" -#: netbox/dcim/models/devices.py:1367 +#: netbox/dcim/models/devices.py:1368 #, python-brace-format msgid "The selected master ({master}) is not assigned to this virtual chassis." msgstr "" -#: netbox/dcim/models/devices.py:1383 +#: netbox/dcim/models/devices.py:1384 #, python-brace-format msgid "" "Unable to delete virtual chassis {self}. There are member interfaces which " "form a cross-chassis LAG interfaces." msgstr "" -#: netbox/dcim/models/devices.py:1409 netbox/vpn/models/l2vpn.py:37 +#: netbox/dcim/models/devices.py:1410 netbox/vpn/models/l2vpn.py:37 msgid "identifier" msgstr "" -#: netbox/dcim/models/devices.py:1410 +#: netbox/dcim/models/devices.py:1411 msgid "Numeric identifier unique to the parent device" msgstr "" -#: netbox/dcim/models/devices.py:1438 netbox/extras/models/customfields.py:225 +#: netbox/dcim/models/devices.py:1439 netbox/extras/models/customfields.py:225 #: netbox/extras/models/models.py:107 netbox/extras/models/models.py:694 #: netbox/netbox/models/__init__.py:119 msgid "comments" msgstr "" -#: netbox/dcim/models/devices.py:1454 +#: netbox/dcim/models/devices.py:1455 msgid "virtual device context" msgstr "" -#: netbox/dcim/models/devices.py:1455 +#: netbox/dcim/models/devices.py:1456 msgid "virtual device contexts" msgstr "" -#: netbox/dcim/models/devices.py:1484 +#: netbox/dcim/models/devices.py:1485 #, python-brace-format msgid "{ip} is not an IPv{family} address." msgstr "" -#: netbox/dcim/models/devices.py:1490 +#: netbox/dcim/models/devices.py:1491 msgid "Primary IP address must belong to an interface on the assigned device." msgstr "" -#: netbox/dcim/models/devices.py:1522 +#: netbox/dcim/models/devices.py:1523 msgid "MAC addresses" msgstr "" -#: netbox/dcim/models/devices.py:1551 +#: netbox/dcim/models/devices.py:1552 msgid "" "Cannot unassign MAC Address while it is designated as the primary MAC for an " "object" msgstr "" -#: netbox/dcim/models/devices.py:1555 +#: netbox/dcim/models/devices.py:1556 msgid "" "Cannot reassign MAC Address while it is designated as the primary MAC for an " "object" @@ -7560,15 +7568,7 @@ msgstr "" msgid "Failure" msgstr "" -#: netbox/extras/choices.py:185 -msgid "12 hours" -msgstr "" - -#: netbox/extras/choices.py:188 -msgid "30 days" -msgstr "" - -#: netbox/extras/choices.py:224 +#: netbox/extras/choices.py:213 #: netbox/templates/dcim/virtualchassis_edit.html:107 #: netbox/templates/generic/bulk_add_component.html:68 #: netbox/templates/generic/object_edit.html:47 @@ -7578,11 +7578,11 @@ msgstr "" msgid "Create" msgstr "" -#: netbox/extras/choices.py:225 +#: netbox/extras/choices.py:214 msgid "Update" msgstr "" -#: netbox/extras/choices.py:226 +#: netbox/extras/choices.py:215 #: netbox/templates/circuits/inc/circuit_termination.html:23 #: netbox/templates/dcim/inc/panels/inventory_items.html:37 #: netbox/templates/dcim/powerpanel.html:66 @@ -7597,82 +7597,82 @@ msgstr "" msgid "Delete" msgstr "" -#: netbox/extras/choices.py:250 netbox/netbox/choices.py:59 +#: netbox/extras/choices.py:239 netbox/netbox/choices.py:59 #: netbox/netbox/choices.py:104 msgid "Blue" msgstr "" -#: netbox/extras/choices.py:251 netbox/netbox/choices.py:58 +#: netbox/extras/choices.py:240 netbox/netbox/choices.py:58 #: netbox/netbox/choices.py:105 msgid "Indigo" msgstr "" -#: netbox/extras/choices.py:252 netbox/netbox/choices.py:56 +#: netbox/extras/choices.py:241 netbox/netbox/choices.py:56 #: netbox/netbox/choices.py:106 msgid "Purple" msgstr "" -#: netbox/extras/choices.py:253 netbox/netbox/choices.py:53 +#: netbox/extras/choices.py:242 netbox/netbox/choices.py:53 #: netbox/netbox/choices.py:107 msgid "Pink" msgstr "" -#: netbox/extras/choices.py:254 netbox/netbox/choices.py:52 +#: netbox/extras/choices.py:243 netbox/netbox/choices.py:52 #: netbox/netbox/choices.py:108 msgid "Red" msgstr "" -#: netbox/extras/choices.py:255 netbox/netbox/choices.py:70 +#: netbox/extras/choices.py:244 netbox/netbox/choices.py:70 #: netbox/netbox/choices.py:109 msgid "Orange" msgstr "" -#: netbox/extras/choices.py:256 netbox/netbox/choices.py:68 +#: netbox/extras/choices.py:245 netbox/netbox/choices.py:68 #: netbox/netbox/choices.py:110 msgid "Yellow" msgstr "" -#: netbox/extras/choices.py:257 netbox/netbox/choices.py:65 +#: netbox/extras/choices.py:246 netbox/netbox/choices.py:65 #: netbox/netbox/choices.py:111 msgid "Green" msgstr "" -#: netbox/extras/choices.py:258 netbox/netbox/choices.py:62 +#: netbox/extras/choices.py:247 netbox/netbox/choices.py:62 #: netbox/netbox/choices.py:112 msgid "Teal" msgstr "" -#: netbox/extras/choices.py:259 netbox/netbox/choices.py:61 +#: netbox/extras/choices.py:248 netbox/netbox/choices.py:61 #: netbox/netbox/choices.py:113 msgid "Cyan" msgstr "" -#: netbox/extras/choices.py:260 netbox/netbox/choices.py:114 +#: netbox/extras/choices.py:249 netbox/netbox/choices.py:114 msgid "Gray" msgstr "" -#: netbox/extras/choices.py:261 netbox/netbox/choices.py:76 +#: netbox/extras/choices.py:250 netbox/netbox/choices.py:76 #: netbox/netbox/choices.py:115 msgid "Black" msgstr "" -#: netbox/extras/choices.py:262 netbox/netbox/choices.py:77 +#: netbox/extras/choices.py:251 netbox/netbox/choices.py:77 #: netbox/netbox/choices.py:116 msgid "White" msgstr "" -#: netbox/extras/choices.py:277 netbox/extras/forms/model_forms.py:353 +#: netbox/extras/choices.py:266 netbox/extras/forms/model_forms.py:353 #: netbox/extras/forms/model_forms.py:430 #: netbox/templates/extras/webhook.html:10 msgid "Webhook" msgstr "" -#: netbox/extras/choices.py:278 netbox/extras/forms/model_forms.py:418 +#: netbox/extras/choices.py:267 netbox/extras/forms/model_forms.py:418 #: netbox/templates/extras/script/base.html:29 msgid "Script" msgstr "" -#: netbox/extras/choices.py:279 +#: netbox/extras/choices.py:268 msgid "Notification" msgstr "" From 11514bfb219501dadd9ae1448a76247f65f2a63b Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Date: Tue, 18 Feb 2025 10:41:12 -0300 Subject: [PATCH 167/190] Fixes: #18584 Add rack types column to manufacturers table (#18636) * Add racktype_count annotation to list view queryset, create the LinkedCountColumn in ManufacturerTable * Add Manufacturer field to RackTypeFilterForm --- netbox/dcim/forms/filtersets.py | 2 +- netbox/dcim/tables/devicetypes.py | 13 +++++++++---- netbox/dcim/views.py | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/forms/filtersets.py b/netbox/dcim/forms/filtersets.py index 37b8afd17..4dbceb4f5 100644 --- a/netbox/dcim/forms/filtersets.py +++ b/netbox/dcim/forms/filtersets.py @@ -303,7 +303,7 @@ class RackTypeFilterForm(RackBaseFilterForm): model = RackType fieldsets = ( FieldSet('q', 'filter_id', 'tag'), - FieldSet('form_factor', 'width', 'u_height', name=_('Rack Type')), + FieldSet('manufacturer_id', 'form_factor', 'width', 'u_height', name=_('Rack Type')), FieldSet('starting_unit', 'desc_units', name=_('Numbering')), FieldSet('weight', 'max_weight', 'weight_unit', name=_('Weight')), ) diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index a7f8f08e8..91f9f3b47 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -31,6 +31,11 @@ class ManufacturerTable(ContactsColumnMixin, NetBoxTable): verbose_name=_('Name'), linkify=True ) + racktype_count = columns.LinkedCountColumn( + viewname='dcim:racktype_list', + url_params={'manufacturer_id': 'pk'}, + verbose_name=_('Rack Types') + ) devicetype_count = columns.LinkedCountColumn( viewname='dcim:devicetype_list', url_params={'manufacturer_id': 'pk'}, @@ -58,12 +63,12 @@ class ManufacturerTable(ContactsColumnMixin, NetBoxTable): class Meta(NetBoxTable.Meta): model = models.Manufacturer fields = ( - 'pk', 'id', 'name', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', 'platform_count', - 'description', 'slug', 'tags', 'contacts', 'actions', 'created', 'last_updated', + 'pk', 'id', 'name', 'racktype_count', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', + 'platform_count', 'description', 'slug', 'tags', 'contacts', 'actions', 'created', 'last_updated', ) default_columns = ( - 'pk', 'name', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', 'platform_count', - 'description', 'slug', + 'pk', 'name', 'racktype_count', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', + 'platform_count', 'description', 'slug', ) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 6efdb63f0..583b89f1a 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -964,6 +964,7 @@ class RackReservationBulkDeleteView(generic.BulkDeleteView): @register_model_view(Manufacturer, 'list', path='', detail=False) class ManufacturerListView(generic.ObjectListView): queryset = Manufacturer.objects.annotate( + racktype_count=count_related(RackType, 'manufacturer'), devicetype_count=count_related(DeviceType, 'manufacturer'), moduletype_count=count_related(ModuleType, 'manufacturer'), inventoryitem_count=count_related(InventoryItem, 'manufacturer'), From 6c6cb321bf60a03ff23ec2db2f6fcdc4e354098d Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Tue, 18 Feb 2025 15:11:32 +0100 Subject: [PATCH 168/190] Fixes 18555: Fix model URL generator for plugins (#18607) * Fix model URL generator for plugins * Fix reverse accessor warning * Revert "Fix reverse accessor warning" This reverts commit f07642bb997910205d0acc09fc8df3dde30c7981. * Add URL test case for regular models * Split dummy models Instead of using a single model for testing, one is used for testing the plugin API and a dedicated one is used for testing the NetBox plugin model features. * Fix filterset test case error * Rename test module --------- Co-authored-by: Jeremy Stretch --- netbox/extras/tests/test_filtersets.py | 1 + netbox/netbox/models/__init__.py | 3 +- .../migrations/0002_dummynetboxmodel.py | 30 +++++++++++++++++++ netbox/netbox/tests/dummy_plugin/models.py | 6 ++++ netbox/netbox/tests/dummy_plugin/urls.py | 2 ++ netbox/netbox/tests/dummy_plugin/views.py | 19 +++++++++++- netbox/netbox/tests/test_models.py | 23 ++++++++++++++ 7 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 netbox/netbox/tests/dummy_plugin/migrations/0002_dummynetboxmodel.py create mode 100644 netbox/netbox/tests/test_models.py diff --git a/netbox/extras/tests/test_filtersets.py b/netbox/extras/tests/test_filtersets.py index cf914e665..03d8508af 100644 --- a/netbox/extras/tests/test_filtersets.py +++ b/netbox/extras/tests/test_filtersets.py @@ -1118,6 +1118,7 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests): 'devicerole', 'devicetype', 'dummymodel', # From dummy_plugin + 'dummynetboxmodel', # From dummy_plugin 'eventrule', 'fhrpgroup', 'frontport', diff --git a/netbox/netbox/models/__init__.py b/netbox/netbox/models/__init__.py index b1f7cfd48..ca79d5e7e 100644 --- a/netbox/netbox/models/__init__.py +++ b/netbox/netbox/models/__init__.py @@ -10,6 +10,7 @@ from mptt.models import MPTTModel, TreeForeignKey from netbox.models.features import * from utilities.mptt import TreeManager from utilities.querysets import RestrictedQuerySet +from utilities.views import get_viewname __all__ = ( @@ -42,7 +43,7 @@ class NetBoxFeatureSet( return f'{settings.STATIC_URL}docs/models/{self._meta.app_label}/{self._meta.model_name}/' def get_absolute_url(self): - return reverse(f'{self._meta.app_label}:{self._meta.model_name}', args=[self.pk]) + return reverse(get_viewname(self), args=[self.pk]) # diff --git a/netbox/netbox/tests/dummy_plugin/migrations/0002_dummynetboxmodel.py b/netbox/netbox/tests/dummy_plugin/migrations/0002_dummynetboxmodel.py new file mode 100644 index 000000000..517178bd9 --- /dev/null +++ b/netbox/netbox/tests/dummy_plugin/migrations/0002_dummynetboxmodel.py @@ -0,0 +1,30 @@ +import taggit.managers +import utilities.json +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dummy_plugin', '0001_initial'), + ('extras', '0122_charfield_null_choices'), + ] + + operations = [ + migrations.CreateModel( + name='DummyNetBoxModel', + 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), + ), + ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/netbox/netbox/tests/dummy_plugin/models.py b/netbox/netbox/tests/dummy_plugin/models.py index 9bd39a46b..ed4522c65 100644 --- a/netbox/netbox/tests/dummy_plugin/models.py +++ b/netbox/netbox/tests/dummy_plugin/models.py @@ -1,5 +1,7 @@ from django.db import models +from netbox.models import NetBoxModel + class DummyModel(models.Model): name = models.CharField( @@ -11,3 +13,7 @@ class DummyModel(models.Model): class Meta: ordering = ['name'] + + +class DummyNetBoxModel(NetBoxModel): + pass diff --git a/netbox/netbox/tests/dummy_plugin/urls.py b/netbox/netbox/tests/dummy_plugin/urls.py index 9e383ffe2..6cdd48f7e 100644 --- a/netbox/netbox/tests/dummy_plugin/urls.py +++ b/netbox/netbox/tests/dummy_plugin/urls.py @@ -6,4 +6,6 @@ from . import views urlpatterns = ( path('models/', views.DummyModelsView.as_view(), name='dummy_model_list'), path('models/add/', views.DummyModelAddView.as_view(), name='dummy_model_add'), + + path('netboxmodel//', views.DummyNetBoxModelView.as_view(), name='dummynetboxmodel'), ) diff --git a/netbox/netbox/tests/dummy_plugin/views.py b/netbox/netbox/tests/dummy_plugin/views.py index 82f250fc1..3aac26cf3 100644 --- a/netbox/netbox/tests/dummy_plugin/views.py +++ b/netbox/netbox/tests/dummy_plugin/views.py @@ -5,12 +5,17 @@ from django.http import HttpResponse from django.views.generic import View from dcim.models import Site +from netbox.views import generic from utilities.views import register_model_view -from .models import DummyModel +from .models import DummyModel, DummyNetBoxModel # Trigger registration of custom column from .tables import mycol # noqa: F401 +# +# DummyModel +# + class DummyModelsView(View): def get(self, request): @@ -32,6 +37,18 @@ class DummyModelAddView(View): return HttpResponse("Instance created") +# +# DummyNetBoxModel +# + +class DummyNetBoxModelView(generic.ObjectView): + queryset = DummyNetBoxModel.objects.all() + + +# +# API +# + @register_model_view(Site, 'extra', path='other-stuff') class ExtraCoreModelView(View): diff --git a/netbox/netbox/tests/test_models.py b/netbox/netbox/tests/test_models.py new file mode 100644 index 000000000..3da4144c2 --- /dev/null +++ b/netbox/netbox/tests/test_models.py @@ -0,0 +1,23 @@ +from unittest import skipIf + +from django.conf import settings +from django.test import TestCase + +from core.models import ObjectChange +from netbox.tests.dummy_plugin.models import DummyNetBoxModel + + +class ModelTest(TestCase): + + def test_get_absolute_url(self): + m = ObjectChange() + m.pk = 123 + + self.assertEqual(m.get_absolute_url(), f'/core/changelog/{m.pk}/') + + @skipIf('netbox.tests.dummy_plugin' not in settings.PLUGINS, "dummy_plugin not in settings.PLUGINS") + def test_get_absolute_url_plugin(self): + m = DummyNetBoxModel() + m.pk = 123 + + self.assertEqual(m.get_absolute_url(), f'/plugins/dummy-plugin/netboxmodel/{m.pk}/') From 70dddb673b82c476ec5ce09570b41baa10597aae Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Tue, 18 Feb 2025 12:33:05 -0600 Subject: [PATCH 169/190] Fixes #18585: filtering circuits by location (#18641) * Fixes #18585: filtering circuits by location This also fixes a related issue where selected filter is not shown in the filter form. Changes: - Adds `CircuitFilterSet.location_id` field to enable filtering with incoming GET params - Adds `CirciotFilterForm.location_id` field to enable filtering from list form - Adds `location_id` to the Location fieldset on `CircuitFilterForm` * Adds test for new CircuitFilterset.location_id filter --- netbox/circuits/filtersets.py | 5 +++++ netbox/circuits/forms/filtersets.py | 7 ++++++- netbox/circuits/tests/test_filtersets.py | 24 ++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/netbox/circuits/filtersets.py b/netbox/circuits/filtersets.py index 964f69f83..188b5343e 100644 --- a/netbox/circuits/filtersets.py +++ b/netbox/circuits/filtersets.py @@ -234,6 +234,11 @@ class CircuitFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilte to_field_name='slug', label=_('Site (slug)'), ) + location_id = django_filters.ModelMultipleChoiceFilter( + field_name='terminations___location', + label=_('Location (ID)'), + queryset=Location.objects.all(), + ) termination_a_id = django_filters.ModelMultipleChoiceFilter( queryset=CircuitTermination.objects.all(), label=_('Termination A (ID)'), diff --git a/netbox/circuits/forms/filtersets.py b/netbox/circuits/forms/filtersets.py index aefc62655..297af5e71 100644 --- a/netbox/circuits/forms/filtersets.py +++ b/netbox/circuits/forms/filtersets.py @@ -126,7 +126,7 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi 'type_id', 'status', 'install_date', 'termination_date', 'commit_rate', 'distance', 'distance_unit', name=_('Attributes') ), - FieldSet('region_id', 'site_group_id', 'site_id', name=_('Location')), + FieldSet('region_id', 'site_group_id', 'site_id', 'location_id', name=_('Location')), FieldSet('tenant_group_id', 'tenant_id', name=_('Tenant')), FieldSet('contact', 'contact_role', 'contact_group', name=_('Contacts')), ) @@ -181,6 +181,11 @@ class CircuitFilterForm(TenancyFilterForm, ContactModelFilterForm, NetBoxModelFi }, label=_('Site') ) + location_id = DynamicModelMultipleChoiceField( + queryset=Location.objects.all(), + required=False, + label=_('Location') + ) install_date = forms.DateField( label=_('Install date'), required=False, diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py index b32abd34e..91077ee64 100644 --- a/netbox/circuits/tests/test_filtersets.py +++ b/netbox/circuits/tests/test_filtersets.py @@ -3,8 +3,10 @@ from django.test import TestCase from circuits.choices import * from circuits.filtersets import * from circuits.models import * -from dcim.choices import InterfaceTypeChoices -from dcim.models import Cable, Device, DeviceRole, DeviceType, Interface, Manufacturer, Region, Site, SiteGroup +from dcim.choices import InterfaceTypeChoices, LocationStatusChoices +from dcim.models import ( + Cable, Device, DeviceRole, DeviceType, Interface, Location, Manufacturer, Region, Site, SiteGroup +) from ipam.models import ASN, RIR from netbox.choices import DistanceUnitChoices from tenancy.models import Tenant, TenantGroup @@ -225,6 +227,17 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): ) ProviderNetwork.objects.bulk_create(provider_networks) + locations = ( + Location.objects.create( + site=sites[0], name='Test Location 1', slug='test-location-1', + status=LocationStatusChoices.STATUS_ACTIVE, + ), + Location.objects.create( + site=sites[1], name='Test Location 2', slug='test-location-2', + status=LocationStatusChoices.STATUS_ACTIVE, + ), + ) + circuits = ( Circuit( provider=providers[0], @@ -305,7 +318,9 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): circuit_terminations = (( CircuitTermination(circuit=circuits[0], termination=sites[0], term_side='A'), + CircuitTermination(circuit=circuits[0], termination=locations[0], term_side='Z'), CircuitTermination(circuit=circuits[1], termination=sites[1], term_side='A'), + CircuitTermination(circuit=circuits[1], termination=locations[1], term_side='Z'), CircuitTermination(circuit=circuits[2], termination=sites[2], term_side='A'), CircuitTermination(circuit=circuits[3], termination=provider_networks[0], term_side='A'), CircuitTermination(circuit=circuits[4], termination=provider_networks[1], term_side='A'), @@ -395,6 +410,11 @@ class CircuitTestCase(TestCase, ChangeLoggedFilterSetTests): params = {'site': [sites[0].slug, sites[1].slug]} self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_location(self): + location_ids = Location.objects.values_list('id', flat=True)[:2] + params = {'location_id': location_ids} + self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2) + def test_tenant(self): tenants = Tenant.objects.all()[:2] params = {'tenant_id': [tenants[0].pk, tenants[1].pk]} From 57ef44706a7cfb1abb3aac1f49206ae216f2bba8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 05:02:03 +0000 Subject: [PATCH 170/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 287 ++++++++++--------- 1 file changed, 145 insertions(+), 142 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index cab5ed729..55d263183 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-15 05:01+0000\n" +"POT-Creation-Date: 2025-02-19 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -158,7 +158,7 @@ msgid "Spoke" msgstr "" #: netbox/circuits/filtersets.py:37 netbox/circuits/filtersets.py:204 -#: netbox/circuits/filtersets.py:279 netbox/dcim/base_filtersets.py:22 +#: netbox/circuits/filtersets.py:284 netbox/dcim/base_filtersets.py:22 #: netbox/dcim/filtersets.py:99 netbox/dcim/filtersets.py:153 #: netbox/dcim/filtersets.py:213 netbox/dcim/filtersets.py:334 #: netbox/dcim/filtersets.py:465 netbox/dcim/filtersets.py:1022 @@ -170,7 +170,7 @@ msgid "Region (ID)" msgstr "" #: netbox/circuits/filtersets.py:44 netbox/circuits/filtersets.py:211 -#: netbox/circuits/filtersets.py:286 netbox/dcim/base_filtersets.py:29 +#: netbox/circuits/filtersets.py:291 netbox/dcim/base_filtersets.py:29 #: netbox/dcim/filtersets.py:106 netbox/dcim/filtersets.py:159 #: netbox/dcim/filtersets.py:220 netbox/dcim/filtersets.py:341 #: netbox/dcim/filtersets.py:472 netbox/dcim/filtersets.py:1029 @@ -182,7 +182,7 @@ msgid "Region (slug)" msgstr "" #: netbox/circuits/filtersets.py:50 netbox/circuits/filtersets.py:217 -#: netbox/circuits/filtersets.py:292 netbox/dcim/base_filtersets.py:35 +#: netbox/circuits/filtersets.py:297 netbox/dcim/base_filtersets.py:35 #: netbox/dcim/filtersets.py:129 netbox/dcim/filtersets.py:226 #: netbox/dcim/filtersets.py:347 netbox/dcim/filtersets.py:478 #: netbox/dcim/filtersets.py:1035 netbox/dcim/filtersets.py:1382 @@ -193,7 +193,7 @@ msgid "Site group (ID)" msgstr "" #: netbox/circuits/filtersets.py:57 netbox/circuits/filtersets.py:224 -#: netbox/circuits/filtersets.py:299 netbox/dcim/base_filtersets.py:42 +#: netbox/circuits/filtersets.py:304 netbox/dcim/base_filtersets.py:42 #: netbox/dcim/filtersets.py:136 netbox/dcim/filtersets.py:233 #: netbox/dcim/filtersets.py:354 netbox/dcim/filtersets.py:485 #: netbox/dcim/filtersets.py:1042 netbox/dcim/filtersets.py:1389 @@ -205,7 +205,7 @@ msgstr "" #: netbox/circuits/filtersets.py:62 netbox/circuits/forms/filtersets.py:59 #: netbox/circuits/forms/filtersets.py:182 -#: netbox/circuits/forms/filtersets.py:235 +#: netbox/circuits/forms/filtersets.py:240 #: netbox/circuits/tables/circuits.py:129 netbox/dcim/forms/bulk_edit.py:172 #: netbox/dcim/forms/bulk_edit.py:333 netbox/dcim/forms/bulk_edit.py:686 #: netbox/dcim/forms/bulk_edit.py:891 netbox/dcim/forms/bulk_import.py:133 @@ -252,7 +252,7 @@ msgid "Site" msgstr "" #: netbox/circuits/filtersets.py:68 netbox/circuits/filtersets.py:235 -#: netbox/circuits/filtersets.py:310 netbox/dcim/base_filtersets.py:53 +#: netbox/circuits/filtersets.py:315 netbox/dcim/base_filtersets.py:53 #: netbox/dcim/filtersets.py:243 netbox/dcim/filtersets.py:364 #: netbox/dcim/filtersets.py:459 netbox/extras/filtersets.py:531 #: netbox/ipam/filtersets.py:243 netbox/ipam/filtersets.py:958 @@ -272,31 +272,31 @@ msgid "ASN" msgstr "" #: netbox/circuits/filtersets.py:101 netbox/circuits/filtersets.py:128 -#: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:333 -#: netbox/circuits/filtersets.py:401 netbox/circuits/filtersets.py:477 -#: netbox/circuits/filtersets.py:545 netbox/ipam/filtersets.py:248 +#: netbox/circuits/filtersets.py:162 netbox/circuits/filtersets.py:338 +#: netbox/circuits/filtersets.py:406 netbox/circuits/filtersets.py:482 +#: netbox/circuits/filtersets.py:550 netbox/ipam/filtersets.py:248 msgid "Provider (ID)" msgstr "" #: netbox/circuits/filtersets.py:107 netbox/circuits/filtersets.py:134 -#: netbox/circuits/filtersets.py:168 netbox/circuits/filtersets.py:339 -#: netbox/circuits/filtersets.py:483 netbox/circuits/filtersets.py:551 +#: netbox/circuits/filtersets.py:168 netbox/circuits/filtersets.py:344 +#: netbox/circuits/filtersets.py:488 netbox/circuits/filtersets.py:556 #: netbox/ipam/filtersets.py:254 msgid "Provider (slug)" msgstr "" -#: netbox/circuits/filtersets.py:173 netbox/circuits/filtersets.py:488 -#: netbox/circuits/filtersets.py:556 +#: netbox/circuits/filtersets.py:173 netbox/circuits/filtersets.py:493 +#: netbox/circuits/filtersets.py:561 msgid "Provider account (ID)" msgstr "" -#: netbox/circuits/filtersets.py:179 netbox/circuits/filtersets.py:494 -#: netbox/circuits/filtersets.py:562 +#: netbox/circuits/filtersets.py:179 netbox/circuits/filtersets.py:499 +#: netbox/circuits/filtersets.py:567 msgid "Provider account (account)" msgstr "" -#: netbox/circuits/filtersets.py:184 netbox/circuits/filtersets.py:498 -#: netbox/circuits/filtersets.py:567 +#: netbox/circuits/filtersets.py:184 netbox/circuits/filtersets.py:503 +#: netbox/circuits/filtersets.py:572 msgid "Provider network (ID)" msgstr "" @@ -308,7 +308,7 @@ msgstr "" msgid "Circuit type (slug)" msgstr "" -#: netbox/circuits/filtersets.py:229 netbox/circuits/filtersets.py:304 +#: netbox/circuits/filtersets.py:229 netbox/circuits/filtersets.py:309 #: netbox/dcim/base_filtersets.py:47 netbox/dcim/filtersets.py:237 #: netbox/dcim/filtersets.py:358 netbox/dcim/filtersets.py:453 #: netbox/dcim/filtersets.py:1046 netbox/dcim/filtersets.py:1394 @@ -319,12 +319,20 @@ msgstr "" msgid "Site (ID)" msgstr "" -#: netbox/circuits/filtersets.py:239 netbox/circuits/filtersets.py:243 +#: netbox/circuits/filtersets.py:239 netbox/circuits/filtersets.py:321 +#: netbox/dcim/base_filtersets.py:59 netbox/dcim/filtersets.py:259 +#: netbox/dcim/filtersets.py:370 netbox/dcim/filtersets.py:491 +#: netbox/dcim/filtersets.py:1058 netbox/dcim/filtersets.py:1405 +#: netbox/dcim/filtersets.py:2305 +msgid "Location (ID)" +msgstr "" + +#: netbox/circuits/filtersets.py:244 netbox/circuits/filtersets.py:248 msgid "Termination A (ID)" msgstr "" -#: netbox/circuits/filtersets.py:268 netbox/circuits/filtersets.py:370 -#: netbox/circuits/filtersets.py:532 netbox/core/filtersets.py:77 +#: netbox/circuits/filtersets.py:273 netbox/circuits/filtersets.py:375 +#: netbox/circuits/filtersets.py:537 netbox/core/filtersets.py:77 #: netbox/core/filtersets.py:136 netbox/core/filtersets.py:173 #: netbox/dcim/filtersets.py:752 netbox/dcim/filtersets.py:1363 #: netbox/dcim/filtersets.py:2400 netbox/extras/filtersets.py:41 @@ -348,12 +356,12 @@ msgstr "" msgid "Search" msgstr "" -#: netbox/circuits/filtersets.py:272 netbox/circuits/forms/bulk_edit.py:195 +#: netbox/circuits/filtersets.py:277 netbox/circuits/forms/bulk_edit.py:195 #: netbox/circuits/forms/bulk_edit.py:284 #: netbox/circuits/forms/bulk_import.py:128 -#: netbox/circuits/forms/filtersets.py:218 -#: netbox/circuits/forms/filtersets.py:245 -#: netbox/circuits/forms/filtersets.py:291 +#: netbox/circuits/forms/filtersets.py:223 +#: netbox/circuits/forms/filtersets.py:250 +#: netbox/circuits/forms/filtersets.py:296 #: netbox/circuits/forms/model_forms.py:139 #: netbox/circuits/forms/model_forms.py:162 #: netbox/circuits/forms/model_forms.py:262 @@ -367,64 +375,57 @@ msgstr "" msgid "Circuit" msgstr "" -#: netbox/circuits/filtersets.py:316 netbox/dcim/base_filtersets.py:59 -#: netbox/dcim/filtersets.py:259 netbox/dcim/filtersets.py:370 -#: netbox/dcim/filtersets.py:491 netbox/dcim/filtersets.py:1058 -#: netbox/dcim/filtersets.py:1405 netbox/dcim/filtersets.py:2305 -msgid "Location (ID)" -msgstr "" - -#: netbox/circuits/filtersets.py:323 netbox/dcim/base_filtersets.py:66 +#: netbox/circuits/filtersets.py:328 netbox/dcim/base_filtersets.py:66 #: netbox/dcim/filtersets.py:266 netbox/dcim/filtersets.py:377 #: netbox/dcim/filtersets.py:498 netbox/dcim/filtersets.py:1411 #: netbox/extras/filtersets.py:542 msgid "Location (slug)" msgstr "" -#: netbox/circuits/filtersets.py:328 +#: netbox/circuits/filtersets.py:333 msgid "ProviderNetwork (ID)" msgstr "" -#: netbox/circuits/filtersets.py:376 +#: netbox/circuits/filtersets.py:381 msgid "Circuit (CID)" msgstr "" -#: netbox/circuits/filtersets.py:381 +#: netbox/circuits/filtersets.py:386 msgid "Circuit (ID)" msgstr "" -#: netbox/circuits/filtersets.py:386 +#: netbox/circuits/filtersets.py:391 msgid "Virtual circuit (CID)" msgstr "" -#: netbox/circuits/filtersets.py:391 netbox/dcim/filtersets.py:1848 +#: netbox/circuits/filtersets.py:396 netbox/dcim/filtersets.py:1848 msgid "Virtual circuit (ID)" msgstr "" -#: netbox/circuits/filtersets.py:396 +#: netbox/circuits/filtersets.py:401 msgid "Provider (name)" msgstr "" -#: netbox/circuits/filtersets.py:405 +#: netbox/circuits/filtersets.py:410 msgid "Circuit group (ID)" msgstr "" -#: netbox/circuits/filtersets.py:411 +#: netbox/circuits/filtersets.py:416 msgid "Circuit group (slug)" msgstr "" -#: netbox/circuits/filtersets.py:502 +#: netbox/circuits/filtersets.py:507 msgid "Virtual circuit type (ID)" msgstr "" -#: netbox/circuits/filtersets.py:508 +#: netbox/circuits/filtersets.py:513 msgid "Virtual circuit type (slug)" msgstr "" -#: netbox/circuits/filtersets.py:536 netbox/circuits/forms/bulk_edit.py:355 +#: netbox/circuits/filtersets.py:541 netbox/circuits/forms/bulk_edit.py:355 #: netbox/circuits/forms/bulk_import.py:249 -#: netbox/circuits/forms/filtersets.py:367 -#: netbox/circuits/forms/filtersets.py:373 +#: netbox/circuits/forms/filtersets.py:372 +#: netbox/circuits/forms/filtersets.py:378 #: netbox/circuits/forms/model_forms.py:343 #: netbox/circuits/forms/model_forms.py:358 #: netbox/circuits/tables/virtual_circuits.py:88 @@ -433,7 +434,7 @@ msgstr "" msgid "Virtual circuit" msgstr "" -#: netbox/circuits/filtersets.py:572 netbox/dcim/filtersets.py:1268 +#: netbox/circuits/filtersets.py:577 netbox/dcim/filtersets.py:1268 #: netbox/dcim/filtersets.py:1633 netbox/ipam/filtersets.py:601 #: netbox/vpn/filtersets.py:102 netbox/vpn/filtersets.py:401 msgid "Interface (ID)" @@ -600,13 +601,13 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:96 #: netbox/circuits/forms/filtersets.py:124 #: netbox/circuits/forms/filtersets.py:142 -#: netbox/circuits/forms/filtersets.py:219 -#: netbox/circuits/forms/filtersets.py:263 -#: netbox/circuits/forms/filtersets.py:286 -#: netbox/circuits/forms/filtersets.py:324 -#: netbox/circuits/forms/filtersets.py:332 -#: netbox/circuits/forms/filtersets.py:368 -#: netbox/circuits/forms/filtersets.py:391 +#: netbox/circuits/forms/filtersets.py:224 +#: netbox/circuits/forms/filtersets.py:268 +#: netbox/circuits/forms/filtersets.py:291 +#: netbox/circuits/forms/filtersets.py:329 +#: netbox/circuits/forms/filtersets.py:337 +#: netbox/circuits/forms/filtersets.py:373 +#: netbox/circuits/forms/filtersets.py:396 #: netbox/circuits/forms/model_forms.py:60 #: netbox/circuits/forms/model_forms.py:76 #: netbox/circuits/forms/model_forms.py:110 @@ -637,14 +638,14 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:112 #: netbox/circuits/forms/bulk_edit.py:303 #: netbox/circuits/forms/filtersets.py:115 -#: netbox/circuits/forms/filtersets.py:315 netbox/dcim/forms/bulk_edit.py:210 +#: netbox/circuits/forms/filtersets.py:320 netbox/dcim/forms/bulk_edit.py:210 #: netbox/dcim/forms/bulk_edit.py:613 netbox/dcim/forms/bulk_edit.py:822 #: netbox/dcim/forms/bulk_edit.py:1191 netbox/dcim/forms/bulk_edit.py:1218 #: netbox/dcim/forms/bulk_edit.py:1740 netbox/dcim/forms/filtersets.py:1065 #: netbox/dcim/forms/filtersets.py:1323 netbox/dcim/forms/filtersets.py:1460 #: netbox/dcim/forms/filtersets.py:1484 netbox/dcim/tables/devices.py:737 #: netbox/dcim/tables/devices.py:793 netbox/dcim/tables/devices.py:1034 -#: netbox/dcim/tables/devicetypes.py:251 netbox/dcim/tables/devicetypes.py:266 +#: netbox/dcim/tables/devicetypes.py:256 netbox/dcim/tables/devicetypes.py:271 #: netbox/dcim/tables/racks.py:33 netbox/extras/forms/bulk_edit.py:270 #: netbox/extras/tables/tables.py:443 #: netbox/templates/circuits/circuittype.html:30 @@ -663,7 +664,7 @@ msgstr "" #: netbox/circuits/forms/bulk_import.py:94 #: netbox/circuits/forms/bulk_import.py:221 #: netbox/circuits/forms/filtersets.py:137 -#: netbox/circuits/forms/filtersets.py:353 +#: netbox/circuits/forms/filtersets.py:358 #: netbox/circuits/tables/circuits.py:65 netbox/circuits/tables/circuits.py:200 #: netbox/circuits/tables/virtual_circuits.py:58 #: netbox/core/forms/bulk_edit.py:18 netbox/core/forms/filtersets.py:33 @@ -725,7 +726,7 @@ msgstr "" #: netbox/circuits/forms/bulk_import.py:87 #: netbox/circuits/forms/bulk_import.py:214 #: netbox/circuits/forms/filtersets.py:150 -#: netbox/circuits/forms/filtersets.py:340 +#: netbox/circuits/forms/filtersets.py:345 #: netbox/circuits/forms/model_forms.py:116 #: netbox/circuits/forms/model_forms.py:330 #: netbox/templates/circuits/virtualcircuit.html:31 @@ -738,7 +739,7 @@ msgstr "" #: netbox/circuits/forms/bulk_import.py:100 #: netbox/circuits/forms/bulk_import.py:227 #: netbox/circuits/forms/filtersets.py:161 -#: netbox/circuits/forms/filtersets.py:356 netbox/core/forms/filtersets.py:38 +#: netbox/circuits/forms/filtersets.py:361 netbox/core/forms/filtersets.py:38 #: netbox/core/forms/filtersets.py:80 netbox/core/tables/data.py:23 #: netbox/core/tables/jobs.py:26 netbox/core/tables/tasks.py:88 #: netbox/dcim/forms/bulk_edit.py:110 netbox/dcim/forms/bulk_edit.py:185 @@ -815,8 +816,8 @@ msgstr "" #: netbox/circuits/forms/bulk_import.py:170 #: netbox/circuits/forms/bulk_import.py:232 #: netbox/circuits/forms/filtersets.py:130 -#: netbox/circuits/forms/filtersets.py:272 -#: netbox/circuits/forms/filtersets.py:326 netbox/dcim/forms/bulk_edit.py:126 +#: netbox/circuits/forms/filtersets.py:277 +#: netbox/circuits/forms/filtersets.py:331 netbox/dcim/forms/bulk_edit.py:126 #: netbox/dcim/forms/bulk_edit.py:191 netbox/dcim/forms/bulk_edit.py:350 #: netbox/dcim/forms/bulk_edit.py:470 netbox/dcim/forms/bulk_edit.py:699 #: netbox/dcim/forms/bulk_edit.py:812 netbox/dcim/forms/bulk_edit.py:1768 @@ -885,22 +886,22 @@ msgid "Tenant" msgstr "" #: netbox/circuits/forms/bulk_edit.py:159 -#: netbox/circuits/forms/filtersets.py:185 +#: netbox/circuits/forms/filtersets.py:190 msgid "Install date" msgstr "" #: netbox/circuits/forms/bulk_edit.py:164 -#: netbox/circuits/forms/filtersets.py:190 +#: netbox/circuits/forms/filtersets.py:195 msgid "Termination date" msgstr "" #: netbox/circuits/forms/bulk_edit.py:170 -#: netbox/circuits/forms/filtersets.py:197 +#: netbox/circuits/forms/filtersets.py:202 msgid "Commit rate (Kbps)" msgstr "" #: netbox/circuits/forms/bulk_edit.py:176 -#: netbox/circuits/forms/filtersets.py:203 +#: netbox/circuits/forms/filtersets.py:208 #: netbox/circuits/forms/model_forms.py:136 #: netbox/templates/circuits/circuit.html:38 #: netbox/templates/wireless/wirelesslink.html:38 @@ -913,7 +914,7 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:181 #: netbox/circuits/forms/bulk_import.py:105 #: netbox/circuits/forms/bulk_import.py:108 -#: netbox/circuits/forms/filtersets.py:207 +#: netbox/circuits/forms/filtersets.py:212 #: netbox/wireless/forms/bulk_edit.py:137 #: netbox/wireless/forms/bulk_import.py:121 #: netbox/wireless/forms/bulk_import.py:124 @@ -931,8 +932,8 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:91 #: netbox/circuits/forms/filtersets.py:110 #: netbox/circuits/forms/filtersets.py:127 -#: netbox/circuits/forms/filtersets.py:310 -#: netbox/circuits/forms/filtersets.py:325 netbox/core/forms/filtersets.py:68 +#: netbox/circuits/forms/filtersets.py:315 +#: netbox/circuits/forms/filtersets.py:330 netbox/core/forms/filtersets.py:68 #: netbox/core/forms/filtersets.py:136 netbox/dcim/forms/bulk_edit.py:846 #: netbox/dcim/forms/filtersets.py:173 netbox/dcim/forms/filtersets.py:205 #: netbox/dcim/forms/filtersets.py:916 netbox/dcim/forms/filtersets.py:1008 @@ -995,7 +996,7 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:218 #: netbox/circuits/forms/bulk_import.py:133 -#: netbox/circuits/forms/filtersets.py:220 +#: netbox/circuits/forms/filtersets.py:225 #: netbox/circuits/forms/model_forms.py:173 #: netbox/templates/circuits/inc/circuit_termination.html:6 #: netbox/templates/dcim/cable.html:68 netbox/templates/dcim/cable.html:72 @@ -1035,7 +1036,7 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:289 #: netbox/circuits/forms/bulk_import.py:188 -#: netbox/circuits/forms/filtersets.py:299 +#: netbox/circuits/forms/filtersets.py:304 #: netbox/circuits/tables/circuits.py:207 netbox/dcim/forms/model_forms.py:562 #: netbox/templates/circuits/circuitgroupassignment.html:34 #: netbox/templates/dcim/device.html:133 @@ -1049,9 +1050,9 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:321 #: netbox/circuits/forms/bulk_import.py:208 #: netbox/circuits/forms/filtersets.py:158 -#: netbox/circuits/forms/filtersets.py:258 -#: netbox/circuits/forms/filtersets.py:348 -#: netbox/circuits/forms/filtersets.py:386 +#: netbox/circuits/forms/filtersets.py:263 +#: netbox/circuits/forms/filtersets.py:353 +#: netbox/circuits/forms/filtersets.py:391 #: netbox/circuits/forms/model_forms.py:325 #: netbox/circuits/tables/virtual_circuits.py:51 #: netbox/circuits/tables/virtual_circuits.py:99 @@ -1060,7 +1061,7 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:365 #: netbox/circuits/forms/bulk_import.py:254 -#: netbox/circuits/forms/filtersets.py:376 +#: netbox/circuits/forms/filtersets.py:381 #: netbox/circuits/forms/model_forms.py:365 netbox/dcim/forms/bulk_edit.py:361 #: netbox/dcim/forms/bulk_edit.py:1280 netbox/dcim/forms/bulk_edit.py:1711 #: netbox/dcim/forms/bulk_import.py:255 netbox/dcim/forms/bulk_import.py:1106 @@ -1069,7 +1070,7 @@ msgstr "" #: netbox/dcim/forms/model_forms.py:1090 netbox/dcim/forms/model_forms.py:1559 #: netbox/dcim/forms/object_import.py:182 netbox/dcim/tables/devices.py:179 #: netbox/dcim/tables/devices.py:840 netbox/dcim/tables/devices.py:966 -#: netbox/dcim/tables/devicetypes.py:306 netbox/dcim/tables/racks.py:128 +#: netbox/dcim/tables/devicetypes.py:311 netbox/dcim/tables/racks.py:128 #: netbox/extras/filtersets.py:552 netbox/ipam/forms/bulk_edit.py:245 #: netbox/ipam/forms/bulk_edit.py:295 netbox/ipam/forms/bulk_edit.py:343 #: netbox/ipam/forms/bulk_edit.py:495 netbox/ipam/forms/bulk_import.py:193 @@ -1214,7 +1215,8 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:38 #: netbox/circuits/forms/filtersets.py:129 -#: netbox/circuits/forms/filtersets.py:240 +#: netbox/circuits/forms/filtersets.py:187 +#: netbox/circuits/forms/filtersets.py:245 #: netbox/circuits/tables/circuits.py:144 netbox/dcim/forms/bulk_edit.py:342 #: netbox/dcim/forms/bulk_edit.py:450 netbox/dcim/forms/bulk_edit.py:691 #: netbox/dcim/forms/bulk_edit.py:746 netbox/dcim/forms/bulk_edit.py:900 @@ -1270,7 +1272,7 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:45 #: netbox/circuits/forms/filtersets.py:168 -#: netbox/circuits/forms/filtersets.py:225 +#: netbox/circuits/forms/filtersets.py:230 #: netbox/circuits/tables/circuits.py:139 netbox/dcim/forms/bulk_edit.py:116 #: netbox/dcim/forms/bulk_edit.py:317 netbox/dcim/forms/bulk_edit.py:875 #: netbox/dcim/forms/bulk_import.py:95 netbox/dcim/forms/filtersets.py:74 @@ -1298,7 +1300,7 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:50 #: netbox/circuits/forms/filtersets.py:173 -#: netbox/circuits/forms/filtersets.py:230 netbox/dcim/forms/bulk_edit.py:325 +#: netbox/circuits/forms/filtersets.py:235 netbox/dcim/forms/bulk_edit.py:325 #: netbox/dcim/forms/bulk_edit.py:883 netbox/dcim/forms/filtersets.py:79 #: netbox/dcim/forms/filtersets.py:191 netbox/dcim/forms/filtersets.py:217 #: netbox/dcim/forms/filtersets.py:348 netbox/dcim/forms/filtersets.py:431 @@ -1323,11 +1325,11 @@ msgstr "" msgid "Account" msgstr "" -#: netbox/circuits/forms/filtersets.py:248 +#: netbox/circuits/forms/filtersets.py:253 msgid "Term Side" msgstr "" -#: netbox/circuits/forms/filtersets.py:281 netbox/dcim/forms/bulk_edit.py:1570 +#: netbox/circuits/forms/filtersets.py:286 netbox/dcim/forms/bulk_edit.py:1570 #: netbox/extras/forms/model_forms.py:582 netbox/ipam/forms/filtersets.py:144 #: netbox/ipam/forms/filtersets.py:598 netbox/ipam/forms/model_forms.py:329 #: netbox/templates/dcim/macaddress.html:25 @@ -1338,7 +1340,7 @@ msgstr "" msgid "Assignment" msgstr "" -#: netbox/circuits/forms/filtersets.py:296 +#: netbox/circuits/forms/filtersets.py:301 #: netbox/circuits/forms/model_forms.py:252 #: netbox/circuits/tables/circuits.py:191 netbox/dcim/forms/bulk_edit.py:121 #: netbox/dcim/forms/bulk_import.py:102 netbox/dcim/forms/model_forms.py:120 @@ -1535,8 +1537,8 @@ msgstr "" #: netbox/extras/models/models.py:158 netbox/extras/models/models.py:396 #: netbox/extras/models/models.py:511 netbox/extras/models/notifications.py:131 #: netbox/extras/models/staging.py:32 netbox/extras/models/tags.py:32 -#: netbox/ipam/models/vlans.py:358 netbox/netbox/models/__init__.py:114 -#: netbox/netbox/models/__init__.py:149 netbox/netbox/models/__init__.py:195 +#: netbox/ipam/models/vlans.py:358 netbox/netbox/models/__init__.py:115 +#: netbox/netbox/models/__init__.py:150 netbox/netbox/models/__init__.py:196 #: netbox/users/models/permissions.py:24 netbox/users/models/tokens.py:57 #: netbox/users/models/users.py:33 #: netbox/virtualization/models/virtualmachines.py:276 @@ -1574,8 +1576,8 @@ msgstr "" #: netbox/ipam/models/services.py:51 netbox/ipam/models/services.py:84 #: netbox/ipam/models/vlans.py:37 netbox/ipam/models/vlans.py:199 #: netbox/ipam/models/vlans.py:337 netbox/ipam/models/vrfs.py:20 -#: netbox/ipam/models/vrfs.py:75 netbox/netbox/models/__init__.py:141 -#: netbox/netbox/models/__init__.py:185 netbox/tenancy/models/contacts.py:58 +#: netbox/ipam/models/vrfs.py:75 netbox/netbox/models/__init__.py:142 +#: netbox/netbox/models/__init__.py:186 netbox/tenancy/models/contacts.py:58 #: netbox/tenancy/models/tenants.py:19 netbox/tenancy/models/tenants.py:42 #: netbox/users/models/permissions.py:20 netbox/users/models/users.py:28 #: netbox/virtualization/models/clusters.py:52 @@ -1596,8 +1598,8 @@ msgstr "" #: netbox/circuits/models/providers.py:28 netbox/dcim/models/devices.py:88 #: netbox/dcim/models/racks.py:137 netbox/dcim/models/sites.py:149 #: netbox/extras/models/models.py:506 netbox/ipam/models/asns.py:23 -#: netbox/ipam/models/vlans.py:42 netbox/netbox/models/__init__.py:145 -#: netbox/netbox/models/__init__.py:190 netbox/tenancy/models/tenants.py:25 +#: netbox/ipam/models/vlans.py:42 netbox/netbox/models/__init__.py:146 +#: netbox/netbox/models/__init__.py:191 netbox/tenancy/models/tenants.py:25 #: netbox/tenancy/models/tenants.py:47 netbox/vpn/models/l2vpn.py:27 #: netbox/wireless/models.py:59 msgid "slug" @@ -1681,7 +1683,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:872 netbox/dcim/tables/devices.py:941 #: netbox/dcim/tables/devices.py:1006 netbox/dcim/tables/devices.py:1025 #: netbox/dcim/tables/devices.py:1054 netbox/dcim/tables/devices.py:1084 -#: netbox/dcim/tables/devicetypes.py:31 netbox/dcim/tables/devicetypes.py:222 +#: netbox/dcim/tables/devicetypes.py:31 netbox/dcim/tables/devicetypes.py:227 #: netbox/dcim/tables/power.py:22 netbox/dcim/tables/power.py:62 #: netbox/dcim/tables/racks.py:24 netbox/dcim/tables/racks.py:113 #: netbox/dcim/tables/sites.py:24 netbox/dcim/tables/sites.py:51 @@ -1824,7 +1826,7 @@ msgstr "" #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 #: netbox/circuits/tables/virtual_circuits.py:68 -#: netbox/dcim/tables/devices.py:1067 netbox/dcim/tables/devicetypes.py:92 +#: netbox/dcim/tables/devices.py:1067 netbox/dcim/tables/devicetypes.py:97 #: netbox/dcim/tables/modules.py:29 netbox/dcim/tables/modules.py:73 #: netbox/dcim/tables/power.py:39 netbox/dcim/tables/power.py:96 #: netbox/dcim/tables/racks.py:84 netbox/dcim/tables/racks.py:144 @@ -2187,7 +2189,7 @@ msgstr "" #: netbox/core/forms/bulk_edit.py:25 netbox/core/forms/filtersets.py:43 #: netbox/core/tables/data.py:26 netbox/dcim/forms/bulk_edit.py:1140 #: netbox/dcim/forms/bulk_edit.py:1418 netbox/dcim/forms/filtersets.py:1375 -#: netbox/dcim/tables/devices.py:566 netbox/dcim/tables/devicetypes.py:226 +#: netbox/dcim/tables/devices.py:566 netbox/dcim/tables/devicetypes.py:231 #: netbox/extras/forms/bulk_edit.py:123 netbox/extras/forms/bulk_edit.py:187 #: netbox/extras/forms/bulk_edit.py:246 netbox/extras/forms/filtersets.py:145 #: netbox/extras/forms/filtersets.py:235 netbox/extras/forms/filtersets.py:300 @@ -2735,7 +2737,7 @@ msgid "Last updated" msgstr "" #: netbox/core/tables/jobs.py:10 netbox/core/tables/tasks.py:76 -#: netbox/dcim/tables/devicetypes.py:164 netbox/extras/tables/tables.py:216 +#: netbox/dcim/tables/devicetypes.py:169 netbox/extras/tables/tables.py:216 #: netbox/extras/tables/tables.py:460 netbox/netbox/tables/tables.py:192 #: netbox/templates/dcim/virtualchassis_edit.html:52 #: netbox/utilities/forms/forms.py:73 netbox/wireless/tables/wirelesslink.py:16 @@ -3867,7 +3869,7 @@ msgstr "" #: netbox/dcim/forms/model_forms.py:498 netbox/dcim/forms/model_forms.py:557 #: netbox/dcim/forms/object_create.py:197 #: netbox/dcim/forms/object_create.py:345 netbox/dcim/tables/devices.py:175 -#: netbox/dcim/tables/devices.py:740 netbox/dcim/tables/devicetypes.py:248 +#: netbox/dcim/tables/devices.py:740 netbox/dcim/tables/devicetypes.py:253 #: netbox/templates/dcim/device.html:43 netbox/templates/dcim/device.html:131 #: netbox/templates/dcim/modulebay.html:38 #: netbox/templates/dcim/virtualchassis.html:66 @@ -3914,8 +3916,8 @@ msgstr "" #: netbox/dcim/forms/model_forms.py:445 netbox/dcim/forms/model_forms.py:1095 #: netbox/dcim/forms/model_forms.py:1564 netbox/dcim/forms/object_import.py:188 #: netbox/dcim/tables/devices.py:107 netbox/dcim/tables/devices.py:182 -#: netbox/dcim/tables/devices.py:969 netbox/dcim/tables/devicetypes.py:80 -#: netbox/dcim/tables/devicetypes.py:310 netbox/dcim/tables/modules.py:20 +#: netbox/dcim/tables/devices.py:969 netbox/dcim/tables/devicetypes.py:85 +#: netbox/dcim/tables/devicetypes.py:315 netbox/dcim/tables/modules.py:20 #: netbox/dcim/tables/modules.py:61 netbox/dcim/tables/racks.py:58 #: netbox/dcim/tables/racks.py:131 netbox/templates/dcim/devicetype.html:14 #: netbox/templates/dcim/inventoryitem.html:48 @@ -3979,7 +3981,7 @@ msgstr "" #: netbox/dcim/forms/filtersets.py:489 netbox/dcim/forms/filtersets.py:595 #: netbox/dcim/forms/filtersets.py:614 netbox/dcim/forms/filtersets.py:675 #: netbox/dcim/forms/model_forms.py:226 netbox/dcim/forms/model_forms.py:306 -#: netbox/dcim/tables/devicetypes.py:106 netbox/dcim/tables/modules.py:35 +#: netbox/dcim/tables/devicetypes.py:111 netbox/dcim/tables/modules.py:35 #: netbox/dcim/tables/racks.py:74 netbox/dcim/tables/racks.py:171 #: netbox/extras/forms/bulk_edit.py:53 netbox/extras/forms/bulk_edit.py:133 #: netbox/extras/forms/bulk_edit.py:183 netbox/extras/forms/bulk_edit.py:288 @@ -4109,12 +4111,12 @@ msgstr "" msgid "U height" msgstr "" -#: netbox/dcim/forms/bulk_edit.py:530 netbox/dcim/tables/devicetypes.py:102 +#: netbox/dcim/forms/bulk_edit.py:530 netbox/dcim/tables/devicetypes.py:107 msgid "Exclude from utilization" msgstr "" #: netbox/dcim/forms/bulk_edit.py:559 netbox/dcim/forms/model_forms.py:377 -#: netbox/dcim/tables/devicetypes.py:77 netbox/templates/dcim/device.html:88 +#: netbox/dcim/tables/devicetypes.py:82 netbox/templates/dcim/device.html:88 #: netbox/templates/dcim/devicebay.html:52 netbox/templates/dcim/module.html:61 msgid "Device Type" msgstr "" @@ -6576,7 +6578,7 @@ msgstr "" #: netbox/dcim/models/devices.py:1439 netbox/extras/models/customfields.py:225 #: netbox/extras/models/models.py:107 netbox/extras/models/models.py:694 -#: netbox/netbox/models/__init__.py:119 +#: netbox/netbox/models/__init__.py:120 msgid "comments" msgstr "" @@ -7062,8 +7064,8 @@ msgid "Power outlets" msgstr "" #: netbox/dcim/tables/devices.py:256 netbox/dcim/tables/devices.py:1112 -#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1142 -#: netbox/dcim/views.py:1386 netbox/dcim/views.py:2137 +#: netbox/dcim/tables/devicetypes.py:133 netbox/dcim/views.py:1143 +#: netbox/dcim/views.py:1387 netbox/dcim/views.py:2138 #: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:258 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 @@ -7100,9 +7102,9 @@ msgstr "" msgid "Module Bay" msgstr "" -#: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:47 -#: netbox/dcim/tables/devicetypes.py:143 netbox/dcim/views.py:1217 -#: netbox/dcim/views.py:2235 netbox/netbox/navigation/menu.py:103 +#: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:52 +#: netbox/dcim/tables/devicetypes.py:148 netbox/dcim/views.py:1218 +#: netbox/dcim/views.py:2236 netbox/netbox/navigation/menu.py:103 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -7159,7 +7161,7 @@ msgstr "" msgid "Tunnel" msgstr "" -#: netbox/dcim/tables/devices.py:625 netbox/dcim/tables/devicetypes.py:229 +#: netbox/dcim/tables/devices.py:625 netbox/dcim/tables/devicetypes.py:234 #: netbox/templates/dcim/interface.html:65 msgid "Management Only" msgstr "" @@ -7188,7 +7190,7 @@ msgstr "" msgid "Module Status" msgstr "" -#: netbox/dcim/tables/devices.py:973 netbox/dcim/tables/devicetypes.py:314 +#: netbox/dcim/tables/devices.py:973 netbox/dcim/tables/devicetypes.py:319 #: netbox/templates/dcim/inventoryitem.html:44 msgid "Component" msgstr "" @@ -7197,42 +7199,47 @@ msgstr "" msgid "Items" msgstr "" -#: netbox/dcim/tables/devicetypes.py:37 netbox/netbox/navigation/menu.py:84 +#: netbox/dcim/tables/devicetypes.py:37 netbox/netbox/navigation/menu.py:60 +#: netbox/netbox/navigation/menu.py:62 +msgid "Rack Types" +msgstr "" + +#: netbox/dcim/tables/devicetypes.py:42 netbox/netbox/navigation/menu.py:84 #: netbox/netbox/navigation/menu.py:86 msgid "Device Types" msgstr "" -#: netbox/dcim/tables/devicetypes.py:42 netbox/netbox/navigation/menu.py:87 +#: netbox/dcim/tables/devicetypes.py:47 netbox/netbox/navigation/menu.py:87 msgid "Module Types" msgstr "" -#: netbox/dcim/tables/devicetypes.py:52 netbox/extras/forms/filtersets.py:378 +#: netbox/dcim/tables/devicetypes.py:57 netbox/extras/forms/filtersets.py:378 #: netbox/extras/forms/model_forms.py:537 netbox/extras/tables/tables.py:540 #: netbox/netbox/navigation/menu.py:78 msgid "Platforms" msgstr "" -#: netbox/dcim/tables/devicetypes.py:84 +#: netbox/dcim/tables/devicetypes.py:89 #: netbox/templates/dcim/devicetype.html:29 msgid "Default Platform" msgstr "" -#: netbox/dcim/tables/devicetypes.py:88 +#: netbox/dcim/tables/devicetypes.py:93 #: netbox/templates/dcim/devicetype.html:45 msgid "Full Depth" msgstr "" -#: netbox/dcim/tables/devicetypes.py:98 +#: netbox/dcim/tables/devicetypes.py:103 msgid "U Height" msgstr "" -#: netbox/dcim/tables/devicetypes.py:113 netbox/dcim/tables/modules.py:26 +#: netbox/dcim/tables/devicetypes.py:118 netbox/dcim/tables/modules.py:26 #: netbox/dcim/tables/racks.py:89 msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:1082 -#: netbox/dcim/views.py:1326 netbox/dcim/views.py:2073 +#: netbox/dcim/tables/devicetypes.py:121 netbox/dcim/views.py:1083 +#: netbox/dcim/views.py:1327 netbox/dcim/views.py:2074 #: netbox/netbox/navigation/menu.py:97 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -7242,8 +7249,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:1097 -#: netbox/dcim/views.py:1341 netbox/dcim/views.py:2089 +#: netbox/dcim/tables/devicetypes.py:124 netbox/dcim/views.py:1098 +#: netbox/dcim/views.py:1342 netbox/dcim/views.py:2090 #: netbox/netbox/navigation/menu.py:98 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -7253,8 +7260,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:1112 -#: netbox/dcim/views.py:1356 netbox/dcim/views.py:2105 +#: netbox/dcim/tables/devicetypes.py:127 netbox/dcim/views.py:1113 +#: netbox/dcim/views.py:1357 netbox/dcim/views.py:2106 #: netbox/netbox/navigation/menu.py:99 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -7264,8 +7271,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1127 -#: netbox/dcim/views.py:1371 netbox/dcim/views.py:2121 +#: netbox/dcim/tables/devicetypes.py:130 netbox/dcim/views.py:1128 +#: netbox/dcim/views.py:1372 netbox/dcim/views.py:2122 #: netbox/netbox/navigation/menu.py:100 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -7275,8 +7282,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1157 -#: netbox/dcim/views.py:1401 netbox/dcim/views.py:2159 +#: netbox/dcim/tables/devicetypes.py:136 netbox/dcim/views.py:1158 +#: netbox/dcim/views.py:1402 netbox/dcim/views.py:2160 #: netbox/netbox/navigation/menu.py:95 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -7285,8 +7292,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1172 -#: netbox/dcim/views.py:1416 netbox/dcim/views.py:2175 +#: netbox/dcim/tables/devicetypes.py:139 netbox/dcim/views.py:1173 +#: netbox/dcim/views.py:1417 netbox/dcim/views.py:2176 #: netbox/netbox/navigation/menu.py:96 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -7296,16 +7303,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1202 -#: netbox/dcim/views.py:2215 netbox/netbox/navigation/menu.py:102 +#: netbox/dcim/tables/devicetypes.py:142 netbox/dcim/views.py:1203 +#: netbox/dcim/views.py:2216 netbox/netbox/navigation/menu.py:102 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1187 -#: netbox/dcim/views.py:1431 netbox/dcim/views.py:2195 +#: netbox/dcim/tables/devicetypes.py:145 netbox/dcim/views.py:1188 +#: netbox/dcim/views.py:1432 netbox/dcim/views.py:2196 #: netbox/netbox/navigation/menu.py:101 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 @@ -7384,48 +7391,48 @@ msgstr "" msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2248 netbox/extras/forms/model_forms.py:577 +#: netbox/dcim/views.py:2249 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 #: netbox/virtualization/forms/model_forms.py:232 #: netbox/virtualization/views.py:422 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2258 netbox/virtualization/views.py:432 +#: netbox/dcim/views.py:2259 netbox/virtualization/views.py:432 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2271 netbox/extras/tables/tables.py:550 +#: netbox/dcim/views.py:2272 netbox/extras/tables/tables.py:550 #: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 #: netbox/virtualization/views.py:190 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:3104 +#: netbox/dcim/views.py:3105 #, python-brace-format msgid "Installed device {device} in bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3145 +#: netbox/dcim/views.py:3146 #, python-brace-format msgid "Removed device {device} from bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3261 netbox/ipam/tables/ip.py:180 +#: netbox/dcim/views.py:3262 netbox/ipam/tables/ip.py:180 msgid "Children" msgstr "" -#: netbox/dcim/views.py:3728 +#: netbox/dcim/views.py:3729 #, python-brace-format msgid "Added member {device}" msgstr "" -#: netbox/dcim/views.py:3777 +#: netbox/dcim/views.py:3778 #, python-brace-format msgid "Unable to remove master device {device} from the virtual chassis." msgstr "" -#: netbox/dcim/views.py:3790 +#: netbox/dcim/views.py:3791 #, python-brace-format msgid "Removed {device} from virtual chassis {chassis}" msgstr "" @@ -11139,10 +11146,6 @@ msgstr "" msgid "Elevations" msgstr "" -#: netbox/netbox/navigation/menu.py:60 netbox/netbox/navigation/menu.py:62 -msgid "Rack Types" -msgstr "" - #: netbox/netbox/navigation/menu.py:76 msgid "Modules" msgstr "" From 2a44affd03ae13daeaf3d22ffcadea87b653d95d Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Thu, 20 Feb 2025 09:01:04 -0600 Subject: [PATCH 171/190] Fixes #18594: asn_count sort in Sites list (#18634) * Fixes #18594: asn_count sort in Sites list * Fixes similar issue in `circuits.views.ProviderListView` Thanks @bctiemann for point this out! --- netbox/circuits/tables/providers.py | 1 - netbox/circuits/views.py | 4 +++- netbox/dcim/tables/sites.py | 1 - netbox/dcim/views.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/tables/providers.py b/netbox/circuits/tables/providers.py index d70c77e9c..c7eba9012 100644 --- a/netbox/circuits/tables/providers.py +++ b/netbox/circuits/tables/providers.py @@ -33,7 +33,6 @@ class ProviderTable(ContactsColumnMixin, NetBoxTable): verbose_name=_('ASNs') ) asn_count = columns.LinkedCountColumn( - accessor=tables.A('asns__count'), viewname='ipam:asn_list', url_params={'provider_id': 'pk'}, verbose_name=_('ASN Count') diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 3bd81c33a..07c1113bd 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -4,6 +4,7 @@ from django.shortcuts import get_object_or_404, redirect, render from django.utils.translation import gettext_lazy as _ from dcim.views import PathTraceView +from ipam.models import ASN from netbox.views import generic from tenancy.views import ObjectContactsView from utilities.forms import ConfirmationForm @@ -20,7 +21,8 @@ from .models import * @register_model_view(Provider, 'list', path='', detail=False) class ProviderListView(generic.ObjectListView): queryset = Provider.objects.annotate( - count_circuits=count_related(Circuit, 'provider') + count_circuits=count_related(Circuit, 'provider'), + asn_count=count_related(ASN, 'providers'), ) filterset = filtersets.ProviderFilterSet filterset_form = forms.ProviderFilterForm diff --git a/netbox/dcim/tables/sites.py b/netbox/dcim/tables/sites.py index 77844f086..e8cb9140e 100644 --- a/netbox/dcim/tables/sites.py +++ b/netbox/dcim/tables/sites.py @@ -94,7 +94,6 @@ class SiteTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): verbose_name=_('ASNs') ) asn_count = columns.LinkedCountColumn( - accessor=tables.A('asns__count'), viewname='ipam:asn_list', url_params={'site_id': 'pk'}, verbose_name=_('ASN Count') diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 583b89f1a..60de8c355 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -422,7 +422,8 @@ class SiteGroupContactsView(ObjectContactsView): @register_model_view(Site, 'list', path='', detail=False) class SiteListView(generic.ObjectListView): queryset = Site.objects.annotate( - device_count=count_related(Device, 'site') + device_count=count_related(Device, 'site'), + asn_count=count_related(ASN, 'sites') ) filterset = filtersets.SiteFilterSet filterset_form = forms.SiteFilterForm From b5bc0bad3858d51912bd466cc4d4e897811cf952 Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Tue, 18 Feb 2025 21:48:12 +0100 Subject: [PATCH 172/190] Cover multitable inheritance in serialization During serialization, custom fields may be available to a model due to multi-table inheritance, but might not be available in serialized data because only direct fields of the model are covered. Now this attribute is only used if available in serialized data. Models using multi-table inheritance must modify their serialize_object() method to cover parent serialization. --- netbox/utilities/serialization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/utilities/serialization.py b/netbox/utilities/serialization.py index af1169e97..f402a30eb 100644 --- a/netbox/utilities/serialization.py +++ b/netbox/utilities/serialization.py @@ -29,7 +29,7 @@ def serialize_object(obj, resolve_tags=True, extra=None, exclude=None): exclude = exclude or [] # Include custom_field_data as "custom_fields" - if hasattr(obj, 'custom_field_data'): + if 'custom_field_data' in data: data['custom_fields'] = data.pop('custom_field_data') # Resolve any assigned tags to their names. Check for tags cached on the instance; From ed79e3bbf4617ec0764c6e7bd1f289d7abb22106 Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Tue, 18 Feb 2025 10:03:49 -0600 Subject: [PATCH 173/190] Fixes #18619: shift-select selects hidden items This also fixes the inverse, when a range is unselected via shift-click, previously checked checkboxes that are hidden are not changed. --- netbox/project-static/dist/netbox.js | Bin 391058 -> 391196 bytes netbox/project-static/dist/netbox.js.map | Bin 525511 -> 525648 bytes .../src/buttons/selectMultiple.ts | 8 ++++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 7e516f7f4859ffcafee6698af56ca52c89acb58c..bb402ec3321ec44f949a3f8bf9b7518cd03ead91 100644 GIT binary patch delta 249 zcmbRAUVP36@rD-07N#xC@$J!NiA4%UnL7EI);Xyq3VE5fiiXx{`9&HaUU8;Eewso_ zre-yWmzZf=oN1kzrU6uBYpZCWrlz4$lxdrosh6CSUz}Q8qM=k$q@<~-Xq#7>lcT0q zH2uIqCNa$v-Msv~R3*)t8V!)rjMU`p)D+uHI8#$orx;{l>huro%!=|l8u@t4%mW+scnAYI$%3LOH^%(4msr38V1z8en_cvL36}NcUjOUG0O}j;F+Ll01Bl4L+uuS zp|ivy delta 357 zcmcc6rEt7cp`nGbg{g&k3(K>7CTG9tzw=pS6Ww&&9UT*OoE@FBoOL`M9ev$F0;w)Q z(znP7NP2m?=y*Fi8aM$-XHzFvi26WB$It)}GuKHc*wMYh*%zcJ(gP$^>;y8dz!}8$ zbe+DjfW^SU-O;%Mn_hpQna)7vu8v^U5L5g>?0m2(IS^C4!KO^_EM!q*44S^7kVS$w z7^KKo2WWt?li&2Kg)9zYfe@i!N9PcrxF^VKZjMpYwToD64ZzA%!KPU_>Et>CUGA*o z>gZhJ76P#i91!_VVDA?@`A?rw#8Si;1(5?PbS-d-oGww!V!>$G9$3r*#H>Kfwmq;SMEXygC@ diff --git a/netbox/project-static/src/buttons/selectMultiple.ts b/netbox/project-static/src/buttons/selectMultiple.ts index d8bad3105..5695b6c24 100644 --- a/netbox/project-static/src/buttons/selectMultiple.ts +++ b/netbox/project-static/src/buttons/selectMultiple.ts @@ -43,7 +43,9 @@ function toggleCheckboxRange( const typedElement = element as HTMLInputElement; //Change loop's current checkbox state to eventTargetElement checkbox state if (changePkCheckboxState === true) { - typedElement.checked = eventTargetElement.checked; + if (!typedElement.closest('tr')?.classList.contains('d-none')) { + typedElement.checked = eventTargetElement.checked; + } } //The previously clicked checkbox was above the shift clicked checkbox if (element === previousStateElement) { @@ -52,7 +54,9 @@ function toggleCheckboxRange( return; } changePkCheckboxState = true; - typedElement.checked = eventTargetElement.checked; + if (!typedElement.closest('tr')?.classList.contains('d-none')) { + typedElement.checked = eventTargetElement.checked; + } } //The previously clicked checkbox was below the shift clicked checkbox if (element === eventTargetElement) { From bcd974210daea6fad43c837a35d8331cf5e2ab20 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 20 Feb 2025 12:13:08 -0500 Subject: [PATCH 174/190] Update Transifex resource slug --- .tx/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tx/config b/.tx/config index 342331d4e..b0562b978 100755 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://app.transifex.com -[o:netbox-community:p:netbox:r:9cbf4fcf95b3d92e4ebbf1a5e5d1caee] +[o:netbox-community:p:netbox:r:034999968a7366ba27a8bdf1ab63bf42] file_filter = netbox/translations//LC_MESSAGES/django.po source_file = netbox/translations/en/LC_MESSAGES/django.po type = PO From 63b7145baaaf9e7b17d65796c42d1dddd5851096 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 05:02:07 +0000 Subject: [PATCH 175/190] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 104 +++++++++---------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 55d263183..e76dac85c 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-19 05:01+0000\n" +"POT-Creation-Date: 2025-02-21 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -223,7 +223,7 @@ msgstr "" #: netbox/dcim/forms/object_create.py:383 netbox/dcim/tables/devices.py:163 #: netbox/dcim/tables/power.py:26 netbox/dcim/tables/power.py:93 #: netbox/dcim/tables/racks.py:121 netbox/dcim/tables/racks.py:206 -#: netbox/dcim/tables/sites.py:134 netbox/extras/filtersets.py:525 +#: netbox/dcim/tables/sites.py:133 netbox/extras/filtersets.py:525 #: netbox/ipam/forms/bulk_edit.py:468 netbox/ipam/forms/bulk_import.py:452 #: netbox/ipam/forms/filtersets.py:155 netbox/ipam/forms/filtersets.py:229 #: netbox/ipam/forms/filtersets.py:435 netbox/ipam/forms/filtersets.py:530 @@ -613,8 +613,8 @@ msgstr "" #: netbox/circuits/forms/model_forms.py:110 #: netbox/circuits/tables/circuits.py:57 netbox/circuits/tables/circuits.py:112 #: netbox/circuits/tables/circuits.py:196 -#: netbox/circuits/tables/providers.py:72 -#: netbox/circuits/tables/providers.py:103 +#: netbox/circuits/tables/providers.py:71 +#: netbox/circuits/tables/providers.py:102 #: netbox/circuits/tables/virtual_circuits.py:46 #: netbox/circuits/tables/virtual_circuits.py:93 #: netbox/templates/circuits/circuit.html:18 @@ -759,7 +759,7 @@ msgstr "" #: netbox/dcim/tables/devices.py:848 netbox/dcim/tables/devices.py:982 #: netbox/dcim/tables/devices.py:1094 netbox/dcim/tables/modules.py:70 #: netbox/dcim/tables/power.py:74 netbox/dcim/tables/racks.py:125 -#: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:138 +#: netbox/dcim/tables/sites.py:82 netbox/dcim/tables/sites.py:137 #: netbox/ipam/forms/bulk_edit.py:240 netbox/ipam/forms/bulk_edit.py:290 #: netbox/ipam/forms/bulk_edit.py:338 netbox/ipam/forms/bulk_edit.py:490 #: netbox/ipam/forms/bulk_import.py:188 netbox/ipam/forms/bulk_import.py:256 @@ -1317,7 +1317,7 @@ msgid "Site group" msgstr "" #: netbox/circuits/forms/filtersets.py:81 netbox/circuits/tables/circuits.py:62 -#: netbox/circuits/tables/providers.py:66 +#: netbox/circuits/tables/providers.py:65 #: netbox/circuits/tables/virtual_circuits.py:55 #: netbox/circuits/tables/virtual_circuits.py:103 #: netbox/templates/circuits/circuit.html:22 @@ -1668,8 +1668,8 @@ msgstr "" #: netbox/circuits/tables/circuits.py:30 netbox/circuits/tables/circuits.py:168 #: netbox/circuits/tables/providers.py:18 -#: netbox/circuits/tables/providers.py:69 -#: netbox/circuits/tables/providers.py:99 +#: netbox/circuits/tables/providers.py:68 +#: netbox/circuits/tables/providers.py:98 #: netbox/circuits/tables/virtual_circuits.py:18 netbox/core/tables/data.py:16 #: netbox/core/tables/jobs.py:14 netbox/core/tables/plugins.py:44 #: netbox/core/tables/tasks.py:11 netbox/core/tables/tasks.py:115 @@ -1687,7 +1687,7 @@ msgstr "" #: netbox/dcim/tables/power.py:22 netbox/dcim/tables/power.py:62 #: netbox/dcim/tables/racks.py:24 netbox/dcim/tables/racks.py:113 #: netbox/dcim/tables/sites.py:24 netbox/dcim/tables/sites.py:51 -#: netbox/dcim/tables/sites.py:78 netbox/dcim/tables/sites.py:130 +#: netbox/dcim/tables/sites.py:78 netbox/dcim/tables/sites.py:129 #: netbox/extras/forms/filtersets.py:218 netbox/extras/tables/tables.py:58 #: netbox/extras/tables/tables.py:122 netbox/extras/tables/tables.py:155 #: netbox/extras/tables/tables.py:180 netbox/extras/tables/tables.py:246 @@ -1789,8 +1789,8 @@ msgid "Name" msgstr "" #: netbox/circuits/tables/circuits.py:39 netbox/circuits/tables/circuits.py:174 -#: netbox/circuits/tables/providers.py:45 -#: netbox/circuits/tables/providers.py:79 +#: netbox/circuits/tables/providers.py:44 +#: netbox/circuits/tables/providers.py:78 #: netbox/circuits/tables/virtual_circuits.py:27 #: netbox/netbox/navigation/menu.py:274 netbox/netbox/navigation/menu.py:278 #: netbox/netbox/navigation/menu.py:280 @@ -1822,15 +1822,15 @@ msgstr "" msgid "Commit Rate" msgstr "" -#: netbox/circuits/tables/circuits.py:84 netbox/circuits/tables/providers.py:48 -#: netbox/circuits/tables/providers.py:82 -#: netbox/circuits/tables/providers.py:107 +#: netbox/circuits/tables/circuits.py:84 netbox/circuits/tables/providers.py:47 +#: netbox/circuits/tables/providers.py:81 +#: netbox/circuits/tables/providers.py:106 #: netbox/circuits/tables/virtual_circuits.py:68 #: netbox/dcim/tables/devices.py:1067 netbox/dcim/tables/devicetypes.py:97 #: netbox/dcim/tables/modules.py:29 netbox/dcim/tables/modules.py:73 #: netbox/dcim/tables/power.py:39 netbox/dcim/tables/power.py:96 #: netbox/dcim/tables/racks.py:84 netbox/dcim/tables/racks.py:144 -#: netbox/dcim/tables/racks.py:224 netbox/dcim/tables/sites.py:108 +#: netbox/dcim/tables/racks.py:224 netbox/dcim/tables/sites.py:107 #: netbox/extras/tables/tables.py:582 netbox/ipam/tables/asn.py:69 #: netbox/ipam/tables/fhrp.py:34 netbox/ipam/tables/ip.py:82 #: netbox/ipam/tables/ip.py:226 netbox/ipam/tables/ip.py:281 @@ -1891,7 +1891,7 @@ msgstr "" msgid "Account Count" msgstr "" -#: netbox/circuits/tables/providers.py:39 netbox/dcim/tables/sites.py:100 +#: netbox/circuits/tables/providers.py:38 netbox/dcim/tables/sites.py:99 msgid "ASN Count" msgstr "" @@ -1973,12 +1973,12 @@ msgstr "" msgid "Device" msgstr "" -#: netbox/circuits/views.py:353 +#: netbox/circuits/views.py:355 #, python-brace-format msgid "No terminations have been defined for circuit {circuit}." msgstr "" -#: netbox/circuits/views.py:402 +#: netbox/circuits/views.py:404 #, python-brace-format msgid "Swapped terminations for circuit {circuit}." msgstr "" @@ -6984,8 +6984,8 @@ msgid "Reachable" msgstr "" #: netbox/dcim/tables/devices.py:69 netbox/dcim/tables/devices.py:117 -#: netbox/dcim/tables/racks.py:149 netbox/dcim/tables/sites.py:105 -#: netbox/dcim/tables/sites.py:148 netbox/extras/tables/tables.py:545 +#: netbox/dcim/tables/racks.py:149 netbox/dcim/tables/sites.py:104 +#: netbox/dcim/tables/sites.py:147 netbox/extras/tables/tables.py:545 #: netbox/netbox/navigation/menu.py:69 netbox/netbox/navigation/menu.py:73 #: netbox/netbox/navigation/menu.py:75 #: netbox/virtualization/forms/model_forms.py:122 @@ -7064,8 +7064,8 @@ msgid "Power outlets" msgstr "" #: netbox/dcim/tables/devices.py:256 netbox/dcim/tables/devices.py:1112 -#: netbox/dcim/tables/devicetypes.py:133 netbox/dcim/views.py:1143 -#: netbox/dcim/views.py:1387 netbox/dcim/views.py:2138 +#: netbox/dcim/tables/devicetypes.py:133 netbox/dcim/views.py:1144 +#: netbox/dcim/views.py:1388 netbox/dcim/views.py:2139 #: netbox/netbox/navigation/menu.py:94 netbox/netbox/navigation/menu.py:258 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 @@ -7103,8 +7103,8 @@ msgid "Module Bay" msgstr "" #: netbox/dcim/tables/devices.py:327 netbox/dcim/tables/devicetypes.py:52 -#: netbox/dcim/tables/devicetypes.py:148 netbox/dcim/views.py:1218 -#: netbox/dcim/views.py:2236 netbox/netbox/navigation/menu.py:103 +#: netbox/dcim/tables/devicetypes.py:148 netbox/dcim/views.py:1219 +#: netbox/dcim/views.py:2237 netbox/netbox/navigation/menu.py:103 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -7238,8 +7238,8 @@ msgstr "" msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:121 netbox/dcim/views.py:1083 -#: netbox/dcim/views.py:1327 netbox/dcim/views.py:2074 +#: netbox/dcim/tables/devicetypes.py:121 netbox/dcim/views.py:1084 +#: netbox/dcim/views.py:1328 netbox/dcim/views.py:2075 #: netbox/netbox/navigation/menu.py:97 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -7249,8 +7249,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:124 netbox/dcim/views.py:1098 -#: netbox/dcim/views.py:1342 netbox/dcim/views.py:2090 +#: netbox/dcim/tables/devicetypes.py:124 netbox/dcim/views.py:1099 +#: netbox/dcim/views.py:1343 netbox/dcim/views.py:2091 #: netbox/netbox/navigation/menu.py:98 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -7260,8 +7260,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:127 netbox/dcim/views.py:1113 -#: netbox/dcim/views.py:1357 netbox/dcim/views.py:2106 +#: netbox/dcim/tables/devicetypes.py:127 netbox/dcim/views.py:1114 +#: netbox/dcim/views.py:1358 netbox/dcim/views.py:2107 #: netbox/netbox/navigation/menu.py:99 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -7271,8 +7271,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:130 netbox/dcim/views.py:1128 -#: netbox/dcim/views.py:1372 netbox/dcim/views.py:2122 +#: netbox/dcim/tables/devicetypes.py:130 netbox/dcim/views.py:1129 +#: netbox/dcim/views.py:1373 netbox/dcim/views.py:2123 #: netbox/netbox/navigation/menu.py:100 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -7282,8 +7282,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:136 netbox/dcim/views.py:1158 -#: netbox/dcim/views.py:1402 netbox/dcim/views.py:2160 +#: netbox/dcim/tables/devicetypes.py:136 netbox/dcim/views.py:1159 +#: netbox/dcim/views.py:1403 netbox/dcim/views.py:2161 #: netbox/netbox/navigation/menu.py:95 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -7292,8 +7292,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:139 netbox/dcim/views.py:1173 -#: netbox/dcim/views.py:1417 netbox/dcim/views.py:2176 +#: netbox/dcim/tables/devicetypes.py:139 netbox/dcim/views.py:1174 +#: netbox/dcim/views.py:1418 netbox/dcim/views.py:2177 #: netbox/netbox/navigation/menu.py:96 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -7303,16 +7303,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:142 netbox/dcim/views.py:1203 -#: netbox/dcim/views.py:2216 netbox/netbox/navigation/menu.py:102 +#: netbox/dcim/tables/devicetypes.py:142 netbox/dcim/views.py:1204 +#: netbox/dcim/views.py:2217 netbox/netbox/navigation/menu.py:102 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:145 netbox/dcim/views.py:1188 -#: netbox/dcim/views.py:1432 netbox/dcim/views.py:2196 +#: netbox/dcim/tables/devicetypes.py:145 netbox/dcim/views.py:1189 +#: netbox/dcim/views.py:1433 netbox/dcim/views.py:2197 #: netbox/netbox/navigation/menu.py:101 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 @@ -7335,7 +7335,7 @@ msgstr "" msgid "Available Power (VA)" msgstr "" -#: netbox/dcim/tables/racks.py:30 netbox/dcim/tables/sites.py:143 +#: netbox/dcim/tables/racks.py:30 netbox/dcim/tables/sites.py:142 #: netbox/netbox/navigation/menu.py:43 netbox/netbox/navigation/menu.py:47 #: netbox/netbox/navigation/menu.py:49 msgid "Racks" @@ -7382,57 +7382,57 @@ msgstr "" msgid "Disconnected {count} {type}" msgstr "" -#: netbox/dcim/views.py:824 netbox/netbox/navigation/menu.py:51 +#: netbox/dcim/views.py:825 netbox/netbox/navigation/menu.py:51 msgid "Reservations" msgstr "" -#: netbox/dcim/views.py:843 netbox/templates/dcim/location.html:90 +#: netbox/dcim/views.py:844 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2249 netbox/extras/forms/model_forms.py:577 +#: netbox/dcim/views.py:2250 netbox/extras/forms/model_forms.py:577 #: netbox/templates/extras/configcontext.html:10 #: netbox/virtualization/forms/model_forms.py:232 #: netbox/virtualization/views.py:422 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2259 netbox/virtualization/views.py:432 +#: netbox/dcim/views.py:2260 netbox/virtualization/views.py:432 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2272 netbox/extras/tables/tables.py:550 +#: netbox/dcim/views.py:2273 netbox/extras/tables/tables.py:550 #: netbox/netbox/navigation/menu.py:255 netbox/netbox/navigation/menu.py:257 #: netbox/virtualization/views.py:190 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:3105 +#: netbox/dcim/views.py:3106 #, python-brace-format msgid "Installed device {device} in bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3146 +#: netbox/dcim/views.py:3147 #, python-brace-format msgid "Removed device {device} from bay {device_bay}." msgstr "" -#: netbox/dcim/views.py:3262 netbox/ipam/tables/ip.py:180 +#: netbox/dcim/views.py:3263 netbox/ipam/tables/ip.py:180 msgid "Children" msgstr "" -#: netbox/dcim/views.py:3729 +#: netbox/dcim/views.py:3730 #, python-brace-format msgid "Added member {device}" msgstr "" -#: netbox/dcim/views.py:3778 +#: netbox/dcim/views.py:3779 #, python-brace-format msgid "Unable to remove master device {device} from the virtual chassis." msgstr "" -#: netbox/dcim/views.py:3791 +#: netbox/dcim/views.py:3792 #, python-brace-format msgid "Removed {device} from virtual chassis {chassis}" msgstr "" From 9c1358e6e7dbf892036a8a58fc1e10ac7a09097f Mon Sep 17 00:00:00 2001 From: mr1716 Date: Fri, 21 Feb 2025 06:29:15 -0500 Subject: [PATCH 176/190] #18698 Correct REST Wikipedia URL In Documentation --- docs/integrations/rest-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/rest-api.md b/docs/integrations/rest-api.md index 215b561a7..e0d2c445f 100644 --- a/docs/integrations/rest-api.md +++ b/docs/integrations/rest-api.md @@ -2,7 +2,7 @@ ## What is a REST API? -REST stands for [representational state transfer](https://en.wikipedia.org/wiki/Representational_state_transfer). It's a particular type of API which employs HTTP requests and [JavaScript Object Notation (JSON)](https://www.json.org/) to facilitate create, retrieve, update, and delete (CRUD) operations on objects within an application. Each type of operation is associated with a particular HTTP verb: +REST stands for [representational state transfer](https://en.wikipedia.org/wiki/REST). It's a particular type of API which employs HTTP requests and [JavaScript Object Notation (JSON)](https://www.json.org/) to facilitate create, retrieve, update, and delete (CRUD) operations on objects within an application. Each type of operation is associated with a particular HTTP verb: * `GET`: Retrieve an object or list of objects * `POST`: Create an object From fbaa82df7b92fb2743dcae38872bc7ec45984a89 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 20 Feb 2025 10:54:36 -0500 Subject: [PATCH 177/190] Fixes #18674: Fix form reset when selecting a value from a speed selection dropdown --- netbox/project-static/dist/netbox.js | Bin 391196 -> 391201 bytes netbox/project-static/dist/netbox.js.map | Bin 525648 -> 525672 bytes netbox/project-static/package.json | 3 ++- netbox/project-static/src/htmx.ts | 4 +++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index bb402ec3321ec44f949a3f8bf9b7518cd03ead91..6650f0fab4a9f2f68e0feb7adbbba5879c6f261c 100644 GIT binary patch delta 6266 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 delta 77 zcmV-T0J8t+iXhO6Ab^AcgaU*Egam{Iga)(+_6Pwvm-h$ Date: Fri, 21 Feb 2025 15:15:14 -0500 Subject: [PATCH 178/190] Release v4.2.4 --- .../ISSUE_TEMPLATE/01-feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/02-bug_report.yaml | 2 +- docs/release-notes/version-4.2.md | 27 +++ netbox/project-static/package.json | 4 +- netbox/release.yaml | 4 +- netbox/translations/cs/LC_MESSAGES/django.mo | Bin 230181 -> 231540 bytes netbox/translations/cs/LC_MESSAGES/django.po | 170 +++++++++--------- netbox/translations/da/LC_MESSAGES/django.mo | Bin 225478 -> 224346 bytes netbox/translations/da/LC_MESSAGES/django.po | 19 +- netbox/translations/de/LC_MESSAGES/django.mo | Bin 237308 -> 236143 bytes netbox/translations/de/LC_MESSAGES/django.po | 64 +++---- netbox/translations/es/LC_MESSAGES/django.mo | Bin 239192 -> 237992 bytes netbox/translations/es/LC_MESSAGES/django.po | 33 ++-- netbox/translations/fr/LC_MESSAGES/django.mo | Bin 237945 -> 239998 bytes netbox/translations/fr/LC_MESSAGES/django.po | 120 +++++++------ netbox/translations/it/LC_MESSAGES/django.mo | Bin 237392 -> 236189 bytes netbox/translations/it/LC_MESSAGES/django.po | 17 +- netbox/translations/ja/LC_MESSAGES/django.mo | Bin 254773 -> 253226 bytes netbox/translations/ja/LC_MESSAGES/django.po | 128 ++++++------- netbox/translations/nl/LC_MESSAGES/django.mo | Bin 233233 -> 232078 bytes netbox/translations/nl/LC_MESSAGES/django.po | 39 ++-- netbox/translations/pl/LC_MESSAGES/django.mo | Bin 235040 -> 233894 bytes netbox/translations/pl/LC_MESSAGES/django.po | 16 +- netbox/translations/pt/LC_MESSAGES/django.mo | Bin 235452 -> 234260 bytes netbox/translations/pt/LC_MESSAGES/django.po | 23 +-- netbox/translations/ru/LC_MESSAGES/django.mo | Bin 301870 -> 300424 bytes netbox/translations/ru/LC_MESSAGES/django.po | 45 +++-- netbox/translations/tr/LC_MESSAGES/django.mo | Bin 229529 -> 228424 bytes netbox/translations/tr/LC_MESSAGES/django.po | 16 +- netbox/translations/uk/LC_MESSAGES/django.mo | Bin 302307 -> 300826 bytes netbox/translations/uk/LC_MESSAGES/django.po | 21 +-- netbox/translations/zh/LC_MESSAGES/django.mo | Bin 212098 -> 212087 bytes netbox/translations/zh/LC_MESSAGES/django.po | 21 +-- requirements.txt | 16 +- 34 files changed, 380 insertions(+), 407 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/01-feature_request.yaml b/.github/ISSUE_TEMPLATE/01-feature_request.yaml index 62c33b424..f8c7f7e9b 100644 --- a/.github/ISSUE_TEMPLATE/01-feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/01-feature_request.yaml @@ -15,7 +15,7 @@ body: attributes: label: NetBox version description: What version of NetBox are you currently running? - placeholder: v4.2.3 + placeholder: v4.2.4 validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/02-bug_report.yaml b/.github/ISSUE_TEMPLATE/02-bug_report.yaml index 0fa8b4084..1789d27aa 100644 --- a/.github/ISSUE_TEMPLATE/02-bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/02-bug_report.yaml @@ -27,7 +27,7 @@ body: attributes: label: NetBox Version description: What version of NetBox are you currently running? - placeholder: v4.2.3 + placeholder: v4.2.4 validations: required: true - type: dropdown diff --git a/docs/release-notes/version-4.2.md b/docs/release-notes/version-4.2.md index c6c99be7f..5612bfca7 100644 --- a/docs/release-notes/version-4.2.md +++ b/docs/release-notes/version-4.2.md @@ -1,5 +1,32 @@ # NetBox v4.2 +## v4.2.4 (2025-02-21) + +### Enhancements + +* [#17309](https://github.com/netbox-community/netbox/issues/17309) - Omit empty counts in related object tables +* [#18277](https://github.com/netbox-community/netbox/issues/18277) - Improve multi-table inheritance in serialization of change-logged models +* [#18286](https://github.com/netbox-community/netbox/issues/18286) - Add more job duration choices +* [#18357](https://github.com/netbox-community/netbox/issues/18357) - Display author name in plugin list for locally installed plugins +* [#18408](https://github.com/netbox-community/netbox/issues/18408) - Add Paused status for virtual machines +* [#18584](https://github.com/netbox-community/netbox/issues/18584) - Add rack type column to manufacturer list + +### Bug Fixes + +* [#17436](https://github.com/netbox-community/netbox/issues/17436) - Fix {module} replacement in module bays +* [#18013](https://github.com/netbox-community/netbox/issues/18013) - Limit object type to selected object in change log filter +* [#18241](https://github.com/netbox-community/netbox/issues/18241) - Default logging level of custom scripts changed to INFO +* [#18247](https://github.com/netbox-community/netbox/issues/18247) - Fix visibility of disabled cable paths in dark mode +* [#18480](https://github.com/netbox-community/netbox/issues/18480) - Clean data passed to script in runscript command +* [#18555](https://github.com/netbox-community/netbox/issues/18555) - Add default get_absolute_url method to plugin models +* [#18585](https://github.com/netbox-community/netbox/issues/18585) - Fix filtering circuits by location +* [#18593](https://github.com/netbox-community/netbox/issues/18593) - Fix "Create & Add Another" IP Address workflow +* [#18594](https://github.com/netbox-community/netbox/issues/18594) - Enable sorting by ASN count on site and provider lists +* [#18619](https://github.com/netbox-community/netbox/issues/18619) - Ensure shift-click selection selects only visible list items +* [#18674](https://github.com/netbox-community/netbox/issues/18674) - Preserve form values when selecting speed on circuit termination + +--- + ## v4.2.3 (2025-02-04) ### Enhancements diff --git a/netbox/project-static/package.json b/netbox/project-static/package.json index 1a99fba2e..bc8f3cee4 100644 --- a/netbox/project-static/package.json +++ b/netbox/project-static/package.json @@ -30,8 +30,8 @@ "gridstack": "11.3.0", "htmx.org": "1.9.12", "query-string": "9.1.1", - "sass": "1.83.4", - "tom-select": "2.4.2", + "sass": "1.85.0", + "tom-select": "2.4.3", "typeface-inter": "3.18.1", "typeface-roboto-mono": "1.1.13" }, diff --git a/netbox/release.yaml b/netbox/release.yaml index 420e71a20..15756c597 100644 --- a/netbox/release.yaml +++ b/netbox/release.yaml @@ -1,3 +1,3 @@ -version: "4.2.3" +version: "4.2.4" edition: "Community" -published: "2025-02-04" +published: "2025-02-21" diff --git a/netbox/translations/cs/LC_MESSAGES/django.mo b/netbox/translations/cs/LC_MESSAGES/django.mo index 964d8f54c07d09f825b4212b35d61b079f85033e..ddb972342822d84825a96c6b6d0ad7ef4283562d 100644 GIT binary patch delta 69153 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 delta 68466 zcmXuscfgj@|G@FPr;LVDk%sc5y@z(%N=rkfMI{xfl+2{=B9V{~Nk#~vFACX;A`y|Y zg(wOsigzJ#WFEqY@L9YH2Nf!iIUP4+Ev#@vfy|NE8JlBI z?2far8-9T8u-uUaGW~Hd_QU_-1p3e99aSLHg^Edd0j|PMn16I~6gH;(Soj6Drd+&m zfy^N6jxF#ZY>HoETP#(iK&C79MFUl7tW`p-1xq9IO0Q~SU08??bv#gbjo z5l=^_jOCR|9hE`ftBh{n#^}hpp#hy0<ytz0-4_hLDGBFgK~ z2REY~ZbJjxk9JtFbPDV^bi@_W#at8JCH2t&24QVHAI

    ;Zkhr{(pgsX59D<8(^*D zQh6}erF<*8m|jI2T!#koG1~F>Xv4pt0puN@=Kg3j(AsEyYjpQ?K;P?u!`%O8Ma6Sy zN2}3Ptw&eu=jarCjV*C!+^<|FHFyddSQ|7`J)=AV4QwK|$7|3d{!KKq-(dDOF7|No z0A^1pkU0+X%ch2!hTYJH&Iu>sy_B!TGqG~HbhKWIZnJmL5pO~R-->2<8~T}1rhF>* zE6@J-%)XI|6Yvdm?moxrSg1l8aUC=hqj52gMKg8eiK(OF=s|QGy702Cvohqix-B*$Q@8Wxm3Vl9qtPS5sQ~PP$--&kcN8Hb=lrmNf9cg8BZPX51h26s; zXofEgvso@|@D8-2B~gAF4d_*LPTxi6Y#VyS?nd7$a8g=i#nJ6|Qk0vaNAKxqyJOHP zybL{JLrv$a10vY<>9QTzYRShA4FIA%jo-W zVQ$f(@9)8Ce*XU*6(?6tBW;Yn*d^?XZkw|)Hxjgi%g_fp{u?Yx+oi>9kxK9 z?}45J=S2NQ=yNl%mivE>7q}8#2 zK7}sYDs|Gg;HlVv@>}TlhCgvI)~#D0(+jh+xv;@4=uup_Uixy`AsmaI5A)Fxtw*0f zjAo`m{gm1k=#-s?F225KMuwsp8;S1w3Fu;+hI~uTW^Uuc)P9J*_!*YQ?brnWiu-jN zq(#>Ro#QU(XGVYYQ*k^x(nrwux1uB7g?60ZFt#T;fEHNV{Xd=yBb1;2LT_`s}&xNUIdpDy4TY_fx@$hLhqt7>C|9i2T z3M1NprtCAc!C%oATQp5Cv_%8!ie_p+l+Qr}y%25Z%Ba6S>hB02LOAVJtM^Y2*xDgsyOLXzIi~1>1KNDSy*W;PE3jN|yq4v%P&7G(*vos-Z^G(?|ki;lD_+U_~wcytYA zr*hGbiznm89&}9{#zuH#%T#WGF0xK&L*3EcFgP3=PC)~igMJ1qiu$L~KvtsxZb1f? z&1~nw2meGHF4ihFTmemW9rXSwXan8Q4u*vj(dTBMBfcT(Z$k(25IUv*3s<9={s?pX z|7$Ls``^&W{>$Cqhs@Tg!^-IWW@sRt(B}rDYvg?NYxPt#z=dcB%hAAIMBiV7X6$|R zy|2~%{~H&M{K!*N!^ekJ(E3Jb1MR~z;{K2*Ul8TX!fV6%=-Rm-4QvJ4&f9VSW6YYG z@3=6c-_cchbepuQOQI?5fu?)_I-)UX1};Jyyc%5_bI|r~MYr*TSPx%9cgv6Hb3da2 z{n3W~Zv#czrnx!+?cn4n*G4;Pie{n{8sM2xKNOwgvFOxXine!S+`lWzOXL0utik>D zXdwIA#{T~+9z3#LimWu+aZPkCo1qPNME7-XYUcf31|SP;{`YX4fHjv~mk-hqznH#G1} z*JNSz{Zi=r713Q$D{LM0XLODIKbQ&w7=t!=MLcjFx=QDx4c>?Caar8og%?x)6Wx{< zbW6`KM5kye8o-NK71v=E+!gi3yJu6!<-4ajtAoDK77eI7+R)IrKN0=ra}7G8d(Z%v zqk+GKBXK>t-Rks6Q`Hntqud4^$TjF%x;e{5LoSxajjd>kzeOAT5l!u%asNMbTNUY< z8mf-2=0@nY>Wg-KR@@(fuAy=0npuj@{c`M$*;lxz#znC+()MbMb~p(QU(LkQ zKo{pjXoo+cDg7A@yi~9B6HYm_odM|k!_dITp&7V7)${$I3tzk+-35=J`~EX@H5c!l zesnqw&!RjDZTM~UWZZirxRJd<|a|7E%G z=l*_Z#{SxOviTaC%0I9@HXe|E=)44d@p-%ye?X^V$XThOXV4MvKnL&-=3~KuDI-yn&<2kfk}`8VIt6vm=Q^Uhp%=Oq z`bGWO=zuOj`^`?|!c{v19q~dmRS%#KK7ux|JbXTU9qnK}*29hHdxy~g3Jgu z#@bjJ9Z*kXyJs^4xv-%d(UH$X8@MmZkE5A*5$od)w4>wCP6tZ`Y(Tjto`!?43*L)! z@OyM%7oC$9>*eTxp1_js|7W>yvAu;x_8Fdx-=hs5H7tGeX^sXq34Q)*bP>)&GqoHY z>9c5nZ=lbwN89~4%G;v68*|_P|BM?&hNlL~pb=L^GgB9Bpb@%iPsMWB1>F@R&=FmZ zu8C|o56#^D==t&<8t5jx5I@1J6&**U)!z+`d?XtA1!#kpqJhkc`*Wf^FUohI0WLz% z`laCt^kjS;4e&$sxzEENMzH_=b=W>C99i9SQ-saXj@zIepMf@XCK}i%w4+H;KP~F# zq0irgcKATtUxu#sm&5nasru^NY)awoc(B08l!?-40Ch39f6?y&Jk2D8)94Zgqny3a1+|`B6I|g zMtMcte;pmb#;E@ceQpPu$zRa{6d0Y_DUH-;Gx=QDK|{2Gw&;u9(GCZob2$I!OryD1tFVsgnYJ)YfJLcnL zwBg&)A37gHpL-jd;KyhOg)c~%tbl%jsgBk0Tx^OrVAk#T8W%2(L-;Tj7@Hb=1U(N{ zq7A-?9r0cC`QjI*`s2~m*Fft}K?l$Z&0IG$z`9O7 zBHW1X-(Bd7htcN?k4tl17VWq)I~q|vHxv&6%~$jJ$m%M zk4C&T+>S1$edzOt!lL72%Fz1y=(cT#eyR?@`Zyu#7h`TwVh`$H$#T(vi=!u`j$5D| zw?`j510Cr=w1Y8ds;>yIMLV2_4RI;D__m@M_z7K{zoS!l^hGIS<#?KW-cv| zIS&S42lxMrT(~_Bql>ZGWhsCj=+s<_E~1CSFVF*})a5DVo$)lvm!nhmGMegj=+u3J z2Dk%l{}8&!OI#8A|0FJau>m^wEzuLKOO$)Z{jKCH#Ka1{?HRu}n zAp9I%+&`d;eJ^I+2K%|FjR){mta4=v;9GR=cA?*hicLwWY=GBLo`SBKzwt6GbrmBl zz`=rkxZFE61+oMU^eHr;m(fhTHI@Buq+i4XKcOF+f1o2h_Ud%P)kW)jps5^#e(YX_ z4q!eu#XHdvzK5pxW3>J6(JB574Xoa@bdWWg#{NHric6_@1s_A_ZuImtC0C#k&qO=A z3B5l*$`7Hbd<=c=f9Mpvh;G-n(6#dk`d)GRb9?5a&!3Xz!V}3~L>gIVG*#Wu$OoV= zoQJtZhIaTe`rI1yy^ZLa`4DaR^C70?H2qN}zs8bAm1 zB5E01vG%w=(ppy@Fe^OM`7lg0=a-kqvy+Ptl<8CiVGWj7aj4( zXougS0sI#JgLNq%eQjEVO|dKGZs;1i4Gr)uG=rPaso92RZaW(2F0`ND@HjvJGqci- zJ55mu)emk1_o#>j{gIQPUe_Z(C zaqM;J9O!_Kd_0*Ue26SZm&_Mph+L$*x4Wu5LnPy?<+3bHC z>>m~9q8&~`8=eu~fgUuEp(B3{&CrG@e~5PcRk$0?z(I5%1+P!-7DvmK(C2Gi&vvlG z=5gb6G@vul17>(UcsUyREObP-<8*uteZI{NX}@c`*Vci!UwCe+KMoBn zKbg(cj~l0=sqBh2H~^iR5pjPK4yJr{l((WCe21=;{b<8S-4weCZLcCa6}8cnpBnbS z!tVbeTsQ@z&<4k&2g@{cn>>%c_zs$(PorGn=JcD++UT5*!SOf;8{?nY1Z&-rzDEqh zMwD+sGq@U?xc_%?;iuP0^U`0z7=Uiao3S3ghTU)vdeAhxHQm1u9q~Qrc3XyyczM*n z6y^0%-hyUyJ38R~m~~Yi=E4z{nV&{n4W08A=(cNveg^c5@;Ef*GtsrP0G*nrqQ3BL zX|5}x0o6j^Z-(~MD?H~m_P-I0j|ZRNcc%NthLzB5nyniZEzlRcpbhp#=k6@Dqw~-?zdXt}q5f<2lGwWit!7uz|&B#E*wBq7SZ*`yWU7yYOc; zz(eSJM=ea2K?A9VeuwOhwlfYJ;1$>qAI03y|DSSULpyU7{HTO(kAion{aqAYe5a%J zeb7ZV2yJ*c`Ym}J_Qadf4nD`0SaebPful3J7M7tu(7cC*-2X-IiMc^LsD!4lIy(0a z(JAPF&V7Hh!%HzA??k6=6?Vcm!Xp=_K)a)huP-`~G3bCNV(#~US99UEyA~bU9CT#2 zq5&+9^78OSG>~=S4`={K+?(DzHarm>P))SmhUjz6(OuB-UiQBcok@iw9vY5D_y0t6 zFFRMFaZ#UiQB)6ud7@L2>lO6VVPD zps8ye_xqqDABHt?Iy#a^(UWi$y68Scr)V$wTeTARrypkPVO`37@e-V#<-)o64Lykd zLnAKvKuUczbl*1%d!k47NOW;cLjzca2KqMo`Tr$$!2MBfx+MKIpPqOc^*4pt54mvr zm3c5(70p0nw8743CWfF5k3skIwD3+epr^1pZa@e0D?0c8qVFI1P_h)-UnS&zHdB`i zJ8BYk3x|c5pljp?^y70rn))}Rya(M*l^#wRI|ohuMd;eO6 zT(qI$=Xjv*()3~rbV}NwBk7F>G7xQG1e*GBXv0&nK3 z#{PHF42c^v(Ui|dx6Q&RKaWPf9u4dxG=-m|Q}GQt;@#+O`5j$^MV6&Ca{~6I+zoB# z9yH@imt|8bpQpk|-$5JRga)z|?chgrj`yPt|A(&PVvnc#@@Rc^^!ZbwzAf5L_b8u@ zK6e2c=w(?hY-nyga5v^6LmPS?ox3&Yx$q$x$Pefm_!T{P3O$iJs)Rn@5S`lgVefEQ z+@FB9lbyzeC)%8-ScYceIkdx9&;U1~4SpTvy=cl0;~*^bWZIVJpwG?5=C}ZzvW@8T zTcZ3mc5(mj;KG#DTb@SH3N81H@?i9Q7>71618s0lI6vy|M(6fHbYxGWnS3GczY~6h z4(JOk;r{=L3m-g)&Q+2Br4gKn*4IJnPmOXfbnb?uC*NgJe{0k)K?7ce2J{{}psi8f zj%Ii-7I**u&c*3i@Ts);dY}*VMMp9StKq1qzY%S4KF-4X&~Ld_o=zF6j-De8(Cym= z-M$yb{fp4Gbp_^r|94GPT#wG(ZD^{Op!@Z4bR}otIW#OZaH*&S3!4At(EM5kJMA+#!&S0`&_Jt)6i5tflcrYtd4)7fmV7pWvFIY z4;^`9^nM$(qtl~)NYszUX4Fs2#>FG(gI}Qy>_b=SVRWtwKbJC42J{CTvYH_^a8!P>YT>tpekl5Ma7l5XnXnW^jT^x@m;oaB?U&MU;2dldOE4`9N&&bHHbG6a6*5Gyaza4d?!jbht zM>aIdW6}GUql@dBa5*{!pQ0)L4(;eS^!7)e+Rhv_kXzBr+!y8S^0;^z9nm{z zgPWtg18ra*x)}dL=Qi_38c98@L2(fJMPvs0+#>Y7hp-1ej+fw{=%?w0Z{~JIHgh!> zU8q=$rf55M#GlcWHd>qP81_R09fb|>qA1^ocK8@N(x<{#(W!kG&B&)w{sxP<|Mzm? zh!3D07G0MjJP|F|M@Q5y?22~OH|`IL`mt!olhG8)bQ>i7b>2)E&p?*H$( z@WtKe3kSm^-bx*nMDLeH?^h2S$NjeG2s>kEJQE%1LUcDh5ci))JAO0D>oIF8w{T&@ z+t88i4u3QBfhOOSo zrWB2SC-x&6>C7nKg3kRNQNB0sKZFMKG}_@R^tsp3fYzf^_I}*|GRohhYvVWcXU+oI z4JlRa&=>lkt9lqV##_)YAZyT(e~NbSJ(|j0=%?a;Xdo5eO@UQIGgud`Z-jQ-5{F_} zbO70hxiIBVpaDFGzVIg6!MjoZ27T^FbZ&n`8z}f*`fMnIjVM<_JMM#?2LrGnPQ*I+ zK-_;1X)l}kkP9370^KIxVLkj04W!=2biXMY;HhXPx}#_PS!hOvpdV5r(7-Q^`*YC6 zdNcOLg=l}fu$cS*S1w#U|K=+AQ?U0_sw$#up)Ptpv_wbNGwh4b`B`XS!|^nnfM#k1 zI)GQu4%ecAzl%Qq2^Mqz|G>ZMCpjcsd%$Aaul|qkIw8q&yYP%)@Ah%Wxe& zhmE}dVcL$%aW>_h=;FTUBlf>3Tk=u*kl2BK$~E4c8t#R2DPMt$u;9n(3&(wE$Dg4c zk>;JDx=Oq)*e&1?|xL z!_c2*Z$>*_hi=oK(ckG-`Yf&T4(R>KQN9QL<#z#$L<24Qb;?+MJd1L6 z1Q$NI3VY&bI1#IFOaF55P8>z~C-iH2uW!=N18-vw$|b%{<)PT0@>kw#P* zJ!tx&0nEag_z#+)?9P_+HkO`~N{MOwH%m2~Yev z{WLrR$5MU@-B#s(N!zR%y1#3OP0)Sc7LUL#=!w@8OW?pLpC9)pqbKK;nEUs?S99S3 zaXq@v7laRDamr7jseTRZ;6t?GPtc=wC;FxHZ_LNz_N8;8DHfvK7Ciwwp#$lT_IK7k z_P-sDii(TTk!8^i=b$IvVzi^D(dXBpC*ntO|9kY{I)G-P@UO{|XaMEVfGdUdu|4Is zzq0?2<|0dl-hj^Gd^FNG(NumA<arrK9{L z^nPnJqvv2H9E+T^*~|@GnEJ=iMez(e$FHL!d=H(|&1l14MExGL!Tsp_|DkK-=mTkF z6|pYmQ_#gZ0$mGNqEj;si@N`>=fYKfJKDj6XaFnG2Unv%VHEs`Y+~w|9|A)spI3(2P>hAqZZmwJM_b%2b$ss`@!|FZwx4xRr^XY_E)r#u_`;-l#5KN$68 z{!8BvnqymC;I^w&c{?RBui4NoyG=p!U0ez9>!WVx>7v0}z1BF>KK3EQ` zVSTKP{n5ph#VU9wI+B;r_di0XU>kaZ?nT?l6v)d>%}W>4NEjlhI7H z3_GBKbVIl2WVGX%QGW-zW?n@*T7w)YnXTw^f1*co;X`&+&=c?pw8J%M>OV$Lx*yRLABu9(VyV6& zy80WS9kfF`JOd5%EOdY)qW=6W7dA8ro$Hxsif;+;Kwn&hj__f0Bu}A%yo?685pDPz zw4I%30KcQ#Ht(49etC3CtA*Kmaib~vLVGl2y)bvwqH}jK+VE`jx!ci^EkPT6JnC1V z@2^Im{~+qWM4#V<4sbv6UN&%kq(aP=*Uk)Q$83S>1ed!3Fvz>(2U%H z2KXS_;WJVH8and#(D%2X0e^+LpZ|a6!Z|vOF22&orUvVx9k)Uo?1E;dADWqS&<~#r zqJBcuUlHYN(D!db-(MK_mqz{5nEUz3ALOf@a`xGy~6|?LUvX{r?shKKOAw@F|+guh0&*qaFW(2J|=D!I5QB z!zIEp=<^lPj%uOL)koiJ9_0>E?yi3R_vgY6hM^-FhekLh>gPoLooEUlj`B+Mxix62 zKSbO4GVcF`2J}~y3!abyD~S%U4Cem+--%qZ6OSBig{g@I17GiRkLT8VzVx zcsn}s2hsK(MW0`Ru8r5x_CG=gy5j`)zZbt#VMBRk(+efhlvP6OYodWPM;q=GYE|+#o z8T5Wlw7wDgTwC=0u4q4l(LhF_&rQm5;iu9x^dPz&&B){EgD;>Du0u7j8#TgeM2;`=4deZdrzb7KZm~mGUk5&{{a`K{L5Sg-%z6b7do;dPKVqc67kmKe@1@BKfIUqV%^oR|Cay@A+>^0inSpTnm3P24YYa{95pBldOwkK^Jj9(Wa7;Bi&*a(~ov z2A)p&I&6;{(XZ#lt0wDU70O+)298JmKp}Gno{yWbJ+`Qpml=suurYoamZ#u92-#zZVVQUv#P})=hI=2Uk&UkJIr0 zcE&5}rC&(AimsKtXkdS0b^sR*>*wYEq+>RoM)?!$hbK13%l&crB%DQgJ)VJQG|bCf zgZH2*uhb|n_ovxIuoLBl;g{%I$#2X^aRl1_2JD6A?M7eh&?K$u znb?c+4d@(xf_7Y_Y3jHOI(4(q4&FxJFV-wQ*E75Uo!Yh79{*{UO)s={=+u?NldwgW3)W6%P&_as z%EQnGN1*%lLM(~X&<^II`~4ntn?8s>_YAu4*T((Nun^^M(1HDcKEDqgK=!|Q;OLfl zx!-ahgWl+hW}q*+7zd+~Ux@zBXb!sgmZAsLN;H5su^ev2>bNh;C$vfjP9t<1cSa7p zY-S`E^{Kcj9$1F1_E*sne;n=z51u@aV{5*^hz{<8_|aE4_Aci&@=l}^f#M((9{=cn*u10c3cx}uS1mkp@EM_ zpPzG>r`=FT^h-Pq9 zlqaD-MNdOBvamh--&8zGg(?03^Y90B5&nqof?shY9!6L3uns9hW6=>`jjr+qXv2%J z2QEW1_6HhB;f`tUk4Nk4bIq?A=aD^A7+SQ9;|2B9b0d~AvzqmdUm zJ)MM=&?)PSo`~0?8G0S>#trCPkLsE-IUdc_<>;c#PUT`U7jw{~_-{N9+jq;${c84M zbP5V}PpK^)Rzycy7hSZcqKm9Ax*bQNi+Bp!(M@QE7NJw|G%|JB%qv{jz!r35yTX6b z#ZszAnu>a82dATRJ}Al;ql@<%bjt3)D)>Kah##Tv73`V%IS$=DwQ^_n$zADZG!@06)xXdu>V;WT zIU*jI65fnHxCCwRd315Ug)W}=;{J!&f$|OYAc}+Hbqx=8*GJB&coWS?tuvFSpzpUqpYM#G4?W}l z&@H<>TlJYta$Ei@vxCovLkde^1=sk6o!hfUc1a{nFH3hkn>BL_f5i zj{1#gVBci9$milmbTJj~pH^!=nwdsuW=@Oxv(V?xM+2RXKDRJ@0zEfg!x|j)exLKN+oqmiwab zU5P{R9yAkwqEp*oaQfK25NA-n4TsWyru2~Xy?i1z=f)doM~CoiY&$f4DZK|hf`1Kb zoShmxC%g{5zZ{$3c5I7f&q-0UJOOk6{^u$#Tx@f!z+2Ij-H#{Xa&&QRM5mz4 zu+%_4x(4c@C*A32J6EDpl0{Fx`RF2i5PRZFXl9NY&i;2XwdcYQnStmWEkf7Cxw3*gEVLo{I)@X?PuazT7#2{cq$?P*DxP#BrE+Zt^0m zMfr2Q0t<~yfnANBaMz%jx&;kL^HJ+J=(v*#(4C3De%_l06U(SO$~LW!qwX! zZD=^UUnfTSCbYrD=m;MPUqs(~51rFb(2;$QX7(W3&atCX2J2yO%H7a@?#^=I5xfjd z=^JQd@1P_60B!h-@JIA0{R7Km(b0Li|MWt2^q`u7X5>1wgWJ(|A41!EJnElErzHCp z7rDsM7r&1OenUIT8t(T&T(c!N>wSeq1tGDi?BPI(zByH5zWv{ z^!YpE{=?{QSQWkhGVHnW!tU&x!BQd$ZfQ3cGyYUoI7qJf+e)l2XH+)@&%at_rH&F;he2P8(5FN@Btdg*JuDgqT6YI+%J4d+7)Hd z0P12xY=NE=W6}2?McaD@&Gc%lhnv;?U*OWT{~MrzbVVN=j4q<_=&qO?_p{-x*n|2d z=r^3b*coeHmOke%LKo@F=m6HD+xP=?F>lA*zyCQ9H}Wn|sVRd_NlkRFTA(8zh8`@J zVpF^WT>~4?hIgO`*&%d)m%bu(R3B?m?u6D)Km)$v3iiJZyh%lC+=k9gg)8%N|5&UZ znu#S?6Q4!DsChr9oG zaN+jo5?{pzU^mL=qA7m@ZD=Jn#*OHz&df;n3!{OQM5nBB)YnBb+XQ{SC+4Oab5o7E z|NhrZE^J^fw#R$WhQ34><4!yS4`Nk3eP-HbYmW$6L@0eSkwSZ&qsW z9JKv$=(f8O4PYha{{7F(T-fn@=!2if13S?X|AKDQ=bYtbSf`Fr{?C_?0Wr?*EwNY&?hZ`{?_1Z%P>%j-D5nWx1%y#Z)vC52KO4 zfhXg4=z~YxoGgkyR}x*E4bV(=z zRJ21ETh}NLMCWoucsV+UH=%(%jDC7Pk51vM=zf0}T`OOr?e9Ya&dkfLwQS}DE^N3e z`eG~e#jfdr%wTlHW1>6@owE68!;8^H_jKIf8y*Uex-|uO9J=_bqZw+Cxj+9uhYKUW z5Z$L2qa92`GjRj@!hH1G>;KS2_7VF0=ji)8qP!Q)$icAa{4{kHu?_WA(D%>9W3yb0 z<-!x`Dm3L;bg|rm2CxR*=Nr(DirkhuD2cA(Dp78MO(=KArkF)LdJfIht7tnPqKmcU z?d<p<4ThPos zhz{^AwB0QW*#D038!GJJCv*)Qjt2|hnaX7`H+N_Q?a{^58*OMfx=SuZ-=BmYWYe)c z&c$5d=m1|r+gWob``?B(QDMrzL8qehUFm=+ix*Hn8SQ8;R>nKg4qrgmz-wqmHlQ7R zfu{buDDR5$uV`Qg(dUoME=-Y}fM%dN+EI(B?-ZVir%`_{+TkN;2P@DKzk~+99v#p| z^trF1{8M-^>I>hU?q`qZ!YQbXZo}GWAnnnVorwlC20cJ7Mi<>I^iQ|$MpOI(8pvk! z`^2|c3lCv#doN1wwLq$oMEvLC^H- zqkJFw{F6~$i%!8u=yN}y@Be)t``$_1bR?6}_hv@@?dXV> zpi{FP^KlEB$v@H0kfINy=W1bd%1s~0riLa^VZ&J*g14ZHB>le<3=;rBQwp?O+oc&=*nu1zr7z(9eo&=HaxMnqm(s+MzGbMNhIjDc{|)WL1&E?5#i5%tfZ9j-;!#3$i)G=smOA67>^>T~SB&Rp2gAT;G8(Zw|d4PY*I z!aJ}deu{n=Rd_5NSWVIWe>OJ48BxCi>rws;tKm`0(ur9QucF)&>$?Bn=AtJ4j%K3b zN-A^7TYywKo6kbdf!H;F!OXeM@~fpzY5)M ztIz;{LDyJ|XW0L)=1$L~#nB&4?bz^IG~#>1mFS$lgTA)~U4%Qr{peI?R-{E%1bx05 z=FSzg{dVa4gIBQsy|^$Qn2I(y2aWJfbPX&)KVBcl#`qL&!0*rwmaj}};6-#QzQW#^ z_iSG7KVWbsI*_k%8vc%b3UH8RpG({9&F9mi+kkGLFT>sFzCIL|U6mSYhK{5sy7pGSAmCM=IXq601XLYj)>&;e$9a^a1E=&HW}UFBDy`~OvR&eo!Hf6R+{ne})E z`Xg1Dmr}|bho_>M>VgiWN0f)4=f-ffOT*3($6!U|IM7qw&D%Tm>f?+QE!VdTny14&F11S6&`@b3&rMPe|Ti^`rkFMe^ z=)OIKKG*p5G{QmX6b(mHJ_+sU+VB=Uh4S5Te;XJgxd!zga+Rn4s5ZA{2KeAjDqT*ll zU@7=!da)V0$l9U%xF0&lCKOFThp;NFP4PYDE;6XIdW7efLa5COW`7E@4FB)LpTe&sI z?|-?lgXU;z2A~hjMjN~z4QM5L4!nboXfry(FQWV-n#q0WF8Kr9j)&2KS9&*p%{f*co@DXM3af(^s-fu|DM&(5c&r zeX+s^DS!#soAUqAO#X|`eeq3cz-2eF|4nW6sA!Bn*d9$~A9M|zi>7!inweSXi0?$_ zd^x&kpGAKv-iSWG2i+Yi3`l9gO-S zAEiZAKFmi0s*bkP25qN1I<+G)w|2s*QJ4sYx;QYhE*w#Lq~oq`u=0+E?JKr$zMl#C+5EY|HFk19{Wiec~vyk zO`_ZxP2m9ax$~lY1-h87LsL5s-Cm2r<>6{Hpv~xWyRk0*iO0DAt9+XN%4H)o)eF$i z>u1olu^(Mz|DjWJ8_isYqyC1WjY|n6E$6uf? z{Dtn*f}f}D*9;xmc(kD`dY0deuAK+bZTdKx;%}n{A2jBdwM(W84P`rZ`m zgfqWl|4-y%9Tm<^)34Lqw?`Z7i`I`or(hg9!pZ1|%~W(`Gtj_p3ztUy3+UJL4d~+h zIqsL4Ezm{V7wvFDl&{5n z%J-w^$Z9+dcc9PJ`92*)9q=SS|A%qWog33JAK$?mXWCXZ!lq#-w4=W0+8BkN@e{&X;XUCB zJc9f0pu6V-Y=DJ+Oxv>wcBOnFx)xSq?(hGv<-!;Dp^N5Ebk!I6DJ{O^(U094I1(>J zSMx@6(fx*I;xBZql-QLPX&H14os2HFy69qWjjgfkF7|&fE@n~D88@SWl-r#;I0@Yi zr=c0>iKch}x>!e}BbkA&h51oljxNsE&eOh;s8NcZ_oPY*Y+DM|cj}@fb9f zlj8mr=&ta2?>~(O^b)$bHle#?f80O%=NK3oNIp6Rb_iu^&_ajr8%{&t~*2ImE!tXJ+ z7|}?J>`No8iFVWm%|I`7O^k~Bm!fN74*J~E@Oi97`E9h_UorRjf5fk;p|WB9@HBK} zL!x{!x__@nNB$H#6)#~vu0%co`bNb?8WLi}F3_dGQ!JqQB4#{fh=#_|NnmvI2U)H#&u9;X^n9^RVP!somrL zV*fj$ic~l!jnR+O(ec1ow1de}KMf6ZCVGI}8uu5Y9X=ZM|3e4z5;}kl;bt_`U!nut zn~jS@XoE)`Nc*-l`e0?Wp~g|}h@&a@L!W;!>erzs-PZ6Y^u51vHWoXW+PfXcQGOU3 zVD{KU>4a;Kp6TbKFW!VMlEvt!*~3@|-$Y0H3+CgW=;A%$a5@3cL_aGgV?%rn{m!@p zeed`1Fp`06ChzYwk`m}*s(_}ZQPj7^_LRGabI~LEJ@mQn(SUzNGgjcAl!;R4$yhDQ zUD3ro6n$@WuAa~T$z1rMa~&GtTr{<}p$*=LJ@F~*fPbTzY5Q;Ls0*&6JQ(}qN&lq) zFAZ-(*Vx18!So_J&@GtT|GT+x-~NYobRtWzJB~$Pcovu8CiLfps|pm%HFyXeQHi{Q zxr3=3x&}I+Bkzw6;0pB9@&qTB?{)R^!hbS+$t?y6aZ3a0=5=R7K!Q?VHB=woyd9Yj-p z>JbHVKO0U*N4x^<_?0Msj0XHQ+TrfFzaO2_qDQ9sQfOw%qk*(JGMgIgK}BUM2A~~W zfi^TV9-M=I)440|FGknMBT>Hs?PwL6;@8j-ZbF~?0$bxwtcg{QDwzBJ&@;=0+vHv} zqW95Meu;Lt8$Cew#r=cm93ORb%0PMay~b#L`>5}Sc04Z1SD=f09@_2#^q|Ww;=&H^ z3zvtlpc!}5O<*ayzMcun6NhGP1qL?qnS9Pcv?h*(f$26n&NfgR&-!H(e3>U z8er8DX#fo{>j+wMp*_%%pA+SA=*Xs_FWwmS3($@p4POY~K|A~$ZRa~QQ~S`hb13SI zADgD)#ADh2uG+>__&{g$YxH2Ofm6`TEI}97W9Y&23_2wn&;UP=`#a*nxKN7rGXXC>^^8-RJpHu8t0% zDLOS>queL%XV2rJ3pXZXAAAufVUgns=Kki>RCMuuj~<;Rj!ywKMgwh)PEijukTcOK z8HRQ|F3Qu<0nSCATYveXeeqWC!%a>#T4-x^~_} zJJ^E;b^vpqu2_xoi6^8?bi_jLv+i7&;@)V4gV2xNkvI>hqYV}>n=FrxusZtQDd_e) z742{!x~7Jq0Z%}u07o-NRh`l6W{jAm*K8t6nk4X0IL|9j&NDoowG@!&`C;1_7aKcN{oh^DaU ziK(NL(fZcm8R-4tasTqDpND?@E+|zQq>!Gy3scqf&alZkCJpsA!E1@#vG%H=&j|m-5Bf z1OLG`*e$qOq9`cRuCP(|L(Zst}!-q z@3rQdYwi7(6hZ(!tfN5fXeQVZ^qD_>S?7gR28_p_2(|_9fO=|bmJ9a(jK>mCg$tB- z;$dKG)|J~cw#dJdr^s5e;!P;agppq}TZpq~4VpbCV8dOswB`uIK>)I0w} zP%otA=HCv!#`-j<_sC-}6A5Om?-VQmDzPZ2YgQUm$JIa;YGT+K)T=ohR3ovVUdiJ? zebAW)ivNkNw}EQp1gJ)T0CfW1$4pe{Z%|(lq;24=GlFU?H>l^iD5!#wpoHT=y^tn= zMZi5^VekiAr)}u0%Yo8uZ|lys9_}Fj{}&S-?O3n__%=8Kya|>Edo*(H))}BaXlw(k zgD*in1=Sln_reBHuil5CPUI!1_e$0#&W4(Ux;Z-K_dz*1}1=d5iJBuf@eT|UjH|!dntc2r_t9zom3)N3fu&~30?#9P~TOf zxs%WVEY3O()KM=m|8h__&3;gq>L*aw@FA#6l%j>*L!j=J0-$cfvY>9>CgyJq>V$fN z+F%6e|NS46nCO-HA?N`wfNJ0gD8b-2oDVkHKnWKG^=f?`)KPZM0rqDt`>v6r2X?z3?rl4W4c7b#A`vIJA@dppNvVVTLx&5#|AP*B7#NMNqt& zpq}HVw(bi?vmONMX1fIHi_r(53TJBTy!o<&dTQ!;ndqho0d?)i8euh9hV@B{{|)Nn zeg1aN4l5W|0d*2JK<%i3`CEc&psmHjLESSk=J(p#JCBL(;+3Fomg}Gz`VrJqk*dA3 zgX*B3g3h2m?hgZtf=j><@E}+YEYZPv0#001*jAF0o0|r2XdnP{$D0~69sj2 zc9;g#QRf5o$!2L#pN=;LbuIgW+F1;!OEwYIJv1LI4Xy*#_(f0+r|aZ=UQhxE<78f6`BIxo&_u`rkp_OBw!>e|PGjltod z8s7=(WWE8_;5AUM;Pl;`{LG-|cfi8kgI#}s8G1O6qq`^1e_b3cdODw#P6c%@8~}B# zzX7$w3!r#6L0vmfFQ;%tFazt_piZVasEzai_1Jk07lV3nZ3lHpPJ?RjPA{H+eb{_% zfh@h9qbmmLDX0PJGo7xWF40<0iHAU))Fn{Q|7}nWzXbJaP2b1aNC{8{%NsTU^_2Ah zbxA_KOe!%M0P6W)0IH$ApdPPt=6?=`vM$os@lOSHGM|CE1U^uY*B*t`tTbR;&hrBR0Bmp9c@ieH&s(mN8cILPWyv8(l}83>4qPID*QR9 zdtpDQr{O11?}POH9DW55J^ueUCMwVwRA*s^F`zmh4r-@fP&eaLP?z9+i?0Q>lg~jl zyw&gksEwTh#lHcn(TAXPQ-|ta@$ydgPx!6Zpmx*-)K2?@5*}ta22_I+Ks7SUa51O? z>p&IQ4eH)F1FE6xpbGvBO79^k{u3efT^Yh0VnI+RQ3g~(ZBPjfK?ybob@UxU-Hd(A zKMGW1lPx|QR3nQ(y|6ZbDtN%~g8A=({@?%M3U?B6gW6dcP>)j`P$$w6)QLoay4y#C zy0-H{UDIu#Ue(t@U8<*`8V&AmFC0)h#XvPu*RXwmo_`e#!y!xnB`^`xj%I;+oRUCY z%gwglYk1xK&q1ABx&e+(9#A_k399kBpq`Glpm?1?)e9Zqb%f(_sNgsw%m9_R0MtpW z1tqW-6z>qIBR&a=cN^5s{seW&(ndHZkQtOeAE--K4%8d;4f98PnMfdjvstUNrRLuV z>L~YuI+^338aNN?F}rE;hoD|GFG0OvUWs&g`9b9sH>?2aBx{1YIlax8XosCZbshz( zfgzwe9tY~9)nZTuE`#Fz21@ubs2#cnI+z{Qy-*AkzX2#-S5O=63+m*CfSiQaHHnFK zxC+#@*#v55dqExf8Czcj)!02-KLb@bW0d3ffZACFP&a8^!)~B-<3RDpfjXhNp#S&( zE;7O@P>xGdaY0b|RY4W12WrPHK^=K_Pz^XKXm#rp+RqkkCw4eFYwje33TFq^cnMH9 zV=Yi8(az$%V|o516puqEF$L6mE~rjdgSuJPgKE@g@tvTaj+3B1Pq+{2$TJLfHj)pN zUNKNQl|kv&0@X+x^M`qvXy;LeLqQS8f!gsr^REW|Plw@NP&+wk@$2Tl3u?ztK;@?& z;$Q(#m$o9P6RQoX5pPSIgn$wpW;hAdHJt-$=bwQR*bHiCyUc$S)CrvgC43PS?~dU^ zP>sI;RWL)Gb0UR7HtuzmG)EOso!16+*S5BGZ&25AFsQqKlKGdJe+wx75%XUL)yREN zm*@qkk0E*D9bPq1dd;{Mpf1s3Pz|gFCA7)n+dv)h zK~NuVuYme8{Shd=jEN3EFR1)Np!56xnTSvw)SIs{sB7K=R6}h+-K70MH8Kd)35@`C z^wU5!wgB`$HRfLrYGb=W6+8v1u}h$MzbEqiOZbTqQw(*8IYIdgfGSYZu$IMJg1TfK zK^e@aB)p^!o z&N??Jp|YS(u##atPz|&KrQaQtekkaF-xyBuGLgVSP&--zD)AG;t)PzZpy35jm*6fa z;XiHt5|mE*;SN6ws7qKFbb}>8ZKO1)4OF(Zw-ys!lZK!Yx`S$@FQ~!;4M&5z7v45p z3QA}*sIO$UgKFq2Pa+vsZwORk zUr?VqC4&AhuR&d^ZJ_dw8eRp}=&zs}a*uS5K0T;)K2W+vz#Mx1OEJ+ksb_?apgtq& z394Yc;XF_$p05<@gJL`pl^cI0uXa>wu|7JKqmz1Xk7aAIGEu zxEd7UB3Kd3ImY=`N^>xT^$@T%cp9t;7JAFU9$+)p^T7JxRj?pffSX&WZ*uE{RBx~e zI0jVyKF}M@>QIR1D;g1Y|i=;CAN7|~q#Tu#9Me?rKAko7zga&jC0N_;;2 z`rJ{!Gr!FR{Te?%Y59*WVpf?uvWD(Xvj<%8S*9yjRx}Q=o|A&}k0sce0n=Q*H#4F;XrLN9Zb*@uB&Eamjh+?kESSL>I)eXA;=ke#_eXidfjnvd zSRdl+&ECccU2MlhWLbJoPb6( zo7_NrHhF7U^FMh1W985IvoeY^`r@lc&0Im8{{cIqOe77mV>w7rHj8z7l2>p- z58-`={{+czA(8@oMuV-b$%P<4B<=bN&TwLbP2&ju1^AaR_%FfzHXFSv%$Di;kFW-Q zA}I;sj|t9zxWJC@d$21auOYCG`6)QZ$lFeV>Z~W?=iTBO2o@l>0Jwzwnl!)J3ihH# zTDUX)<%xlF;Hkdfd=%KnY`#_qS3*cO9=~iMLP<0j$0$zX2;%(_l&!MsUyYb7E%}4s zq-I3m`@))7PZOPt`w5%iqrTU5+8lop?2Tx+6_k)dS55RY;zNih;yXy;Tvq%$_$3hg z3tk%I@&nGU_wj9(2v&)cxJ(nNEhitsUl32w^M4nCnJmtd^ccb++j)L=QI5owkY_WO z9VLE>d1kmJX{a0Va1$LvflS15vUZy<3axbHcZOGtocF+vrnOR>k_>*p-Bq5>^}$3I zVJC2h0zDCEP15|7a|)gJ|Fq~T%2dN!$_~}Z;jTe;AQ`ghD4an4M|i4MnhIr^e?u$T z;dqnf@;@89mJ-WIPAPJ>n??y9?tI|e2upm zNvmkAA44_^EQR1I3eRBP4DKN~vX$iXv%0Q#X)+}{Zg2htU}k*l$dUcR`crt9EZ$JR zt*0r;^$~sp!IqHt|JDDo5SyprQ^DuN7Z7QHpscY2uG+TiuMyQ}2TRb~P7^696tJ~$ zR&zqKE$GPFfoZ&u){gZL`*&$wPwiH(BT4Bt3J(!%?h2FlaeR*DoxXbJ`A zFn?^q5)aiMW+CWYVcybq9q?CW?ahjCV-nXuDr^n>K;U~sQ?gz{(K@WJPbb7=8hH+K@TDyuJ(K-TqST}^UlScFj*hOM_Aci5d({?lmUcf#iHk9W6 z#MjhzUYnf7(m_G)S+Z*V- z#!2M1!Zj#Rm!hN4ct&0Xx|glE^3I{_-2~w|36mKmaFk)pW5}-3%-i_;vF-pbx#dC7 zfAioR%Y1vXc)T?r{#A+=rO{C|cEK86LK9)cmgutuStpWH@`??jP%enFktE9QvCe@1 zN9I-Rl2kB`;w{PTW9txvn~_(U^$kuVU>|YaqY=a@%L+2` z(ulVZ0+$)DQT!yM2E{*Ohw0dL2mBjIs)7F{Vlp@DAFNTWpRkK9#6GfPeL!w7MY_ZJ zmf}azt4K^=XUjs#m(_MOysmI|KGE^HHc>DOff-idw`3=A4dLVPCeZbd@H$cSgo%~G zztrX-hNFr57{eI9+bOg|BQ4F;gcA?0)Mty;5tF$g9kA>89YqdM{4NP^G2SEL55Q_W=rzGo+rgs6&yTslg_5s@6S!aT?humKo{BtSi5&8?lBz8R9 zc3lDFpR@Wc3}Sv72-rddWq(_dPQ(gZGi#WqwE0Lhs@dGh;A=0_X^D0@oTEYi^QYfi zm5Jk+f#@8r=NQIOf}2Qqg;9nEZ-MRE-K%g1SfhtoH?a93up6-o4PSl^&=Q(z$@ zoCe>fx!+7wVo~_|qVpQ@VKi~mavw0?g61(!q!`$m^>k~XAihX=-a828BRCUL{`$-H z1%mGzDIURHkP3nC+Ohr!79~Ct|K}9m%P#tmD_e+vvGKId&3cVBqjgPcHK5Vu|N6YH zHIO>tjHbJK5GtG46~vd)SboSQl#T5nb`$&rF8}b;l?Rj+qrn^uSw|WQ*a@3dM|Uc9 zqRHWR0QjvV`gZ^G>{93+gps)RFb^Xk1#8(&?b1)?4N3Af8mdH*`BreU@kYSi!TdwU zec}(%7{X~>2Mgf)%{F!d{nKc?p+@xlEymG;A&Z3E!UTV!=q-F6M1m3IAAY)iM`ShJ zN5r04Q_5RU{BJApD*TU#HRW_J;QNYV0lP=6mNk9~zyJAnQ*;^P8!6n=8ZnNm0wQN1 zc0lkcyag5?1HZWmN28vX24vZZ_XjV-t$|2p6Y86+*>!N1Yxk<(2V!zNPQm5`SKv=# zp2y-fN$N)TosGPWg8PX5VTA)4_w5u;8y29+DezXJB^wU^HtWIEc&h)cJr#k`7FCk^0XJRsoB7Z>AU(M_xDYYfWk<`FiF3vWaGukE-mGCL@50RgqtCkb~ zTh`cIigbm4fpsO~FUaE?@~(xf2aq#VU&g$&v-98_L~?ov_n2p9$V!91)Ad6HE`e9^ z?F5tC9tsU0cN*N&?EbWxF~S0N`zx_0ww^}eBGi1-zh?ixB6b!5-E&7sUJao-2^;Os zY6AIv#^+FuqdE=@Cti@eW8^ib*aYHTX#5=U^^6AWbSCQ^#ANNzYzgO2@?4CGjQ5DY z@0A0)rv{Rl{tjYzvh^%@Zy^@A?G?&J133}-g+?o}?qH`9g;sHzc#YU8(}$1 zahX^Zxa(-jJDo*c60*@l2q7k`XD89p3d~5>>_UVmkhhQg4dlfjDk}$v zUq#?5M!_WfJ?tc|7>d(d_uqDk%t7FF0(T%*pjZj;HHv+Y$eYA}W<15`X4GL`68~Zf z25d9)2Q(r(4vr)K1LGe2Icm_Jh!m{7=ssZmkh$vnEhUS>5Zwenpn+)Cdui$f#WK^_ z6n51f>lRtA$-+c;Z9lBs?fiVQ&fHN@UR z=sAh?nNMQuVl8W<2H?rU5ov8gAHvx~uB^X*M?59u%hIr+ZVXv^a4h*fh`peZzHqmo z>EHi$L}a6J?t(bZx|Xj#2_-n*-T1x)U$D-o09L{Z54OVcjnW_36^fLn$yRn+j+dtm zjniyuB;(Cgf%CU$BkQ~>!8DfmjE3T^&@$p_Xm&X9r!+JXloerTMXZSlhM$r1Ee-ra z!9?5OWO!|?Mp^v+{Xan{mPJz%Yguw0)?M-QlNzpP2=VJkT%%aaK4#p-&rkZenws!< zYh)u$7qVuj5U)e?L&@z29wxTjuki05OT2W{g22}h#xR$aBJm|6S7>4rMMpE=Piz^@ zH9~9~n9WXSCjJ!6v-@|02K=UIU8kW^_!far(0gKW>0h&EHTRAq&J%PA(r)HIGXIhWs?ks=oQbRhmVocNExO}>8$DSQ=Ba7y1z3ih zpQ+ak|L6XOxc`5)&O}Z_(d3p6(Nz>2LsG023kBye8X_8Lz6o|(Gg!|+pq3T?go346 z?}a;-O?-uZI^)h#uAaXGII}alla!OSY`-;ifTXb`C%27==Ej%9gubG|YY@iZ%fKj1 zPBz;}S&Gy}E1r$K%Luc^g7AG!o;L-KB)bG1z|A&4j(BCnexO)I$feBR8S!=a7Lr`W ziWES&CH!pg(vVXce<)*vbv=UIM%0;P{59mt4yR=QL#?CyblMj2Vu<{W$Pkj6BK(r^ zCTrPG4*c_HNg7Fj_r#hT0`D66yIA+6*gG_J3C(~VMe9q}&G0wzYjXa}NeEb3<|kPM z(bQbJTtLFti2cQUopm4JKF7Bak#8+uKaus9ZRQc&(d6E+oqk25saeauCnuHhj_CT| zL7-K#E=9^?qA_%OhS)@!@FEhhFY(KYfy+&}7U&_bEWTU9~{)YwJwnNeIqBAd=*Y@a{7{!XIM=C*d#8`VoVlXK>9y^cGqv_)MxU zO>9Q15W4NaW5nEWzC$k;IzjL-?VtBKj0F#ihia|8=pk$0`*FA;f)Zy;RRB!qUe z-mSRp&PD73Ymcqdv%XIQD_Li@JbyBOltHhwzK!+N$k%Yxp+gS>MeO)Ru0s50nv)%% z=m*B1M3XNO@6O0V-UpWRIsVIVYqP!p_bc!*>%VAVp+vAe*32kNL_!zlg%CeMQeAujJAt6= zL&g_0zXWb(I7jf0v`f$hetqUE7&+1TfLg!%vp5-j8~YgKFGw6@2`dPuW-XiSfNLw_ zH|=N_v$J=}8^HP}<5k5sn!?GgFzZ_IGSawy8fyr35?Qw;rzh)i%>B<_3_=%J1gw|M z>(TjXo4#g2Uw$qz|-+pc9b=9@^0gCpC)sL1*f&0T{tp28W~z3f-kzk$CKm#rXn(3-gg zXRbA=SY<{HyZ>ATAswZGPe@!tp{};;qwH`9h29}~IbCn2Kn&|Yz!UgBhueg_Tkz^K zA47gRMsD(Fp?O7dus(cQLvpjwL_X#NL6bTQYlF}z&Nx6)|9=F^1i2TtNDqch@%+2!BhGn$Zntw!<5 zzGU=As~+Pu=HXroOtzvgaDFZU3WZSUCi7efj%U3%v57QM0sIb*tQQ5&&};&n zcN~}N6N??AP%Op22hYMAW^q9l{JF_l$$T}jINAR z2sJ1981t9RGtk&u_W zMpI&u#P%l>dJ~~$HI?1&1k-vk+^AUTGSbO~XXgd%c*&k@GcHV#7RFF?X zXos_h2{<(8&oacbAXW{rZU{_9=yiCBG?3h0fzuX$C2KM-!Aoe$W|;0zrZ@* zQ0q?1r{Qd1ElUHZ8uOFzWJjnJgl{5MZ-TN0#AcvT9bYNN2H_^$ML#0zJB8 zUbXY6M6d?MWO)eoAyKy3;?s!@rkLy~V-f3E3KimPn#0-6`Vi|l@BsO;{S^Ad8r6Cc z`TdE@j)4&=_!^}oglQ~ZV^{4`=-c>nDxBAs60S@pGu-eFzG<+Rv(M?))-uELa9+n> z0es3!syZj^V?DoUm4cFV7NfX-o#scj~@+8}f3JfQf z5rIC;hcOScGn)s#Lhi>Dd_m4o^M8zHH^kde{0(d1U36p6$O<=L?e(R6D8%(v{8NHA zS$Bu{3BnIdaJPxfCUX+8maN~k6B)$%897-PvKHh_v<+M|j{IksKc}%0G%^ouSql9` z%AXXih+_+Zju2$wkZ0kJdq27wt7`IPw+;x{NL8*Rm$70-j6 zp4Jl>YbZDser0eiV;(-;f3Dn!bzl@=1gs>J!mP6+zKGN40lq0EMCnVp*(ARt_#|2Pwec+^`CKwzX@oXf12wGp zO7db53RqVBUDFvPjw zX4a|U{Fdxk3y@ojBD1WClh$y3ny<}#82l)-W37R=j5h#(d34$a{%Xc&NB22c8uF(U zE5nc#LTn$tv7k&^jX1_f7T=5ieHx4;aGWupQP8;Jucwi6reB?AMo0kr1N2Tek+%@& zOLr5jLlI6xeg~mkw&O>v7voRF*O(oYNydF*1tN$og}<0FfF_Hx4r2Z~IG>z@@HR02 zlrdR9kuo2V+Xx@V5rX(0=F`FEkZUoD(%=|`WP2Go{4+k;Auoug12z@TO54m@3N|I) z7){x)=*TYOpN)RF>6J{$_0NFw2EheNW?lsH3Q+bnN4ElzJ@``bIb?oBQ&F@ku`Te2 z`dQ8&pIFXeJBgpjIR!s2`5hQ(h!-R0HEZ&q_>)c@O3q3AU)xEf#h;RKoSdFCawXXbx$vzc|3mowK$*8a0z)D7w<6z? zEW5zY^MF&?L1o5oBo$`74KFXk#b|69oVS?2j&D7&bu=~zf528TpG=dzWZ3#7HhaIiK^p>oQGv@mY?sev8;s1@l74!S- zx(iKRr=d;ccf~gd{l6Gx;LC~-|K3YS0h@vNr*{1E&0};qgB@ohYgW9R6dnd| zBfKu?6~Nbpd0UDmf?L5IzbB zC~Q_F6Mj@yF|^(Rcyx8*5fYWq-qW!OcJe&A=aY|NqG3x&qi~ zL?7DmRH3om%=6NK>;%I57*pZM-eY`EtPaHfg?qmB55b$g4`D2~4#iESX)Bq_PwfuD{>MkVuSp}`dt?#V_D z895ccHE4c{e+oH4jNx|DVd%@eLvf5@@)hGf<|nOt1)nkgBB>%myNE^6%$p?EX8sPi znV9TtipuiP@G%O8(%3inE)$O-XCBSAC;lxto6vtrel5n7v|Rs02&+jLNw5!dok)F> z=R@4g_zBU{ta}ry0WLwbI{u0jn#Nkz$xdP`e%UxQy1-9M;U2`cQEUO+Ep{m?;P1z# zcIw}+1?+W_|1hCf36`WlPg{QvX*B|`v+fD+6aun8DAWznZ16J@^MM;#AEn8e6b)Dg z;|~MJ!rKfdiQo)B)Lz&3n+;eJ8E^o(o>K4%0I zKbWlWM{v6kkE79EIx!k}j($(ZST^LXNRgd5%aK$BM^P&#I6#5-NOoEG@?F*%3x+Ez zkMMPPhm8{kj<*fug>#*_QtE=Ysj&oZNBk|pBl=OE^VaPs6ZEU{$L|o%B9?<)^`Obu zLD_hA5wI|Pku{)-*F%{Q8FUbq&ZW;-*Kv_*h zTUbG@2b)L++x?DYvAVX~AIO)b=JSNRX#P&~OZ*<59_FL*Elt+UoA7h%mAc%V+pYL7 z2(E=Zlce_`wF19G=oe05B|Gd&EUWFH9$X*(CHQxMY0%0^>@@sJ>Y3zzEBE&h`$y&0rQc2kWG9G=QZXB z;CxAuOpJqYi_&<&c2KvX{zbwvNL?6xalAv)BLtr(6CF)Vb`M{5JNEv}J2MthtS-LF zjFc43Z_Ni=v&wUGIowwG7LCaAlXrznssBISZ%ypFYViQ!U0?~4s?fD;9zK27BQ3m6 zCXx-`HaLgzj|ZE9LoCMBb=GpXQLI1nofb>Qx`b_{j(*0c7CZbL;c*DcCPFC6PM(4> zjGCOxG;46boyNNk)&K9^*D~J;Z=mH@VfS$qTV(~C6Yob}G#puRw1Sz>V|eFLsICze zY-A#DQ&jd2iKD^8?4TsgeoWE}JLb3GoHhP=c$Znn`?I)t;cg}N8_gV~;8e!@toPcb z*#duvew61Lg7+a8CizpGvd7GQ5Q~7x?SM7927aOyz6W8V9rX91}A&}%Tb%_*cI{zjEAgyF`AQDfySmFHkS2Uh|98=&{epyZ?t=2 z-^2fz^?vxbX)*`vF#I8me(2|8tRm;GnpS;n`j(08BdH<8d<6S257-BY$nKLYJ4>Qm_NQM)>X!Z^C>sz6@yIMyD~2&L;mCbXTb;_BAIV^Y8z2h^HX@$q0p%-AIWv zkYL2YU_D~{De$f}wv&RNk@GFS?#YhzEW(rFwxx+a;`mE(s^WM`geJztg~ud#5+VnM z`wj&KWl7YH$%Vor6Cy}5saR%N|Cf~SRLY>z z*^^@O2EFR5o;Rps_N1F-gLe9kl?$4l*SDxe(AJbG8-&rTuT|Ti8!3FdItBG9>MJuc zs8zQ@97sF9^(m#kB=M>6CUR2PlE{&kz|JtjSLMh=V}w{35|{U|4bel z8JCb4673npVMfOIRgzZB3+k9uYJO0)q`UKiGWnLx52~9oX<;#UdSAyyL5Is`Dc_}4 zgEpQ9{ze9I!F;)n1f6&LDjW;yRou7dQBe6Z>HfW5zF$1iDGdMOrYD7ZpP)D<8kB!|!+)4MFyW9D0H+QGakh<}K z5B9Aa8t!}8$$dR-(#SsUqdsq6_tjKc`VEZ@^OR`RqH#%ATg{WA2e{{^@Xu02xT`ud z?*MmBU&jdd_TZ$<(eB(?Tkl&J7vhQK)JKNxTgnL~)rfZY%+X;)Xhd`@4?wbrZ$-4b zb?Ve%R{wFlJ573DORxL;RGB*tj@!3%XlS^n@xYLn0kOVvliib3`Z~>Y7fhR`O?YDb z;Qb4ueIw_&2WAf%?7O|%Jt32Cn9sd6MfY~(k=AcSbcknUNW{LS1H)rNT;?4W88${C z&(INrLPpYEx&IXz8FJu*kdfT^VX>b6aj`K8BLbYHsXN@oTK%We$PgZ;q2d3b6hqPI zaAaZw*`84YWBc_{{eNRg&v&>>B+Xdm&YDzrr#n?z?!|-=gSkt6jd!}Yr1h0PK z5H7n8ny%ub5(o3X^~5Kz&zSHiPl@>G$U*y-MkT$t=Ps1=?4ElCS9$5r?pCSNXrDT9 z--F-X{eps`eH|aUQ>895G~Bsb`xkm%^Izro5iy|=T))VXdcHiP!a@>4;$suzLc_=S zWDB64B%0`b2LeShW(P7@sHD=9c%a6;1G`GWKKuH*~e?asA^+u`5$6Ca&C zv3h2Gn+gO^3d-JgWK4)&U9qlzX1?~G;D{or+Jr>J#wGf8H4aX6`{J7gZw>ZeWncN0 z!ApaKLVPFN1gFT%OE777ui#gFcY6i5PXC&O6J3D|=&y5Ny{$($b(6YB2AB80OA=k& z-U06ik-8 T#DpK%^?(1+5IZ3_Wy=2pLyp%$ diff --git a/netbox/translations/cs/LC_MESSAGES/django.po b/netbox/translations/cs/LC_MESSAGES/django.po index 2a5e42b12..fdd9a8b88 100644 --- a/netbox/translations/cs/LC_MESSAGES/django.po +++ b/netbox/translations/cs/LC_MESSAGES/django.po @@ -4,10 +4,10 @@ # FIRST AUTHOR , YEAR. # # Translators: -# czarnian, 2024 -# Jeremy Stretch, 2024 # Pavel Valach, 2024 # Matěj Gordon, 2025 +# czarnian, 2025 +# Jeremy Stretch, 2025 # #, fuzzy msgid "" @@ -16,7 +16,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: Matěj Gordon, 2025\n" +"Last-Translator: Jeremy Stretch, 2025\n" "Language-Team: Czech (https://app.transifex.com/netbox-community/teams/178115/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,7 @@ msgstr "Naposledy použitý" #: netbox/templates/users/token.html:47 netbox/users/forms/bulk_edit.py:122 #: netbox/users/forms/model_forms.py:124 msgid "Allowed IPs" -msgstr "Povolené IP adresy" +msgstr "Povolené adresy IP" #: netbox/account/views.py:114 #, python-brace-format @@ -179,7 +179,7 @@ msgstr "Region (zkratka)" #: netbox/ipam/filtersets.py:974 netbox/virtualization/filtersets.py:58 #: netbox/virtualization/filtersets.py:186 msgid "Site group (ID)" -msgstr "Skupina stránek (ID)" +msgstr "Skupina míst (ID)" #: netbox/circuits/filtersets.py:51 netbox/circuits/filtersets.py:218 #: netbox/dcim/filtersets.py:135 netbox/dcim/filtersets.py:232 @@ -191,7 +191,7 @@ msgstr "Skupina stránek (ID)" #: netbox/virtualization/filtersets.py:65 #: netbox/virtualization/filtersets.py:193 msgid "Site group (slug)" -msgstr "Skupina stránek (slug)" +msgstr "Skupina míst (zkratka)" #: netbox/circuits/filtersets.py:56 netbox/circuits/forms/bulk_edit.py:188 #: netbox/circuits/forms/bulk_edit.py:216 @@ -252,7 +252,7 @@ msgstr "Skupina stránek (slug)" #: netbox/vpn/forms/filtersets.py:266 netbox/wireless/forms/model_forms.py:76 #: netbox/wireless/forms/model_forms.py:118 msgid "Site" -msgstr "Stránky" +msgstr "Místo" #: netbox/circuits/filtersets.py:62 netbox/circuits/filtersets.py:229 #: netbox/circuits/filtersets.py:274 netbox/dcim/filtersets.py:242 @@ -262,7 +262,7 @@ msgstr "Stránky" #: netbox/virtualization/filtersets.py:75 #: netbox/virtualization/filtersets.py:203 netbox/vpn/filtersets.py:363 msgid "Site (slug)" -msgstr "Místo (slug)" +msgstr "Místo (zkratka)" #: netbox/circuits/filtersets.py:67 msgid "ASN (ID)" @@ -316,7 +316,7 @@ msgstr "Typ okruhu (URL zkratka)" #: netbox/ipam/filtersets.py:985 netbox/virtualization/filtersets.py:69 #: netbox/virtualization/filtersets.py:197 netbox/vpn/filtersets.py:368 msgid "Site (ID)" -msgstr "Stránky (ID)" +msgstr "Místo (ID)" #: netbox/circuits/filtersets.py:233 netbox/circuits/filtersets.py:237 msgid "Termination A (ID)" @@ -371,15 +371,15 @@ msgstr "Síť poskytovatele (ID)" #: netbox/circuits/filtersets.py:335 msgid "Circuit (ID)" -msgstr "Obvod (ID)" +msgstr "Okruh (ID)" #: netbox/circuits/filtersets.py:341 msgid "Circuit (CID)" -msgstr "Obvod (CID)" +msgstr "Okruh (CID)" #: netbox/circuits/filtersets.py:345 msgid "Circuit group (ID)" -msgstr "Skupina obvodů (ID)" +msgstr "Skupina okruhů (ID)" #: netbox/circuits/filtersets.py:351 msgid "Circuit group (slug)" @@ -804,7 +804,7 @@ msgstr "Datum ukončení" #: netbox/circuits/forms/bulk_edit.py:158 #: netbox/circuits/forms/filtersets.py:186 msgid "Commit rate (Kbps)" -msgstr "Rychlost odevzdání (Kbps)" +msgstr "Smluvní rychlost (Kbps)" #: netbox/circuits/forms/bulk_edit.py:173 #: netbox/circuits/forms/model_forms.py:112 @@ -1042,7 +1042,7 @@ msgstr "Region" #: netbox/virtualization/forms/filtersets.py:138 #: netbox/virtualization/forms/model_forms.py:98 msgid "Site group" -msgstr "Skupina stránek" +msgstr "Skupina míst" #: netbox/circuits/forms/filtersets.py:65 #: netbox/circuits/forms/filtersets.py:83 @@ -1160,19 +1160,19 @@ msgstr "barva" #: netbox/circuits/models/circuits.py:36 msgid "circuit type" -msgstr "typ obvodu" +msgstr "typ okruhu" #: netbox/circuits/models/circuits.py:37 msgid "circuit types" -msgstr "typy obvodů" +msgstr "typy okruhů" #: netbox/circuits/models/circuits.py:48 msgid "circuit ID" -msgstr "ID obvodu" +msgstr "ID okruhu" #: netbox/circuits/models/circuits.py:49 msgid "Unique circuit ID" -msgstr "Jedinečné ID obvodu" +msgstr "Jedinečné ID okruhu" #: netbox/circuits/models/circuits.py:69 netbox/core/models/data.py:52 #: netbox/core/models/jobs.py:85 netbox/dcim/models/cables.py:49 @@ -1194,11 +1194,11 @@ msgstr "nainstalován" #: netbox/circuits/models/circuits.py:89 msgid "terminates" -msgstr "ukončí" +msgstr "končí" #: netbox/circuits/models/circuits.py:94 msgid "commit rate (Kbps)" -msgstr "rychlost odevzdání (Kbps)" +msgstr "smluvní rychlost (Kbps)" #: netbox/circuits/models/circuits.py:95 msgid "Committed rate" @@ -1214,11 +1214,11 @@ msgstr "okruhy" #: netbox/circuits/models/circuits.py:170 msgid "circuit group" -msgstr "skupina obvodů" +msgstr "skupina okruhů" #: netbox/circuits/models/circuits.py:171 msgid "circuit groups" -msgstr "skupiny obvodů" +msgstr "skupiny okruhů" #: netbox/circuits/models/circuits.py:195 netbox/ipam/models/fhrp.py:93 #: netbox/tenancy/models/contacts.py:134 @@ -1227,7 +1227,7 @@ msgstr "přednost" #: netbox/circuits/models/circuits.py:213 msgid "Circuit group assignment" -msgstr "Přiřazení skupiny obvodů" +msgstr "Přiřazení skupiny okruhů" #: netbox/circuits/models/circuits.py:214 msgid "Circuit group assignments" @@ -1235,7 +1235,7 @@ msgstr "Přiřazení skupin obvodů" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "zakončení" +msgstr "" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1297,14 +1297,11 @@ msgstr "zakončení okruhů" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"Zakončení okruhu se musí připojit buď k místu, nebo k síti poskytovatele." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"Zakončení okruhu se nemůže připojit jak k síti webu, tak k síti " -"poskytovatele." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -1534,7 +1531,7 @@ msgstr "Strana Z" #: netbox/circuits/tables/circuits.py:77 #: netbox/templates/circuits/circuit.html:55 msgid "Commit Rate" -msgstr "Míra odevzdání" +msgstr "Smluvní rychlost" #: netbox/circuits/tables/circuits.py:80 #: netbox/circuits/tables/providers.py:48 @@ -1563,7 +1560,7 @@ msgstr "Míra odevzdání" #: netbox/vpn/tables/tunnels.py:61 netbox/wireless/tables/wirelesslan.py:27 #: netbox/wireless/tables/wirelesslan.py:58 msgid "Comments" -msgstr "Komentář" +msgstr "Komentáře" #: netbox/circuits/tables/circuits.py:86 #: netbox/templates/tenancy/contact.html:84 @@ -1586,12 +1583,12 @@ msgstr "Počet ASN" #: netbox/circuits/views.py:331 #, python-brace-format msgid "No terminations have been defined for circuit {circuit}." -msgstr "Pro obvod nebyla definována žádná zakončení {circuit}." +msgstr "Pro okruh {circuit} nebyla definována žádná zakončení ." #: netbox/circuits/views.py:380 #, python-brace-format msgid "Swapped terminations for circuit {circuit}." -msgstr "Vyměněné zakončení pro obvod {circuit}." +msgstr "Vyměněná zakončení pro okruh {circuit}." #: netbox/core/api/views.py:39 msgid "This user does not have permission to synchronize this data source." @@ -1620,7 +1617,7 @@ msgstr "Dokončeno" #: netbox/dcim/choices.py:187 netbox/dcim/choices.py:239 #: netbox/dcim/choices.py:1609 netbox/virtualization/choices.py:47 msgid "Failed" -msgstr "Neuspěl" +msgstr "Selhalo" #: netbox/core/choices.py:35 netbox/netbox/navigation/menu.py:335 #: netbox/netbox/navigation/menu.py:339 @@ -1647,7 +1644,7 @@ msgstr "Naplánováno" #: netbox/core/choices.py:56 msgid "Running" -msgstr "Běh" +msgstr "Běží" #: netbox/core/choices.py:58 msgid "Errored" @@ -1656,7 +1653,7 @@ msgstr "Chyba" #: netbox/core/choices.py:87 netbox/core/tables/plugins.py:63 #: netbox/templates/generic/object.html:61 msgid "Updated" -msgstr "aktualizováno" +msgstr "Aktualizováno" #: netbox/core/choices.py:88 msgid "Deleted" @@ -1725,7 +1722,7 @@ msgstr "Tajný přístupový klíč AWS" #: netbox/core/events.py:27 msgid "Object created" -msgstr "Vytvořený objekt" +msgstr "Objekt vytvořen" #: netbox/core/events.py:28 msgid "Object updated" @@ -1737,7 +1734,7 @@ msgstr "Objekt odstraněn" #: netbox/core/events.py:30 msgid "Job started" -msgstr "Práce byla zahájena" +msgstr "Úloha zahájena" #: netbox/core/events.py:31 msgid "Job completed" @@ -1850,7 +1847,7 @@ msgstr "Vytvořeno po" #: netbox/core/forms/filtersets.py:89 msgid "Created before" -msgstr "Vytvořeno dříve" +msgstr "Vytvořeno před" #: netbox/core/forms/filtersets.py:94 msgid "Scheduled after" @@ -1858,7 +1855,7 @@ msgstr "Naplánováno po" #: netbox/core/forms/filtersets.py:99 msgid "Scheduled before" -msgstr "Naplánováno dříve" +msgstr "Naplánováno před" #: netbox/core/forms/filtersets.py:104 msgid "Started after" @@ -1866,7 +1863,7 @@ msgstr "Začalo po" #: netbox/core/forms/filtersets.py:109 msgid "Started before" -msgstr "Začalo dříve" +msgstr "Začalo před" #: netbox/core/forms/filtersets.py:114 msgid "Completed after" @@ -1905,7 +1902,7 @@ msgstr "Po" #: netbox/core/forms/filtersets.py:144 netbox/extras/forms/filtersets.py:450 msgid "Before" -msgstr "Dříve" +msgstr "Před" #: netbox/core/forms/filtersets.py:148 netbox/core/tables/change_logging.py:29 #: netbox/extras/forms/model_forms.py:396 @@ -1941,7 +1938,7 @@ msgstr "" #: netbox/core/forms/model_forms.py:153 #: netbox/templates/dcim/rack_elevation_list.html:6 msgid "Rack Elevations" -msgstr "Výšky stojanů" +msgstr "Přehled stojanů" #: netbox/core/forms/model_forms.py:157 netbox/dcim/choices.py:1520 #: netbox/dcim/forms/bulk_edit.py:984 netbox/dcim/forms/bulk_edit.py:1372 @@ -2259,16 +2256,16 @@ msgstr "ID úlohy" #: netbox/core/models/jobs.py:112 msgid "job" -msgstr "práce" +msgstr "úloha" #: netbox/core/models/jobs.py:113 msgid "jobs" -msgstr "pracovní místa" +msgstr "úlohy" #: netbox/core/models/jobs.py:136 #, python-brace-format msgid "Jobs cannot be assigned to this object type ({type})." -msgstr "K tomuto typu objektu nelze přiřadit úlohy ({type})." +msgstr "K tomuto typu objektu ({type}) nelze přiřadit úlohy." #: netbox/core/models/jobs.py:190 #, python-brace-format @@ -2278,7 +2275,7 @@ msgstr "Neplatný stav pro ukončení úlohy. Možnosti jsou: {choices}" #: netbox/core/models/jobs.py:221 msgid "" "enqueue() cannot be called with values for both schedule_at and immediate." -msgstr "enqueue () nelze volat s hodnotami pro schedule_at a instant." +msgstr "enqueue() nelze volat s hodnotami pro schedule_at a ihned zároveň." #: netbox/core/signals.py:126 #, python-brace-format @@ -2396,7 +2393,7 @@ msgstr "Hostitel" #: netbox/core/tables/tasks.py:50 netbox/ipam/forms/filtersets.py:535 msgid "Port" -msgstr "Přístav" +msgstr "Port" #: netbox/core/tables/tasks.py:54 msgid "DB" @@ -2445,7 +2442,7 @@ msgstr "Nebyli nalezeni žádní pracovníci" #: netbox/core/views.py:90 #, python-brace-format msgid "Queued job #{id} to sync {datasource}" -msgstr "Úloha ve frontě #{id} synchronizovat {datasource}" +msgstr "Úloha #{id} k synchronizaci {datasource} zařazena do fronty." #: netbox/core/views.py:319 #, python-brace-format @@ -2455,12 +2452,12 @@ msgstr "Obnovená revize konfigurace #{id}" #: netbox/core/views.py:412 netbox/core/views.py:455 netbox/core/views.py:531 #, python-brace-format msgid "Job {job_id} not found" -msgstr "Práce {job_id} nenalezeno" +msgstr "Úloha {job_id} nenalezena" #: netbox/core/views.py:463 #, python-brace-format msgid "Job {id} has been deleted." -msgstr "Práce {id} byl vymazán." +msgstr "Úloha {id} byla vymazána." #: netbox/core/views.py:465 #, python-brace-format @@ -2470,22 +2467,22 @@ msgstr "Chyba při mazání úlohy {id}: {error}" #: netbox/core/views.py:478 netbox/core/views.py:496 #, python-brace-format msgid "Job {id} not found." -msgstr "Práce {id} nenalezeno." +msgstr "Úloha {id} nenalezena." #: netbox/core/views.py:484 #, python-brace-format msgid "Job {id} has been re-enqueued." -msgstr "Práce {id} byla znovu zařazena do fronty." +msgstr "Úloha {id} byla znovu zařazena do fronty." #: netbox/core/views.py:519 #, python-brace-format msgid "Job {id} has been enqueued." -msgstr "Práce {id} byl zařazen do fronty." +msgstr "Úloha {id} byla zařazena do fronty." #: netbox/core/views.py:538 #, python-brace-format msgid "Job {id} has been stopped." -msgstr "Práce {id} byl zastaven." +msgstr "Úloha {id} byla zastavena." #: netbox/core/views.py:540 #, python-brace-format @@ -2535,7 +2532,7 @@ msgstr "4-sloupový rám" #: netbox/dcim/choices.py:67 msgid "4-post cabinet" -msgstr "4-sloupová skříňka" +msgstr "4-sloupová skříň" #: netbox/dcim/choices.py:68 msgid "Wall-mounted frame" @@ -2547,7 +2544,7 @@ msgstr "Nástěnný rám (vertikální)" #: netbox/dcim/choices.py:70 msgid "Wall-mounted cabinet" -msgstr "Nástěnná skříňka" +msgstr "Nástěnná skříň" #: netbox/dcim/choices.py:71 msgid "Wall-mounted cabinet (vertical)" @@ -2582,7 +2579,7 @@ msgstr "Milimetry" #: netbox/dcim/choices.py:115 netbox/dcim/choices.py:1555 msgid "Inches" -msgstr "palce" +msgstr "Palce" #: netbox/dcim/choices.py:136 netbox/dcim/choices.py:207 #: netbox/dcim/choices.py:254 @@ -2679,12 +2676,12 @@ msgstr "Zdola nahoru" #: netbox/dcim/choices.py:214 msgid "Top to bottom" -msgstr "Nahoru dolů" +msgstr "Shora dolů" #: netbox/dcim/choices.py:215 netbox/dcim/choices.py:259 #: netbox/dcim/choices.py:1305 msgid "Passive" -msgstr "pasivní" +msgstr "Pasivní" #: netbox/dcim/choices.py:216 msgid "Mixed" @@ -2802,17 +2799,17 @@ msgstr "Auto" #: netbox/dcim/choices.py:1265 msgid "Access" -msgstr "Přístup" +msgstr "Přístupový" #: netbox/dcim/choices.py:1266 netbox/ipam/tables/vlans.py:172 #: netbox/ipam/tables/vlans.py:217 #: netbox/templates/dcim/inc/interface_vlans_table.html:7 msgid "Tagged" -msgstr "Označeno" +msgstr "Značkovaný" #: netbox/dcim/choices.py:1267 msgid "Tagged (All)" -msgstr "Označeno (Vše)" +msgstr "Značkovaný (Vše)" #: netbox/dcim/choices.py:1296 msgid "IEEE Standard" @@ -2888,7 +2885,7 @@ msgstr "Gramy" #: netbox/dcim/choices.py:1572 netbox/templates/dcim/device.html:328 #: netbox/templates/dcim/rack.html:108 msgid "Pounds" -msgstr "libry" +msgstr "Libry" #: netbox/dcim/choices.py:1573 msgid "Ounces" @@ -2896,7 +2893,7 @@ msgstr "Unce" #: netbox/dcim/choices.py:1620 msgid "Redundant" -msgstr "Redundantní" +msgstr "Zdvojený" #: netbox/dcim/choices.py:1641 msgid "Single phase" @@ -2922,15 +2919,15 @@ msgstr "Nadřazená oblast (ID)" #: netbox/dcim/filtersets.py:92 msgid "Parent region (slug)" -msgstr "Nadřazená oblast (URL zkratka)" +msgstr "Nadřazená oblast (zkratka)" #: netbox/dcim/filtersets.py:116 msgid "Parent site group (ID)" -msgstr "Nadřazená skupina webů (ID)" +msgstr "Nadřazená skupina míst (ID)" #: netbox/dcim/filtersets.py:122 msgid "Parent site group (slug)" -msgstr "Nadřazená skupina stránek (slimák)" +msgstr "Nadřazená skupina míst (zkratka)" #: netbox/dcim/filtersets.py:164 netbox/extras/filtersets.py:364 #: netbox/ipam/filtersets.py:843 netbox/ipam/filtersets.py:995 @@ -4231,7 +4228,7 @@ msgstr "Šířka musí být nastavena, pokud není zadán typ stojanu." #: netbox/dcim/forms/bulk_import.py:326 msgid "U height must be set if not specifying a rack type." -msgstr "" +msgstr "Pokud není zadán typ stojanu, musí být nastavena výška U." #: netbox/dcim/forms/bulk_import.py:334 msgid "Parent site" @@ -4890,6 +4887,11 @@ msgid "" "present, will be automatically replaced with the position value when " "creating a new module." msgstr "" +"Pro hromadné vytváření jsou podporovány alfanumerické rozsahy. Smíšené " +"případy a typy v rámci jednoho rozsahu nejsou podporovány (příklad: " +"[ge, xe] -0/0/ [0-9]). Žeton {module}, pokud je " +"přítomen, bude automaticky nahrazen hodnotou pozice při vytváření nového " +"modulu." #: netbox/dcim/forms/model_forms.py:1094 msgid "Console port template" @@ -9595,11 +9597,11 @@ msgstr "Nastavte to jako primární IP pro přiřazené zařízení" #: netbox/ipam/forms/bulk_import.py:330 msgid "Is out-of-band" -msgstr "" +msgstr "Je mimo pásmo" #: netbox/ipam/forms/bulk_import.py:331 msgid "Designate this as the out-of-band IP address for the assigned device" -msgstr "" +msgstr "Určete tuto adresu jako mimopásmovou IP adresu přiřazeného zařízení" #: netbox/ipam/forms/bulk_import.py:371 msgid "No device or virtual machine specified; cannot set as primary IP" @@ -9609,11 +9611,11 @@ msgstr "" #: netbox/ipam/forms/bulk_import.py:375 msgid "No device specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Není určeno žádné zařízení; nelze nastavit jako IP mimo pásmo" #: netbox/ipam/forms/bulk_import.py:379 msgid "Cannot set out-of-band IP for virtual machines" -msgstr "" +msgstr "Nelze nastavit IP mimo pásmo pro virtuální počítače" #: netbox/ipam/forms/bulk_import.py:383 msgid "No interface specified; cannot set as primary IP" @@ -9621,7 +9623,7 @@ msgstr "Není určeno žádné rozhraní; nelze nastavit jako primární IP" #: netbox/ipam/forms/bulk_import.py:387 msgid "No interface specified; cannot set as out-of-band IP" -msgstr "" +msgstr "Není určeno žádné rozhraní; nelze nastavit jako IP mimo pásmo" #: netbox/ipam/forms/bulk_import.py:422 msgid "Auth type" @@ -9780,7 +9782,7 @@ msgstr "Řada ASN" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Přiřazení webu/VLAN" +msgstr "" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -9798,7 +9800,7 @@ msgstr "Nastavte z něj primární IP pro zařízení/virtuální počítač" #: netbox/ipam/forms/model_forms.py:314 msgid "Make this the out-of-band IP for the device" -msgstr "" +msgstr "Nastavte z tohoto pole IP mimo pásmo zařízení" #: netbox/ipam/forms/model_forms.py:329 msgid "NAT IP (Inside)" @@ -9811,10 +9813,12 @@ msgstr "IP adresu lze přiřadit pouze jednomu objektu." #: netbox/ipam/forms/model_forms.py:398 msgid "Cannot reassign primary IP address for the parent device/VM" msgstr "" +"Nelze znovu přiřadit primární adresu IP pro nadřazené zařízení/virtuální " +"počítač" #: netbox/ipam/forms/model_forms.py:402 msgid "Cannot reassign out-of-Band IP address for the parent device" -msgstr "" +msgstr "Nelze znovu přiřadit IP adresu mimo pásmo pro nadřazené zařízení" #: netbox/ipam/forms/model_forms.py:412 msgid "" @@ -9827,6 +9831,8 @@ msgid "" "Only IP addresses assigned to a device interface can be designated as the " "out-of-band IP for a device." msgstr "" +"Pouze IP adresy přiřazené k rozhraní zařízení mohou být označeny jako IP " +"adresy mimo pásmo zařízení." #: netbox/ipam/forms/model_forms.py:508 msgid "Virtual IP Address" @@ -10220,12 +10226,12 @@ msgstr "Nelze nastavit scope_id bez scope_type." #: netbox/ipam/models/vlans.py:105 #, python-brace-format msgid "Starting VLAN ID in range ({value}) cannot be less than {minimum}" -msgstr "" +msgstr "Spuštění VLAN ID v dosahu ({value}) nemůže být menší než {minimum}" #: netbox/ipam/models/vlans.py:111 #, python-brace-format msgid "Ending VLAN ID in range ({value}) cannot exceed {maximum}" -msgstr "" +msgstr "Ukončení VLAN ID v rozsahu ({value}) nesmí překročit {maximum}" #: netbox/ipam/models/vlans.py:118 #, python-brace-format @@ -10233,6 +10239,8 @@ msgid "" "Ending VLAN ID in range must be greater than or equal to the starting VLAN " "ID ({range})" msgstr "" +"Koncové ID VLAN v rozsahu musí být větší nebo roven počátečnímu ID VLAN " +"({range})" #: netbox/ipam/models/vlans.py:124 msgid "Ranges cannot overlap." @@ -12587,7 +12595,7 @@ msgstr "Chyba při vykreslování šablony" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "Pro toto zařízení nebyla přiřazena žádná konfigurační šablona." +msgstr "" #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13852,7 +13860,7 @@ msgstr "Centrum nápovědy" #: netbox/templates/inc/user_menu.html:41 msgid "Django Admin" -msgstr "Správce Django" +msgstr "" #: netbox/templates/inc/user_menu.html:61 msgid "Log Out" @@ -14266,7 +14274,6 @@ msgstr "Přidat virtuální disk" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" -"Pro tento virtuální počítač nebyla přiřazena žádná konfigurační šablona." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15365,7 +15372,6 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} patří k jinému webu ({device_site}) než cluster ({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -16098,7 +16104,7 @@ msgstr "bezdrátové spoje" #: netbox/wireless/models.py:236 msgid "Must specify a unit when setting a wireless distance" -msgstr "Při nastavování bezdrátové vzdálenosti je nutné zadat jednotku" +msgstr "" #: netbox/wireless/models.py:242 netbox/wireless/models.py:248 #, python-brace-format diff --git a/netbox/translations/da/LC_MESSAGES/django.mo b/netbox/translations/da/LC_MESSAGES/django.mo index 2988b90ff53d5fc83b2065306d44c9252733fecc..993b688e4760f2064b2f251acb5af1a899196fd0 100644 GIT binary patch delta 66531 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 ahrL_&LrL?xr59nzvL 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 Ac>n+a diff --git a/netbox/translations/da/LC_MESSAGES/django.po b/netbox/translations/da/LC_MESSAGES/django.po index 1b48b5849..bb8f0a346 100644 --- a/netbox/translations/da/LC_MESSAGES/django.po +++ b/netbox/translations/da/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # Translators: # Jeff Gehlbach, 2024 # ch, 2024 -# Frederik Spang Thomsen , 2024 +# Frederik Spang , 2024 # Jeremy Stretch, 2025 # #, fuzzy @@ -1235,7 +1235,7 @@ msgstr "Kredsløbsgruppeopgaver" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "opsigelse" +msgstr "" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1297,15 +1297,11 @@ msgstr "kredsløbsafslutninger" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"En kredsløbsafslutning skal tilsluttes enten et websted eller et " -"udbydernetværk." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"En kredsløbsafslutning kan ikke knyttes til både et websted og et " -"udbydernetværk." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -9803,7 +9799,7 @@ msgstr "ASN-rækkevidde" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Websted/VLAN-tildeling" +msgstr "" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -12635,7 +12631,7 @@ msgstr "Fejl ved gengivelse af skabelon" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "Der er ikke tildelt nogen konfigurationsskabelon til denne enhed." +msgstr "" #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -13903,7 +13899,7 @@ msgstr "Hjælpecenter" #: netbox/templates/inc/user_menu.html:41 msgid "Django Admin" -msgstr "Django Admin" +msgstr "" #: netbox/templates/inc/user_menu.html:61 msgid "Log Out" @@ -14317,8 +14313,6 @@ msgstr "Tilføj virtuel disk" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" -"Der er ikke tildelt nogen konfigurationsskabelon til denne virtuelle " -"maskine." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -15421,7 +15415,6 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} tilhører et andet sted ({device_site}) end klyngen ({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -16151,7 +16144,7 @@ msgstr "trådløse links" #: netbox/wireless/models.py:236 msgid "Must specify a unit when setting a wireless distance" -msgstr "Skal angive en enhed, når du indstiller en trådløs afstand" +msgstr "" #: netbox/wireless/models.py:242 netbox/wireless/models.py:248 #, python-brace-format diff --git a/netbox/translations/de/LC_MESSAGES/django.mo b/netbox/translations/de/LC_MESSAGES/django.mo index aa2135609c1e4c4c6f2a435002584b79166c4203..69d6143e4385d332124ab03c512a9592715cf1fe 100644 GIT binary patch delta 66895 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 delta 67866 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 E53dY_5dZ)H diff --git a/netbox/translations/de/LC_MESSAGES/django.po b/netbox/translations/de/LC_MESSAGES/django.po index 5faf9b341..be453b8cf 100644 --- a/netbox/translations/de/LC_MESSAGES/django.po +++ b/netbox/translations/de/LC_MESSAGES/django.po @@ -5,13 +5,13 @@ # # Translators: # Martin R, 2024 -# Niklas, 2024 # fepilins, 2024 # Steffen, 2024 # haagehan, 2024 +# Jeremy Stretch, 2024 # Robin Reinhardt, 2024 -# Jeremy Stretch, 2025 # chbally, 2025 +# Niklas, 2025 # #, fuzzy msgid "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-01-04 05:02+0000\n" "PO-Revision-Date: 2023-10-30 17:48+0000\n" -"Last-Translator: chbally, 2025\n" +"Last-Translator: Niklas, 2025\n" "Language-Team: German (https://app.transifex.com/netbox-community/teams/178115/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1240,7 +1240,7 @@ msgstr "Transportnetzzuweisungen" #: netbox/circuits/models/circuits.py:240 msgid "termination" -msgstr "Abschlusspunkt" +msgstr "" #: netbox/circuits/models/circuits.py:257 msgid "port speed (Kbps)" @@ -1303,15 +1303,11 @@ msgstr "Transportnetzabschlusspunkte" msgid "" "A circuit termination must attach to either a site or a provider network." msgstr "" -"Ein Leitungsabschluss muss entweder an einen Standort oder an ein " -"Providernetzwerk angeschlossen werden." #: netbox/circuits/models/circuits.py:310 msgid "" "A circuit termination cannot attach to both a site and a provider network." msgstr "" -"Ein Leitungsabschluss kann nicht sowohl an einen Standort als auch an ein " -"Providernetzwerk angeschlossen werden." #: netbox/circuits/models/providers.py:22 #: netbox/circuits/models/providers.py:66 @@ -8438,8 +8434,7 @@ msgstr "Gewicht anzeigen" #: netbox/extras/models/customfields.py:173 msgid "Fields with higher weights appear lower in a form." -msgstr "" -"Felder mit höheren Gewichten werden in einem Formular niedriger angezeigt." +msgstr "Höher gewichtete Felder werden im Formular weiter unten angezeigt." #: netbox/extras/models/customfields.py:178 msgid "minimum value" @@ -9531,7 +9526,7 @@ msgstr "Dienst (ID)" #: netbox/ipam/filtersets.py:675 msgid "NAT inside IP address (ID)" -msgstr "NAT innerhalb der IP-Adresse (ID)" +msgstr "NAT inside IP-Adresse (ID)" #: netbox/ipam/filtersets.py:1043 netbox/ipam/forms/bulk_import.py:322 msgid "Assigned interface" @@ -9959,7 +9954,7 @@ msgstr "Ziel der Route" #: netbox/templates/ipam/aggregate.html:11 #: netbox/templates/ipam/prefix.html:38 msgid "Aggregate" -msgstr "Aggregat" +msgstr "Aggregieren" #: netbox/ipam/forms/model_forms.py:135 netbox/templates/ipam/asnrange.html:12 msgid "ASN Range" @@ -9967,7 +9962,7 @@ msgstr "ASN-Bereich" #: netbox/ipam/forms/model_forms.py:231 msgid "Site/VLAN Assignment" -msgstr "Standort-/VLAN-Zuweisung" +msgstr "" #: netbox/ipam/forms/model_forms.py:259 netbox/templates/ipam/iprange.html:10 msgid "IP Range" @@ -10095,9 +10090,7 @@ msgstr "ASN-Bereiche" #: netbox/ipam/models/asns.py:72 #, python-brace-format msgid "Starting ASN ({start}) must be lower than ending ASN ({end})." -msgstr "" -"ASN wird gestartet ({start}) muss niedriger sein als das Ende der ASN " -"({end})." +msgstr "Der ASN ({start}) muss niedriger sein als das letzte ASN ({end})." #: netbox/ipam/models/asns.py:104 msgid "Regional Internet Registry responsible for this AS number space" @@ -10171,7 +10164,7 @@ msgstr "Aggregat" #: netbox/ipam/models/ip.py:116 msgid "aggregates" -msgstr "Aggregate" +msgstr "aggregiert" #: netbox/ipam/models/ip.py:132 msgid "Cannot create aggregate with /0 mask." @@ -10227,7 +10220,8 @@ msgstr "ist ein Pool" #: netbox/ipam/models/ip.py:267 msgid "All IP addresses within this prefix are considered usable" msgstr "" -"Alle IP-Adressen innerhalb dieses Prefixes werden als nutzbar betrachtet" +"Alle IP-Adressen (inklusive Netzwerk- und Broadcast-Adresse) innerhalb " +"dieses Prefixes werden als nutzbar betrachtet" #: netbox/ipam/models/ip.py:270 netbox/ipam/models/ip.py:537 msgid "mark utilized" @@ -10503,7 +10497,7 @@ msgstr "einzigartigen Raum erzwingen" #: netbox/ipam/models/vrfs.py:43 msgid "Prevent duplicate prefixes/IP addresses within this VRF" -msgstr "Vermeiden Sie doppelte Präfixe/IP-Adressen in diesem VRF" +msgstr "Vermeiden Sie doppelte Präfixe/IP-Adressen in dieser VRF" #: netbox/ipam/models/vrfs.py:63 netbox/netbox/navigation/menu.py:186 #: netbox/netbox/navigation/menu.py:188 @@ -10524,7 +10518,7 @@ msgstr "Routenziele" #: netbox/ipam/tables/asn.py:52 msgid "ASDOT" -msgstr "ALS PUNKT" +msgstr "ASDOT" #: netbox/ipam/tables/asn.py:57 msgid "Site Count" @@ -11552,7 +11546,7 @@ msgstr "" #: netbox/netbox/registry.py:14 #, python-brace-format msgid "Invalid store: {key}" -msgstr "Ungültiger Shop: {key}" +msgstr "Ungültiger Store: {key}" #: netbox/netbox/registry.py:17 msgid "Cannot add stores to registry after initialization" @@ -12431,7 +12425,7 @@ msgstr "Warteschlange" #: netbox/templates/core/rq_task.html:65 msgid "Timeout" -msgstr "Auszeit" +msgstr "Timeout" #: netbox/templates/core/rq_task.html:69 msgid "Result TTL" @@ -12501,7 +12495,7 @@ msgstr "Anzahl fehlgeschlagener Jobs" #: netbox/templates/core/rq_worker.html:75 msgid "Total working time" -msgstr "Gesamtarbeitszeit" +msgstr "Gesamtlaufzeit" #: netbox/templates/core/rq_worker.html:76 msgid "seconds" @@ -12827,7 +12821,7 @@ msgstr "Fehler beim Rendern der Vorlage" #: netbox/templates/dcim/device/render_config.html:70 msgid "No configuration template has been assigned for this device." -msgstr "Diesem Gerät wurde keine Konfigurationsvorlage zugewiesen." +msgstr "" #: netbox/templates/dcim/device_edit.html:44 msgid "Parent Bay" @@ -14098,7 +14092,7 @@ msgstr "Hilfecenter" #: netbox/templates/inc/user_menu.html:41 msgid "Django Admin" -msgstr "Django-Administrator" +msgstr "" #: netbox/templates/inc/user_menu.html:61 msgid "Log Out" @@ -14513,7 +14507,6 @@ msgstr "Virtuelles Laufwerk hinzufügen" #: netbox/templates/virtualization/virtualmachine/render_config.html:70 msgid "No configuration template has been assigned for this virtual machine." msgstr "" -"Für diese virtuelle Maschine wurde keine Konfigurationsvorlage zugewiesen." #: netbox/templates/vpn/ikepolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:33 netbox/vpn/tables/crypto.py:166 @@ -14540,11 +14533,11 @@ msgstr "Secret anzeigen" #: netbox/vpn/forms/model_forms.py:316 netbox/vpn/forms/model_forms.py:352 #: netbox/vpn/tables/crypto.py:68 netbox/vpn/tables/crypto.py:134 msgid "Proposals" -msgstr "Vorschläge" +msgstr "Proposals" #: netbox/templates/vpn/ikeproposal.html:10 msgid "IKE Proposal" -msgstr "IKE-Vorschlag" +msgstr "IKE- Proposal" #: netbox/templates/vpn/ikeproposal.html:21 netbox/vpn/forms/bulk_edit.py:97 #: netbox/vpn/forms/bulk_import.py:145 netbox/vpn/forms/filtersets.py:101 @@ -14575,7 +14568,7 @@ msgstr "DH-Gruppe" #: netbox/templates/vpn/ipsecproposal.html:29 #: netbox/vpn/forms/bulk_edit.py:182 netbox/vpn/models/crypto.py:146 msgid "SA lifetime (seconds)" -msgstr "SA-Lebensdauer (Sekunden)" +msgstr "SA-Gültigkeitsdauer (Sekunden)" #: netbox/templates/vpn/ipsecpolicy.html:10 #: netbox/templates/vpn/ipsecprofile.html:66 netbox/vpn/tables/crypto.py:170 @@ -14660,7 +14653,7 @@ msgstr "Peer-Abschlusspunkt" #: netbox/templates/wireless/inc/authentication_attrs.html:12 msgid "Cipher" -msgstr "Chiffre" +msgstr "Verschlüsselungsalgorithmus" #: netbox/templates/wireless/inc/authentication_attrs.html:16 msgid "PSK" @@ -15638,8 +15631,6 @@ msgid "" "{device} belongs to a different site ({device_site}) than the cluster " "({cluster_site})" msgstr "" -"{device} gehört zu einer anderen Seite ({device_site}) als der Cluster " -"({cluster_site})" #: netbox/virtualization/forms/model_forms.py:192 msgid "Optionally pin this VM to a specific host device within the cluster" @@ -15977,7 +15968,7 @@ msgstr "SA-Lebendauer" #: netbox/wireless/forms/filtersets.py:64 #: netbox/wireless/forms/filtersets.py:98 msgid "Pre-shared key" -msgstr "Vorab geteilter Schlüssel (Pre-shared key)" +msgstr "Vorab geteilter Schlüssel (PSK)" #: netbox/vpn/forms/bulk_edit.py:237 netbox/vpn/forms/bulk_import.py:239 #: netbox/vpn/forms/filtersets.py:199 netbox/vpn/forms/model_forms.py:370 @@ -15993,7 +15984,7 @@ msgstr "IPSec-Richtlinie" #: netbox/vpn/forms/bulk_import.py:50 msgid "Tunnel encapsulation" -msgstr "Tunnelkapselung" +msgstr "Tunnel Encapsulation" #: netbox/vpn/forms/bulk_import.py:83 msgid "Operational role" @@ -16140,7 +16131,7 @@ msgstr "Vorschläge" #: netbox/vpn/models/crypto.py:91 netbox/wireless/models.py:39 msgid "pre-shared key" -msgstr "vorab geteilter Schlüssel" +msgstr "vorab geteilter Schlüssel (PSK)" #: netbox/vpn/models/crypto.py:105 msgid "IKE policies" @@ -16273,7 +16264,7 @@ msgstr "SA-Lebensdauer" #: netbox/vpn/tables/crypto.py:71 msgid "Pre-shared Key" -msgstr "Vorab geteilter Schlüssel" +msgstr "Vorab geteilter Schlüssel (PSK)" #: netbox/vpn/tables/crypto.py:103 msgid "SA Lifetime (Seconds)" @@ -16390,7 +16381,6 @@ msgstr "Funkverbindungen" #: netbox/wireless/models.py:236 msgid "Must specify a unit when setting a wireless distance" msgstr "" -"Beim Einstellen einer Funkreichweite muss eine Einheit angegeben werden" #: netbox/wireless/models.py:242 netbox/wireless/models.py:248 #, python-brace-format diff --git a/netbox/translations/es/LC_MESSAGES/django.mo b/netbox/translations/es/LC_MESSAGES/django.mo index 34276d7000868fcbb655f738f36e8594be1705f0..29c90fab3934d7f8281867a1fb519397c2c2d640 100644 GIT binary patch delta 66628 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 az{%i+83W$74-N_nco;JH%EEwQA^#5vPzGcG delta 67644 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 z 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%0AUqTx^fKJhIG=RUc zG+y2=El~<9qxD_Ueh0KmhB+G-Z_J1{=AjKejn3&>^c&9(bVLWy4o{(h|ARv@Tl=t^ z#-UR+1zTbg9mo!JEq#jB@%aDWD9|CKxD?u8MKrbb(HE~nw^hej9*wT%iRiXkgl^-- z@&0q@8hQl{)G4I2I=VJ` zqCeU6N85QEeg9cB@K?}*?2PqaBJU*=KXBmz@-w>c3wI8yxhqzpJR7ga*U^Tvb_uID z4|+ZnKm+Q92Hp?tXf*o#L^K0;VsV^>{^nx^R&xKp!-X&Wif)VZsT+KIMSpy*&@~)P z!_h_aGWvPH6#Wu zIlX`$L>b*fh6knnfTmcSaw{|=Bhf&oqk%3$*UFMu|J?O)|8Jzi zZT3;T@hv*y(`c$M>m5$IQs`7&hwkH!(LS+$cr1@cGdeAnXQG*W5Z%U)M_=pB{x`y% zR2bnQG{R%(RQ!e>z5k$de`TLgE{eWa1)byOvD_7XZv^_@r06VkAdjH!tVQ2@H_3%B ze1?_rdvt_X_6;My7$HgucMK-*b|3_O|G z#DydHFjOSIKr?X!t76Xnq2VUzfzlGIVK;1vGqE*(fO9bWfH1Ph(M7rx9nhDUI=a!d zb_%n(|I-JCU$JCI8?KIi;~9bm_5}LE3iRW46Pl@g=tvKuBR_#Ye+C`#rC81~D3tS| zpDD%A=W1bg_kU9^oQqCqYI>m!^g~ze2rP)>(Yc?4j%X>mCRRo_p_%&#{cZW5XrLGH zMobJ2<+124n1HE2|C`H&5iLL)d>Rep6?9~;$MU9F-i8MF9y%p^qTiw^{uvGMBKlm$ zkYEniZ~1m|LX`ta~v zPBfE+FqLAooyM`g9ol|hB3Vm)f8o&qW^Lx?f zzeNw4qp`lgh>)og=+u@)->-w&-T%$wjjqwbXh%24@^tit2hkBdiLQ;+=t$l{&xbwe z9RGlJbS|2CWOy$h+HP6&eqHO`|E*$0Z?vP4SPmy*aa@8nycPX3ozKzdPNOH>B{Z;_ zqe3QIqF*q&U|D)={+`yEHuMyb*4|L3`=$b}7lithLC&<2m7-viE~FVq_o>YJdc z?~2wBKu0tT9pMDDy}QxC=cAc=K9*lcpZ{FeRysy!qU|I%a8a6zU04FoUx{5Ku@?ecn5xrWwF)x;7w>di?BGZM?2n!_3(;Y!s2d$^qWkK<)S<{9!5LZ zjQ)z{V6@1s;ZG|1V{7VPLbu-;?17mlgm1Zh(ehkuhu>pQtS~VxF$|~Ub$A5b9i=C^ zIN5)LxiEl9=-fPwE~4GhOt*ytr4gF)o3SM>MW^g1G}R~3sY^@_0p>(ke<^fv*N?VE z-|K@{y8nlA;T(;(0;k3Y?nP5QKbBuc*TVW(za4%4AiBN&hpvIYq8U@dBFllU_N&od zPy{Pt2~2L|q9YdukZo$1yS!MEave04eeiC44qY^5Zcj_xhK(>^8V3vd;qt*9A&`&J zK=-2o{e))XRJ@;QTDYHQ8vEam&10cic^8_>&(Y_; zMyKEix?NA9YbP;1yjKt1p6$@*2cQSiC^WE}lU$gp325Zg(HG`nYLTHG{)9gFKlH_O z=#*VV8_r-Lmi-T!3@AUk$Vx}6qVLy__glvLWH&Bcwf)fmJP|#~rlOHPj1};4ERNgJ zhK`_tokXYLEE>o^@&4sALOCy*$!pNvRVtQy1e1wATzKXWL>ssRoy&XC5j={HY$^J+ zd?ni94`=|tpx=&9VKK})GyE}I1uRbaAuNxtqHAnF+TK}Aeg0qK!Va&vI|NWTS{5r) zUjto)gRm`5Ko`*#G{9461}~sfljWX}xhv5?^P-t8jP8O8vAzkW_J3gUr6Od^rW1HX6QvUGn>%^?0dB1i)edU?hk7sKRTddNiG~= z*?6NSI%f^z15Kl?(Ghk+*G6yjy@6=pW6+LfpaDM=%bTMgVma!+LU+q0^h8YNpA&xP z(+_QU2^zpMtc)*U1^go3zl5eZ0*_`;m6WEvXidg;+?cj>JVXYKF8?KISvnJ@&v__|*2b%H`(Mf0q??In`5OewY z|0ow8EH9wj z_o49N)fVgd`9GZt_u~evg2%BPUNt`)G=tImi_j78K==J#bj15&{g1JHCYJw2GkWF2 zVZ=qyMOhjhU{g#w;?7(+=Qp6+ZY25{aAzz(f^N^3(8co>IyL)aea!`74YWoB>W;oY z80~0EbT%5$qv&%h7O?+abgxt4h&G{fw-r4=_MicMjn3U~=vp}+O4qMu@I(LhF{Bb$bHI0GHoLukWK#QK%d z4bdIww%i-bhtT(aMcX@%PC@b?F6=1lqj6iIL?&fP$4 zfup0V(Lhh5i|;%-kSmvj5nqMgFNyB53b9-b9avpV{rO+>SkWUo7!71>bS@ge%kln( z=)35M_Mjc@L!Uc{?t-7ufc`>9oc2`k3Us?)^%VQx6cvmW*PwG&5{AQ%(e{!jxG)uoWuf6K(fwR1 z+87O}7na3a(Czd%I`_|`@2`$-LOa|M@9#xBIuJb-&GcNVKA9-Ug^Q#r`f*tg%j1|> zUWooaUM6Ak1N z+Q4Pcht%gr8!mxWu?p6~0ayzcqTA~ObS>7Q4E5#ET~Ha#RFfCk|5gm3 z!pLt%Bb$n*bOt&Vv(dm7pu6QsbP>LWu9f$yaSra0cfD((RL@J{oc7U z89I1~3g`F1KQ4j zBp1%zDD+^Mf<8DGjr?)+;CTt{Xb1ZIK6Gx6MgNRudMVt`i?&k=JsGS;Kq2%WNt==0NJc^0;&JP*z27w7;E$MWx? zoJ{=3g$G3L)uDm1XoJ#)q5-^y4)onr zJ^SzTc;iT_f*+^Rxy$@YIQa^r4b(;J+n@mtL<5?Dj_}S{o`a@%5!%s{*alaji|