mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-19 15:54:27 +02:00
fix: remove dead PAUSED printer state checks (#447)
The printer only sends PAUSE via MQTT gcode_state, never PAUSED. Removed all unreachable PAUSED comparisons from frontend (4 files) and backend (2 files).
This commit is contained in:
@@ -137,7 +137,7 @@ export function EmbeddedCameraViewer({ printerId, printerName, viewerIndex = 0,
|
||||
},
|
||||
});
|
||||
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE' || status?.state === 'PAUSED') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
|
||||
// Save state to localStorage (printer-specific)
|
||||
useEffect(() => {
|
||||
|
||||
@@ -82,7 +82,7 @@ export function CameraPage() {
|
||||
},
|
||||
});
|
||||
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE' || status?.state === 'PAUSED') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
|
||||
// Update document title
|
||||
useEffect(() => {
|
||||
|
||||
@@ -1776,7 +1776,7 @@ function PrinterCard({
|
||||
|
||||
// Query for printable objects (for skip functionality)
|
||||
// Fetch when printing with 2+ objects OR when modal is open
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE' || status?.state === 'PAUSED') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
const isPrintingWithObjects = (status?.state === 'RUNNING' || status?.state === 'PAUSE') && (status?.printable_objects_count ?? 0) >= 2;
|
||||
const { data: objectsData } = useQuery({
|
||||
queryKey: ['printableObjects', printer.id],
|
||||
queryFn: () => api.getPrintableObjects(printer.id),
|
||||
@@ -2369,16 +2369,16 @@ function PrinterCard({
|
||||
{/* Skip Objects button - top right corner, always visible */}
|
||||
<button
|
||||
onClick={() => setShowSkipObjectsModal(true)}
|
||||
disabled={!(status.state === 'RUNNING' || status.state === 'PAUSE' || status.state === 'PAUSED') || (status.printable_objects_count ?? 0) < 2 || !hasPermission('printers:control')}
|
||||
disabled={!(status.state === 'RUNNING' || status.state === 'PAUSE') || (status.printable_objects_count ?? 0) < 2 || !hasPermission('printers:control')}
|
||||
className={`absolute top-2 right-2 p-1.5 rounded transition-colors z-10 ${
|
||||
(status.state === 'RUNNING' || status.state === 'PAUSE' || status.state === 'PAUSED') && (status.printable_objects_count ?? 0) >= 2 && hasPermission('printers:control')
|
||||
(status.state === 'RUNNING' || status.state === 'PAUSE') && (status.printable_objects_count ?? 0) >= 2 && hasPermission('printers:control')
|
||||
? 'text-bambu-gray hover:text-white hover:bg-white/10'
|
||||
: 'text-bambu-gray/30 cursor-not-allowed'
|
||||
}`}
|
||||
title={
|
||||
!hasPermission('printers:control')
|
||||
? t('printers.permission.noControl')
|
||||
: !(status.state === 'RUNNING' || status.state === 'PAUSE' || status.state === 'PAUSED')
|
||||
: !(status.state === 'RUNNING' || status.state === 'PAUSE')
|
||||
? t('printers.skipObjects.onlyWhilePrinting')
|
||||
: (status.printable_objects_count ?? 0) >= 2
|
||||
? t('printers.skipObjects.tooltip')
|
||||
@@ -2573,7 +2573,7 @@ function PrinterCard({
|
||||
{viewMode === 'expanded' && (() => {
|
||||
// Determine print state for control buttons
|
||||
const isRunning = status.state === 'RUNNING';
|
||||
const isPaused = status.state === 'PAUSED' || status.state === 'PAUSE';
|
||||
const isPaused = status.state === 'PAUSE';
|
||||
const isPrinting = isRunning || isPaused;
|
||||
const isControlBusy = stopPrintMutation.isPending || pausePrintMutation.isPending || resumePrintMutation.isPending;
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ function StatusBadge({ status, waitingReason, printerState, t }: { status: Print
|
||||
}
|
||||
|
||||
// Special case: printing but printer is paused
|
||||
if (status === 'printing' && (printerState === 'PAUSE' || printerState === 'PAUSED')) {
|
||||
if (status === 'printing' && printerState === 'PAUSE') {
|
||||
return (
|
||||
<span className="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-medium border text-yellow-400 bg-yellow-400/10 border-yellow-400/20">
|
||||
<Pause className="w-3.5 h-3.5" />
|
||||
|
||||
Reference in New Issue
Block a user