High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: base action (#29617)
shenlongfe5c8ed0fb80
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dartindex f4c4a519d3..f35c962ff0 100644--- a/mobile/lib/domain/services/asset.service.dart+++ b/mobile/lib/domain/services/asset.service.dart@@ -171,13 +171,4 @@ class AssetService {Future<LocalAsset?> getLocalAsset(String id) {return _localRepository.get(id);}-- Future<void> updateFavorite(List<String> remoteIds, bool isFavorite) async {- if (remoteIds.isEmpty) {- return;- }-- await _apiRepository.updateFavorite(remoteIds, isFavorite);- await _remoteRepository.updateFavorite(remoteIds, isFavorite);- }}diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dartindex cdf8bfa15b..e97b05465b 100644--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart@@ -117,18 +117,6 @@ class RemoteAssetRepository extends DriftDatabaseRepository {}).get();}- Future<void> updateFavorite(List<String> ids, bool isFavorite) {- return _db.batch((batch) async {- for (final id in ids) {- batch.update(- _db.remoteAssetEntity,- RemoteAssetEntityCompanion(isFavorite: Value(isFavorite)),- where: (e) => e.id.equals(id),- );- }- });- }-Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) {return _db.batch((batch) async {for (final id in ids) {diff --git a/mobile/lib/pages/library/partner/partner.page.dart b/mobile/lib/pages/library/partner/partner.page.dartindex 7274b8a14e..afe64d24f4 100644--- a/mobile/lib/pages/library/partner/partner.page.dart+++ b/mobile/lib/pages/library/partner/partner.page.dart@@ -33,7 +33,7 @@ class PartnerPage extends ConsumerWidget {title: Text(context.t.partners),elevation: 0,centerTitle: false,- actions: const [ActionIconButtonWidget(action: PartnerAddAction())],+ actions: const [ActionIconButton(action: PartnerAddAction())],),body: sharedByAsync.when(data: (partners) => PartnerSharedByList(partners: partners.toList(growable: false)),@@ -60,7 +60,7 @@ class _EmptyPartners extends StatelessWidget {),const Align(alignment: .center,- child: ActionButtonWidget(action: PartnerAddAction()),+ child: ActionButton(action: PartnerAddAction()),),],),@@ -88,7 +88,7 @@ class PartnerSharedByList extends StatelessWidget {leading: PartnerUserAvatar(userId: partner.id, name: partner.name),title: Text(partner.name),subtitle: Text(partner.email),- trailing: ActionIconButtonWidget(+ trailing: ActionIconButton(action: PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),),);diff --git a/mobile/lib/presentation/actions/action.dart b/mobile/lib/presentation/actions/action.dartindex 5ceb2f855d..072c2524be 100644--- a/mobile/lib/presentation/actions/action.dart+++ b/mobile/lib/presentation/actions/action.dart@@ -1,32 +1,54 @@+import 'dart:async';+import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/user.model.dart';--class ActionScope {- final BuildContext context;- final WidgetRef ref;- final UserDto authUser;-- const ActionScope({required this.context, required this.ref, required this.authUser});+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';+import 'package:immich_mobile/providers/user.provider.dart';+import 'package:immich_mobile/utils/asset_filter.dart';++class ActionItem {+ final IconData icon;+ final String label;+ final FutureOr<void> Function() onAction;+ final FutureOr<void> Function()? onSecondaryAction;++ const ActionItem({required this.icon, required this.label, required this.onAction, this.onSecondaryAction});}-abstract class BaseAction {- const BaseAction();+abstract class ActionBuilder {+ const ActionBuilder();- IconData get icon;+ // null when the action is not applicable for the current context+ ActionItem? create(BuildContext context, WidgetRef ref);+}- String label(ActionScope scope);+final assetsActionProvider = Provider.family.autoDispose<AssetFilter<BaseAsset>, ActionSource>(+ (ref, source) => AssetFilter(switch (source) {+ .timeline => ref.watch(multiSelectProvider.select((s) => s.selectedAssets)),+ .viewer => switch (ref.watch(assetViewerProvider.select((s) => s.currentAsset))) {+ final BaseAsset asset => {asset},+ null => const <BaseAsset>{},+ },+ }),+);- bool isVisible(ActionScope scope) => true;+final clearSelectionProvider = Provider.family.autoDispose<VoidCallback, ActionSource>((ref, source) {+ if (source == .timeline) {+ return ref.read(multiSelectProvider.notifier).reset;+ }- Future<void> onAction(ActionScope scope);-}+ return () {};+});-abstract class AssetAction<T extends BaseAsset> extends BaseAction {- final Iterable<BaseAsset> assets;+final ownedAssetsActionProvider = Provider.family.autoDispose<AssetFilter<RemoteAsset>, ActionSource>(+ (ref, source) => ref.watch(assetsActionProvider(source)).owned(ref.watch(authUserProvider).id),+);- const AssetAction({required this.assets});+abstract class AssetActionBuilder extends ActionBuilder {+ final ActionSource source;- Iterable<T> filter(ActionScope scope) => assets.whereType<T>();+ const AssetActionBuilder({required this.source});}diff --git a/mobile/lib/presentation/actions/action.widget.dart b/mobile/lib/presentation/actions/action.widget.dartindex f96dc2bc2f..a865528440 100644--- a/mobile/lib/presentation/actions/action.widget.dart+++ b/mobile/lib/presentation/actions/action.widget.dart@@ -1,99 +1,71 @@import 'package:flutter/material.dart';-import 'package:flutter/widgets.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/presentation/actions/action.dart';-import 'package:immich_mobile/providers/user.provider.dart';-import 'package:immich_mobile/utils/error_handler.dart';import 'package:immich_ui/immich_ui.dart';-class _ActionWidgetScope {- final String label;- final VoidCallback onAction;+abstract class ActionWidget extends ConsumerWidget {+ final ActionBuilder action;- const _ActionWidgetScope({required this.label, required this.onAction});-}--class _ActionWidget extends ConsumerWidget {- final BaseAction action;- final Widget Function(_ActionWidgetScope context) builder;+ const ActionWidget({super.key, required this.action});- const _ActionWidget({required this.action, required this.builder});-- Future<void> _onAction(ActionScope scope) async {- try {- await action.onAction(scope);- } catch (error, stackTrace) {- if (!scope.context.mounted) {- return;- }-- handleError(scope.context, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');- }- }+ Widget builder(BuildContext context, WidgetRef ref, ActionItem action);@overrideWidget build(BuildContext context, WidgetRef ref) {- final authUser = ref.watch(currentUserProvider);- if (authUser == null) {- return const SizedBox.shrink();- }-- final scope = ActionScope(context: context, ref: ref, authUser: authUser);- if (!action.isVisible(scope)) {+ final actionItem = action.create(context, ref);+ if (actionItem == null) {return const SizedBox.shrink();}- return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));+ return builder(context, ref, actionItem);}}-class ActionIconButtonWidget extends StatelessWidget {- final BaseAction action;- final ImmichVariant variant;-- const ActionIconButtonWidget({super.key, required this.action, this.variant = .ghost});+class ActionColumnButton extends ActionWidget {+ const ActionColumnButton({super.key, required super.action});@override- Widget build(BuildContext context) => _ActionWidget(- action: action,- builder: (ctx) => ImmichIconButton(icon: action.icon, onPressed: ctx.onAction, variant: variant),+ Widget builder(BuildContext context, WidgetRef ref, ActionItem action) => ImmichColumnButton(+ icon: action.icon,+ label: action.label,+ onPressed: action.onAction,+ onLongPress: action.onSecondaryAction,);}-class ActionButtonWidget extends StatelessWidget {- final BaseAction action;+class ActionIconButton extends ActionWidget {final ImmichVariant variant;- const ActionButtonWidget({super.key, required this.action, this.variant = .ghost});+ const ActionIconButton({super.key, required super.action, this.variant = .ghost});@override- Widget build(BuildContext context) => _ActionWidget(- action: action,- builder: (ctx) =>- ImmichTextButton(labelText: ctx.label, icon: action.icon, onPressed: ctx.onAction, variant: variant),+ Widget builder(BuildContext context, WidgetRef ref, ActionItem action) => ImmichIconButton(+ icon: action.icon,+ onPressed: action.onAction,+ onLongPress: action.onSecondaryAction,+ variant: variant,);}-class ActionColumnButtonWidget extends StatelessWidget {- final BaseAction action;+class ActionButton extends ActionWidget {+ final ImmichVariant variant;- const ActionColumnButtonWidget({super.key, required this.action});+ const ActionButton({super.key, required super.action, this.variant = .ghost});@override- Widget build(BuildContext context) => _ActionWidget(- action: action,- builder: (ctx) => ImmichColumnButton(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),+ Widget builder(BuildContext context, WidgetRef ref, ActionItem action) => ImmichTextButton(+ labelText: action.label,+ icon: action.icon,+ onPressed: action.onAction,+ onLongPress: action.onSecondaryAction,+ variant: variant,);}-class ActionMenuItemWidget extends StatelessWidget {- final BaseAction action;-- const ActionMenuItemWidget({super.key, required this.action});+class ActionMenuItem extends ActionWidget {+ const ActionMenuItem({super.key, required super.action});@override- Widget build(BuildContext context) => _ActionWidget(- action: action,- builder: (ctx) => ImmichMenuItem(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),- );+ Widget builder(BuildContext context, WidgetRef ref, ActionItem action) =>+ ImmichMenuItem(icon: action.icon, label: action.label, onPressed: action.onAction);}diff --git a/mobile/lib/presentation/actions/asset_debug.action.dart b/mobile/lib/presentation/actions/asset_debug.action.dartindex aec99fc90b..ff2935fc96 100644--- a/mobile/lib/presentation/actions/asset_debug.action.dart+++ b/mobile/lib/presentation/actions/asset_debug.action.dart@@ -2,26 +2,27 @@ import 'dart:async';import 'package:auto_route/auto_route.dart';import 'package:flutter/material.dart';-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/generated/translations.g.dart';import 'package:immich_mobile/presentation/actions/action.dart';import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';import 'package:immich_mobile/routing/router.dart';-class AssetDebugAction extends AssetAction<BaseAsset> {- const AssetDebugAction({required super.assets});+class AssetDebugAction extends AssetActionBuilder {+ const AssetDebugAction({required super.source});@override- IconData get icon => Icons.help_outline_rounded;+ ActionItem? create(BuildContext context, WidgetRef ref) {+ final assets = ref.watch(assetsActionProvider(source)).assets;+ final troubleshootEnabled = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);+ if (!troubleshootEnabled || assets.length != 1) {+ return null;+ }- @override- String label(ActionScope scope) => scope.context.t.troubleshoot;-- @override- bool isVisible(ActionScope scope) =>- assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);-- @override- Future<void> onAction(ActionScope scope) async =>- unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));+ return .new(+ icon: Icons.help_outline_rounded,+ label: context.t.troubleshoot,+ onAction: () => unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.single))),+ );+ }}diff --git a/mobile/lib/presentation/actions/favorite.action.dart b/mobile/lib/presentation/actions/favorite.action.dartindex a480e10a5f..9ab3770163 100644--- a/mobile/lib/presentation/actions/favorite.action.dart+++ b/mobile/lib/presentation/actions/favorite.action.dart@@ -1,38 +1,62 @@import 'package:flutter/material.dart';-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/generated/translations.g.dart';import 'package:immich_mobile/presentation/actions/action.dart';import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';-import 'package:immich_mobile/utils/asset_filter.dart';-import 'package:immich_ui/immich_ui.dart';+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';+import 'package:immich_mobile/utils/error_handler.dart';-class FavoriteAction extends AssetAction<RemoteAsset> {- final bool favorite;+typedef _State = ({bool shouldFavorite, List<String> assetIds});- FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);+final _stateProvider = Provider.family.autoDispose<_State?, ActionSource>((ref, source) {+ final assets = ref.watch(ownedAssetsActionProvider(source));+ if (assets.isEmpty) {+ return null;+ }- @override- IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;+ 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);+});- @override- String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;+class FavoriteAction extends AssetActionBuilder {+ const FavoriteAction({required super.source});@override- Iterable<RemoteAsset> filter(ActionScope scope) =>- AssetFilter(assets).owned(scope.authUser.id).favorite(isFavorite: !favorite);-- @override- bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;+ ActionItem? create(BuildContext context, WidgetRef ref) {+ final shouldFavorite = ref.watch(_stateProvider(source).select((state) => state?.shouldFavorite));+ if (shouldFavorite == null) {+ return null;+ }++ return .new(+ icon: shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded,+ label: shouldFavorite ? context.t.favorite : context.t.unfavorite,+ onAction: () => _favorite(context, ref),+ );+ }- @override- Future<void> onAction(ActionScope scope) async {- final ActionScope(:ref) = scope;- final assets = filter(scope).map((asset) => asset.id).toList(growable: false);-- await ref.read(assetServiceProvider).updateFavorite(assets, favorite);- final message = favorite- ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)- : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);- snackbar.success(message);+ Future<void> _favorite(BuildContext context, WidgetRef ref) async {+ final state = ref.read(_stateProvider(source));+ if (state == null) {+ return;+ }++ final _State(:shouldFavorite, :assetIds) = state;+ final message = shouldFavorite+ ? context.t.favorite_action_prompt(count: assetIds.length)+ : context.t.unfavorite_action_prompt(count: assetIds.length);+ final assertService = ref.read(assetServiceProvider);+ final toastService = ref.read(toastServiceProvider);+ final clearSelection = ref.read(clearSelectionProvider(source));++ try {+ await assertService.update(assetIds, isFavorite: .some(shouldFavorite));+ toastService.success(message);+ clearSelection();+ } catch (error, stack) {+ handleError(error, stack: stack, description: "Failed to update favorite status for assets");+ }}}diff --git a/mobile/lib/presentation/actions/partner.action.dart b/mobile/lib/presentation/actions/partner.action.dartindex 11fb69ee75..012340c1d8 100644--- a/mobile/lib/presentation/actions/partner.action.dart+++ b/mobile/lib/presentation/actions/partner.action.dart@@ -6,44 +6,46 @@ import 'package:immich_mobile/presentation/actions/action.dart';import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';import 'package:immich_mobile/providers/infrastructure/user.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';+import 'package:immich_mobile/utils/error_handler.dart';import 'package:immich_mobile/widgets/common/confirm_dialog.dart';-class PartnerAddAction extends BaseAction {+class PartnerAddAction extends ActionBuilder {const PartnerAddAction();@override- IconData get icon => Icons.person_add_rounded;+ ActionItem create(BuildContext context, WidgetRef ref) =>+ ActionItem(icon: Icons.person_add_rounded, label: context.t.add_partner, onAction: () => _add(context, ref));- @override- String label(ActionScope scope) => scope.context.t.add_partner;+ Future<void> _add(BuildContext context, WidgetRef ref) async {+ final partnerService = ref.read(partnerServiceProvider);+ final authUserId = ref.read(authUserProvider).id;- @override- Future<void> onAction(ActionScope scope) async {- final ActionScope(:context, :ref, :authUser) = scope;final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());if (selected == null) {return;}- await ref.read(partnerServiceProvider).create(sharedById: authUser.id, sharedWithId: selected.id);+ try {+ await partnerService.create(sharedById: authUserId, sharedWithId: selected.id);+ } catch (error, stack) {+ handleError(error, stack: stack, description: 'Failed to add partner');+ }}}-class PartnerRemoveAction extends BaseAction {+class PartnerRemoveAction extends ActionBuilder {const PartnerRemoveAction({required this.sharedWithId, required this.partnerName});final String sharedWithId;final String partnerName;@override- IconData get icon => Icons.person_remove_rounded;-- @override- String label(ActionScope scope) => scope.context.t.remove;+ ActionItem create(BuildContext context, WidgetRef ref) =>+ ActionItem(icon: Icons.person_remove_rounded, label: context.t.remove, onAction: () => _remove(context, ref));- @override- Future<void> onAction(ActionScope scope) async {- final ActionScope(:context, :ref, :authUser) = scope;+ Future<void> _remove(BuildContext context, WidgetRef ref) async {+ final partnerService = ref.read(partnerServiceProvider);+ final authUserId = ref.read(authUserProvider).id;final confirmed = await showDialog<bool>(context: context,@@ -56,19 +58,18 @@ class PartnerRemoveAction extends BaseAction {return;}- await ref.read(partnerServiceProvider).delete(sharedById: authUser.id, sharedWithId: sharedWithId);+ try {+ await partnerService.delete(sharedById: authUserId, sharedWithId: sharedWithId);+ } catch (error, stack) {+ handleError(error, stack: stack, description: 'Failed to remove partner');+ }}}@visibleForTesting-final candidatesStateProvider = StreamProvider.autoDispose<Iterable<User>>((ref) {- final currentUser = ref.watch(currentUserProvider);- // TODO: Refactor with a route guard to avoid this check in every provider- if (currentUser == null) {- return const Stream.empty();- }- return ref.watch(partnerServiceProvider).getCandidates(currentUser.id);-});+final candidatesStateProvider = StreamProvider.autoDispose<Iterable<User>>(+ (ref) => ref.watch(partnerServiceProvider).getCandidates(ref.watch(authUserProvider).id),+);@visibleForTestingclass PartnerSelectionDialog extends ConsumerWidget {diff --git a/mobile/lib/presentation/actions/timeline.action.dart b/mobile/lib/presentation/actions/timeline.action.dartdeleted file mode 100644index d8d367f674..0000000000--- a/mobile/lib/presentation/actions/timeline.action.dart+++ /dev/null@@ -1,24 +0,0 @@-import 'package:flutter/material.dart';-import 'package:immich_mobile/presentation/actions/action.dart';-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';--class TimelineAction extends BaseAction {- final BaseAction action;-- const TimelineAction({required this.action});-- @override- IconData get icon => action.icon;-- @override- String label(ActionScope scope) => action.label(scope);-- @override- bool isVisible(ActionScope scope) => action.isVisible(scope);-- @override- Future<void> onAction(ActionScope scope) async {- await action.onAction(scope);- scope.ref.read(multiSelectProvider.notifier).reset();- }-}diff --git a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dartdeleted file mode 100644index 0f3ce47122..0000000000--- a/mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart+++ /dev/null@@ -1,61 +0,0 @@-import 'package:flutter/material.dart';-import 'package:fluttertoast/fluttertoast.dart';-import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/constants/enums.dart';-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/extensions/translate_extensions.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';-import 'package:immich_mobile/widgets/common/immich_toast.dart';--class FavoriteActionButton extends ConsumerWidget {- final ActionSource source;- final bool iconOnly;- final bool menuItem;-- const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});-- Future<void> _onTap(BuildContext context, WidgetRef ref) async {- if (!context.mounted) {- return;- }-- final result = await ref.read(actionProvider.notifier).favorite(source);-- if (source == ActionSource.viewer) {- if (result.success) {- final currentAsset = ref.read(assetViewerProvider).currentAsset;- if (currentAsset is RemoteAsset && !currentAsset.isFavorite) {- ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: true));- }- }- return;- }-- ref.read(multiSelectProvider.notifier).reset();- if (!context.mounted) {- return;- }-- final successMessage = 'favorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});- ImmichToast.show(- context: context,- msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),- gravity: ToastGravity.BOTTOM,- toastType: result.success ? ToastType.success : ToastType.error,- );- }-- @override- Widget build(BuildContext context, WidgetRef ref) {- return BaseActionButton(- iconData: Icons.favorite_border_rounded,- label: "favorite".t(context: context),- iconOnly: iconOnly,- menuItem: menuItem,- onPressed: () => _onTap(context, ref),- );- }-}diff --git a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dartdeleted file mode 100644index be6c3b0180..0000000000--- a/mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart+++ /dev/null@@ -1,61 +0,0 @@-import 'package:flutter/material.dart';-import 'package:fluttertoast/fluttertoast.dart';-import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/constants/enums.dart';-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/extensions/translate_extensions.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';-import 'package:immich_mobile/widgets/common/immich_toast.dart';--class UnFavoriteActionButton extends ConsumerWidget {- final ActionSource source;- final bool iconOnly;- final bool menuItem;-- const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});-- Future<void> _onTap(BuildContext context, WidgetRef ref) async {- if (!context.mounted) {- return;- }-- final result = await ref.read(actionProvider.notifier).unFavorite(source);-- if (source == ActionSource.viewer) {- if (result.success) {- final currentAsset = ref.read(assetViewerProvider).currentAsset;- if (currentAsset is RemoteAsset && currentAsset.isFavorite) {- ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: false));- }- }- return;- }-- ref.read(multiSelectProvider.notifier).reset();- if (!context.mounted) {- return;- }-- final successMessage = 'unfavorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});- ImmichToast.show(- context: context,- msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),- gravity: ToastGravity.BOTTOM,- toastType: result.success ? ToastType.success : ToastType.error,- );- }-- @override- Widget build(BuildContext context, WidgetRef ref) {- return BaseActionButton(- iconData: Icons.favorite_rounded,- label: "unfavorite".t(context: context),- onPressed: () => _onTap(context, ref),- iconOnly: iconOnly,- menuItem: menuItem,- );- }-}diff --git a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dartindex 9c9f8f7139..deae9cbd07 100644--- a/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart@@ -46,7 +46,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);final originalTheme = context.themeData;- final assetForAction = [asset];final actions = <Widget>[if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),@@ -66,7 +65,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {},),- ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),+ const ActionIconButton(action: FavoriteAction(source: .viewer)),ImmichColorOverride(color: null, child: ViewerKebabMenu(originalTheme: originalTheme)),];diff --git a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dartindex 3c9c0c692e..85fa8b4563 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart@@ -5,7 +5,6 @@ import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/domain/models/album/album.model.dart';import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/presentation/actions/favorite.action.dart';-import 'package:immich_mobile/presentation/actions/timeline.action.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';@@ -76,9 +75,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);}- final assets = multiselect.selectedAssets.toList(growable: false);- final actions = [FavoriteAction(assets: assets)];-return BaseBottomSheet(controller: sheetController,initialChildSize: 0.25,@@ -89,7 +85,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {if (multiselect.hasRemote) ...[const ShareLinkActionButton(source: ActionSource.timeline),const UnArchiveActionButton(source: ActionSource.timeline),- ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),+ const ActionColumnButton(action: FavoriteAction(source: .timeline)),if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),isTrashEnable? const TrashActionButton(source: ActionSource.timeline)diff --git a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dartindex 4382eeba5d..6447c5ccf8 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/presentation/actions/favorite.action.dart';-import 'package:immich_mobile/presentation/actions/timeline.action.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';@@ -77,9 +76,6 @@ class FavoriteBottomSheet extends ConsumerWidget {ref.read(multiSelectProvider.notifier).reset();}- final assets = multiselect.selectedAssets.toList(growable: false);- final actions = [FavoriteAction(assets: assets)];-return BaseBottomSheet(initialChildSize: 0.4,maxChildSize: 0.7,@@ -88,7 +84,7 @@ class FavoriteBottomSheet extends ConsumerWidget {const ShareActionButton(source: ActionSource.timeline),if (multiselect.hasRemote) ...[const ShareLinkActionButton(source: ActionSource.timeline),- ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),+ const ActionColumnButton(action: FavoriteAction(source: .timeline)),const ArchiveActionButton(source: ActionSource.timeline),if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),isTrashEnablediff --git a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dartindex 1949a79495..2f1ffe4cbc 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart@@ -4,8 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/domain/models/album/album.model.dart';import 'package:immich_mobile/presentation/actions/action.widget.dart';-import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';-import 'package:immich_mobile/presentation/actions/timeline.action.dart';+import 'package:immich_mobile/presentation/actions/favorite.action.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';@@ -14,7 +13,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permaneimport 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';@@ -83,9 +81,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);}- final assets = multiselect.selectedAssets.toList(growable: false);- final actions = [AssetDebugAction(assets: assets)];-return BaseBottomSheet(controller: sheetController,initialChildSize: widget.minChildSize ?? 0.15,@@ -93,7 +88,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {maxChildSize: 0.85,shouldCloseOnMinExtent: false,actions: [- ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),+ const ActionColumnButton(action: FavoriteAction(source: .timeline)),const ShareActionButton(source: ActionSource.timeline),if (multiselect.hasRemote) ...[const ShareLinkActionButton(source: ActionSource.timeline),@@ -101,7 +96,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {isTrashEnable? const TrashActionButton(source: ActionSource.timeline): const DeletePermanentActionButton(source: ActionSource.timeline),- const FavoriteActionButton(source: ActionSource.timeline),+ const ActionColumnButton(action: FavoriteAction(source: .timeline)),const ArchiveActionButton(source: ActionSource.timeline),if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),const EditDateTimeActionButton(source: ActionSource.timeline),diff --git a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dartindex a292c1899c..f6cbc5eac9 100644--- a/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart+++ b/mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/models/album/album.model.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/presentation/actions/favorite.action.dart';-import 'package:immich_mobile/presentation/actions/timeline.action.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';@@ -85,9 +84,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);}- final assets = multiselect.selectedAssets.toList(growable: false);- final actions = [FavoriteAction(assets: assets)];-return BaseBottomSheet(controller: sheetController,initialChildSize: 0.22,@@ -101,7 +97,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>if (ownsAlbum) ...[const ArchiveActionButton(source: ActionSource.timeline),- ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),+ const ActionColumnButton(action: FavoriteAction(source: .timeline)),],const DownloadActionButton(source: ActionSource.timeline),if (ownsAlbum) ...[diff --git a/mobile/lib/providers/infrastructure/action.provider.dart b/mobile/lib/providers/infrastructure/action.provider.dartindex 7e08686078..d4cd39bbd3 100644--- a/mobile/lib/providers/infrastructure/action.provider.dart+++ b/mobile/lib/providers/infrastructure/action.provider.dart@@ -137,28 +137,6 @@ class ActionNotifier extends Notifier<void> {}}- Future<ActionResult> favorite(ActionSource source) async {- final ids = _getOwnedRemoteIdsForSource(source);- try {- await _service.favorite(ids);- return ActionResult(count: ids.length, success: true);- } catch (error, stack) {- _logger.severe('Failed to favorite assets', error, stack);- return ActionResult(count: ids.length, success: false, error: error.toString());- }- }-- Future<ActionResult> unFavorite(ActionSource source) async {- final ids = _getOwnedRemoteIdsForSource(source);- try {- await _service.unFavorite(ids);- return ActionResult(count: ids.length, success: true);- } catch (error, stack) {- _logger.severe('Failed to unfavorite assets', error, stack);- return ActionResult(count: ids.length, success: false, error: error.toString());- }- }-Future<ActionResult> archive(ActionSource source) async {final ids = _getOwnedRemoteIdsForSource(source);try {diff --git a/mobile/lib/providers/infrastructure/toast.provider.dart b/mobile/lib/providers/infrastructure/toast.provider.dartindex 27d1cf9e6b..eaaffd6fca 100644--- a/mobile/lib/providers/infrastructure/toast.provider.dart+++ b/mobile/lib/providers/infrastructure/toast.provider.dart@@ -1,4 +1,4 @@import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/repositories/toast.repository.dart';+import 'package:immich_mobile/services/toast.service.dart';-final toastRepositoryProvider = Provider<ToastRepository>((ref) => const .new());+final toastServiceProvider = Provider<ToastService>((ref) => const .new());diff --git a/mobile/lib/providers/user.provider.dart b/mobile/lib/providers/user.provider.dartindex 2feb39ce5c..427a1bf1c7 100644--- a/mobile/lib/providers/user.provider.dart+++ b/mobile/lib/providers/user.provider.dart@@ -30,3 +30,11 @@ class CurrentUserProvider extends StateNotifier<UserDto?> {final currentUserProvider = StateNotifierProvider<CurrentUserProvider, UserDto?>((ref) {return CurrentUserProvider(ref.watch(userServiceProvider));});++final authUserProvider = Provider<UserDto>((ref) {+ final user = ref.watch(currentUserProvider);+ if (user == null) {+ throw Exception('User must be logged in to access this provider');+ }+ return user;+});diff --git a/mobile/lib/repositories/asset_api.repository.dart b/mobile/lib/repositories/asset_api.repository.dartindex 2024b75c6e..9b92b491bf 100644--- a/mobile/lib/repositories/asset_api.repository.dart+++ b/mobile/lib/repositories/asset_api.repository.dart@@ -111,11 +111,6 @@ class AssetApiRepository extends ApiRepository {);}- // TODO(shenlong): remove after action migration- Future<void> updateFavorite(List<String> ids, bool isFavorite) async {- return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: Optional.present(isFavorite)));- }-Future<void> updateLocation(List<String> ids, LatLng location) async {return _api.updateAssets(AssetBulkUpdateDto(diff --git a/mobile/lib/services/action.service.dart b/mobile/lib/services/action.service.dartindex 5986f0407d..dd1b3e8496 100644--- a/mobile/lib/services/action.service.dart+++ b/mobile/lib/services/action.service.dart@@ -68,16 +68,6 @@ class ActionService {unawaited(context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds)));}- Future<void> favorite(List<String> remoteIds) async {- await _assetApiRepository.updateFavorite(remoteIds, true);- await _remoteAssetRepository.updateFavorite(remoteIds, true);- }-- Future<void> unFavorite(List<String> remoteIds) async {- await _assetApiRepository.updateFavorite(remoteIds, false);- await _remoteAssetRepository.updateFavorite(remoteIds, false);- }-Future<void> archive(List<String> remoteIds) async {await _assetApiRepository.updateVisibility(remoteIds, .archive);await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);diff --git a/mobile/lib/repositories/toast.repository.dart b/mobile/lib/services/toast.service.dartsimilarity index 91%rename from mobile/lib/repositories/toast.repository.dartrename to mobile/lib/services/toast.service.dartindex 0cca50fdec..2b61a945ff 100644--- a/mobile/lib/repositories/toast.repository.dart+++ b/mobile/lib/services/toast.service.dart@@ -9,8 +9,8 @@ class ToastOption {const ToastOption({this.timeout, this.onUndo});}-class ToastRepository {- const ToastRepository();+class ToastService {+ const ToastService();FutureOr<void> success(String message, {ToastOption? toast}) {snackbar.success(message, duration: toast?.timeout);diff --git a/mobile/lib/utils/action_button.utils.dart b/mobile/lib/utils/action_button.utils.dartindex 0e5a3123e7..4219e0aed7 100644--- a/mobile/lib/utils/action_button.utils.dart+++ b/mobile/lib/utils/action_button.utils.dart@@ -192,7 +192,7 @@ enum ActionButtonType {bool menuItem = false,]) {return switch (this) {- ActionButtonType.advancedInfo => ActionMenuItemWidget(action: AssetDebugAction(assets: [context.asset])),+ ActionButtonType.advancedInfo => ActionMenuItem(action: AssetDebugAction(source: context.source)),ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),ActionButtonType.shareLink => ShareLinkActionButton(source: context.source,diff --git a/mobile/test/repository.mocks.dart b/mobile/test/repository.mocks.dartindex 82c9395b58..b56a8a098a 100644--- a/mobile/test/repository.mocks.dart+++ b/mobile/test/repository.mocks.dart@@ -6,7 +6,6 @@ import 'package:immich_mobile/repositories/auth.repository.dart';import 'package:immich_mobile/repositories/auth_api.repository.dart';import 'package:immich_mobile/repositories/download.repository.dart';import 'package:immich_mobile/repositories/permission.repository.dart';-import 'package:immich_mobile/repositories/toast.repository.dart';import 'package:mocktail/mocktail.dart';class MockAssetApiRepository extends Mock implements AssetApiRepository {}@@ -24,5 +23,3 @@ class MockTagService extends Mock implements TagService {}class MockDownloadRepository extends Mock implements DownloadRepository {}class MockRemoteExifRepository extends Mock implements RemoteExifRepository {}--class MockToastRepository extends Mock implements ToastRepository {}diff --git a/mobile/test/service.mocks.dart b/mobile/test/service.mocks.dartindex 300c54dcbb..785567de56 100644--- a/mobile/test/service.mocks.dart+++ b/mobile/test/service.mocks.dart@@ -12,6 +12,7 @@ import 'package:immich_mobile/services/foreground_upload.service.dart';import 'package:immich_mobile/services/gcast.service.dart';import 'package:immich_mobile/services/network.service.dart';import 'package:immich_mobile/services/server_info.service.dart';+import 'package:immich_mobile/services/toast.service.dart';import 'package:mocktail/mocktail.dart';class MockApiService extends Mock implements ApiService {}@@ -43,3 +44,5 @@ class MockServerInfoService extends Mock implements ServerInfoService {}class MockCleanupService extends Mock implements CleanupService {}class MockBackgroundSyncManager extends Mock implements BackgroundSyncManager {}++class MockToastService extends Mock implements ToastService {}diff --git a/mobile/test/unit/mocks.dart b/mobile/test/unit/mocks.dartindex d8eadda7ae..7dd15eb9a3 100644--- a/mobile/test/unit/mocks.dart+++ b/mobile/test/unit/mocks.dart@@ -30,7 +30,6 @@ class RepositoryMocks {final remoteAsset = RemoteAssetRepositoryStub(MockRemoteAssetRepository());final remoteExif = RemoteExifRepositoryStub(MockRemoteExifRepository());final trashedAsset = MockTrashedLocalAssetRepository();- final toast = MockToastRepository();final remoteAlbum = MockRemoteAlbumRepository();final albumApi = MockDriftAlbumApiRepository();@@ -56,7 +55,6 @@ class RepositoryMocks {assetApi.reset();assetMedia.reset();download.reset();- reset(toast);_stubLocalAlbumRepository();_stubLocalAssetRepository();_stubRemoteAssetRepository();@@ -115,6 +113,7 @@ class ServiceMocks {final upload = MockForegroundUploadService();final cast = MockGCastService();final serverInfo = MockServerInfoService();+ final toast = MockToastService();ServiceMocks() {resetAll();@@ -132,6 +131,7 @@ class ServiceMocks {reset(serverInfo);reset(backgroundSync);reset(upload);+ reset(toast);_stubUserService();_stubPartnerService();_stubAssetService();diff --git a/mobile/test/unit/presentation/actions/asset_debug_action_test.dart b/mobile/test/unit/presentation/actions/asset_debug_action_test.dartindex 4e84c100cb..1644df0396 100644--- a/mobile/test/unit/presentation/actions/asset_debug_action_test.dart+++ b/mobile/test/unit/presentation/actions/asset_debug_action_test.dart@@ -24,7 +24,8 @@ void main() {testWidgets('visible for a single asset when advanced troubleshooting is on', (tester) async {await tester.pumpTestWidget(context,- ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),+ const ActionIconButton(action: AssetDebugAction(source: .timeline)),+ overrides: context.selected({RemoteAssetFactory.create()}),);expect(find.byType(ImmichIconButton), findsOneWidget);@@ -33,9 +34,8 @@ void main() {testWidgets('hidden for multiple assets', (tester) async {await tester.pumpTestWidget(context,- ActionIconButtonWidget(- action: AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()]),- ),+ const ActionIconButton(action: AssetDebugAction(source: .timeline)),+ overrides: context.selected({RemoteAssetFactory.create(), RemoteAssetFactory.create()}),);expect(find.byType(ImmichIconButton), findsNothing);@@ -43,9 +43,11 @@ void main() {testWidgets('hidden when advanced troubleshooting is off', (tester) async {await StoreService.I.put(StoreKey.advancedTroubleshooting, false);+await tester.pumpTestWidget(context,- ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),+ const ActionIconButton(action: AssetDebugAction(source: .timeline)),+ overrides: context.selected({RemoteAssetFactory.create()}),);expect(find.byType(ImmichIconButton), findsNothing);diff --git a/mobile/test/unit/presentation/actions/favorite_action_test.dart b/mobile/test/unit/presentation/actions/favorite_action_test.dartindex 722d9d1dc7..cb4d6130ab 100644--- a/mobile/test/unit/presentation/actions/favorite_action_test.dart+++ b/mobile/test/unit/presentation/actions/favorite_action_test.dart@@ -1,7 +1,10 @@import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/presentation/actions/favorite.action.dart';+import 'package:immich_mobile/utils/option.dart';+import 'package:immich_ui/immich_ui.dart';import 'package:mocktail/mocktail.dart';import '../../../service.mocks.dart';@@ -24,55 +27,66 @@ void main() {RemoteAsset owned({bool isFavorite = false}) =>RemoteAssetFactory.create(ownerId: context.currentUser.id, isFavorite: isFavorite);+ Future<void> pumpFavorite(WidgetTester tester, Set<BaseAsset> selection) =>+ tester.pumpTestAction(context, const FavoriteAction(source: .timeline), overrides: context.selected(selection));+group('FavoriteAction', () {testWidgets('favorites the eligible owned assets', (tester) async {final asset = owned();- await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));+ await pumpFavorite(tester, {asset});- verify(() => assetService.updateFavorite([asset.id], true)).called(1);+ verify(() => assetService.update([asset.id], isFavorite: const Option.some(true))).called(1);});testWidgets('unfavorite the eligible owned assets', (tester) async {final asset = owned(isFavorite: true);- await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));+ await pumpFavorite(tester, {asset});- verify(() => assetService.updateFavorite([asset.id], false)).called(1);+ verify(() => assetService.update([asset.id], isFavorite: const Option.some(false))).called(1);});testWidgets('ignores assets owned by someone else', (tester) async {final mine = owned();final theirs = RemoteAssetFactory.create();- await tester.pumpTestAction(context, FavoriteAction(assets: [mine, theirs]));-- verify(() => assetService.updateFavorite([mine.id], true)).called(1);- });-- testWidgets('batches every eligible owned asset into a single call', (tester) async {- final first = owned();- final second = owned();-- await tester.pumpTestAction(context, FavoriteAction(assets: [first, second]));+ await pumpFavorite(tester, {mine, theirs});- verify(() => assetService.updateFavorite([first.id, second.id], true)).called(1);+ verify(() => assetService.update([mine.id], isFavorite: const Option.some(true))).called(1);});testWidgets('skips owned assets already in the target state', (tester) async {final stale = owned();final alreadyFavorite = owned(isFavorite: true);- await tester.pumpTestAction(context, FavoriteAction(assets: [stale, alreadyFavorite]));+ await pumpFavorite(tester, {stale, alreadyFavorite});- verify(() => assetService.updateFavorite([stale.id], true)).called(1);+ verify(() => assetService.update([stale.id], isFavorite: const Option.some(true))).called(1);});testWidgets('shows a confirmation snackbar on success', (tester) async {- await tester.pumpTestAction(context, FavoriteAction(assets: [owned()]));+ await pumpFavorite(tester, {owned()});await tester.pumpUntilFound(find.byType(SnackBar));expect(find.byType(SnackBar), findsOneWidget);});++ testWidgets('clears the selection once the update succeeds', (tester) async {+ await pumpFavorite(tester, {owned()});+ await tester.pumpAndSettle();++ expect(find.byType(ImmichIconButton), findsNothing, reason: 'an empty selection hides the action');+ });++ testWidgets('is hidden when none of the selected assets are owned', (tester) async {+ await tester.pumpTestWidget(+ context,+ const ActionIconButton(action: FavoriteAction(source: .timeline)),+ overrides: context.selected({RemoteAssetFactory.create()}),+ );++ expect(find.byType(ImmichIconButton), findsNothing);+ });});}diff --git a/mobile/test/unit/presentation/actions/timeline_action_test.dart b/mobile/test/unit/presentation/actions/timeline_action_test.dartdeleted file mode 100644index 5661be72c0..0000000000--- a/mobile/test/unit/presentation/actions/timeline_action_test.dart+++ /dev/null@@ -1,108 +0,0 @@-import 'package:flutter/material.dart';-import 'package:flutter_test/flutter_test.dart';-import 'package:hooks_riverpod/hooks_riverpod.dart';-import 'package:immich_mobile/presentation/actions/action.dart';-import 'package:immich_mobile/presentation/actions/action.widget.dart';-import 'package:immich_mobile/presentation/actions/timeline.action.dart';-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';--import '../../factories/remote_asset_factory.dart';-import '../presentation_context.dart';--class _FakeAction extends BaseAction {- _FakeAction({this.visible = true, this.error});-- final bool visible;- final Object? error;-- bool ran = false;- bool? selectionDuringOnAction;-- @override- IconData get icon => Icons.bolt;-- @override- String label(ActionScope scope) => 'fake';-- @override- bool isVisible(ActionScope scope) => visible;-- @override- Future<void> onAction(ActionScope scope) async {- ran = true;- selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;- if (error != null) {- throw error!;- }- }-}--void main() {- late PresentationContext context;-- setUp(() async {- context = await PresentationContext.create();- });-- tearDown(() {- context.dispose();- });-- List<Override> overrides() => [- multiSelectProvider.overrideWith(- () => MultiSelectNotifier(- MultiSelectState(selectedAssets: {RemoteAssetFactory.create()}, lockedSelectionAssets: const {}),- ),- ),- ];-- Future<(ActionScope, ProviderContainer)> pumpScope(WidgetTester tester) async {- late ActionScope scope;- late ProviderContainer container;- await tester.pumpTestWidget(- context,- Consumer(- builder: (innerContext, ref, _) {- scope = ActionScope(context: innerContext, ref: ref, authUser: context.currentUser);- container = ProviderScope.containerOf(innerContext, listen: false);- return const SizedBox.shrink();- },- ),- overrides: overrides(),- );- return (scope, container);- }-- group('TimelineAction', () {- testWidgets('runs the wrapped action and then clears the selection', (tester) async {- final inner = _FakeAction();- final (scope, container) = await pumpScope(tester);- await TimelineAction(action: inner).onAction(scope);-- expect(inner.ran, isTrue);- expect(inner.selectionDuringOnAction, isTrue, reason: 'reset must run after the inner action, not before');- expect(container.read(multiSelectProvider).isEnabled, isFalse);- });-- testWidgets('rethrows and keeps the selection when the wrapped action throws', (tester) async {- final error = Exception('boom');- final inner = _FakeAction(error: error);- final (scope, container) = await pumpScope(tester);-- await expectLater(TimelineAction(action: inner).onAction(scope), throwsA(same(error)));-- expect(inner.ran, isTrue);- expect(container.read(multiSelectProvider).isEnabled, isTrue);- });-- testWidgets('delegates visibility to the wrapped action', (tester) async {- await tester.pumpTestWidget(- context,- ActionIconButtonWidget(action: TimelineAction(action: _FakeAction(visible: false))),- );-- expect(find.byType(ActionIconButtonWidget), findsOneWidget);- expect(find.byIcon(Icons.bolt), findsNothing);- });- });-}diff --git a/mobile/test/unit/presentation/partner_page_test.dart b/mobile/test/unit/presentation/partner_page_test.dartindex ee9c6a3575..e6ff8fc83f 100644--- a/mobile/test/unit/presentation/partner_page_test.dart+++ b/mobile/test/unit/presentation/partner_page_test.dart@@ -3,7 +3,9 @@ import 'package:flutter_test/flutter_test.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/user.model.dart';import 'package:immich_mobile/pages/library/partner/partner.page.dart';+import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/presentation/actions/partner.action.dart';+import 'package:immich_ui/immich_ui.dart';import '../factories/partner_user_factory.dart';import '../factories/user_factory.dart';@@ -17,12 +19,10 @@ void main() {group('PartnerSharedByList', () {testWidgets('shows the empty-state add button when there are no partners', (tester) async {- const action = PartnerAddAction();-await tester.pumpTestWidget(context, const PartnerSharedByList(partners: []));expect(find.byType(ListView), findsNothing);- expect(find.widgetWithIcon(TextButton, action.icon), findsOneWidget);+ expect(find.descendant(of: find.byType(ActionButton), matching: find.byType(ImmichTextButton)), findsOneWidget);});testWidgets('renders a tile per partner with name and email', (tester) async {@@ -39,9 +39,11 @@ void main() {testWidgets('renders a remove action for each partner', (tester) async {final partner1 = PartnerFactory.create(inTimeline: true);final partner2 = PartnerFactory.create();- const action = PartnerRemoveAction(sharedWithId: '', partnerName: '');await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));- expect(find.byIcon(action.icon), findsNWidgets(2));+ expect(+ find.descendant(of: find.byType(ActionIconButton), matching: find.byType(ImmichIconButton)),+ findsNWidgets(2),+ );});});diff --git a/mobile/test/unit/presentation/presentation_context.dart b/mobile/test/unit/presentation/presentation_context.dartindex 25de583049..a45c1c14f9 100644--- a/mobile/test/unit/presentation/presentation_context.dart+++ b/mobile/test/unit/presentation/presentation_context.dart@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/locales.dart';+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/domain/models/store.model.dart';import 'package:immich_mobile/domain/models/user.model.dart';import 'package:immich_mobile/domain/services/store.service.dart';@@ -16,6 +17,7 @@ import 'package:immich_mobile/presentation/actions/action.widget.dart';import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';import 'package:immich_mobile/providers/infrastructure/user.provider.dart';import 'package:immich_mobile/providers/routes.provider.dart';+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';import 'package:immich_mobile/services/gcast.service.dart';import 'package:immich_mobile/services/server_info.service.dart';@@ -52,6 +54,12 @@ class PresentationContext {inLockedViewProvider.overrideWithValue(false),];+ List<Override> selected(Set<BaseAsset> assets) => [+ multiSelectProvider.overrideWith(+ () => MultiSelectNotifier(MultiSelectState(selectedAssets: assets, lockedSelectionAssets: const {})),+ ),+ ];+static Future<PresentationContext> create() async {TestUtils.init();if (_db == null) {@@ -103,10 +111,10 @@ extension PumpPresentationWidget on WidgetTester {Future<void> pumpTestAction(PresentationContext context,- BaseAction action, {+ ActionBuilder action, {List<Override> overrides = const [],}) async {- await pumpTestWidget(context, ActionIconButtonWidget(action: action), overrides: overrides);+ await pumpTestWidget(context, ActionIconButton(action: action), overrides: overrides);await tap(find.byType(ImmichIconButton));await pump();}