Adding view Service and Account activities feature

YassinLokhat · YassinLokhat · commit 01a05f5af5e6 · 2026-01-13T10:23:20.000+03:00
diff --git a/GUI/WPF/ViewModels/Controls/ActivityViewModel.cs b/GUI/WPF/ViewModels/Controls/ActivityViewModel.cs
@@ -33,13 +33,14 @@ protected virtual void OnPropertyChanged(string propertyName)
          PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
       }
 
-      public bool MeetsConditions(DateTime fromDateFilter, DateTime toDateFilter, ActivityEventType eventType, string message, bool needsReview)
+      public bool MeetsConditions(string itemId, DateTime fromDateFilter, DateTime toDateFilter, ActivityEventType eventType, string message, bool needsReview)
       {
-         return (fromDateFilter > System.DateTime.Now.Date
-            || Activity.DateTime.Date >= fromDateFilter) && (toDateFilter > System.DateTime.Now.Date
-            || Activity.DateTime.Date <= toDateFilter) && (eventType == ActivityEventType.None
-            || Activity.EventType == eventType) && (!needsReview
-            || Activity.NeedsReview) && Activity.Message.Contains(message, StringComparison.CurrentCultureIgnoreCase);
+         return (string.IsNullOrEmpty(itemId) || Activity.ItemId == itemId)
+            && (fromDateFilter > System.DateTime.Now.Date
+               || Activity.DateTime.Date >= fromDateFilter) && (toDateFilter > System.DateTime.Now.Date
+               || Activity.DateTime.Date <= toDateFilter) && (eventType == ActivityEventType.None
+               || Activity.EventType == eventType) && (!needsReview
+               || Activity.NeedsReview) && Activity.Message.Contains(message, StringComparison.CurrentCultureIgnoreCase);
       }
    }
 }
diff --git a/GUI/WPF/ViewModels/MainViewModel.cs b/GUI/WPF/ViewModels/MainViewModel.cs
@@ -3,6 +3,7 @@
 using Upsilon.Apps.Passkey.Core.Utils;
 using Upsilon.Apps.Passkey.GUI.WPF.Helper;
 using Upsilon.Apps.Passkey.GUI.WPF.OSSpecific;
+using Upsilon.Apps.Passkey.GUI.WPF.Views;
 using Upsilon.Apps.Passkey.Interfaces.Models;
 using Upsilon.Apps.Passkey.Interfaces.Utils;
 
@@ -30,6 +31,11 @@ public static string AppTitle
 
       public static IUser User => Database is null || Database.User is null ? throw new NullReferenceException(nameof(User)) : Database.User;
 
+      public static AccountPasswordsWarningView? AccountPasswordsWarningView;
+      public static DuplicatedPasswordsWarningView? DuplicatedPasswordsWarningView;
+      public static UserActivitiesView? UserActivitiesView;
+      public static Action<string>? GoToItem;
+
       public string DatabaseFile
       {
          get;
diff --git a/GUI/WPF/ViewModels/UserActivitiesViewModel.cs b/GUI/WPF/ViewModels/UserActivitiesViewModel.cs
@@ -101,15 +101,23 @@ public UserActivitiesViewModel()
          RefreshFilters();
       }
 
