mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-07 23:01:06 +02:00
* Added "Force Color Match" feature to filament override * Update settings.py * Update settings.py * Label updates for warnings and checkbox case * Initial plan * Add noMatchingMaterial i18n translations to all 7 locale files Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com> * Use {{material}} interpolation in noMatchingMaterial; populate from filament_overrides with getColorName Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com> * Updates for PR#625 comments * Added "Force Color Match" feature to filament override * Update settings.py * Update settings.py * Label updates for warnings and checkbox case * Initial plan * Add noMatchingMaterial i18n translations to all 7 locale files Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com> * Use {{material}} interpolation in noMatchingMaterial; populate from filament_overrides with getColorName Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com> * Updates to PrintersPage and QueuePage * Update QueuePage.tsx * Rebase to 0.2.2b3 * Fix compile errors with FilamentOverride * Updates for PR#625 comments https://github.com/maziggy/bambuddy/pull/625#pullrequestreview-3908738261 * Fix force color match default, loadedFilamentTypes bug, remove dead translations --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cadtoolbox <12723486+cadtoolbox@users.noreply.github.com> Co-authored-by: MartinNYHC <mz@v8w.de>
131 lines
5.6 KiB
TypeScript
131 lines
5.6 KiB
TypeScript
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
|
import { Clock, Calendar, ChevronRight, Loader2, CircleCheck } from 'lucide-react';
|
|
import { Link } from 'react-router-dom';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { api } from '../api/client';
|
|
import { useAuth } from '../contexts/AuthContext';
|
|
import { useToast } from '../contexts/ToastContext';
|
|
import { formatRelativeTime } from '../utils/date';
|
|
import { filterCompatibleQueueItems } from '../utils/printer';
|
|
|
|
interface PrinterQueueWidgetProps {
|
|
printerId: number;
|
|
printerModel?: string | null;
|
|
printerState?: string | null;
|
|
plateCleared?: boolean;
|
|
loadedFilamentTypes?: Set<string>;
|
|
loadedFilaments?: Set<string>; // "TYPE:rrggbb" pairs for filament override color matching
|
|
}
|
|
|
|
export function PrinterQueueWidget({ printerId, printerModel, printerState, plateCleared, loadedFilamentTypes, loadedFilaments }: PrinterQueueWidgetProps) {
|
|
const { t } = useTranslation();
|
|
const queryClient = useQueryClient();
|
|
const { showToast } = useToast();
|
|
const { hasPermission } = useAuth();
|
|
const { data: queue } = useQuery({
|
|
queryKey: ['queue', printerId, 'pending', printerModel],
|
|
queryFn: () => api.getQueue(printerId, 'pending', printerModel || undefined),
|
|
refetchInterval: 30000,
|
|
});
|
|
|
|
const clearPlateMutation = useMutation({
|
|
mutationFn: () => api.clearPlate(printerId),
|
|
onSuccess: () => {
|
|
queryClient.invalidateQueries({ queryKey: ['queue', printerId] });
|
|
queryClient.invalidateQueries({ queryKey: ['printerStatus', printerId] });
|
|
showToast(t('queue.clearPlateSuccess'), 'success');
|
|
},
|
|
onError: (err: Error) => {
|
|
showToast(err.message, 'error');
|
|
},
|
|
});
|
|
|
|
// Filter queue to items this printer can actually print (filament type + color check)
|
|
const compatibleQueue = queue ? filterCompatibleQueueItems(queue, loadedFilamentTypes, loadedFilaments) : undefined;
|
|
|
|
// Split into auto-dispatchable vs staged (manual_start) items
|
|
const autoDispatchQueue = compatibleQueue?.filter(item => !item.manual_start) ?? [];
|
|
const totalPending = compatibleQueue?.length || 0;
|
|
|
|
if (totalPending === 0) {
|
|
return null;
|
|
}
|
|
|
|
const nextAutoItem = autoDispatchQueue[0];
|
|
const nextItem = compatibleQueue?.[0];
|
|
// Only prompt "Clear Plate & Start Next" when there are auto-dispatchable items
|
|
const needsClearPlate = (printerState === 'FINISH' || printerState === 'FAILED') && !plateCleared && autoDispatchQueue.length > 0;
|
|
|
|
if (needsClearPlate) {
|
|
const displayItem = nextAutoItem || nextItem;
|
|
return (
|
|
<div className="mb-3 p-3 bg-bambu-dark rounded-lg border border-yellow-400/30">
|
|
<div className="flex items-center gap-3 mb-2">
|
|
<Calendar className="w-5 h-5 text-yellow-400 flex-shrink-0" />
|
|
<div className="min-w-0 flex-1">
|
|
<p className="text-xs text-bambu-gray">{t('queue.nextInQueue')}</p>
|
|
<p className="text-sm text-white truncate">
|
|
{displayItem?.archive_name || displayItem?.library_file_name || `File #${displayItem?.archive_id || displayItem?.library_file_id}`}
|
|
</p>
|
|
</div>
|
|
{totalPending > 1 && (
|
|
<span className="text-xs px-1.5 py-0.5 bg-yellow-400/20 text-yellow-400 rounded flex-shrink-0">
|
|
+{totalPending - 1}
|
|
</span>
|
|
)}
|
|
</div>
|
|
{clearPlateMutation.isSuccess ? (
|
|
<div className="w-full py-2 px-3 rounded-lg bg-bambu-green/10 border border-bambu-green/20 text-bambu-green text-sm flex items-center justify-center gap-2">
|
|
<CircleCheck className="w-4 h-4" />
|
|
{t('queue.plateReady')}
|
|
</div>
|
|
) : (
|
|
<button
|
|
onClick={() => clearPlateMutation.mutate()}
|
|
disabled={clearPlateMutation.isPending || !hasPermission('printers:clear_plate')}
|
|
className="w-full py-2 px-3 rounded-lg bg-bambu-green/20 border border-bambu-green/40 text-bambu-green hover:bg-bambu-green/30 transition-colors text-sm font-medium flex items-center justify-center gap-2 disabled:opacity-50"
|
|
>
|
|
{clearPlateMutation.isPending ? (
|
|
<Loader2 className="w-4 h-4 animate-spin" />
|
|
) : (
|
|
<CircleCheck className="w-4 h-4" />
|
|
)}
|
|
{t('queue.clearPlate')}
|
|
</button>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Link
|
|
to="/queue"
|
|
className="block mb-3 p-3 bg-bambu-dark rounded-lg hover:bg-bambu-dark-tertiary transition-colors"
|
|
>
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="flex items-center gap-3 min-w-0 flex-1">
|
|
<Calendar className="w-5 h-5 text-yellow-400 flex-shrink-0" />
|
|
<div className="min-w-0 flex-1">
|
|
<p className="text-xs text-bambu-gray">{t('queue.nextInQueue')}</p>
|
|
<p className="text-sm text-white truncate">
|
|
{nextItem?.archive_name || nextItem?.library_file_name || `File #${nextItem?.archive_id || nextItem?.library_file_id}`}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div className="flex items-center gap-2 flex-shrink-0">
|
|
<span className="text-xs text-bambu-gray flex items-center gap-1">
|
|
<Clock className="w-3 h-3" />
|
|
{nextItem?.scheduled_time ? formatRelativeTime(nextItem.scheduled_time, 'system', t) : t('time.waiting')}
|
|
</span>
|
|
{totalPending > 1 && (
|
|
<span className="text-xs px-1.5 py-0.5 bg-yellow-400/20 text-yellow-400 rounded">
|
|
+{totalPending - 1}
|
|
</span>
|
|
)}
|
|
<ChevronRight className="w-4 h-4 text-bambu-gray" />
|
|
</div>
|
|
</div>
|
|
</Link>
|
|
);
|
|
}
|