From 0a498759e52eedc086b621755d754b016961920e Mon Sep 17 00:00:00 2001
From: Christian <6939810+chkr1011@users.noreply.github.com>
Date: Wed, 3 Aug 2022 21:08:01 +0200
Subject: [PATCH] Add more data to publish state (#52)

---
 Source/Controls/ErrorBox/ErrorBox.axaml.cs    |  2 +-
 .../UserProperties/UserPropertiesView.axaml   |  2 +-
 .../UserProperties/UserPropertiesViewModel.cs | 15 +++++++-
 .../Connection/ConnectionItemViewModel.cs     |  2 +-
 Source/Pages/Publish/PayloadInputFormat.cs    | 10 +++++
 .../PayloadInputFormatSelectorViewModel.cs    | 37 ++++++++++++++++++-
 Source/Pages/Publish/PublishPageViewModel.cs  |  2 +-
 .../Publish/State/PublishPageStateFactory.cs  | 24 ++++++++++--
 .../Publish/State/PublishPageStateLoader.cs   | 22 ++++++++++-
 Source/Pages/Publish/State/PublishState.cs    | 16 ++++++++
 .../SubscriptionsPageViewModel.cs             |  2 +-
 Source/Services/State/Model/UserProperty.cs   |  8 ++++
 12 files changed, 129 insertions(+), 13 deletions(-)
 create mode 100644 Source/Pages/Publish/PayloadInputFormat.cs
 create mode 100644 Source/Services/State/Model/UserProperty.cs

diff --git a/Source/Controls/ErrorBox/ErrorBox.axaml.cs b/Source/Controls/ErrorBox/ErrorBox.axaml.cs
index a4e27fc..058b9dc 100644
--- a/Source/Controls/ErrorBox/ErrorBox.axaml.cs
+++ b/Source/Controls/ErrorBox/ErrorBox.axaml.cs
@@ -35,6 +35,6 @@ void OnButtonCloseClicked(object? sender, RoutedEventArgs e)
 
     void OnButtonCopyClicked(object? sender, RoutedEventArgs e)
     {
-        _ = Application.Current.Clipboard.SetTextAsync(Message);
+        _ = Application.Current?.Clipboard?.SetTextAsync(Message);
     }
 }
\ No newline at end of file
diff --git a/Source/Controls/UserProperties/UserPropertiesView.axaml b/Source/Controls/UserProperties/UserPropertiesView.axaml
index 8a1ecf9..bd32f93 100644
--- a/Source/Controls/UserProperties/UserPropertiesView.axaml
+++ b/Source/Controls/UserProperties/UserPropertiesView.axaml
@@ -18,7 +18,7 @@
                     Orientation="Horizontal">
             <Button Classes="tool_bar_button"
                     ToolTip.Tip="Add user property"
-                    Command="{Binding AddItem}">
+                    Command="{Binding AddEmptyItem}">
                 <PathIcon Data="{StaticResource add_square_regular}" />
             </Button>
             <Button Classes="tool_bar_button"
diff --git a/Source/Controls/UserProperties/UserPropertiesViewModel.cs b/Source/Controls/UserProperties/UserPropertiesViewModel.cs
index a4b5d21..84215d6 100644
--- a/Source/Controls/UserProperties/UserPropertiesViewModel.cs
+++ b/Source/Controls/UserProperties/UserPropertiesViewModel.cs
@@ -19,9 +19,20 @@ public bool IsReadOnly
 
     public ObservableCollection<UserPropertyViewModel> Items { get; } = new();
 
-    public void AddItem()
+    public void AddEmptyItem()
     {
-        Items.Add(new UserPropertyViewModel(this));
+        AddItem(string.Empty, string.Empty);
+    }
+
+    public void AddItem(string name, string value)
+    {
+        var item = new UserPropertyViewModel(this)
+        {
+            Name = name,
+            Value = value
+        };
+
+        Items.Add(item);
     }
 
     public void ClearItems()
diff --git a/Source/Pages/Connection/ConnectionItemViewModel.cs b/Source/Pages/Connection/ConnectionItemViewModel.cs
index 6bd4bfb..d520c8b 100644
--- a/Source/Pages/Connection/ConnectionItemViewModel.cs
+++ b/Source/Pages/Connection/ConnectionItemViewModel.cs
@@ -13,7 +13,7 @@ public ConnectionItemViewModel(ConnectionPageViewModel ownerPage)
     {
         OwnerPage = ownerPage ?? throw new ArgumentNullException(nameof(ownerPage));
 
-        SessionOptions.UserProperties.AddItem();
+        SessionOptions.UserProperties.AddEmptyItem();
     }
 
     public string Name