-      public void RefreshFilters()
+      public void ClearFilters()
+      {
+         FromDateFilter = ToDateFilter = DateTime.Now.Date.AddDays(1);
+         EventType = ActivityEventType.None;
+         Message = string.Empty;
+         NeedsReview = false;
+      }
+
+      public void RefreshFilters(string itemId = "")
       {
          Activities.Clear();
 
          if (MainViewModel.Database?.Activities is null) return;
 
          ActivityViewModel[] activities = [.. MainViewModel.Database.Activities
             .Select(x => new ActivityViewModel(x))
-            .Where(x => x.MeetsConditions(FromDateFilter, ToDateFilter, EventType, Message, NeedsReview))
+            .Where(x => x.MeetsConditions(itemId, FromDateFilter, ToDateFilter, EventType, Message, NeedsReview))
             .OrderByDescending(x => x.DateTime)];
 
          foreach (ActivityViewModel activity in activities)
diff --git a/GUI/WPF/Views/AccountPasswordsWarningView.xaml.cs b/GUI/WPF/Views/AccountPasswordsWarningView.xaml.cs
@@ -13,9 +13,8 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views
    public partial class AccountPasswordsWarningView : Window
    {
       private readonly AccountPasswordsWarningViewModel _viewModel;
-      private readonly Action<string> _goToItem;
 
-      internal AccountPasswordsWarningView(WarningType warningType, Action<string> goToItem)
+      internal AccountPasswordsWarningView(WarningType warningType)
       {
          InitializeComponent();
 
@@ -24,8 +23,6 @@ internal AccountPasswordsWarningView(WarningType warningType, Action<string> goT
             WarningType = warningType,
          };
 
-         _goToItem = goToItem;
-
          _ = _warningType_CB.Items.Add((WarningType.PasswordUpdateReminderWarning | WarningType.PasswordLeakedWarning).ToReadableString());
          _ = _warningType_CB.Items.Add(WarningType.PasswordLeakedWarning.ToReadableString());
          _ = _warningType_CB.Items.Add(WarningType.PasswordUpdateReminderWarning.ToReadableString());
@@ -43,7 +40,7 @@ private void _filterClear_Button_Click(object sender, RoutedEventArgs e)
 
       private void _viewItemButton_Click(object sender, RoutedEventArgs e)
       {
-         _goToItem(_viewModel.Warnings[_warnings_DGV.SelectedIndex].Account.ItemId);
+         MainViewModel.GoToItem?.Invoke(_viewModel.Warnings[_warnings_DGV.SelectedIndex].Account.ItemId);
       }
    }
 }
diff --git a/GUI/WPF/Views/Controls/AccountView.xaml b/GUI/WPF/Views/Controls/AccountView.xaml
@@ -20,17 +20,22 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <Label Grid.Row="0"
                         Grid.Column="0"
                         Content="Label : "/>
+                <Button Grid.Row="0"
+                            Grid.Column="2"
+                            Content="👓"
+                            Click="_viewActivities_Button_Click"/>
                 <TextBox Grid.Row="0"
                             Grid.Column="1"
                             Text="{Binding Label, Mode=TwoWay}"
                             Background="{Binding LabelBackground}"/>
                 <Grid Grid.Row="1"
                       Grid.Column="0"
-                      Grid.ColumnSpan="2">
+                      Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="2*"/>
                         <ColumnDefinition Width="3*"/>
@@ -156,6 +161,7 @@
                         Content="Notes : "/>
                 <TextBox Grid.Row="2"
                             Grid.Column="1"
+                            Grid.ColumnSpan="2"
                             Text="{Binding Notes, Mode=TwoWay}"
                             Background="{Binding NotesBackground}"
                             MaxHeight="75"
@@ -165,7 +171,7 @@
                 <GroupBox Header="Options"
                             Grid.Row="3"
                             Grid.Column="0"
-                            Grid.ColumnSpan="2">
+                            Grid.ColumnSpan="3">
                     <StackPanel>
                         <StackPanel Orientation="Horizontal">
                             <CheckBox IsChecked="{Binding RemindPasswordUpdate}"
diff --git a/GUI/WPF/Views/Controls/AccountView.xaml.cs b/GUI/WPF/Views/Controls/AccountView.xaml.cs
@@ -231,5 +231,30 @@ private void _showQrCodePasswords_Clicked(object sender, RoutedEventArgs e)
             ((PasswordViewModel)((ContentPresenter)button.TemplatedParent).Content).Password,
             MainViewModel.User.ShowPasswordDelay);
       }
+
+      private void _viewActivities_Button_Click(object sender, RoutedEventArgs e)
+      {
+         if (this.GetIsBusy()
+            || _viewModel is null)
+         {
+            return;
+         }
+
+         if (this.GetIsBusy()) return;
+
+         if (MainViewModel.UserActivitiesView is not null
+            && MainViewModel.UserActivitiesView.IsLoaded)
+         {
+            UserActivitiesViewModel? vm = MainViewModel.UserActivitiesView.DataContext as UserActivitiesViewModel;
+            MainViewModel.UserActivitiesView.ViewModel.RefreshFilters(_viewModel.Account.ItemId);
+            MainViewModel.UserActivitiesView.Activate();
+            return;
+         }
+
+         MainViewModel.UserActivitiesView = new(needsReviewFilter: false);
+         MainViewModel.UserActivitiesView.ViewModel.ClearFilters();
+         MainViewModel.UserActivitiesView.ViewModel.RefreshFilters(_viewModel.Account.ItemId);
+         MainViewModel.UserActivitiesView.Show();
+      }
    }
 }
diff --git a/GUI/WPF/Views/Controls/ServiceView.xaml b/GUI/WPF/Views/Controls/ServiceView.xaml
@@ -31,9 +31,12 @@
                            Content="Service name : "/>
                     <TextBox Grid.Row="0"
                              Grid.Column="1"
