Improve UI interaction for saving and applying

CodingOctocat · CodingOctocat · commit 852c90f86feb · 2023-10-17T17:27:32.000+08:00
diff --git a/IPConfig/Languages/Lang.Designer.cs b/IPConfig/Languages/Lang.Designer.cs
diff --git a/IPConfig/Languages/Lang.en.resx b/IPConfig/Languages/Lang.en.resx
@@ -299,6 +299,12 @@
   <data name="Ethernet_Lower" xml:space="preserve">
     <value>ethernet</value>
   </data>
+  <data name="ExportFailed" xml:space="preserve">
+    <value>Export failed</value>
+  </data>
+  <data name="ExportSuccessful" xml:space="preserve">
+    <value>Export successful</value>
+  </data>
   <data name="ExportToCsv_" xml:space="preserve">
     <value>Export to _CSV...</value>
   </data>
@@ -317,12 +323,6 @@
   <data name="ExportToPlaintext_FileDialogTitle" xml:space="preserve">
     <value>Export to Plaintext</value>
   </data>
-  <data name="ExportFailed" xml:space="preserve">
-    <value>Export failed</value>
-  </data>
-  <data name="ExportSuccessful" xml:space="preserve">
-    <value>Export successful</value>
-  </data>
   <data name="ForwardingEnabled" xml:space="preserve">
     <value>Forwarding Enabled</value>
     
@@ -603,6 +603,9 @@
   <data name="ValidationError" xml:space="preserve">
     <value>Configuration contains validation errors</value>
   </data>
+  <data name="ValidationErrorWarning" xml:space="preserve">
+    <value>Warning: Configuration contains validation errors!</value>
+  </data>
   <data name="ValidLifetime" xml:space="preserve">
     <value>Valid Lifetime</value>
   </data>
diff --git a/IPConfig/Languages/Lang.resx b/IPConfig/Languages/Lang.resx
@@ -337,6 +337,14 @@
     <value>以太网</value>
     <comment>Nic</comment>
   </data>
+  <data name="ExportFailed" xml:space="preserve">
+    <value>导出失败</value>
+    <comment>NicConfigDetailViewModel</comment>
+  </data>
+  <data name="ExportSuccessful" xml:space="preserve">
+    <value>导出成功</value>
+    <comment>NicConfigDetailViewModel</comment>
+  </data>
   <data name="ExportToCsv_" xml:space="preserve">
     <value>导出到 _CSV...</value>
     <comment>NicConfigDetailView</comment>
@@ -361,14 +369,6 @@
     <value>导出到 文本文档</value>
     <comment>NicConfigDetailViewModel</comment>
   </data>
-  <data name="ExportFailed" xml:space="preserve">
-    <value>导出失败</value>
-    <comment>NicConfigDetailViewModel</comment>
-  </data>
-  <data name="ExportSuccessful" xml:space="preserve">
-    <value>导出成功</value>
-    <comment>NicConfigDetailViewModel</comment>
-  </data>
   <data name="ForwardingEnabled" xml:space="preserve">
     <value>已启用转发(路由)</value>
     <comment>NicConfigDetailView</comment>
@@ -739,6 +739,10 @@
     <value>配置存在验证错误</value>
     <comment>IPConfigDetailViewModel</comment>
   </data>
+  <data name="ValidationErrorWarning" xml:space="preserve">
+    <value>警告：配置存在验证错误！</value>
+    <comment>IPConfigDetailViewModel</comment>
+  </data>
   <data name="ValidLifetime" xml:space="preserve">
     <value>有效剩余</value>
     <comment>NicConfigDetailView</comment>
diff --git a/IPConfig/ViewModels/IPConfigDetailViewModel.cs b/IPConfig/ViewModels/IPConfigDetailViewModel.cs
@@ -44,12 +44,12 @@ public partial class IPConfigDetailViewModel : ObservableRecipient, IEditableObj
 
     private bool _inTxn;
 
