nautobot 2.1.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

nautobot/project-static/docs/user-guide/platform-functionality/users/objectpermission.html

@@ -979,20 +979,6 @@
 
             
           
-            
-              
-  
-  
-  
-    <li class="md-nav__item">
-      <a href="../../administration/configuration/node-configuration.html" class="md-nav__link">
-        Node.js Configuration
-      </a>
-    </li>
-  
-
-            
-          
         </ul>
       </nav>
     </li>
@@ -3578,23 +3564,9 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../../development/apps/api/views/view-overrides.html" class="md-nav__link">
-        View Overrides
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../../development/apps/api/views/core-view-overrides.html" class="md-nav__link">
-        Legacy View Overrides
+        View Overrides
       </a>
     </li>
   
@@ -4688,20 +4660,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../../development/core/react-ui.html" class="md-nav__link">
-        React UI
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../../development/core/role-internals.html" class="md-nav__link">
         Role Internals
@@ -5279,6 +5237,10 @@
 <a id="__codelineno-1-9" name="__codelineno-1-9" href="#__codelineno-1-9"></a><span class="p">]</span>
 </code></pre></div>
 <p>Additionally, where multiple permissions have been assigned for an object type, their collective constraints will be merged using a logical "OR" operation.</p>
+<div class="admonition version-added">
+<p class="admonition-title">Added in version 2.1.1</p>
+<p>The ObjectPermission model now has change-logging capabilities. When object permissions are created, updated, or deleted, change logs will be automatically generated and will be viewable by users with the appropriate permissions.</p>
+</div>
 
 
 

nautobot/project-static/docs/user-guide/platform-functionality/users/token.html

@@ -979,20 +979,6 @@
 
             
           
-            
-              
-  
-  
-  
-    <li class="md-nav__item">
-      <a href="../../administration/configuration/node-configuration.html" class="md-nav__link">
-        Node.js Configuration
-      </a>
-    </li>
-  
-
-            
-          
         </ul>
       </nav>
     </li>
@@ -3540,23 +3526,9 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../../development/apps/api/views/view-overrides.html" class="md-nav__link">
-        View Overrides
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../../development/apps/api/views/core-view-overrides.html" class="md-nav__link">
-        Legacy View Overrides
+        View Overrides
       </a>
     </li>
   
@@ -4650,20 +4622,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../../development/core/react-ui.html" class="md-nav__link">
-        React UI
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../../development/core/role-internals.html" class="md-nav__link">
         Role Internals

nautobot/project-static/docs/user-guide/platform-functionality/webhook.html

@@ -979,20 +979,6 @@
 
             
           
-            
-              
-  
-  
-  
-    <li class="md-nav__item">
-      <a href="../administration/configuration/node-configuration.html" class="md-nav__link">
-        Node.js Configuration
-      </a>
-    </li>
-  
-
-            
-          
         </ul>
       </nav>
     </li>
@@ -3610,23 +3596,9 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../development/apps/api/views/view-overrides.html" class="md-nav__link">
-        View Overrides
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../development/apps/api/views/core-view-overrides.html" class="md-nav__link">
-        Legacy View Overrides
+        View Overrides
       </a>
     </li>
   
@@ -4720,20 +4692,6 @@
   
   
   
-    <li class="md-nav__item">
-      <a href="../../development/core/react-ui.html" class="md-nav__link">
-        React UI
-      </a>
-    </li>
-  
-
-            
-          
-            
-              
-  
-  
-  
     <li class="md-nav__item">
       <a href="../../development/core/role-internals.html" class="md-nav__link">
         Role Internals

nautobot/project-static/js/theme.js

@@ -131,8 +131,3 @@ function setSystemThemeActive() {
     tdDarkTheme.classList.remove("active-theme");
     tdLightTheme.classList.remove("active-theme");
 }
-
-function viewNewUI() {
-    document.cookie = "newui=1; path=/";
-    document.location.reload(true);
-}

nautobot/tenancy/api/urls.py

@@ -1,6 +1,6 @@
 from nautobot.core.api.routers import OrderedDefaultRouter
-from . import views
 
+from . import views
 
 router = OrderedDefaultRouter()
 router.APIRootView = views.TenancyRootView

nautobot/tenancy/api/views.py

@@ -8,6 +8,7 @@ from nautobot.ipam.models import IPAddress, Prefix, VLAN, VRF
 from nautobot.tenancy import filters
 from nautobot.tenancy.models import Tenant, TenantGroup
 from nautobot.virtualization.models import VirtualMachine
+
 from . import serializers
 
 

nautobot/tenancy/factory.py

@@ -4,10 +4,10 @@ from nautobot.core.factory import (
     NautobotBoolIterator,
     OrganizationalModelFactory,
     PrimaryModelFactory,
-    UniqueFaker,
     random_instance,
+    UniqueFaker,
 )
