From 886d920fcfb78ac56e0cd4633444b4a3c2af49b0 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 5 Mar 2022 12:21:05 +0100
Subject: [PATCH 1/2] fix in cache loader

---
 packages/web/src/utility/metadataLoaders.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/utility/metadataLoaders.ts b/packages/web/src/utility/metadataLoaders.ts
index 016974dde..4f6aa1bdf 100644
--- a/packages/web/src/utility/metadataLoaders.ts
+++ b/packages/web/src/utility/metadataLoaders.ts
@@ -178,12 +178,15 @@ async function getCore(loader, args) {
 function useCore(loader, args) {
   const { url, params, reloadTrigger, transform, onLoaded } = loader(args);
   const cacheKey = stableStringify({ url, ...params });
+  let closed = false;
 
   return {
     subscribe: onChange => {
       async function handleReload() {
         const res = await getCore(loader, args);
-        onChange(res);
+        if (!closed) {
+          onChange(res);
+        }
       }
 
       handleReload();
@@ -191,6 +194,7 @@ function useCore(loader, args) {
       if (reloadTrigger) {
         subscribeCacheChange(reloadTrigger, cacheKey, handleReload);
         return () => {
+          closed = true;
           unsubscribeCacheChange(reloadTrigger, cacheKey, handleReload);
         };
       }

From 17d90c73cc8de02d473a50be69b6249836f52d2a Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sat, 5 Mar 2022 12:28:42 +0100
Subject: [PATCH 2/2] changed order of widgets in files widget

---
 packages/web/src/widgets/FilesWidget.svelte | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/web/src/widgets/FilesWidget.svelte b/packages/web/src/widgets/FilesWidget.svelte
index a232fd1da..7d5b7155d 100644
--- a/packages/web/src/widgets/FilesWidget.svelte
+++ b/packages/web/src/widgets/FilesWidget.svelte
@@ -15,19 +15,18 @@
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
 
   $: favorites = useFavorites();
-
 </script>
 
 <WidgetColumnBar>
+  <WidgetColumnBarItem title="Saved files" name="files" height="70%" storageName="savedFilesWidget">
+    <SavedFilesList />
+  </WidgetColumnBarItem>
+
   {#if hasPermission('files/favorites/read')}
-    <WidgetColumnBarItem title="Favorites" name="favorites" height="20%" storageName="favoritesWidget">
+    <WidgetColumnBarItem title="Favorites" name="favorites" storageName="favoritesWidget">
       <WidgetsInnerContainer>
         <AppObjectList list={$favorites || []} module={favoriteFileAppObject} />
       </WidgetsInnerContainer>
     </WidgetColumnBarItem>
   {/if}
-
-  <WidgetColumnBarItem title="Saved files" name="files" storageName="savedFilesWidget">
-    <SavedFilesList />
-  </WidgetColumnBarItem>
 </WidgetColumnBar>