[Review Stack] #872 on #857

.playwright-cli/page-2026-03-14T13-04-28-164Z.yml

@@ -0,0 +1 @@
+- generic [ref=e2]: loading

CHANGELOG.md

@@ -1,4 +1,4 @@
 # Changelog
 
 ## Unreleased
-- Add filament label printing with separate presets, QR codes, and AML export (labels and pages), plus AML size control and filament QR scanning support.
+- Add filament label printing with separate presets, QR codes, and filament QR scanning support.

README.md

@@ -1,5 +1,3 @@
-<br/>
-
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="https://github.com/Donkie/Spoolman/assets/2332094/4e6e80ac-c7be-4ad2-9a33-dedc1b5ba30e">
   <source media="(prefers-color-scheme: light)" srcset="https://github.com/Donkie/Spoolman/assets/2332094/3c120b3a-1422-42f6-a16b-8d5a07c33000">
@@ -40,15 +38,3 @@ Spoolman is a self-hosted web service designed to help you efficiently manage yo
 
 ## Installation
 Please see the [Installation page on the Wiki](https://github.com/Donkie/Spoolman/wiki/Installation) for details how to install Spoolman.
-
-## Syncing Manufacturer Logos
-If you want to bundle manufacturer logos locally for UI + label rendering, run:
-
-```bash
-./scripts/sync_vendor_logos.sh
-```
-
-This pulls the `logos` set from `MarksMakerSpace/filament-profiles` into `client/public/vendor-logos`.
-
-In the Manufacturers list, use `Sync Logos` to auto-map existing manufacturers to bundled logos.
-The matching normalizes casing and separators (for example `Bambu Lab`, `bambu-lab`, `BAMBU LAB`).

client/package.json

@@ -40,19 +40,19 @@
     "@refinedev/cli": "^2.16.50",
     "@types/loadable__component": "^5.13.10",
     "@types/node": "^25.0.3",
-    "@types/react-dom": "^19.2.3",
     "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
     "@types/uuid": "^10.0.0",
     "@vitejs/plugin-react": "^5.1.2",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.4.26",
-    "eslint-plugin-react": "^7.37.5",
-    "eslint": "^9.39.2",
     "globals": "^17.0.0",
     "prettier": "3.7.4",
-    "typescript-eslint": "^8.52.0",
     "typescript": "^5.9.3",
+    "typescript-eslint": "^8.52.0",
     "vite": "^7.3.0",
     "vite-plugin-mkcert": "^1.17.9",
     "vite-plugin-pwa": "^1.2.0"

client/public/locales/en/common.json

@@ -28,10 +28,8 @@
         "hideArchived": "Hide Archived",
         "showArchived": "Show Archived",
         "notAccessTitle": "You don't have permission to access",
-        "hideColumns": "Columns",
-        "clearFilters": "Clear Filters",
-        "selectAll": "Select All",
-        "selectNone": "Select None"
+        "hideColumns": "Hide Columns",
+        "clearFilters": "Clear Filters"
     },
     "warnWhenUnsavedChanges": "Are you sure you want to leave? You have unsaved changes.",
     "notifications": {
@@ -148,6 +146,11 @@
             "titleAreaHeight": "Title Area Height",
             "showContent": "Show Information on label",
             "showManufacturerLogo": "Show Manufacturer Logo",
+            "logoSource": "Logo Source",
+            "logoSourceOptions": {
+                "print": "Print Logo",
+                "color": "Color Logo"
+            },
             "showTitle": "Show Title",
             "titleFitToWidth": "Fit Title to Width",
             "titleFitToWidthOptions": {
@@ -300,7 +303,6 @@
             "diameter": "Diameter",
             "weight": "Weight",
             "spool_weight": "Spool Weight",
-            "spool_count": "Spool Count",
             "article_number": "Article Number",
             "registered": "Registered",
             "comment": "Comment",
@@ -361,10 +363,10 @@
         },
         "fields_help": {
             "empty_spool_weight": "The weight of an empty spool from this manufacturer.",
-            "logo_url": "Optional custom logo used in the UI. Supports absolute URLs or local paths like /vendor-logos/web/bambu-lab-web.png.",
-            "print_logo_url": "Optional custom logo used for label rendering. Supports absolute URLs or local paths like /vendor-logos/print/bambu-lab.png.",
-            "logo_suggestions": "Checks the logo database for files with names similar to this manufacturer.",
-            "print_logo_suggestions": "Checks the print-logo database for files with names similar to this manufacturer."
+            "logo_url": "Optional custom logo used in the UI. Supports absolute URLs or local paths like /vendor-logos/web/bambu-lab-web.png. Use any image your browser can display from that path or URL.",
+            "print_logo_url": "Optional custom logo used for label rendering. Supports absolute URLs or local paths like /vendor-logos/print/bambu-lab.png. Use any image your browser can display from that path or URL.",
+            "logo_suggestions": "Checks available logo files in /vendor-logos/web for names similar to this manufacturer.",
+            "print_logo_suggestions": "Checks available logo files in /vendor-logos/print for names similar to this manufacturer."
         },
         "titles": {
             "create": "Create Manufacturer",
@@ -378,15 +380,21 @@
             "sync_logos": "Sync Logos",
             "clear_logo_url": "Clear URL",
             "convert_logo_to_print": "Convert Logo to Print",
-            "convert_logo_to_print_help": "Creates a black-and-white print logo from the current Logo URL and stores it as a separate local print logo file."
+            "convert_logo_to_print_help": "Creates a black-and-white print logo from the current Logo URL and stores it as a separate local print logo file.",
+            "convert_logo_to_print_help_locked": "A Print Logo URL is already set. Clear Print Logo URL to enable creating a new print logo from the current Logo URL."
+        },
+        "logo_filter": {
+            "has_logo": "Has Logo",
+            "no_logo": "No Logo"
         },
         "form": {
             "vendor_updated": "This manufacturer has been updated by someone/something else since you opened this page. Saving will overwrite those changes!",
             "logo_sync_no_match": "No matching logos found for this manufacturer name.",
             "logo_sync_applied": "Suggested logo paths applied.",
-            "logo_preview_auto_notice": "using auto-matched logo from bundled logo pack",
+            "logo_preview_auto_notice": "using auto-matched logo from available logo files",
             "logo_preview_default_notice": "no logo defined, using default generated text logo",
             "logo_convert_requires_web_logo": "Set a Logo URL first.",
+            "logo_convert_requires_empty_print_logo": "Clear Print Logo URL first to generate a new print logo.",
             "logo_convert_success": "Generated print logo from web logo.",
             "logo_convert_error": "Could not generate a print logo from this Logo URL."
         }
@@ -432,13 +440,6 @@
                 "not_ready": "Logo manifest is not available yet.",
                 "load_error": "Could not load manufacturers for logo sync.",
                 "done": "Logo sync complete. Matched {{matched}}, updated {{updated}}.",
-                "github_title": "Update Logo Pack from GitHub",
-                "github_description": "Checks the upstream logo repository for changes and downloads files only when there is a newer logo pack. No re-download happens when unchanged.",
-                "github_source": "Source repository:",
-                "github_button": "Check GitHub for Logo Updates",
-                "github_load_error": "Could not check GitHub logo updates.",
-                "github_done_updated": "Logo pack updated from GitHub. Web: {{web}}, Print: {{print}}.",
-                "github_done_no_changes": "Logo pack already up to date. Web: {{web}}, Print: {{print}}.",
                 "scope_note": "This action syncs the whole manufacturer database. You can sync a single manufacturer from its Edit page."
             }
         },

client/public/vendor-logos/manifest.json

@@ -1,7 +0,0 @@
-{
-  "source_repo": "MarksMakerSpace/filament-profiles",
-  "source_ref": "main",
-  "synced_at_utc": "2026-02-18T16:36:19Z",
-  "web_logo_count": 338,
-  "print_logo_count": 338
-}