diff --git a/Source/Pages/Publish/PayloadInputFormat.cs b/Source/Pages/Publish/PayloadInputFormat.cs
new file mode 100644
index 0000000..15e13c3
--- /dev/null
+++ b/Source/Pages/Publish/PayloadInputFormat.cs
@@ -0,0 +1,10 @@
+namespace MQTTnetApp.Pages.Publish;
+
+public enum PayloadInputFormat
+{
+    PlainText,
+    
+    Base64String,
+    
+    FilePath
+}
\ No newline at end of file
diff --git a/Source/Pages/Publish/PayloadInputFormatSelectorViewModel.cs b/Source/Pages/Publish/PayloadInputFormatSelectorViewModel.cs
index 0a5b847..07296f1 100644
--- a/Source/Pages/Publish/PayloadInputFormatSelectorViewModel.cs
+++ b/Source/Pages/Publish/PayloadInputFormatSelectorViewModel.cs
@@ -10,7 +10,12 @@ public sealed class PayloadInputFormatSelectorViewModel : BaseViewModel
 {
     bool _isBase64String;
     bool _isFilePath;
-    bool _isPlainText = true;
+    bool _isPlainText;
+
+    public PayloadInputFormatSelectorViewModel()
+    {
+        Value = PayloadInputFormat.PlainText;
+    }
 
     public bool IsBase64String
     {
@@ -30,6 +35,36 @@ public bool IsPlainText
         set => this.RaiseAndSetIfChanged(ref _isPlainText, value);
     }
 
+    public PayloadInputFormat Value
+    {
+        get
+        {
+            if (IsPlainText)
+            {
+                return PayloadInputFormat.PlainText;
+            }
+
+            if (IsBase64String)
+            {
+                return PayloadInputFormat.Base64String;
+            }
+
+            if (IsFilePath)
+            {
+                return PayloadInputFormat.FilePath;
+            }
+
+            throw new NotSupportedException();
+        }
+
+        set
+        {
+            IsPlainText = value == PayloadInputFormat.PlainText;
+            IsBase64String = value == PayloadInputFormat.Base64String;
+            IsFilePath = value == PayloadInputFormat.FilePath;
+        }
+    }
+    
     public byte[] ConvertPayloadInput(string? payloadInput)
     {
         if (string.IsNullOrEmpty(payloadInput))
diff --git a/Source/Pages/Publish/PublishPageViewModel.cs b/Source/Pages/Publish/PublishPageViewModel.cs
index bfcbd03..95b4d55 100644
--- a/Source/Pages/Publish/PublishPageViewModel.cs
+++ b/Source/Pages/Publish/PublishPageViewModel.cs
@@ -36,7 +36,7 @@ public void AddItem()
 
         // Prepare the UI with at lest one user property.
         // It will not be send when the name is empty.
-        newItem.UserProperties.AddItem();
+        newItem.UserProperties.AddEmptyItem();
 
         Items.Collection.Add(newItem);
         Items.SelectedItem = newItem;
diff --git a/Source/Pages/Publish/State/PublishPageStateFactory.cs b/Source/Pages/Publish/State/PublishPageStateFactory.cs
index 315c751..714fb43 100644
--- a/Source/Pages/Publish/State/PublishPageStateFactory.cs
+++ b/Source/Pages/Publish/State/PublishPageStateFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using MQTTnetApp.Services.State.Model;
 
 namespace MQTTnetApp.Pages.Publish.State;
 
@@ -15,15 +16,32 @@ public static PublishPageState Create(PublishPageViewModel viewModel)
 
         foreach (var item in viewModel.Items.Collection)
         {
-            state.Publishes.Add(new PublishState
+            var publishState = new PublishState
             {
                 Name = item.Name,
                 Topic = item.Topic,
                 Retain = item.Retain,
                 ContentType = item.ContentType,
+                ResponseTopic = item.ResponseTopic,
+                SubscriptionIdentifier = item.SubscriptionIdentifier,
+                TopicAlias = item.TopicAlias,
+                MessageExpiryInterval = item.MessageExpiryInterval, 
                 PayloadFormatIndicator = item.PayloadFormatIndicator.Value,
-                QualityOfServiceLevel = item.QualityOfServiceLevel.Value
-            });
+                QualityOfServiceLevel = item.QualityOfServiceLevel.Value,
+                PayloadInputFormat = item.PayloadInputFormat.Value,
+                Payload = item.Payload
+            };
+
+            foreach (var userProperty in item.UserProperties.Items)
+            {
+                publishState.UserProperties.Add(new UserProperty
+                {
+                    Name = userProperty.Name,
+                    Value = userProperty.Value
+                });
+            }
+
+            state.Publishes.Add(publishState);
         }
 
         return state;
diff --git a/Source/Pages/Publish/State/PublishPageStateLoader.cs b/Source/Pages/Publish/State/PublishPageStateLoader.cs
index 884133f..666e875 100644
--- a/Source/Pages/Publish/State/PublishPageStateLoader.cs
+++ b/Source/Pages/Publish/State/PublishPageStateLoader.cs
@@ -29,15 +29,33 @@ static PublishItemViewModel CreateItem(PublishPageViewModel ownerPage, PublishSt
         var item = new PublishItemViewModel(ownerPage)
         {
             Name = publishState.Name ?? string.Empty,
-            Topic = publishState.Topic,
+            Topic = publishState.Topic ?? string.Empty,
             Retain = publishState.Retain,
-            ContentType = publishState.ContentType,
+            ContentType = publishState.ContentType ?? string.Empty,
+            ResponseTopic = publishState.ResponseTopic ?? string.Empty,
+            SubscriptionIdentifier = publishState.SubscriptionIdentifier,
+            TopicAlias = publishState.TopicAlias,
+            MessageExpiryInterval = publishState.MessageExpiryInterval,
+            Payload = publishState.Payload ?? string.Empty,
+            PayloadFormatIndicator =
+            {
+                Value = publishState.PayloadFormatIndicator
+            },
             QualityOfServiceLevel =
             {
                 Value = publishState.QualityOfServiceLevel
+            },
+            PayloadInputFormat =
+            {
+                Value = publishState.PayloadInputFormat
             }
         };
 
+        foreach (var userProperty in publishState.UserProperties)
+        {
+            item.UserProperties.AddItem(userProperty.Name ?? string.Empty, userProperty.Value ?? string.Empty);
+        }
+
         return item;
     }
 }
