Merge branch 'master' into pui-adjust-breadcrumbs

matmair · Nov 11, 2024 · 4bddce5 · 4bddce5
2 parents 1ba4d77 + e7cfb4c
commit 4bddce5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -49,7 +49,7 @@ jobs:
       - name: Build frontend
         run: cd src/frontend && npm run compile && npm run build
       - name: Create SBOM for frontend
-        uses: anchore/sbom-action@251a468eed47e5082b105c3ba6ee500c0e65a764 # pin@v0
+        uses: anchore/sbom-action@fc46e51fd3cb168ffb36c6d1915723c47db58abb # pin@v0
         with:
           artifact-name: frontend-build.spdx
           path: src/frontend
@@ -63,7 +63,7 @@ jobs:
           zip -r ../frontend-build.zip * .vite
       - name: Attest Build Provenance
         id: attest
-        uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # pin@v1
+        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # pin@v1
         with:
           subject-path: "${{ github.workspace }}/src/backend/InvenTree/web/static/frontend-build.zip"
 

diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         with:
           sarif_file: results.sarif
diff --git a/src/frontend/src/components/render/Part.tsx b/src/frontend/src/components/render/Part.tsx
@@ -63,11 +63,11 @@ export function RenderPartCategory(
       tooltip={instance.pathstring}
       prefix={
         <>
-          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.level > 0 && `${'- '.repeat(instance.level)}`}
           {instance.icon && <ApiIcon name={instance.icon} />}
         </>
       }
-      primary={instance.name}
+      primary={instance.pathstring}
       secondary={instance.description}
       url={
         props.link

diff --git a/src/frontend/src/components/render/Stock.tsx b/src/frontend/src/components/render/Stock.tsx
@@ -21,11 +21,11 @@ export function RenderStockLocation(
       tooltip={instance.pathstring}
       prefix={
         <>
-          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.level > 0 && `${'- '.repeat(instance.level)}`}
           {instance.icon && <ApiIcon name={instance.icon} />}
         </>
       }
-      primary={instance.name}
+      primary={instance.pathstring}
       secondary={instance.description}
       url={
         props.link

diff --git a/src/frontend/src/forms/ReturnOrderForms.tsx b/src/frontend/src/forms/ReturnOrderForms.tsx
@@ -115,13 +115,7 @@ export function useReturnOrderLineItemFields({
       price_currency: {},
       target_date: {},
       notes: {},
-      link: {},
-      responsible: {
-        filters: {
-          is_active: true
-        },
-        icon: <IconUsers />
-      }
+      link: {}
     };
   }, [create, orderId, customerId]);
 }

diff --git a/src/frontend/tests/pages/pui_scan.spec.ts b/src/frontend/tests/pages/pui_scan.spec.ts
@@ -73,7 +73,7 @@ test('Scanning (StockLocation)', async ({ page }) => {
   await defaultScanTest(page, '{"stocklocation": 3}');
 
   // stocklocation: 3
-  await page.getByText('Storage Room B', { exact: true }).waitFor();
+  await page.getByText('Factory/Storage Room B', { exact: true }).waitFor();
   await page.getByText('Storage Room B (green door)').waitFor();
   await page.getByRole('cell', { name: 'stocklocation' }).waitFor();
 });

diff --git a/src/frontend/tests/pui_forms.spec.ts b/src/frontend/tests/pui_forms.spec.ts
@@ -39,7 +39,7 @@ test('Forms - Stock Item Validation', async ({ page }) => {
 
   // Set location
   await page.getByLabel('related-field-location').click();
-  await page.getByRole('option', { name: /Electronics Lab/ }).click();
+  await page.getByText('Electronics production facility').click();
 
   // Create the stock item
   await page.getByLabel('number-field-quantity').fill('123');