Merge branch 'main' into fix/player-ignorepointer

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

mobile/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.41.6",
+  "dart.flutterSdkPath": ".fvm/versions/3.41.7",
   "dart.lineLength": 120,
   "[dart]": {
     "editor.rulers": [

mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart

@@ -65,26 +65,37 @@ class ViewerBottomBar extends ConsumerWidget {
                   labelLarge: context.themeData.textTheme.labelLarge?.copyWith(color: Colors.white),
                 ),
               ),
-              child: Container(
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.bottomCenter,
-                    end: Alignment.topCenter,
-                    colors: [Colors.black45, Colors.black12, Colors.transparent],
-                    stops: [0.0, 0.7, 1.0],
+              child: Stack(
+                children: [
+                  const Positioned.fill(
+                    child: IgnorePointer(
+                      child: DecoratedBox(
+                        decoration: BoxDecoration(
+                          gradient: LinearGradient(
+                            begin: Alignment.bottomCenter,
+                            end: Alignment.topCenter,
+                            colors: [Colors.black45, Colors.black12, Colors.transparent],
+                            stops: [0.0, 0.7, 1.0],
+                          ),
+                        ),
+                      ),
+                    ),
                   ),
-                ),
-                child: SafeArea(
-                  top: false,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
-                      if (!isReadonlyModeEnabled)
-                        Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
-                    ],
+                  SafeArea(
+                    top: false,
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 16),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
+                          if (!isReadonlyModeEnabled)
+                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
+                        ],
+                      ),
+                    ),
                   ),
-                ),
+                ],
               ),
             ),
     );

mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart

