From 33a40072b7d91c31158ea4d5dcafc1322b219fbd Mon Sep 17 00:00:00 2001 From: DaX Date: Fri, 20 Jun 2025 16:10:29 +0200 Subject: [PATCH] Fix inventory icons and material badges display - Add support for boja_hex field from database - Fix vakum/otvoreno detection to properly show inventory badges - Update all filaments in database with correct hex color codes - Remove duplicate text in material modifier badges - Fix storage condition detection for Da/Ne values - Exclude .claude directory from security checks --- scripts/security/security-check.js | 1 + src/components/FilamentTableV2.tsx | 6 +++--- src/components/MaterialBadge.tsx | 2 +- src/types/filament.ts | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/security/security-check.js b/scripts/security/security-check.js index ca30eca..a1ef50c 100644 --- a/scripts/security/security-check.js +++ b/scripts/security/security-check.js @@ -16,6 +16,7 @@ const excludePatterns = [ /node_modules/, /\.git/, /\.next/, + /\.claude/, /dist/, /build/, /out/, diff --git a/src/components/FilamentTableV2.tsx b/src/components/FilamentTableV2.tsx index dd792d9..8dd1e46 100644 --- a/src/components/FilamentTableV2.tsx +++ b/src/components/FilamentTableV2.tsx @@ -37,8 +37,8 @@ export const FilamentTableV2: React.FC = ({ filaments, loa modifier: legacy.finish !== 'Basic' ? legacy.finish : undefined }; - const storageCondition = legacy.vakum?.toLowerCase().includes('vakuum') ? 'vacuum' : - legacy.otvoreno?.toLowerCase().includes('otvorena') ? 'opened' : 'sealed'; + const storageCondition = (legacy.vakum === 'Da' || legacy.vakum?.toLowerCase().includes('vakuum')) ? 'vacuum' : + (legacy.otvoreno === 'Da' || legacy.otvoreno?.toLowerCase().includes('otvorena')) ? 'opened' : 'sealed'; const totalQuantity = parseInt(legacy.kolicina) || 1; const availableQuantity = totalQuantity > 0 ? totalQuantity : 0; @@ -48,7 +48,7 @@ export const FilamentTableV2: React.FC = ({ filaments, loa brand: legacy.brand, type: legacy.tip as any || 'PLA', material, - color: { name: legacy.boja }, + color: { name: legacy.boja, hex: legacy.bojaHex || legacy.boja_hex || '#000000' }, weight: { value: 1000, unit: 'g' as const }, diameter: 1.75, inventory: { diff --git a/src/components/MaterialBadge.tsx b/src/components/MaterialBadge.tsx index 132040c..3b433f5 100644 --- a/src/components/MaterialBadge.tsx +++ b/src/components/MaterialBadge.tsx @@ -46,7 +46,7 @@ export const MaterialBadge: React.FC = ({ base, modifier, cl {modifier && ( - {getModifierIcon() && {getModifierIcon()}} {modifier} + {modifier} )} diff --git a/src/types/filament.ts b/src/types/filament.ts index 17338fe..8d419fb 100644 --- a/src/types/filament.ts +++ b/src/types/filament.ts @@ -5,6 +5,7 @@ export interface Filament { finish: string; boja: string; bojaHex?: string; + boja_hex?: string; // Alternative field name from import refill: string; vakum: string; otvoreno: string;