1.0.9
This commit is contained in:
1 parent
62636426bf
commit
c185d00dc3
60 files changed
+2830
-918
No files matched your search
@@ -57,13 +57,26 @@
|
||||
let selectedRegistryId = $state<number | null>(null);
|
||||
|
||||
let searchTerm = $state('');
|
||||
let browseFilter = $state('');
|
||||
let results = $state<SearchResult[]>([]);
|
||||
let loading = $state(false);
|
||||
let browsing = $state(false);
|
||||
let loadingMore = $state(false);
|
||||
let searched = $state(false);
|
||||
let browseMode = $state(false);
|
||||
let errorMessage = $state('');
|
||||
|
||||
// Pagination state for browse mode
|
||||
let hasMoreResults = $state(false);
|
||||
let nextPageCursor = $state<string | null>(null);
|
||||
|
||||
// Filtered results for browse mode
|
||||
let filteredResults = $derived(
|
||||
browseMode && browseFilter.trim()
|
||||
? results.filter(r => r.name.toLowerCase().includes(browseFilter.toLowerCase()))
|
||||
: results
|
||||
);
|
||||
|
||||
// Copy to registry modal state
|
||||
let showCopyModal = $state(false);
|
||||
let copyImageName = $state('');
|
||||
@@ -174,28 +187,60 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function browse() {
|
||||
async function browse(loadMore = false) {
|
||||
if (!selectedRegistryId) return;
|
||||
|
||||
browsing = true;
|
||||
searched = true;
|
||||
browseMode = true;
|
||||
if (loadMore) {
|
||||
loadingMore = true;
|
||||
} else {
|
||||
browsing = true;
|
||||
searched = true;
|
||||
browseMode = true;
|
||||
results = [];
|
||||
hasMoreResults = false;
|
||||
nextPageCursor = null;
|
||||
}
|
||||
errorMessage = '';
|
||||
|
||||
try {
|
||||
const response = await fetch(`/api/registry/catalog?registry=${selectedRegistryId}`);
|
||||
let url = `/api/registry/catalog?registry=${selectedRegistryId}`;
|
||||
if (loadMore && nextPageCursor) {
|
||||
url += `&last=${encodeURIComponent(nextPageCursor)}`;
|
||||
}
|
||||
|
||||
const response = await fetch(url);
|
||||
if (response.ok) {
|
||||
results = await response.json();
|
||||
const data = await response.json();
|
||||
|
||||
// Handle both old array format and new paginated format
|
||||
if (Array.isArray(data)) {
|
||||
// Old format (backwards compat)
|
||||
results = loadMore ? [...results, ...data] : data;
|
||||
hasMoreResults = false;
|
||||
nextPageCursor = null;
|
||||
} else {
|
||||
// New paginated format
|
||||
const newResults = data.repositories || [];
|
||||
results = loadMore ? [...results, ...newResults] : newResults;
|
||||
hasMoreResults = data.pagination?.hasMore || false;
|
||||
nextPageCursor = data.pagination?.nextLast || null;
|
||||
}
|
||||
} else {
|
||||
const data = await response.json();
|
||||
errorMessage = data.error || 'Failed to browse registry';
|
||||
results = [];
|
||||
if (!loadMore) {
|
||||
results = [];
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to browse registry:', error);
|
||||
errorMessage = 'Failed to browse registry';
|
||||
results = [];
|
||||
if (!loadMore) {
|
||||
results = [];
|
||||
}
|
||||
} finally {
|
||||
browsing = false;
|
||||
loadingMore = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -221,8 +266,11 @@
|
||||
results = [];
|
||||
searched = false;
|
||||
browseMode = false;
|
||||
browseFilter = '';
|
||||
errorMessage = '';
|
||||
expandedImages = {};
|
||||
hasMoreResults = false;
|
||||
nextPageCursor = null;
|
||||
}
|
||||
|
||||
async function toggleImageExpansion(imageName: string) {
|
||||
@@ -433,7 +481,7 @@
|
||||
</script>
|
||||
|
||||
<div class="h-full flex flex-col gap-3 overflow-hidden">
|
||||
<div class="shrink-0 flex flex-wrap justify-between items-center gap-3">
|
||||
<div class="shrink-0 flex flex-wrap justify-between items-center gap-3 min-h-8">
|
||||
<PageHeader icon={Download} title="Registry" showConnection={false} />
|
||||
{#if $canAccess('registries', 'edit')}
|
||||
<a href="/settings?tab=registries" class="inline-flex items-center justify-center gap-2 whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground h-8 rounded-md px-3 text-xs">
|
||||
@@ -446,14 +494,17 @@
|
||||
<!-- Registry Selector + Search Bar -->
|
||||
<div class="shrink-0 flex gap-2">
|
||||
<Select.Root type="single" value={selectedRegistryId ? String(selectedRegistryId) : undefined} onValueChange={(v) => { selectedRegistryId = Number(v); handleRegistryChange(); }}>
|
||||
<Select.Trigger class="h-9 w-48">
|
||||
<Select.Trigger class="h-9 min-w-48 max-w-64 shrink-0">
|
||||
{@const selected = registries.find(r => r.id === selectedRegistryId)}
|
||||
{#if selected && isDockerHub(selected)}
|
||||
<Icon iconNode={whale} class="w-4 h-4 mr-2 text-muted-foreground" />
|
||||
<Icon iconNode={whale} class="w-4 h-4 mr-2 text-muted-foreground shrink-0" />
|
||||
{:else}
|
||||
<Server class="w-4 h-4 mr-2 text-muted-foreground" />
|
||||
<Server class="w-4 h-4 mr-2 text-muted-foreground shrink-0" />
|
||||
{/if}
|
||||
<span class="truncate">{selected ? selected.name : 'Select registry'}</span>
|
||||
{#if selected?.hasCredentials}
|
||||
<Badge variant="outline" class="ml-1.5 text-xs shrink-0">auth</Badge>
|
||||
{/if}
|
||||
<span>{selected ? `${selected.name}${selected.hasCredentials ? ' (auth)' : ''}` : 'Select registry'}</span>
|
||||
</Select.Trigger>
|
||||
<Select.Content>
|
||||
{#each registries as registry}
|
||||
@@ -490,7 +541,7 @@
|
||||
Search
|
||||
</Button>
|
||||
{#if supportsBrowsing()}
|
||||
<Button variant="outline" onclick={browse} disabled={loading || browsing}>
|
||||
<Button variant="outline" onclick={() => browse()} disabled={loading || browsing}>
|
||||
{#if browsing}
|
||||
<RefreshCw class="w-4 h-4 mr-1 animate-spin" />
|
||||
{:else}
|
||||
@@ -507,10 +558,36 @@
|
||||
{:else if errorMessage}
|
||||
<p class="text-red-600 dark:text-red-400 text-sm">{errorMessage}</p>
|
||||
{:else if searched && results.length === 0}
|
||||
<p class="text-muted-foreground text-sm">
|
||||
{browseMode ? 'No images found in this registry' : `No images found for "${searchTerm}"`}
|
||||
</p>
|
||||
<div class="text-sm">
|
||||
<p class="text-muted-foreground">
|
||||
{browseMode ? 'No images found in this registry' : `No images found for "${searchTerm}"`}
|
||||
</p>
|
||||
{#if !browseMode && supportsBrowsing()}
|
||||
<p class="text-muted-foreground mt-2">
|
||||
Tip: Large registries don't support search. Try <button class="text-primary underline" onclick={() => browse()}>Browse</button> and use the filter to find images.
|
||||
</p>
|
||||
{/if}
|
||||
</div>
|
||||
{:else if results.length > 0}
|
||||
<!-- Browse mode filter -->
|
||||
{#if browseMode}
|
||||
<div class="shrink-0 flex items-center gap-2 text-sm">
|
||||
<div class="relative flex-1 max-w-xs">
|
||||
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 w-3.5 h-3.5 text-muted-foreground" />
|
||||
<Input
|
||||
type="text"
|
||||
placeholder="Filter results..."
|
||||
bind:value={browseFilter}
|
||||
class="h-8 pl-8 text-xs"
|
||||
/>
|
||||
</div>
|
||||
<span class="text-muted-foreground text-xs">
|
||||
{filteredResults.length === results.length
|
||||
? `${results.length} images`
|
||||
: `${filteredResults.length} of ${results.length} images`}
|
||||
</span>
|
||||
</div>
|
||||
{/if}
|
||||
<div
|
||||
bind:this={scrollContainer}
|
||||
class="flex-1 min-h-0 rounded-lg overflow-auto"
|
||||
@@ -527,7 +604,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each results as result (result.name)}
|
||||
{#each filteredResults as result (result.name)}
|
||||
{@const isExpanded = !!expandedImages[result.name]}
|
||||
{@const expandState = expandedImages[result.name]}
|
||||
<!-- Main row -->
|
||||
@@ -684,6 +761,24 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- Load More button for pagination (outside scroll container so always visible) -->
|
||||
{#if browseMode && hasMoreResults}
|
||||
<div class="shrink-0 flex justify-center py-3 border-t border-muted">
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onclick={() => browse(true)}
|
||||
disabled={loadingMore}
|
||||
>
|
||||
{#if loadingMore}
|
||||
<Loader2 class="w-4 h-4 mr-2 animate-spin" />
|
||||
Loading...
|
||||
{:else}
|
||||
Load more images
|
||||
{/if}
|
||||
</Button>
|
||||
</div>
|
||||
{/if}
|
||||
{:else}
|
||||
<div class="text-center py-12 text-muted-foreground">
|
||||
<Download class="w-12 h-12 mx-auto mb-4 opacity-50" />
|
||||
|
||||
Reference in new issue
Block a user