@@ -75,29 +75,41 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
       child: AnimatedOpacity(
         opacity: opacity,
         duration: Durations.short2,
-        child: DecoratedBox(
-          decoration: BoxDecoration(
-            gradient: showingDetails
-                ? null
-                : const LinearGradient(
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: [Colors.black45, Colors.black12, Colors.transparent],
-                    stops: [0.0, 0.7, 1.0],
+        child: Stack(
+          children: [
+            Positioned.fill(
+              child: IgnorePointer(
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    gradient: showingDetails
+                        ? null
+                        : const LinearGradient(
+                            begin: Alignment.topCenter,
+                            end: Alignment.bottomCenter,
+                            colors: [Colors.black45, Colors.black12, Colors.transparent],
+                            stops: [0.0, 0.7, 1.0],
+                          ),
                   ),
-          ),
-          child: AppBar(
-            backgroundColor: Colors.transparent,
-            leading: const _AppBarBackButton(),
-            iconTheme: const IconThemeData(size: 22, color: Colors.white),
-            actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
-            shape: const Border(),
-            actions: showingDetails || isReadonlyModeEnabled
-                ? null
-                : isInLockedView
-                ? lockedViewActions
-                : actions,
-          ),
+                ),
+              ),
+            ),
+            SafeArea(
+              bottom: false,
+              child: SizedBox.square(
+                child: Theme(
+                  data: context.themeData.copyWith(iconTheme: const IconThemeData(size: 22, color: Colors.white)),
+                  child: Row(
+                    children: [
+                      const _AppBarBackButton(),
+                      const Spacer(),
+                      if (!showingDetails && !isReadonlyModeEnabled)
+                        if (isInLockedView) ...lockedViewActions else ...actions,
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
         ),
       ),
     );
@@ -113,20 +125,17 @@ class _AppBarBackButton extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final showingDetails = ref.watch(assetViewerProvider.select((state) => state.showingDetails));
-    return Padding(
-      padding: const EdgeInsets.only(left: 12.0),
-      child: ElevatedButton(
-        style: ElevatedButton.styleFrom(
-          backgroundColor: showingDetails ? context.colorScheme.surface : Colors.transparent,
-          shape: const CircleBorder(),
-          iconSize: 22,
-          iconColor: showingDetails ? context.colorScheme.onSurface : Colors.white,
-          padding: EdgeInsets.zero,
-          elevation: showingDetails ? 4 : 0,
-        ),
-        onPressed: context.maybePop,
-        child: const Icon(Icons.arrow_back_rounded),
+    return ElevatedButton(
+      style: ElevatedButton.styleFrom(
+        backgroundColor: showingDetails ? context.colorScheme.surface : Colors.transparent,
+        shape: const CircleBorder(),
+        iconSize: 22,
+        iconColor: showingDetails ? context.colorScheme.onSurface : Colors.white,
+        padding: const EdgeInsets.all(10.0),
+        elevation: showingDetails ? 4 : 0,
       ),
+      onPressed: context.maybePop,
+      child: const Icon(Icons.arrow_back_rounded),
     );
   }
 }

mobile/lib/widgets/asset_viewer/video_controls.dart

@@ -119,13 +119,15 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
                 onPressed: () => _toggle(isCasting),
               ),
               const Spacer(),
-              Text(
-                "${position.format()} / ${duration.format()}",
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.w500,
-                  fontFeatures: [FontFeature.tabularFigures()],
-                  shadows: VideoControls._controlShadows,
+              IgnorePointer(
+                child: Text(
+                  "${position.format()} / ${duration.format()}",
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontWeight: FontWeight.w500,
+                    fontFeatures: [FontFeature.tabularFigures()],
+                    shadows: VideoControls._controlShadows,
+                  ),
                 ),
               ),
               const SizedBox(width: 12),

mobile/mise.toml

@@ -1,5 +1,5 @@
 [tools]
-flutter = "3.41.6"
+flutter = "3.41.7"
 
 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"

mobile/openapi/lib/model/asset_media_status.dart

@@ -24,13 +24,11 @@ class AssetMediaStatus {
   String toJson() => value;
 
   static const created = AssetMediaStatus._(r'created');
-  static const replaced = AssetMediaStatus._(r'replaced');
   static const duplicate = AssetMediaStatus._(r'duplicate');
 
   /// List of all possible values in this [enum][AssetMediaStatus].
   static const values = <AssetMediaStatus>[
     created,
-    replaced,
     duplicate,
   ];
 
@@ -71,7 +69,6 @@ class AssetMediaStatusTypeTransformer {
     if (data != null) {
       switch (data) {
         case r'created': return AssetMediaStatus.created;
-        case r'replaced': return AssetMediaStatus.replaced;
         case r'duplicate': return AssetMediaStatus.duplicate;
         default:
           if (!allowNull) {

mobile/pubspec.lock

@@ -1989,4 +1989,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.11.0 <4.0.0"
-  flutter: "3.41.6"
+  flutter: "3.41.7"

mobile/pubspec.yaml

@@ -6,7 +6,7 @@ version: 2.7.5+3046
 
 environment:
   sdk: '>=3.11.0 <4.0.0'
-  flutter: 3.41.6
+  flutter: 3.41.7
 
 dependencies:
   async: ^2.13.1

open-api/immich-openapi-specs.json

@@ -16348,7 +16348,6 @@
         "description": "Upload status",
         "enum": [
           "created",
-          "replaced",
           "duplicate"
         ],
         "type": "string"

open-api/typescript-sdk/src/fetch-client.ts

@@ -6899,7 +6899,6 @@ export enum Permission {
 }
 export enum AssetMediaStatus {
     Created = "created",
-    Replaced = "replaced",
     Duplicate = "duplicate"
 }
 export enum AssetUploadAction {

pnpm-lock.yaml

@@ -412,9 +412,6 @@ importers:
       '@socket.io/redis-adapter':
         specifier: ^8.3.0
         version: 8.3.0(socket.io-adapter@2.5.6)
-      ajv:
-        specifier: ^8.17.1
-        version: 8.18.0
       archiver:
         specifier: ^7.0.0
         version: 7.0.1
@@ -523,9 +520,6 @@ importers:
       pg:
         specifier: ^8.11.3
         version: 8.20.0
-      pg-connection-string:
-        specifier: ^2.9.1
-        version: 2.12.0
       picomatch:
         specifier: ^4.0.2
         version: 4.0.4
@@ -689,9 +683,6 @@ importers:
       mock-fs:
         specifier: ^5.2.0
         version: 5.5.0
-      node-gyp:
-        specifier: ^12.0.0
-        version: 12.2.0
       pngjs:
         specifier: ^7.0.0
         version: 7.0.0

server/package.json

@@ -26,7 +26,6 @@
     "test": "vitest --config test/vitest.config.mjs",
     "test:cov": "vitest --config test/vitest.config.mjs --coverage",
     "test:medium": "vitest --config test/vitest.config.medium.mjs",
-    "typeorm": "typeorm",
     "migrations:debug": "sql-tools -u ${DB_URL:-postgres://postgres:postgres@localhost:5432/immich} migrations generate --debug",
     "migrations:generate": "sql-tools -u ${DB_URL:-postgres://postgres:postgres@localhost:5432/immich} migrations generate",
     "migrations:create": "sql-tools -u ${DB_URL:-postgres://postgres:postgres@localhost:5432/immich} migrations create",
@@ -63,7 +62,6 @@
     "@react-email/components": "^1.0.0",
     "@react-email/render": "^2.0.0",
     "@socket.io/redis-adapter": "^8.3.0",
-    "ajv": "^8.17.1",
     "archiver": "^7.0.0",
     "async-lock": "^1.4.0",
     "bcrypt": "^6.0.0",
@@ -96,11 +94,10 @@
     "nestjs-cls": "^6.0.0",
     "nestjs-kysely": "3.1.2",
     "nestjs-otel": "^7.0.0",
-    "nodemailer": "^8.0.0",
     "nestjs-zod": "^5.3.0",
+    "nodemailer": "^8.0.0",
     "openid-client": "^6.3.3",
     "pg": "^8.11.3",
-    "pg-connection-string": "^2.9.1",
     "picomatch": "^4.0.2",
     "postgres": "3.4.8",
     "react": "^19.0.0",
@@ -157,7 +154,6 @@
     "eslint-plugin-unicorn": "^64.0.0",
     "globals": "^17.0.0",
     "mock-fs": "^5.2.0",
-    "node-gyp": "^12.0.0",
     "pngjs": "^7.0.0",
     "prettier": "^3.7.4",
     "prettier-plugin-organize-imports": "^4.0.0",

server/src/constants.ts

@@ -1,4 +1,3 @@
-import { Duration } from 'luxon';
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { SemVer } from 'semver';
@@ -52,9 +51,6 @@ const packageFile = join(basePath, '..', 'package.json');
 const { version } = JSON.parse(readFileSync(packageFile, 'utf8'));
 export const serverVersion = new SemVer(version);
 
-export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
-export const ONE_HOUR = Duration.fromObject({ hours: 1 });
-
 export const citiesFile = 'cities500.txt';
 export const reverseGeocodeMaxDistance = 25_000;
 

server/src/database.ts

@@ -18,7 +18,7 @@ import {
 import { AlbumTable } from 'src/schema/tables/album.table';
 import { AssetExifTable } from 'src/schema/tables/asset-exif.table';
 import { AssetTable } from 'src/schema/tables/asset.table';
-import { PluginActionTable, PluginFilterTable, PluginTable } from 'src/schema/tables/plugin.table';
+import { PluginActionTable, PluginFilterTable } from 'src/schema/tables/plugin.table';
 import { WorkflowActionTable, WorkflowFilterTable, WorkflowTable } from 'src/schema/tables/workflow.table';
 import { UserMetadataItem } from 'src/types';
 import type { ActionConfig, FilterConfig, JSONSchema } from 'src/types/plugin-schema.types';
@@ -277,8 +277,6 @@ export type AssetFace = {
   isVisible: boolean;
 };
 
-export type Plugin = Selectable<PluginTable>;
-
 export type PluginFilter = Selectable<PluginFilterTable> & {
   methodName: string;
   title: string;

server/src/decorators.ts

@@ -1,6 +1,6 @@
 import { BeforeUpdateTrigger, Column, ColumnOptions } from '@immich/sql-tools';
 import { SetMetadata, applyDecorators } from '@nestjs/common';
-import { ApiOperation, ApiOperationOptions, ApiProperty, ApiPropertyOptions, ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiOperationOptions, ApiTags } from '@nestjs/swagger';
 import _ from 'lodash';
 import { ApiCustomExtension, ApiTag, ImmichWorker, JobName, MetadataKey, QueueName } from 'src/enum';
 import { EmitEvent } from 'src/repositories/event.repository';
@@ -172,17 +172,6 @@ export const Endpoint = ({ history, ...options }: EndpointOptions) => {
   return applyDecorators(...decorators);
 };
 
-export type PropertyOptions = ApiPropertyOptions & { history?: HistoryBuilder };
-export const Property = ({ history, ...options }: PropertyOptions) => {
-  const extensions = history?.getExtensions() ?? {};
-
-  if (history?.isDeprecated()) {
-    options.deprecated = true;
-  }
-
-  return ApiProperty({ ...options, ...extensions });
-};
-
 type HistoryEntry = {
   version: string;
   state: ApiState | 'Added' | 'Updated';

server/src/dtos/asset-media-response.dto.ts

@@ -3,7 +3,6 @@ import z from 'zod';
 
 export enum AssetMediaStatus {
   CREATED = 'created',
-  REPLACED = 'replaced',
   DUPLICATE = 'duplicate',
 }
 

server/src/enum.ts

@@ -5,8 +5,6 @@ export enum AuthType {
   OAuth = 'oauth',
 }
 
-export const AuthTypeSchema = z.enum(AuthType).describe('Auth type').meta({ id: 'AuthType' });
-
 export enum ImmichCookie {
   AccessToken = 'immich_access_token',
   MaintenanceToken = 'immich_maintenance_token',
@@ -17,8 +15,6 @@ export enum ImmichCookie {
   OAuthCodeVerifier = 'immich_oauth_code_verifier',
 }
 
-export const ImmichCookieSchema = z.enum(ImmichCookie).describe('Immich cookie').meta({ id: 'ImmichCookie' });
-
 export enum ImmichHeader {
   ApiKey = 'x-api-key',
   UserToken = 'x-immich-user-token',
@@ -29,8 +25,6 @@ export enum ImmichHeader {
   Cid = 'x-immich-cid',
 }
 
-export const ImmichHeaderSchema = z.enum(ImmichHeader).describe('Immich header').meta({ id: 'ImmichHeader' });
-
 export enum ImmichQuery {
   SharedLinkKey = 'key',
   SharedLinkSlug = 'slug',
@@ -38,8 +32,6 @@ export enum ImmichQuery {
   SessionKey = 'sessionKey',
 }
 
-export const ImmichQuerySchema = z.enum(ImmichQuery).describe('Immich query').meta({ id: 'ImmichQuery' });
-
 export enum AssetType {
   Image = 'IMAGE',
   Video = 'VIDEO',
@@ -56,11 +48,6 @@ export enum ChecksumAlgorithm {
   sha1Path = 'sha1-path',
 }
 
-export const ChecksumAlgorithmSchema = z
-  .enum(ChecksumAlgorithm)
-  .describe('Checksum algorithm')
-  .meta({ id: 'ChecksumAlgorithmEnum' });
-
 export enum AssetFileType {
   /**
    * An full/large-size image extracted/converted from RAW photos
@@ -72,8 +59,6 @@ export enum AssetFileType {
   EncodedVideo = 'encoded_video',
 }
 
-export const AssetFileTypeSchema = z.enum(AssetFileType).describe('Asset file type').meta({ id: 'AssetFileType' });
-
 export enum AlbumUserRole {
   Editor = 'editor',
   Viewer = 'viewer',
@@ -313,8 +298,6 @@ export enum Permission {
   AdminAuthUnlinkAll = 'adminAuth.unlinkAll',
 }
 
-export const PermissionSchema = z.enum(Permission).describe('Permission').meta({ id: 'Permission' });
-
 export enum SharedLinkType {
   Album = 'ALBUM',
 
@@ -351,11 +334,6 @@ export enum SystemMetadataKey {
   License = 'license',
 }
 
-export const SystemMetadataKeySchema = z
-  .enum(SystemMetadataKey)
-  .describe('System metadata key')
-  .meta({ id: 'SystemMetadataKey' });
-
 export enum UserMetadataKey {
   Preferences = 'preferences',
   License = 'license',
@@ -371,11 +349,6 @@ export enum AssetMetadataKey {
   MobileApp = 'mobile-app',
 }
 
-export const AssetMetadataKeySchema = z
-  .enum(AssetMetadataKey)
-  .describe('Asset metadata key')
-  .meta({ id: 'AssetMetadataKey' });
-
 export enum UserAvatarColor {
   Primary = 'primary',
   Pink = 'pink',
@@ -408,8 +381,6 @@ export enum AssetStatus {
   Deleted = 'deleted',
 }
 
-export const AssetStatusSchema = z.enum(AssetStatus).describe('Asset status').meta({ id: 'AssetStatus' });
-
 export enum SourceType {
   MachineLearning = 'machine-learning',
   Exif = 'exif',
@@ -434,20 +405,14 @@ export enum AssetPathType {
   EncodedVideo = 'encoded_video',
 }
 
-export const AssetPathTypeSchema = z.enum(AssetPathType).describe('Asset path type').meta({ id: 'AssetPathType' });
-
 export enum PersonPathType {
   Face = 'face',
 }
 
-export const PersonPathTypeSchema = z.enum(PersonPathType).describe('Person path type').meta({ id: 'PersonPathType' });
-
 export enum UserPathType {
   Profile = 'profile',
 }
 
-export const UserPathTypeSchema = z.enum(UserPathType).describe('User path type').meta({ id: 'UserPathType' });
-
 export type PathType = AssetFileType | AssetPathType | PersonPathType | UserPathType;
 
 export enum TranscodePolicy {
@@ -470,11 +435,6 @@ export enum TranscodeTarget {
   All = 'ALL',
 }
 
-export const TranscodeTargetSchema = z
-  .enum(TranscodeTarget)
-  .describe('Transcode target')
-  .meta({ id: 'TranscodeTarget' });
-
 export enum VideoCodec {
   H264 = 'h264',
   Hevc = 'hevc',
@@ -556,11 +516,6 @@ export enum RawExtractedFormat {
   Jxl = 'jxl',
 }
 
-export const RawExtractedFormatSchema = z
-  .enum(RawExtractedFormat)
-  .describe('Raw extracted format')
-  .meta({ id: 'RawExtractedFormat' });
-
 export enum LogLevel {
   Verbose = 'verbose',
   Debug = 'debug',
@@ -586,38 +541,25 @@ export enum ApiCustomExtension {
   State = 'x-immich-state',
 }
 
-export const ApiCustomExtensionSchema = z
-  .enum(ApiCustomExtension)
-  .describe('API custom extension')
-  .meta({ id: 'ApiCustomExtension' });
-
 export enum MetadataKey {
   AuthRoute = 'auth_route',
-  AdminRoute = 'admin_route',
-  SharedRoute = 'shared_route',
   ApiKeySecurity = 'api_key',
   EventConfig = 'event_config',
   JobConfig = 'job_config',
   TelemetryEnabled = 'telemetry_enabled',
 }
 
-export const MetadataKeySchema = z.enum(MetadataKey).describe('Metadata key').meta({ id: 'MetadataKey' });
-
 export enum RouteKey {
   Asset = 'assets',
   User = 'users',
 }
 
-export const RouteKeySchema = z.enum(RouteKey).describe('Route key').meta({ id: 'RouteKey' });
-
 export enum CacheControl {
   PrivateWithCache = 'private_with_cache',
   PrivateWithoutCache = 'private_without_cache',
   None = 'none',
 }
 
-export const CacheControlSchema = z.enum(CacheControl).describe('Cache control').meta({ id: 'CacheControl' });
-
 export enum ImmichEnvironment {
   Development = 'development',
   Testing = 'testing',
@@ -635,8 +577,6 @@ export enum ImmichWorker {
   Microservices = 'microservices',
 }
 
-export const ImmichWorkerSchema = z.enum(ImmichWorker).describe('Immich worker').meta({ id: 'ImmichWorker' });
-
 export enum ImmichTelemetry {
   Host = 'host',
   Api = 'api',
@@ -645,11 +585,6 @@ export enum ImmichTelemetry {
   Job = 'job',
 }
 
-export const ImmichTelemetrySchema = z
-  .enum(ImmichTelemetry)
-  .describe('Immich telemetry')
-  .meta({ id: 'ImmichTelemetry' });
-
 export enum ExifOrientation {
   Horizontal = 1,
   MirrorHorizontal = 2,
@@ -661,11 +596,6 @@ export enum ExifOrientation {
   Rotate270CW = 8,
 }
 
-export const ExifOrientationSchema = z
-  .enum(ExifOrientation)
-  .describe('EXIF orientation')
-  .meta({ id: 'ExifOrientation' });
-
 export enum DatabaseExtension {
   Cube = 'cube',
   EarthDistance = 'earthdistance',
@@ -674,11 +604,6 @@ export enum DatabaseExtension {
   VectorChord = 'vchord',
 }
 
-export const DatabaseExtensionSchema = z
-  .enum(DatabaseExtension)
-  .describe('Database extension')
-  .meta({ id: 'DatabaseExtension' });
-
 export enum BootstrapEventPriority {
   // Database service should be initialized before anything else, most other services need database access
   DatabaseService = -200,
@@ -690,11 +615,6 @@ export enum BootstrapEventPriority {
   SystemConfig = 100,
 }
 
-export const BootstrapEventPrioritySchema = z
-  .enum(BootstrapEventPriority)
-  .describe('Bootstrap event priority')
-  .meta({ id: 'BootstrapEventPriority' });
-
 export enum QueueName {
   ThumbnailGeneration = 'thumbnailGeneration',
   MetadataExtraction = 'metadataExtraction',
@@ -833,21 +753,15 @@ export enum JobStatus {
   Skipped = 'skipped',
 }
 
-export const JobStatusSchema = z.enum(JobStatus).describe('Job status').meta({ id: 'JobStatus' });
-
 export enum QueueCleanType {
   Failed = 'failed',
 }
 
-export const QueueCleanTypeSchema = z.enum(QueueCleanType).describe('Queue clean type').meta({ id: 'QueueCleanType' });
-
 export enum VectorIndex {
   Clip = 'clip_index',
   Face = 'face_index',
 }
 
-export const VectorIndexSchema = z.enum(VectorIndex).describe('Vector index').meta({ id: 'VectorIndex' });
-
 export enum DatabaseLock {
   GeodataImport = 100,
   Migrations = 200,
@@ -865,8 +779,6 @@ export enum DatabaseLock {
   VersionCheck = 800,
 }
 
-export const DatabaseLockSchema = z.enum(DatabaseLock).describe('Database lock').meta({ id: 'DatabaseLock' });
-
 export enum MaintenanceAction {
   Start = 'start',
   End = 'end',
@@ -883,8 +795,6 @@ export enum ExitCode {
   AppRestart = 7,
 }
 
-export const ExitCodeSchema = z.enum(ExitCode).describe('Exit code').meta({ id: 'ExitCode' });
-
 export enum SyncRequestType {
   AlbumsV1 = 'AlbumsV1',
   AlbumUsersV1 = 'AlbumUsersV1',
@@ -1043,8 +953,6 @@ export enum CronJob {
   VersionCheck = 'VersionCheck',
 }
 
-export const CronJobSchema = z.enum(CronJob).describe('Cron job').meta({ id: 'CronJob' });
-
 export enum ApiTag {
   Activities = 'Activities',
   Albums = 'Albums',
@@ -1085,8 +993,6 @@ export enum ApiTag {
   Workflows = 'Workflows',
 }
 
-export const ApiTagSchema = z.enum(ApiTag).describe('API tag').meta({ id: 'ApiTag' });
-
 export enum PluginContext {
   Asset = 'asset',
   Album = 'album',

server/src/repositories/map.repository.ts

@@ -33,12 +33,6 @@ export interface ReverseGeocodeResult {
   city: string | null;
 }
 
-export interface MapMarker extends ReverseGeocodeResult {
-  id: string;
-  lat: number;
-  lon: number;
-}
-
 interface MapDB extends DB {
   geodata_places_tmp: GeodataPlacesTable;
   naturalearth_countries_tmp: NaturalEarthCountriesTable;

server/src/types.ts

@@ -65,13 +65,8 @@ export interface DecodeToBufferOptions extends DecodeImageOptions {
 }
 
 export type GenerateThumbnailOptions = Pick<ImageOptions, 'format' | 'quality' | 'progressive'> & DecodeToBufferOptions;
-
-export type GenerateThumbnailFromBufferOptions = GenerateThumbnailOptions & { raw: RawImageInfo };
-
 export type GenerateThumbhashOptions = DecodeImageOptions;
 
-export type GenerateThumbhashFromBufferOptions = GenerateThumbhashOptions & { raw: RawImageInfo };
-
 export interface GenerateThumbnailsOptions {
   colorspace: string;
   preview?: ImageOptions;

server/src/utils/config.ts

@@ -10,8 +10,6 @@ import { SystemMetadataRepository } from 'src/repositories/system-metadata.repos
 import { DeepPartial } from 'src/types';
 import { getKeysDeep, unsetDeep } from 'src/utils/misc';
 
-export type SystemConfigValidator = (config: SystemConfig, newConfig: SystemConfig) => void | Promise<void>;
-
 type RepoDeps = {
   configRepo: ConfigRepository;
   metadataRepo: SystemMetadataRepository;

server/src/utils/maintenance.ts

@@ -1,60 +1,11 @@
-import { createAdapter } from '@socket.io/redis-adapter';
-import Redis from 'ioredis';
 import { SignJWT } from 'jose';
 import { randomBytes } from 'node:crypto';
 import { join } from 'node:path';
-import { Server as SocketIO } from 'socket.io';
 import { StorageCore } from 'src/cores/storage.core';
 import { MaintenanceAuthDto, MaintenanceDetectInstallResponseDto } from 'src/dtos/maintenance.dto';
 import { StorageFolder } from 'src/enum';
-import { ConfigRepository } from 'src/repositories/config.repository';
-import { AppRestartEvent } from 'src/repositories/event.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
 
-export function sendOneShotAppRestart(state: AppRestartEvent): void {
-  const server = new SocketIO();
-  const { redis } = new ConfigRepository().getEnv();
-  const pubClient = new Redis(redis);
-  const subClient = pubClient.duplicate();
-  server.adapter(createAdapter(pubClient, subClient));
-
-  /**
-   * Keep trying until we manage to stop Immich
-   *
-   * Sometimes there appear to be communication
-   * issues between to the other servers.
-   *
-   * This issue only occurs with this method.
-   */
-  async function tryTerminate() {
-    while (true) {
-      try {
-        const responses = await server.serverSideEmitWithAck('AppRestart', state);
-        if (responses.length > 0) {
-          return;
-        }
-      } catch (error) {
-        console.error(error);
-        console.error('Encountered an error while telling Immich to stop.');
-      }
-
-      console.info(
-        "\nIt doesn't appear that Immich stopped, trying again in a moment.\nIf Immich is already not running, you can ignore this error.",
-      );
-
-      await new Promise((r) => setTimeout(r, 1e3));
-    }
-  }
-
-  // => corresponds to notification.service.ts#onAppRestart
-  server.emit('AppRestartV1', state, () => {
-    void tryTerminate().finally(() => {
-      pubClient.disconnect();
-      subClient.disconnect();
-    });
-  });
-}
-
 export async function createMaintenanceLoginUrl(
   baseUrl: string,
   auth: MaintenanceAuthDto,

server/test/fixtures/shared-link.stub.ts

@@ -1,5 +1,4 @@
 import { MapAsset } from 'src/dtos/asset-response.dto';
-import { SharedLinkResponseDto } from 'src/dtos/shared-link.dto';
 import { SharedLinkType } from 'src/enum';
 import { AssetFactory } from 'test/factories/asset.factory';
 import { authStub } from 'test/fixtures/auth.stub';
@@ -70,23 +69,6 @@ export const sharedLinkStub = {
     album: null,
     slug: null,
   }),
-  readonlyNoExif: Object.freeze({
-    id: '123',
-    userId: authStub.admin.user.id,
-    key: sharedLinkBytes,
-    type: SharedLinkType.Individual,
-    createdAt: today,
-    expiresAt: tomorrow,
-    allowUpload: false,
-    allowDownload: false,
-    showExif: false,
-    description: null,
-    password: null,
-    assets: [],
-    albumId: null,
-    album: null,
-    slug: null,
-  }),
   passwordRequired: Object.freeze({
     id: '123',
     userId: authStub.admin.user.id,
@@ -105,37 +87,3 @@ export const sharedLinkStub = {
     album: null,
   }),
 };
-
-export const sharedLinkResponseStub = {
-  valid: Object.freeze<SharedLinkResponseDto>({
-    allowDownload: true,
-    allowUpload: true,
-    assets: [],
-    createdAt: today,
-    description: null,
-    password: null,
-    expiresAt: tomorrow,
-    id: '123',
-    key: sharedLinkBytes.toString('base64url'),
-    showMetadata: true,
-    type: SharedLinkType.Album,
-    userId: 'admin_id',
-    slug: null,
-  }),
-  expired: Object.freeze<SharedLinkResponseDto>({
-    album: undefined,
-    allowDownload: true,
-    allowUpload: true,
-    assets: [],
-    createdAt: today,
-    description: null,
-    password: null,
-    expiresAt: yesterday,
-    id: '123',
-    key: sharedLinkBytes.toString('base64url'),
-    showMetadata: true,
-    type: SharedLinkType.Album,
-    userId: 'admin_id',
-    slug: null,
-  }),
-};

server/test/medium/responses.ts

@@ -67,48 +67,3 @@ export const errorDto = {
     correlationId: expect.any(String),
   },
 };
-
-export const signupResponseDto = {
-  admin: {
-    avatarColor: expect.any(String),
-    id: expect.any(String),
-    name: 'Immich Admin',
-    email: 'admin@immich.cloud',
-    storageLabel: 'admin',
-    profileImagePath: '',
-    // why? lol
-    shouldChangePassword: true,
-    isAdmin: true,
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    deletedAt: null,
-    oauthId: '',
-    quotaUsageInBytes: 0,
-    quotaSizeInBytes: null,
-    status: 'active',
-    license: null,
-    profileChangedAt: expect.any(String),
-  },
-};
-
-export const loginResponseDto = {
-  admin: {
-    accessToken: expect.any(String),
-    name: 'Immich Admin',
-    isAdmin: true,
-    profileImagePath: '',
-    shouldChangePassword: true,
-    userEmail: 'admin@immich.cloud',
-    userId: expect.any(String),
-  },
-};
-export const deviceDto = {
-  current: {
-    id: expect.any(String),
-    createdAt: expect.any(String),
-    updatedAt: expect.any(String),
-    current: true,
-    deviceOS: '',
-    deviceType: '',
-  },
-};

server/test/utils.ts

@@ -531,43 +531,6 @@ export const mockDuplex =
     return duplex;
   };
 
-export const mockFork = vitest.fn((exitCode: number, stdout: string, stderr: string, error?: unknown) => {
-  const stdoutStream = new Readable({
-    read() {
-      this.push(stdout); // write mock data to stdout
-      this.push(null); // end stream
-    },
-  });
-
-  return {
-    stdout: stdoutStream,
-    stderr: new Readable({
-      read() {
-        this.push(stderr); // write mock data to stderr
-        this.push(null); // end stream
-      },
-    }),
-    stdin: new Writable({
-      write(chunk, encoding, callback) {
-        callback();
-      },
-    }),
-    exitCode,
-    on: vitest.fn((event, callback: any) => {
-      if (event === 'close') {
-        stdoutStream.once('end', () => callback(0));
-      }
-      if (event === 'error' && error) {
-        stdoutStream.once('end', () => callback(error));
-      }
-      if (event === 'exit') {
-        stdoutStream.once('end', () => callback(exitCode));
-      }
-    }),
-    kill: vitest.fn(),
-  } as unknown as ChildProcessWithoutNullStreams;
-});
-
 export async function* makeStream<T>(items: T[] = []): AsyncIterableIterator<T> {
   for (const item of items) {
     await Promise.resolve();

web/src/lib/components/asset-viewer/detail-panel.svelte

@@ -37,6 +37,7 @@
     mdiPlus,
   } from '@mdi/js';
   import { DateTime } from 'luxon';
+  import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
   import { slide } from 'svelte/transition';
   import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte';
@@ -52,7 +53,6 @@
 
   let { asset, currentAlbum = null }: Props = $props();
 
-  let showEditFaces = $derived(assetViewerManager.isEditFacesPanelOpen);
   let isOwner = $derived(authManager.authenticated && authManager.user.id === asset.ownerId);
   let people = $derived(asset.people || []);
   let unassignedFaces = $derived(asset.unassignedFaces || []);
@@ -118,379 +118,385 @@
     // Remove the last part of the path to get the parent path
     return Route.folders({ path: getParentPath(asset.originalPath) });
   };
+
+  onDestroy(() => {
+    assetViewerManager.closeEditFacesPanel();
+  });
 </script>
 
 <OnEvents onAlbumAddAssets={() => (albums = refreshAlbums())} />
 
-<section class="relative p-2">
-  <div class="flex place-items-center gap-2">
-    <IconButton
-      icon={mdiClose}
-      aria-label={$t('close')}
-      onclick={() => assetViewerManager.closeDetailPanel()}
-      shape="round"
-      color="secondary"
-      variant="ghost"
-    />
-    <p class="text-lg text-immich-fg dark:text-immich-dark-fg">{$t('info')}</p>
-  </div>
+{#if !assetViewerManager.isEditFacesPanelOpen}
+  <section class="relative p-2">
+    <div class="flex place-items-center gap-2">
+      <IconButton
+        icon={mdiClose}
+        aria-label={$t('close')}
+        onclick={() => assetViewerManager.closeDetailPanel()}
+        shape="round"
+        color="secondary"
+        variant="ghost"
+      />
+      <p class="text-lg text-immich-fg dark:text-immich-dark-fg">{$t('info')}</p>
+    </div>
 
-  {#if asset.isOffline}
-    <section class="px-4 py-4">
-      <div role="alert">
-        <div class="rounded-t bg-red-500 px-4 py-2 font-bold text-white">
-          {$t('asset_offline')}
+    {#if asset.isOffline}
+      <section class="px-4 py-4">
+        <div role="alert">
+          <div class="rounded-t bg-red-500 px-4 py-2 font-bold text-white">
+            {$t('asset_offline')}
+          </div>
+          <div class="border border-t-0 border-red-400 bg-red-100 px-4 py-3 text-red-700">
+            <p>
+              {#if authManager.authenticated && authManager.user.isAdmin}
+                {$t('admin.asset_offline_description')}
+              {:else}
+                {$t('asset_offline_description')}
+              {/if}
+            </p>
+          </div>
+          <div class="rounded-b bg-red-500 px-4 py-2 text-white text-sm">
+            <p>{asset.originalPath}</p>
+          </div>
         </div>
-        <div class="border border-t-0 border-red-400 bg-red-100 px-4 py-3 text-red-700">
-          <p>
-            {#if authManager.authenticated && authManager.user.isAdmin}
-              {$t('admin.asset_offline_description')}
-            {:else}
-              {$t('asset_offline_description')}
+      </section>
+    {/if}
+
+    <DetailPanelDescription {asset} {isOwner} />
+    <DetailPanelRating {asset} {isOwner} />
+
+    {#if !authManager.isSharedLink && isOwner}
+      <section class="px-4 pt-4 text-sm">
+        <div class="flex h-10 w-full items-center justify-between">
+          <Text size="small" color="muted">{$t('people')}</Text>
+          <div class="flex gap-2 items-center">
+            {#if people.some((person) => person.isHidden)}
+              <IconButton
+                aria-label={$t('show_hidden_people')}
+                icon={showingHiddenPeople ? mdiEyeOff : mdiEye}
+                size="medium"
+                shape="round"
+                color="secondary"
+                variant="ghost"
+                onclick={() => (showingHiddenPeople = !showingHiddenPeople)}
+              />
+            {/if}
+            <IconButton
+              aria-label={$t('tag_people')}
+              icon={mdiPlus}
+              size="medium"
+              shape="round"
+              color="secondary"
+              variant="ghost"
+              onclick={() => assetViewerManager.toggleFaceEditMode()}
+            />
+
+            {#if people.length > 0 || unassignedFaces.length > 0}
+              <IconButton
+                aria-label={$t('edit_people')}
+                icon={mdiPencil}
+                size="medium"
+                shape="round"
+                color="secondary"
+                variant="ghost"
+                onclick={() => assetViewerManager.openEditFacesPanel()}
+              />
+            {/if}
+          </div>
+        </div>
+
+        <div class="mt-2 flex flex-wrap gap-2">
+          {#each people as person, index (person.id)}
+            {#if showingHiddenPeople || !person.isHidden}
+              {@const isHighlighted = people[index].faces.some((f) => $boundingBoxesArray.some((b) => b.id === f.id))}
+              <a
+                class="group w-22 outline-none"
+                href={Route.viewPerson(person, { previousRoute })}
+                onfocus={() => ($boundingBoxesArray = people[index].faces)}
+                onblur={() => ($boundingBoxesArray = [])}
+                onmouseover={() => ($boundingBoxesArray = people[index].faces)}
+                onmouseleave={() => ($boundingBoxesArray = [])}
+              >
+                <div class="relative">
+                  <ImageThumbnail
+                    curve
+                    shadow
+                    url={getPeopleThumbnailUrl(person)}
+                    altText={person.name}
+                    title={person.name}
+                    widthStyle="90px"
+                    heightStyle="90px"
+                    hidden={person.isHidden}
+                    highlighted={isHighlighted}
+                    class="group-focus-visible:outline-2 group-focus-visible:outline-offset-2 group-focus-visible:outline-immich-primary dark:group-focus-visible:outline-immich-dark-primary"
+                  />
+                </div>
+                <p class="mt-1 truncate font-medium" title={person.name}>{person.name}</p>
+                {#if person.birthDate}
+                  {@const personBirthDate = DateTime.fromISO(person.birthDate)}
+                  {@const age = Math.floor(DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'years').years)}
+                  {@const ageInMonths = Math.floor(
+                    DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'months').months,
+                  )}
+                  {#if age >= 0}
+                    <p
+                      class="font-light"
+                      title={personBirthDate.toLocaleString(
+                        {
+                          month: 'long',
+                          day: 'numeric',
+                          year: 'numeric',
+                        },
+                        { locale: $locale },
+                      )}
+                    >
+                      {#if ageInMonths <= 11}
+                        {$t('age_months', { values: { months: ageInMonths } })}
+                      {:else if ageInMonths > 12 && ageInMonths <= 23}
+                        {$t('age_year_months', { values: { months: ageInMonths - 12 } })}
+                      {:else}
+                        {$t('age_years', { values: { years: age } })}
+                      {/if}
+                    </p>
+                  {/if}
+                {/if}
+              </a>
+            {/if}
+          {/each}
+        </div>
+      </section>
+    {/if}
+
+    <div class="px-4 py-4">
+      {#if asset.exifInfo}
+        <div class="flex h-10 w-full items-center justify-between text-sm">
+          <Text size="small" color="muted">{$t('details')}</Text>
+        </div>
+      {:else}
+        <Text size="small" color="muted">{$t('no_exif_info_available')}</Text>
+      {/if}
+
+      <DetailPanelDate {asset} />
+
+      <div class="flex gap-4 py-4">
+        <div><Icon icon={mdiImageOutline} size="24" /></div>
+
+        <div>
+          <p class="break-all flex place-items-center gap-2 whitespace-pre-wrap">
+            {asset.originalFileName}
+            {#if isOwner}
+              <IconButton
+                icon={mdiInformationOutline}
+                aria-label={$t('show_file_location')}
+                size="small"
+                shape="round"
+                color="secondary"
+                variant="ghost"
+                onclick={() => assetViewerManager.toggleAssetPath()}
+              />
             {/if}
           </p>
-        </div>
-        <div class="rounded-b bg-red-500 px-4 py-2 text-white text-sm">
-          <p>{asset.originalPath}</p>
-        </div>
-      </div>
-    </section>
-  {/if}
-
-  <DetailPanelDescription {asset} {isOwner} />
-  <DetailPanelRating {asset} {isOwner} />
-
-  {#if !authManager.isSharedLink && isOwner}
-    <section class="px-4 pt-4 text-sm">
-      <div class="flex h-10 w-full items-center justify-between">
-        <Text size="small" color="muted">{$t('people')}</Text>
-        <div class="flex gap-2 items-center">
-          {#if people.some((person) => person.isHidden)}
-            <IconButton
-              aria-label={$t('show_hidden_people')}
-              icon={showingHiddenPeople ? mdiEyeOff : mdiEye}
-              size="medium"
-              shape="round"
-              color="secondary"
-              variant="ghost"
-              onclick={() => (showingHiddenPeople = !showingHiddenPeople)}
-            />
+          {#if assetViewerManager.isShowAssetPath}
+            <p class="text-xs opacity-50 break-all pb-2 hover:text-primary" transition:slide={{ duration: 250 }}>
+              <!-- eslint-disable-next-line svelte/no-navigation-without-resolve this is supposed to be treated as an absolute/external link -->
+              <a href={getAssetFolderHref(asset)} title={$t('go_to_folder')} class="whitespace-pre-wrap">
+                {asset.originalPath}
+              </a>
+            </p>
           {/if}
-          <IconButton
-            aria-label={$t('tag_people')}
-            icon={mdiPlus}
-            size="medium"
-            shape="round"
-            color="secondary"
-            variant="ghost"
-            onclick={() => assetViewerManager.toggleFaceEditMode()}
-          />
-
-          {#if people.length > 0 || unassignedFaces.length > 0}
-            <IconButton
-              aria-label={$t('edit_people')}
-              icon={mdiPencil}
-              size="medium"
-              shape="round"
-              color="secondary"
-              variant="ghost"
-              onclick={() => assetViewerManager.openEditFacesPanel()}
-            />
-          {/if}
-        </div>
-      </div>
-
-      <div class="mt-2 flex flex-wrap gap-2">
-        {#each people as person, index (person.id)}
-          {#if showingHiddenPeople || !person.isHidden}
-            {@const isHighlighted = people[index].faces.some((f) => $boundingBoxesArray.some((b) => b.id === f.id))}
-            <a
-              class="group w-22 outline-none"
-              href={Route.viewPerson(person, { previousRoute })}
-              onfocus={() => ($boundingBoxesArray = people[index].faces)}
-              onblur={() => ($boundingBoxesArray = [])}
-              onmouseover={() => ($boundingBoxesArray = people[index].faces)}
-              onmouseleave={() => ($boundingBoxesArray = [])}
-            >
-              <div class="relative">
-                <ImageThumbnail
-                  curve
-                  shadow
-                  url={getPeopleThumbnailUrl(person)}
-                  altText={person.name}
-                  title={person.name}
-                  widthStyle="90px"
-                  heightStyle="90px"
-                  hidden={person.isHidden}
-                  highlighted={isHighlighted}
-                  class="group-focus-visible:outline-2 group-focus-visible:outline-offset-2 group-focus-visible:outline-immich-primary dark:group-focus-visible:outline-immich-dark-primary"
-                />
-              </div>
-              <p class="mt-1 truncate font-medium" title={person.name}>{person.name}</p>
-              {#if person.birthDate}
-                {@const personBirthDate = DateTime.fromISO(person.birthDate)}
-                {@const age = Math.floor(DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'years').years)}
-                {@const ageInMonths = Math.floor(
-                  DateTime.fromISO(asset.localDateTime).diff(personBirthDate, 'months').months,
-                )}
-                {#if age >= 0}
-                  <p
-                    class="font-light"
-                    title={personBirthDate.toLocaleString(
-                      {
-                        month: 'long',
-                        day: 'numeric',
-                        year: 'numeric',
-                      },
-                      { locale: $locale },
-                    )}
-                  >
-                    {#if ageInMonths <= 11}
-                      {$t('age_months', { values: { months: ageInMonths } })}
-                    {:else if ageInMonths > 12 && ageInMonths <= 23}
-                      {$t('age_year_months', { values: { months: ageInMonths - 12 } })}
-                    {:else}
-                      {$t('age_years', { values: { years: age } })}
-                    {/if}
+          {#if (asset.exifInfo?.exifImageHeight && asset.exifInfo?.exifImageWidth) || asset.exifInfo?.fileSizeInByte}
+            <div class="flex gap-2 text-sm">
+              {#if asset.exifInfo?.exifImageHeight && asset.exifInfo?.exifImageWidth}
+                {#if getMegapixel(asset.exifInfo.exifImageHeight, asset.exifInfo.exifImageWidth)}
+                  <p>
+                    {getMegapixel(asset.exifInfo.exifImageHeight, asset.exifInfo.exifImageWidth)} MP
                   </p>
                 {/if}
+                {@const { width, height } = getDimensions(asset.exifInfo)}
+                <p>{width} x {height}</p>
               {/if}
-            </a>
+              {#if asset.exifInfo?.fileSizeInByte}
+                <p>{getByteUnitString(asset.exifInfo.fileSizeInByte, $locale)}</p>
+              {/if}
+            </div>
           {/if}
-        {/each}
+        </div>
+      </div>
+
+      {#if asset.exifInfo?.make || asset.exifInfo?.model || asset.exifInfo?.exposureTime || asset.exifInfo?.iso}
+        <div class="flex gap-4 py-4">
+          <div><Icon icon={mdiCamera} size="24" /></div>
+
+          <div>
+            {#if asset.exifInfo?.make || asset.exifInfo?.model}
+              <p>
+                <a
+                  href={Route.search({
+                    make: asset.exifInfo?.make ?? undefined,
+                    model: asset.exifInfo?.model ?? undefined,
+                  })}
+                  title="{$t('search_for')} {asset.exifInfo.make || ''} {asset.exifInfo.model || ''}"
+                  class="hover:text-primary"
+                >
+                  {asset.exifInfo.make || ''}
+                  {asset.exifInfo.model || ''}
+                </a>
+              </p>
+            {/if}
+
+            <div class="flex gap-2 text-sm">
+              {#if asset.exifInfo.exposureTime}
+                <p>{`${asset.exifInfo.exposureTime} s`}</p>
+              {/if}
+
+              {#if asset.exifInfo.iso}
+                <p>{`ISO ${asset.exifInfo.iso}`}</p>
+              {/if}
+            </div>
+          </div>
+        </div>
+      {/if}
+
+      {#if asset.exifInfo?.lensModel || asset.exifInfo?.fNumber || asset.exifInfo?.focalLength}
+        <div class="flex gap-4 py-4">
+          <div><Icon icon={mdiCameraIris} size="24" /></div>
+
+          <div>
+            {#if asset.exifInfo?.lensModel}
+              <p>
+                <a
+                  href={Route.search({ lensModel: asset.exifInfo.lensModel })}
+                  title="{$t('search_for')} {asset.exifInfo.lensModel}"
+                  class="hover:text-primary line-clamp-1"
+                >
+                  {asset.exifInfo.lensModel}
+                </a>
+              </p>
+            {/if}
+
+            <div class="flex gap-2 text-sm">
+              {#if asset.exifInfo?.fNumber}
+                <p>ƒ/{asset.exifInfo.fNumber.toLocaleString($locale)}</p>
+              {/if}
+
+              {#if asset.exifInfo.focalLength}
+                <p>{`${asset.exifInfo.focalLength.toLocaleString($locale)} mm`}</p>
+              {/if}
+            </div>
+          </div>
+        </div>
+      {/if}
+
+      <DetailPanelLocation {isOwner} {asset} />
+    </div>
+  </section>
+
+  {#if latlng && featureFlagsManager.value.map}
+    <div class="h-90">
+      {#await import('$lib/components/shared-components/map/map.svelte')}
+        {#await delay(timeToLoadTheMap) then}
+          <!-- show the loading spinner only if loading the map takes too much time -->
+          <div class="flex items-center justify-center h-full w-full">
+            <LoadingSpinner />
+          </div>
+        {/await}
+      {:then { default: Map }}
+        <Map
+          mapMarkers={[
+            {
+              lat: latlng.lat,
+              lon: latlng.lng,
+              id: asset.id,
+              city: asset.exifInfo?.city ?? null,
+              state: asset.exifInfo?.state ?? null,
+              country: asset.exifInfo?.country ?? null,
+            },
+          ]}
+          center={latlng}
+          showSettings={false}
+          zoom={12.5}
+          simplified
+          useLocationPin
+          showSimpleControls={!assetViewerManager.isEditFacesPanelOpen}
+          onOpenInMapView={() => goto(Route.map({ ...latlng, zoom: 12.5 }))}
+        >
+          {#snippet popup({ marker })}
+            {@const { lat, lon } = marker}
+            <div class="flex flex-col items-center gap-1">
+              <p class="font-bold">{lat.toPrecision(6)}, {lon.toPrecision(6)}</p>
+              <a
+                href="https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom=13#map=15/{lat}/{lon}"
+                target="_blank"
+                class="font-medium text-primary underline focus:outline-none"
+              >
+                {$t('open_in_openstreetmap')}
+              </a>
+            </div>
+          {/snippet}
+        </Map>
+      {/await}
+    </div>
+  {/if}
+
+  {#if currentAlbum && currentAlbum.albumUsers.length > 0 && asset.owner}
+    <section class="px-6 dark:text-immich-dark-fg mt-4">
+      <Text size="small" color="muted">{$t('shared_by')}</Text>
+      <div class="flex gap-4 pt-4">
+        <div>
+          <UserAvatar user={asset.owner} size="md" />
+        </div>
+
+        <div class="mb-auto mt-auto">
+          <p>
+            {asset.owner.name}
+          </p>
+        </div>
       </div>
     </section>
   {/if}
 
-  <div class="px-4 py-4">
-    {#if asset.exifInfo}
-      <div class="flex h-10 w-full items-center justify-between text-sm">
-        <Text size="small" color="muted">{$t('details')}</Text>
-      </div>
-    {:else}
-      <Text size="small" color="muted">{$t('no_exif_info_available')}</Text>
-    {/if}
-
-    <DetailPanelDate {asset} />
-
-    <div class="flex gap-4 py-4">
-      <div><Icon icon={mdiImageOutline} size="24" /></div>
-
-      <div>
-        <p class="break-all flex place-items-center gap-2 whitespace-pre-wrap">
-          {asset.originalFileName}
-          {#if isOwner}
-            <IconButton
-              icon={mdiInformationOutline}
-              aria-label={$t('show_file_location')}
-              size="small"
-              shape="round"
-              color="secondary"
-              variant="ghost"
-              onclick={() => assetViewerManager.toggleAssetPath()}
-            />
-          {/if}
-        </p>
-        {#if assetViewerManager.isShowAssetPath}
-          <p class="text-xs opacity-50 break-all pb-2 hover:text-primary" transition:slide={{ duration: 250 }}>
-            <!-- eslint-disable-next-line svelte/no-navigation-without-resolve this is supposed to be treated as an absolute/external link -->
-            <a href={getAssetFolderHref(asset)} title={$t('go_to_folder')} class="whitespace-pre-wrap">
-              {asset.originalPath}
-            </a>
-          </p>
-        {/if}
-        {#if (asset.exifInfo?.exifImageHeight && asset.exifInfo?.exifImageWidth) || asset.exifInfo?.fileSizeInByte}
-          <div class="flex gap-2 text-sm">
-            {#if asset.exifInfo?.exifImageHeight && asset.exifInfo?.exifImageWidth}
-              {#if getMegapixel(asset.exifInfo.exifImageHeight, asset.exifInfo.exifImageWidth)}
-                <p>
-                  {getMegapixel(asset.exifInfo.exifImageHeight, asset.exifInfo.exifImageWidth)} MP
-                </p>
-              {/if}
-              {@const { width, height } = getDimensions(asset.exifInfo)}
-              <p>{width} x {height}</p>
-            {/if}
-            {#if asset.exifInfo?.fileSizeInByte}
-              <p>{getByteUnitString(asset.exifInfo.fileSizeInByte, $locale)}</p>
-            {/if}
-          </div>
-        {/if}
-      </div>
-    </div>
-
-    {#if asset.exifInfo?.make || asset.exifInfo?.model || asset.exifInfo?.exposureTime || asset.exifInfo?.iso}
-      <div class="flex gap-4 py-4">
-        <div><Icon icon={mdiCamera} size="24" /></div>
-
-        <div>
-          {#if asset.exifInfo?.make || asset.exifInfo?.model}
-            <p>
-              <a
-                href={Route.search({
-                  make: asset.exifInfo?.make ?? undefined,
-                  model: asset.exifInfo?.model ?? undefined,
-                })}
-                title="{$t('search_for')} {asset.exifInfo.make || ''} {asset.exifInfo.model || ''}"
-                class="hover:text-primary"
-              >
-                {asset.exifInfo.make || ''}
-                {asset.exifInfo.model || ''}
-              </a>
-            </p>
-          {/if}
-
-          <div class="flex gap-2 text-sm">
-            {#if asset.exifInfo.exposureTime}
-              <p>{`${asset.exifInfo.exposureTime} s`}</p>
-            {/if}
-
-            {#if asset.exifInfo.iso}
-              <p>{`ISO ${asset.exifInfo.iso}`}</p>
-            {/if}
-          </div>
+  {#await albums then albums}
+    {#if albums.length > 0}
+      <section class="px-6 py-6 dark:text-immich-dark-fg">
+        <div class="pb-4">
+          <Text size="small" color="muted">{$t('appears_in')}</Text>
         </div>
-      </div>
-    {/if}
+        {#each albums as album (album.id)}
+          <a href={Route.viewAlbum(album)}>
+            <div class="flex gap-4 pt-2 hover:cursor-pointer items-center">
+              <div>
+                <img
+                  alt={album.albumName}
+                  class="h-12.5 w-12.5 rounded object-cover"
+                  src={album.albumThumbnailAssetId &&
+                    getAssetMediaUrl({ id: album.albumThumbnailAssetId, size: AssetMediaSize.Preview })}
+                  draggable="false"
+                />
+              </div>
 
-    {#if asset.exifInfo?.lensModel || asset.exifInfo?.fNumber || asset.exifInfo?.focalLength}
-      <div class="flex gap-4 py-4">
-        <div><Icon icon={mdiCameraIris} size="24" /></div>
-
-        <div>
-          {#if asset.exifInfo?.lensModel}
-            <p>
-              <a
-                href={Route.search({ lensModel: asset.exifInfo.lensModel })}
-                title="{$t('search_for')} {asset.exifInfo.lensModel}"
-                class="hover:text-primary line-clamp-1"
-              >
-                {asset.exifInfo.lensModel}
-              </a>
-            </p>
-          {/if}
-
-          <div class="flex gap-2 text-sm">
-            {#if asset.exifInfo?.fNumber}
-              <p>ƒ/{asset.exifInfo.fNumber.toLocaleString($locale)}</p>
-            {/if}
-
-            {#if asset.exifInfo.focalLength}
-              <p>{`${asset.exifInfo.focalLength.toLocaleString($locale)} mm`}</p>
-            {/if}
-          </div>
-        </div>
-      </div>
-    {/if}
-
-    <DetailPanelLocation {isOwner} {asset} />
-  </div>
-</section>
-
-{#if latlng && featureFlagsManager.value.map}
-  <div class="h-90">
-    {#await import('$lib/components/shared-components/map/map.svelte')}
-      {#await delay(timeToLoadTheMap) then}
-        <!-- show the loading spinner only if loading the map takes too much time -->
-        <div class="flex items-center justify-center h-full w-full">
-          <LoadingSpinner />
-        </div>
-      {/await}
-    {:then { default: Map }}
-      <Map
-        mapMarkers={[
-          {
-            lat: latlng.lat,
-            lon: latlng.lng,
-            id: asset.id,
-            city: asset.exifInfo?.city ?? null,
-            state: asset.exifInfo?.state ?? null,
-            country: asset.exifInfo?.country ?? null,
-          },
-        ]}
-        center={latlng}
-        showSettings={false}
-        zoom={12.5}
-        simplified
-        useLocationPin
-        showSimpleControls={!showEditFaces}
-        onOpenInMapView={() => goto(Route.map({ ...latlng, zoom: 12.5 }))}
-      >
-        {#snippet popup({ marker })}
-          {@const { lat, lon } = marker}
-          <div class="flex flex-col items-center gap-1">
-            <p class="font-bold">{lat.toPrecision(6)}, {lon.toPrecision(6)}</p>
-            <a
-              href="https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom=13#map=15/{lat}/{lon}"
-              target="_blank"
-              class="font-medium text-primary underline focus:outline-none"
-            >
-              {$t('open_in_openstreetmap')}
-            </a>
-          </div>
-        {/snippet}
-      </Map>
-    {/await}
-  </div>
-{/if}
-
-{#if currentAlbum && currentAlbum.albumUsers.length > 0 && asset.owner}
-  <section class="px-6 dark:text-immich-dark-fg mt-4">
-    <Text size="small" color="muted">{$t('shared_by')}</Text>
-    <div class="flex gap-4 pt-4">
-      <div>
-        <UserAvatar user={asset.owner} size="md" />
-      </div>
-
-      <div class="mb-auto mt-auto">
-        <p>
-          {asset.owner.name}
-        </p>
-      </div>
-    </div>
-  </section>
-{/if}
-
-{#await albums then albums}
-  {#if albums.length > 0}
-    <section class="px-6 py-6 dark:text-immich-dark-fg">
-      <div class="pb-4">
-        <Text size="small" color="muted">{$t('appears_in')}</Text>
-      </div>
-      {#each albums as album (album.id)}
-        <a href={Route.viewAlbum(album)}>
-          <div class="flex gap-4 pt-2 hover:cursor-pointer items-center">
-            <div>
-              <img
-                alt={album.albumName}
-                class="h-12.5 w-12.5 rounded object-cover"
-                src={album.albumThumbnailAssetId &&
-                  getAssetMediaUrl({ id: album.albumThumbnailAssetId, size: AssetMediaSize.Preview })}
-                draggable="false"
-              />
-            </div>
-
-            <div class="mb-auto mt-auto">
-              <p class="dark:text-immich-dark-primary">{album.albumName}</p>
-              <div class="flex flex-col gap-0 text-sm">
-                <div>
-                  <AlbumListItemDetails {album} />
+              <div class="mb-auto mt-auto">
+                <p class="dark:text-immich-dark-primary">{album.albumName}</p>
+                <div class="flex flex-col gap-0 text-sm">
+                  <div>
+                    <AlbumListItemDetails {album} />
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-        </a>
-      {/each}
+          </a>
+        {/each}
+      </section>
+    {/if}
+  {/await}
+
+  {#if authManager.authenticated && authManager.preferences.tags.enabled}
+    <section class="relative px-2 pb-12 dark:bg-immich-dark-bg dark:text-immich-dark-fg">
+      <DetailPanelTags {asset} {isOwner} />
     </section>
   {/if}
-{/await}
-
-{#if authManager.authenticated && authManager.preferences.tags.enabled}
-  <section class="relative px-2 pb-12 dark:bg-immich-dark-bg dark:text-immich-dark-fg">
-    <DetailPanelTags {asset} {isOwner} />
-  </section>
 {/if}
 
-{#if showEditFaces}
+{#if assetViewerManager.isEditFacesPanelOpen}
   <PersonSidePanel
     assetId={asset.id}
     assetType={asset.type}

web/src/lib/managers/asset-viewer-manager.svelte.ts

@@ -209,7 +209,6 @@ class AssetViewerManager extends BaseEventManager<Events> {
     this.closeFaceEditMode();
     this.closeEditFacesPanel();
   }
-
   setAsset(asset: AssetResponseDto) {
     this.#viewingAssetStoreState = asset;
     this.#viewState = true;