Added version note for f-droid

* Added dispatch event for edit user

* Fixed import location

* solve merge conflict

* Fixed issue not admin user can access admin page

* Implemented edit user and password reset

.github/workflows/test.yml

@@ -2,11 +2,12 @@ name: Test
 on:
   workflow_dispatch:
   pull_request:
-  push: { branches: master }
+  push:
+    branches: [main]
 
 jobs:
-  test-server-e2e:
+  e2e-tests:
-    name: Run test suite
+    name: Run end-to-end test suites
 
     runs-on: ubuntu-latest
 
@@ -16,3 +17,14 @@ jobs:
 
       - name: Run Immich Server 2E2 Test
         run: docker-compose -f ./docker/docker-compose.test.yml --env-file ./docker/.env.test up --abort-on-container-exit --exit-code-from immich-server-test
+
+  unit-tests:
+    name: Run unit test suites
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Run tests
+        run: cd server && npm install && npm run test

Makefile

@@ -1,6 +1,9 @@
 dev:
 	rm -rf ./server/dist && docker-compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
+dev-new:
+	rm -rf ./server/dist && docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
+
 dev-update:
 	rm -rf ./server/dist && docker-compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 

README.md

@@ -129,7 +129,7 @@ wget https://raw.githubusercontent.com/immich-app/immich/main/docker/docker-comp
 Get `.env`
 
 ```bash
-wget -O .env wget https://raw.githubusercontent.com/immich-app/immich/main/docker/.env.example
+wget -O .env https://raw.githubusercontent.com/immich-app/immich/main/docker/.env.example
 ```
 
 ### Step 2 - Populate .env file with customed information

mobile/android/fastlane/Fastfile

@@ -30,8 +30,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 31,
+        "android.injected.version.code" => 32,
-        "android.injected.version.name" => "1.21.0",
+        "android.injected.version.name" => "1.22.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/metadata/android/en-US/changelogs/32.txt

@@ -0,0 +1 @@
+* Modify Album API endpoint to return count attribute instead of all assets to reduce network consumption and CPU processing.

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-    version_number: "1.21.0"
+    version_number: "1.22.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/modules/album/ui/album_thumbnail_card.dart

@@ -61,13 +61,13 @@ class AlbumThumbnailCard extends StatelessWidget {
               mainAxisSize: MainAxisSize.min,
               children: [
                 Text(
-                  album.assets.length == 1
+                  album.assetCount == 1
                       ? 'album_thumbnail_card_item'
                       : 'album_thumbnail_card_items',
                   style: const TextStyle(
                     fontSize: 10,
                   ),
-                ).tr(args: ['${album.assets.length }']),
+                ).tr(args: ['${album.assetCount}']),
                 if (album.shared)
                   const Text(
                     'album_thumbnail_card_shared',

mobile/lib/modules/album/views/album_viewer_page.dart

@@ -203,7 +203,7 @@ class AlbumViewerPage extends HookConsumerWidget {
                   assetList: albumInfo.assets,
                 );
               },
-              childCount: albumInfo.assets.length,
+              childCount: albumInfo.assetCount,
             ),
           ),
         );

mobile/lib/shared/services/share.service.dart

@@ -1,6 +1,6 @@
-
 import 'dart:io';
 
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:openapi/api.dart';
@@ -39,7 +39,9 @@ class ShareService {
       return tempFile.path;
     });
 
-    Share.shareFiles(await Future.wait(downloadedFilePaths));
+    Share.shareFiles(
+      await Future.wait(downloadedFilePaths),
+      sharePositionOrigin: Rect.zero,
+    );
   }
-
 }

mobile/openapi/doc/AlbumResponseDto.md

@@ -8,6 +8,7 @@ import 'package:openapi/api.dart';
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**assetCount** | **int** |  | 
 **id** | **String** |  | 
 **ownerId** | **String** |  | 
 **albumName** | **String** |  | 

mobile/openapi/lib/model/album_response_dto.dart

