nautobot 2.3.16__py3-none-any.whl → 2.4.0__py3-none-any.whl

nautobot/extras/models/relationships.py

@@ -105,7 +105,7 @@ class RelationshipModel(models.Model):
 
                 # Determine if the relationship is applicable to this object based on the filter
                 # To resolve the filter we are using the FilterSet for the given model
-                # If there is no match when we query the primary key of the device along with the filter
+                # If there is no match when we query our id along with the filter
                 # Then the relationship is not applicable to this object
                 if getattr(relationship, f"{side}_filter"):
                     filterset = get_filterset_for_model(self._meta.model)
@@ -222,6 +222,74 @@ class RelationshipModel(models.Model):
         """
         return self.get_relationships_data(advanced_ui=True)
 
+    def get_relationships_with_related_objects(self, include_hidden=False, advanced_ui=None):
+        """Alternative version of get_relationships()."""
+        src_relationships, dst_relationships = Relationship.objects.get_for_model(self)
+
+        if advanced_ui is not None:
+            src_relationships = src_relationships.filter(advanced_ui=advanced_ui)
+            dst_relationships = dst_relationships.filter(advanced_ui=advanced_ui)
+
+        resp = {
+            RelationshipSideChoices.SIDE_SOURCE: {},
+            RelationshipSideChoices.SIDE_DESTINATION: {},
+            RelationshipSideChoices.SIDE_PEER: {},
+        }
+
+        for side, relationships in (
+            (RelationshipSideChoices.SIDE_SOURCE, src_relationships),
+            (RelationshipSideChoices.SIDE_DESTINATION, dst_relationships),
+        ):
+            peer_side = RelationshipSideChoices.OPPOSITE[side]
+            for relationship in relationships:
+                if getattr(relationship, f"{side}_hidden") and not include_hidden:
+                    continue
+
+                # Determine if the relationship is applicable to this object based on the filter
+                # To resolve the filter we are using the FilterSet for the given model
+                # If there is no match when we query our id along with the filter
+                # Then the relationship is not applicable to this object
+                if getattr(relationship, f"{side}_filter"):
+                    filterset = get_filterset_for_model(self._meta.model)
+                    if filterset:
+                        filter_params = getattr(relationship, f"{side}_filter")
+                        if not filterset(filter_params, self._meta.model.objects.filter(id=self.id)).qs.exists():
+                            continue
+
+                # Construct the queryset for related objects for this relationship
+                remote_ct = getattr(relationship, f"{peer_side}_type")
+                remote_model = remote_ct.model_class()
+                if remote_model is not None:
+                    if not relationship.symmetric:
+                        query_params = {f"{peer_side}_for_associations__relationship": relationship.pk}
+                        resp[side][relationship] = remote_model.objects.filter(**query_params)
+                        if not relationship.has_many(peer_side):
+                            resp[side][relationship] = resp[side][relationship].first()
+                    else:
+                        resp[RelationshipSideChoices.SIDE_PEER][relationship] = remote_model.objects.filter(
+                            Q(source_for_associations__relationship=relationship.pk)
+                            | Q(destination_for_associations__relationship=relationship.pk)
+                        ).exclude(pk=self.pk)
+                        if not relationship.has_many(peer_side):
+                            resp[side][relationship] = resp[side][relationship].first()
+                else:
+                    # Maybe an uninstalled App?
+                    # We can't provide a relevant queryset, but we can provide a descriptive string
+                    if not relationship.symmetric:
+                        count = RelationshipAssociation.objects.filter(
+                            relationship=relationship, **{f"{side}_id": self.pk}
+                        ).count()
+                        resp[side][relationship] = f"{count} {remote_ct} object(s)"
+                    else:
+                        count = (
+                            RelationshipAssociation.objects.filter(relationship=relationship)
+                            .filter(Q(source_id=self.pk) | Q(destination_id=self.pk))
+                            .count()
+                        )
+                        resp[RelationshipSideChoices.SIDE_PEER][relationship] = f"{count} {remote_ct} object(s)"
+
+        return resp
+
     @classmethod
     def required_related_objects_errors(
         cls, output_for="ui", initial_data=None, relationships_key_specified=False, instance=None

nautobot/extras/models/secrets.py

@@ -46,6 +46,11 @@ class Secret(PrimaryModel):
     def __str__(self):
         return self.name
 
+    def get_provider_display(self):
+        if provider := registry["secrets_providers"].get(self.provider):
+            return provider.name
+        return self.provider
+
     def rendered_parameters(self, obj=None):
         """Render self.parameters as a Jinja2 template with the given object as context."""
         try:

nautobot/extras/navigation.py

@@ -1,7 +1,4 @@
 from nautobot.core.apps import (
-    NavContext,
-    NavGrouping,
-    NavItem,
     NavMenuAddButton,
     NavMenuGroup,
     NavMenuItem,
@@ -217,6 +214,22 @@ menu_items = (
                             ),
                         ),
                     ),
+                    NavMenuItem(
+                        link="extras:jobqueue_list",
+                        name="Job Queues",
+                        weight=700,
+                        permissions=[
+                            "extras.view_jobqueue",
+                        ],
+                        buttons=(
+                            NavMenuAddButton(
+                                link="extras:jobqueue_add",
+                                permissions=[
+                                    "extras.add_jobqueue",
+                                ],
+                            ),
+                        ),
+                    ),
                 ),
             ),
         ),
@@ -504,269 +517,14 @@ menu_items = (
                 weight=100,
                 items=(
                     NavMenuItem(
-                        link="apps:apps_list",
-                        name="Installed Apps",
-                        weight=100,
-                    ),
-                ),
-            ),
-        ),
-    ),
-)
-
-
-navigation = (
-    NavContext(
-        name="Inventory",
-        groups=(
-            NavGrouping(
-                name="Devices",
-                weight=100,
-                items=(
-                    NavItem(
-                        name="Dynamic Groups",
-                        weight=900,
-                        link="extras:dynamicgroup_list",
-                        permissions=["extras.view_dynamicgroup"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-    NavContext(
-        name="Networks",
-        groups=(
-            NavGrouping(
-                name="Config Contexts",
-                weight=500,
-                items=(
-                    NavItem(
-                        name="Config Contexts",
-                        weight=100,
-                        link="extras:configcontext_list",
-                        permissions=["extras.view_configcontext"],
-                    ),
-                    NavItem(
-                        name="Config Context Schemas",
-                        weight=100,
-                        link="extras:configcontextschema_list",
-                        permissions=["extras.view_configcontextschema"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-    NavContext(
-        name="Security",
-        groups=(
-            NavGrouping(
-                name="Secrets",
-                weight=500,
-                items=(
-                    NavItem(
-                        name="Secrets",
+                        link="apps:apps_marketplace",
+                        name="Apps Marketplace",
                         weight=100,
-                        link="extras:secret_list",
-                        permissions=["extras.view_secret"],
                     ),
-                    NavItem(
-                        name="Secret Groups",
-                        weight=200,
-                        link="extras:secretsgroup_list",
-                        permissions=["extras.view_secretsgroup"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-    NavContext(
-        name="Automation",
-        groups=(
-            NavGrouping(
-                name="Jobs",
-                weight=100,
-                items=(
-                    NavItem(
-                        link="extras:job_list",
-                        name="Jobs",
-                        weight=100,
-                        permissions=[
-                            "extras.view_job",
-                        ],
-                    ),
-                    NavItem(
-                        link="extras:scheduledjob_approval_queue_list",
-                        name="Job Approval Queue",
-                        weight=200,
-                        permissions=[
-                            "extras.view_job",
-                        ],
-                    ),
-                    NavItem(
-                        link="extras:scheduledjob_list",
-                        name="Scheduled Jobs",
-                        weight=300,
-                        permissions=[
-                            "extras.view_job",
-                            "extras.view_scheduledjob",
-                        ],
-                    ),
-                    NavItem(
-                        link="extras:jobresult_list",
-                        name="Job Results",
-                        weight=400,
-                        permissions=[
-                            "extras.view_jobresult",
-                        ],
-                    ),
-                    NavItem(
-                        link="extras:jobhook_list",
-                        name="Job Hooks",
-                        weight=500,
-                        permissions=[
-                            "extras.view_jobhook",
-                        ],
-                    ),
-                    NavItem(
-                        link="extras:jobbutton_list",
-                        name="Job Buttons",
-                        weight=600,
-                        permissions=[
-                            "extras.view_jobbutton",
-                        ],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Extensibility",
-                weight=9999,  # always last
-                items=(
-                    NavItem(
-                        link="extras:webhook_list",
-                        name="Webhooks",
-                        weight=100,
-                        permissions=["extras.view_webhook"],
-                    ),
-                    NavItem(
-                        name="GraphQL Queries",
-                        weight=200,
-                        link="extras:graphqlquery_list",
-                        permissions=["extras.view_graphqlquery"],
-                    ),
-                    NavItem(
-                        name="Export Templates",
-                        weight=300,
-                        link="extras:exporttemplate_list",
-                        permissions=["extras.view_exporttemplate"],
-                    ),
-                ),
-            ),
-        ),
-    ),
-    NavContext(
-        name="Platform",
-        groups=(
-            NavGrouping(
-                name="Platform",
-                weight=100,
-                items=(
-                    NavItem(
-                        name="Installed Apps",
-                        weight=100,
+                    NavMenuItem(
                         link="apps:apps_list",
-                    ),
-                    NavItem(
-                        name="Git Repositories",
-                        weight=200,
-                        link="extras:gitrepository_list",
-                        permissions=["extras.view_gitrepository"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Governance",
-                weight=200,
-                items=(
-                    NavItem(
-                        name="Change Log",
-                        weight=100,
-                        link="extras:objectchange_list",
-                        permissions=["extras.view_objectchange"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Reference Data",
-                weight=300,
-                items=(
-                    NavItem(
-                        name="Tags",
-                        weight=100,
-                        link="extras:tag_list",
-                        permissions=["extras.view_tag"],
-                    ),
-                    NavItem(
-                        name="Statuses",
-                        weight=200,
-                        link="extras:status_list",
-                        permissions=["extras.view_status"],
-                    ),
-                    NavItem(
-                        name="Roles",
-                        weight=300,
-                        link="extras:role_list",
-                        permissions=["extras.view_role"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Data Management",
-                weight=400,
-                items=(
-                    NavItem(
-                        name="Relationships",
-                        weight=100,
-                        link="extras:relationship_list",
-                        permissions=["extras.view_relationship"],
-                    ),
-                    NavItem(
-                        name="Computed Fields",
+                        name="Installed Apps",
                         weight=200,
-                        link="extras:computedfield_list",
-                        permissions=["extras.view_computedfield"],
-                    ),
-                    NavItem(
-                        name="Custom Fields",
-                        weight=300,
-                        link="extras:customfield_list",
-                        permissions=["extras.view_customfield"],
-                    ),
-                    NavItem(
-                        name="Custom Links",
-                        weight=400,
-                        link="extras:customlink_list",
-                        permissions=["extras.view_customlink"],
-                    ),
-                    NavItem(
-                        name="Notes",
-                        weight=500,
-                        # TODO figure out what link we should put here
-                        # This NavItem is required for the breadCrumb on NotesDetailView to render.
-                        # However `extras:note_list` is not a reverse url lookup that does not exist.
-                        link="extras:note_list",
-                        permissions=["extras.view_note"],
-                    ),
-                ),
-            ),
-            NavGrouping(
-                name="Users",
-                weight=500,
-                items=(
-                    NavItem(
-                        link="extras:savedview_list",
-                        name="Saved Views",
-                        weight=100,
-                        permissions=["extras.view_savedviews"],
                     ),
                 ),
             ),

nautobot/extras/plugins/__init__.py

@@ -287,21 +287,34 @@ class PluginConfig(NautobotAppConfig):
 
 class TemplateExtension:
     """
