Merge b59f0ba5a76bc8c07c3b44ef4e23d820c262c8c3 into b0bcc6c03ecedff0d756a0e54352586672cea761

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

cli/package-lock.json

@@ -3148,10 +3148,11 @@
       }
     },
     "node_modules/mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       }

mobile/lib/pages/common/album_viewer.page.dart

@@ -242,6 +242,7 @@ class AlbumViewerPage extends HookConsumerWidget {
               ),
               onRemoveFromAlbum: onRemoveFromAlbumPressed,
               editEnabled: data.ownerId == userId,
+              stackEnabled: data.ownerId == userId,
             ),
           ),
           AnimatedPositioned(

server/package-lock.json

@@ -10478,9 +10478,9 @@
       "dev": true
     },
     "node_modules/mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true,
       "engines": {
         "node": ">=12.0.0"
@@ -22506,9 +22506,9 @@
       "dev": true
     },
     "mock-fs": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.2.0.tgz",
-      "integrity": "sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-5.3.0.tgz",
+      "integrity": "sha512-IMvz1X+RF7vf+ur7qUenXMR7/FSKSIqS3HqFHXcyNI7G0FbpFO8L5lfsUJhl+bhK1AiulVHWKUSxebWauPA+xQ==",
       "dev": true
     },
     "module-details-from-path": {

server/src/dtos/album.dto.ts

@@ -185,7 +185,7 @@ export const mapAlbum = (entity: AlbumEntity, withAssets: boolean, auth?: AuthDt
     hasSharedLink,
     startDate,
     endDate,
-    assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth })),
+    assets: (withAssets ? assets : []).map((asset) => mapAsset(asset, { auth, withStack: true })),
     assetCount: entity.assets?.length || 0,
     isActivityEnabled: entity.isActivityEnabled,
     order: entity.order,

server/src/repositories/album.repository.ts

@@ -46,6 +46,7 @@ export class AlbumRepository implements IAlbumRepository {
     if (options.withAssets) {
       relations.assets = {
         exifInfo: true,
+        stack: { assets: true },
       };
 
       order.assets = {

web/package-lock.json

@@ -769,9 +769,9 @@
       }
     },
     "node_modules/@faker-js/faker": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.0.2.tgz",
-      "integrity": "sha512-nI/FP30ZGXb+UaR7yXawVTH40NVKXPIx0tA3GKjkKLjorqBoMAeq4iSEacl8mJmpVhOCDa0vYHwYDmOOcFMrYw==",
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.0.3.tgz",
+      "integrity": "sha512-lWrrK4QNlFSU+13PL9jMbMKLJYXDFu3tQfayBsMXX7KL/GiQeqfB1CzHkqD5UHBUtPAuPo6XwGbMFNdVMZObRA==",
       "dev": true,
       "funding": [
         {