mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-18 11:56:01 +02:00
Fix spool assignments query, mismatch dialog premature closing, confirm modal black text, add missing de.ts, fr.ts, and ja.ts locales
This commit is contained in:
@@ -118,8 +118,6 @@ export function AssignSpoolModal({ isOpen, onClose, printerId, amsId, trayId, tr
|
||||
const handleConfirmMismatch = () => {
|
||||
if (!pendingAssignId) return;
|
||||
assignMutation.mutate(pendingAssignId);
|
||||
setShowMismatchConfirm(false);
|
||||
setPendingAssignId(null);
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -268,7 +266,6 @@ export function AssignSpoolModal({ isOpen, onClose, printerId, amsId, trayId, tr
|
||||
location: trayInfo.location,
|
||||
})}
|
||||
confirmText={t('inventory.assignMismatchConfirm')}
|
||||
confirmClassName="!text-black"
|
||||
variant="warning"
|
||||
isLoading={assignMutation.isPending}
|
||||
onConfirm={handleConfirmMismatch}
|
||||
|
||||
@@ -11,7 +11,6 @@ interface ConfirmModalProps {
|
||||
cancelText?: string;
|
||||
cancelVariant?: 'primary' | 'secondary' | 'danger' | 'ghost';
|
||||
cardClassName?: string;
|
||||
confirmClassName?: string;
|
||||
variant?: 'danger' | 'warning' | 'default';
|
||||
isLoading?: boolean;
|
||||
loadingText?: string;
|
||||
@@ -26,7 +25,6 @@ export function ConfirmModal({
|
||||
cancelText,
|
||||
cancelVariant,
|
||||
cardClassName,
|
||||
confirmClassName,
|
||||
variant = 'default',
|
||||
isLoading = false,
|
||||
loadingText,
|
||||
@@ -53,7 +51,7 @@ export function ConfirmModal({
|
||||
},
|
||||
warning: {
|
||||
icon: 'text-yellow-400',
|
||||
button: 'bg-yellow-500 hover:bg-yellow-600',
|
||||
button: 'bg-yellow-500 hover:bg-yellow-600 text-black',
|
||||
},
|
||||
default: {
|
||||
icon: 'text-bambu-green',
|
||||
@@ -93,7 +91,7 @@ export function ConfirmModal({
|
||||
</Button>
|
||||
<Button
|
||||
onClick={onConfirm}
|
||||
className={`flex-1 ${styles.button}${confirmClassName ? ` ${confirmClassName}` : ''}`}
|
||||
className={`flex-1 ${styles.button}`}
|
||||
disabled={isLoading}
|
||||
>
|
||||
{isLoading ? (
|
||||
|
||||
@@ -189,7 +189,7 @@ export function PrintModal({
|
||||
queryKey: ['spool-assignments'],
|
||||
queryFn: () => api.getAssignments(),
|
||||
staleTime: 30 * 1000,
|
||||
enabled: isLibraryFile && mode === 'reprint',
|
||||
enabled: (mode === 'reprint' || mode === 'add-to-queue') && assignmentMode === 'printer',
|
||||
});
|
||||
|
||||
// Fetch archive details to get sliced_for_model
|
||||
|
||||
@@ -2651,10 +2651,10 @@ export default {
|
||||
rightNozzle: 'R',
|
||||
leftNozzleTooltip: 'Linke Düse',
|
||||
rightNozzleTooltip: 'Rechte Düse',
|
||||
insufficientFilamentTitle: 'Not enough filament',
|
||||
insufficientFilamentMessage: 'Some assigned spools have less filament remaining than this print needs:',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}}: needs {{required}}g, remaining {{remaining}}g',
|
||||
printAnyway: 'Print anyway',
|
||||
insufficientFilamentTitle: 'Nicht genug Filament',
|
||||
insufficientFilamentMessage: 'Einige zugewiesene Spulen haben weniger Filament als dieser Druck benoetigt:',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}}: benoetigt {{required}}g, verbleibend {{remaining}}g',
|
||||
printAnyway: 'Trotzdem drucken',
|
||||
},
|
||||
|
||||
// Backup
|
||||
|
||||
@@ -2651,10 +2651,10 @@ export default {
|
||||
rightNozzle: 'D',
|
||||
leftNozzleTooltip: 'Buse gauche',
|
||||
rightNozzleTooltip: 'Buse droite',
|
||||
insufficientFilamentTitle: 'Not enough filament',
|
||||
insufficientFilamentMessage: 'Some assigned spools have less filament remaining than this print needs:',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}}: needs {{required}}g, remaining {{remaining}}g',
|
||||
printAnyway: 'Print anyway',
|
||||
insufficientFilamentTitle: 'Filament insuffisant',
|
||||
insufficientFilamentMessage: 'Certaines bobines assignées ont moins de filament restant que nécessaire pour cette impression :',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}} : nécessite {{required}}g, restant {{remaining}}g',
|
||||
printAnyway: 'Imprimer quand même',
|
||||
},
|
||||
|
||||
// Backup
|
||||
|
||||
@@ -2571,10 +2571,10 @@ export default {
|
||||
rightNozzle: 'R',
|
||||
leftNozzleTooltip: '左ノズル',
|
||||
rightNozzleTooltip: '右ノズル',
|
||||
insufficientFilamentTitle: 'Not enough filament',
|
||||
insufficientFilamentMessage: 'Some assigned spools have less filament remaining than this print needs:',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}}: needs {{required}}g, remaining {{remaining}}g',
|
||||
printAnyway: 'Print anyway',
|
||||
insufficientFilamentTitle: 'フィラメントが不足しています',
|
||||
insufficientFilamentMessage: '割り当てられたスプールの一部は、この印刷に必要な量より残量が少ないです:',
|
||||
insufficientFilamentLine: '{{printer}} - {{slot}}: 必要 {{required}}g、残り {{remaining}}g',
|
||||
printAnyway: 'それでも印刷',
|
||||
},
|
||||
backup: {
|
||||
restoreBackup: 'バックアップの復元',
|
||||
|
||||
Reference in New Issue
Block a user