-    This class is used to register plugin content to be injected into core Nautobot templates. It contains methods
-    that are overridden by plugin authors to return template content.
+    This class is used to register App content to be injected into core Nautobot templates.
 
-    The `model` attribute on the class defines the which model detail page this class renders content for. It
-    should be set as a string in the form `<app_label>.<model_name>`. `render()` provides the following context data:
+    It contains methods and attributes that may be overridden by App authors to return template content.
 
-    * object - The object being viewed
-    * request - The current request
-    * settings - Global Nautobot settings
-    * config - Plugin-specific configuration parameters
+    The `model` attribute on the class defines the which model detail/list pages this class renders content for.
+    It should be set as a string in the form `<app_label>.<model_name>`.
     """
 
-    model = None
+    model: str = None
+    """The model (as a string in the form `<app_label>.<model>`) that this TemplateExtension subclass applies to."""
+    object_detail_buttons = None
+    """List of Button instances to add to the specified model's detail view."""
+    object_detail_tabs = None
+    """List of Tab instances to add to the specified model's detail view."""
+    object_detail_panels = None
+    """List of Panel instances to add to the specified model's detail view."""
 
     def __init__(self, context):
+        """
+        Called automatically to instantiate a TemplateExtension with render context before calling `left_page()`, etc.
+
+        The provided context typically includes the following keys:
+
+        * object - The object being viewed
+        * request - The current request
+        * settings - Global Nautobot settings
+        * config - App-specific configuration parameters
+        """
         self.context = context
 
     def render(self, template_name, extra_context=None):