-                             Grid.ColumnSpan="2"
                              Text="{Binding ServiceName, Mode=TwoWay}"
                              Background="{Binding ServiceNameBackground}"/>
+                    <Button Grid.Row="0"
+                            Grid.Column="2"
+                            Content="👓"
+                            Click="_viewActivities_Button_Click"/>
                     <Label Grid.Row="1"
                            Grid.Column="0"
                            Content="Url : "/>
diff --git a/GUI/WPF/Views/Controls/ServiceView.xaml.cs b/GUI/WPF/Views/Controls/ServiceView.xaml.cs
@@ -106,5 +106,30 @@ public bool SelectAccount(string itemId)
 
          return true;
       }
+
+      private void _viewActivities_Button_Click(object sender, RoutedEventArgs e)
+      {
+         if (this.GetIsBusy()
+            || _viewModel is null)
+         {
+            return;
+         }
+
+         if (this.GetIsBusy()) return;
+
+         if (MainViewModel.UserActivitiesView is not null
+            && MainViewModel.UserActivitiesView.IsLoaded)
+         {
+            UserActivitiesViewModel? vm = MainViewModel.UserActivitiesView.DataContext as UserActivitiesViewModel;
+            MainViewModel.UserActivitiesView.ViewModel.RefreshFilters(_viewModel.Service.ItemId);
+            MainViewModel.UserActivitiesView.Activate();
+            return;
+         }
+
+         MainViewModel.UserActivitiesView = new(needsReviewFilter: false);
+         MainViewModel.UserActivitiesView.ViewModel.ClearFilters();
+         MainViewModel.UserActivitiesView.ViewModel.RefreshFilters(_viewModel.Service.ItemId);
+         MainViewModel.UserActivitiesView.Show();
+      }
    }
 }
diff --git a/GUI/WPF/Views/DuplicatedPasswordsWarningView.xaml.cs b/GUI/WPF/Views/DuplicatedPasswordsWarningView.xaml.cs
@@ -13,16 +13,13 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views
    public partial class DuplicatedPasswordsWarningView : Window
    {
       private readonly DuplicatedPasswordsWarningViewModel _viewModel;
-      private readonly Action<string> _goToItem;
 
-      internal DuplicatedPasswordsWarningView(Action<string> goToItem)
+      internal DuplicatedPasswordsWarningView()
       {
          InitializeComponent();
 
          DataContext = _viewModel = new();
 
-         _goToItem = goToItem;
-
          _warnings_LB.ItemsSource = _viewModel.Warnings;
          _warnings_LB.SelectionChanged += _warnings_LB_SelectionChanged;
 
@@ -40,7 +37,7 @@ private void _warnings_LB_SelectionChanged(object sender, SelectionChangedEventA
 
       private void _viewItemButton_Click(object sender, RoutedEventArgs e)
       {
-         _goToItem(_viewModel.Warnings[_warnings_LB.SelectedIndex].Accounts[_warnings_DGV.SelectedIndex].Account.ItemId);
+         MainViewModel.GoToItem?.Invoke(_viewModel.Warnings[_warnings_LB.SelectedIndex].Accounts[_warnings_DGV.SelectedIndex].Account.ItemId);
       }
    }
 }
diff --git a/GUI/WPF/Views/UserActivitiesView.xaml.cs b/GUI/WPF/Views/UserActivitiesView.xaml.cs
@@ -11,41 +11,35 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views
    /// </summary>
    public partial class UserActivitiesView : Window
    {
-      private readonly UserActivitiesViewModel _viewModel;
-      private readonly Action<string> _goToItem;
+      internal readonly UserActivitiesViewModel ViewModel;
 
-      internal UserActivitiesView(bool needsReviewFilter, Action<string> goToItem)
+      internal UserActivitiesView(bool needsReviewFilter)
       {
          InitializeComponent();
 
-         DataContext = _viewModel = new()
+         DataContext = ViewModel = new()
          {
             NeedsReview = needsReviewFilter,
          };
-         
-         _goToItem = goToItem;
 
          _eventType_CB.ItemsSource = Enum.GetValues<ActivityEventType>()
             .Cast<ActivityEventType>()
             .Select(x => x.ToReadableString());
          _eventType_CB.SelectedIndex = 0;
 
-         _activities_DGV.ItemsSource = _viewModel.Activities;
+         _activities_DGV.ItemsSource = ViewModel.Activities;
 
          Loaded += (s, e) => DarkMode.SetDarkMode(this);
       }
 
       private void _filterClear_Button_Click(object sender, RoutedEventArgs e)
       {
-         _viewModel.FromDateFilter = _viewModel.ToDateFilter = DateTime.Now.Date.AddDays(1);
-         _viewModel.EventType = ActivityEventType.None;
-         _viewModel.Message = string.Empty;
-         _viewModel.NeedsReview = false;
+         ViewModel.ClearFilters();
       }
 
       private void _viewItemButton_Click(object sender, RoutedEventArgs e)
       {
-         _goToItem(_viewModel.Activities[_activities_DGV.SelectedIndex].Activity.ItemId);
+         MainViewModel.GoToItem?.Invoke(ViewModel.Activities[_activities_DGV.SelectedIndex].Activity.ItemId);
       }
    }
 }
