nautobot 2.4.1__py3-none-any.whl → 2.4.2__py3-none-any.whl

nautobot/core/views/generic.py

@@ -1051,7 +1051,7 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, BulkEditAnd
 
             if form.is_valid():
                 logger.debug("Form validation was successful")
-                return self.send_bulk_edit_objects_to_job(request, form, model)
+                return self.send_bulk_edit_objects_to_job(request, form.cleaned_data, model)
             else:
                 logger.debug("Form validation failed")
 

nautobot/core/views/mixins.py

@@ -992,10 +992,9 @@ class BulkEditAndBulkDeleteModelMixin:
         )
         return redirect("extras:jobresult", pk=job_result.pk)
 
-    def send_bulk_edit_objects_to_job(self, request, form, model):
+    def send_bulk_edit_objects_to_job(self, request, form_data, model):
         """Prepare and enqueue a bulk edit job."""
         job_model = Job.objects.get_for_class_path(BulkEditObjects.class_path)
-        form_data = normalize_querydict(request.POST, form)
         if filterset_class := lookup.get_filterset_for_model(model):
             filter_query_params = normalize_querydict(request.GET, filterset=filterset_class())
         else:
@@ -1288,7 +1287,7 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, Bulk
             form = form_class(queryset.model, request.POST, edit_all=edit_all)
             restrict_form_fields(form, request.user)
             if form.is_valid():
-                return self.send_bulk_edit_objects_to_job(self.request, form, queryset.model)
+                return self.send_bulk_edit_objects_to_job(self.request, form.cleaned_data, queryset.model)
             else:
                 return self.form_invalid(form)
         table = None
@@ -1312,10 +1311,14 @@ class ObjectBulkUpdateViewMixin(NautobotViewSetMixin, BulkUpdateModelMixin, Bulk
 
 class ObjectChangeLogViewMixin(NautobotViewSetMixin):
     """
-    UI mixin to list a model's changelog queryset
+    UI mixin to list a model's changelog queryset.
+
+    base_template: Specify to explicitly identify the base object detail template to render.
+        If not provided, "<app>/<model>.html", "<app>/<model>_retrieve.html", or "generic/object_retrieve.html"
+        will be used, as per `get_base_template()`.
     """
 
-    base_template = None
+    base_template: Optional[str] = None
 
     @drf_action(detail=True)
     def changelog(self, request, *args, **kwargs):
@@ -1330,9 +1333,13 @@ class ObjectChangeLogViewMixin(NautobotViewSetMixin):
 class ObjectNotesViewMixin(NautobotViewSetMixin):
     """
     UI Mixin for an Object's Notes.
+
+    base_template: Specify to explicitly identify the base object detail template to render.
+        If not provided, "<app>/<model>.html", "<app>/<model>_retrieve.html", or "generic/object_retrieve.html"
+        will be used, as per `get_base_template()`.
     """
 
-    base_template = None
+    base_template: Optional[str] = None
 
     @drf_action(detail=True)
     def notes(self, request, *args, **kwargs):

nautobot/core/views/utils.py

@@ -137,10 +137,10 @@ def get_csv_form_fields_from_serializer_class(serializer_class):
                 elif cf.type == CustomFieldTypeChoices.TYPE_DATE:
                     field_info["format"] = mark_safe("<code>YYYY-MM-DD</code>")  # noqa: S308
                 elif cf.type == CustomFieldTypeChoices.TYPE_SELECT:
-                    field_info["choices"] = {cfc.value: cfc.value for cfc in cf.custom_field_choices.all()}
+                    field_info["choices"] = {value: value for value in cf.choices}
                 elif cf.type == CustomFieldTypeChoices.TYPE_MULTISELECT:
                     field_info["format"] = mark_safe('<code>"value,value"</code>')  # noqa: S308
-                    field_info["choices"] = {cfc.value: cfc.value for cfc in cf.custom_field_choices.all()}
+                    field_info["choices"] = {value: value for value in cf.choices}
                 fields.append(field_info)
             continue
 

nautobot/dcim/forms.py

@@ -307,6 +307,17 @@ class LocationTypeFilterForm(NautobotFilterForm):
     content_types = MultipleContentTypeField(feature="locations", choices_as_strings=True, required=False)
 
 
+class LocationTypeBulkEditForm(TagsBulkEditFormMixin, NautobotBulkEditForm):
+    pk = forms.ModelMultipleChoiceField(queryset=LocationType.objects.all(), widget=forms.MultipleHiddenInput())
+    description = forms.CharField(max_length=CHARFIELD_MAX_LENGTH, required=False)
+    nestable = forms.NullBooleanField(required=False, widget=BulkEditNullBooleanSelect)
+    add_content_types = MultipleContentTypeField(feature="locations", required=False)
+    remove_content_types = MultipleContentTypeField(feature="locations", required=False)
+
+    class Meta:
+        nullable_fields = []
+
+
 #
 # Locations
 #
@@ -784,6 +795,7 @@ class DeviceFamilyForm(NautobotModelForm):
         fields = [
             "name",
             "description",
+            "tags",
         ]
 
 

nautobot/dcim/tables/devices.py

@@ -106,7 +106,8 @@ __all__ = (
 
 class PlatformTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn()
+    name = tables.Column(linkify=True)
+    manufacturer = tables.Column(linkify=True)
     device_count = LinkedCountColumn(
         viewname="dcim:device_list",
         url_params={"platform": "pk"},

nautobot/dcim/templates/dcim/cable.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/device/base.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 

nautobot/dcim/templates/dcim/device.html

@@ -214,8 +214,8 @@
                                         <tr>
                                             <td>Cluster</td>
                                             <td>
-                                                {% if object.cluster.group %}
-                                                    {{ object.cluster.group|hyperlinked_object }} /
+                                                {% if object.cluster.cluster_group %}
+                                                    {{ object.cluster.cluster_group|hyperlinked_object }} /
                                                 {% endif %}
                                                 {{ object.cluster|hyperlinked_object }}
                                             </td>

nautobot/dcim/templates/dcim/device_component.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block breadcrumbs %}

nautobot/dcim/templates/dcim/devicetype.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 {% load plugins %}

nautobot/dcim/templates/dcim/location.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load plugins %}
 {% load helpers %}

nautobot/dcim/templates/dcim/locationtype.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/locationtype_retrieve.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/manufacturer.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/platform.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/powerfeed.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/powerpanel.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block extra_breadcrumbs %}

