feat: EntityPicker component, replace dropdowns with command palette
Port EntityPalette pattern from wled-screen-controller as Svelte 5 component. Full-screen modal with search, keyboard navigation (Arrow keys, Enter, Escape), grouped items, current-item accent, auto-scroll, backdrop blur. Replace inline image browser dropdowns on Projects and Quick Deploy pages with EntityPicker. Add EntityPickerItem type and i18n keys.
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
<script lang="ts">
|
||||
import { inspectImage, quickDeploy, listRegistries, listRegistryImages } from '$lib/api';
|
||||
import type { InspectResult, Registry, RegistryImage } from '$lib/types';
|
||||
import type { InspectResult, EntityPickerItem } from '$lib/types';
|
||||
import FormField from '$lib/components/FormField.svelte';
|
||||
import EntityPicker from '$lib/components/EntityPicker.svelte';
|
||||
import { toasts } from '$lib/stores/toast';
|
||||
import { t } from '$lib/i18n';
|
||||
import { IconSearch, IconDeploy, IconLoader, IconCheck } from '$lib/components/icons';
|
||||
@@ -21,42 +22,46 @@
|
||||
|
||||
let errors = $state<Record<string, string>>({});
|
||||
|
||||
// Image browser state
|
||||
let showImageBrowser = $state(false);
|
||||
let browseImages = $state<(RegistryImage & { registryName: string })[]>([]);
|
||||
let browseLoading = $state(false);
|
||||
// Image picker state
|
||||
let showImagePicker = $state(false);
|
||||
let imagePickerItems = $state<EntityPickerItem[]>([]);
|
||||
let imagePickerLoading = $state(false);
|
||||
|
||||
async function handleBrowseImages() {
|
||||
showImageBrowser = !showImageBrowser;
|
||||
if (!showImageBrowser) return;
|
||||
showImagePicker = true;
|
||||
if (imagePickerItems.length > 0) return;
|
||||
|
||||
browseLoading = true;
|
||||
browseImages = [];
|
||||
imagePickerLoading = true;
|
||||
try {
|
||||
const registries = await listRegistries();
|
||||
const allImages: (RegistryImage & { registryName: string })[] = [];
|
||||
const items: EntityPickerItem[] = [];
|
||||
for (const reg of registries) {
|
||||
if (!reg.owner) continue;
|
||||
try {
|
||||
const images = await listRegistryImages(reg.id);
|
||||
for (const img of images) {
|
||||
allImages.push({ ...img, registryName: reg.name });
|
||||
items.push({
|
||||
value: img.full_ref + ':latest',
|
||||
label: img.full_ref,
|
||||
description: reg.name,
|
||||
group: reg.name
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// Skip registries that fail.
|
||||
}
|
||||
}
|
||||
browseImages = allImages;
|
||||
imagePickerItems = items;
|
||||
} catch {
|
||||
toasts.error($t('quickDeploy.imageLoadFailed'));
|
||||
} finally {
|
||||
browseLoading = false;
|
||||
imagePickerLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
function selectBrowsedImage(image: RegistryImage & { registryName: string }) {
|
||||
imageUrl = image.full_ref + ':latest';
|
||||
showImageBrowser = false;
|
||||
function selectPickedImage(value: string) {
|
||||
imageUrl = value;
|
||||
showImagePicker = false;
|
||||
}
|
||||
|
||||
function validateImageUrl(url: string): string {
|
||||
@@ -183,7 +188,11 @@
|
||||
aria-label={$t('quickDeploy.browseImages')}
|
||||
class="rounded-lg border border-[var(--border-primary)] p-2 text-[var(--text-secondary)] hover:bg-[var(--surface-card-hover)] hover:text-[var(--text-primary)] transition-colors"
|
||||
>
|
||||
<IconSearch size={16} />
|
||||
{#if imagePickerLoading}
|
||||
<IconLoader size={16} />
|
||||
{:else}
|
||||
<IconSearch size={16} />
|
||||
{/if}
|
||||
</button>
|
||||
<button
|
||||
onclick={handleInspect}
|
||||
@@ -200,34 +209,15 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{#if showImageBrowser}
|
||||
<div class="mt-3 rounded-lg border border-[var(--border-primary)] bg-[var(--surface-card)] p-3 shadow-[var(--shadow-md)] max-h-60 overflow-y-auto animate-scale-in">
|
||||
{#if browseLoading}
|
||||
<div class="flex items-center gap-2 py-2 text-sm text-[var(--text-secondary)]">
|
||||
<IconLoader size={14} />
|
||||
{$t('quickDeploy.loadingImages')}
|
||||
</div>
|
||||
{:else if browseImages.length === 0}
|
||||
<p class="text-sm text-[var(--text-tertiary)]">{$t('quickDeploy.noImages')}</p>
|
||||
{:else}
|
||||
<p class="mb-2 text-xs font-medium text-[var(--text-tertiary)]">{$t('quickDeploy.selectImage')}</p>
|
||||
<ul class="space-y-1">
|
||||
{#each browseImages as image}
|
||||
<li>
|
||||
<button
|
||||
type="button"
|
||||
onclick={() => selectBrowsedImage(image)}
|
||||
class="w-full rounded-md px-3 py-2 text-left text-sm hover:bg-[var(--surface-card-hover)] transition-colors"
|
||||
>
|
||||
<span class="font-medium text-[var(--text-primary)]">{image.full_ref}</span>
|
||||
<span class="ml-2 text-xs text-[var(--text-tertiary)]">({image.registryName})</span>
|
||||
</button>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<EntityPicker
|
||||
bind:open={showImagePicker}
|
||||
items={imagePickerItems}
|
||||
current={imageUrl}
|
||||
title={$t('quickDeploy.selectImage')}
|
||||
placeholder={$t('entityPicker.search')}
|
||||
onselect={selectPickedImage}
|
||||
onclose={() => { showImagePicker = false; }}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- Step 2 -->
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
<script lang="ts">
|
||||
import type { Project, Registry, RegistryImage } from '$lib/types';
|
||||
import type { Project, EntityPickerItem } from '$lib/types';
|
||||
import * as api from '$lib/api';
|
||||
import { t } from '$lib/i18n';
|
||||
import { IconPlus, IconSearch, IconLoader } from '$lib/components/icons';
|
||||
import FormField from '$lib/components/FormField.svelte';
|
||||
import SkeletonTable from '$lib/components/SkeletonTable.svelte';
|
||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||
import EntityPicker from '$lib/components/EntityPicker.svelte';
|
||||
|
||||
let projects = $state<Project[]>([]);
|
||||
let loading = $state(true);
|
||||
@@ -20,39 +21,40 @@
|
||||
let formSubmitting = $state(false);
|
||||
let formError = $state('');
|
||||
|
||||
// Image browser state
|
||||
let showImageBrowser = $state(false);
|
||||
let registries = $state<Registry[]>([]);
|
||||
let browseImages = $state<(RegistryImage & { registryName: string })[]>([]);
|
||||
let browseLoading = $state(false);
|
||||
let browseError = $state('');
|
||||
// Image picker state
|
||||
let showImagePicker = $state(false);
|
||||
let imagePickerItems = $state<EntityPickerItem[]>([]);
|
||||
let imagePickerLoading = $state(false);
|
||||
|
||||
async function handleBrowseImages() {
|
||||
showImageBrowser = !showImageBrowser;
|
||||
if (!showImageBrowser) return;
|
||||
showImagePicker = true;
|
||||
if (imagePickerItems.length > 0) return;
|
||||
|
||||
browseLoading = true;
|
||||
browseError = '';
|
||||
browseImages = [];
|
||||
imagePickerLoading = true;
|
||||
try {
|
||||
registries = await api.listRegistries();
|
||||
const allImages: (RegistryImage & { registryName: string })[] = [];
|
||||
const registries = await api.listRegistries();
|
||||
const items: EntityPickerItem[] = [];
|
||||
for (const reg of registries) {
|
||||
if (!reg.owner) continue;
|
||||
try {
|
||||
const images = await api.listRegistryImages(reg.id);
|
||||
for (const img of images) {
|
||||
allImages.push({ ...img, registryName: reg.name });
|
||||
items.push({
|
||||
value: JSON.stringify({ full_ref: img.full_ref, registryName: reg.name }),
|
||||
label: img.full_ref,
|
||||
description: reg.name,
|
||||
group: reg.name
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// Skip registries that fail (e.g., no owner configured).
|
||||
}
|
||||
}
|
||||
browseImages = allImages;
|
||||
} catch (e) {
|
||||
browseError = e instanceof Error ? e.message : $t('projects.imageLoadFailed');
|
||||
imagePickerItems = items;
|
||||
} catch {
|
||||
imagePickerItems = [];
|
||||
} finally {
|
||||
browseLoading = false;
|
||||
imagePickerLoading = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,14 +64,15 @@
|
||||
return parts[parts.length - 1].toLowerCase().replace(/[^a-z0-9-]/g, '-');
|
||||
}
|
||||
|
||||
function selectBrowsedImage(image: RegistryImage & { registryName: string }) {
|
||||
formImage = image.full_ref;
|
||||
formRegistry = image.registryName;
|
||||
function selectPickedImage(value: string) {
|
||||
const parsed = JSON.parse(value) as { full_ref: string; registryName: string };
|
||||
formImage = parsed.full_ref;
|
||||
formRegistry = parsed.registryName;
|
||||
// Auto-fill name if empty.
|
||||
if (!formName.trim()) {
|
||||
formName = nameFromImage(image.full_ref);
|
||||
formName = nameFromImage(parsed.full_ref);
|
||||
}
|
||||
showImageBrowser = false;
|
||||
showImagePicker = false;
|
||||
}
|
||||
|
||||
async function loadProjects() {
|
||||
@@ -149,51 +152,33 @@
|
||||
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 sm:grid-cols-2">
|
||||
<FormField label="{$t('projects.name')} *" name="name" bind:value={formName} placeholder="my-web-app" required />
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<div class="flex items-end gap-2">
|
||||
<div class="flex-1">
|
||||
<FormField label="{$t('projects.image')} *" name="image" bind:value={formImage} placeholder="registry.example.com/org/app" required />
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onclick={handleBrowseImages}
|
||||
title={$t('projects.browseImages')}
|
||||
aria-label={$t('projects.browseImages')}
|
||||
class="rounded-lg border border-[var(--border-primary)] p-2 text-[var(--text-secondary)] hover:bg-[var(--surface-card-hover)] hover:text-[var(--text-primary)] transition-colors"
|
||||
>
|
||||
<IconSearch size={16} />
|
||||
</button>
|
||||
<div class="flex items-end gap-2">
|
||||
<div class="flex-1">
|
||||
<FormField label="{$t('projects.image')} *" name="image" bind:value={formImage} placeholder="registry.example.com/org/app" required />
|
||||
</div>
|
||||
{#if showImageBrowser}
|
||||
<div class="rounded-lg border border-[var(--border-primary)] bg-[var(--surface-card)] p-3 shadow-[var(--shadow-md)] max-h-60 overflow-y-auto animate-scale-in">
|
||||
{#if browseLoading}
|
||||
<div class="flex items-center gap-2 py-2 text-sm text-[var(--text-secondary)]">
|
||||
<IconLoader size={14} />
|
||||
{$t('projects.loadingImages')}
|
||||
</div>
|
||||
{:else if browseError}
|
||||
<p class="text-sm text-[var(--color-danger)]">{browseError}</p>
|
||||
{:else if browseImages.length === 0}
|
||||
<p class="text-sm text-[var(--text-tertiary)]">{$t('projects.noImages')}</p>
|
||||
{:else}
|
||||
<ul class="space-y-1">
|
||||
{#each browseImages as image}
|
||||
<li>
|
||||
<button
|
||||
type="button"
|
||||
onclick={() => selectBrowsedImage(image)}
|
||||
class="w-full rounded-md px-3 py-2 text-left text-sm hover:bg-[var(--surface-card-hover)] transition-colors"
|
||||
>
|
||||
<span class="font-medium text-[var(--text-primary)]">{image.full_ref}</span>
|
||||
<span class="ml-2 text-xs text-[var(--text-tertiary)]">({image.registryName})</span>
|
||||
</button>
|
||||
</li>
|
||||
{/each}
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<button
|
||||
type="button"
|
||||
onclick={handleBrowseImages}
|
||||
title={$t('projects.browseImages')}
|
||||
aria-label={$t('projects.browseImages')}
|
||||
class="rounded-lg border border-[var(--border-primary)] p-2 text-[var(--text-secondary)] hover:bg-[var(--surface-card-hover)] hover:text-[var(--text-primary)] transition-colors"
|
||||
>
|
||||
{#if imagePickerLoading}
|
||||
<IconLoader size={16} />
|
||||
{:else}
|
||||
<IconSearch size={16} />
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
<EntityPicker
|
||||
bind:open={showImagePicker}
|
||||
items={imagePickerItems}
|
||||
current={formImage}
|
||||
title={$t('projects.selectImage')}
|
||||
placeholder={$t('entityPicker.search')}
|
||||
onselect={selectPickedImage}
|
||||
onclose={() => { showImagePicker = false; }}
|
||||
/>
|
||||
<FormField label={$t('projects.port')} name="port" type="number" bind:value={formPort} helpText="Auto-detected from EXPOSE if empty" />
|
||||
<FormField label={$t('projects.healthcheck')} name="healthcheck" bind:value={formHealthcheck} placeholder="/api/health" helpText="Auto-detected from image if empty" />
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user