High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: action provider overrides (#30480)
shenlong4d9a27691ee0
diff --git a/mobile/lib/presentation/actions/action.dart b/mobile/lib/presentation/actions/action.dartindex 072c2524be..d880b7ddf7 100644--- a/mobile/lib/presentation/actions/action.dart+++ b/mobile/lib/presentation/actions/action.dart@@ -33,6 +33,7 @@ final assetsActionProvider = Provider.family.autoDispose<AssetFilter<BaseAsset>,null => const <BaseAsset>{},},}),+ dependencies: [multiSelectProvider],);final clearSelectionProvider = Provider.family.autoDispose<VoidCallback, ActionSource>((ref, source) {@@ -41,10 +42,11 @@ final clearSelectionProvider = Provider.family.autoDispose<VoidCallback, ActionS}return () {};-});+}, dependencies: [multiSelectProvider]);final ownedAssetsActionProvider = Provider.family.autoDispose<AssetFilter<RemoteAsset>, ActionSource>((ref, source) => ref.watch(assetsActionProvider(source)).owned(ref.watch(authUserProvider).id),+ dependencies: [assetsActionProvider],);abstract class AssetActionBuilder extends ActionBuilder {diff --git a/mobile/lib/presentation/actions/archive.action.dart b/mobile/lib/presentation/actions/archive.action.dartindex f04611c4c0..f8e4a1e038 100644--- a/mobile/lib/presentation/actions/archive.action.dart+++ b/mobile/lib/presentation/actions/archive.action.dart@@ -22,7 +22,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,.map((asset) => asset.id).toList(growable: false);return assetIds.isEmpty ? null : (shouldArchive: shouldArchive, assetIds: assetIds);-});+}, dependencies: [ownedAssetsActionProvider]);class ArchiveAction extends AssetActionBuilder {const ArchiveAction({required super.source});diff --git a/mobile/lib/presentation/actions/delete.action.dart b/mobile/lib/presentation/actions/delete.action.dartindex 0fe297bd03..31d01b32ef 100644--- a/mobile/lib/presentation/actions/delete.action.dart+++ b/mobile/lib/presentation/actions/delete.action.dart@@ -40,7 +40,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,final trash = trashEnabled && !ownedRemote.every((asset) => asset.isTrashed || asset.isLocked);return (localIds: localIds, remoteIds: ownedRemote.map((asset) => asset.id).toList(growable: false), trash: trash);-});+}, dependencies: [assetsActionProvider]);class DeleteAction extends AssetActionBuilder {const DeleteAction({required super.source});@@ -149,7 +149,7 @@ final _cleanupStateProvider = Provider.family.autoDispose<List<String>?, ActionSfinal assets = ref.watch(assetsActionProvider(source));final assetIds = assets.backedUp().map((asset) => asset.localId).nonNulls.toList(growable: false);return assetIds.isEmpty ? null : assetIds;-});+}, dependencies: [assetsActionProvider]);class CleanupLocalAction extends AssetActionBuilder {const CleanupLocalAction({required super.source});diff --git a/mobile/lib/presentation/actions/download.action.dart b/mobile/lib/presentation/actions/download.action.dartindex 1303fa6b03..60a1395bcd 100644--- a/mobile/lib/presentation/actions/download.action.dart+++ b/mobile/lib/presentation/actions/download.action.dart@@ -14,7 +14,7 @@ final _stateProvider = Provider.family.autoDispose<List<RemoteAsset>?, ActionSoufinal assets = ref.watch(assetsActionProvider(source));final remote = assets.remote().toList(growable: false);return remote.isEmpty ? null : remote;-});+}, dependencies: [assetsActionProvider]);class DownloadAction extends AssetActionBuilder {const DownloadAction({required super.source});diff --git a/mobile/lib/presentation/actions/edit_asset.action.dart b/mobile/lib/presentation/actions/edit_asset.action.dartindex d0a7e73122..9b11032df9 100644--- a/mobile/lib/presentation/actions/edit_asset.action.dart+++ b/mobile/lib/presentation/actions/edit_asset.action.dart@@ -28,7 +28,7 @@ final _stateProvider = Provider.family.autoDispose<RemoteAsset?, ActionSource>((final assets = ref.watch(ownedAssetsActionProvider(source));return assets.where((asset) => asset.isEditable).singleOrNull;-});+}, dependencies: [ownedAssetsActionProvider]);class EditAssetAction extends AssetActionBuilder {const EditAssetAction({required super.source});diff --git a/mobile/lib/presentation/actions/edit_datetime.action.dart b/mobile/lib/presentation/actions/edit_datetime.action.dartindex a3c825c4db..31de23d1a7 100644--- a/mobile/lib/presentation/actions/edit_datetime.action.dart+++ b/mobile/lib/presentation/actions/edit_datetime.action.dart@@ -21,7 +21,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,}return (assetIds: assets.map((asset) => asset.id).toList(growable: false), origin: assets.singleOrNull);-});+}, dependencies: [ownedAssetsActionProvider]);class EditDateTimeAction extends AssetActionBuilder {const EditDateTimeAction({required super.source});diff --git a/mobile/lib/presentation/actions/edit_location.action.dart b/mobile/lib/presentation/actions/edit_location.action.dartindex f83a98099c..5ce74a0f40 100644--- a/mobile/lib/presentation/actions/edit_location.action.dart+++ b/mobile/lib/presentation/actions/edit_location.action.dart@@ -21,7 +21,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,}return (assetIds: assets.map((asset) => asset.id).toList(growable: false), origin: assets.singleOrNull);-});+}, dependencies: [ownedAssetsActionProvider]);class EditLocationAction extends AssetActionBuilder {const EditLocationAction({required super.source});diff --git a/mobile/lib/presentation/actions/favorite.action.dart b/mobile/lib/presentation/actions/favorite.action.dartindex 17c841b745..402d2f3833 100644--- a/mobile/lib/presentation/actions/favorite.action.dart+++ b/mobile/lib/presentation/actions/favorite.action.dart@@ -18,7 +18,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,final shouldFavorite = assets.favorite(isFavorite: false).isNotEmpty;final assetIds = assets.favorite(isFavorite: !shouldFavorite).map((asset) => asset.id).toList(growable: false);return (shouldFavorite: shouldFavorite, assetIds: assetIds);-});+}, dependencies: [ownedAssetsActionProvider]);class FavoriteAction extends AssetActionBuilder {const FavoriteAction({required super.source});diff --git a/mobile/lib/presentation/actions/lock.action.dart b/mobile/lib/presentation/actions/lock.action.dartindex b7fd01ad18..3d090b712d 100644--- a/mobile/lib/presentation/actions/lock.action.dart+++ b/mobile/lib/presentation/actions/lock.action.dart@@ -23,7 +23,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,// Only locking has an on-device copy to clean up; unlocking leaves the device alone.localIds: shouldLock ? targets.map((asset) => asset.localId).nonNulls.toList(growable: false) : const [],);-});+}, dependencies: [ownedAssetsActionProvider]);class LockAction extends AssetActionBuilder {const LockAction({required super.source});diff --git a/mobile/lib/presentation/actions/remove_from_album.action.dart b/mobile/lib/presentation/actions/remove_from_album.action.dartindex 3d648a9cfd..9e2d9d582f 100644--- a/mobile/lib/presentation/actions/remove_from_album.action.dart+++ b/mobile/lib/presentation/actions/remove_from_album.action.dart@@ -11,7 +11,7 @@ final _stateProvider = Provider.family.autoDispose<List<String>?, ActionSource>(final assets = ref.watch(assetsActionProvider(source));final assetIds = assets.remote().map((asset) => asset.id).toList(growable: false);return assetIds.isEmpty ? null : assetIds;-});+}, dependencies: [assetsActionProvider]);class RemoveFromAlbumAction extends AssetActionBuilder {final String albumId;diff --git a/mobile/lib/presentation/actions/restore.action.dart b/mobile/lib/presentation/actions/restore.action.dartindex 0a2f34abf8..0a1b707b39 100644--- a/mobile/lib/presentation/actions/restore.action.dart+++ b/mobile/lib/presentation/actions/restore.action.dart@@ -11,7 +11,7 @@ final _stateProvider = Provider.family.autoDispose<List<String>?, ActionSource>(final assets = ref.watch(ownedAssetsActionProvider(source));final assetIds = assets.trashed().map((asset) => asset.id).toList(growable: false);return assetIds.isEmpty ? null : assetIds;-});+}, dependencies: [ownedAssetsActionProvider]);class RestoreAction extends AssetActionBuilder {const RestoreAction({required super.source});diff --git a/mobile/lib/presentation/actions/set_album_cover.action.dart b/mobile/lib/presentation/actions/set_album_cover.action.dartindex 0c16c9a9db..d5ad367eed 100644--- a/mobile/lib/presentation/actions/set_album_cover.action.dart+++ b/mobile/lib/presentation/actions/set_album_cover.action.dart@@ -11,7 +11,7 @@ import 'package:immich_mobile/utils/error_handler.dart';final _stateProvider = Provider.family.autoDispose<String?, ActionSource>((ref, source) {final assets = ref.watch(assetsActionProvider(source));return assets.remote().map((asset) => asset.id).singleOrNull;-});+}, dependencies: [assetsActionProvider]);class SetAlbumCoverAction extends AssetActionBuilder {final String albumId;diff --git a/mobile/lib/presentation/actions/share.action.dart b/mobile/lib/presentation/actions/share.action.dartindex 4c36493265..3b8a6318de 100644--- a/mobile/lib/presentation/actions/share.action.dart+++ b/mobile/lib/presentation/actions/share.action.dart@@ -16,7 +16,7 @@ final _stateProvider = Provider.family.autoDispose<List<BaseAsset>?, ActionSourcfinal assets = ref.watch(assetsActionProvider(source));final shareable = assets.toList(growable: false);return shareable.isEmpty ? null : shareable;-});+}, dependencies: [assetsActionProvider]);class ShareAction extends AssetActionBuilder {const ShareAction({required super.source});diff --git a/mobile/lib/presentation/actions/share_link.action.dart b/mobile/lib/presentation/actions/share_link.action.dartindex 1966dd8811..4285105ed3 100644--- a/mobile/lib/presentation/actions/share_link.action.dart+++ b/mobile/lib/presentation/actions/share_link.action.dart@@ -12,7 +12,7 @@ final _stateProvider = Provider.family.autoDispose<List<String>?, ActionSource>(final assets = ref.watch(assetsActionProvider(source));final remoteIds = assets.remote().map((asset) => asset.id).toList(growable: false);return remoteIds.isEmpty ? null : remoteIds;-});+}, dependencies: [assetsActionProvider]);class ShareLinkAction extends AssetActionBuilder {const ShareLinkAction({required super.source});diff --git a/mobile/lib/presentation/actions/stack.action.dart b/mobile/lib/presentation/actions/stack.action.dartindex 9697dc02be..5ab978a7e4 100644--- a/mobile/lib/presentation/actions/stack.action.dart+++ b/mobile/lib/presentation/actions/stack.action.dart@@ -23,7 +23,7 @@ final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref,assetIds: assets.map((asset) => asset.id).toList(growable: false),stackIds: assets.map((asset) => asset.stackId).nonNulls.toList(growable: false),);-});+}, dependencies: [ownedAssetsActionProvider]);class StackAction extends AssetActionBuilder {const StackAction({required super.source});diff --git a/mobile/lib/presentation/actions/tag.action.dart b/mobile/lib/presentation/actions/tag.action.dartindex 749b23d150..978648708f 100644--- a/mobile/lib/presentation/actions/tag.action.dart+++ b/mobile/lib/presentation/actions/tag.action.dart@@ -21,7 +21,7 @@ final _stateProvider = Provider.family.autoDispose<List<String>?, ActionSource>(final assets = ref.watch(ownedAssetsActionProvider(source));final assetIds = assets.map((asset) => asset.id).toList(growable: false);return assetIds.isEmpty ? null : assetIds;-});+}, dependencies: [ownedAssetsActionProvider]);class TagAction extends AssetActionBuilder {const TagAction({required super.source});diff --git a/mobile/lib/presentation/actions/upload.action.dart b/mobile/lib/presentation/actions/upload.action.dartindex ceb35c8786..e52659beb7 100644--- a/mobile/lib/presentation/actions/upload.action.dart+++ b/mobile/lib/presentation/actions/upload.action.dart@@ -16,7 +16,7 @@ final _stateProvider = Provider.family.autoDispose<List<LocalAsset>?, ActionSourfinal assets = ref.watch(assetsActionProvider(source));final local = assets.backedUp(isBackedUp: false).local().toList(growable: false);return local.isEmpty ? null : local;-});+}, dependencies: [assetsActionProvider]);class UploadAction extends AssetActionBuilder {final bool showProgress;diff --git a/mobile/test/unit/presentation/presentation_context.dart b/mobile/test/unit/presentation/presentation_context.dartindex 5b23890ef8..36ae8d087d 100644--- a/mobile/test/unit/presentation/presentation_context.dart+++ b/mobile/test/unit/presentation/presentation_context.dart@@ -101,15 +101,18 @@ extension PumpPresentationWidget on WidgetTester {useFallbackTranslations: true,assetLoader: const CodegenLoader(),child: ProviderScope(- overrides: [...context.overrides, ...overrides],+ overrides: context.overrides,child: Builder(- builder: (context) => MaterialApp(- debugShowCheckedModeBanner: false,- scaffoldMessengerKey: scaffoldMessengerKey,- localizationsDelegates: context.localizationDelegates,- supportedLocales: context.supportedLocales,- locale: context.locale,- home: Scaffold(body: widget),+ builder: (context) => ProviderScope(+ overrides: overrides,+ child: MaterialApp(+ debugShowCheckedModeBanner: false,+ scaffoldMessengerKey: scaffoldMessengerKey,+ localizationsDelegates: context.localizationDelegates,+ supportedLocales: context.supportedLocales,+ locale: context.locale,+ home: Scaffold(body: widget),+ ),),),),