From f6a4f0c1640fdaa8b37b5495991cf4458037e0cb Mon Sep 17 00:00:00 2001
From: Stefan Markovic <stefan@janeasystems.com>
Date: Thu, 21 Sep 2023 17:13:55 +0200
Subject: [PATCH] Add cancel button in dialogs

---
 .../EnvironmentVariablesXAML/Views/MainPage.xaml    | 13 ++++++++-----
 .../EnvironmentVariablesXAML/Views/MainPage.xaml.cs |  2 ++
 .../Strings/en-us/Resources.resw                    |  3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
index 9be1cebc4d..19cac726e0 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml
@@ -68,11 +68,13 @@
             <RowDefinition Height="Auto" />
             <!--  content  -->
         </Grid.RowDefinitions>
-        <InfoBar
-            x:Uid="StateNotUpToDateInfoBar"
-            Grid.Row="1"
-            IsOpen="True"
-            Severity="Warning" />
+        <Grid Grid.Row="1">
+            <InfoBar
+                x:Uid="StateNotUpToDateInfoBar"
+                IsOpen="{x:Bind ViewModel.IsStateModified, Mode=TwoWay}"
+                Severity="Warning"
+                Visibility="{x:Bind ViewModel.IsStateModified, Mode=TwoWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+        </Grid>
 
         <!--  buttons  -->
         <StackPanel Orientation="Horizontal">
@@ -268,6 +270,7 @@
             x:Name="EditVariableDialog"
             x:Uid="EditVariableDialog"
             IsPrimaryButtonEnabled="True"
+            IsSecondaryButtonEnabled="True"
             PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
             <ContentDialog.DataContext>
                 <models:Variable />
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml.cs b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml.cs
index 9483c90ac5..7eb79a30a1 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml.cs
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/Views/MainPage.xaml.cs
@@ -38,6 +38,7 @@ namespace EnvironmentVariables.Views
 
             EditVariableDialog.Title = resourceLoader.GetString("EditVariableDialog_Title");
             EditVariableDialog.PrimaryButtonText = resourceLoader.GetString("SaveBtn");
+            EditVariableDialog.SecondaryButtonText = resourceLoader.GetString("CancelBtn");
             EditVariableDialog.PrimaryButtonCommand = EditCommand;
             EditVariableDialog.PrimaryButtonCommandParameter = card;
 
@@ -72,6 +73,7 @@ namespace EnvironmentVariables.Views
             var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
             AddProfileDialog.Title = resourceLoader.GetString("AddNewProfileDialog_Title");
             AddProfileDialog.PrimaryButtonText = resourceLoader.GetString("AddBtn");
+            AddProfileDialog.SecondaryButtonText = resourceLoader.GetString("CancelBtn");
             AddProfileDialog.PrimaryButtonCommand = AddProfileCommand;
             AddProfileDialog.DataContext = new ProfileVariablesSet(Guid.NewGuid(), string.Empty);
             await AddProfileDialog.ShowAsync();
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw b/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw
index 180771fe1c..a47b32253e 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw
@@ -224,4 +224,7 @@
   <data name="StateNotUpToDateInfoBar.Message" xml:space="preserve">
     <value>Variables have been modified. Reload to get the latest changes.</value>
   </data>
+  <data name="CancelBtn" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
 </root>
\ No newline at end of file