nautobot/dcim/templates/dcim/rack.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 

nautobot/dcim/templates/dcim/rackgroup.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load buttons %}
 {% load helpers %}
 

nautobot/dcim/templates/dcim/rackreservation.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 {% load static %}
 
@@ -15,7 +15,7 @@
                 {% with rack=object.rack %}
                     <tr>
                         <td>Location</td>
-                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=object.location %}</td>
+                        <td>{% include 'dcim/inc/location_hierarchy.html' with location=rack.location %}</td>
                     </tr>
                     <tr>
                         <td>Group</td>

nautobot/dcim/templates/dcim/virtualchassis.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_detail.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/tests/integration/test_device_bulk_operations.py

@@ -0,0 +1,30 @@
+import uuid
+
+from nautobot.core.testing.integration import (
+    BulkOperationsTestCases,
+)
+from nautobot.dcim.models import Device
+from nautobot.extras.tests.integration import create_test_device
+
+
+class DeviceBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
+    """
+    Test devices bulk edit / delete operations.
+    """
+
+    model_menu_path = ("Devices", "Devices")
+    model_base_viewname = "dcim:device"
+    model_edit_data = {"serial": "Test serial"}
+    model_filter_by = {"location": "Test Location 2"}
+    model_class = Device
+
+    def setup_items(self):
+        Device.objects.all().delete()
+        test_uuid = str(uuid.uuid4())
+
+        # Create device for test
+        create_test_device("Test Device Integration Test 1", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 2", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 3", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 4", "Test Location 2", test_uuid=test_uuid)
+        create_test_device("Test Device Integration Test 5", "Test Location 2", test_uuid=test_uuid)

nautobot/dcim/tests/integration/test_location_bulk_operations.py

@@ -0,0 +1,43 @@
+from django.contrib.contenttypes.models import ContentType
+
+from nautobot.core.testing.integration import (
+    BulkOperationsTestCases,
+)
+from nautobot.dcim.models import Device, Location, LocationType
+from nautobot.extras.models import Status
+
+
+class LocationBulkOperationsTestCase(BulkOperationsTestCases.BulkOperationsTestCase):
+    """
+    Test locations bulk edit / delete operations.
+    """
+
+    model_menu_path = ("Organization", "Locations")
+    model_base_viewname = "dcim:location"
+    model_edit_data = {"description": "Test description"}
+    model_filter_by = {"location_type": "External"}
+    model_class = Location
+
+    def setup_items(self):
+        Location.objects.all().delete()
+
+        # Create locations for test
+        self.create_location("Test Location Integration Test 1")
+        self.create_location("Test Location Integration Test 2")
+        self.create_location("Test Location Integration Test 3")
+        self.create_location("Test Location Integration Test 4", "External")
+        self.create_location("Test Location Integration Test 5", "External")
+
+    @staticmethod
+    def create_location(location_name, location_type="Internal"):
+        location_type, location_type_created = LocationType.objects.get_or_create(name=location_type)
+        if location_type_created:
+            location_type.content_types.add(ContentType.objects.get_for_model(Device))
+            location_type.save()
+
+        location_status = Status.objects.get_for_model(Location).first()
+        Location.objects.get_or_create(
+            name=location_name,
+            status=location_status,
+            location_type=location_type,
+        )

nautobot/dcim/tests/test_views.py

@@ -161,7 +161,7 @@ def create_test_device(name):
     return device
 
 
-class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
+class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase, ViewTestCases.BulkEditObjectsViewTestCase):
     model = LocationType
     sort_on_field = "nestable"
 
