Merge branch 'generic-parameters' of https://github.com/schrodingersgat/inventree into pr/SchrodingersGat/10699

.github/workflows/qc_checks.yaml

@@ -626,7 +626,7 @@ jobs:
           pip-dependency: psycopg2
       - name: Set up test data
         run: |
-          invoke dev.setup-test -iv
+          invoke dev.setup-test -iv -b generic-parameters
           invoke int.rebuild-thumbnails
       - name: Install dependencies
         run: |

src/backend/InvenTree/part/api.py

@@ -318,7 +318,7 @@ class CategoryTree(ListAPI):
         return queryset
 
 
-class CategoryParameterList(DataExportViewMixin, ListCreateAPI):
+class CategoryParameterList(DataExportViewMixin, OutputOptionsMixin, ListCreateAPI):
     """API endpoint for accessing a list of PartCategoryParameterTemplate objects.
 
     - GET: Return a list of PartCategoryParameterTemplate objects

src/backend/InvenTree/part/serializers.py

@@ -1745,7 +1745,9 @@ class BomItemSerializer(
 
 @register_importer()
 class CategoryParameterTemplateSerializer(
-    DataImportExportSerializerMixin, InvenTree.serializers.InvenTreeModelSerializer
+    InvenTree.serializers.FilterableSerializerMixin,
+    DataImportExportSerializerMixin,
+    InvenTree.serializers.InvenTreeModelSerializer,
 ):
     """Serializer for the PartCategoryParameterTemplate model."""
 
@@ -1758,17 +1760,22 @@ class CategoryParameterTemplateSerializer(
             'category',
             'category_detail',
             'template',
-            # 'parameter_template_detail',
+            'template_detail',
             'default_value',
         ]
 
-    # TODO: Re-implement this, but point to the ParameterTemplate model
-    # parameter_template_detail = PartParameterTemplateSerializer(
-    #     source='parameter_template', many=False, read_only=True
-    # )
+    template_detail = enable_filter(
+        common.serializers.ParameterTemplateSerializer(
+            source='template', many=False, read_only=True
+        ),
+        True,
+    )
 
-    category_detail = CategorySerializer(
+    category_detail = enable_filter(
+        CategorySerializer(
             source='category', many=False, read_only=True, allow_null=True
+        ),
+        True,
     )
 
 

src/frontend/src/tables/part/PartCategoryTemplateTable.tsx

@@ -37,7 +37,7 @@ export default function PartCategoryTemplateTable({
         value: categoryId,
         disabled: categoryId !== undefined
       },
-      parameter_template: {},
+      template: {},
       default_value: {}
     };
   }, [categoryId]);
@@ -83,7 +83,7 @@ export default function PartCategoryTemplateTable({
         accessor: 'category_detail.pathstring'
       },
       {
-        accessor: 'parameter_template_detail.name',
+        accessor: 'template_detail.name',
         title: t`Parameter Template`,
         sortable: true,
         switchable: false
@@ -99,8 +99,8 @@ export default function PartCategoryTemplateTable({
 
           let units = '';
 
-          if (record?.parameter_template_detail?.units) {
-            units = `[${record.parameter_template_detail.units}]`;
+          if (record?.template_detail?.units) {
+            units = `[${record.template_detail.units}]`;
           }
 
           return (
@@ -162,7 +162,9 @@ export default function PartCategoryTemplateTable({
           tableActions: tableActions,
           enableDownload: true,
           params: {
-            category: categoryId
+            category: categoryId,
+            template_detail: true,
+            category_detail: true
           }
         }}
       />

tasks.py

@@ -1355,6 +1355,7 @@ def test(
         'dev': 'Set up development environment at the end',
         'validate_files': 'Validate media files are correctly copied',
         'use_ssh': 'Use SSH protocol for cloning the demo dataset (requires SSH key)',
+        'branch': 'Specify branch of demo-dataset to clone (default = main)',
     }
 )
 def setup_test(
@@ -1364,6 +1365,7 @@ def setup_test(
     validate_files=False,
     use_ssh=False,
     path='inventree-demo-dataset',
+    branch='main',
 ):
     """Setup a testing environment."""
     from src.backend.InvenTree.InvenTree.config import (  # type: ignore[import]
@@ -1388,7 +1390,7 @@ def setup_test(
 
     # Get test data
     info('Cloning demo dataset ...')
-    run(c, f'git clone {URL} {template_dir} -v --depth=1')
+    run(c, f'git clone {URL} {template_dir} -b {branch} -v --depth=1')
 
     # Make sure migrations are done - might have just deleted sqlite database
     if not ignore_update: