[PUI] Notes editor

src/backend/InvenTree/InvenTree/api_version.py

@@ -1,11 +1,14 @@
 """InvenTree API version information."""
 
 # InvenTree API version
-INVENTREE_API_VERSION = 204
+INVENTREE_API_VERSION = 205
 
 """Increment this API version number whenever there is a significant change to the API that any clients need to know about."""
 
 INVENTREE_API_TEXT = """
+v205 - 2024-06-03 : https://github.com/inventree/InvenTree/pull/7284
+    - Added model_type and model_id fields to the "NotesImage" serializer
+
 v204 - 2024-06-03 : https://github.com/inventree/InvenTree/pull/7393
     - Fixes previous API update which resulted in inconsistent ordering of currency codes
 

src/backend/InvenTree/InvenTree/models.py

@@ -1031,6 +1031,30 @@
 
         abstract = True
 
+    def delete(self):
+        """Custom delete method for InvenTreeNotesMixin.
+
+        - Before deleting the object, check if there are any uploaded images associated with it.
+        - If so, delete the notes first
+        """
+        from common.models import NotesImage
+
+        images = NotesImage.objects.filter(
+            model_type=self.__class__.__name__.lower(), model_id=self.pk
+        )
+
+        if images.exists():
+            logger.info(
+                'Deleting %s uploaded images associated with %s <%s>',
+                images.count(),
+                self.__class__.__name__,
+                self.pk,
+            )
+
+            images.delete()
+
+        super().delete()
+
     notes = InvenTree.fields.InvenTreeNotesField(
         verbose_name=_('Notes'), help_text=_('Markdown notes (optional)')
     )

src/backend/InvenTree/InvenTree/serializers.py

@@ -18,6 +18,7 @@
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied, ValidationError
 from rest_framework.fields import empty
+from rest_framework.mixins import ListModelMixin
 from rest_framework.serializers import DecimalField
 from rest_framework.utils import model_meta
 from taggit.serializers import TaggitSerializer
@@ -842,6 +843,23 @@ def save(self):
         pass
 
 
+class NotesFieldMixin:
+    """Serializer mixin for handling 'notes' fields.
+
+    The 'notes' field will be hidden in a LIST serializer,
+    but available in a DETAIL serializer.
+    """
+
+    def __init__(self, *args, **kwargs):
+        """Remove 'notes' field from list views."""
+        super().__init__(*args, **kwargs)
+
+        if hasattr(self, 'context'):
+            if view := self.context.get('view', None):
+                if issubclass(view.__class__, ListModelMixin):
+                    self.fields.pop('notes', None)
+
+
 class RemoteImageMixin(metaclass=serializers.SerializerMetaclass):
     """Mixin class which allows downloading an 'image' from a remote URL.
 

src/backend/InvenTree/build/serializers.py

@@ -17,7 +17,7 @@
 from InvenTree.serializers import UserSerializer
 
 import InvenTree.helpers
-from InvenTree.serializers import InvenTreeDecimalField
+from InvenTree.serializers import InvenTreeDecimalField, NotesFieldMixin
 from stock.status_codes import StockStatus
 
 from stock.generators import generate_batch_code
@@ -33,7 +33,7 @@
 from .models import Build, BuildLine, BuildItem, BuildOrderAttachment
 
 
-class BuildSerializer(InvenTreeModelSerializer):
+class BuildSerializer(NotesFieldMixin, InvenTreeModelSerializer):
     """Serializes a Build object."""
 
     class Meta:

src/backend/InvenTree/build/templates/build/detail.html

@@ -346,6 +346,8 @@ <h4>{% trans "Build Notes" %}</h4>
         'build-notes',
         '{% url "api-build-detail" build.pk %}',
         {
+            model_type: 'build',
+            model_id: {{ build.pk }},
             {% if roles.build.change %}
             editable: true,
             {% else %}

src/backend/InvenTree/common/api.py

@@ -479,6 +479,10 @@ class NotesImageList(ListCreateAPI):
     serializer_class = common.serializers.NotesImageSerializer
     permission_classes = [permissions.IsAuthenticated]
 
+    filter_backends = SEARCH_ORDER_FILTER
+
+    search_fields = ['user', 'model_type', 'model_id']
+
     def perform_create(self, serializer):
         """Create (upload) a new notes image."""
         image = serializer.save()

src/backend/InvenTree/common/migrations/0023_auto_20240602_1332.py

@@ -52,11 +52,11 @@
     setting = InvenTreeSetting.objects.filter(key=key).first()
 
     if setting:
-        print(f"Updating existing setting for currency codes")
+        print(f"- Updating existing setting for currency codes")
         setting.value = value
         setting.save()
     else:
-        print(f"Creating new setting for currency codes")
+        print(f"- Creating new setting for currency codes")
         setting = InvenTreeSetting(key=key, value=value)
         setting.save()
 

src/backend/InvenTree/common/migrations/0024_notesimage_model_id_notesimage_model_type.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.12 on 2024-05-22 12:27
+
+import common.validators
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0023_auto_20240602_1332'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='notesimage',
+            name='model_id',
+            field=models.IntegerField(blank=True, default=None, help_text='Target model ID for this image', null=True),
+        ),
+        migrations.AddField(
+            model_name='notesimage',
+            name='model_type',
+            field=models.CharField(blank=True, null=True, help_text='Target model type for this image', max_length=100, validators=[common.validators.validate_notes_model_type]),
+        ),
+    ]