diff --git a/GUI/WPF/Views/UserServicesView.xaml.cs b/GUI/WPF/Views/UserServicesView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,14 @@ protected virtual void OnPropertyChanged(string propertyName)`
`33`	`33`	`PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`34`	`34`	`}`
`35`	`35`
`36`		`- public bool MeetsConditions(DateTime fromDateFilter, DateTime toDateFilter, ActivityEventType eventType, string message, bool needsReview)`
	`36`	`+ public bool MeetsConditions(string itemId, DateTime fromDateFilter, DateTime toDateFilter, ActivityEventType eventType, string message, bool needsReview)`
`37`	`37`	`{`
`38`		`- return (fromDateFilter > System.DateTime.Now.Date`
`39`		`- \|\| Activity.DateTime.Date >= fromDateFilter) && (toDateFilter > System.DateTime.Now.Date`
`40`		`- \|\| Activity.DateTime.Date <= toDateFilter) && (eventType == ActivityEventType.None`
`41`		`- \|\| Activity.EventType == eventType) && (!needsReview`
`42`		`- \|\| Activity.NeedsReview) && Activity.Message.Contains(message, StringComparison.CurrentCultureIgnoreCase);`
	`38`	`+ return (string.IsNullOrEmpty(itemId) \|\| Activity.ItemId == itemId)`
	`39`	`+ && (fromDateFilter > System.DateTime.Now.Date`
	`40`	`+ \|\| Activity.DateTime.Date >= fromDateFilter) && (toDateFilter > System.DateTime.Now.Date`
	`41`	`+ \|\| Activity.DateTime.Date <= toDateFilter) && (eventType == ActivityEventType.None`
	`42`	`+ \|\| Activity.EventType == eventType) && (!needsReview`
	`43`	`+ \|\| Activity.NeedsReview) && Activity.Message.Contains(message, StringComparison.CurrentCultureIgnoreCase);`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views`
`13`	`13`	`public partial class AccountPasswordsWarningView : Window`
`14`	`14`	`{`
`15`	`15`	`private readonly AccountPasswordsWarningViewModel _viewModel;`
`16`		`- private readonly Action<string> _goToItem;`
`17`	`16`
`18`		`- internal AccountPasswordsWarningView(WarningType warningType, Action<string> goToItem)`
	`17`	`+ internal AccountPasswordsWarningView(WarningType warningType)`
`19`	`18`	`{`
`20`	`19`	`InitializeComponent();`
`21`	`20`
`@@ -24,8 +23,6 @@ internal AccountPasswordsWarningView(WarningType warningType, Action<string> goT`
`24`	`23`	`WarningType = warningType,`
`25`	`24`	`};`
`26`	`25`
`27`		`- _goToItem = goToItem;`
`28`		`-`
`29`	`26`	`_ = _warningType_CB.Items.Add((WarningType.PasswordUpdateReminderWarning \| WarningType.PasswordLeakedWarning).ToReadableString());`
`30`	`27`	`_ = _warningType_CB.Items.Add(WarningType.PasswordLeakedWarning.ToReadableString());`
`31`	`28`	`_ = _warningType_CB.Items.Add(WarningType.PasswordUpdateReminderWarning.ToReadableString());`
`@@ -43,7 +40,7 @@ private void _filterClear_Button_Click(object sender, RoutedEventArgs e)`
`43`	`40`
`44`	`41`	`private void _viewItemButton_Click(object sender, RoutedEventArgs e)`
`45`	`42`	`{`
`46`		`- _goToItem(_viewModel.Warnings[_warnings_DGV.SelectedIndex].Account.ItemId);`
	`43`	`+ MainViewModel.GoToItem?.Invoke(_viewModel.Warnings[_warnings_DGV.SelectedIndex].Account.ItemId);`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,13 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views`
`13`	`13`	`public partial class DuplicatedPasswordsWarningView : Window`
`14`	`14`	`{`
`15`	`15`	`private readonly DuplicatedPasswordsWarningViewModel _viewModel;`
`16`		`- private readonly Action<string> _goToItem;`
`17`	`16`
`18`		`- internal DuplicatedPasswordsWarningView(Action<string> goToItem)`
	`17`	`+ internal DuplicatedPasswordsWarningView()`
`19`	`18`	`{`
`20`	`19`	`InitializeComponent();`
`21`	`20`
`22`	`21`	`DataContext = _viewModel = new();`
`23`	`22`
`24`		`- _goToItem = goToItem;`
`25`		`-`
`26`	`23`	`_warnings_LB.ItemsSource = _viewModel.Warnings;`
`27`	`24`	`_warnings_LB.SelectionChanged += _warnings_LB_SelectionChanged;`
`28`	`25`
`@@ -40,7 +37,7 @@ private void _warnings_LB_SelectionChanged(object sender, SelectionChangedEventA`
`40`	`37`
`41`	`38`	`private void _viewItemButton_Click(object sender, RoutedEventArgs e)`
`42`	`39`	`{`
`43`		`- _goToItem(_viewModel.Warnings[_warnings_LB.SelectedIndex].Accounts[_warnings_DGV.SelectedIndex].Account.ItemId);`
	`40`	`+ MainViewModel.GoToItem?.Invoke(_viewModel.Warnings[_warnings_LB.SelectedIndex].Accounts[_warnings_DGV.SelectedIndex].Account.ItemId);`
`44`	`41`	`}`
`45`	`42`	`}`
`46`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,41 +11,35 @@ namespace Upsilon.Apps.Passkey.GUI.WPF.Views`
`11`	`11`	`/// </summary>`
`12`	`12`	`public partial class UserActivitiesView : Window`
`13`	`13`	`{`
`14`		`- private readonly UserActivitiesViewModel _viewModel;`
`15`		`- private readonly Action<string> _goToItem;`
	`14`	`+ internal readonly UserActivitiesViewModel ViewModel;`
`16`	`15`
`17`		`- internal UserActivitiesView(bool needsReviewFilter, Action<string> goToItem)`
	`16`	`+ internal UserActivitiesView(bool needsReviewFilter)`
`18`	`17`	`{`
`19`	`18`	`InitializeComponent();`
`20`	`19`
`21`		`- DataContext = _viewModel = new()`
	`20`	`+ DataContext = ViewModel = new()`
`22`	`21`	`{`
`23`	`22`	`NeedsReview = needsReviewFilter,`
`24`	`23`	`};`
`25`		`-`
`26`		`- _goToItem = goToItem;`
`27`	`24`
`28`	`25`	`_eventType_CB.ItemsSource = Enum.GetValues<ActivityEventType>()`
`29`	`26`	`.Cast<ActivityEventType>()`
`30`	`27`	`.Select(x => x.ToReadableString());`
`31`	`28`	`_eventType_CB.SelectedIndex = 0;`
`32`	`29`
`33`		`- _activities_DGV.ItemsSource = _viewModel.Activities;`
	`30`	`+ _activities_DGV.ItemsSource = ViewModel.Activities;`
`34`	`31`
`35`	`32`	`Loaded += (s, e) => DarkMode.SetDarkMode(this);`
`36`	`33`	`}`
`37`	`34`
`38`	`35`	`private void _filterClear_Button_Click(object sender, RoutedEventArgs e)`
`39`	`36`	`{`
`40`		`- _viewModel.FromDateFilter = _viewModel.ToDateFilter = DateTime.Now.Date.AddDays(1);`
`41`		`- _viewModel.EventType = ActivityEventType.None;`
`42`		`- _viewModel.Message = string.Empty;`
`43`		`- _viewModel.NeedsReview = false;`
	`37`	`+ ViewModel.ClearFilters();`
`44`	`38`	`}`
`45`	`39`
`46`	`40`	`private void _viewItemButton_Click(object sender, RoutedEventArgs e)`
`47`	`41`	`{`
`48`		`- _goToItem(_viewModel.Activities[_activities_DGV.SelectedIndex].Activity.ItemId);`
	`42`	`+ MainViewModel.GoToItem?.Invoke(ViewModel.Activities[_activities_DGV.SelectedIndex].Activity.ItemId);`
`49`	`43`	`}`
`50`	`44`	`}`
`51`	`45`	`}`