{assets.length}
diff --git a/web/src/lib/components/timeline/Month.svelte b/web/src/lib/components/timeline/Month.svelte
index 91073a0a5f..28996b204a 100644
--- a/web/src/lib/components/timeline/Month.svelte
+++ b/web/src/lib/components/timeline/Month.svelte
@@ -1,11 +1,11 @@
-{#each filterIntersecting(monthGroup.dayGroups) as dayGroup, groupIndex (dayGroup.day)}
- {@const isDayGroupSelected = assetInteraction.selectedGroup.has(dayGroup.groupTitle)}
+{#each filterIsInOrNearViewport(timelineMonth.timelineDays) as timelineDay, groupIndex (timelineDay.day)}
+ {@const isTimelineDaySelected = assetInteraction.selectedGroup.has(timelineDay.groupTitle)}
(hoveredDayGroup = dayGroup.groupTitle)}
- onmouseleave={() => (hoveredDayGroup = null)}
+ style:inset-inline-start={timelineDay.start + 'px'}
+ style:top={timelineDay.top + 'px'}
+ onmouseenter={() => (hoveredTimelineDay = timelineDay.groupTitle)}
+ onmouseleave={() => (hoveredTimelineDay = null)}
>
{#if !singleSelect}
onDayGroupSelect(dayGroup, assetsSnapshot(dayGroup.getAssets()))}
- onkeydown={() => onDayGroupSelect(dayGroup, assetsSnapshot(dayGroup.getAssets()))}
+ class:w-8={hoveredTimelineDay === timelineDay.groupTitle ||
+ assetInteraction.selectedGroup.has(timelineDay.groupTitle)}
+ onclick={() => onTimelineDaySelect(timelineDay, assetsSnapshot(timelineDay.getAssets()))}
+ onkeydown={() => onTimelineDaySelect(timelineDay, assetsSnapshot(timelineDay.getAssets()))}
>
- {#if isDayGroupSelected}
+ {#if isTimelineDaySelected}
{:else}
@@ -87,20 +93,20 @@
{/if}
-
- {dayGroup.groupTitle}
+
+ {timelineDay.groupTitle}
diff --git a/web/src/lib/components/timeline/Scrubber.svelte b/web/src/lib/components/timeline/Scrubber.svelte
index c6f81eb1ce..99aec0e429 100644
--- a/web/src/lib/components/timeline/Scrubber.svelte
+++ b/web/src/lib/components/timeline/Scrubber.svelte
@@ -92,7 +92,7 @@
scrubberWidth = usingMobileDevice ? MOBILE_WIDTH : DESKTOP_WIDTH;
});
- const toScrollFromMonthGroupPercentage = (
+ const toScrollFromTimelineMonthPercentage = (
scrubberMonth: ViewportTopMonth,
scrubberMonthPercent: number,
scrubOverallPercent: number,
@@ -125,7 +125,7 @@
}
};
const scrollY = $derived(
- toScrollFromMonthGroupPercentage(viewportTopMonth, viewportTopMonthScrollPercent, timelineScrollPercent),
+ toScrollFromTimelineMonthPercentage(viewportTopMonth, viewportTopMonthScrollPercent, timelineScrollPercent),
);
const timelineFullHeight = $derived(timelineManager.scrubberTimelineHeight);
const relativeTopOffset = $derived(toScrollY(timelineTopOffset / timelineFullHeight));
@@ -281,12 +281,12 @@
const boundingClientRect = bestElement.boundingClientRect;
const sy = boundingClientRect.y;
const relativeY = y - sy;
- const monthGroupPercentY = relativeY / boundingClientRect.height;
+ const timelineMonthPercentY = relativeY / boundingClientRect.height;
return {
isOnPaddingTop: false,
isOnPaddingBottom: false,
segment,
- monthGroupPercentY,
+ timelineMonthPercentY,
};
}
@@ -309,7 +309,7 @@
isOnPaddingTop,
isOnPaddingBottom,
segment: undefined,
- monthGroupPercentY: 0,
+ timelineMonthPercentY: 0,
};
};
@@ -328,7 +328,7 @@
const upper = rect?.height - (PADDING_TOP + PADDING_BOTTOM);
hoverY = clamp(clientY - rect?.top - PADDING_TOP, lower, upper);
const x = rect!.left + rect!.width / 2;
- const { segment, monthGroupPercentY, isOnPaddingTop, isOnPaddingBottom } = getActive(x, clientY);
+ const { segment, timelineMonthPercentY, isOnPaddingTop, isOnPaddingBottom } = getActive(x, clientY);
activeSegment = segment;
isHoverOnPaddingTop = isOnPaddingTop;
isHoverOnPaddingBottom = isOnPaddingBottom;
@@ -336,7 +336,7 @@
const scrubData = {
scrubberMonth: segmentDate,
overallScrollPercent: toTimelineY(hoverY),
- scrubberMonthScrollPercent: monthGroupPercentY,
+ scrubberMonthScrollPercent: timelineMonthPercentY,
};
if (wasDragging === false && isDragging) {
void startScrub?.(scrubData);
diff --git a/web/src/lib/components/timeline/Timeline.svelte b/web/src/lib/components/timeline/Timeline.svelte
index d6ce722c96..bcef9f3260 100644
--- a/web/src/lib/components/timeline/Timeline.svelte
+++ b/web/src/lib/components/timeline/Timeline.svelte
@@ -11,14 +11,14 @@
import HotModuleReload from '$lib/elements/HotModuleReload.svelte';
import Portal from '$lib/elements/Portal.svelte';
import Skeleton from '$lib/elements/Skeleton.svelte';
- import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
+ import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
+ import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
+ import type { TimelineDay } from '$lib/managers/timeline-manager/timeline-day.svelte';
import { isIntersecting } from '$lib/managers/timeline-manager/internal/intersection-support.svelte';
- import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
+ import type { TimelineMonth } from '$lib/managers/timeline-manager/timeline-month.svelte';
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
import type { TimelineAsset, TimelineManagerOptions, ViewportTopMonth } from '$lib/managers/timeline-manager/types';
import { assetsSnapshot } from '$lib/managers/timeline-manager/utils.svelte';
- import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
- import { assetViewingStore } from '$lib/stores/asset-viewing.store';
import { mediaQueryManager } from '$lib/stores/media-query-manager.svelte';
import { isAssetViewerRoute, navigate } from '$lib/utils/navigation';
import { getTimes, type ScrubberListener } from '$lib/utils/timeline-util';
@@ -36,7 +36,7 @@
enableRouting: boolean;
timelineManager?: TimelineManager;
options?: TimelineManagerOptions;
- assetInteraction: AssetInteraction;
+ assetInteraction: AssetMultiSelectManager;
removeAction?: AssetAction.UNARCHIVE | AssetAction.ARCHIVE | AssetAction.SET_VISIBILITY_TIMELINE | null;
withStacked?: boolean;
showArchiveIcon?: boolean;
@@ -52,7 +52,7 @@
onThumbnailClick?: (
asset: TimelineAsset,
timelineManager: TimelineManager,
- dayGroup: DayGroup,
+ timelineDay: TimelineDay,
onClick: (
timelineManager: TimelineManager,
assets: TimelineAsset[],
@@ -88,10 +88,7 @@
onDestroy(() => timelineManager.destroy());
$effect(() => options && void timelineManager.updateOptions(options));
- let { isViewing: showAssetViewer, asset: viewingAsset, gridScrollTarget } = assetViewingStore;
-
let scrollableElement: HTMLElement | undefined = $state();
-
let timelineElement: HTMLElement | undefined = $state();
let invisible = $state(true);
// The percentage of scroll through the month that is currently intersecting the top boundary of the viewport.
@@ -124,10 +121,11 @@
timelineManager.scrollableElement = scrollableElement;
});
- const getAssetPosition = (assetId: string, monthGroup: MonthGroup) => monthGroup.findAssetAbsolutePosition(assetId);
+ const getAssetPosition = (assetId: string, timelineMonth: TimelineMonth) =>
+ timelineMonth.findAssetAbsolutePosition(assetId);
- const scrollToAssetPosition = (assetId: string, monthGroup: MonthGroup) => {
- const position = getAssetPosition(assetId, monthGroup);
+ const scrollToAssetPosition = (assetId: string, timelineMonth: TimelineMonth) => {
+ const position = getAssetPosition(assetId, timelineMonth);
if (!position) {
return;
@@ -179,11 +177,11 @@
// the performance benefits of deferred layouts while still supporting deep linking
// to assets at the end of the timeline.
timelineManager.isScrollingOnLoad = true;
- const monthGroup = await timelineManager.findMonthGroupForAsset({ id: assetId });
- if (!monthGroup) {
+ const timelineMonth = await timelineManager.findTimelineMonthForAsset({ id: assetId });
+ if (!timelineMonth) {
return false;
}
- scrollToAssetPosition(assetId, monthGroup);
+ scrollToAssetPosition(assetId, timelineMonth);
return true;
} finally {
timelineManager.isScrollingOnLoad = false;
@@ -191,11 +189,11 @@
};
const scrollToAsset = (asset: TimelineAsset) => {
- const monthGroup = timelineManager.getMonthGroupByAssetId(asset.id);
- if (!monthGroup) {
+ const timelineMonth = timelineManager.getTimelineMonthByAssetId(asset.id);
+ if (!timelineMonth) {
return false;
}
- scrollToAssetPosition(asset.id, monthGroup);
+ scrollToAssetPosition(asset.id, timelineMonth);
return true;
};
@@ -209,7 +207,7 @@
timelineManager.viewportWidth = rect.width;
}
}
- const scrollTarget = $gridScrollTarget?.at;
+ const scrollTarget = assetViewerManager.gridScrollTarget?.at;
let scrolled = false;
if (scrollTarget) {
scrolled = await scrollAndLoadAsset(scrollTarget);
@@ -265,10 +263,10 @@
}
});
- const scrollToSegmentPercentage = (segmentTop: number, segmentHeight: number, monthGroupScrollPercent: number) => {
+ const scrollToSegmentPercentage = (segmentTop: number, segmentHeight: number, timelineMonthScrollPercent: number) => {
const topOffset = segmentTop;
const maxScrollPercent = timelineManager.maxScrollPercent;
- const delta = segmentHeight * monthGroupScrollPercent;
+ const delta = segmentHeight * timelineMonthScrollPercent;
const scrollToTop = (topOffset + delta) * maxScrollPercent;
timelineManager.scrollTo(scrollToTop);
@@ -297,13 +295,13 @@
scrubberMonthScrollPercent,
);
} else {
- const monthGroup = timelineManager.months.find(
+ const timelineMonth = timelineManager.months.find(
({ yearMonth: { year, month } }) => year === scrubberMonth.year && month === scrubberMonth.month,
);
- if (!monthGroup) {
+ if (!timelineMonth) {
return;
}
- scrollToSegmentPercentage(monthGroup.top, monthGroup.height, scrubberMonthScrollPercent);
+ scrollToSegmentPercentage(timelineMonth.top, timelineMonth.height, scrubberMonthScrollPercent);
}
};
@@ -328,28 +326,28 @@
const monthsLength = timelineManager.months.length;
for (let i = -1; i < monthsLength + 1; i++) {
- let monthGroup: ViewportTopMonth;
- let monthGroupHeight: number;
+ let timelineMonth: ViewportTopMonth;
+ let timelineMonthHeight: number;
if (i === -1) {
// lead-in
- monthGroup = 'lead-in';
- monthGroupHeight = timelineManager.topSectionHeight;
+ timelineMonth = 'lead-in';
+ timelineMonthHeight = timelineManager.topSectionHeight;
} else if (i === monthsLength) {
// lead-out
- monthGroup = 'lead-out';
- monthGroupHeight = timelineManager.bottomSectionHeight;
+ timelineMonth = 'lead-out';
+ timelineMonthHeight = timelineManager.bottomSectionHeight;
} else {
- monthGroup = timelineManager.months[i].yearMonth;
- monthGroupHeight = timelineManager.months[i].height;
+ timelineMonth = timelineManager.months[i].yearMonth;
+ timelineMonthHeight = timelineManager.months[i].height;
}
- let next = top - monthGroupHeight * maxScrollPercent;
+ let next = top - timelineMonthHeight * maxScrollPercent;
// instead of checking for < 0, add a little wiggle room for subpixel resolution
- if (next < -1 && monthGroup) {
- viewportTopMonth = monthGroup;
+ if (next < -1 && timelineMonth) {
+ viewportTopMonth = timelineMonth;
// allowing next to be at least 1 may cause percent to go negative, so ensure positive percentage
- viewportTopMonthScrollPercent = Math.max(0, top / (monthGroupHeight * maxScrollPercent));
+ viewportTopMonthScrollPercent = Math.max(0, top / (timelineMonthHeight * maxScrollPercent));
// compensate for lost precision/rounding errors advance to the next bucket, if present
if (viewportTopMonthScrollPercent > 0.9999 && i + 1 < monthsLength - 1) {
@@ -393,8 +391,8 @@
lastAssetMouseEvent = asset;
};
- const handleGroupSelect = (dayGroup: DayGroup, assets: TimelineAsset[]) => {
- const group = dayGroup.groupTitle;
+ const handleGroupSelect = (timelineDay: TimelineDay, assets: TimelineAsset[]) => {
+ const group = timelineDay.groupTitle;
if (assetInteraction.selectedGroup.has(group)) {
assetInteraction.removeGroupFromMultiselectGroup(group);
for (const asset of assets) {
@@ -407,7 +405,7 @@
}
}
- assetInteraction.selectAll = timelineManager.assetCount === assetInteraction.selectedAssets.length;
+ assetInteraction.selectAll = timelineManager.assetCount === assetInteraction.assets.length;
};
const onSelectAssets = async (asset: TimelineAsset) => {
@@ -416,35 +414,35 @@
}
onSelect(asset);
- const rangeSelection = assetInteraction.assetSelectionCandidates.length > 0;
+ const rangeSelection = assetInteraction.candidates.length > 0;
const deselect = assetInteraction.hasSelectedAsset(asset.id);
// Select/deselect already loaded assets
if (deselect) {
- for (const candidate of assetInteraction.assetSelectionCandidates) {
+ for (const candidate of assetInteraction.candidates) {
assetInteraction.removeAssetFromMultiselectGroup(candidate.id);
}
assetInteraction.removeAssetFromMultiselectGroup(asset.id);
} else {
- for (const candidate of assetInteraction.assetSelectionCandidates) {
+ for (const candidate of assetInteraction.candidates) {
handleSelectAsset(candidate);
}
handleSelectAsset(asset);
}
- assetInteraction.clearAssetSelectionCandidates();
+ assetInteraction.clearCandidates();
- if (assetInteraction.assetSelectionStart && rangeSelection) {
- const startBucket = timelineManager.getMonthGroupByAssetId(assetInteraction.assetSelectionStart.id);
- const endBucket = timelineManager.getMonthGroupByAssetId(asset.id);
+ if (assetInteraction.startAsset && rangeSelection) {
+ const startBucket = timelineManager.getTimelineMonthByAssetId(assetInteraction.startAsset.id);
+ const endBucket = timelineManager.getTimelineMonthByAssetId(asset.id);
if (!startBucket || !endBucket) {
return;
}
- const monthGroups = timelineManager.months;
- const startBucketIndex = monthGroups.indexOf(startBucket);
- const endBucketIndex = monthGroups.indexOf(endBucket);
+ const timelineMonths = timelineManager.months;
+ const startBucketIndex = timelineMonths.indexOf(startBucket);
+ const endBucketIndex = timelineMonths.indexOf(endBucket);
if (startBucketIndex === -1 || endBucketIndex === -1) {
return;
@@ -455,9 +453,9 @@
// Select/deselect assets in range (start,end)
for (let index = rangeStartIndex + 1; index < rangeEndIndex; index++) {
- const monthGroup = monthGroups[index];
- await timelineManager.loadMonthGroup(monthGroup.yearMonth);
- for (const monthAsset of monthGroup.assetsIterator()) {
+ const timelineMonth = timelineMonths[index];
+ await timelineManager.loadTimelineMonth(timelineMonth.yearMonth);
+ for (const monthAsset of timelineMonth.assetsIterator()) {
if (deselect) {
assetInteraction.removeAssetFromMultiselectGroup(monthAsset.id);
} else {
@@ -468,15 +466,15 @@
// Update date group selection in range [start,end]
for (let index = rangeStartIndex; index <= rangeEndIndex; index++) {
- const monthGroup = monthGroups[index];
+ const timelineMonth = timelineMonths[index];
// Split month group into day groups and check each group
- for (const dayGroup of monthGroup.dayGroups) {
- const dayGroupTitle = dayGroup.groupTitle;
- if (dayGroup.getAssets().every((a) => assetInteraction.hasSelectedAsset(a.id))) {
- assetInteraction.addGroupToMultiselectGroup(dayGroupTitle);
+ for (const timelineDay of timelineMonth.timelineDays) {
+ const timelineDayTitle = timelineDay.groupTitle;
+ if (timelineDay.getAssets().every((a) => assetInteraction.hasSelectedAsset(a.id))) {
+ assetInteraction.addGroupToMultiselectGroup(timelineDayTitle);
} else {
- assetInteraction.removeGroupFromMultiselectGroup(dayGroupTitle);
+ assetInteraction.removeGroupFromMultiselectGroup(timelineDayTitle);
}
}
}
@@ -490,7 +488,7 @@
return;
}
- const startAsset = assetInteraction.assetSelectionStart;
+ const startAsset = assetInteraction.startAsset;
if (!startAsset) {
return;
}
@@ -501,13 +499,13 @@
$effect(() => {
if (!lastAssetMouseEvent) {
- assetInteraction.clearAssetSelectionCandidates();
+ assetInteraction.clearCandidates();
}
});
$effect(() => {
if (!shiftKeyIsDown) {
- assetInteraction.clearAssetSelectionCandidates();
+ assetInteraction.clearCandidates();
}
});
@@ -518,31 +516,33 @@
});
$effect(() => {
- if ($showAssetViewer) {
- const { localDateTime } = getTimes($viewingAsset.fileCreatedAt, DateTime.local().offset / 60);
- void timelineManager.loadMonthGroup({ year: localDateTime.year, month: localDateTime.month });
+ if (assetViewerManager.asset && assetViewerManager.isViewing) {
+ const { localDateTime } = getTimes(assetViewerManager.asset.fileCreatedAt, DateTime.local().offset / 60);
+ void timelineManager.loadTimelineMonth({ year: localDateTime.year, month: localDateTime.month });
}
});
const assetSelectHandler = (
timelineManager: TimelineManager,
asset: TimelineAsset,
- assetsInDayGroup: TimelineAsset[],
+ assetsInTimelineDay: TimelineAsset[],
groupTitle: string,
) => {
void onSelectAssets(asset);
// Check if all assets are selected in a group to toggle the group selection's icon
- let selectedAssetsInGroupCount = assetsInDayGroup.filter(({ id }) => assetInteraction.hasSelectedAsset(id)).length;
+ let selectedAssetsInGroupCount = assetsInTimelineDay.filter(({ id }) =>
+ assetInteraction.hasSelectedAsset(id),
+ ).length;
// if all assets are selected in a group, add the group to selected group
- if (selectedAssetsInGroupCount === assetsInDayGroup.length) {
+ if (selectedAssetsInGroupCount === assetsInTimelineDay.length) {
assetInteraction.addGroupToMultiselectGroup(groupTitle);
} else {
assetInteraction.removeGroupFromMultiselectGroup(groupTitle);
}
- assetInteraction.selectAll = timelineManager.assetCount === assetInteraction.selectedAssets.length;
+ assetInteraction.selectAll = timelineManager.assetCount === assetInteraction.assets.length;
};
const _onClick = (
@@ -565,7 +565,7 @@
onAfterUpdate={() => {
const asset = page.url.searchParams.get('at');
if (asset) {
- $gridScrollTarget = { at: asset };
+ assetViewerManager.gridScrollTarget = { at: asset };
}
void scrollAfterNavigate();
}}
@@ -644,23 +644,23 @@
{/if}
- {#each timelineManager.months as monthGroup (monthGroup.viewId)}
- {@const display = monthGroup.intersecting}
- {@const absoluteHeight = monthGroup.top}
+ {#each timelineManager.months as timelineMonth (timelineMonth.viewId)}
+ {@const isInOrNearViewport = timelineMonth.isInOrNearViewport}
+ {@const absoluteHeight = timelineMonth.top}
- {#if !monthGroup.isLoaded}
+ {#if !timelineMonth.isLoaded}
-
+
- {:else if display}
+ {:else if isInOrNearViewport}
- {#snippet thumbnail({ asset, position, dayGroup, groupIndex })}
+ {#snippet thumbnail({ asset, position, timelineDay, groupIndex })}
{@const isAssetSelectionCandidate = assetInteraction.hasSelectionCandidate(asset.id)}
{@const isAssetSelected =
assetInteraction.hasSelectedAsset(asset.id) || timelineManager.albumAssets.has(asset.id)}
@@ -686,19 +686,22 @@
{groupIndex}
onClick={(asset) => {
if (typeof onThumbnailClick === 'function') {
- onThumbnailClick(asset, timelineManager, dayGroup, _onClick);
+ onThumbnailClick(asset, timelineManager, timelineDay, _onClick);
} else {
- _onClick(timelineManager, dayGroup.getAssets(), dayGroup.groupTitle, asset);
+ _onClick(timelineManager, timelineDay.getAssets(), timelineDay.groupTitle, asset);
}
}}
onSelect={() => {
if (isSelectionMode || assetInteraction.selectionActive) {
- assetSelectHandler(timelineManager, asset, dayGroup.getAssets(), dayGroup.groupTitle);
+ assetSelectHandler(timelineManager, asset, timelineDay.getAssets(), timelineDay.groupTitle);
return;
}
void onSelectAssets(asset);
}}
onMouseEvent={() => handleSelectAssetCandidates(asset)}
+ onPreview={isSelectionMode || assetInteraction.selectionActive
+ ? (asset) => void navigate({ targetRoute: 'current', assetId: asset.id })
+ : undefined}
selected={isAssetSelected}
selectionCandidate={isAssetSelectionCandidate}
disabled={isAssetDisabled}
@@ -722,7 +725,7 @@
- {#if $showAssetViewer}
+ {#if assetViewerManager.isViewing}
{/if}
@@ -733,7 +736,7 @@
scrollbar-width: none;
}
- .month-group {
+ .timeline-month {
contain: layout size paint;
transform-style: flat;
backface-visibility: hidden;
diff --git a/web/src/lib/components/timeline/TimelineAssetViewer.svelte b/web/src/lib/components/timeline/TimelineAssetViewer.svelte
index bd4ead6def..47144dcca9 100644
--- a/web/src/lib/components/timeline/TimelineAssetViewer.svelte
+++ b/web/src/lib/components/timeline/TimelineAssetViewer.svelte
@@ -2,11 +2,11 @@
import type { Action } from '$lib/components/asset-viewer/actions/action';
import type { AssetCursor } from '$lib/components/asset-viewer/asset-viewer.svelte';
import { AssetAction } from '$lib/constants';
+ import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
import { assetCacheManager } from '$lib/managers/AssetCacheManager.svelte';
import { authManager } from '$lib/managers/auth-manager.svelte';
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
- import { assetViewingStore } from '$lib/stores/asset-viewing.store';
import { websocketEvents } from '$lib/stores/websocket';
import { handlePromiseError } from '$lib/utils';
import { updateStackedAssetInTimeline, updateUnstackedAssetInTimeline } from '$lib/utils/actions';
@@ -18,8 +18,6 @@
import { onDestroy, onMount, untrack } from 'svelte';
import { t } from 'svelte-i18n';
- let { asset: viewingAsset, gridScrollTarget } = assetViewingStore;
-
interface Props {
timelineManager: TimelineManager;
invisible: boolean;
@@ -65,7 +63,7 @@
};
let assetCursor = $state
({
- current: $viewingAsset,
+ current: assetViewerManager.asset!,
previousAsset: undefined,
nextAsset: undefined,
});
@@ -82,9 +80,10 @@
//TODO: replace this with async derived in svelte 6
$effect(() => {
- // eslint-disable-next-line @typescript-eslint/no-unused-expressions
- $viewingAsset;
- untrack(() => handlePromiseError(loadCloseAssets($viewingAsset)));
+ const asset = assetViewerManager.asset;
+ if (asset) {
+ untrack(() => handlePromiseError(loadCloseAssets(asset)));
+ }
});
const handleRandom = async () => {
@@ -99,8 +98,26 @@
const handleClose = async (asset: { id: string }) => {
invisible = true;
- $gridScrollTarget = { at: asset.id };
- await navigate({ targetRoute: 'current', assetId: null, assetGridRouteSearchParams: $gridScrollTarget });
+ assetViewerManager.gridScrollTarget = { at: asset.id };
+ await navigate({
+ targetRoute: 'current',
+ assetId: null,
+ assetGridRouteSearchParams: assetViewerManager.gridScrollTarget,
+ });
+ };
+
+ const handleRemoveFromAlbum = async (assetIds: string[]) => {
+ timelineManager.removeAssets(assetIds);
+
+ if (!assetIds.includes(assetCursor.current.id)) {
+ return;
+ }
+
+ // keep the cleanup workflow in viewer by moving to adjacent asset first
+ // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+ (await navigateToAsset(assetCursor?.nextAsset)) ||
+ (await navigateToAsset(assetCursor?.previousAsset)) ||
+ (await handleClose(assetCursor.current));
};
const handlePreAction = async (action: Action) => {
@@ -188,7 +205,7 @@
const restoredAsset = assets[0];
const asset = await getAssetInfo({ ...authManager.params, id: restoredAsset.id });
- assetViewingStore.setAsset(asset);
+ assetViewerManager.setAsset(asset);
await navigate({ targetRoute: 'current', assetId: restoredAsset.id });
};
@@ -232,6 +249,7 @@
}}
onUndoDelete={handleUndoDelete}
onRandom={handleRandom}
+ onRemoveFromAlbum={handleRemoveFromAlbum}
onClose={handleClose}
/>
{/await}
diff --git a/web/src/lib/components/timeline/actions/ArchiveAction.svelte b/web/src/lib/components/timeline/actions/ArchiveAction.svelte
index 95c586ede4..26545d5ccf 100644
--- a/web/src/lib/components/timeline/actions/ArchiveAction.svelte
+++ b/web/src/lib/components/timeline/actions/ArchiveAction.svelte
@@ -1,18 +1,18 @@
diff --git a/web/src/lib/components/timeline/actions/ChangeDescriptionAction.svelte b/web/src/lib/components/timeline/actions/ChangeDescriptionAction.svelte
index 883e43aa50..2fb8dcc5a0 100644
--- a/web/src/lib/components/timeline/actions/ChangeDescriptionAction.svelte
+++ b/web/src/lib/components/timeline/actions/ChangeDescriptionAction.svelte
@@ -1,8 +1,8 @@
diff --git a/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte b/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte
index 08d27bf793..5d9fdc139d 100644
--- a/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte
+++ b/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte
@@ -1,48 +1,39 @@
{#if menuItem}
- (isShowChangeLocation = true)}
- />
-{/if}
-{#if isShowChangeLocation}
-
+
{/if}
diff --git a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
index 8af880ed33..318318c432 100644
--- a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
+++ b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
@@ -1,14 +1,12 @@
diff --git a/web/src/lib/components/timeline/actions/DeleteAssetsAction.svelte b/web/src/lib/components/timeline/actions/DeleteAssetsAction.svelte
index e643bae512..16fa72a75d 100644
--- a/web/src/lib/components/timeline/actions/DeleteAssetsAction.svelte
+++ b/web/src/lib/components/timeline/actions/DeleteAssetsAction.svelte
@@ -1,10 +1,10 @@
diff --git a/web/src/lib/components/timeline/actions/DownloadAction.svelte b/web/src/lib/components/timeline/actions/DownloadAction.svelte
index 509aa3a0d7..0a9ab89df8 100644
--- a/web/src/lib/components/timeline/actions/DownloadAction.svelte
+++ b/web/src/lib/components/timeline/actions/DownloadAction.svelte
@@ -1,15 +1,15 @@
diff --git a/web/src/lib/components/timeline/actions/FavoriteAction.svelte b/web/src/lib/components/timeline/actions/FavoriteAction.svelte
index d970a16b8d..b60740d471 100644
--- a/web/src/lib/components/timeline/actions/FavoriteAction.svelte
+++ b/web/src/lib/components/timeline/actions/FavoriteAction.svelte
@@ -1,7 +1,7 @@
diff --git a/web/src/lib/components/timeline/actions/RestoreAction.svelte b/web/src/lib/components/timeline/actions/RestoreAction.svelte
index 48094825f6..946167fb61 100644
--- a/web/src/lib/components/timeline/actions/RestoreAction.svelte
+++ b/web/src/lib/components/timeline/actions/RestoreAction.svelte
@@ -1,6 +1,6 @@
{#if withText}
-
+
{:else}
-
+
{/if}
diff --git a/web/src/lib/components/timeline/actions/SetVisibilityAction.svelte b/web/src/lib/components/timeline/actions/SetVisibilityAction.svelte
index c1fa1c53ab..3806dc5325 100644
--- a/web/src/lib/components/timeline/actions/SetVisibilityAction.svelte
+++ b/web/src/lib/components/timeline/actions/SetVisibilityAction.svelte
@@ -1,7 +1,7 @@
diff --git a/web/src/lib/components/timeline/actions/TagAction.svelte b/web/src/lib/components/timeline/actions/TagAction.svelte
index 63748cd214..e4887441e3 100644
--- a/web/src/lib/components/timeline/actions/TagAction.svelte
+++ b/web/src/lib/components/timeline/actions/TagAction.svelte
@@ -1,11 +1,11 @@
diff --git a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte
index a5fa34289b..d6cb1c170b 100644
--- a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte
+++ b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte
@@ -5,6 +5,8 @@
setFocusToAsset as setFocusAssetInit,
setFocusTo as setFocusToInit,
} from '$lib/components/timeline/actions/focus-actions';
+ import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
+ import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
import { eventManager } from '$lib/managers/event-manager.svelte';
import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
@@ -13,30 +15,26 @@
import NavigateToDateModal from '$lib/modals/NavigateToDateModal.svelte';
import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
import { Route } from '$lib/route';
- import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
- import { assetViewingStore } from '$lib/stores/asset-viewing.store';
import { showDeleteModal } from '$lib/stores/preferences.store';
import { searchStore } from '$lib/stores/search.svelte';
import { handlePromiseError } from '$lib/utils';
import { deleteAssets, updateStackedAssetInTimeline } from '$lib/utils/actions';
- import { archiveAssets, cancelMultiselect, selectAllAssets, stackAssets } from '$lib/utils/asset-utils';
+ import { archiveAssets, selectAllAssets, stackAssets } from '$lib/utils/asset-utils';
import { AssetVisibility } from '@immich/sdk';
import { isModalOpen, modalManager } from '@immich/ui';
type Props = {
timelineManager: TimelineManager;
- assetInteraction: AssetInteraction;
+ assetInteraction: AssetMultiSelectManager;
onEscape?: () => void;
scrollToAsset: (asset: TimelineAsset) => boolean;
};
let { timelineManager = $bindable(), assetInteraction, onEscape, scrollToAsset }: Props = $props();
- const { isViewing: showAssetViewer } = assetViewingStore;
-
const trashOrDelete = async (forceRequested?: boolean) => {
const force = forceRequested || !featureFlagsManager.value.trash;
- const selectedAssets = assetInteraction.selectedAssets;
+ const selectedAssets = assetInteraction.assets;
if ($showDeleteModal && force) {
const confirmed = await modalManager.show(AssetDeleteConfirmModal, { size: selectedAssets.length });
@@ -54,16 +52,16 @@
selectedAssets,
force ? undefined : (assets) => timelineManager.upsertAssets(assets),
);
- assetInteraction.clearMultiselect();
+ assetInteraction.clear();
};
const onDelete = () => {
- const hasTrashedAsset = assetInteraction.selectedAssets.some((asset) => asset.isTrashed);
+ const hasTrashedAsset = assetInteraction.assets.some((asset) => asset.isTrashed);
handlePromiseError(trashOrDelete(hasTrashedAsset));
};
const onStackAssets = async () => {
- const result = await stackAssets(assetInteraction.selectedAssets);
+ const result = await stackAssets(assetInteraction.assets);
updateStackedAssetInTimeline(timelineManager, result);
@@ -72,18 +70,14 @@
const toggleArchive = async () => {
const visibility = assetInteraction.isAllArchived ? AssetVisibility.Timeline : AssetVisibility.Archive;
- const ids = await archiveAssets(assetInteraction.selectedAssets, visibility);
+ const ids = await archiveAssets(assetInteraction.assets, visibility);
timelineManager.update(ids, (asset) => (asset.visibility = visibility));
eventManager.emit('AssetsArchive', ids);
- deselectAllAssets();
+ assetInteraction.clear();
};
let shiftKeyIsDown = $state(false);
- const deselectAllAssets = () => {
- cancelMultiselect(assetInteraction);
- };
-
const onKeyDown = (event: KeyboardEvent) => {
if (searchStore.isSearchEnabled) {
return;
@@ -127,7 +121,7 @@
$effect(() => {
if (isEmpty) {
- assetInteraction.clearMultiselect();
+ assetInteraction.clear();
}
});
@@ -142,7 +136,7 @@
};
const shortcutList = $derived.by(() => {
- if (searchStore.isSearchEnabled || $showAssetViewer || isModalOpen()) {
+ if (searchStore.isSearchEnabled || assetViewerManager.isViewing || isModalOpen()) {
return [];
}
@@ -168,7 +162,7 @@
shortcuts.push(
{ shortcut: { key: 'Delete' }, onShortcut: onDelete },
{ shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) },
- { shortcut: { key: 'D', ctrl: true }, onShortcut: () => deselectAllAssets() },
+ { shortcut: { key: 'D', ctrl: true }, onShortcut: () => assetInteraction.clear() },
{ shortcut: { key: 's' }, onShortcut: () => onStackAssets() },
{ shortcut: { key: 'a', shift: true }, onShortcut: toggleArchive },
);
diff --git a/web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte b/web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte
index f230a01ba5..afab0c6819 100644
--- a/web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte
+++ b/web/src/lib/components/user-settings-page/PinCodeChangeForm.svelte
@@ -1,9 +1,8 @@
-
-
- {#if label}
-
- {/if}
-
- {#each { length: pinLength } as _, index (index)}
- handleInput(event, index)}
- aria-label={`PIN digit ${index + 1} of ${pinLength}${label ? ` for ${label}` : ''}`}
- />
- {/each}
-
-
-{#if $showAssetViewer}
+{#if assetViewerManager.isViewing}
{#await import('$lib/components/asset-viewer/asset-viewer.svelte') then { default: AssetViewer }}
.default} "Keycloak Client general Settings")
+.default} "Keycloak Client Access Settings")
+.default} "Keycloak Client Capability Configuration")
+
+Configuration of OAuth in Immich System Settings
+
+| Setting | Value |
+| ---------------------------- | ----------------------------------------------------- |
+| Issuer URL | `https://.default} "Advanced search filters")
diff --git a/docs/docs/features/supported-formats.md b/docs/docs/features/supported-formats.md
index 4c4ac6039a..86ac264cc3 100644
--- a/docs/docs/features/supported-formats.md
+++ b/docs/docs/features/supported-formats.md
@@ -28,17 +28,17 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
## Video formats
-| Format | Extension(s) | Supported? | Notes |
-| :---------- | :-------------------- | :----------------: | :---- |
-| `3GPP` | `.3gp` `.3gpp` | :white_check_mark: | |
-| `AVI` | `.avi` | :white_check_mark: | |
-| `FLV` | `.flv` | :white_check_mark: | |
-| `M4V` | `.m4v` | :white_check_mark: | |
-| `MATROSKA` | `.mkv` | :white_check_mark: | |
-| `MP2T` | `.mts` `.m2ts` `.m2t` | :white_check_mark: | |
-| `MP4` | `.mp4` `.insv` | :white_check_mark: | |
-| `MPEG` | `.mpg` `.mpe` `.mpeg` | :white_check_mark: | |
-| `MXF` | `.mxf` | :white_check_mark: | |
-| `QUICKTIME` | `.mov` | :white_check_mark: | |
-| `WEBM` | `.webm` | :white_check_mark: | |
-| `WMV` | `.wmv` | :white_check_mark: | |
+| Format | Extension(s) | Supported? | Notes |
+| :---------- | :-------------------------- | :----------------: | :---- |
+| `3GPP` | `.3gp` `.3gpp` | :white_check_mark: | |
+| `AVI` | `.avi` | :white_check_mark: | |
+| `FLV` | `.flv` | :white_check_mark: | |
+| `M4V` | `.m4v` | :white_check_mark: | |
+| `MATROSKA` | `.mkv` | :white_check_mark: | |
+| `MP2T` | `.mts` `.m2ts` `.m2t` `.ts` | :white_check_mark: | |
+| `MP4` | `.mp4` `.insv` | :white_check_mark: | |
+| `MPEG` | `.mpg` `.mpe` `.mpeg` | :white_check_mark: | |
+| `MXF` | `.mxf` | :white_check_mark: | |
+| `QUICKTIME` | `.mov` | :white_check_mark: | |
+| `WEBM` | `.webm` | :white_check_mark: | |
+| `WMV` | `.wmv` | :white_check_mark: | |
diff --git a/docs/docs/guides/custom-map-styles.md b/docs/docs/guides/custom-map-styles.md
index 1a61afc324..ac693c16ba 100644
--- a/docs/docs/guides/custom-map-styles.md
+++ b/docs/docs/guides/custom-map-styles.md
@@ -3,8 +3,8 @@
You may decide that you'd like to modify the style document which is used to
draw the maps in Immich. In addition to visual customization, this also allows
you to pick your own map tile provider instead of the default one. The default
-`style.json` for [light theme](https://github.com/immich-app/immich/tree/main/server/resources/style-light.json)
-and [dark theme](https://github.com/immich-app/immich/blob/main/server/resources/style-dark.json)
+`style.json` for [light theme](https://tiles.immich.cloud/v1/style/light.json)
+and [dark theme](https://tiles.immich.cloud/v1/style/dark.json)
can be used as a basis for creating your own style.
There are several sources for already-made `style.json` map themes, as well as
diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md
index e9e3bb032c..41068dee97 100644
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -29,22 +29,23 @@ These environment variables are used by the `docker-compose.yml` file and do **N
## General
-| Variable | Description | Default | Containers | Workers |
-| :---------------------------------- | :---------------------------------------------------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
-| `TZ` | Timezone | \*1 | server | microservices |
-| `IMMICH_ENV` | Environment (production, development) | `production` | server, machine learning | api, microservices |
-| `IMMICH_LOG_LEVEL` | Log level (verbose, debug, log, warn, error) | `log` | server, machine learning | api, microservices |
-| `IMMICH_LOG_FORMAT` | Log output format (`console`, `json`) | `console` | server | api, microservices |
-| `IMMICH_MEDIA_LOCATION` | Media location inside the container â ī¸**You probably shouldn't set this**\*2â ī¸ | `/data` | server | api, microservices |
-| `IMMICH_CONFIG_FILE` | Path to config file | | server | api, microservices |
-| `NO_COLOR` | Set to `true` to disable color-coded log output | `false` | server, machine learning | |
-| `CPU_CORES` | Number of cores available to the Immich server | auto-detected CPU core count | server | |
-| `IMMICH_API_METRICS_PORT` | Port for the OTEL metrics | `8081` | server | api |
-| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics | `8082` | server | microservices |
-| `IMMICH_PROCESS_INVALID_IMAGES` | When `true`, generate thumbnails for invalid images | | server | microservices |
-| `IMMICH_TRUSTED_PROXIES` | List of comma-separated IPs set as trusted proxies | | server | api |
-| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS` | See [System Integrity](/administration/system-integrity) | | server | api, microservices |
-| `IMMICH_ALLOW_SETUP` | When `false` disables the `/auth/admin-sign-up` endpoint | `true` | server | api |
+| Variable | Description | Default | Containers | Workers |
+| :---------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------: | :----------------------- | :----------------- |
+| `TZ` | Timezone | \*1 | server | microservices |
+| `IMMICH_ENV` | Environment (production, development) | `production` | server, machine learning | api, microservices |
+| `IMMICH_LOG_LEVEL` | Log level (verbose, debug, log, warn, error) | `log` | server, machine learning | api, microservices |
+| `IMMICH_LOG_FORMAT` | Log output format (`console`, `json`) | `console` | server | api, microservices |
+| `IMMICH_MEDIA_LOCATION` | Media location inside the container â ī¸**You probably shouldn't set this**\*2â ī¸ | `/data` | server | api, microservices |
+| `IMMICH_CONFIG_FILE` | Path to config file | | server | api, microservices |
+| `IMMICH_HELMET_FILE` | Path to a json file with [helmet](https://www.npmjs.com/package/helmet) options. Set to `false` to disable. Set to `true` to use `server/helmet.json`. | `false` | server | api, microservices |
+| `NO_COLOR` | Set to `true` to disable color-coded log output | `false` | server, machine learning | |
+| `CPU_CORES` | Number of cores available to the Immich server | auto-detected CPU core count | server | |
+| `IMMICH_API_METRICS_PORT` | Port for the OTEL metrics | `8081` | server | api |
+| `IMMICH_MICROSERVICES_METRICS_PORT` | Port for the OTEL metrics | `8082` | server | microservices |
+| `IMMICH_PROCESS_INVALID_IMAGES` | When `true`, generate thumbnails for invalid images | | server | microservices |
+| `IMMICH_TRUSTED_PROXIES` | List of comma-separated IPs set as trusted proxies | | server | api |
+| `IMMICH_IGNORE_MOUNT_CHECK_ERRORS` | See [System Integrity](/administration/system-integrity) | | server | api, microservices |
+| `IMMICH_ALLOW_SETUP` | When `false` disables the `/auth/admin-sign-up` endpoint | `true` | server | api |
\*1: `TZ` should be set to a `TZ identifier` from [this list][tz-list]. For example, `TZ="Etc/UTC"`.
`TZ` is used by `exiftool` as a fallback in case the timezone cannot be determined from the image metadata. It is also used for logfile timestamps and cron job execution.
diff --git a/docs/docs/install/requirements.md b/docs/docs/install/requirements.md
index 178cf45388..66f3033a43 100644
--- a/docs/docs/install/requirements.md
+++ b/docs/docs/install/requirements.md
@@ -49,7 +49,7 @@ Immich requires [**Docker**](https://docs.docker.com/get-started/get-docker/) wi
The Compose plugin will be installed by both Docker Engine and Desktop by following the linked installation guides; it can also be [separately installed](https://docs.docker.com/compose/install/).
:::note
-Immich requires the command `docker compose`; the similarly named `docker-compose` is [deprecated](https://docs.docker.com/compose/migrate/) and is no longer supported by Immich.
+Immich requires the command `docker compose`; the similarly named `docker-compose` is [deprecated](https://docs.docker.com/retired/#docker-compose-v1-replaced-by-compose-v2) and is no longer supported by Immich.
:::
### Special requirements for Windows users
diff --git a/docs/package.json b/docs/package.json
index 60a6dccf87..f976791279 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -30,17 +30,17 @@
"postcss": "^8.4.25",
"prism-react-renderer": "^2.3.1",
"raw-loader": "^4.0.2",
- "react": "^18.0.0",
- "react-dom": "^18.0.0",
+ "react": "^19.0.0",
+ "react-dom": "^19.0.0",
"tailwindcss": "^3.2.4",
"url": "^0.11.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "~3.9.0",
- "@docusaurus/tsconfig": "^3.7.0",
+ "@docusaurus/tsconfig": "^3.10.0",
"@docusaurus/types": "^3.7.0",
"prettier": "^3.7.4",
- "typescript": "^5.1.6"
+ "typescript": "^6.0.0"
},
"browserslist": {
"production": [
@@ -58,6 +58,6 @@
"node": ">=20"
},
"volta": {
- "node": "24.13.1"
+ "node": "24.14.1"
}
}
diff --git a/docs/static/archived-versions.json b/docs/static/archived-versions.json
index 09cd1b1548..964291ad08 100644
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,7 +1,11 @@
[
{
- "label": "v2.6.2",
- "url": "https://docs.v2.6.2.archive.immich.app"
+ "label": "v2.7.5",
+ "url": "https://docs.v2.7.5.archive.immich.app"
+ },
+ {
+ "label": "v2.6.3",
+ "url": "https://docs.v2.6.3.archive.immich.app"
},
{
"label": "v2.5.6",
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
index 674c46e46d..a6ba1bd9dd 100644
--- a/docs/tsconfig.json
+++ b/docs/tsconfig.json
@@ -1,8 +1,4 @@
{
// This file is not used in compilation. It is here just for a nice editor experience.
- "extends": "@docusaurus/tsconfig",
-
- "compilerOptions": {
- "baseUrl": "."
- }
+ "extends": "@docusaurus/tsconfig"
}
diff --git a/e2e/.nvmrc b/e2e/.nvmrc
index 32f8c50de0..8e35034890 100644
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-24.13.1
+24.14.1
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 957de4698e..c8a3b975d4 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -44,7 +44,7 @@ services:
redis:
container_name: immich-e2e-redis
- image: docker.io/valkey/valkey:9@sha256:3eeb09785cd61ec8e3be35f8804c8892080f3ca21934d628abc24ee4ed1698f6
+ image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
healthcheck:
test: redis-cli ping || exit 1
diff --git a/e2e/package.json b/e2e/package.json
index 58304f3433..24b9d849ee 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
{
"name": "immich-e2e",
- "version": "2.6.2",
+ "version": "2.7.5",
"description": "",
"main": "index.js",
"type": "module",
@@ -32,15 +32,15 @@
"@playwright/test": "^1.44.1",
"@socket.io/component-emitter": "^3.1.2",
"@types/luxon": "^3.4.2",
- "@types/node": "^24.11.0",
+ "@types/node": "^24.12.0",
"@types/pg": "^8.15.1",
"@types/pngjs": "^6.0.4",
- "@types/supertest": "^6.0.2",
+ "@types/supertest": "^7.0.0",
"dotenv": "^17.2.3",
"eslint": "^10.0.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.1.3",
- "eslint-plugin-unicorn": "^63.0.0",
+ "eslint-plugin-unicorn": "^64.0.0",
"exiftool-vendored": "^35.0.0",
"globals": "^17.0.0",
"luxon": "^3.4.4",
@@ -51,13 +51,13 @@
"sharp": "^0.34.5",
"socket.io-client": "^4.7.4",
"supertest": "^7.0.0",
- "typescript": "^5.3.3",
+ "typescript": "^6.0.0",
"typescript-eslint": "^8.28.0",
"utimes": "^5.2.1",
"vite-tsconfig-paths": "^6.1.1",
"vitest": "^4.0.0"
},
"volta": {
- "node": "24.13.1"
+ "node": "24.14.1"
}
}
diff --git a/e2e/src/api/specs/duplicate.e2e-spec.ts b/e2e/src/api/specs/duplicate.e2e-spec.ts
new file mode 100644
index 0000000000..d6d0ec1394
--- /dev/null
+++ b/e2e/src/api/specs/duplicate.e2e-spec.ts
@@ -0,0 +1,651 @@
+import { LoginResponseDto } from '@immich/sdk';
+import { createUserDto, uuidDto } from 'src/fixtures';
+import { errorDto } from 'src/responses';
+import { app, utils } from 'src/utils';
+import request from 'supertest';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
+
+describe('/duplicates', () => {
+ let admin: LoginResponseDto;
+ let user1: LoginResponseDto;
+ let user2: LoginResponseDto;
+
+ beforeAll(async () => {
+ await utils.resetDatabase();
+
+ admin = await utils.adminSetup();
+
+ [user1, user2] = await Promise.all([
+ utils.userSetup(admin.accessToken, createUserDto.user1),
+ utils.userSetup(admin.accessToken, createUserDto.user2),
+ ]);
+ });
+
+ beforeEach(async () => {
+ // Reset assets, albums, tags, and stacks between tests to ensure clean state for repeated test runs
+ // Note: We don't reset users since they're set up once in beforeAll
+ // Stack must be reset before asset due to foreign key constraint
+ await utils.resetDatabase(['stack', 'asset', 'album', 'tag']);
+ });
+
+ describe('GET /duplicates', () => {
+ it('should return empty array when no duplicates', async () => {
+ const { status, body } = await request(app)
+ .get('/duplicates')
+ .set('Authorization', `Bearer ${user1.accessToken}`);
+
+ expect(status).toBe(200);
+ expect(body).toEqual([]);
+ });
+
+ it('should return duplicate groups with suggestedKeepAssetIds', async () => {
+ // Create assets with different file sizes for duplicate detection
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Manually set duplicateId on both assets to create a duplicate group
+ const duplicateId = '00000000-0000-4000-8000-000000000001';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .get('/duplicates')
+ .set('Authorization', `Bearer ${user1.accessToken}`);
+
+ expect(status).toBe(200);
+ expect(body).toEqual([
+ {
+ duplicateId,
+ assets: expect.arrayContaining([
+ expect.objectContaining({ id: asset1.id }),
+ expect.objectContaining({ id: asset2.id }),
+ ]),
+ suggestedKeepAssetIds: expect.any(Array),
+ },
+ ]);
+ expect(body[0].suggestedKeepAssetIds.length).toBe(1);
+ });
+ });
+
+ describe('POST /duplicates/resolve', () => {
+ it('should require authentication', async () => {
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .send({
+ groups: [{ duplicateId: uuidDto.dummy, keepAssetIds: [], trashAssetIds: [] }],
+ });
+
+ expect(status).toBe(401);
+ expect(body).toEqual(errorDto.unauthorized);
+ });
+
+ it('should return failure for non-existent duplicate group', async () => {
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId: uuidDto.dummy, keepAssetIds: [], trashAssetIds: [] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body).toEqual({
+ status: 'COMPLETED',
+ results: [
+ {
+ duplicateId: uuidDto.dummy,
+ status: 'FAILED',
+ reason: expect.stringContaining('not found or access denied'),
+ },
+ ],
+ });
+ });
+
+ it('should resolve duplicate group with keepers', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000002';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body).toEqual({
+ status: 'COMPLETED',
+ results: [
+ {
+ duplicateId,
+ status: 'SUCCESS',
+ },
+ ],
+ });
+
+ // Verify side effects: duplicateId cleared on kept asset
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.duplicateId).toBeNull();
+
+ // Verify side effects: trashed asset is trashed and duplicateId cleared
+ const trashedAsset = await utils.getAssetInfo(user1.accessToken, asset2.id);
+ expect(trashedAsset.isTrashed).toBe(true);
+ expect(trashedAsset.duplicateId).toBeNull();
+ });
+
+ it('should reject when keepAssetIds and trashAssetIds overlap', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000003';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset1.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('FAILED');
+ expect(body.results[0].reason).toContain('disjoint');
+ });
+
+ it('should require keepAssetIds when partially trashing', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000004';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [], trashAssetIds: [asset1.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('FAILED');
+ expect(body.results[0].reason).toContain('must cover all assets');
+ });
+
+ it('should reject partial resolution (not all assets covered)', async () => {
+ const [asset1, asset2, asset3] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000010';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset3.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('FAILED');
+ expect(body.results[0].reason).toContain('must cover all assets');
+ });
+
+ it('should reject asset not in duplicate group', async () => {
+ const [asset1, asset2, outsideAsset] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000011';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [outsideAsset.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('FAILED');
+ expect(body.results[0].reason).toContain('not a member of duplicate group');
+ });
+
+ it('should allow trash-all without keepers', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000012';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [], trashAssetIds: [asset1.id, asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body).toEqual({
+ status: 'COMPLETED',
+ results: [
+ {
+ duplicateId,
+ status: 'SUCCESS',
+ },
+ ],
+ });
+
+ // Verify both assets are trashed
+ const [asset1Info, asset2Info] = await Promise.all([
+ utils.getAssetInfo(user1.accessToken, asset1.id),
+ utils.getAssetInfo(user1.accessToken, asset2.id),
+ ]);
+
+ expect(asset1Info.isTrashed).toBe(true);
+ expect(asset1Info.duplicateId).toBeNull();
+ expect(asset2Info.isTrashed).toBe(true);
+ expect(asset2Info.duplicateId).toBeNull();
+ });
+
+ it('should reject cross-user duplicate group access', async () => {
+ const asset1 = await utils.createAsset(user1.accessToken);
+ const asset2 = await utils.createAsset(user2.accessToken);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000013';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user2.accessToken, asset2.id, duplicateId);
+
+ // User1 tries to resolve a group containing user2's asset
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('FAILED');
+ expect(body.results[0].reason).toContain('not a member of duplicate group');
+ });
+
+ it('should synchronize favorites when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Mark one asset as favorite
+ await request(app)
+ .put('/assets')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({ ids: [asset2.id], isFavorite: true });
+
+ const duplicateId = '00000000-0000-4000-8000-000000000020';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify favorite was synchronized to keeper
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.isFavorite).toBe(true);
+ expect(keptAsset.duplicateId).toBeNull();
+ });
+
+ it('should synchronize visibility when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Archive one asset
+ await utils.archiveAssets(user1.accessToken, [asset2.id]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000021';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify visibility was synchronized to keeper
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.visibility).toBe('archive');
+ expect(keptAsset.duplicateId).toBeNull();
+ });
+
+ it('should synchronize rating when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Set rating on one asset
+ await request(app)
+ .put('/assets')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({ ids: [asset2.id], rating: 5 });
+
+ const duplicateId = '00000000-0000-4000-8000-000000000022';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify rating was synchronized to keeper
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.exifInfo?.rating).toBe(5);
+ expect(keptAsset.duplicateId).toBeNull();
+ });
+
+ it('should synchronize description when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Set description on one asset
+ await request(app)
+ .put('/assets')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({ ids: [asset2.id], description: 'Test description for duplicate' });
+
+ const duplicateId = '00000000-0000-4000-8000-000000000023';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify description was synchronized to keeper
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.exifInfo?.description).toBe('Test description for duplicate');
+ expect(keptAsset.duplicateId).toBeNull();
+ });
+
+ it('should synchronize location when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Set location on one asset
+ await request(app)
+ .put('/assets')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({ ids: [asset2.id], latitude: 40.7128, longitude: -74.006 });
+
+ const duplicateId = '00000000-0000-4000-8000-000000000024';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify location was synchronized to keeper
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.exifInfo?.latitude).toBe(40.7128);
+ expect(keptAsset.exifInfo?.longitude).toBe(-74.006);
+ expect(keptAsset.duplicateId).toBeNull();
+ });
+
+ it('should synchronize albums when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Create albums and add assets to different albums
+ const album1 = await utils.createAlbum(user1.accessToken, {
+ albumName: 'Album 1',
+ assetIds: [asset1.id],
+ });
+ const album2 = await utils.createAlbum(user1.accessToken, {
+ albumName: 'Album 2',
+ assetIds: [asset2.id],
+ });
+
+ const duplicateId = '00000000-0000-4000-8000-000000000025';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify keeper is now in both albums
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.duplicateId).toBeNull();
+
+ // Check albums directly
+ const { status: album1Status, body: album1Body } = await request(app)
+ .get(`/albums/${album1.id}`)
+ .set('Authorization', `Bearer ${user1.accessToken}`);
+ const { status: album2Status, body: album2Body } = await request(app)
+ .get(`/albums/${album2.id}`)
+ .set('Authorization', `Bearer ${user1.accessToken}`);
+
+ expect(album1Status).toBe(200);
+ expect(album2Status).toBe(200);
+ expect(album1Body.assets.map((a: any) => a.id)).toContain(asset1.id);
+ expect(album2Body.assets.map((a: any) => a.id)).toContain(asset1.id);
+ });
+
+ it('should synchronize tags when enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ // Wait for metadata extraction to complete before adding tags
+ // Otherwise, metadata jobs will race and overwrite our tags
+ await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+ // Create tags and tag assets differently
+ const tags = await utils.upsertTags(user1.accessToken, ['tag1', 'tag2']);
+ await utils.tagAssets(user1.accessToken, tags[0].id, [asset1.id]);
+ await utils.tagAssets(user1.accessToken, tags[1].id, [asset2.id]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000026';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify keeper has both tags
+ const keptAsset = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(keptAsset.duplicateId).toBeNull();
+ expect(keptAsset.tags).toBeDefined();
+ const tagIds = keptAsset.tags?.map((t) => t.id) || [];
+ expect(tagIds).toContain(tags[0].id);
+ expect(tagIds).toContain(tags[1].id);
+ });
+
+ it('should handle batch resolve with mixed success and failure', async () => {
+ // Create first group that will succeed
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+ const duplicateId1 = '00000000-0000-4000-8000-000000000027';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId1);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId1);
+
+ // Create second group with non-existent duplicate ID (will fail)
+ const fakeId = '00000000-0000-4000-8000-000000000099';
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [
+ { duplicateId: duplicateId1, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] },
+ { duplicateId: fakeId, keepAssetIds: [], trashAssetIds: [] },
+ ],
+ });
+
+ expect(status).toBe(200);
+ expect(body.status).toBe('COMPLETED');
+ expect(body.results).toHaveLength(2);
+
+ // First group should succeed
+ expect(body.results[0].duplicateId).toBe(duplicateId1);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Second group should fail
+ expect(body.results[1].duplicateId).toBe(fakeId);
+ expect(body.results[1].status).toBe('FAILED');
+ expect(body.results[1].reason).toContain('not found or access denied');
+
+ // Verify first group was actually resolved despite second failure
+ const asset1Info = await utils.getAssetInfo(user1.accessToken, asset1.id);
+ expect(asset1Info.duplicateId).toBeNull();
+ const asset2Info = await utils.getAssetInfo(user1.accessToken, asset2.id);
+ expect(asset2Info.isTrashed).toBe(true);
+ });
+
+ it('should trash assets when trash is enabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000028';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ // Ensure trash is enabled (default)
+ const config = await utils.getSystemConfig(admin.accessToken);
+ expect(config.trash.enabled).toBe(true);
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Verify asset is trashed (not deleted)
+ const trashedAsset = await utils.getAssetInfo(user1.accessToken, asset2.id);
+ expect(trashedAsset.isTrashed).toBe(true);
+ });
+
+ it('should delete assets when trash is disabled', async () => {
+ const [asset1, asset2] = await Promise.all([
+ utils.createAsset(user1.accessToken),
+ utils.createAsset(user1.accessToken),
+ ]);
+
+ const duplicateId = '00000000-0000-4000-8000-000000000029';
+ await utils.setAssetDuplicateId(user1.accessToken, asset1.id, duplicateId);
+ await utils.setAssetDuplicateId(user1.accessToken, asset2.id, duplicateId);
+
+ // Disable trash
+ await request(app)
+ .put('/system-config')
+ .set('Authorization', `Bearer ${admin.accessToken}`)
+ .send({
+ trash: { enabled: false, days: 30 },
+ });
+
+ const { status, body } = await request(app)
+ .post('/duplicates/resolve')
+ .set('Authorization', `Bearer ${user1.accessToken}`)
+ .send({
+ groups: [{ duplicateId, keepAssetIds: [asset1.id], trashAssetIds: [asset2.id] }],
+ });
+
+ expect(status).toBe(200);
+ expect(body.results[0].status).toBe('SUCCESS');
+
+ // Asset should be marked as deleted (force delete)
+ const { status: getStatus } = await request(app)
+ .get(`/assets/${asset2.id}`)
+ .set('Authorization', `Bearer ${user1.accessToken}`);
+
+ // Asset should still be accessible (soft deleted) but marked as deleted
+ expect(getStatus).toBe(200);
+
+ // Re-enable trash for other tests
+ await utils.resetAdminConfig(admin.accessToken);
+ });
+ });
+});
diff --git a/e2e/src/fixtures.ts b/e2e/src/fixtures.ts
index 9e311c896d..1e03ad6d24 100644
--- a/e2e/src/fixtures.ts
+++ b/e2e/src/fixtures.ts
@@ -2,6 +2,8 @@ export const uuidDto = {
invalid: 'invalid-uuid',
// valid uuid v4
notFound: '00000000-0000-4000-a000-000000000000',
+ dummy: '00000000-0000-4000-a000-000000000001',
+ dummy2: '00000000-0000-4000-a000-000000000002',
};
const adminLoginDto = {
diff --git a/e2e/src/specs/maintenance/server/database-backups.e2e-spec.ts b/e2e/src/specs/maintenance/server/database-backups.e2e-spec.ts
index 2b0f6ae61a..b69bd099ed 100644
--- a/e2e/src/specs/maintenance/server/database-backups.e2e-spec.ts
+++ b/e2e/src/specs/maintenance/server/database-backups.e2e-spec.ts
@@ -10,7 +10,9 @@ describe('/admin/database-backups', () => {
beforeAll(async () => {
await utils.resetDatabase();
- admin = await utils.adminSetup();
+ admin = await utils.adminSetup({
+ onboarding: false,
+ });
await utils.resetBackups(admin.accessToken);
});
@@ -94,7 +96,9 @@ describe('/admin/database-backups', () => {
({ status, body }) => status === 200 && !body.maintenanceMode,
);
- admin = await utils.adminSetup();
+ admin = await utils.adminSetup({
+ onboarding: false,
+ });
});
it.sequential('should not work when the server is configured', async () => {
diff --git a/e2e/src/specs/web/album.e2e-spec.ts b/e2e/src/specs/web/album.e2e-spec.ts
index 953c7d00ae..cd8bb87582 100644
--- a/e2e/src/specs/web/album.e2e-spec.ts
+++ b/e2e/src/specs/web/album.e2e-spec.ts
@@ -1,6 +1,7 @@
import { LoginResponseDto } from '@immich/sdk';
-import { test } from '@playwright/test';
-import { utils } from 'src/utils';
+import { expect, test } from '@playwright/test';
+import { readFileSync } from 'node:fs';
+import { testAssetDir, utils } from 'src/utils';
test.describe('Album', () => {
let admin: LoginResponseDto;
@@ -22,4 +23,41 @@ test.describe('Album', () => {
await page.reload();
await page.getByRole('button', { name: 'Select photos' }).waitFor();
});
+
+ test('should keep map view open after viewing an asset from the map and going back', async ({ context, page }) => {
+ await utils.setAuthCookies(context, admin.accessToken);
+
+ const imagePath = `${testAssetDir}/metadata/gps-position/thompson-springs.jpg`;
+ const mapAsset = await utils.createAsset(admin.accessToken, {
+ assetData: {
+ bytes: readFileSync(imagePath),
+ filename: 'thompson-springs.jpg',
+ },
+ });
+
+ await utils.waitForQueueFinish(admin.accessToken, 'metadataExtraction');
+
+ const mapAlbum = await utils.createAlbum(admin.accessToken, {
+ albumName: 'Map Test Album',
+ assetIds: [mapAsset.id],
+ });
+
+ await page.goto(`/albums/${mapAlbum.id}`);
+ const mapButton = page.getByRole('button', { name: 'Map' });
+ await expect(mapButton).toBeVisible();
+ await mapButton.click();
+
+ const mapModal = page.getByRole('dialog');
+ await expect(mapModal).toBeVisible();
+
+ const mapMarker = mapModal.getByRole('img', { name: /Map marker/i }).first();
+ await expect(mapMarker).toBeVisible();
+ await mapMarker.click();
+
+ await page.waitForSelector('#immich-asset-viewer');
+ await page.getByRole('button', { name: 'Go back' }).click();
+
+ await expect(page.locator('#immich-asset-viewer')).not.toBeVisible();
+ await expect(mapModal).toBeVisible();
+ });
});
diff --git a/e2e/src/ui/mock-network/base-network.ts b/e2e/src/ui/mock-network/base-network.ts
index f23202ca77..7c4aee59e3 100644
--- a/e2e/src/ui/mock-network/base-network.ts
+++ b/e2e/src/ui/mock-network/base-network.ts
@@ -1,5 +1,5 @@
import { BrowserContext } from '@playwright/test';
-import { playwrightHost } from 'playwright.config';
+import { playwrightHost } from 'src/../playwright.config';
export const setupBaseMockApiRoutes = async (context: BrowserContext, adminUserId: string) => {
await context.addCookies([
@@ -173,6 +173,7 @@ export const setupBaseMockApiRoutes = async (context: BrowserContext, adminUserI
'.mpeg',
'.mpg',
'.mts',
+ '.ts',
'.vob',
'.webm',
'.wmv',
diff --git a/e2e/src/ui/mock-network/ocr-network.ts b/e2e/src/ui/mock-network/ocr-network.ts
new file mode 100644
index 0000000000..3b1a2fe62e
--- /dev/null
+++ b/e2e/src/ui/mock-network/ocr-network.ts
@@ -0,0 +1,55 @@
+import { faker } from '@faker-js/faker';
+import type { AssetOcrResponseDto } from '@immich/sdk';
+import { BrowserContext } from '@playwright/test';
+
+export type MockOcrBox = {
+ text: string;
+ x1: number;
+ y1: number;
+ x2: number;
+ y2: number;
+ x3: number;
+ y3: number;
+ x4: number;
+ y4: number;
+};
+
+export const createMockOcrData = (assetId: string, boxes: MockOcrBox[]): AssetOcrResponseDto[] => {
+ return boxes.map((box) => ({
+ id: faker.string.uuid(),
+ assetId,
+ x1: box.x1,
+ y1: box.y1,
+ x2: box.x2,
+ y2: box.y2,
+ x3: box.x3,
+ y3: box.y3,
+ x4: box.x4,
+ y4: box.y4,
+ boxScore: 0.95,
+ textScore: 0.9,
+ text: box.text,
+ }));
+};
+
+export const setupOcrMockApiRoutes = async (
+ context: BrowserContext,
+ ocrDataByAssetId: Map