Rename patch view model

UI/FormRegionDPE.cs

@@ -63,7 +63,7 @@ namespace pEp
                 // Get the patch submitter and set data context
                 if (PEPIdentity.GetFromIdentity(omi, out PEPIdentity submitter) == Globals.ReturnStatus.Success)
                 {
-                    this.FormControlPatchView.DataContext = new PatchDialogViewModel(patch, submitter, patchStatus, editDate);
+                    this.FormControlPatchView.DataContext = new PatchViewModel(patch, submitter, patchStatus, editDate);
                 }
                 else
                 {

UI/ViewModels/FormControlPatchViewModel.cs

-using pEp.DPE;
-using pEp.UI.Models;
-using System;
-using System.Threading.Tasks;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace pEp.UI.ViewModels
-{
-    internal class FormControlPatchViewModel : ViewModelBase
-    {
-        #region Fields
-
-        private readonly Patch patch;
-
-        private Brush                                   _Background     = Brushes.White;
-        private FlowDocument                            _DisplayDiff    = null;
-        private DateTime?                               _EditDate       = null;
-        private string                                  _Explanation    = null;
-        private bool                                    _IsLoading      = false;
-        private bool                                    _Loaded         = false;
-        private DistributedPolicyEngine.PatchStatus     _Status         = DistributedPolicyEngine.PatchStatus.Open;
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets the background.
-        /// </summary>
-        public Brush Background { get => this._Background; set => this.SetProperty(ref this._Background, value); }
-
-        /// <summary>
-        /// The commit message of the patch.
-        /// </summary>
-        public string CommitMessage
-        {
-            get => this.patch?.CommitMessage;
-            set
-            {
-                this.patch.CommitMessage = value;
-                this.OnPropertyChanged();
-            }
-        }
-
-        /// <summary>
-        /// Gets the creation date as string.
-        /// </summary>
-        public string CreationDateString => this.patch?.CreationDate.ToString("F");
-
-        /// <summary>
-        /// The diff of this patch.
-        /// </summary>
-        public string Diff
-        {
-            get => this.patch?.Diff;
-            set
-            {
-                this.patch.Diff = value;
-                this.OnPropertyChanged();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the diff of this patch as formatted flow document.
-        /// </summary>
-        public FlowDocument DisplayDiff { get => this._DisplayDiff; set => this.SetProperty(ref this._DisplayDiff, value); }
-
-        /// <summary>
-        /// Gets or sets the last date the patch was edited.
-        /// </summary>
-        public DateTime? EditDate { get => this._EditDate; set => this.SetProperty(ref this._EditDate, value); }
-
-        /// <summary>
-        /// The explanation shown in the UI regarding this patch.
-        /// </summary>
-        public string Explanation { get => this._Explanation; set => this.SetProperty(ref this._Explanation, value); }
-
-        /// <summary>
-        /// Gets or sets whether the screen is loading.
-        /// </summary>
-        public bool IsLoading { get => this._IsLoading; set => this.SetProperty(ref this._IsLoading, value); }
-        
-        /// <summary>
-        /// Gets or sets whether the screen is fully loaded.
-        /// </summary>
-        public bool Loaded { get => this._Loaded; set => this.SetProperty(ref this._Loaded, value); }
-
-        /// <summary>
-        /// Gets whether the OK button is visible.
-        /// </summary>
-        public bool IsOKButtonVisible { get; } = true;
-
-        /// <summary>
-        /// Gets whether the Reject button is visible.
-        /// </summary>
-        public bool IsRejectButtonVisible { get; } = false;
-
-        /// <summary>
-        /// The command to accept the patch dialog.
-        /// </summary>
-        public RelayCommand OKButtonCommand => new RelayCommand(this.SupportPatch, p => (this.Status == DistributedPolicyEngine.PatchStatus.Open));
-
-        /// <summary>
-        /// Gets the OK button text.
-        /// </summary>
-        public string OKButtonText { get; } = Properties.Resources.Options_OKText;
-
-        /// <summary>
-        /// The command to reject the dialog.
-        /// </summary>
-        public RelayCommand RejectButtonCommand => new RelayCommand(this.RejectPatch, p => (this.Status == DistributedPolicyEngine.PatchStatus.Open));
-
-        /// <summary>
-        /// Gets the Reject button text.
-        /// </summary>
-        public string RejectButtonText { get; } = Properties.Resources.SyncWizard_RejectButton;
-
-        /// <summary>
-        /// Gets the submitter of this patch.
-        /// </summary>
-        public PEPIdentity Submitter { get; }
-
-        /// <summary>
-        /// Gets or sets the status of this patch.
-        /// </summary>
-        public DistributedPolicyEngine.PatchStatus Status { get => this._Status; set => this.SetProperty(ref this._Status, value); }
-
-        /// <summary>
-        /// Gets or sets the tag of the patch.
-        /// </summary>
-        public string Tag
-        {
-            get => this.patch?.Tag;
-            set
-            {
-                this.patch.Tag = value;
-                this.OnPropertyChanged();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the root path of the patch.
-        /// </summary>
-        public string RootPath
-        {
-            get => this.patch?.RootPath.AbsoluteUri;
-            set
-            {
-                this.patch.RootPath = new Uri(value);
-                this.OnPropertyChanged();
-            }
-        }
-
-        #endregion
-
-        #region Constructors
-
-        /// <summary>
-        /// Primary constructor.
-        /// </summary>
-        /// <param name="patch">The patch to create the form region with.</param>
-        /// <param name="submitter">The submitter of the patch.</param>
-        /// <param name="status">The status of the patch.</param>
-        /// <param name="editDate">The last time this patch was edited (accepted/supported/rejected).</param>
-        public FormControlPatchViewModel(Patch patch, PEPIdentity submitter, DistributedPolicyEngine.PatchStatus status = DistributedPolicyEngine.PatchStatus.Open, DateTime? editDate = null)
-        {
-            this.EditDate = editDate;
-            this.patch = patch;
-            this.Submitter = submitter;
-            this.IsRejectButtonVisible = true;
-            this.OKButtonText = "Support";
-            this.UpdateView(status);
-            this.Loaded = true;
-        }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Executes a patch task (support/reject) and shows an error message if necessary.
-        /// </summary>
-        /// <param name="patchTask">The task to execute.</param>
-        /// <returns>True if the patch task was executed successfully, otherwise false.</returns>
-        private async Task<bool> ExecutePatchTask(Task patchTask)
-        {
-            string errorMessage = null;
-
-            try
-            {
-                // Block UI and show loading cursor
-                this.IsLoading = true;
-                Mouse.OverrideCursor = Cursors.Wait;
-
-                // Execute the task
-                await patchTask;
-
-                // Unblock UI again
-                this.IsLoading = false;
-                Mouse.OverrideCursor = null;
-            }
-            catch (Exception ex)
-            {
-                Log.Error("Error occured. " + ex);
-
-                // Get the innermost exception message and show message box
-                while (ex.InnerException != null)
-                {
-                    ex = ex.InnerException;
-                }
-
-                errorMessage = ex.Message;
-            }
-            finally
-            {
-                this.IsLoading = false;
-                Mouse.OverrideCursor = null;
-            }
-
-            if (string.IsNullOrEmpty(errorMessage))
-            {
-                return true;
-            }
-            else
-            {
-                CustomMessageBox.ShowDialog(errorMessage, "Error", "OK");
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Rejects this patch.
-        /// </summary>
-        /// <param name="parameter">The command parameter.</param>
-        private async void RejectPatch(object parameter)
-        {
-            if (await this.ExecutePatchTask(Globals.ThisAddIn.DistributedPolicyEngine.Reject(this.patch, new PEPIdentity())))
-            {
-                this.UpdateView(DistributedPolicyEngine.PatchStatus.Rejected);
-            }
-        }
-
-        /// <summary>
-        /// Sets the explanation text.
-        /// </summary>
-        private void SetExplanation()
-        {
-            string editDate = "<n/a>";
-            if (this.EditDate != null)
-            {
-                editDate = ((DateTime)this.EditDate).ToLocalTime().ToString("F");
-            }
-
-            switch (this.Status)
-            {
-                case DistributedPolicyEngine.PatchStatus.Accepted:
-                    this.Explanation = $"Accepted on { editDate }";
-                    break;
-                case DistributedPolicyEngine.PatchStatus.Supported:
-                    this.Explanation = $"Supported on { editDate }";
-                    break;
-                case DistributedPolicyEngine.PatchStatus.Rejected:
-                    this.Explanation = $"Rejected on { editDate }";
-                    break;
-                case DistributedPolicyEngine.PatchStatus.Open:
-                default:
-                    this.Explanation = "New configuration changes pending approval";
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Supports this patch.
-        /// </summary>
-        /// <param name="parameter">The command parameter.</param>
-        private async void SupportPatch(object parameter)
-        {
-            if (await this.ExecutePatchTask(Globals.ThisAddIn.DistributedPolicyEngine.Support(this.patch, new PEPIdentity())))
-            {
-                this.UpdateView(DistributedPolicyEngine.PatchStatus.Supported);
-            }
-        }
-
-        /// <summary>
-        /// Updates the view according to a new patch status.
-        /// </summary>
-        /// <param name="patchStatus">The new patch status.</param>
-        private void UpdateView(DistributedPolicyEngine.PatchStatus patchStatus)
-        {
-            this.Status = patchStatus;
-            this.EditDate = DateTime.UtcNow;
-            this.SetExplanation();
-            this.DisplayDiff = PatchDialogViewModel.FormatDiff(this.Diff, this.Status == DistributedPolicyEngine.PatchStatus.Open);
-            this.Background = (patchStatus == DistributedPolicyEngine.PatchStatus.Open) ? Brushes.White : Brushes.WhiteSmoke;
-        }
-
-        #endregion
-    }
-}

UI/ViewModels/PatchDialogViewModel.cs → UI/ViewModels/PatchViewModel.cs

@@ -18,7 +18,7 @@ using System.Windows.Media;
 
 namespace pEp.UI.ViewModels
 {
-    internal class PatchDialogViewModel : DialogHostViewModel
+    internal class PatchViewModel : DialogHostViewModel
     {
         #region Fields
 
@@ -229,7 +229,7 @@ namespace pEp.UI.ViewModels
         /// </summary>
         /// <param name="dialog">The dialog object.</param>
         /// <param name="closeDialogAction">The action to close the dialog.</param>
-        public PatchDialogViewModel(PatchDialog dialog, Action closeDialogAction) : base(dialog, closeDialogAction)
+        public PatchViewModel(PatchDialog dialog, Action closeDialogAction) : base(dialog, closeDialogAction)
         {
             switch (dialog.PatchActionType)
             {
@@ -260,7 +260,7 @@ namespace pEp.UI.ViewModels
         /// <param name="submitter">The submitter of the patch.</param>
         /// <param name="status">The status of the patch.</param>
         /// <param name="editDate">The last time this patch was edited (accepted/supported/rejected).</param>
-        public PatchDialogViewModel(Patch patch,
+        public PatchViewModel(Patch patch,
                                     PEPIdentity submitter,
                                     DistributedPolicyEngine.PatchStatus status = DistributedPolicyEngine.PatchStatus.Open,
                                     DateTime? editDate = null) : this(new PatchDialog(PatchDialog.PatchAction.ShowPatch, patch), null)
@@ -482,7 +482,7 @@ namespace pEp.UI.ViewModels
                 return null;
             }
 
-            return diff.Insert(0, $"{ PatchDialogViewModel.FILE_A_PREFIX }{ fileNameB }\n{ PatchDialogViewModel.FILE_B_PREFIX }{ fileNameB }\n").TrimEnd('\n');
+            return diff.Insert(0, $"{ PatchViewModel.FILE_A_PREFIX }{ fileNameB }\n{ PatchViewModel.FILE_B_PREFIX }{ fileNameB }\n").TrimEnd('\n');
         }
 
         /// <summary>
@@ -736,8 +736,8 @@ namespace pEp.UI.ViewModels
             }
 
             // Remove root parts of URI
-            diff = diff.Replace(PatchDialogViewModel.FILE_A_PREFIX + this.Dialog.Patch.RootPath + "/", PatchDialogViewModel.FILE_A_PREFIX);
-            diff = diff.Replace(PatchDialogViewModel.FILE_B_PREFIX + this.Dialog.Patch.RootPath + "/", PatchDialogViewModel.FILE_B_PREFIX);
+            diff = diff.Replace(PatchViewModel.FILE_A_PREFIX + this.Dialog.Patch.RootPath + "/", PatchViewModel.FILE_A_PREFIX);
+            diff = diff.Replace(PatchViewModel.FILE_B_PREFIX + this.Dialog.Patch.RootPath + "/", PatchViewModel.FILE_B_PREFIX);
 
             return diff.TrimEnd('\n');
         }
@@ -750,7 +750,7 @@ namespace pEp.UI.ViewModels
         {
             this.Status = patchStatus;
             this.SetExplanation();
-            this.FormattedDiff = PatchDialogViewModel.FormatDiff(this.Dialog.Patch.Diff, this.Status == DistributedPolicyEngine.PatchStatus.Open);
+            this.FormattedDiff = PatchViewModel.FormatDiff(this.Dialog.Patch.Diff, this.Status == DistributedPolicyEngine.PatchStatus.Open);
             this.Background = (patchStatus == DistributedPolicyEngine.PatchStatus.Open) ? Brushes.White : Brushes.WhiteSmoke;
         }
 
@@ -759,7 +759,7 @@ namespace pEp.UI.ViewModels
         /// </summary>
         private void UpdateVisibleDiff()
         {
-            this.FormattedDiff = PatchDialogViewModel.FormatDiff(this.SelectedFile?.Diff);
+            this.FormattedDiff = PatchViewModel.FormatDiff(this.SelectedFile?.Diff);
         }
 
         /// <summary>

UI/Views/DialogHostView.xaml

@@ -33,7 +33,7 @@
         <DataTemplate DataType="{x:Type vm:InputMessageBoxViewModel}">
             <v:InputMessageBoxView />
         </DataTemplate>
-        <DataTemplate DataType="{x:Type vm:PatchDialogViewModel}">
+        <DataTemplate DataType="{x:Type vm:PatchViewModel}">
             <v:PatchDialogView />
         </DataTemplate>
     </UserControl.Resources>

UI/Views/DialogHostView.xaml.cs

@@ -81,7 +81,7 @@ namespace pEp.UI.Views
                 case Dialog.Type.Patch:
                     {
                         Debug.Assert(dialog is PatchDialog);
-                        this.Content = new PatchDialogViewModel(dialog as PatchDialog, closeDialogAction);
+                        this.Content = new PatchViewModel(dialog as PatchDialog, closeDialogAction);
                     }
                     break;
                 default:

UI/Views/FormControlPatchView.xaml

@@ -10,7 +10,7 @@
              FontFamily="Segoe UI"
              FontSize="12"
              Background="{Binding Background}"
-             d:DataContext="{d:DesignInstance Type=vm:PatchDialogViewModel}"
+             d:DataContext="{d:DesignInstance Type=vm:PatchViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>

UI/Views/PatchDialogView.xaml

@@ -7,7 +7,7 @@
              xmlns:ui="clr-namespace:pEp.UI" 
              xmlns:vm="clr-namespace:pEp.UI.ViewModels"
              mc:Ignorable="d" 
-             d:DataContext="{d:DesignInstance Type=vm:PatchDialogViewModel}"
+             d:DataContext="{d:DesignInstance Type=vm:PatchViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <ResourceDictionary>

UI/Views/PatchDialogView.xaml.cs

@@ -24,7 +24,7 @@ namespace pEp.UI.Views
         private void ListBoxItem_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             // Edit the file that is being double-clicked
-            (this.DataContext as PatchDialogViewModel)?.AddOrEditFileCommand?.Execute(((sender as ContentControl)?.DataContext as ConfigFile)?.FileName);
+            (this.DataContext as PatchViewModel)?.AddOrEditFileCommand?.Execute(((sender as ContentControl)?.DataContext as ConfigFile)?.FileName);
         }
     }
 }

pEpForOutlook.csproj

@@ -440,14 +440,13 @@
     <Compile Include="UI\TextBoxWithPlaceholder.xaml.cs">
       <DependentUpon>TextBoxWithPlaceholder.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UI\ViewModels\FormControlPatchViewModel.cs" />
     <Compile Include="UI\ViewModels\GroupWizardAddMembersViewModel.cs" />
     <Compile Include="UI\ViewModels\GroupWizardNewListViewModel.cs" />
     <Compile Include="UI\ViewModels\GroupWizardViewModel.cs" />
     <Compile Include="UI\ViewModels\CustomMessageBoxViewModel.cs" />
     <Compile Include="UI\ViewModels\InputMessageBoxViewModel.cs" />
     <Compile Include="UI\ViewModels\MessageBoxBaseViewModel.cs" />
-    <Compile Include="UI\ViewModels\PatchDialogViewModel.cs" />
+    <Compile Include="UI\ViewModels\PatchViewModel.cs" />
     <Compile Include="UI\Views\CustomMessageBoxView.xaml.cs">
       <DependentUpon>CustomMessageBoxView.xaml</DependentUpon>
     </Compile>