@@ -194,6 +194,13 @@ class LocationTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "nestable": True,
         }
 
+        cls.bulk_edit_data = {
+            "description": "A generic description",
+            "add_content_types": [
+                ContentType.objects.get_for_model(CircuitTermination).pk,
+            ],
+        }
+
     def _get_queryset(self):
         return super()._get_queryset().order_by("-last_updated")
 
@@ -743,6 +750,7 @@ class DeviceFamilyTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.form_data = {
             "name": "New Device Family",
             "description": "A new device family",
+            "tags": [t.pk for t in Tag.objects.get_for_model(DeviceFamily)],
         }
         cls.bulk_edit_data = {
             "description": "A new device family",

nautobot/dcim/views.py

@@ -40,7 +40,7 @@ from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.utils.lookup import get_form_for_model
 from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.utils.requests import normalize_querydict
-from nautobot.core.views import generic, mixins as view_mixins
+from nautobot.core.views import generic
 from nautobot.core.views.mixins import (
     GetReturnURLMixin,
     ObjectBulkDestroyViewMixin,
@@ -213,21 +213,13 @@ class BaseDeviceComponentTemplatesBulkRenameView(generic.BulkRenameView):
 #
 
 
-class LocationTypeUIViewSet(
-    view_mixins.ObjectDetailViewMixin,
-    view_mixins.ObjectListViewMixin,
-    view_mixins.ObjectEditViewMixin,
-    view_mixins.ObjectDestroyViewMixin,
-    view_mixins.ObjectBulkDestroyViewMixin,
-    view_mixins.ObjectBulkCreateViewMixin,  # 3.0 TODO: remove this mixin as it's no longer used
-    view_mixins.ObjectChangeLogViewMixin,
-    view_mixins.ObjectNotesViewMixin,
-):
+class LocationTypeUIViewSet(NautobotUIViewSet):
     queryset = LocationType.objects.all()
     filterset_class = filters.LocationTypeFilterSet
     filterset_form_class = forms.LocationTypeFilterForm
     table_class = tables.LocationTypeTable
     form_class = forms.LocationTypeForm
+    bulk_update_form_class = forms.LocationTypeBulkEditForm
     serializer_class = serializers.LocationSerializer
 
     object_detail_content = object_detail.ObjectDetailContent(
@@ -1755,16 +1747,21 @@ class DeviceListView(generic.ObjectListView):
 
 class DeviceView(generic.ObjectView):
     queryset = Device.objects.select_related(
+        "cluster__cluster_group",
+        "controller_managed_device_group__controller",
+        "device_redundancy_group",
+        "device_type__device_family",
         "location",
-        "rack__rack_group",
-        "tenant__tenant_group",
-        "role",
         "platform",
         "primary_ip4",
         "primary_ip6",
+        "rack__rack_group",
+        "role",
+        "secrets_group",
         "software_version",
         "status",
-    )
+        "tenant__tenant_group",
+    ).prefetch_related("images", "software_image_files")
 
     object_detail_content = object_detail.ObjectDetailContent(
         extra_buttons=(

nautobot/extras/api/serializers.py

@@ -480,11 +480,32 @@ class GitRepositorySerializer(TaggedModelSerializerMixin, NautobotModelSerialize
 
 class GraphQLQuerySerializer(ValidatedModelSerializer, NotesSerializerMixin):
     variables = serializers.DictField(read_only=True)
+    owner_content_type = ContentTypeField(
+        queryset=ContentType.objects.filter(FeatureQuery("graphql_query_owners").get_query()),
+        required=False,
+        allow_null=True,
+        default=None,
+    )
+    owner = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
         model = GraphQLQuery
         fields = "__all__"
 
+    @extend_schema_field(
+        PolymorphicProxySerializer(
+            component_name="GraphQLQueryOwner",
+            resource_type_field_name="object_type",
+            serializers=lambda: nested_serializers_for_models(FeatureQuery("graphql_query_owners").list_subclasses()),
+            allow_null=True,
+        )
+    )
+    def get_owner(self, obj):
+        if obj.owner is None:
+            return None
+        depth = get_nested_serializer_depth(self)
+        return return_nested_serializer_data_based_on_depth(self, depth, obj, obj.owner, "owner")
+
 
 class GraphQLQueryInputSerializer(serializers.Serializer):
     variables = serializers.DictField(allow_null=True, default={})
@@ -1148,3 +1169,15 @@ class WebhookSerializer(ValidatedModelSerializer, NotesSerializerMixin):
             raise serializers.ValidationError(conflicts)
 
         return validated_attrs
+
+
+#
+# More Git repositories
+#
+
+
+class GitRepositorySyncResponseSerializer(serializers.Serializer):
+    """Serializer representing responses from the GitRepository.sync() POST endpoint."""
+
+    message = serializers.CharField(read_only=True)
+    job_result = JobResultSerializer(read_only=True)

nautobot/extras/api/views.py

@@ -425,7 +425,7 @@ class GitRepositoryViewSet(NautobotModelViewSet):
     serializer_class = serializers.GitRepositorySerializer
     filterset_class = filters.GitRepositoryFilterSet
 
-    @extend_schema(methods=["post"], request=serializers.GitRepositorySerializer)
+    @extend_schema(methods=["post"], responses={"200": serializers.GitRepositorySyncResponseSerializer}, request=None)
     # Since we are explicitly checking for `extras:change_gitrepository` in the API sync() method
     # We explicitly set the permission_classes to IsAuthenticated in the @action decorator
     # bypassing the default DRF permission check for `extras:add_gitrepository` and the permission check fall through to the function itself.
@@ -441,8 +441,16 @@ class GitRepositoryViewSet(NautobotModelViewSet):
             raise CeleryWorkerNotRunningException()
 
         repository = get_object_or_404(GitRepository, id=pk)
-        repository.sync(user=request.user)
-        return Response({"message": f"Repository {repository} sync job added to queue."})
+        job_result = repository.sync(user=request.user)
+
+        data = {
+            # Kept message for backward compatibility for now
+            "message": f"Repository {repository} sync job added to queue.",
+            "job_result": job_result,
+        }
+
+        serializer = serializers.GitRepositorySyncResponseSerializer(data, context={"request": request})
+        return Response(serializer.data, status=status.HTTP_200_OK)
 
 
 #

nautobot/extras/constants.py

@@ -11,6 +11,7 @@ EXTRAS_FEATURES = [
     "dynamic_groups",
     "export_template_owners",
     "export_templates",
+    "graphql_query_owners",
     "graphql",
     "job_results",  # No longer used
     "locations",

nautobot/extras/datasources/git.py

@@ -30,6 +30,7 @@ from nautobot.extras.models import (
     DynamicGroup,
     ExportTemplate,
     GitRepository,
+    GraphQLQuery,
     Job,
     JobQueue,
     JobResult,
@@ -935,6 +936,120 @@ def delete_git_export_templates(repository_record, job_result, preserve=None):
             job_result.log(msg, level_choice=LogLevelChoices.LOG_WARNING, grouping="export templates")
 
 
+#
+# GraphQL handling
+#
+
+
+def refresh_git_graphql_queries(repository_record, job_result, delete=False):
+    """Callback function for GitRepository updates - refresh all GraphQLQuery managed by this repository."""
+    if "extras.graphqlquery" in repository_record.provided_contents and not delete:
+        update_git_graphql_queries(repository_record, job_result)
+    else:
+        delete_git_graphql_queries(repository_record, job_result)
+
+
+logger = logging.getLogger(__name__)
+
+
+def update_git_graphql_queries(repository_record, job_result):
+    """Refresh any GraphQL queries provided by this Git repository."""
+    graphql_query_path = os.path.join(repository_record.filesystem_path, "graphql_queries")
+    git_repository_content_type = ContentType.objects.get_for_model(GitRepository)
+    graphql_queries = []
+
+    if os.path.isdir(graphql_query_path):
+        for file in os.listdir(graphql_query_path):
+            file_path = os.path.join(graphql_query_path, file)
+            if not os.path.isfile(file_path):
+                continue
+
+            # Remove `.gql` extension from the name if it exists
+            query_name = file.rsplit(".gql", 1)[0] if file.endswith(".gql") else file
+
+            try:
+                with open(file_path, "r") as fd:
+                    query_content = fd.read().strip()
+
+                graphql_query, created = GraphQLQuery.objects.get_or_create(
+                    name=query_name,
+                    owner_content_type=git_repository_content_type,
+                    owner_object_id=repository_record.pk,
+                    defaults={"query": query_content},
+                )
+                modified = graphql_query.query != query_content
+                graphql_queries.append(query_name)
+                # Only attempt to update if the content has changed
+                if modified:
+                    try:
+                        graphql_query.query = query_content
+                        graphql_query.validated_save()
+                        msg = (
+                            f"Successfully created GraphQL query: {query_name}"
+                            if created
+                            else f"Successfully updated GraphQL query: {query_name}"
+                        )
+                        logger.info(msg)
+                        job_result.log(
+                            msg, obj=graphql_query, level_choice=LogLevelChoices.LOG_INFO, grouping="graphql queries"
+                        )
+                    except Exception as exc:
+                        # Log validation error and retain the existing query
+                        error_msg = (
+                            f"Invalid GraphQL syntax for query '{query_name}'. "
+                            f"Retaining the existing query. Error: {exc}"
+                        )
+                        logger.error(error_msg)
+                        job_result.log(error_msg, level_choice=LogLevelChoices.LOG_ERROR, grouping="graphql queries")
+                        continue
+                else:
+                    msg = f"No changes to GraphQL query: {query_name}"
+                    logger.info(msg)
+                    job_result.log(
+                        msg, obj=graphql_query, level_choice=LogLevelChoices.LOG_INFO, grouping="graphql queries"
+                    )
+
+            except Exception as exc:
+                # Check if a query with the same name already exists
+                existing_query = GraphQLQuery.objects.filter(name=query_name).first()
+                if existing_query and existing_query.owner_object_id != repository_record.pk:
+                    error_msg = (
+                        f"GraphQL query '{query_name}' already exists "
+                        f"Please rename the query in the repository and try again."
+                    )
+                else:
+                    error_msg = f"Error processing GraphQL query file '{file}': {exc}"
+
+                # Log the error
+                logger.error(error_msg)
+                job_result.log(error_msg, level_choice=LogLevelChoices.LOG_ERROR, grouping="graphql queries")
+
+    # Delete any queries not in the preserved list
+    delete_git_graphql_queries(repository_record, job_result, preserve=graphql_queries)
+
+
+def delete_git_graphql_queries(repository_record, job_result, preserve=None):
+    """Delete GraphQL queries owned by the given Git repository that are not in the preserve list."""
+    git_repository_content_type = ContentType.objects.get_for_model(GitRepository)
+    if preserve is None:
+        preserve = []
+
+    for graphql_query in GraphQLQuery.objects.filter(
+        owner_content_type=git_repository_content_type,
+        owner_object_id=repository_record.pk,
+    ):
+        if graphql_query.name not in preserve:
+            try:
+                graphql_query.delete()
+                msg = f"Deleted GraphQL query: {graphql_query.name}"
+                logger.warning(msg)
+                job_result.log(msg, level_choice=LogLevelChoices.LOG_WARNING, grouping="graphql queries")
+            except Exception as exc:
+                error_msg = f"Unable to delete '{graphql_query.name}': {exc}"
+                logger.error(error_msg)
+                job_result.log(error_msg, level_choice=LogLevelChoices.LOG_ERROR, grouping="graphql queries")
+
+
 # Register built-in callbacks for data types potentially provided by a GitRepository
 register_datasource_contents(
     [
@@ -978,5 +1093,15 @@ register_datasource_contents(
                 callback=refresh_git_export_templates,
             ),
         ),
+        (
+            "extras.gitrepository",
+            DatasourceContent(
+                name="graphql queries",
+                content_identifier="extras.graphqlquery",
+                icon="mdi-graphql",
+                weight=400,
+                callback=refresh_git_graphql_queries,
+            ),
+        ),
     ]
 )