@@ -318,30 +331,49 @@ class TemplateExtension:
 
     def left_page(self):
         """
-        Content that will be rendered on the left of the detail page view. Content should be returned as an
-        HTML string. Note that content does not need to be marked as safe because this is automatically handled.
+        (Deprecated) Provide content that will be rendered on the left of the detail page view.
+
+        In Nautobot v2.4.0 and later, Apps can (should) instead register `Panel` instances in `object_detail_panels`,
+        instead of implementing a `.left_page()` method.
+
+        Content should be returned as an HTML string.
+        Note that content does not need to be marked as safe because this is automatically handled.
         """
         raise NotImplementedError
 
     def right_page(self):
         """
-        Content that will be rendered on the right of the detail page view. Content should be returned as an
-        HTML string. Note that content does not need to be marked as safe because this is automatically handled.
+        (Deprecated) Provide content that will be rendered on the right of the detail page view.
+
+        In Nautobot v2.4.0 and later, Apps can (should) instead register `Panel` instances in `object_detail_panels`,
+        instead of implementing a `.right_page()` method.
+
+        Content should be returned as an HTML string.
+        Note that content does not need to be marked as safe because this is automatically handled.
         """
         raise NotImplementedError
 
     def full_width_page(self):
         """
-        Content that will be rendered within the full width of the detail page view. Content should be returned as an
-        HTML string. Note that content does not need to be marked as safe because this is automatically handled.
+        (Deprecated) Provide content that will be rendered within the full width of the detail page view.
+
+        In Nautobot v2.4.0 and later, Apps can (should) instead register `Panel` instances in `object_detail_panels`,
+        instead of implementing a `.full_width_page()` method.
+
+        Content should be returned as an HTML string.
+        Note that content does not need to be marked as safe because this is automatically handled.
         """
         raise NotImplementedError
 
     def buttons(self):
         """
-        Buttons that will be rendered and added to the existing list of buttons on the detail page view. Content
-        should be returned as an HTML string. Note that content does not need to be marked as safe because this is
-        automatically handled.
+        (Deprecated) Provide content that will be added to the existing list of buttons on the detail page view.
+
+        In Nautobot v2.4.0 and later, Apps can (should) instead register `Button` instances in `object_detail_buttons`,
+        instead of implementing a `.buttons()` method.
+
+        Content should be returned as an HTML string.
+        Note that content does not need to be marked as safe because this is automatically handled.
         """
         raise NotImplementedError
 
@@ -355,7 +387,10 @@ class TemplateExtension:
 
     def detail_tabs(self):
         """
-        Tabs that will be rendered and added to the existing list of tabs on the detail page view.
+        (Deprecated) Provide a dict of tabs and associated views that will be added to the detail page view.
+
+        In Nautobot v2.4.0 and later, Apps can (should) instead implement the `object_detail_tabs` attribute instead.
+
         Tabs will be ordered by their position in the list.
 
         Content should be returned as a list of dicts in the following format: