Merge branch 'master' of https://github.com/inventree/InvenTree into feat--matrix-testing

src/backend/InvenTree/InvenTree/mixins.py

@@ -239,10 +239,17 @@ class OutputOptionsMixin:
 
     def get_serializer(self, *args, **kwargs):
         """Return serializer instance with output options applied."""
-        if self.output_options and hasattr(self, 'request'):
+        request = getattr(self, 'request', None)
+
+        if self.output_options and request:
             params = self.request.query_params
             kwargs.update(self.output_options.format_params(params))
 
+        # Ensure the request is included in the serializer context
+        context = kwargs.get('context', {})
+        context['request'] = request
+        kwargs['context'] = context
+
         serializer = super().get_serializer(*args, **kwargs)
 
         # Check if the serializer actually can be filtered - makes not much sense to use this mixin without that prerequisite

src/backend/InvenTree/InvenTree/serializers.py

@@ -163,10 +163,26 @@ class FilterableSerializerMixin:
 
     def gather_filters(self, kwargs) -> None:
         """Gather filterable fields through introspection."""
+        context = kwargs.get('context', {})
+        top_level_serializer = context.get('top_level_serializer', None)
+        request = context.get('request', None) or getattr(self, 'request', None)
+
+        # Gather query parameters from the request context
+        query_params = dict(getattr(request, 'query_params', {})) if request else {}
+
+        is_top_level = (
+            top_level_serializer is None
+            or top_level_serializer == self.__class__.__name__
+        )
+
+        # Update the context to ensure that the top_level_serializer flag is removed for nested serializers
+        if top_level_serializer is None:
+            context['top_level_serializer'] = self.__class__.__name__
+            kwargs['context'] = context
+
         # Fast exit if this has already been done or would not have any effect
         if getattr(self, '_was_filtered', False) or not hasattr(self, 'fields'):
             return
-        self._was_filtered = True
 
         # Actually gather the filterable fields
         # Also see `enable_filter` where` is_filterable and is_filterable_vals are set
@@ -176,21 +192,22 @@ class FilterableSerializerMixin:
             if getattr(a, 'is_filterable', None)
         }
 
-        # Gather query parameters from the request context
-        query_params = {}
-        if context := kwargs.get('context', {}):
-            query_params = dict(getattr(context.get('request', {}), 'query_params', {}))
-
         # Remove filter args from kwargs to avoid issues with super().__init__
         popped_kwargs = {}  # store popped kwargs as a arg might be reused for multiple fields
         tgs_vals: dict[str, bool] = {}
         for k, v in self.filter_targets.items():
             pop_ref = v['filter_name'] or k
             val = kwargs.pop(pop_ref, popped_kwargs.get(pop_ref))
-
             # Optionally also look in query parameters
-            if val is None and self.filter_on_query and v.get('filter_by_query', True):
+            # Note that we only do this for a top-level serializer, to avoid issues with nested serializers
+            if (
+                is_top_level
+                and val is None
+                and self.filter_on_query
+                and v.get('filter_by_query', True)
+            ):
                 val = query_params.pop(pop_ref, None)
+
                 if isinstance(val, list) and len(val) == 1:
                     val = val[0]
 
@@ -199,7 +216,9 @@ class FilterableSerializerMixin:
             tgs_vals[k] = (
                 str2bool(val) if isinstance(val, (str, int, float)) else val
             )  # Support for various filtering style for backwards compatibility
+
         self.filter_target_values = tgs_vals
+        self._was_filtered = True
 
         # Ensure this mixin is not broadly applied as it is expensive on scale (total CI time increased by 21% when running all coverage tests)
         if len(self.filter_targets) == 0 and not self.no_filters:
@@ -216,14 +235,12 @@ class FilterableSerializerMixin:
         ):
             return
 
-        # Skip filtering when exporting data - leave all fields intact
+        is_exporting = getattr(self, '_exporting_data', False)
-        if getattr(self, '_exporting_data', False):
-            return
 
         # Skip filtering for a write requests - all fields should be present for data creation
         if request := self.context.get('request', None):
             if method := getattr(request, 'method', None):
-                if str(method).lower() in ['post', 'put', 'patch']:
+                if str(method).lower() in ['post', 'put', 'patch'] and not is_exporting:
                     return
 
         # Throw out fields which are not requested (either by default or explicitly)

src/backend/InvenTree/InvenTree/test_serializers.py

@@ -157,7 +157,7 @@ class FilteredSerializers(InvenTreeAPITestCase):
         _ = BadSerializer()
         self.assertTrue(True)  # Dummy assertion to ensure we reach here
 
-    def test_failiure_OutputOptionsMixin(self):
+    def test_failure_OutputOptionsMixin(self):
         """Test failure case for OutputOptionsMixin."""
 
         class BadSerializer(InvenTree.serializers.InvenTreeModelSerializer):

src/backend/InvenTree/InvenTree/unit_test.py

@@ -655,7 +655,9 @@ class InvenTreeAPITestCase(
         # Append URL params
         url += '?' + '&'.join([f'{key}={value}' for key, value in params.items()])
 
-        response = self.client.get(url, data=None, format='json')
+        response = self.get(
+            url, data=None, format='json', expected_code=expected_code, **kwargs
+        )
         self.check_response(url, response, expected_code=expected_code)
 
         # Check that the response is of the correct type

src/backend/InvenTree/build/models.py

@@ -1887,7 +1887,7 @@ class BuildItem(InvenTree.models.InvenTreeMetadataModel):
         return self.build_line.bom_item if self.build_line else None
 
     @transaction.atomic
-    def complete_allocation(self, quantity=None, notes='', user=None) -> None:
+    def complete_allocation(self, quantity=None, notes: str = '', user=None) -> None:
         """Complete the allocation of this BuildItem into the output stock item.
 
         Arguments:
@@ -1910,9 +1910,7 @@ class BuildItem(InvenTree.models.InvenTreeMetadataModel):
 
         # Ensure we are not allocating more than available
         if quantity > item.quantity:
-            raise ValidationError({
+            quantity = item.quantity
-                'quantity': _('Allocated quantity exceeds available stock quantity')
-            })
 
         # Split the allocated stock if there are more available than allocated
         if item.quantity > quantity:

src/backend/InvenTree/data_exporter/mixins.py

@@ -337,6 +337,12 @@ class DataExportViewMixin:
         # Update the output instance with the total number of items to export
         output.total = queryset.count()
         output.save()
+        request = context.get('request', None)
+
+        if request:
+            query_params = getattr(request, 'query_params', {})
+            context.update(**query_params)
+            context['request'] = request
 
         data = None
         serializer = serializer_class(context=context, exporting=True)
@@ -363,7 +369,12 @@ class DataExportViewMixin:
         # The returned data *must* be a list of dict objects
         try:
             data = export_plugin.export_data(
-                queryset, serializer_class, headers, export_context, output
+                queryset,
+                serializer_class,
+                headers,
+                export_context,
+                output,
+                serializer_context=context,
             )
 
         except Exception as e:

src/backend/InvenTree/plugin/base/integration/DataExport.py

@@ -90,6 +90,7 @@ class DataExportMixin:
         headers: OrderedDict,
         context: dict,
         output: DataOutput,
+        serializer_context: Optional[dict] = None,
         **kwargs,
     ) -> list:
         """Export data from the queryset.
@@ -100,6 +101,7 @@ class DataExportMixin:
         Arguments:
             queryset: The queryset to export
             serializer_class: The serializer class to use for exporting the data
+            serializer_context: Optional context for the serializer
             headers: The headers for the export
             context: Any custom context for the export (provided by the plugin serializer)
             output: The DataOutput object for the export
@@ -107,7 +109,9 @@ class DataExportMixin:
         Returns: The exported data (a list of dict objects)
         """
         # The default implementation simply serializes the queryset
-        return serializer_class(queryset, many=True, exporting=True).data
+        return serializer_class(
+            queryset, many=True, exporting=True, context=serializer_context or {}
+        ).data
 
     def get_export_options_serializer(self, **kwargs) -> serializers.Serializer | None:
         """Return a serializer class with dynamic export options for this plugin.

src/backend/InvenTree/stock/test_api.py

@@ -867,9 +867,13 @@ class StockItemListTest(StockAPITestCase):
 
         excluded_headers = ['metadata']
 
-        filters = {}
+        filters = {
+            'part_detail': True,
+            'location_detail': True,
+            'supplier_part_detail': True,
+        }
 
-        with self.export_data(self.list_url, filters) as data_file:
+        with self.export_data(self.list_url, params=filters) as data_file:
             self.process_csv(
                 data_file,
                 required_cols=required_headers,
@@ -881,7 +885,7 @@ class StockItemListTest(StockAPITestCase):
         filters['location'] = 1
         filters['cascade'] = True
 
-        with self.export_data(self.list_url, filters) as data_file:
+        with self.export_data(self.list_url, params=filters) as data_file:
             data = self.process_csv(data_file, required_rows=9)
 
             for row in data:
@@ -909,6 +913,51 @@ class StockItemListTest(StockAPITestCase):
         with self.export_data(self.list_url, {'part': 25}) as data_file:
             self.process_csv(data_file, required_rows=items.count())
 
+    def test_large_export(self):
+        """Test export of very large dataset.
+
+        - Ensure that the time taken to export a large dataset is reasonable.
+        - Ensure that the number of DB queries is reasonable.
+        """
+        # Create a large number of stock items
+        locations = list(StockLocation.objects.all())
+        parts = list(Part.objects.filter(virtual=False))
+
+        idx = 0
+
+        N_LOCATIONS = len(locations)
+        N_PARTS = len(parts)
+
+        stock_items = []
+
+        while idx < 2500:
+            part = parts[idx % N_PARTS]
+            location = locations[idx % N_LOCATIONS]
+
+            item = StockItem(
+                part=part,
+                location=location,
+                quantity=10,
+                level=0,
+                tree_id=0,
+                lft=0,
+                rght=0,
+            )
+            stock_items.append(item)
+            idx += 1
+
+        StockItem.objects.bulk_create(stock_items)
+
+        self.assertGreaterEqual(StockItem.objects.count(), 2500)
+
+        # Note: While the export is quick on pgsql, it is still quite slow on sqlite3
+        with self.export_data(
+            self.list_url, max_query_count=50, max_query_time=7.5
+        ) as data_file:
+            data = self.process_csv(data_file)
+
+            self.assertGreaterEqual(len(data), 2500)
+
     def test_filter_by_allocated(self):
         """Test that we can filter by "allocated" status.
 

src/frontend/src/pages/Index/Settings/AdminCenter/ParameterPanel.tsx

@@ -5,7 +5,7 @@ import { StylishText } from '../../../../components/items/StylishText';
 import ParameterTemplateTable from '../../../../tables/general/ParameterTemplateTable';
 import SelectionListTable from '../../../../tables/part/SelectionListTable';
 
-export default function PartParameterPanel() {
+export default function ParameterPanel() {
   return (
     <Accordion multiple defaultValue={['parameter-templates']}>
       <Accordion.Item value='parameter-templates' key='parameter-templates'>

src/frontend/src/tables/bom/BomTable.tsx

@@ -670,9 +670,10 @@ export function BomTable({
             params: {
               ...params,
               part: partId,
-              category_detail: true,
+              substitutes: true,
               part_detail: true,
-              sub_part_detail: true
+              sub_part_detail: true,
+              category_detail: true
             },
             tableActions: tableActions,
             tableFilters: tableFilters,

src/frontend/src/tables/build/BuildAllocatedStockTable.tsx

@@ -6,7 +6,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
 import { ModelType } from '@lib/enums/ModelType';
 import { UserRoles } from '@lib/enums/Roles';
 import { apiUrl } from '@lib/functions/Api';
-import { ActionButton } from '@lib/index';
+import { ActionButton, formatDecimal } from '@lib/index';
 import type { TableFilter } from '@lib/types/Filters';
 import type { StockOperationProps } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
@@ -113,13 +113,6 @@ export default function BuildAllocatedStockTable({
         sortable: true,
         switchable: true
       },
-      {
-        accessor: 'serial',
-        title: t`Serial Number`,
-        sortable: false,
-        switchable: true,
-        render: (record: any) => record?.stock_item_detail?.serial
-      },
       {
         accessor: 'batch',
         title: t`Batch Code`,
@@ -128,15 +121,22 @@ export default function BuildAllocatedStockTable({
         render: (record: any) => record?.stock_item_detail?.batch
       },
       DecimalColumn({
-        accessor: 'available',
+        accessor: 'stock_item_detail.quantity',
         title: t`Available`
       }),
-      DecimalColumn({
+      {
         accessor: 'quantity',
         title: t`Allocated`,
-        sortable: true,
+        render: (record: any) => {
-        switchable: false
+          const serial = record?.stock_item_detail?.serial;
-      }),
+
+          if (serial && record?.quantity == 1) {
+            return `${t`Serial`}: ${serial}`;
+          }
+
+          return formatDecimal(record.quantity);
+        }
+      },
       LocationColumn({
         accessor: 'location_detail',
         switchable: true,

src/frontend/tests/pages/pui_part.spec.ts

@@ -135,7 +135,7 @@ test('Parts - BOM', async ({ browser }) => {
   await page.getByRole('button', { name: 'Close' }).click();
 });
 
-test('Part - Editing', async ({ browser }) => {
+test('Parts - Editing', async ({ browser }) => {
   const page = await doCachedLogin(browser, { url: 'part/104/details' });
 
   await page.getByText('A square table - with blue paint').first().waitFor();