From fa7130f4072e3ddd86c4a64ab95e4af2db2a1421 Mon Sep 17 00:00:00 2001 From: Daniel Dietzler Date: Mon, 1 Jun 2026 16:34:24 +0200 Subject: [PATCH] fix: version check --- web/src/lib/utils.spec.ts | 11 ++++++++++- web/src/lib/utils.ts | 2 +- .../system-settings/NewVersionCheckSettings.svelte | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/src/lib/utils.spec.ts b/web/src/lib/utils.spec.ts index 9fde998dcd..992cd803e7 100644 --- a/web/src/lib/utils.spec.ts +++ b/web/src/lib/utils.spec.ts @@ -1,5 +1,5 @@ import { AssetTypeEnum } from '@immich/sdk'; -import { getAssetUrl } from '$lib/utils'; +import { getAssetUrl, semverToName } from '$lib/utils'; import { assetFactory } from '@test-data/factories/asset-factory'; import { sharedLinkFactory } from '@test-data/factories/shared-link-factory'; @@ -161,4 +161,13 @@ describe('utils', () => { expect(url).toContain(asset.id); }); }); + describe('semverToName', () => { + it('should not append release candidate tag if prelease is not set', () => { + expect(semverToName({ major: 3, minor: 0, patch: 0, prerelease: null })).toEqual('v3.0.0'); + }); + + it('should append release candidate if set', () => { + expect(semverToName({ major: 3, minor: 0, patch: 0, prerelease: 0 })).toEqual('v3.0.0-rc.0'); + }); + }); }); diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts index 4bc3ce76b3..9af417bb19 100644 --- a/web/src/lib/utils.ts +++ b/web/src/lib/utils.ts @@ -412,7 +412,7 @@ export function createDateFormatter(localeCode: string | undefined): DateFormatt } export const semverToName = ({ major, minor, patch, prerelease }: ServerVersionResponseDto) => - `v${major}.${minor}.${patch}${prerelease ? `-rc.${prerelease}` : ''}`; + `v${major}.${minor}.${patch}${prerelease === null ? '' : `-rc.${prerelease}`}`; export const withoutIcons = (actions: ActionItem[]): ActionItem[] => actions.map((action) => ({ ...action, icon: undefined })); diff --git a/web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte b/web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte index c646601718..653448e062 100644 --- a/web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte +++ b/web/src/routes/admin/system-settings/NewVersionCheckSettings.svelte @@ -16,7 +16,7 @@
event.preventDefault()}> -
+