From 39abc8f0a9672e3abaf03d5de2aec7f815d14b48 Mon Sep 17 00:00:00 2001 From: ndom91 Date: Thu, 14 Nov 2024 23:15:22 +0100 Subject: [PATCH] fix: loops --- .../web/src/routes/(dashboard)/+layout.svelte | 31 ++++++++++--------- .../routes/(dashboard)/bookmarks/+page.svelte | 14 ++++----- .../src/routes/(dashboard)/feeds/+page.svelte | 14 ++++----- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/apps/web/src/routes/(dashboard)/+layout.svelte b/apps/web/src/routes/(dashboard)/+layout.svelte index fc7b124..3e3f79b 100644 --- a/apps/web/src/routes/(dashboard)/+layout.svelte +++ b/apps/web/src/routes/(dashboard)/+layout.svelte @@ -24,24 +24,25 @@ const feedsService = new FeedsService($page.data.feeds.data) const feedEntriesService = new FeedEntriesService($page.data.feedEntries.data) const bookmarksService = new BookmarksService($page.data.bookmarks.data) + setContext(FeedsService, feedsService) setContext(FeedEntriesService, feedEntriesService) setContext(BookmarksService, bookmarksService) - $effect(() => { - // Deal with invalidated and re-run 'Load' functions - if ($page.data.bookmarks.data.length) { - // Add newly created to state - if (!bookmarksService.find($page.data.bookmarks.data[0])) { - bookmarksService.add($page.data.bookmarks.data[0]) - } - - // Update any potentially changed bookmarks - $page.data.bookmarks.data.forEach((bk: LoadBookmarkFlatTags) => { - bookmarksService.update(bk) - }) - } - }) + // $effect(() => { + // // Deal with invalidated and re-run 'Load' functions + // if ($page.data.bookmarks.data.length) { + // // Add newly created to state + // if (!bookmarksService.find($page.data.bookmarks.data[0])) { + // bookmarksService.add($page.data.bookmarks.data[0]) + // } + // + // // Update any potentially changed bookmarks + // $page.data.bookmarks.data.forEach((bk: LoadBookmarkFlatTags) => { + // bookmarksService.update(bk) + // }) + // } + // }) const ui = useInterface() @@ -65,7 +66,7 @@ onMount(() => { if (browser && "serviceWorker" in navigator) { - navigator.serviceWorker.register("/service-worker.js", { + void navigator.serviceWorker.register("/service-worker.js", { type: dev ? "module" : "classic", }) } diff --git a/apps/web/src/routes/(dashboard)/bookmarks/+page.svelte b/apps/web/src/routes/(dashboard)/bookmarks/+page.svelte index 2ad34b6..915f773 100644 --- a/apps/web/src/routes/(dashboard)/bookmarks/+page.svelte +++ b/apps/web/src/routes/(dashboard)/bookmarks/+page.svelte @@ -32,13 +32,13 @@ const limitLoadCount = 20 const logger = new Logger({ level: loggerLevels.DEBUG }) - $effect(() => { - if ($page.data.bookmarks.data.length) { - $page.data.bookmarks.data.forEach((bk: LoadBookmarkFlatTags) => { - bookmarkService.update(bk) - }) - } - }) + // $effect(() => { + // if ($page.data.bookmarks.data.length) { + // $page.data.bookmarks.data.forEach((bk: LoadBookmarkFlatTags) => { + // bookmarkService.update(bk) + // }) + // } + // }) if ($page.data.error) { logger.error(String($page.data.error)) diff --git a/apps/web/src/routes/(dashboard)/feeds/+page.svelte b/apps/web/src/routes/(dashboard)/feeds/+page.svelte index bdc4509..66a9f7b 100644 --- a/apps/web/src/routes/(dashboard)/feeds/+page.svelte +++ b/apps/web/src/routes/(dashboard)/feeds/+page.svelte @@ -35,13 +35,13 @@ const limitLoadCount = 20 // Reset feed items on load invalidation - $effect(() => { - if ($page.data.feedEntries.data.length) { - $page.data.feedEntries.data.forEach((feedEntry: LoadFeedEntry) => { - feedEntriesService.update(feedEntry) - }) - } - }) + // $effect(() => { + // if ($page.data.feedEntries.data.length) { + // $page.data.feedEntries.data.forEach((feedEntry: LoadFeedEntry) => { + // feedEntriesService.update(feedEntry) + // }) + // } + // }) registerTtsWorker() registerSummarizationWorker()