Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: self update button in mobile sheet (#1543)
Chase Baucom2d2e30beb9bb
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 6ebef5fbd..c07524b0d 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1684,6 +1684,7 @@"first_login_error_failed": "Failed to change password","first_login_success": "Password changed successfully","upgrade_to_version": "Update to {version}",+ "upgrade_update_tag": "Update {tag}","upgrade_confirm_title": "Confirm System Upgrade","upgrade_confirm_description": "You are about to upgrade Arcane to version {version}.","upgrade_confirm_what_happens": "This upgrade will:",diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelteindex 988170f97..3d6534663 100644--- a/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte+++ b/frontend/src/lib/components/mobile-nav/mobile-nav-sheet.svelte@@ -7,17 +7,25 @@import { m } from '$lib/paraglide/messages';import MobileUserCard from './mobile-user-card.svelte';import * as Drawer from '$lib/components/ui/drawer/index.js';+ import { ArcaneButton } from '$lib/components/arcane-button/index.js';+ import systemUpgradeService from '$lib/services/api/system-upgrade-service';+ import UpgradeConfirmationDialog from '$lib/components/dialogs/upgrade-confirmation-dialog.svelte';+ import { toast } from 'svelte-sonner';+ import { onMount } from 'svelte';+ import { DownloadIcon } from '$lib/icons';+ import { extractApiErrorMessage } from '$lib/utils/api.util';+ import type { AppVersionInformation } from '$lib/types/application-configuration';let {open = $bindable(false),user = null,- versionInformation = null,- navigationMode = 'floating'+ versionInformation,+ debug = false}: {open: boolean;user?: any;- versionInformation?: any;- navigationMode?: 'floating' | 'docked';+ versionInformation?: AppVersionInformation;+ debug?: boolean;} = $props();let storeUser: any = $state(null);@@ -29,10 +37,100 @@const currentPath = $derived(page.url.pathname);const memoizedUser = $derived.by(() => user ?? storeUser);- const memoizedIsAdmin = $derived.by(() => !!memoizedUser?.roles?.includes('admin'));- function handleItemClick(item: NavigationItem, event?: MouseEvent) {- // Don't prevent default - let the navigation happen+ let canUpgrade = $state(false);+ let checkingUpgrade = $state(false);+ let upgrading = $state(false);+ let showConfirmDialog = $state(false);++ const isAdmin = $derived(!!user?.roles?.includes('admin'));+ const shouldShowUpgrade = $derived((canUpgrade && isAdmin) || debug);++ // Determine update type and display text+ const updateType = $derived.by(() => {+ if (!versionInformation) return 'none';+ if (versionInformation.isSemverVersion) return 'semver';+ if (versionInformation.currentTag && versionInformation.newestDigest) return 'digest';+ return 'none';+ });++ const updateDisplayText = $derived.by(() => {+ if (!versionInformation) return '';+ if (updateType === 'semver') {+ return versionInformation.newestVersion ?? '';+ }+ if (updateType === 'digest' && versionInformation.newestDigest) {+ // Show shortened digest for non-semver tags+ const digest = versionInformation.newestDigest;+ return digest.length > 12 ? digest.substring(0, 12) : digest;+ }+ return '';+ });++ const upgradeButtonText = $derived.by(() => {+ if (upgrading) return m.upgrade_in_progress();+ if (checkingUpgrade) return m.upgrade_checking();+ if (updateType === 'digest') {+ const tag = versionInformation?.currentTag ?? m.common_image();+ return m.upgrade_update_tag({ tag });+ }+ // For semver updates, use newestVersion or fallback to updateDisplayText+ const version = versionInformation?.newestVersion || updateDisplayText;+ if (version) {+ return m.upgrade_to_version({ version });+ }+ // Fallback if no version info is available (shouldn't happen in prod, but safe fallback)+ return m.upgrade_now();+ });++ // Debug mode: force show upgrade button+ $effect(() => {+ if (debug) {+ canUpgrade = true;+ }+ });++ // Check if self-upgrade is available+ onMount(() => {+ if (versionInformation?.updateAvailable && isAdmin && !debug) {+ checkUpgradeAvailability();+ }+ });++ // Show banner for both semver and digest-based updates+ const shouldShowBanner = $derived(versionInformation?.updateAvailable || debug);++ async function checkUpgradeAvailability() {+ if (checkingUpgrade) return;++ checkingUpgrade = true;+ try {+ const result = await systemUpgradeService.checkUpgradeAvailable();+ canUpgrade = result.canUpgrade && !result.error;+ } catch (error) {+ canUpgrade = false;+ } finally {+ checkingUpgrade = false;+ }+ }++ function handleUpgradeClick() {+ showConfirmDialog = true;+ }++ async function handleConfirmUpgrade() {+ try {+ await systemUpgradeService.triggerUpgrade();+ // Dialog will handle countdown and reload+ } catch (error: any) {+ const errorMessage = extractApiErrorMessage(error);+ const wrappedPrefix = m.upgrade_failed({ error: '' });+ toast.error(errorMessage.startsWith(wrappedPrefix) ? errorMessage : m.upgrade_failed({ error: errorMessage }));+ upgrading = false;+ }+ }++ function handleItemClick() {open = false;}@@ -64,7 +162,7 @@{@const IconComponent = item.icon}<ahref={item.url}- onclick={() => handleItemClick(item)}+ onclick={handleItemClick}class={cn('flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out','focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',@@ -90,7 +188,7 @@{@const IconComponent = item.icon}<ahref={item.url}- onclick={() => handleItemClick(item)}+ onclick={handleItemClick}class={cn('flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out','focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',@@ -107,7 +205,7 @@</div></section>- {#if memoizedIsAdmin}+ {#if isAdmin}{#if navigationItems.settingsItems}<section><h4 class="text-muted-foreground/70 mb-4 px-3 text-[11px] font-bold tracking-widest uppercase">@@ -120,7 +218,7 @@<div class="space-y-2"><ahref={item.url}- onclick={() => handleItemClick(item)}+ onclick={handleItemClick}class={cn('flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',isActiveItem(item)@@ -136,7 +234,7 @@{@const SubIconComponent = subItem.icon}<ahref={subItem.url}- onclick={() => handleItemClick(subItem)}+ onclick={handleItemClick}class={cn('flex items-center gap-3 rounded-xl px-4 py-2 text-sm transition-all duration-200 ease-out','focus-visible:ring-muted-foreground/50 hover:scale-[1.01] focus-visible:ring-1 focus-visible:ring-offset-1 focus-visible:ring-offset-transparent',@@ -156,7 +254,7 @@{@const IconComponent = item.icon}<ahref={item.url}- onclick={() => handleItemClick(item)}+ onclick={handleItemClick}class={cn('flex items-center gap-3 rounded-2xl px-4 py-3 text-sm font-medium transition-all duration-200 ease-out',isActiveItem(item)@@ -179,16 +277,40 @@<div class="border-border/30 border-t px-6 pt-4 pb-4">{#if versionInformation}<div class="text-muted-foreground/60 text-center text-xs">- <p class="font-medium">Arcane v{versionInformation.currentVersion}</p>- {#if versionInformation.updateAvailable}+ <p class="font-medium">+ Arcane {versionInformation.displayVersion ?? versionInformation.currentVersion}+ </p>+ {#if shouldShowBanner}<p class="text-primary/80 mt-1 font-medium">Update available</p>{/if}</div>+ {#if shouldShowUpgrade}+ <div class="mt-3">+ <ArcaneButton+ action="update"+ size="sm"+ class="h-9 w-full gap-2 rounded-xl shadow-sm transition-colors"+ onclick={handleUpgradeClick}+ disabled={upgrading || checkingUpgrade}+ customLabel={upgradeButtonText}+ icon={DownloadIcon}+ />+ </div>+ {/if}{/if}</div></Drawer.Content></Drawer.Root>+<UpgradeConfirmationDialog+ bind:open={showConfirmDialog}+ bind:upgrading+ version={versionInformation?.newestVersion ?? ''}+ expectedVersion={versionInformation?.newestVersion}+ expectedDigest={versionInformation?.newestDigest}+ onConfirm={handleConfirmUpgrade}+/>+<style>:global(.scrollbar-hide) {-ms-overflow-style: none; /* IE and Edge */diff --git a/frontend/src/lib/components/mobile-nav/mobile-nav.svelte b/frontend/src/lib/components/mobile-nav/mobile-nav.svelteindex 69da8b353..2467dd94e 100644--- a/frontend/src/lib/components/mobile-nav/mobile-nav.svelte+++ b/frontend/src/lib/components/mobile-nav/mobile-nav.svelte@@ -9,16 +9,17 @@import { m } from '$lib/paraglide/messages';import { MobileNavGestures } from './gestures.svelte';import './styles.css';+ import type { AppVersionInformation } from '$lib/types/application-configuration';let {navigationSettings,user = null,- versionInformation = null,+ versionInformation,class: className = ''}: {navigationSettings: MobileNavigationSettings;user?: any;- versionInformation?: any;+ versionInformation?: AppVersionInformation;class?: string;} = $props();@@ -183,4 +184,4 @@{/if}</nav>-<MobileNavSheet bind:open={menuOpen} {user} {versionInformation} navigationMode={mode} />+<MobileNavSheet bind:open={menuOpen} {user} {versionInformation} />diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelteindex 38a617f5d..db83d3316 100644--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte@@ -17,13 +17,11 @@let {isCollapsed,versionInformation,- updateAvailable = false,debug = false,user}: {isCollapsed: boolean;versionInformation?: AppVersionInformation;- updateAvailable?: boolean;debug?: boolean;user?: User | null;} = $props();@@ -63,9 +61,16 @@if (upgrading) return m.upgrade_in_progress();if (checkingUpgrade) return m.upgrade_checking();if (updateType === 'digest') {- return `Update ${versionInformation?.currentTag ?? 'image'}`;+ const tag = versionInformation?.currentTag ?? m.common_image();+ return m.upgrade_update_tag({ tag });}- return m.upgrade_to_version({ version: versionInformation?.newestVersion ?? '' });+ // For semver updates, use newestVersion or fallback to updateDisplayText+ const version = versionInformation?.newestVersion || updateDisplayText;+ if (version) {+ return m.upgrade_to_version({ version });+ }+ // Fallback if no version info is available (shouldn't happen in prod, but safe fallback)+ return m.upgrade_now();});// Debug mode: force show upgrade button@@ -77,7 +82,7 @@// Check if self-upgrade is availableonMount(() => {- if (updateAvailable && isAdmin && !debug) {+ if (versionInformation?.updateAvailable && isAdmin && !debug) {checkUpgradeAvailability();}});@@ -113,7 +118,7 @@}// Show banner for both semver and digest-based updates- const shouldShowBanner = $derived(updateAvailable || debug);+ const shouldShowBanner = $derived(versionInformation?.updateAvailable || debug);</script>{#snippet updateInfo()}diff --git a/frontend/src/lib/components/sidebar/sidebar.svelte b/frontend/src/lib/components/sidebar/sidebar.svelteindex 2acf25955..3446c9732 100644--- a/frontend/src/lib/components/sidebar/sidebar.svelte+++ b/frontend/src/lib/components/sidebar/sidebar.svelte@@ -105,7 +105,6 @@<SidebarUpdatebanner{isCollapsed}{versionInformation}- updateAvailable={versionInformation.updateAvailable}user={effectiveUser}debug={false}/>