+    private bool _isSaveSuccessful;
+
     private bool _loaded;
 
     private Nic? _nic;
 
-    private bool _saved;
-
     #endregion Fields
 
     #region ObservableProperties
@@ -391,20 +391,28 @@ private static async Task PingDnsGroupAsync(CollectionViewGroup group)
     [RelayCommand]
     private void Apply()
     {
-        FormatInput();
-
         if (_nic is null)
         {
             Growl.Error(Lang.ApplyFailed);
 
             return;
         }
 
+        FormatInput();
+        Validate(false);
+
+        string msg = Lang.ApplyAsk_Format.Format(_nic.Name, _nic.Description);
+
+        if (EditingIPConfig.HasErrors)
+        {
+            msg = $"{msg}\n\n{Lang.ValidationErrorWarning}";
+        }
+
         var result = HcMessageBox.Show(
-            Lang.ApplyAsk_Format.Format(_nic.Name, _nic.Description),
+            msg,
             App.AppName,
             MessageBoxButton.OKCancel,
-            MessageBoxImage.Question,
+            EditingIPConfig.HasErrors ? MessageBoxImage.Warning : MessageBoxImage.Question,
             MessageBoxResult.OK);
 
         if (result != MessageBoxResult.OK)
@@ -526,7 +534,7 @@ private void Save()
             {
                 Growl.Error(Lang.SaveFailedValidationError);
 
-                _saved = false;
+                _isSaveSuccessful = false;
 
                 return;
             }
@@ -552,13 +560,13 @@ private void Save()
 
             EditingIPConfig.AcceptChanges();
 
-            _saved = true;
+            _isSaveSuccessful = true;
         }
         catch (Exception ex)
         {
             Growl.Error($"{Lang.SaveFailed}\n\n{ex.Message}");
 
-            _saved = false;
+            _isSaveSuccessful = false;
         }
     }
 
@@ -567,7 +575,7 @@ private void SaveAndApply()
     {
         Save();
 
-        if (_saved)
+        if (_isSaveSuccessful)
         {
             Apply();
         }
@@ -616,10 +624,15 @@ private void TryAutoCompleteGateway()
     }
 
     [RelayCommand]