\ No newline at end of file
diff --git a/Source/Pages/Publish/State/PublishState.cs b/Source/Pages/Publish/State/PublishState.cs
index efb4a19..0213a76 100644
--- a/Source/Pages/Publish/State/PublishState.cs
+++ b/Source/Pages/Publish/State/PublishState.cs
@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using MQTTnet.Protocol;
+using MQTTnetApp.Services.State.Model;
 
 namespace MQTTnetApp.Pages.Publish.State;
 
@@ -6,13 +8,27 @@ public sealed class PublishState
 {
     public string? ContentType { get; set; }
 
+    public uint MessageExpiryInterval { get; set; }
+
     public string? Name { get; set; }
 
+    public string? Payload { get; set; }
+
     public MqttPayloadFormatIndicator PayloadFormatIndicator { get; set; }
 
+    public PayloadInputFormat PayloadInputFormat { get; set; }
+
     public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
 
+    public string? ResponseTopic { get; set; }
+
     public bool Retain { get; set; }
 
+    public uint SubscriptionIdentifier { get; set; }
+
     public string? Topic { get; set; }
+
+    public ushort TopicAlias { get; set; }
+
+    public List<UserProperty> UserProperties { get; set; } = new();
 }
\ No newline at end of file
diff --git a/Source/Pages/Subscriptions/SubscriptionsPageViewModel.cs b/Source/Pages/Subscriptions/SubscriptionsPageViewModel.cs
index 0208d0e..dbfcc0d 100644
--- a/Source/Pages/Subscriptions/SubscriptionsPageViewModel.cs
+++ b/Source/Pages/Subscriptions/SubscriptionsPageViewModel.cs
@@ -34,7 +34,7 @@ public void AddItem()
             Name = "Untitled"
         };
 
-        newItem.UserProperties.AddItem();
+        newItem.UserProperties.AddEmptyItem();
 
         Items.Collection.Add(newItem);
     }
diff --git a/Source/Services/State/Model/UserProperty.cs b/Source/Services/State/Model/UserProperty.cs
new file mode 100644
index 0000000..5c0d8b9
--- /dev/null
+++ b/Source/Services/State/Model/UserProperty.cs
@@ -0,0 +1,8 @@
+namespace MQTTnetApp.Services.State.Model;
+
+public sealed class UserProperty
+{
+    public string? Name { get; set; }
+
+    public string? Value { get; set; }
+}
\ No newline at end of file