src/backend/InvenTree/common/models.py

@@ -9,7 +9,6 @@
 import json
 import logging
 import os
-import re
 import uuid
 from datetime import timedelta, timezone
 from enum import Enum
@@ -35,7 +34,6 @@
 
 from djmoney.contrib.exchange.exceptions import MissingRate
 from djmoney.contrib.exchange.models import convert_money
-from djmoney.settings import CURRENCY_CHOICES
 from rest_framework.exceptions import PermissionDenied
 
 import build.validators
@@ -2955,7 +2953,7 @@ def rename_notes_image(instance, filename):
 class NotesImage(models.Model):
     """Model for storing uploading images for the 'notes' fields of various models.
 
-    Simply stores the image file, for use in the 'notes' field (of any models which support markdown)
+    Simply stores the image file, for use in the 'notes' field (of any models which support markdown).
     """
 
     image = models.ImageField(
@@ -2966,6 +2964,21 @@ class NotesImage(models.Model):
 
     date = models.DateTimeField(auto_now_add=True)
 
+    model_type = models.CharField(
+        max_length=100,
+        blank=True,
+        null=True,
+        validators=[common.validators.validate_notes_model_type],
+        help_text=_('Target model type for this image'),
+    )
+
+    model_id = models.IntegerField(
+        help_text=_('Target model ID for this image'),
+        blank=True,
+        null=True,
+        default=None,
+    )
+
 
 class CustomUnit(models.Model):
     """Model for storing custom physical unit definitions.

src/backend/InvenTree/common/serializers.py

@@ -281,7 +281,7 @@ class Meta:
         """Meta options for NotesImageSerializer."""
 
         model = common_models.NotesImage
-        fields = ['pk', 'image', 'user', 'date']
+        fields = ['pk', 'image', 'user', 'date', 'model_type', 'model_id']
 
         read_only_fields = ['date', 'user']
 

src/backend/InvenTree/common/validators.py

@@ -1,8 +1,33 @@
 """Validation helpers for common models."""
 
+import re
+
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
+import InvenTree.helpers_model
+
+
+def validate_notes_model_type(value):
+    """Ensure that the provided model type is valid.
+
+    The provided value must map to a model which implements the 'InvenTreeNotesMixin'.
+    """
+    import InvenTree.models
+
+    if not value:
+        # Empty values are allowed
+        return
+
+    model_types = list(
+        InvenTree.helpers_model.getModelsWithMixin(InvenTree.models.InvenTreeNotesMixin)
+    )
+
+    model_names = [model.__name__.lower() for model in model_types]
+
+    if value.lower() not in model_names:
+        raise ValidationError(f"Invalid model type '{value}'")
+
 
 def validate_decimal_places_min(value):
     """Validator for PRICING_DECIMAL_PLACES_MIN setting."""

src/backend/InvenTree/company/serializers.py

@@ -18,6 +18,7 @@
     InvenTreeModelSerializer,
     InvenTreeMoneySerializer,
     InvenTreeTagModelSerializer,
+    NotesFieldMixin,
     RemoteImageMixin,
 )
 from part.serializers import PartBriefSerializer
@@ -102,7 +103,7 @@ class Meta:
         ]
 
 
-class CompanySerializer(RemoteImageMixin, InvenTreeModelSerializer):
+class CompanySerializer(NotesFieldMixin, RemoteImageMixin, InvenTreeModelSerializer):
     """Serializer for Company object (full detail)."""
 
     class Meta:

src/backend/InvenTree/company/templates/company/detail.html

@@ -305,6 +305,8 @@ <h4>{% trans "Attachments" %}</h4>
             '{% url "api-company-detail" company.pk %}',
             {
                 editable: true,
+                model_type: "company",
+                model_id: {{ company.pk }},
             }
         );
     });

src/backend/InvenTree/order/serializers.py

@@ -47,6 +47,7 @@
     InvenTreeDecimalField,
     InvenTreeModelSerializer,
     InvenTreeMoneySerializer,
+    NotesFieldMixin,
 )
 from order.status_codes import (
     PurchaseOrderStatusGroups,
@@ -198,7 +199,7 @@ class AbstractExtraLineMeta:
 
 
 class PurchaseOrderSerializer(
-    TotalPriceMixin, AbstractOrderSerializer, InvenTreeModelSerializer
+    NotesFieldMixin, TotalPriceMixin, AbstractOrderSerializer, InvenTreeModelSerializer
 ):
     """Serializer for a PurchaseOrder object."""
 
@@ -768,7 +769,7 @@ class Meta:
 
 
 class SalesOrderSerializer(
-    TotalPriceMixin, AbstractOrderSerializer, InvenTreeModelSerializer
+    NotesFieldMixin, TotalPriceMixin, AbstractOrderSerializer, InvenTreeModelSerializer
 ):
     """Serializer for the SalesOrder model class."""
 
@@ -1075,7 +1076,7 @@ def annotate_queryset(queryset):
     )
 
 
-class SalesOrderShipmentSerializer(InvenTreeModelSerializer):
+class SalesOrderShipmentSerializer(NotesFieldMixin, InvenTreeModelSerializer):
     """Serializer for the SalesOrderShipment class."""
 
     class Meta:
@@ -1536,7 +1537,7 @@ class Meta:
 
 
 class ReturnOrderSerializer(
-    AbstractOrderSerializer, TotalPriceMixin, InvenTreeModelSerializer
+    NotesFieldMixin, AbstractOrderSerializer, TotalPriceMixin, InvenTreeModelSerializer
 ):
     """Serializer for the ReturnOrder model class."""
 

src/backend/InvenTree/order/templates/order/purchase_order_detail.html

@@ -120,6 +120,8 @@ <h4>{% trans "Order Notes" %}</h4>
             'order-notes',
             '{% url "api-po-detail" order.pk %}',
             {
+                model_type: "purchaseorder",
+                model_id: {{ order.pk }},
                 {% if roles.purchase_order.change %}
                 editable: true,
                 {% else %}

src/backend/InvenTree/order/templates/order/return_order_detail.html

@@ -175,6 +175,8 @@ <h4>{% trans "Order Notes" %}</h4>
         'order-notes',
         '{% url "api-return-order-detail" order.pk %}',
         {
+            model_type: 'returnorder',
+            model_id: {{ order.pk }},
             {% if roles.purchase_order.change %}
             editable: true,
             {% else %}

src/backend/InvenTree/order/templates/order/sales_order_detail.html

@@ -190,6 +190,8 @@ <h4>{% trans "Order Notes" %}</h4>
             'order-notes',
             '{% url "api-so-detail" order.pk %}',
             {
+                model_type: "salesorder",
+                model_id: {{ order.pk }},
                 {% if roles.purchase_order.change %}
                 editable: true,
                 {% else %}

src/backend/InvenTree/part/api.py

@@ -1179,7 +1179,6 @@ class PartMixin:
     queryset = Part.objects.all()
 
     starred_parts = None
-
     is_create = False
 
     def get_queryset(self, *args, **kwargs):

src/backend/InvenTree/part/serializers.py

@@ -580,6 +580,7 @@ def validate(self, data):
 
 
 class PartSerializer(
+    InvenTree.serializers.NotesFieldMixin,
     InvenTree.serializers.RemoteImageMixin,
     InvenTree.serializers.InvenTreeTagModelSerializer,
 ):

src/backend/InvenTree/part/templates/part/detail.html

@@ -404,6 +404,8 @@ <h4>{% trans "Part Manufacturers" %}</h4>
             'part-notes',
             '{% url "api-part-detail" part.pk %}',
             {
+                model_type: "part",
+                model_id: {{ part.pk }},
                 editable: {% js_bool roles.part.change %},
             }
         );

src/backend/InvenTree/part/test_api.py

@@ -1149,6 +1149,23 @@ def test_date_filters(self):
             date = datetime.fromisoformat(item['creation_date'])
             self.assertGreaterEqual(date, date_compare)
 
+    def test_part_notes(self):
+        """Test the 'notes' field."""
+        # First test the 'LIST' endpoint - no notes information provided
+        url = reverse('api-part-list')
+
+        response = self.get(url, {'limit': 1}, expected_code=200)
+        data = response.data['results'][0]
+
+        self.assertNotIn('notes', data)
+
+        # Second, test the 'DETAIL' endpoint - notes information provided
+        url = reverse('api-part-detail', kwargs={'pk': data['pk']})
+
+        response = self.get(url, expected_code=200)
+
+        self.assertIn('notes', response.data)
+
 
 class PartCreationTests(PartAPITestBase):
     """Tests for creating new Part instances via the API."""