Skip to content

High performance self-hosted photo and video management solution.

fix: memory page navigation (#31334)

Daniel Dietzlerd2245c7d0758
diff --git a/web/src/lib/managers/memory-manager.svelte.ts b/web/src/lib/managers/memory-manager.svelte.ts
index 99ad839563..40a7794a56 100644
--- a/web/src/lib/managers/memory-manager.svelte.ts
+++ b/web/src/lib/managers/memory-manager.svelte.ts
@@ -321,7 +321,6 @@ class MemoryManager {
}
private clearCache() {
- this.#loading = undefined;
this.#hasNextPage = true;
this.#page = 1;
this.#total = undefined;
@@ -338,6 +337,14 @@ class MemoryManager {
private async load(page: number) {
const items = await searchMemories({ ...this.#filters, page });
+
+ if (this.#queued) {
+ this.#queued = false;
+ this.#loading = this.load(this.#page++);
+ await this.#loading;
+ return;
+ }
+
for (const item of items) {
if (!this.#lookup.has(item.id)) {
this.memories.push(item);
@@ -351,12 +358,6 @@ class MemoryManager {
this.#hasNextPage = this.memories.length < this.#total;
this.#loading = undefined;
-
- if (this.#queued) {
- this.#queued = false;
- this.#loading = this.load(this.#page++);
- await this.#loading;
- }
}
private scheduleHourlyRefresh() {
diff --git a/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte b/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte
index 2ee2023a4f..99d8fd5bf0 100644
--- a/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte
+++ b/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte
@@ -231,7 +231,7 @@
});
$effect(() => {
- if (current || memoryManager.loading !== undefined) {
+ if (current) {
return;
}