-    private void Validate()
+    private void Validate(bool showGrowl = true)
     {
         EditingIPConfig.ValidateAllProperties();
 
+        if (!showGrowl)
+        {
+            return;
+        }
+
         if (EditingIPConfig.HasErrors)
         {
             Growl.Error(Lang.ValidationError);
@@ -726,7 +739,10 @@ private static IEnumerable<IPv4Dns> ReadIPv4DnsList()
 
     private void FormatInput()
     {
-        EditingIPConfig?.IPv4Config.FormatProperties();
+        if (EditingIPConfig.IsChanged)
+        {
+            EditingIPConfig.IPv4Config.FormatProperties();
+        }
     }
 
     private string GetAutoCompleteDns1()

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ public partial class IPConfigDetailViewModel : ObservableRecipient, IEditableObj`
`44`	`44`
`45`	`45`	`private bool _inTxn;`
`46`	`46`
	`47`	`+ private bool _isSaveSuccessful;`
	`48`	`+`
`47`	`49`	`private bool _loaded;`
`48`	`50`
`49`	`51`	`private Nic? _nic;`
`50`	`52`
`51`		`- private bool _saved;`
`52`		`-`
`53`	`53`	`#endregion Fields`
`54`	`54`
`55`	`55`	`#region ObservableProperties`
`@@ -391,20 +391,28 @@ private static async Task PingDnsGroupAsync(CollectionViewGroup group)`
`391`	`391`	`[RelayCommand]`
`392`	`392`	`private void Apply()`
`393`	`393`	`{`
`394`		`- FormatInput();`
`395`		`-`
`396`	`394`	`if (_nic is null)`
`397`	`395`	`{`
`398`	`396`	`Growl.Error(Lang.ApplyFailed);`
`399`	`397`
`400`	`398`	`return;`
`401`	`399`	`}`
`402`	`400`
	`401`	`+ FormatInput();`
	`402`	`+ Validate(false);`
	`403`	`+`
	`404`	`+ string msg = Lang.ApplyAsk_Format.Format(_nic.Name, _nic.Description);`
	`405`	`+`
	`406`	`+ if (EditingIPConfig.HasErrors)`
	`407`	`+ {`
	`408`	`+ msg = $"{msg}\n\n{Lang.ValidationErrorWarning}";`
	`409`	`+ }`
	`410`	`+`
`403`	`411`	`var result = HcMessageBox.Show(`
`404`		`- Lang.ApplyAsk_Format.Format(_nic.Name, _nic.Description),`
	`412`	`+ msg,`
`405`	`413`	`App.AppName,`
`406`	`414`	`MessageBoxButton.OKCancel,`
`407`		`- MessageBoxImage.Question,`
	`415`	`+ EditingIPConfig.HasErrors ? MessageBoxImage.Warning : MessageBoxImage.Question,`
`408`	`416`	`MessageBoxResult.OK);`
`409`	`417`
`410`	`418`	`if (result != MessageBoxResult.OK)`
`@@ -526,7 +534,7 @@ private void Save()`
`526`	`534`	`{`
`527`	`535`	`Growl.Error(Lang.SaveFailedValidationError);`
`528`	`536`
`529`		`- _saved = false;`
	`537`	`+ _isSaveSuccessful = false;`
`530`	`538`
`531`	`539`	`return;`
`532`	`540`	`}`
`@@ -552,13 +560,13 @@ private void Save()`
`552`	`560`
`553`	`561`	`EditingIPConfig.AcceptChanges();`
`554`	`562`
`555`		`- _saved = true;`
	`563`	`+ _isSaveSuccessful = true;`
`556`	`564`	`}`
`557`	`565`	`catch (Exception ex)`
`558`	`566`	`{`
`559`	`567`	`Growl.Error($"{Lang.SaveFailed}\n\n{ex.Message}");`
`560`	`568`
`561`		`- _saved = false;`
	`569`	`+ _isSaveSuccessful = false;`
`562`	`570`	`}`
`563`	`571`	`}`
`564`	`572`
`@@ -567,7 +575,7 @@ private void SaveAndApply()`
`567`	`575`	`{`
`568`	`576`	`Save();`
`569`	`577`
`570`		`- if (_saved)`
	`578`	`+ if (_isSaveSuccessful)`
`571`	`579`	`{`
`572`	`580`	`Apply();`
`573`	`581`	`}`
`@@ -616,10 +624,15 @@ private void TryAutoCompleteGateway()`
`616`	`624`	`}`
`617`	`625`
`618`	`626`	`[RelayCommand]`
`619`		`- private void Validate()`
	`627`	`+ private void Validate(bool showGrowl = true)`
`620`	`628`	`{`
`621`	`629`	`EditingIPConfig.ValidateAllProperties();`
`622`	`630`
	`631`	`+ if (!showGrowl)`
	`632`	`+ {`
	`633`	`+ return;`
	`634`	`+ }`
	`635`	`+`
`623`	`636`	`if (EditingIPConfig.HasErrors)`
`624`	`637`	`{`
`625`	`638`	`Growl.Error(Lang.ValidationError);`
`@@ -726,7 +739,10 @@ private static IEnumerable<IPv4Dns> ReadIPv4DnsList()`
`726`	`739`
`727`	`740`	`private void FormatInput()`
`728`	`741`	`{`
`729`		`- EditingIPConfig?.IPv4Config.FormatProperties();`
	`742`	`+ if (EditingIPConfig.IsChanged)`
	`743`	`+ {`
	`744`	`+ EditingIPConfig.IPv4Config.FormatProperties();`
	`745`	`+ }`
`730`	`746`	`}`
`731`	`747`
`732`	`748`	`private string GetAutoCompleteDns1()`