-from nautobot.tenancy.models import TenantGroup, Tenant
+from nautobot.tenancy.models import Tenant, TenantGroup
 
 
 class TenantGroupFactory(OrganizationalModelFactory):

nautobot/tenancy/filters/__init__.py

@@ -1,5 +1,6 @@
 import django_filters
 
+from nautobot.circuits.models import Circuit
 from nautobot.core.filters import (
     NameSearchFilterSet,
     NaturalKeyOrPKMultipleChoiceFilter,
@@ -8,7 +9,6 @@ from nautobot.core.filters import (
     TreeNodeMultipleChoiceFilter,
 )
 from nautobot.core.utils.deprecation import class_deprecated_in_favor_of
-from nautobot.circuits.models import Circuit
 from nautobot.dcim.models import Device, Location, Rack, RackReservation
 from nautobot.extras.filters import NautobotFilterSet
 from nautobot.ipam.models import IPAddress, Prefix, RouteTarget, VLAN, VRF
@@ -16,7 +16,6 @@ from nautobot.tenancy.filters.mixins import TenancyModelFilterSetMixin
 from nautobot.tenancy.models import Tenant, TenantGroup
 from nautobot.virtualization.models import Cluster, VirtualMachine
 
-
 __all__ = (
     "TenancyFilterSet",
     "TenancyModelFilterSetMixin",

nautobot/tenancy/forms.py

@@ -7,13 +7,13 @@ from nautobot.core.forms import (
     TagFilterField,
 )
 from nautobot.extras.forms import (
-    NautobotFilterForm,
     NautobotBulkEditForm,
+    NautobotFilterForm,
     NautobotModelForm,
     TagsBulkEditFormMixin,
 )
-from .models import Tenant, TenantGroup
 
+from .models import Tenant, TenantGroup
 
 #
 # Tenant groups

nautobot/tenancy/homepage.py

@@ -1,7 +1,6 @@
 from nautobot.core.apps import HomePageItem, HomePagePanel
 from nautobot.tenancy.models import Tenant
 
-
 layout = (
     HomePagePanel(
         name="Organization",

nautobot/tenancy/migrations/0001_initial.py

@@ -1,10 +1,11 @@
 # Generated by Django 3.1.7 on 2021-04-01 06:35
 
+import uuid
+
 import django.core.serializers.json
 from django.db import migrations, models
 import django.db.models.deletion
 import taggit.managers
-import uuid
 
 
 class Migration(migrations.Migration):

nautobot/tenancy/migrations/0002_auto_slug.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.1.13 on 2021-08-05 03:23
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/tenancy/migrations/0004_change_tree_manager_on_tree_models.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.16 on 2022-12-23 02:46
 
 from django.db import migrations
+
 import nautobot.core.models.tree_queries
 
 

nautobot/tenancy/migrations/0008_tagsfield.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-04-21 13:59
 
 from django.db import migrations
+
 import nautobot.core.models.fields
 
 

nautobot/tenancy/models.py

@@ -4,7 +4,6 @@ from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.tree_queries import TreeModel
 from nautobot.extras.utils import extras_features
 
-
 __all__ = (
     "Tenant",
     "TenantGroup",

nautobot/tenancy/navigation.py

@@ -8,7 +8,6 @@ from nautobot.core.apps import (
     NavMenuTab,
 )
 
-
 menu_items = (
     NavMenuTab(
         name="Organization",

nautobot/tenancy/tables.py

@@ -7,6 +7,7 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
+
 from .models import Tenant, TenantGroup
 
 TREE_LINK = """

nautobot/tenancy/tests/test_filters.py

@@ -2,15 +2,14 @@ import factory
 
 from nautobot.circuits.models import Circuit
 from nautobot.core.testing import FilterTestCases
+
+# TODO: move this to nautobot.core.management.commands.generate_test_data and update all impacted tests
+from nautobot.dcim.factory import RackFactory, RackReservationFactory
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Platform, Rack, RackReservation
 from nautobot.extras.models import Role, Status, Tag
 from nautobot.ipam.models import IPAddress, Prefix, RouteTarget, VLAN, VRF
-from nautobot.tenancy.filters import TenantGroupFilterSet, TenantFilterSet
+from nautobot.tenancy.filters import TenantFilterSet, TenantGroupFilterSet
 from nautobot.tenancy.models import Tenant, TenantGroup
-from nautobot.virtualization.models import Cluster, VirtualMachine
-
-# TODO: move this to nautobot.core.management.commands.generate_test_data and update all impacted tests
-from nautobot.dcim.factory import RackFactory, RackReservationFactory
 from nautobot.users.factory import UserFactory
 from nautobot.virtualization.factory import (
     ClusterFactory,
@@ -18,6 +17,7 @@ from nautobot.virtualization.factory import (
     ClusterTypeFactory,
     VirtualMachineFactory,
 )
+from nautobot.virtualization.models import Cluster, VirtualMachine
 
 
 class TenantGroupTestCase(FilterTestCases.NameOnlyFilterTestCase):

nautobot/tenancy/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 
 from nautobot.extras.views import ObjectChangeLogView, ObjectNotesView
+
 from . import views
 from .models import Tenant, TenantGroup
 

nautobot/tenancy/views.py

@@ -6,11 +6,11 @@ from nautobot.core.views import generic
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
 from nautobot.dcim.models import Device, Location, Rack, RackReservation
 from nautobot.ipam.models import IPAddress, Prefix, VLAN, VRF
-from nautobot.virtualization.models import VirtualMachine, Cluster
+from nautobot.virtualization.models import Cluster, VirtualMachine
+
 from . import filters, forms, tables
 from .models import Tenant, TenantGroup
 
-
 #
 # Tenant groups
 #

nautobot/users/admin.py

@@ -14,7 +14,6 @@ from nautobot.core.admin import NautobotModelAdmin
 from nautobot.extras.admin import order_content_types
 from nautobot.users.models import AdminGroup, ObjectPermission, Token, User
 
-
 #
 # Inline models
 #
@@ -185,7 +184,7 @@ class ObjectPermissionForm(forms.ModelForm):
 
     class Meta:
         model = ObjectPermission
-        exclude = []
+        fields = ["name", "description", "enabled", "object_types", "groups", "users", "actions", "constraints"]
         help_texts = {
             "actions": "Actions granted in addition to those listed above",
             "constraints": "JSON expression of a queryset filter that will return only permitted objects. Leave null "

nautobot/users/api/urls.py

@@ -1,6 +1,6 @@
 from nautobot.core.api.routers import OrderedDefaultRouter
-from . import views
 
+from . import views
 
 router = OrderedDefaultRouter()
 router.APIRootView = views.UsersRootView

nautobot/users/api/views.py

@@ -1,8 +1,8 @@
 from django.contrib.auth import get_user_model, login, logout
 from django.contrib.auth.models import Group
 from django.db.models import Count
-from django.views.decorators.csrf import ensure_csrf_cookie
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import ensure_csrf_cookie
 from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiTypes
 from rest_framework.authentication import BasicAuthentication
 from rest_framework.decorators import action
@@ -17,6 +17,7 @@ from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.core.utils.data import deepmerge
 from nautobot.users import filters
 from nautobot.users.models import ObjectPermission, Token
+
 from . import serializers
 
 
@@ -48,9 +49,10 @@ class UserViewSet(ModelViewSet):
     @action(methods=["GET"], detail=False, permission_classes=[AllowAny])
     def session(self, request):
         from django.conf import settings as django_settings
-        from nautobot.core.settings_funcs import sso_auth_enabled
-        from social_django.context_processors import backends
         from django.urls import reverse
+        from social_django.context_processors import backends
+
+        from nautobot.core.settings_funcs import sso_auth_enabled
 
         serializer = self.serializer_class(instance=request.user, context={"request": request})
 
@@ -97,7 +99,7 @@ class TokenViewSet(ModelViewSet):
     def authentication_classes(self):
         """Inherit default authentication_classes and basic authentication."""
         classes = super().authentication_classes
-        return classes + [BasicAuthentication]
+        return [*classes, BasicAuthentication]
 
     # TODO(timizuo): Move authenticate and logout to its own view;
     #  as it is not proper to be on this.

nautobot/users/factory.py

@@ -1,11 +1,9 @@
 from datetime import timezone
 
 from django.contrib.auth import get_user_model
-
 import factory
 
-from nautobot.core.factory import NautobotBoolIterator, BaseModelFactory
-
+from nautobot.core.factory import BaseModelFactory, NautobotBoolIterator
 
 User = get_user_model()
 

nautobot/users/filters.py

@@ -1,16 +1,16 @@
-import django_filters
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
+import django_filters
 
-from nautobot.dcim.models import RackReservation
-from nautobot.extras.models import ObjectChange
-from nautobot.users.models import ObjectPermission, Token
 from nautobot.core.filters import (
     BaseFilterSet,
     NaturalKeyOrPKMultipleChoiceFilter,
     RelatedMembershipBooleanFilter,
     SearchFilter,
 )
+from nautobot.dcim.models import RackReservation
+from nautobot.extras.models import ObjectChange
+from nautobot.users.models import ObjectPermission, Token
 
 __all__ = (
     "GroupFilterSet",

nautobot/users/forms.py

@@ -5,6 +5,7 @@ from django.contrib.auth.forms import (
 )
 
 from nautobot.core.forms import BootstrapMixin, DateTimePicker
+
 from .models import Token
 
 

nautobot/users/migrations/0004_alter_user_managers.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.18 on 2023-03-14 19:40
 
 from django.db import migrations
+
 import nautobot.users.models
 
 

nautobot/users/migrations/0008_make_object_permission_a_changelogged_model.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.23 on 2024-01-02 19:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0007_alter_objectpermission_object_types"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="objectpermission",
+            name="created",
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="objectpermission",
+            name="last_updated",
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+    ]

nautobot/users/models.py

@@ -13,7 +13,7 @@ from django.utils import timezone
 from nautobot.core.models import BaseManager, BaseModel, CompositeKeyQuerySetMixin
 from nautobot.core.models.fields import JSONArrayField
 from nautobot.core.utils.data import flatten_dict
-
+from nautobot.extras.models.change_logging import ChangeLoggedModel
 
 __all__ = (
     "AdminGroup",
@@ -221,7 +221,7 @@ class Token(BaseModel):
 #
 
 
-class ObjectPermission(BaseModel):
+class ObjectPermission(BaseModel, ChangeLoggedModel):
     """
     A mapping of view, add, change, and/or delete permission for users and/or groups to an arbitrary set of objects
     identified by ORM query parameters.

nautobot/users/tests/test_api.py

@@ -1,5 +1,6 @@
 import base64
 from unittest import skip
+
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
@@ -7,12 +8,11 @@ from django.urls import reverse
 from django.utils.timezone import now
 from rest_framework import HTTP_HEADER_ENCODING, status
 
-from nautobot.core.testing import APIViewTestCases, APITestCase, get_deletable_objects
+from nautobot.core.testing import APITestCase, APIViewTestCases, get_deletable_objects
 from nautobot.core.utils.data import deepmerge
 from nautobot.users.filters import GroupFilterSet
 from nautobot.users.models import ObjectPermission, Token
 
-
 # Use the proper swappable User model
 User = get_user_model()
 
@@ -170,9 +170,9 @@ class TokenTest(APIViewTestCases.APIViewTestCase):
             Token.objects.create(user=self.user),
         ]
 
-        self.tokens = tokens + [self.token]
+        self.tokens = [*tokens, self.token]
 
-        self.basic_auth_user_password = "abc123"
+        self.basic_auth_user_password = "abc123"  # noqa: S105  # hardcoded-password-string -- OK as this is test code
         self.basic_auth_user_granted = User.objects.create_user(
             username="basicusergranted", password=self.basic_auth_user_password
         )
@@ -246,7 +246,8 @@ class TokenTest(APIViewTestCases.APIViewTestCase):
         Test the behavior of the token create view when an invalid password is supplied
         """
         auth = self._create_basic_authentication_header(
-            username=self.basic_auth_user_granted.username, password="hunter2"
+            username=self.basic_auth_user_granted.username,
+            password="hunter2",  # noqa: S106  # hardcoded-password-func-arg -- OK as this is test code
         )
         response = self.client.post(self._get_list_url(), HTTP_AUTHORIZATION=auth)
 
@@ -256,7 +257,7 @@ class TokenTest(APIViewTestCases.APIViewTestCase):
         """
         Test the behavior of the token create view when the user supplied is not a valid user
         """
-        auth = self._create_basic_authentication_header(username="iamnotreal", password="P1n0cc#10")
+        auth = self._create_basic_authentication_header(username="iamnotreal", password="P1n0cc#10")  # noqa: S106  # hardcoded-password-func-arg -- OK as this is test code
         response = self.client.post(self._get_list_url(), HTTP_AUTHORIZATION=auth)
 
         self.assertEqual(response.status_code, 403)

nautobot/users/tests/test_filters.py

@@ -19,7 +19,6 @@ from nautobot.users.filters import (
 )
 from nautobot.users.models import ObjectPermission, Token
 
-
 # Use the proper swappable User model
 User = get_user_model()
 

nautobot/users/tests/test_models.py

@@ -3,7 +3,6 @@ from django.contrib.auth import get_user_model
 from nautobot.core.testing.models import ModelTestCases
 from nautobot.users.models import ObjectPermission, Token
 
-
 # Use the proper swappable User model
 User = get_user_model()
 

nautobot/users/tests/test_password_ui.py

@@ -5,7 +5,7 @@ from django.contrib.auth import get_user_model
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import override_settings, RequestFactory
 from django.urls import reverse
-from social_django.utils import load_strategy, load_backend
+from social_django.utils import load_backend, load_strategy
 
 from nautobot.core.testing import TestCase