High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: version check (#28746)
Daniel Dietzler3f7af51531b2
diff --git a/web/src/lib/utils.spec.ts b/web/src/lib/utils.spec.tsindex 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.tsindex 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.svelteindex 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 @@<div><div in:fade={{ duration: 500 }}><form autocomplete="off" onsubmit={(event) => event.preventDefault()}>- <div class="ms-4 mt-4">+ <div class="ms-4 mt-4 flex flex-col gap-4"><SettingSwitchtitle={$t('admin.version_check_enabled_description')}subtitle={$t('admin.version_check_implications', { values: { server: 'version.immich.cloud' } })}