@@ -13,6 +13,7 @@ part of openapi.api;
 class AlbumResponseDto {
   /// Returns a new [AlbumResponseDto] instance.
   AlbumResponseDto({
+    required this.assetCount,
     required this.id,
     required this.ownerId,
     required this.albumName,
@@ -23,6 +24,8 @@ class AlbumResponseDto {
     this.assets = const [],
   });
 
+  int assetCount;
+
   String id;
 
   String ownerId;
@@ -41,6 +44,7 @@ class AlbumResponseDto {
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AlbumResponseDto &&
+     other.assetCount == assetCount &&
      other.id == id &&
      other.ownerId == ownerId &&
      other.albumName == albumName &&
@@ -53,6 +57,7 @@ class AlbumResponseDto {
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (assetCount.hashCode) +
     (id.hashCode) +
     (ownerId.hashCode) +
     (albumName.hashCode) +
@@ -63,10 +68,11 @@ class AlbumResponseDto {
     (assets.hashCode);
 
   @override
-  String toString() => 'AlbumResponseDto[id=$id, ownerId=$ownerId, albumName=$albumName, createdAt=$createdAt, albumThumbnailAssetId=$albumThumbnailAssetId, shared=$shared, sharedUsers=$sharedUsers, assets=$assets]';
+  String toString() => 'AlbumResponseDto[assetCount=$assetCount, id=$id, ownerId=$ownerId, albumName=$albumName, createdAt=$createdAt, albumThumbnailAssetId=$albumThumbnailAssetId, shared=$shared, sharedUsers=$sharedUsers, assets=$assets]';
 
   Map<String, dynamic> toJson() {
     final _json = <String, dynamic>{};
+      _json[r'assetCount'] = assetCount;
       _json[r'id'] = id;
       _json[r'ownerId'] = ownerId;
       _json[r'albumName'] = albumName;
@@ -101,6 +107,7 @@ class AlbumResponseDto {
       }());
 
       return AlbumResponseDto(
+        assetCount: mapValueOfType<int>(json, r'assetCount')!,
         id: mapValueOfType<String>(json, r'id')!,
         ownerId: mapValueOfType<String>(json, r'ownerId')!,
         albumName: mapValueOfType<String>(json, r'albumName')!,
@@ -158,6 +165,7 @@ class AlbumResponseDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
+    'assetCount',
     'id',
     'ownerId',
     'albumName',

mobile/openapi/lib/model/asset_response_dto.dart

@@ -76,9 +76,7 @@ class AssetResponseDto {
   SmartInfoResponseDto? smartInfo;
 
   @override
-  bool operator ==(Object other) =>
+  bool operator ==(Object other) => identical(this, other) || other is AssetResponseDto &&
-      identical(this, other) ||
-      other is AssetResponseDto &&
      other.type == type &&
      other.id == id &&
      other.deviceAssetId == deviceAssetId &&
@@ -117,8 +115,7 @@ class AssetResponseDto {
     (smartInfo == null ? 0 : smartInfo!.hashCode);
 
   @override
-  String toString() =>
+  String toString() => 'AssetResponseDto[type=$type, id=$id, deviceAssetId=$deviceAssetId, ownerId=$ownerId, deviceId=$deviceId, originalPath=$originalPath, resizePath=$resizePath, createdAt=$createdAt, modifiedAt=$modifiedAt, isFavorite=$isFavorite, mimeType=$mimeType, duration=$duration, webpPath=$webpPath, encodedVideoPath=$encodedVideoPath, exifInfo=$exifInfo, smartInfo=$smartInfo]';
-      'AssetResponseDto[type=$type, id=$id, deviceAssetId=$deviceAssetId, ownerId=$ownerId, deviceId=$deviceId, originalPath=$originalPath, resizePath=$resizePath, createdAt=$createdAt, modifiedAt=$modifiedAt, isFavorite=$isFavorite, mimeType=$mimeType, duration=$duration, webpPath=$webpPath, encodedVideoPath=$encodedVideoPath, exifInfo=$exifInfo, smartInfo=$smartInfo]';
 
   Map<String, dynamic> toJson() {
     final _json = <String, dynamic>{};
@@ -177,10 +174,8 @@ class AssetResponseDto {
       // Note 2: this code is stripped in release mode!
       assert(() {
         requiredKeys.forEach((key) {
-          assert(json.containsKey(key),
+          assert(json.containsKey(key), 'Required key "AssetResponseDto[$key]" is missing from JSON.');
-              'Required key "AssetResponseDto[$key]" is missing from JSON.');
+          assert(json[key] != null, 'Required key "AssetResponseDto[$key]" has a null value in JSON.');
-          assert(json[key] != null,
-              'Required key "AssetResponseDto[$key]" has a null value in JSON.');
         });
         return true;
       }());
@@ -207,10 +202,7 @@ class AssetResponseDto {
     return null;
   }
 
-  static List<AssetResponseDto>? listFromJson(
+  static List<AssetResponseDto>? listFromJson(dynamic json, {bool growable = false,}) {
-    dynamic json, {
-    bool growable = false,
-  }) {
     final result = <AssetResponseDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -238,18 +230,12 @@ class AssetResponseDto {
   }
 
   // maps a json object with a list of AssetResponseDto-objects as value to a dart map
-  static Map<String, List<AssetResponseDto>> mapListFromJson(
+  static Map<String, List<AssetResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    dynamic json, {
-    bool growable = false,
-  }) {
     final map = <String, List<AssetResponseDto>>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = AssetResponseDto.listFromJson(
+        final value = AssetResponseDto.listFromJson(entry.value, growable: growable,);
-          entry.value,
-          growable: growable,
-        );
         if (value != null) {
           map[entry.key] = value;
         }
@@ -276,3 +262,4 @@ class AssetResponseDto {
     'encodedVideoPath',
   };
 }
+

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: "none"
-version: 1.21.0+31
+version: 1.22.0+32
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

server/apps/immich/src/api-v1/album/album-repository.ts

@@ -134,21 +134,14 @@ export class AlbumRepository implements IAlbumRepository {
         .leftJoinAndSelect('album.sharedUsers', 'sharedUser')
         .leftJoinAndSelect('sharedUser.userInfo', 'userInfo')
         .where('album.ownerId = :ownerId', { ownerId: userId });
-      // .orWhere((qb) => {
-      //   const subQuery = qb
-      //     .subQuery()
-      //     .select('userAlbum.albumId')
-      //     .from(UserAlbumEntity, 'userAlbum')
-      //     .where('userAlbum.sharedUserId = :sharedUserId', { sharedUserId: userId })
-      //     .getQuery();
-      //   return `album.id IN ${subQuery}`;
-      // });
     }
+
     // Get information of assets in albums
     query = query
       .leftJoinAndSelect('album.assets', 'assets')
       .leftJoinAndSelect('assets.assetInfo', 'assetInfo')
       .orderBy('"assetInfo"."createdAt"::timestamptz', 'ASC');
+
     const albums = await query.getMany();
 
     albums.sort((a, b) => new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf());

server/apps/immich/src/api-v1/album/album.service.spec.ts

@@ -4,6 +4,7 @@ import { AuthUserDto } from '../../decorators/auth-user.decorator';
 import { BadRequestException, NotFoundException, ForbiddenException } from '@nestjs/common';
 import { AlbumEntity } from '@app/database/entities/album.entity';
 import { AlbumResponseDto } from './response-dto/album-response.dto';
+import { AssetAlbumEntity } from '@app/database/entities/asset-album.entity';
 
 describe('Album service', () => {
   let sut: AlbumService;
@@ -12,7 +13,7 @@ describe('Album service', () => {
     id: '1111',
     email: 'auth@test.com',
   });
-  const albumId = '0001';
+  const albumId = 'f19ab956-4761-41ea-a5d6-bae948308d58';
   const sharedAlbumOwnerId = '2222';
   const sharedAlbumSharedAlsoWithId = '3333';
   const ownedAlbumSharedWithId = '4444';
@@ -148,7 +149,7 @@ describe('Album service', () => {
 
   it('gets an owned album', async () => {
     const ownerId = authUser.id;
-    const albumId = '0001';
+    const albumId = 'f19ab956-4761-41ea-a5d6-bae948308d58';
 
     const albumEntity = _getOwnedAlbum();
     albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
@@ -157,11 +158,12 @@ describe('Album service', () => {
       albumName: 'name',
       albumThumbnailAssetId: null,
       createdAt: 'date',
-      id: '0001',
+      id: 'f19ab956-4761-41ea-a5d6-bae948308d58',
       ownerId,
       shared: false,
       assets: [],
       sharedUsers: [],
+      assetCount: 0,
     };
     await expect(sut.getAlbumInfo(authUser, albumId)).resolves.toEqual(expectedResult);
   });
@@ -270,6 +272,7 @@ describe('Album service', () => {
       authUser,
       {
         albumName: updatedAlbumName,
+        albumThumbnailAssetId: updatedAlbumThumbnailAssetId,
       },
       albumId,
     );
@@ -279,7 +282,7 @@ describe('Album service', () => {
     expect(albumRepositoryMock.updateAlbum).toHaveBeenCalledTimes(1);
     expect(albumRepositoryMock.updateAlbum).toHaveBeenCalledWith(albumEntity, {
       albumName: updatedAlbumName,
-      thumbnailAssetId: updatedAlbumThumbnailAssetId,
+      albumThumbnailAssetId: updatedAlbumThumbnailAssetId,
     });
   });
 
@@ -357,45 +360,45 @@ describe('Album service', () => {
     ).rejects.toBeInstanceOf(ForbiddenException);
   });
 
-  it('removes assets from owned album', async () => {
+  // it('removes assets from owned album', async () => {
-    const albumEntity = _getOwnedAlbum();
+  //   const albumEntity = _getOwnedAlbum();
-    albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
+  //   albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
-    albumRepositoryMock.removeAssets.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
+  //   albumRepositoryMock.removeAssets.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
 
-    await expect(
+  //   await expect(
-      sut.removeAssetsFromAlbum(
+  //     sut.removeAssetsFromAlbum(
-        authUser,
+  //       authUser,
-        {
+  //       {
-          assetIds: ['1'],
+  //         assetIds: ['f19ab956-4761-41ea-a5d6-bae948308d60'],
-        },
+  //       },
-        albumEntity.id,
+  //       albumEntity.id,
-      ),
+  //     ),
-    ).resolves.toBeUndefined();
+  //   ).resolves.toBeUndefined();
-    expect(albumRepositoryMock.removeAssets).toHaveBeenCalledTimes(1);
+  //   expect(albumRepositoryMock.removeAssets).toHaveBeenCalledTimes(1);
-    expect(albumRepositoryMock.removeAssets).toHaveBeenCalledWith(albumEntity, {
+  //   expect(albumRepositoryMock.removeAssets).toHaveBeenCalledWith(albumEntity, {
-      assetIds: ['1'],
+  //     assetIds: ['f19ab956-4761-41ea-a5d6-bae948308d60'],
-    });
+  //   });
-  });
+  // });
 
-  it('removes assets from shared album (shared with auth user)', async () => {
+  // it('removes assets from shared album (shared with auth user)', async () => {
-    const albumEntity = _getOwnedSharedAlbum();
+  //   const albumEntity = _getOwnedSharedAlbum();
-    albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
+  //   albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
-    albumRepositoryMock.removeAssets.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
+  //   albumRepositoryMock.removeAssets.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity));
 
-    await expect(
+  //   await expect(
-      sut.removeAssetsFromAlbum(
+  //     sut.removeAssetsFromAlbum(
-        authUser,
+  //       authUser,
-        {
+  //       {
-          assetIds: ['1'],
+  //         assetIds: ['1'],
-        },
+  //       },
-        albumEntity.id,
+  //       albumEntity.id,
-      ),
+  //     ),
-    ).resolves.toBeUndefined();
+  //   ).resolves.toBeUndefined();
-    expect(albumRepositoryMock.removeAssets).toHaveBeenCalledTimes(1);
+  //   expect(albumRepositoryMock.removeAssets).toHaveBeenCalledTimes(1);
-    expect(albumRepositoryMock.removeAssets).toHaveBeenCalledWith(albumEntity, {
+  //   expect(albumRepositoryMock.removeAssets).toHaveBeenCalledWith(albumEntity, {
-      assetIds: ['1'],
+  //     assetIds: ['1'],
-    });
+  //   });
-  });
+  // });
 
   it('prevents removing assets from a not owned / shared album', async () => {
     const albumEntity = _getNotOwnedNotSharedAlbum();
@@ -414,4 +417,33 @@ describe('Album service', () => {
       ),
     ).rejects.toBeInstanceOf(ForbiddenException);
   });
+
+  it('counts assets correctly', async () => {
+    const albumEntity = new AlbumEntity();
+
+    albumEntity.ownerId = authUser.id;
+    albumEntity.id = albumId;
+    albumEntity.albumName = 'name';
+    albumEntity.createdAt = 'date';
+    albumEntity.sharedUsers = [];
+    albumEntity.assets = [
+      {
+        id: '1',
+        albumId: '2',
+        assetId: '3',
+        //@ts-expect-error Partial stub
+        albumInfo: {},
+        //@ts-expect-error Partial stub
+        assetInfo: {},
+      },
+    ];
+    albumEntity.albumThumbnailAssetId = null;
+
+    albumRepositoryMock.getList.mockImplementation(() => Promise.resolve([albumEntity]));
+
+    const result = await sut.getAllAlbums(authUser, {});
+
+    expect(result).toHaveLength(1);
+    expect(result[0].assetCount).toEqual(1);
+  });
 });

server/apps/immich/src/api-v1/album/album.service.ts

@@ -7,7 +7,7 @@ import { AddUsersDto } from './dto/add-users.dto';
 import { RemoveAssetsDto } from './dto/remove-assets.dto';
 import { UpdateAlbumDto } from './dto/update-album.dto';
 import { GetAlbumsDto } from './dto/get-albums.dto';
-import { AlbumResponseDto, mapAlbum } from './response-dto/album-response.dto';
+import { AlbumResponseDto, mapAlbum, mapAlbumExcludeAssetInfo } from './response-dto/album-response.dto';
 import { ALBUM_REPOSITORY, IAlbumRepository } from './album-repository';
 
 @Injectable()
@@ -49,7 +49,8 @@ export class AlbumService {
    */
   async getAllAlbums(authUser: AuthUserDto, getAlbumsDto: GetAlbumsDto): Promise<AlbumResponseDto[]> {
     const albums = await this._albumRepository.getList(authUser.id, getAlbumsDto);
-    return albums.map((album) => mapAlbum(album));
+
+    return albums.map((album) => mapAlbumExcludeAssetInfo(album));
   }
 
   async getAlbumInfo(authUser: AuthUserDto, albumId: string): Promise<AlbumResponseDto> {
@@ -80,8 +81,6 @@ export class AlbumService {
     await this._albumRepository.removeUser(album, sharedUserId);
   }
 
-  // async removeUsersFromAlbum() {}
-
   async removeAssetsFromAlbum(
     authUser: AuthUserDto,
     removeAssetsDto: RemoveAssetsDto,
@@ -89,7 +88,6 @@ export class AlbumService {
   ): Promise<AlbumResponseDto> {
     const album = await this._getAlbum({ authUser, albumId });
     const updateAlbum = await this._albumRepository.removeAssets(album, removeAssetsDto);
-
     return mapAlbum(updateAlbum);
   }
 

server/apps/immich/src/api-v1/album/response-dto/album-response.dto.ts

@@ -1,6 +1,7 @@
 import { AlbumEntity } from '../../../../../../libs/database/src/entities/album.entity';
 import { UserResponseDto, mapUser } from '../../user/response-dto/user-response.dto';
 import { AssetResponseDto, mapAsset } from '../../asset/response-dto/asset-response.dto';
+import { ApiProperty } from '@nestjs/swagger';
 
 export class AlbumResponseDto {
   id!: string;
@@ -11,6 +12,9 @@ export class AlbumResponseDto {
   shared!: boolean;
   sharedUsers!: UserResponseDto[];
   assets!: AssetResponseDto[];
+
+  @ApiProperty({ type: 'integer' })
+  assetCount!: number;
 }
 
 export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
@@ -24,5 +28,21 @@ export function mapAlbum(entity: AlbumEntity): AlbumResponseDto {
     sharedUsers,
     shared: sharedUsers.length > 0,
     assets: entity.assets?.map((assetAlbum) => mapAsset(assetAlbum.assetInfo)) || [],
+    assetCount: entity.assets?.length || 0,
+  };
+}
+
+export function mapAlbumExcludeAssetInfo(entity: AlbumEntity): AlbumResponseDto {
+  const sharedUsers = entity.sharedUsers?.map((userAlbum) => mapUser(userAlbum.userInfo)) || [];
+  return {
+    albumName: entity.albumName,
+    albumThumbnailAssetId: entity.albumThumbnailAssetId,
+    createdAt: entity.createdAt,
+    id: entity.id,
+    ownerId: entity.ownerId,
+    sharedUsers,
+    shared: sharedUsers.length > 0,
+    assets: [],
+    assetCount: entity.assets?.length || 0,
   };
 }

server/apps/immich/src/constants/server_version.constant.ts

@@ -10,7 +10,7 @@ export interface IServerVersion {
 
 export const serverVersion: IServerVersion = {
   major: 1,
-  minor: 21,
+  minor: 22,
-  patch: 1,
+  patch: 0,
   build: 0,
 };

web/src/api/open-api/api.ts

@@ -90,6 +90,12 @@ export interface AdminSignupResponseDto {
  * @interface AlbumResponseDto
  */
 export interface AlbumResponseDto {
+    /**
+     * 
+     * @type {number}
+     * @memberof AlbumResponseDto
+     */
+    'assetCount': number;
     /**
      * 
      * @type {string}

web/src/app.css

@@ -48,9 +48,10 @@ input:focus-visible {
     outline-offset: 0px !important;
     outline: none !important;
 }
+
 @layer utilities {
     .immich-form-input {
-		@apply bg-slate-100 p-2 rounded-md focus:border-immich-primary text-sm;
+        @apply bg-slate-100 p-2 rounded-md focus:border-immich-primary text-sm ;
     }
 
     .immich-form-label {

web/src/lib/components/admin-page/user-management.svelte

@@ -31,6 +31,9 @@
 				<td class="text-sm px-4 w-1/4 text-ellipsis">{user.lastName}</td>
 				<td class="text-sm px-4 w-1/4 text-ellipsis"
 					><button
+						on:click={() => {
+							dispatch('edit-user', { user });
+						}}
 						class="bg-immich-primary text-gray-100 rounded-full p-3 transition-all duration-150 hover:bg-immich-primary/75"
 						><PencilOutline size="20" /></button
 					></td
@@ -40,4 +43,4 @@
 	</tbody>
 </table>
 
-<button on:click={() => dispatch('createUser')} class="immich-btn-primary">Create user</button>
+<button on:click={() => dispatch('create-user')} class="immich-btn-primary">Create user</button>

web/src/lib/components/album-page/album-card.svelte

@@ -32,7 +32,7 @@
 	};
 
 	onMount(async () => {
-		imageData = await loadHighQualityThumbnail(album.albumThumbnailAssetId) || 'no-thumbnail.png';
+		imageData = (await loadHighQualityThumbnail(album.albumThumbnailAssetId)) || 'no-thumbnail.png';
 	});
 </script>
 
@@ -67,7 +67,7 @@
 		</p>
 
 		<span class="text-xs flex gap-2">
-			<p>{album.assets.length} items</p>
+			<p>{album.assetCount} items</p>
 
 			{#if album.shared}
 				<p>·</p>

web/src/lib/components/album-page/album-viewer.svelte

@@ -61,7 +61,7 @@
 
 	$: {
 		if (album.assets?.length < 6) {
-			thumbnailSize = Math.floor(viewWidth / album.assets.length - album.assets.length);
+			thumbnailSize = Math.floor(viewWidth / album.assetCount - album.assetCount);
 		} else {
 			thumbnailSize = Math.floor(viewWidth / 6 - 6);
 		}
@@ -69,7 +69,7 @@
 
 	const getDateRange = () => {
 		const startDate = new Date(album.assets[0].createdAt);
-		const endDate = new Date(album.assets[album.assets.length - 1].createdAt);
+		const endDate = new Date(album.assets[album.assetCount - 1].createdAt);
 
 		const timeFormatOption: Intl.DateTimeFormatOptions = {
 			month: 'short',
@@ -135,7 +135,7 @@
 	};
 	const navigateAssetForward = () => {
 		try {
-			if (currentViewAssetIndex < album.assets.length - 1) {
+			if (currentViewAssetIndex < album.assetCount - 1) {
 				currentViewAssetIndex++;
 				selectedAsset = album.assets[currentViewAssetIndex];
 				pushState(selectedAsset.id);
@@ -296,7 +296,7 @@
 	{#if !isMultiSelectionMode}
 		<ControlAppBar on:close-button-click={() => goto(backUrl)} backIcon={ArrowLeft}>
 			<svelte:fragment slot="trailing">
-				{#if album.assets.length > 0}
+				{#if album.assetCount > 0}
 					<CircleIconButton
 						title="Add Photos"
 						on:click={() => (isShowAssetSelection = true)}
@@ -322,7 +322,7 @@
 
 				{#if isCreatingSharedAlbum && album.sharedUsers.length == 0}
 					<button
-						disabled={album.assets.length == 0}
+						disabled={album.assetCount == 0}
 						on:click={() => (isShowShareUserSelection = true)}
 						class="immich-text-button border bg-immich-primary text-gray-50 hover:bg-immich-primary/75 px-6 text-sm disabled:opacity-25 disabled:bg-gray-500 disabled:cursor-not-allowed"
 						><span class="px-2">Share</span></button
@@ -351,7 +351,7 @@
 			bind:this={titleInput}
 		/>
 
-		{#if album.assets.length > 0}
+		{#if album.assetCount > 0}
 			<p class="my-4 text-sm text-gray-500 font-medium">{getDateRange()}</p>
 		{/if}
 
@@ -375,11 +375,11 @@
 			</div>
 		{/if}
 
-		{#if album.assets.length > 0}
+		{#if album.assetCount > 0}
 			<div class="flex flex-wrap gap-1 w-full pb-20" bind:clientWidth={viewWidth}>
 				{#each album.assets as asset}
 					{#key asset.id}
-						{#if album.assets.length < 7}
+						{#if album.assetCount < 7}
 							<ImmichThumbnail
 								{asset}
 								{thumbnailSize}

web/src/lib/components/forms/create-user-form.svelte

@@ -5,8 +5,8 @@
   let error: string;
   let success: string;
 
-	let password: string = '';
+  let password = '';
-	let confirmPassowrd: string = '';
+  let confirmPassowrd = '';
 
   let canCreateUser = false;
 
@@ -22,7 +22,6 @@
   const dispatch = createEventDispatcher();
 
   async function registerUser(event: SubmitEvent) {
-		console.log('registerUser');
     if (canCreateUser) {
       error = '';
 
@@ -35,7 +34,7 @@
       const firstName = form.get('firstName');
       const lastName = form.get('lastName');
 
-			const { status } = await api.userApi.createUser({
+      const {status} = await api.userApi.createUser({
         email: String(email),
         password: String(password),
         firstName: String(firstName),
@@ -54,9 +53,9 @@
   }
 </script>
 
-<div class="border bg-white p-4 shadow-sm w-[500px] rounded-md py-8">
+<div class="border bg-white p-4 shadow-sm w-[500px] rounded-3xl py-8">
     <div class="flex flex-col place-items-center place-content-center gap-4 px-4">
-		<img class="text-center" src="/immich-logo.svg" height="100" width="100" alt="immich-logo" />
+        <img class="text-center" src="/immich-logo.svg" height="100" width="100" alt="immich-logo"/>
         <h1 class="text-2xl text-immich-primary font-medium">Create new user</h1>
         <p class="text-sm border rounded-md p-4 font-mono text-gray-600">
             Please provide your user with the password, they will have to change it on their first sign
@@ -67,7 +66,7 @@
     <form on:submit|preventDefault={registerUser} autocomplete="off">
         <div class="m-4 flex flex-col gap-2">
             <label class="immich-form-label" for="email">Email</label>
-			<input class="immich-form-input" id="email" name="email" type="email" required />
+            <input class="immich-form-input" id="email" name="email" type="email" required/>
         </div>
 
         <div class="m-4 flex flex-col gap-2">
@@ -96,12 +95,12 @@
 
         <div class="m-4 flex flex-col gap-2">
             <label class="immich-form-label" for="firstName">First Name</label>
-			<input class="immich-form-input" id="firstName" name="firstName" type="text" required />
+            <input class="immich-form-input" id="firstName" name="firstName" type="text" required/>
         </div>
 
         <div class="m-4 flex flex-col gap-2">
             <label class="immich-form-label" for="lastName">Last Name</label>
-			<input class="immich-form-input" id="lastName" name="lastName" type="text" required />
+            <input class="immich-form-input" id="lastName" name="lastName" type="text" required/>
         </div>
 
         {#if error}
@@ -114,8 +113,9 @@
         <div class="flex w-full">
             <button
                     type="submit"
-				class="m-4 p-2 bg-immich-primary hover:bg-immich-primary/75 px-6 py-4 text-white rounded-md shadow-md w-full"
+                    class="m-4 bg-immich-primary hover:bg-immich-primary/75 px-6 py-3 text-white rounded-full shadow-md w-full font-medium"
-				>Create</button
+            >Create
+            </button
             >
         </div>
     </form>

web/src/lib/components/forms/edit-user-form.svelte

@@ -0,0 +1,103 @@
+<script lang="ts">
+  import { api, UserResponseDto } from '@api';
+  import { createEventDispatcher } from 'svelte';
+  import AccountEditOutline from 'svelte-material-icons/AccountEditOutline.svelte';
+
+  export let user: UserResponseDto;
+
+  let error: string;
+  let success: string;
+
+  const dispatch = createEventDispatcher();
+
+  // eslint-disable-next-line no-undef
+  const editUser = async (event: SubmitEvent) => {
+
+    const formElement = event.target as HTMLFormElement;
+    const form = new FormData(formElement);
+
+    const firstName = form.get('firstName');
+    const lastName = form.get('lastName');
+
+
+    const {status} = await api.userApi.updateUser({
+      id: user.id,
+      firstName: firstName.toString(),
+      lastName: lastName.toString()
+    }).catch(e => console.log("Error updating user ", e));
+
+    if (status == 200) {
+      dispatch('edit-success');
+    }
+  }
+
+  const resetPassword = async () => {
+    const defaultPassword = 'password'
+
+    const {status} = await api.userApi.updateUser({
+      id: user.id,
+      password: defaultPassword,
+      shouldChangePassword: true,
+
+    }).catch(e => console.log("Error updating user ", e));
+
+    if (status == 200) {
+      dispatch('reset-password-success');
+    }
+  }
+</script>
+
+<div class="border bg-white p-4 shadow-sm w-[500px] rounded-3xl py-8">
+    <div class="flex flex-col place-items-center place-content-center gap-4 px-4">
+        <!--        <img class="text-center" src="/immich-logo.svg" height="100" width="100" alt="immich-logo"/>-->
+        <AccountEditOutline size="4em" color="#4250affe"/>
+        <h1 class="text-2xl text-immich-primary font-medium">Edit user</h1>
+    </div>
+
+    <form on:submit|preventDefault={editUser} autocomplete="off">
+        <div class="m-4 flex flex-col gap-2">
+            <label class="immich-form-label" for="email">Email
+                (cannot change)</label>
+            <input class="immich-form-input disabled:bg-gray-200 hover:cursor-not-allowed"
+                   id="email" name="email"
+                   type="email" disabled
+                   bind:value={user.email}/>
+        </div>
+
+
+        <div class="m-4 flex flex-col gap-2">
+            <label class="immich-form-label" for="firstName">First Name</label>
+            <input class="immich-form-input" id="firstName" name="firstName" type="text" required
+                   bind:value={user.firstName}/>
+        </div>
+
+        <div class="m-4 flex flex-col gap-2">
+            <label class="immich-form-label" for="lastName">Last Name</label>
+            <input class="immich-form-input" id="lastName" name="lastName" type="text" required
+                   bind:value={user.lastName}/>
+        </div>
+
+
+        {#if error}
+            <p class="text-red-400 ml-4 text-sm">{error}</p>
+        {/if}
+
+        {#if success}
+            <p class="text-immich-primary ml-4 text-sm">{success}</p>
+        {/if}
+        <div class="flex w-full px-4 gap-4 mt-8">
+            <button on:click={resetPassword}
+                    class="flex-1 transition-colors bg-[#F9DEDC] hover:bg-red-50 text-[#410E0B] px-6 py-3 rounded-full w-full font-medium"
+
+            >Reset password
+            </button
+            >
+            <button
+                    type="submit"
+                    class="flex-1 transition-colors bg-immich-primary hover:bg-immich-primary/75 px-6 py-3 text-white rounded-full shadow-md w-full font-medium"
+            >Confirm
+            </button
+            >
+        </div>
+    </form>
+</div>

web/src/routes/admin/index.svelte

@@ -1,8 +1,9 @@
 <script context="module" lang="ts">
   import type { Load } from '@sveltejs/kit';
   import { api, UserResponseDto } from '@api';
+  import { browser } from '$app/env';
 
-	export const load: Load = async ({ fetch, session }) => {
+  export const load: Load = async ({fetch, session}) => {
     if (!browser && !session.user) {
       return {
         status: 302,
@@ -11,10 +12,17 @@
     }
 
     try {
-			const [user, allUsers] = await Promise.all([
+
-				fetch('/data/user/get-my-user-info').then((r) => r.json()),
+
-				fetch('/data/user/get-all-users?isAll=false').then((r) => r.json())
+      const user: UserResponseDto = await fetch('/data/user/get-my-user-info').then((r) => r.json());
-			]);
+      const allUsers: UserResponseDto[] = await fetch<UserResponseDto[]>('/data/user/get-all-users?isAll=false').then((r) => r.json());
+
+      if (!user.isAdmin) {
+        return {
+          status: 302,
+          redirect: '/photos'
+        };
+      }
 
       return {
         status: 200,
@@ -35,7 +43,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
 
-	import type { ImmichUser } from '$lib/models/immich-user';
   import { AdminSideBarSelection } from '$lib/models/admin-sidebar-selection';
   import SideBarButton from '$lib/components/shared-components/side-bar/side-bar-button.svelte';
   import AccountMultipleOutline from 'svelte-material-icons/AccountMultipleOutline.svelte';
@@ -43,15 +50,20 @@
   import UserManagement from '$lib/components/admin-page/user-management.svelte';
   import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
   import CreateUserForm from '$lib/components/forms/create-user-form.svelte';
+  import EditUserForm from '$lib/components/forms/edit-user-form.svelte';
   import StatusBox from '$lib/components/shared-components/status-box.svelte';
-	import { browser } from '$app/env';
+
 
   let selectedAction: AdminSideBarSelection = AdminSideBarSelection.USER_MANAGEMENT;
 
-	export let user: ImmichUser;
+  export let user: UserResponseDto;
   export let allUsers: UserResponseDto[];
 
-	let shouldShowCreateUserForm: boolean;
+  let editUser: UserResponseDto;
+
+  let shouldShowEditUserForm = false;
+  let shouldShowCreateUserForm = false;
+  let shouldShowInfoPanel = false;
 
   const onButtonClicked = (buttonType: CustomEvent) => {
     selectedAction = buttonType.detail['actionType'] as AdminSideBarSelection;
@@ -62,27 +74,76 @@
   });
 
   const onUserCreated = async () => {
-		const { data } = await api.userApi.getAllUsers(false);
+    const {data} = await api.userApi.getAllUsers(false);
     allUsers = data;
-
     shouldShowCreateUserForm = false;
   };
+
+  const editUserHandler = async (event: CustomEvent) => {
+    const {user} = event.detail;
+    editUser = user;
+    shouldShowEditUserForm = true;
+  };
+
+  const onEditUserSuccess = async () => {
+    const {data} = await api.userApi.getAllUsers(false);
+    allUsers = data;
+    shouldShowEditUserForm = false;
+  }
+
+  const onEditPasswordSuccess = async () => {
+    const {data} = await api.userApi.getAllUsers(false);
+    allUsers = data;
+    shouldShowEditUserForm = false;
+    shouldShowInfoPanel = true;
+  }
 </script>
 
 <svelte:head>
     <title>Administration - Immich</title>
 </svelte:head>
 
-<NavigationBar {user} />
+<NavigationBar {user}/>
 
 {#if shouldShowCreateUserForm}
     <FullScreenModal on:clickOutside={() => (shouldShowCreateUserForm = false)}>
-		<div>
+        <CreateUserForm on:user-created={onUserCreated}/>
-			<CreateUserForm on:user-created={onUserCreated} />
+    </FullScreenModal>
+{/if}
+
+{#if shouldShowEditUserForm}
+    <FullScreenModal on:clickOutside={() => (shouldShowEditUserForm = false)}>
+        <EditUserForm user={editUser} on:edit-success={onEditUserSuccess}
+                      on:reset-password-success={onEditPasswordSuccess}/>
+    </FullScreenModal>
+{/if}
+
+{#if shouldShowInfoPanel}
+    <FullScreenModal on:clickOutside={() => (shouldShowInfoPanel = false)}>
+
+        <div class="border bg-white shadow-sm w-[500px] rounded-3xl p-8 text-sm">
+            <h1 class="font-bold text-immich-primary text-lg mb-4">Password reset success</h1>
+
+            <p>
+                The user's password has been reset to the default <code
+                    class="font-bold bg-gray-200 px-2 py-1 rounded-md text-immich-primary">password</code>
+                <br>
+                Please inform the user, and they will need to change the password at the next log-on.
+            </p>
+
+            <div class="flex w-full">
+                <button
+                        on:click={() => shouldShowInfoPanel = false}
+                        class="mt-6 bg-immich-primary hover:bg-immich-primary/75 px-6 py-3 text-white rounded-full shadow-md w-full font-medium"
+                >Done
+                </button
+                >
+            </div>
         </div>
     </FullScreenModal>
 {/if}
 
+
 <section class="grid grid-cols-[250px_auto] relative pt-[72px] h-screen">
     <section id="admin-sidebar" class="pt-8 pr-6 flex flex-col">
         <SideBarButton
@@ -94,21 +155,27 @@
         />
 
         <div class="mb-6 mt-auto">
-			<StatusBox />
+            <StatusBox/>
         </div>
     </section>
     <section class="overflow-y-auto relative">
         <div id="setting-title" class="pt-10 fixed w-full z-50 bg-immich-bg">
             <h1 class="text-lg ml-8 mb-4 text-immich-primary font-medium">{selectedAction}</h1>
-			<hr />
+            <hr/>
         </div>
 
+
         <section id="setting-content" class="relative pt-[85px] flex place-content-center">
             <section class="w-[800px] pt-4">
                 {#if selectedAction === AdminSideBarSelection.USER_MANAGEMENT}
-					<UserManagement {allUsers} on:createUser={() => (shouldShowCreateUserForm = true)} />
+                    <UserManagement
+                            {allUsers}
+                            on:create-user={() => (shouldShowCreateUserForm = true)}
+                            on:edit-user={editUserHandler}
+                    />
                 {/if}
             </section>
         </section>
     </section>
+
 </section>

web/src/routes/albums/index.svelte

@@ -61,7 +61,7 @@
 
 		// Delete album that has no photos and is named 'Untitled'
 		for (const album of albums) {
-			if (album.albumName === 'Untitled' && album.assets.length === 0) {
+			if (album.albumName === 'Untitled' && album.assetCount === 0) {
 				const isDeleted = await autoDeleteAlbum(album);
 
 				if (isDeleted) {

web/src/routes/index.svelte

@@ -2,24 +2,26 @@
   export const prerender = false;
   import type { Load } from '@sveltejs/kit';
   import { api } from '@api';
+  import { browser } from '$app/env';
 
   export const load: Load = async () => {
     if (browser) {
       try {
-				const { data: user } = await api.userApi.getMyUserInfo();
+        const {data: user} = await api.userApi.getMyUserInfo();
 
         return {
           status: 302,
           redirect: '/photos'
         };
-			} catch (e) {}
+      } catch (e) {
+      }
 
-			const { data } = await api.userApi.getUserCount();
+      const {data} = await api.userApi.getUserCount();
 
       return {
         status: 200,
         props: {
-					isAdminUserExist: data.userCount == 0 ? false : true
+          isAdminUserExist: data.userCount != 0
         }
       };
     }
@@ -28,29 +30,29 @@
 
 <script lang="ts">
   import { goto } from '$app/navigation';
-	import { browser } from '$app/env';
 
   export let isAdminUserExist: boolean;
 
   async function onGettingStartedClicked() {
-		isAdminUserExist ? goto('/auth/login') : goto('/auth/register');
+    isAdminUserExist ? await goto('/auth/login') : await goto('/auth/register');
   }
 </script>
 
 <svelte:head>
     <title>Welcome 🎉 - Immich</title>
-	<meta name="description" content="Immich Web Interface" />
+    <meta name="description" content="Immich Web Interface"/>
 </svelte:head>
 
 <section class="h-screen w-screen flex place-items-center place-content-center">
     <div class="flex flex-col place-items-center gap-8 text-center max-w-[350px]">
         <div class="flex place-items-center place-content-center ">
-			<img class="text-center" src="immich-logo.svg" height="200" width="200" alt="immich-logo" />
+            <img class="text-center" src="immich-logo.svg" height="200" width="200" alt="immich-logo"/>
         </div>
         <h1 class="text-4xl text-immich-primary font-bold font-immich-title">Welcome to IMMICH Web</h1>
         <button
                 class="border px-4 py-2 rounded-md bg-immich-primary hover:bg-immich-primary/75 text-white font-bold w-[200px]"
-			on:click={onGettingStartedClicked}>Getting Started</button
+                on:click={onGettingStartedClicked}>Getting Started
+        </button
         >
     </div>
 </section>

web/src/routes/sharing/index.svelte

@@ -3,8 +3,9 @@
 
   import type { Load } from '@sveltejs/kit';
   import { AlbumResponseDto, api, UserResponseDto } from '@api';
+  import { browser } from '$app/env';
 
-	export const load: Load = async ({ fetch, session }) => {
+  export const load: Load = async ({fetch, session}) => {
     if (!browser && !session.user) {
       return {
         status: 302,
@@ -40,14 +41,13 @@
   import PlusBoxOutline from 'svelte-material-icons/PlusBoxOutline.svelte';
   import SharedAlbumListTile from '$lib/components/sharing-page/shared-album-list-tile.svelte';
   import { goto } from '$app/navigation';
-	import { browser } from '$app/env';
 
   export let user: UserResponseDto;
   export let sharedAlbums: AlbumResponseDto[];
 
   const createSharedAlbum = async () => {
     try {
-			const { data: newAlbum } = await api.albumApi.createAlbum({
+      const {data: newAlbum} = await api.albumApi.createAlbum({
         albumName: 'Untitled'
       });
 
@@ -63,11 +63,11 @@
 </svelte:head>
 
 <section>
-	<NavigationBar {user} on:uploadClicked={() => {}} />
+    <NavigationBar {user} on:uploadClicked={() => {}}/>
 </section>
 
 <section class="grid grid-cols-[250px_auto] relative pt-[72px] h-screen bg-immich-bg">
-	<SideBar />
+    <SideBar/>
 
     <section class="overflow-y-auto relative">
         <section id="album-content" class="relative pt-8 pl-4 mb-12 bg-immich-bg">
@@ -83,7 +83,7 @@
                             class="flex place-items-center gap-1 text-sm hover:bg-immich-primary/5 p-2 rounded-lg font-medium hover:text-gray-700"
                     >
 						<span>
-							<PlusBoxOutline size="18" />
+							<PlusBoxOutline size="18"/>
 						</span>
                         <p>Create shared album</p>
                     </button>
@@ -91,14 +91,15 @@
             </div>
 
             <div class="my-4">
-				<hr />
+                <hr/>
             </div>
 
             <!-- Share Album List -->
             <div class="w-full flex flex-col place-items-center">
                 {#each sharedAlbums as album}
                     <a sveltekit:prefetch href={`albums/${album.id}`}>
-						<SharedAlbumListTile {album} {user} /></a
+                        <SharedAlbumListTile {album} {user}/>
+                    </a
                     >
                 {/each}
             </div>
@@ -108,7 +109,7 @@
                 <div
                         class="border p-5 w-[50%] m-auto mt-10 bg-gray-50 rounded-3xl flex flex-col place-content-center place-items-center"
                 >
-					<img src="/empty-2.svg" alt="Empty shared album" width="500" />
+                    <img src="/empty-2.svg" alt="Empty shared album" width="500"/>
                     <p class="text-center text-immich-text-gray-500">
                         Create a shared album to share photos and videos with people in your network
                     </p>