From 6b075c21b6d9211e76717a10fe8aedcc251e56d8 Mon Sep 17 00:00:00 2001
From: mgabor <>
Date: Sun, 21 Apr 2024 18:05:35 +0200
Subject: [PATCH] move sorting to backend

---
 server/src/dtos/album.dto.ts                           | 10 ++++++++++
 .../lib/components/album-page/share-info-modal.svelte  | 10 +---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/src/dtos/album.dto.ts b/server/src/dtos/album.dto.ts
index 797118a50e..556f424c9f 100644
--- a/server/src/dtos/album.dto.ts
+++ b/server/src/dtos/album.dto.ts
@@ -136,6 +136,16 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
     }
   }
 
+  albumUsers.sort((a, b) => {
+    if (a.role === AlbumUserRole.VIEWER && b.role === AlbumUserRole.EDITOR) {
+      return 1;
+    }
+    if (a.role === AlbumUserRole.EDITOR && b.role === AlbumUserRole.VIEWER) {
+      return -1;
+    }
+    return a.user.name.localeCompare(b.user.name);
+  });
+
   const assets = entity.assets || [];
 
   const hasSharedLink = entity.sharedLinks?.length > 0;
diff --git a/web/src/lib/components/album-page/share-info-modal.svelte b/web/src/lib/components/album-page/share-info-modal.svelte
index 15b6345b50..ac5596ef30 100644
--- a/web/src/lib/components/album-page/share-info-modal.svelte
+++ b/web/src/lib/components/album-page/share-info-modal.svelte
@@ -99,15 +99,7 @@
           <p class="text-sm">Owner</p>
         </div>
       </div>
-      {#each album.albumUsers.toSorted((a, b) => {
-        if (a.role === AlbumUserRole.Viewer && b.role === AlbumUserRole.Editor) {
-          return 1;
-        }
-        if (a.role === AlbumUserRole.Editor && b.role === AlbumUserRole.Viewer) {
-          return -1;
-        }
-        return a.user.name.localeCompare(b.user.name);
-      }) as { user, role }}
+      {#each album.albumUsers as { user, role }}
         <div
           class="flex w-full place-items-center justify-between gap-4 p-5 rounded-xl transition-colors hover:bg-gray-50 dark:hover:bg-gray-700"
         >