v1.0.19
This commit is contained in:
1 parent
4b430340db
commit
9c451aedf9
120 files changed
+7777
-6046
No files matched your search
@@ -27,6 +27,7 @@
|
||||
import { onDockerEvent, isImageListChange } from '$lib/stores/events';
|
||||
import { canAccess } from '$lib/stores/auth';
|
||||
import { formatDate, appSettings } from '$lib/stores/settings';
|
||||
import { readJobResponse } from '$lib/utils/sse-fetch';
|
||||
import { EmptyState, NoEnvironment } from '$lib/components/ui/empty-state';
|
||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||
import { DataGrid } from '$lib/components/data-grid';
|
||||
@@ -485,9 +486,9 @@
|
||||
confirmPrune = false;
|
||||
try {
|
||||
const response = await fetch(appendEnvParam('/api/prune/images', envId), { method: 'POST' });
|
||||
if (response.ok) {
|
||||
const data = await readJobResponse(response);
|
||||
if (data.success) {
|
||||
pruneStatus = 'success';
|
||||
const data = await response.json();
|
||||
const deleted = data.result?.ImagesDeleted;
|
||||
const spaceReclaimed = data.result?.SpaceReclaimed ?? 0;
|
||||
const count = deleted?.length ?? 0;
|
||||
@@ -499,7 +500,7 @@
|
||||
await fetchImages();
|
||||
} else {
|
||||
pruneStatus = 'error';
|
||||
toast.error('Failed to prune images');
|
||||
toast.error(data.error || 'Failed to prune images');
|
||||
}
|
||||
} catch (error) {
|
||||
pruneStatus = 'error';
|
||||
@@ -513,9 +514,9 @@
|
||||
confirmPruneUnused = false;
|
||||
try {
|
||||
const response = await fetch(appendEnvParam('/api/prune/images?dangling=false', envId), { method: 'POST' });
|
||||
if (response.ok) {
|
||||
const data = await readJobResponse(response);
|
||||
if (data.success) {
|
||||
pruneUnusedStatus = 'success';
|
||||
const data = await response.json();
|
||||
const deleted = data.result?.ImagesDeleted;
|
||||
const spaceReclaimed = data.result?.SpaceReclaimed ?? 0;
|
||||
const count = deleted?.length ?? 0;
|
||||
@@ -527,7 +528,7 @@
|
||||
await fetchImages();
|
||||
} else {
|
||||
pruneUnusedStatus = 'error';
|
||||
toast.error('Failed to prune unused images');
|
||||
toast.error(data.error || 'Failed to prune unused images');
|
||||
}
|
||||
} catch (error) {
|
||||
pruneUnusedStatus = 'error';
|
||||
@@ -1060,7 +1061,7 @@
|
||||
{:else if column.id === 'used'}
|
||||
{#if tagInfo.containers > 0}
|
||||
<a
|
||||
href="/containers?image={encodeURIComponent(tagInfo.fullRef)}"
|
||||
href="/containers?search={encodeURIComponent(tagInfo.fullRef)}"
|
||||
class="text-muted-foreground hover:text-foreground hover:underline"
|
||||
title="View containers using this image"
|
||||
>
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
import { Progress } from '$lib/components/ui/progress';
|
||||
import { tick } from 'svelte';
|
||||
import ImageScanModal from './ImageScanModal.svelte';
|
||||
import { watchJob } from '$lib/utils/sse-fetch';
|
||||
|
||||
interface Props {
|
||||
imageName: string | (() => string);
|
||||
@@ -113,103 +114,86 @@
|
||||
throw new Error('Failed to start pull');
|
||||
}
|
||||
|
||||
const reader = response.body?.getReader();
|
||||
if (!reader) {
|
||||
throw new Error('No response body');
|
||||
}
|
||||
const { jobId } = await response.json();
|
||||
|
||||
const decoder = new TextDecoder();
|
||||
let buffer = '';
|
||||
await watchJob(jobId, (line) => {
|
||||
try {
|
||||
const data = line.data as any;
|
||||
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) break;
|
||||
|
||||
buffer += decoder.decode(value, { stream: true });
|
||||
const lines = buffer.split('\n');
|
||||
buffer = lines.pop() || '';
|
||||
|
||||
for (const line of lines) {
|
||||
if (!line.trim() || !line.startsWith('data: ')) continue;
|
||||
|
||||
try {
|
||||
const data = JSON.parse(line.slice(6));
|
||||
|
||||
if (data.status === 'complete') {
|
||||
overallStatus = 'complete';
|
||||
onComplete?.();
|
||||
// Trigger scan if scanning is enabled
|
||||
if (envHasScanning) {
|
||||
// Close popover and open scan modal after short delay
|
||||
setTimeout(() => {
|
||||
scanImageName = displayImageName;
|
||||
open = false;
|
||||
showScanModal = true;
|
||||
}, 500);
|
||||
}
|
||||
} else if (data.status === 'error') {
|
||||
overallStatus = 'error';
|
||||
errorMessage = data.error || 'Unknown error occurred';
|
||||
} else if (data.id) {
|
||||
// Layer progress update - only process if id looks like a layer hash (12 hex chars)
|
||||
const isLayerId = /^[a-f0-9]{12}$/i.test(data.id);
|
||||
if (!isLayerId) {
|
||||
if (data.status) {
|
||||
statusMessage = `${data.id}: ${data.status}`;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
const existing = layers.get(data.id);
|
||||
const statusLower = (data.status || '').toLowerCase();
|
||||
// Only count "Pull complete" or "Already exists" as truly complete
|
||||
const isFullyComplete = statusLower === 'pull complete' || statusLower === 'already exists';
|
||||
|
||||
if (!existing) {
|
||||
totalLayers++;
|
||||
layerOrder++;
|
||||
if (isFullyComplete) {
|
||||
completedLayers++;
|
||||
}
|
||||
|
||||
const layerProgress: LayerProgress = {
|
||||
id: data.id,
|
||||
status: data.status || 'Processing',
|
||||
progress: data.progress,
|
||||
current: data.progressDetail?.current,
|
||||
total: data.progressDetail?.total,
|
||||
order: layerOrder,
|
||||
isComplete: isFullyComplete
|
||||
};
|
||||
layers.set(data.id, layerProgress);
|
||||
layers = new Map(layers);
|
||||
scrollToBottom();
|
||||
} else {
|
||||
// Check if layer transitioned to complete (only count once)
|
||||
if (isFullyComplete && !existing.isComplete) {
|
||||
completedLayers++;
|
||||
}
|
||||
|
||||
const layerProgress: LayerProgress = {
|
||||
id: data.id,
|
||||
status: data.status || 'Processing',
|
||||
progress: data.progress,
|
||||
current: data.progressDetail?.current,
|
||||
total: data.progressDetail?.total,
|
||||
order: existing.order,
|
||||
isComplete: existing.isComplete || isFullyComplete
|
||||
};
|
||||
layers.set(data.id, layerProgress);
|
||||
layers = new Map(layers);
|
||||
}
|
||||
} else if (data.status) {
|
||||
statusMessage = data.status;
|
||||
if (data.status === 'complete') {
|
||||
overallStatus = 'complete';
|
||||
onComplete?.();
|
||||
// Trigger scan if scanning is enabled
|
||||
if (envHasScanning) {
|
||||
// Close popover and open scan modal after short delay
|
||||
setTimeout(() => {
|
||||
scanImageName = displayImageName;
|
||||
open = false;
|
||||
showScanModal = true;
|
||||
}, 500);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to parse SSE data:', e);
|
||||
} else if (data.status === 'error') {
|
||||
overallStatus = 'error';
|
||||
errorMessage = data.error || 'Unknown error occurred';
|
||||
} else if (data.id) {
|
||||
// Layer progress update - only process if id looks like a layer hash (12 hex chars)
|
||||
const isLayerId = /^[a-f0-9]{12}$/i.test(data.id);
|
||||
if (!isLayerId) {
|
||||
if (data.status) {
|
||||
statusMessage = `${data.id}: ${data.status}`;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const existing = layers.get(data.id);
|
||||
const statusLower = (data.status || '').toLowerCase();
|
||||
// Only count "Pull complete" or "Already exists" as truly complete
|
||||
const isFullyComplete = statusLower === 'pull complete' || statusLower === 'already exists';
|
||||
|
||||
if (!existing) {
|
||||
totalLayers++;
|
||||
layerOrder++;
|
||||
if (isFullyComplete) {
|
||||
completedLayers++;
|
||||
}
|
||||
|
||||
const layerProgress: LayerProgress = {
|
||||
id: data.id,
|
||||
status: data.status || 'Processing',
|
||||
progress: data.progress,
|
||||
current: data.progressDetail?.current,
|
||||
total: data.progressDetail?.total,
|
||||
order: layerOrder,
|
||||
isComplete: isFullyComplete
|
||||
};
|
||||
layers.set(data.id, layerProgress);
|
||||
layers = new Map(layers);
|
||||
scrollToBottom();
|
||||
} else {
|
||||
// Check if layer transitioned to complete (only count once)
|
||||
if (isFullyComplete && !existing.isComplete) {
|
||||
completedLayers++;
|
||||
}
|
||||
|
||||
const layerProgress: LayerProgress = {
|
||||
id: data.id,
|
||||
status: data.status || 'Processing',
|
||||
progress: data.progress,
|
||||
current: data.progressDetail?.current,
|
||||
total: data.progressDetail?.total,
|
||||
order: existing.order,
|
||||
isComplete: existing.isComplete || isFullyComplete
|
||||
};
|
||||
layers.set(data.id, layerProgress);
|
||||
layers = new Map(layers);
|
||||
}
|
||||
} else if (data.status) {
|
||||
statusMessage = data.status;
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to process job line:', e);
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (error: any) {
|
||||
console.error('Failed to pull image:', error);
|
||||
overallStatus = 'error';
|
||||
|
||||
Reference in new issue
Block a user