From b320f7951eeab76eb7f31d33e0a4c8271a2c5f9c Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sat, 28 Mar 2026 14:09:25 -0400
Subject: [PATCH 01/11] wip

---
 .../AzureKeyVaultStudio.csproj                |   5 +
 .../UserControls/NewItem.xaml                 |   3 +-
 .../UserControls/TagsEditor.xaml              | 106 ++++++++++++++++++
 .../UserControls/TagsEditor.xaml.cs           | 105 +++++++++++++++++
 4 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
 create mode 100644 src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
index 7d24fc1d..47e5e095 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
@@ -77,6 +77,11 @@
   </PropertyGroup>
 
 
+  <ItemGroup>
+    <None Remove="UserControls\TagsEditor.xaml" />
+  </ItemGroup>
+
+
   <ItemGroup>
     <PackageReference Include="Azure.ResourceManager.KeyVault" />
     <PackageReference Include="Azure.Security.KeyVault.Certificates" />
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
index 6c17cdee..7ebbc7d5 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
@@ -121,7 +121,6 @@
                 <StackPanel Orientation="Vertical" Spacing="4">
                     <TextBlock x:Uid="SecretValueTextBlock" />
 
-
                     <Grid ColumnSpacing="4">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
@@ -144,6 +143,8 @@
 
                 </StackPanel>
 
+
+                <local:TagsEditor Tag="{x:Bind ViewModel.ItemPropertiesModel.Tags, Mode=TwoWay}" />
             </StackPanel>
         </ScrollViewer>
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
new file mode 100644
index 00000000..3e705526
--- /dev/null
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -0,0 +1,106 @@
+<UserControl
+    x:Class="AzureKeyVaultStudio.UserControls.TagsEditor"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:AzureKeyVaultStudio.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    d:DesignHeight="300"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <win:ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <StackLayout
+                x:Key="VerticalStackLayout"
+                x:Name="VerticalStackLayout"
+                Orientation="Vertical"
+                Spacing="8" />
+
+            <DataTemplate x:Key="TagsTemplateBase" x:DataType="local:TagItem">
+                <Grid ColumnSpacing="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox
+                        HorizontalAlignment="Stretch"
+                        MaxLength="512"
+                        PlaceholderText="Key"
+                        Text="{x:Bind Key, Mode=TwoWay}" />
+                    <TextBox
+                        Grid.Column="1"
+                        HorizontalAlignment="Stretch"
+                        MaxLength="256"
+                        PlaceholderText="Value"
+                        Text="{x:Bind Value, Mode=TwoWay}" />
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="TagsTemplate" x:DataType="local:TagItem">
+                <Grid ColumnSpacing="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBox
+                        HorizontalAlignment="Stretch"
+                        PlaceholderText="Key"
+                        Text="{x:Bind Key, Mode=TwoWay}" />
+
+                    <TextBox
+                        Grid.Column="1"
+                        HorizontalAlignment="Stretch"
+                        PlaceholderText="Value"
+                        Text="{x:Bind Value, Mode=TwoWay}" />
+
+                    <!--
+                        Command="{Binding DataContext.RemoveTagCommand, ElementName=TagsEditorRoot}"
+                        CommandParameter="{x:Bind}"
+                    -->
+                    <Button
+                        Grid.Column="2"
+                        Margin="8,0,0,0"
+                        VerticalAlignment="Center"
+                        Click="RemoveTagButton_Click"
+                        CommandParameter="{x:Bind}"
+                        Content="&#xE74D;"
+                        FontFamily="Segoe Fluent Icons"
+                        Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+                </Grid>
+            </DataTemplate>
+        </ResourceDictionary>
+
+    </UserControl.Resources>
+
+    <ScrollViewer
+        HorizontalScrollBarVisibility="Auto"
+        HorizontalScrollMode="Auto"
+        IsVerticalScrollChainingEnabled="False">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <Button
+                Grid.Row="0"
+                HorizontalAlignment="Right"
+                Click="Button_Click"
+                Content="Add Tags" />
+
+            <ItemsRepeater
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                ItemTemplate="{StaticResource TagsTemplate}"
+                ItemsSource="{x:Bind EditableTags, Mode=OneWay}"
+                Layout="{StaticResource VerticalStackLayout}" />
+        </Grid>
+    </ScrollViewer>
+</UserControl>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
new file mode 100644
index 00000000..6bc728a9
--- /dev/null
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
+
+namespace AzureKeyVaultStudio.UserControls;
+
+public sealed partial class TagsEditor : UserControl
+{
+
+    
+    public ObservableCollection<TagItem> EditableTags { get; } = new();
+
+    public TagsEditor()
+    {
+        this.InitializeComponent();
+        TranformTagsToTagItems();
+
+        EditableTags.CollectionChanged += EditableTagsUpdateBindingTags_CollectionChanged;
+    }
+
+    private void EditableTagsUpdateBindingTags_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        Dictionary<string, string>? dictTags = [];
+        foreach(var tag in EditableTags)
+        {
+            dictTags.Add(tag.Key, tag.Value);
+        }
+    }
+
+    //public static readonly DependencyProperty RemoveTagCommandProperty = DependencyProperty.Register(
+    // nameof(RemoveTagCommand),
+    // typeof(ICommand),
+    // typeof(TagsEditor),
+    // new PropertyMetadata(default));
+
+    //public ICommand RemoveTagCommand
+    //{
+    //    get => (ICommand)GetValue(RemoveTagCommandProperty);
+    //    set => SetValue(RemoveTagCommandProperty, value);
+    //}
+
+
+    public static readonly DependencyProperty TagsProperty =
+        DependencyProperty.Register(
+            nameof(Tags),
+            typeof(Dictionary<string, string>),
+            typeof(TagsEditor),
+            new PropertyMetadata(default(TagsEditor)));
+
+    public Dictionary<string, string> Tags
+    {
+        get => (Dictionary<string, string>)GetValue(TagsProperty);
+        set => SetValue(TagsProperty, value);
+    }
+
+    private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (sender is Button button && button.CommandParameter is TagItem tagItem)
+        {
+            EditableTags.Remove(tagItem);
+        }
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        var count = EditableTags is null ? 0 : EditableTags.Count;
+        EditableTags.Add(new TagItem
+        {
+            Key = $"Key{count}",
+            Value = $"Value{count}"
+        });
+    }
+
+    private void TranformTagsToTagItems()
+    {
+        foreach(var item in Tags)
+        {
+            EditableTags.Add(new TagItem { Key = item.Key, Value = item.Value });
+        }
+    }
+
+}
+
+public partial class TagItem : ObservableObject
+{
+    [ObservableProperty]
+    public partial string Key { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string Value { get; set; } = string.Empty;
+}

From 84a510d264cd70a524661ffba1b74d7d08db0a40 Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sat, 28 Mar 2026 15:19:16 -0400
Subject: [PATCH 02/11] wip: add ability to add and edit/delete tags

---
 .../Models/KeyVaultValuesAmalgamation.cs      | 42 ++++++++++--
 .../Strings/en/Resources.resw                 |  9 +++
 .../Strings/es/Resources.resw                 |  9 +++
 .../Strings/fr/Resources.resw                 |  9 +++
 .../Strings/pt-BR/Resources.resw              |  9 +++
 .../UserControls/NewItem.xaml                 |  4 +-
 .../UserControls/NewVersionDialog.xaml        |  2 +
 .../UserControls/TagsEditor.xaml              | 33 +++++++---
 .../UserControls/TagsEditor.xaml.cs           | 65 ++++---------------
 .../ViewModels/NewVersionViewModel.cs         |  2 +-
 10 files changed, 111 insertions(+), 73 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
index 83d03f2b..2e8e2067 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
@@ -1,7 +1,10 @@
+using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
+using Azure.ResourceManager.Resources.Models;
 using Azure.Security.KeyVault.Certificates;
 using Azure.Security.KeyVault.Keys;
 using Azure.Security.KeyVault.Secrets;
+using Microsoft.UI.Xaml.XamlTypeInfo;
 
 namespace AzureKeyVaultStudio.Models;
 
@@ -33,6 +36,7 @@ public sealed class KeyVaultItemProperties
     public string[] TagValues => Tags is not null ? [.. Tags.Values] : [];
     public string[] TagKeys => Tags is not null ? [.. Tags.Keys] : [];
     public string TagValuesString => string.Join(", ", Tags?.Values ?? []);
+    public ObservableCollection<TagItem> EditableTags { get; set; } = new ObservableCollection<TagItem>();
 
     public DateTimeOffset? LastModifiedDate => UpdatedOn.HasValue ? UpdatedOn.Value.ToLocalTime() : CreatedOn?.ToLocalTime();
     public string? WhenLastModified => LastModifiedDate.HasValue ? FormatRelativeDate(LastModifiedDate.Value, true) : null;
@@ -109,9 +113,9 @@ public SecretProperties ToSecretProperties()
         properties.NotBefore = NotBefore;
         properties.ExpiresOn = ExpiresOn;
 
-        if (Tags != null && Tags.Count > 0)
+        if (EditableTags != null)
         {
-            foreach (var tag in Tags)
+            foreach (var tag in EditableTags)
             {
                 properties.Tags[tag.Key] = tag.Value;
             }
@@ -127,9 +131,9 @@ public KeyProperties ToKeyProperties()
         properties.NotBefore = NotBefore;
         properties.ExpiresOn = ExpiresOn;
 
-        if (Tags != null && Tags.Count > 0)
+        if (EditableTags != null)
         {
-            foreach (var tag in Tags)
+            foreach (var tag in EditableTags)
             {
                 properties.Tags[tag.Key] = tag.Value;
             }
@@ -142,9 +146,9 @@ public CertificateProperties ToCertificateProperties()
     {
         var properties = new CertificateProperties(Id);
         properties.Enabled = Enabled;
-        if (Tags != null && Tags.Count > 0)
+        if (EditableTags != null)
         {
-            foreach (var tag in Tags)
+            foreach (var tag in EditableTags)
             {
                 properties.Tags[tag.Key] = tag.Value;
             }
@@ -188,7 +192,8 @@ private static KeyVaultItemProperties Create(
             RecoveryLevel = recoveryLevel,
             Managed = managed,
             Tags = tags is null ? new Dictionary<string, string>() : new Dictionary<string, string>(tags),
-            Type = type
+            Type = type,
+            EditableTags = tags is null ? []: new ObservableCollection<TagItem>(tags.Select(t => new TagItem { Key = t.Key, Value = t.Value }))
         };
     }
 
@@ -225,6 +230,20 @@ private static KeyVaultItemProperties Create(
             ( < 366, _) => $"{(isPast ? string.Empty : "in ")}{months} {(months == 1 ? "month" : "months")}{(isPast ? " ago" : string.Empty)}",
             (_, _) => $"{(isPast ? string.Empty : "in ")}{years} {(years == 1 ? "year" : "years")}{(isPast ? " ago" : string.Empty)}"
         };
+
+
+        
+    }
+
+    internal  ObservableCollection<TagItem> FromTagsToEditableTags()
+    {
+        var editableTags = new ObservableCollection<TagItem>();
+        if (Tags?.Count > 0)
+            foreach (var item in Tags)
+            {
+                editableTags.Add(new TagItem { Key = item.Key, Value = item.Value });
+            }
+        return editableTags;
     }
 }
 
@@ -235,3 +254,12 @@ public enum KeyVaultItemType
     Key = 2,
     All = 3
 }
+
+public partial class TagItem : ObservableObject
+{
+    [ObservableProperty]
+    public partial string Key { get; set; } = string.Empty;
+
+    [ObservableProperty]
+    public partial string Value { get; set; } = string.Empty;
+}
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
index 5f31bba6..187610f8 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
@@ -576,6 +576,9 @@
   <data name="DataGridTextColumnTags.Header" xml:space="preserve">
     <value>Tags</value>
   </data>
+  <data name="TagsHeader.Text" xml:space="preserve">
+    <value>Tags</value>
+  </data>
   <data name="DataGridTextColumnUpdated.Header" xml:space="preserve">
     <value>Updated</value>
   </data>
@@ -669,4 +672,10 @@
   <data name="DocumenationHyperlinkButton.Content" xml:space="preserve">
     <value>Documentation: Tenant setup guide</value>
   </data>
+  <data name="RemoveTagButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Remove Tag</value>
+  </data>
+  <data name="AddTagButton.Content" xml:space="preserve">
+    <value>Add Tag</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
index ec874485..e8ce0f93 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
@@ -576,6 +576,9 @@
   <data name="DataGridTextColumnTags.Header" xml:space="preserve">
     <value>Etiquetas</value>
   </data>
+  <data name="TagsHeader.Text" xml:space="preserve">
+    <value>Etiquetas</value>
+  </data>
   <data name="DataGridTextColumnUpdated.Header" xml:space="preserve">
     <value>Actualizado</value>
   </data>
@@ -669,4 +672,10 @@
   <data name="DocumenationHyperlinkButton.Content" xml:space="preserve">
     <value>Documentación: Guía de configuración del tenant</value>
   </data>
+  <data name="RemoveTagButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Eliminar etiqueta</value>
+  </data>
+  <data name="AddTagButton.Content" xml:space="preserve">
+    <value>Agregar etiqueta</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
index 1102d977..402cc883 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
@@ -576,6 +576,9 @@
   <data name="DataGridTextColumnTags.Header" xml:space="preserve">
     <value>Étiquettes</value>
   </data>
+  <data name="TagsHeader.Text" xml:space="preserve">
+    <value>Étiquettes</value>
+  </data>
   <data name="DataGridTextColumnUpdated.Header" xml:space="preserve">
     <value>Mis à jour</value>
   </data>
@@ -669,4 +672,10 @@
   <data name="DocumenationHyperlinkButton.Content" xml:space="preserve">
     <value>Documentation : Guide de configuration du tenant</value>
   </data>
+  <data name="RemoveTagButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Supprimer l’étiquette</value>
+  </data>
+  <data name="AddTagButton.Content" xml:space="preserve">
+    <value>Ajouter étiquette</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
index 3370399d..138c19ea 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
@@ -576,6 +576,9 @@
   <data name="DataGridTextColumnTags.Header" xml:space="preserve">
     <value>Tags</value>
   </data>
+  <data name="TagsHeader.Text" xml:space="preserve">
+    <value>Tags</value>
+  </data>
   <data name="DataGridTextColumnUpdated.Header" xml:space="preserve">
     <value>Atualizado</value>
   </data>
@@ -669,4 +672,10 @@
   <data name="DocumenationHyperlinkButton.Content" xml:space="preserve">
     <value>Documentação: Guia de configuração do tenant</value>
   </data>
+  <data name="RemoveTagButton.ToolTipService.ToolTip" xml:space="preserve">
+    <value>Remover tag</value>
+  </data>
+  <data name="AddTagButton.Content" xml:space="preserve">
+    <value>Adicionar tag</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
index 7ebbc7d5..2fbaf01d 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
@@ -5,7 +5,6 @@
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AzureKeyVaultStudio.UserControls"
-    xmlns:localx="AzureKeyVaultStudio.UserControls.NewItem"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:skia="http://uno.ui/skia"
     d:DesignHeight="300"
@@ -144,7 +143,8 @@
                 </StackPanel>
 
 
-                <local:TagsEditor Tag="{x:Bind ViewModel.ItemPropertiesModel.Tags, Mode=TwoWay}" />
+                <local:TagsEditor EditableTags="{x:Bind ViewModel.ItemPropertiesModel.EditableTags, Mode=TwoWay}" />
+
             </StackPanel>
         </ScrollViewer>
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
index aae6c81e..415f2501 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
@@ -110,6 +110,8 @@
                     Text="{x:Bind ViewModel.SecretValue, Mode=TwoWay}"
                     TextWrapping="Wrap" />
             </StackPanel>
+
+            <local:TagsEditor EditableTags="{x:Bind ViewModel.ItemPropertiesModel.EditableTags, Mode=TwoWay}" />
         </StackPanel>
     </ScrollViewer>
 </ContentDialog>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
index 3e705526..9372d58f 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AzureKeyVaultStudio.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:AzureKeyVaultStudio.Models"
     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     d:DesignHeight="300"
     d:DesignWidth="400"
@@ -21,7 +22,7 @@
                 Orientation="Vertical"
                 Spacing="8" />
 
-            <DataTemplate x:Key="TagsTemplateBase" x:DataType="local:TagItem">
+            <DataTemplate x:Key="TagsTemplateBase" x:DataType="models:TagItem">
                 <Grid ColumnSpacing="10">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="200" />
@@ -30,23 +31,25 @@
                     </Grid.ColumnDefinitions>
                     <TextBox
                         HorizontalAlignment="Stretch"
+                        AcceptsReturn="False"
                         MaxLength="512"
                         PlaceholderText="Key"
                         Text="{x:Bind Key, Mode=TwoWay}" />
                     <TextBox
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"
+                        AcceptsReturn="False"
                         MaxLength="256"
                         PlaceholderText="Value"
                         Text="{x:Bind Value, Mode=TwoWay}" />
                 </Grid>
             </DataTemplate>
 
-            <DataTemplate x:Key="TagsTemplate" x:DataType="local:TagItem">
-                <Grid ColumnSpacing="10">
+            <DataTemplate x:Key="TagsTemplate" x:DataType="models:TagItem">
+                <Grid ColumnSpacing="4">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200" />
-                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
@@ -66,14 +69,16 @@
                         CommandParameter="{x:Bind}"
                     -->
                     <Button
+                        x:Uid="RemoveTagButton"
                         Grid.Column="2"
                         Margin="8,0,0,0"
                         VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
                         Click="RemoveTagButton_Click"
                         CommandParameter="{x:Bind}"
                         Content="&#xE74D;"
-                        FontFamily="Segoe Fluent Icons"
-                        Foreground="{ThemeResource SystemFillColorCriticalBrush}" />
+                        FontFamily="Segoe Fluent Icons" />
                 </Grid>
             </DataTemplate>
         </ResourceDictionary>
@@ -84,16 +89,24 @@
         HorizontalScrollBarVisibility="Auto"
         HorizontalScrollMode="Auto"
         IsVerticalScrollChainingEnabled="False">
-        <Grid>
+        <Grid RowSpacing="4">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+
+            <TextBlock
+                x:Uid="TagsHeader"
+                Grid.Row="0"
+                Margin="0,0,0,8"
+                FontSize="14" />
             <Button
+                x:Uid="AddTagButton"
                 Grid.Row="0"
+                Padding="8,3"
                 HorizontalAlignment="Right"
-                Click="Button_Click"
-                Content="Add Tags" />
+                Click="AddTagButton_Click" />
 
             <ItemsRepeater
                 Grid.Row="1"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
index 6bc728a9..68aa29b1 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
@@ -21,50 +21,28 @@ namespace AzureKeyVaultStudio.UserControls;
 public sealed partial class TagsEditor : UserControl
 {
 
-    
-    public ObservableCollection<TagItem> EditableTags { get; } = new();
-
     public TagsEditor()
     {
         this.InitializeComponent();
-        TranformTagsToTagItems();
-
-        EditableTags.CollectionChanged += EditableTagsUpdateBindingTags_CollectionChanged;
-    }
-
-    private void EditableTagsUpdateBindingTags_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-    {
-        Dictionary<string, string>? dictTags = [];
-        foreach(var tag in EditableTags)
+        if(EditableTags is null)
         {
-            dictTags.Add(tag.Key, tag.Value);
+            EditableTags = [];
         }
     }
 
-    //public static readonly DependencyProperty RemoveTagCommandProperty = DependencyProperty.Register(
-    // nameof(RemoveTagCommand),
-    // typeof(ICommand),
-    // typeof(TagsEditor),
-    // new PropertyMetadata(default));
-
-    //public ICommand RemoveTagCommand
-    //{
-    //    get => (ICommand)GetValue(RemoveTagCommandProperty);
-    //    set => SetValue(RemoveTagCommandProperty, value);
-    //}
+  
 
-
-    public static readonly DependencyProperty TagsProperty =
+    public static readonly DependencyProperty EditableTagsProperty =
         DependencyProperty.Register(
-            nameof(Tags),
-            typeof(Dictionary<string, string>),
+            nameof(EditableTags),
+            typeof(ObservableCollection<TagItem>),
             typeof(TagsEditor),
             new PropertyMetadata(default(TagsEditor)));
 
-    public Dictionary<string, string> Tags
+    public ObservableCollection<TagItem> EditableTags
     {
-        get => (Dictionary<string, string>)GetValue(TagsProperty);
-        set => SetValue(TagsProperty, value);
+        get => (ObservableCollection<TagItem>)GetValue(EditableTagsProperty);
+        set => SetValue(EditableTagsProperty, value);
     }
 
     private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
@@ -75,31 +53,12 @@ private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
         }
     }
 
-    private void Button_Click(object sender, RoutedEventArgs e)
+    private void AddTagButton_Click(object sender, RoutedEventArgs e)
     {
         var count = EditableTags is null ? 0 : EditableTags.Count;
-        EditableTags.Add(new TagItem
-        {
-            Key = $"Key{count}",
-            Value = $"Value{count}"
-        });
-    }
-
-    private void TranformTagsToTagItems()
-    {
-        foreach(var item in Tags)
-        {
-            EditableTags.Add(new TagItem { Key = item.Key, Value = item.Value });
-        }
+        EditableTags.Add(new TagItem { Key = string.Empty, Value = string.Empty });
     }
+ 
 
 }
 
-public partial class TagItem : ObservableObject
-{
-    [ObservableProperty]
-    public partial string Key { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    public partial string Value { get; set; } = string.Empty;
-}
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
index 1f1d7919..7b6729d0 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
@@ -135,7 +135,7 @@ private async Task NewSecretVersion(CancellationToken token)
 
             newSecret.Properties.ContentType = ItemPropertiesModel.ContentType;
 
-            foreach (var tag in ItemPropertiesModel.Tags)
+            foreach (var tag in ItemPropertiesModel.EditableTags)
                 newSecret.Properties.Tags.Add(tag.Key, tag.Value);
 
             token.ThrowIfCancellationRequested();

From 40275e8ecc8375494c91f6f91b3e3363ebb49807 Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sat, 28 Mar 2026 16:15:10 -0400
Subject: [PATCH 03/11] cleanup, DRY for tags logic

---
 .../Models/KeyVaultValuesAmalgamation.cs      | 47 +++++--------------
 .../UserControls/ItemDetails.xaml             | 12 ++++-
 .../UserControls/TagsEditor.xaml              | 41 +++++-----------
 3 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
index 2e8e2067..8cb44699 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
@@ -112,15 +112,7 @@ public SecretProperties ToSecretProperties()
         properties.Enabled = Enabled;
         properties.NotBefore = NotBefore;
         properties.ExpiresOn = ExpiresOn;
-
-        if (EditableTags != null)
-        {
-            foreach (var tag in EditableTags)
-            {
-                properties.Tags[tag.Key] = tag.Value;
-            }
-        }
-
+        ApplyEditableTags(properties.Tags);
         return properties;
     }
 
@@ -130,15 +122,7 @@ public KeyProperties ToKeyProperties()
         properties.Enabled = Enabled;
         properties.NotBefore = NotBefore;
         properties.ExpiresOn = ExpiresOn;
-
-        if (EditableTags != null)
-        {
-            foreach (var tag in EditableTags)
-            {
-                properties.Tags[tag.Key] = tag.Value;
-            }
-        }
-
+        ApplyEditableTags(properties.Tags);
         return properties;
     }
 
@@ -146,14 +130,7 @@ public CertificateProperties ToCertificateProperties()
     {
         var properties = new CertificateProperties(Id);
         properties.Enabled = Enabled;
-        if (EditableTags != null)
-        {
-            foreach (var tag in EditableTags)
-            {
-                properties.Tags[tag.Key] = tag.Value;
-            }
-        }
-
+        ApplyEditableTags(properties.Tags);
         return properties;
     }
 
@@ -235,15 +212,17 @@ private static KeyVaultItemProperties Create(
         
     }
 
-    internal  ObservableCollection<TagItem> FromTagsToEditableTags()
+    private void ApplyEditableTags(IDictionary<string, string> targetTags)
     {
-        var editableTags = new ObservableCollection<TagItem>();
-        if (Tags?.Count > 0)
-            foreach (var item in Tags)
-            {
-                editableTags.Add(new TagItem { Key = item.Key, Value = item.Value });
-            }
-        return editableTags;
+        targetTags.Clear();
+
+        if (EditableTags is null || EditableTags.Count == 0)
+            return;
+
+        foreach (var tag in EditableTags)
+        {
+            targetTags[tag.Key] = tag.Value;
+        }
     }
 }
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
index ae0700be..2f208e10 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -55,12 +55,20 @@
                 <AppBarButton
                     x:Uid="ItemDetailsOpenAppBarButton"
                     Command="{x:Bind ViewModel.OpenInAzureCommand, Mode=OneWay}"
-                    Icon="OpenFile" />
+                    Icon="OpenFile">
+                    <AppBarButton.KeyboardAccelerators>
+                        <KeyboardAccelerator Key="O" Modifiers="Control" />
+                    </AppBarButton.KeyboardAccelerators>
+                </AppBarButton>
 
                 <AppBarButton
                     x:Uid="ItemDetailsRefreshAppBarButton"
                     Command="{x:Bind ViewModel.RefreshCommand, Mode=OneWay}"
-                    Icon="Refresh" />
+                    Icon="Refresh">
+                    <AppBarButton.KeyboardAccelerators>
+                        <KeyboardAccelerator Key="F5" />
+                    </AppBarButton.KeyboardAccelerators>
+                </AppBarButton>
                 <AppBarButton
                     x:Uid="ItemDetailsCopyAppBarButton"
                     Command="{x:Bind ViewModel.CopyCommand, Mode=OneWay}"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
index 9372d58f..b3aa2c60 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -22,29 +22,6 @@
                 Orientation="Vertical"
                 Spacing="8" />
 
-            <DataTemplate x:Key="TagsTemplateBase" x:DataType="models:TagItem">
-                <Grid ColumnSpacing="10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="200" />
-                        <ColumnDefinition Width="200" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBox
-                        HorizontalAlignment="Stretch"
-                        AcceptsReturn="False"
-                        MaxLength="512"
-                        PlaceholderText="Key"
-                        Text="{x:Bind Key, Mode=TwoWay}" />
-                    <TextBox
-                        Grid.Column="1"
-                        HorizontalAlignment="Stretch"
-                        AcceptsReturn="False"
-                        MaxLength="256"
-                        PlaceholderText="Value"
-                        Text="{x:Bind Value, Mode=TwoWay}" />
-                </Grid>
-            </DataTemplate>
-
             <DataTemplate x:Key="TagsTemplate" x:DataType="models:TagItem">
                 <Grid ColumnSpacing="4">
                     <Grid.ColumnDefinitions>
@@ -55,19 +32,19 @@
 
                     <TextBox
                         HorizontalAlignment="Stretch"
+                        AcceptsReturn="False"
+                        MaxLength="256"
                         PlaceholderText="Key"
                         Text="{x:Bind Key, Mode=TwoWay}" />
 
                     <TextBox
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"
+                        AcceptsReturn="False"
+                        MaxLength="256"
                         PlaceholderText="Value"
                         Text="{x:Bind Value, Mode=TwoWay}" />
 
-                    <!--
-                        Command="{Binding DataContext.RemoveTagCommand, ElementName=TagsEditorRoot}"
-                        CommandParameter="{x:Bind}"
-                    -->
                     <Button
                         x:Uid="RemoveTagButton"
                         Grid.Column="2"
@@ -85,31 +62,35 @@
 
     </UserControl.Resources>
 
+
     <ScrollViewer
         HorizontalScrollBarVisibility="Auto"
         HorizontalScrollMode="Auto"
         IsVerticalScrollChainingEnabled="False">
+
         <Grid RowSpacing="4">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <Border BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}" BorderThickness="0,1,0,0" />
 
             <TextBlock
                 x:Uid="TagsHeader"
-                Grid.Row="0"
+                Grid.Row="1"
                 Margin="0,0,0,8"
                 FontSize="14" />
             <Button
                 x:Uid="AddTagButton"
-                Grid.Row="0"
+                Grid.Row="1"
                 Padding="8,3"
                 HorizontalAlignment="Right"
                 Click="AddTagButton_Click" />
 
             <ItemsRepeater
-                Grid.Row="1"
+                Grid.Row="2"
                 HorizontalAlignment="Stretch"
                 ItemTemplate="{StaticResource TagsTemplate}"
                 ItemsSource="{x:Bind EditableTags, Mode=OneWay}"

From 5b0b5ed8209eee7d6dfc8d2df76f8be0d441a78f Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sat, 28 Mar 2026 20:36:32 -0400
Subject: [PATCH 04/11] styling fixes

---
 .../AzureKeyVaultStudio.csproj                |  9 ---------
 .../Strings/en/Resources.resw                 |  5 ++++-
 .../Strings/es/Resources.resw                 |  3 +++
 .../Strings/fr/Resources.resw                 |  3 +++
 .../Strings/pt-BR/Resources.resw              |  3 +++
 .../UserControls/NewItem.xaml.cs              | 12 ++++++++---
 .../UserControls/TagsEditor.xaml              | 11 +++++-----
 .../UserControls/TagsEditor.xaml.cs           | 20 ++-----------------
 src/uno/global.json                           |  2 +-
 9 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
index 47e5e095..f3194594 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
@@ -77,10 +77,6 @@
   </PropertyGroup>
 
 
-  <ItemGroup>
-    <None Remove="UserControls\TagsEditor.xaml" />
-  </ItemGroup>
-
 
   <ItemGroup>
     <PackageReference Include="Azure.ResourceManager.KeyVault" />
@@ -120,10 +116,5 @@
   </ItemGroup>
 
 
-  <ItemGroup>
-    <Content Update="Assets\Images\kv-gray-3.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
     
 </Project>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
index 187610f8..d8af5ac2 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/en/Resources.resw
@@ -678,4 +678,7 @@
   <data name="AddTagButton.Content" xml:space="preserve">
     <value>Add Tag</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="CloseButtonText" xml:space="preserve">
+    <value>Close</value>
+  </data>
+</root>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
index e8ce0f93..fae95085 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/es/Resources.resw
@@ -678,4 +678,7 @@
   <data name="AddTagButton.Content" xml:space="preserve">
     <value>Agregar etiqueta</value>
   </data>
+  <data name="CloseButtonText" xml:space="preserve">
+    <value>Cerrar</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
index 402cc883..188f09a2 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/fr/Resources.resw
@@ -678,4 +678,7 @@
   <data name="AddTagButton.Content" xml:space="preserve">
     <value>Ajouter étiquette</value>
   </data>
+  <data name="CloseButtonText" xml:space="preserve">
+    <value>Fermer</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
index 138c19ea..1a7c1467 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Strings/pt-BR/Resources.resw
@@ -678,4 +678,7 @@
   <data name="AddTagButton.Content" xml:space="preserve">
     <value>Adicionar tag</value>
   </data>
+  <data name="CloseButtonText" xml:space="preserve">
+    <value>Fechar</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
index de9caae3..48164535 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
@@ -31,7 +31,7 @@ private void NewItem_Loaded(object sender, RoutedEventArgs e)
     {
         WeakReferenceMessenger.Default.Register<ShowValidationErrorMessage, Guid>(this, ViewModel.MessengerToken, async (r, m) =>
         {
-            ShowDialogMessage(_localizer["NewItemErrorTitle"], m.Data, _localizer["NewItemDismissButtonText"]);
+            ShowDialogMessage(_localizer["NewItemErrorTitle"], m.Data, _localizer["NewItemDismissButtonText"], true);
         });
         WeakReferenceMessenger.Default.Register<ShowSuccessOperationMessage, Guid>(this, ViewModel.MessengerToken, async (r, m) =>
         {
@@ -41,7 +41,7 @@ private void NewItem_Loaded(object sender, RoutedEventArgs e)
         });
     }
 
-    private void ShowDialogMessage(string title, string message, string dismissButtonText)
+    private void ShowDialogMessage(string title, string message, string dismissMessageButtonText, bool isError = false)
     {
         _ = DispatcherQueue.TryEnqueue(async () =>
         {
@@ -62,10 +62,16 @@ private void ShowDialogMessage(string title, string message, string dismissButto
                     HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled,
                     MaxHeight = 300
                 },
-                CloseButtonText = "OK",
+               
+                CloseButtonText = _localizer?["CloseButtonText"] ?? "Close",
                 XamlRoot = this.XamlRoot,
                 RequestedTheme = this.ActualTheme,
             };
+
+            if (isError)
+            {
+                contentDialog.PrimaryButtonText = dismissMessageButtonText ?? "OK";
+            }
             contentDialog.CloseButtonClick += ContentDialog_CloseButtonClick;
             await contentDialog.ShowAsync();
         });
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
index b3aa2c60..a5cba1cd 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -6,24 +6,25 @@
     xmlns:local="using:AzureKeyVaultStudio.UserControls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:AzureKeyVaultStudio.Models"
+    xmlns:skia="http://uno.ui/not_win"
     xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     d:DesignHeight="300"
     d:DesignWidth="400"
-    mc:Ignorable="d">
+    mc:Ignorable="d skia">
     <UserControl.Resources>
 
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <win:ResourceDictionary Source="ms-appx:///Microsoft.UI.Xaml/DensityStyles/Compact.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <StackLayout
+            <win:StackLayout
                 x:Key="VerticalStackLayout"
                 x:Name="VerticalStackLayout"
                 Orientation="Vertical"
                 Spacing="8" />
 
             <DataTemplate x:Key="TagsTemplate" x:DataType="models:TagItem">
-                <Grid ColumnSpacing="4">
+                <Grid skia:Margin="0,4,0,4" ColumnSpacing="4">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="*" />
@@ -92,9 +93,9 @@
             <ItemsRepeater
                 Grid.Row="2"
                 HorizontalAlignment="Stretch"
+                win:Layout="{StaticResource VerticalStackLayout}"
                 ItemTemplate="{StaticResource TagsTemplate}"
-                ItemsSource="{x:Bind EditableTags, Mode=OneWay}"
-                Layout="{StaticResource VerticalStackLayout}" />
+                ItemsSource="{x:Bind EditableTags, Mode=OneWay}" />
         </Grid>
     </ScrollViewer>
 </UserControl>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
index 68aa29b1..e5bd34ea 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
@@ -1,18 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -24,10 +10,9 @@ public sealed partial class TagsEditor : UserControl
     public TagsEditor()
     {
         this.InitializeComponent();
-        if(EditableTags is null)
-        {
+
+        if (EditableTags is null)
             EditableTags = [];
-        }
     }
 
   
@@ -55,7 +40,6 @@ private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
 
     private void AddTagButton_Click(object sender, RoutedEventArgs e)
     {
-        var count = EditableTags is null ? 0 : EditableTags.Count;
         EditableTags.Add(new TagItem { Key = string.Empty, Value = string.Empty });
     }
  
diff --git a/src/uno/global.json b/src/uno/global.json
index 6da79b5f..2d7febf6 100644
--- a/src/uno/global.json
+++ b/src/uno/global.json
@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "6.6.0-dev.148"
+    "Uno.Sdk": "6.6.0-dev.156"
   },
   "sdk": {
     "allowPrerelease": false

From 8852f2b494a5959da7d5b2e02739958a1d27764b Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sat, 28 Mar 2026 23:29:15 -0400
Subject: [PATCH 05/11] feat: add key to tag, use item repeater.

---
 .../UserControls/ItemDetails.xaml             | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
index 2f208e10..15cf48cd 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -20,6 +20,15 @@
     d:DesignWidth="400"
     mc:Ignorable="d skia">
 
+    <UserControl.Resources>
+        <UniformGridLayout
+            x:Key="UniformGridLayout2"
+            MinColumnSpacing="12"
+            MinItemHeight="108"
+            MinItemWidth="108"
+            MinRowSpacing="12" />
+
+    </UserControl.Resources>
 
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -313,29 +322,29 @@
                             Text="{x:Bind ViewModel.OpenedItem.UpdatedOn, Mode=OneWay}" />
                     </Grid>
 
-                    <ItemsControl Margin="0,4,0,0" ItemsSource="{x:Bind ViewModel.OpenedItem.TagValues, Mode=OneWay}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <StackPanel Orientation="Horizontal" Spacing="4" />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="x:String">
+                    <ItemsRepeater Margin="0,4,0,0" ItemsSource="{x:Bind ViewModel.OpenedItem.EditableTags, Mode=OneWay}">
+                        <ItemsRepeater.Layout>
+                            <toolkit:WrapLayout HorizontalSpacing="5" VerticalSpacing="5" />
+                        </ItemsRepeater.Layout>
+
+                        <ItemsRepeater.ItemTemplate>
+                            <DataTemplate x:DataType="models:TagItem">
                                 <Border
                                     Height="18"
                                     Padding="6,2"
-                                    Background="{ThemeResource SystemAccentColor}"
+                                    Background="{ThemeResource AccentAcrylicBackgroundFillColorBaseBrush}"
                                     CornerRadius="2">
                                     <TextBlock
+                                        x:Name="textBlock"
                                         FontSize="10"
                                         Foreground="White"
                                         IsTextSelectionEnabled="True"
-                                        Text="{x:Bind Mode=OneTime}"
+                                        Text="{x:Bind sys:String.Format(x:Null, '{0}: {1}', Key, Value)}"
                                         TextTrimming="CharacterEllipsis" />
                                 </Border>
                             </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
+                        </ItemsRepeater.ItemTemplate>
+                    </ItemsRepeater>
                 </StackPanel>
             </Border>
 

From c54f9f6c898defdb011837489c07163b979d5844 Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sun, 29 Mar 2026 09:45:40 -0400
Subject: [PATCH 06/11] update style of tag

---
 .../AzureKeyVaultStudio/Presentation/VaultTabContentPage.xaml  | 3 +--
 .../AzureKeyVaultStudio/UserControls/ItemDetails.xaml          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/VaultTabContentPage.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/VaultTabContentPage.xaml
index 079d2444..1c6adab7 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/VaultTabContentPage.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/VaultTabContentPage.xaml
@@ -278,12 +278,11 @@
                                                         Height="20"
                                                         MaxWidth="80"
                                                         Padding="5,2"
-                                                        Background="{ThemeResource SystemAccentColor}"
+                                                        Background="{ThemeResource AccentAcrylicBackgroundFillColorDefaultBrush}"
                                                         CornerRadius="2">
                                                         <TextBlock
                                                             VerticalAlignment="Center"
                                                             FontSize="11"
-                                                            Foreground="White"
                                                             IsTextSelectionEnabled="False"
                                                             Text="{x:Bind Mode=OneTime}"
                                                             TextTrimming="CharacterEllipsis" />
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
index 15cf48cd..81a66d6d 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -332,12 +332,11 @@
                                 <Border
                                     Height="18"
                                     Padding="6,2"
-                                    Background="{ThemeResource AccentAcrylicBackgroundFillColorBaseBrush}"
+                                    Background="{ThemeResource AccentAcrylicBackgroundFillColorDefaultBrush}"
                                     CornerRadius="2">
                                     <TextBlock
                                         x:Name="textBlock"
                                         FontSize="10"
-                                        Foreground="White"
                                         IsTextSelectionEnabled="True"
                                         Text="{x:Bind sys:String.Format(x:Null, '{0}: {1}', Key, Value)}"
                                         TextTrimming="CharacterEllipsis" />

From 7587859477acbc63a604a40d10d905695fb35185 Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Sun, 29 Mar 2026 21:41:58 -0400
Subject: [PATCH 07/11] add support for tab navigation

---
 .../UserControls/TagsEditor.xaml                   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
index a5cba1cd..7f183e8f 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -21,7 +21,7 @@
                 x:Key="VerticalStackLayout"
                 x:Name="VerticalStackLayout"
                 Orientation="Vertical"
-                Spacing="8" />
+                Spacing="6" />
 
             <DataTemplate x:Key="TagsTemplate" x:DataType="models:TagItem">
                 <Grid skia:Margin="0,4,0,4" ColumnSpacing="4">
@@ -42,6 +42,7 @@
                         Grid.Column="1"
                         HorizontalAlignment="Stretch"
                         AcceptsReturn="False"
+                        IsTabStop="True"
                         MaxLength="256"
                         PlaceholderText="Value"
                         Text="{x:Bind Value, Mode=TwoWay}" />
@@ -49,8 +50,7 @@
                     <Button
                         x:Uid="RemoveTagButton"
                         Grid.Column="2"
-                        Margin="8,0,0,0"
-                        VerticalAlignment="Center"
+                        VerticalAlignment="Bottom"
                         Background="Transparent"
                         BorderBrush="Transparent"
                         Click="RemoveTagButton_Click"
@@ -64,6 +64,7 @@
     </UserControl.Resources>
 
 
+
     <ScrollViewer
         HorizontalScrollBarVisibility="Auto"
         HorizontalScrollMode="Auto"
@@ -80,14 +81,14 @@
 
             <TextBlock
                 x:Uid="TagsHeader"
-                Grid.Row="1"
+                Grid.Row="0"
                 Margin="0,0,0,8"
                 FontSize="14" />
             <Button
                 x:Uid="AddTagButton"
                 Grid.Row="1"
                 Padding="8,3"
-                HorizontalAlignment="Right"
+                HorizontalAlignment="Left"
                 Click="AddTagButton_Click" />
 
             <ItemsRepeater
@@ -95,7 +96,8 @@
                 HorizontalAlignment="Stretch"
                 win:Layout="{StaticResource VerticalStackLayout}"
                 ItemTemplate="{StaticResource TagsTemplate}"
-                ItemsSource="{x:Bind EditableTags, Mode=OneWay}" />
+                ItemsSource="{x:Bind EditableTags, Mode=OneWay}"
+                TabFocusNavigation="Local" />
         </Grid>
     </ScrollViewer>
 </UserControl>

From fb1ee72eb0252e2dcd0dc75b25cfb124682bc45f Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Mon, 30 Mar 2026 08:07:14 -0400
Subject: [PATCH 08/11] add missing bad request message

---
 .../ViewModels/NewVersionViewModel.cs          | 18 ++++++++++--------
 .../Directory.Packages.props                   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
index 7b6729d0..1b8359d8 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
@@ -16,7 +16,6 @@ public partial class NewVersionViewModel : ObservableValidator
     private readonly IStringLocalizer _localizer;
     public Guid MessengerToken { get; } = Guid.NewGuid();
 
-
     [ObservableProperty]
     public partial TimeSpan ExpiresOnTimespan { get; set; } = TimeSpan.Zero;
 
@@ -61,7 +60,6 @@ public NewVersionViewModel()
         _authService = services.GetRequiredService<AuthService>();
         _vaultService = services.GetRequiredService<VaultService>();
         _localizer = services.GetRequiredService<IStringLocalizer>();
-
     }
 
     [ObservableProperty]
@@ -97,7 +95,6 @@ private async Task ShowErrors(XamlRoot xamlRoot)
         await dialog.ShowAsync();
     }
 
-
     [RelayCommand]
     public async Task SaveSecretDetailsChanges()
     {
@@ -111,10 +108,17 @@ public async Task SaveSecretDetailsChanges()
         else
             ItemPropertiesModel.ExpiresOn = null;
 
-        var updatedProps = await _vaultService.UpdateSecret(ItemPropertiesModel.ToSecretProperties(), ItemPropertiesModel.VaultUri);
-        ItemPropertiesModel = KeyVaultItemProperties.FromSecretProperties(updatedProps);
+        try
+        {
+            var updatedProps = await _vaultService.UpdateSecret(ItemPropertiesModel.ToSecretProperties(), ItemPropertiesModel.VaultUri);
+            ItemPropertiesModel = KeyVaultItemProperties.FromSecretProperties(updatedProps);
 
-        WeakReferenceMessenger.Default.Send(new ShowSuccessOperationMessage(ItemPropertiesModel.Name, true), MessengerToken);
+            WeakReferenceMessenger.Default.Send(new ShowSuccessOperationMessage(ItemPropertiesModel.Name, true), MessengerToken);
+        }
+        catch (Exception ex)
+        {
+            WeakReferenceMessenger.Default.Send(new ShowValidationErrorMessage(ex.Message), MessengerToken);
+        }
     }
 
     [RelayCommand(FlowExceptionsToTaskScheduler = false, IncludeCancelCommand = true, AllowConcurrentExecutions = false)]
@@ -185,6 +189,4 @@ partial void OnHasExpirationDateCheckedChanged(bool oldValue, bool newValue)
             ItemPropertiesModel.ExpiresOn = null;
         }
     }
-
-
 }
diff --git a/src/uno/AzureKeyVaultStudio/Directory.Packages.props b/src/uno/AzureKeyVaultStudio/Directory.Packages.props
index 1b09bb36..6d198794 100644
--- a/src/uno/AzureKeyVaultStudio/Directory.Packages.props
+++ b/src/uno/AzureKeyVaultStudio/Directory.Packages.props
@@ -11,7 +11,7 @@
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
     <PackageVersion Include="Azure.Core" Version="1.50.0" />
     <PackageVersion Include="Azure.ResourceManager" Version="1.13.2" />
-    <PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.3" />
+    <PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.4.0" />
     <PackageVersion Include="Azure.Security.KeyVault.Certificates" Version="4.8.0" />
     <PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.9.0" />
     <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.9.0" />

From c06a6a178955e3167446c5aa501881dfee554f0f Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Tue, 31 Mar 2026 07:43:02 -0400
Subject: [PATCH 09/11] update width and package version

---
 .../AzureKeyVaultStudio/AzureKeyVaultStudio.csproj            | 4 +---
 .../AzureKeyVaultStudio/Package.appxmanifest                  | 2 +-
 .../AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml    | 2 +-
 src/uno/global.json                                           | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
index f3194594..dc796633 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/AzureKeyVaultStudio.csproj
@@ -12,7 +12,7 @@
     <AssemblyName>AzureKeyVaultStudio</AssemblyName>
     <ApplicationId>io.github.cricketthomas.AzureKeyVaultExplorer</ApplicationId>
 
-    <ApplicationDisplayVersion>2.0.5.0</ApplicationDisplayVersion>
+    <ApplicationDisplayVersion>2.1.0.0</ApplicationDisplayVersion>
     <ApplicationVersion>2</ApplicationVersion>
 
     <ApplicationPublisher>cricketthomas</ApplicationPublisher>
@@ -115,6 +115,4 @@
     <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
   </ItemGroup>
 
-
-    
 </Project>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest
index acc46fd0..118d56bd 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:uap18="http://schemas.microsoft.com/appx/manifest/uap/windows10/18"
   IgnorableNamespaces="uap rescap uap18">
 
-  <Identity Version="2.0.5.0" Publisher="CN=FE9032D7-9FA7-4DED-9087-469BC45B4D99" Name="ArthurThomasIV.AzureKeyVaultExplorer-forAzure"/>
+  <Identity Version="2.1.0.0" Publisher="CN=FE9032D7-9FA7-4DED-9087-469BC45B4D99" Name="ArthurThomasIV.AzureKeyVaultExplorer-forAzure"/>
   <Properties>
     <DisplayName>Key Vault Explorer</DisplayName>
     <PublisherDisplayName>Arthur Thomas IV</PublisherDisplayName>
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
index 415f2501..16c93af6 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
@@ -8,7 +8,7 @@
     RequestedTheme="Default"
     Style="{ThemeResource DefaultContentDialogStyle}">
     <ScrollViewer
-        MinWidth="400"
+        MinWidth="500"
         HorizontalAlignment="Stretch"
         VerticalAlignment="Stretch">
 
diff --git a/src/uno/global.json b/src/uno/global.json
index 2d7febf6..1caf5e3b 100644
--- a/src/uno/global.json
+++ b/src/uno/global.json
@@ -1,7 +1,7 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "6.6.0-dev.156"
+    "Uno.Sdk": "6.6.0-dev.162"
   },
   "sdk": {
     "allowPrerelease": false

From 5a9ba504254f63229b03c6e3c782bd9d9fcfda1a Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Wed, 1 Apr 2026 19:40:58 -0400
Subject: [PATCH 10/11] fix: copilot comments with duplicate tags, throwing an
 error for duplicates, and remove unused code

---
 .../AzureKeyVaultStudio/App.xaml.cs           |   2 +-
 .../Models/KeyVaultValuesAmalgamation.cs      |  14 +-
 .../Presentation/MainViewModel.cs             | 127 ++++++++----------
 .../UserControls/ItemDetails.xaml             |  16 ---
 .../UserControls/NewItem.xaml                 |   3 +-
 .../UserControls/NewVersionDialog.xaml        |   3 +-
 .../UserControls/TagsEditor.xaml              |   1 -
 .../UserControls/TagsEditor.xaml.cs           |   9 +-
 .../Directory.Packages.props                  |   2 +-
 9 files changed, 78 insertions(+), 99 deletions(-)

diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs
index ac5d615f..290c20af 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/App.xaml.cs
@@ -70,7 +70,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args)
                                 LogLevel.Error)
 
                         // Default filters for core Uno Platform namespaces
-                        .CoreLogLevel(LogLevel.Warning);
+                        .CoreLogLevel(LogLevel.Critical);
 
 #if DEBUG
                     //Uno Platform namespace filter groups
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
index 8cb44699..5b7233d2 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
@@ -1,10 +1,8 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
-using Azure.ResourceManager.Resources.Models;
 using Azure.Security.KeyVault.Certificates;
 using Azure.Security.KeyVault.Keys;
 using Azure.Security.KeyVault.Secrets;
-using Microsoft.UI.Xaml.XamlTypeInfo;
 
 namespace AzureKeyVaultStudio.Models;
 
@@ -219,9 +217,19 @@ private void ApplyEditableTags(IDictionary<string, string> targetTags)
         if (EditableTags is null || EditableTags.Count == 0)
             return;
 
+        var seenKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
         foreach (var tag in EditableTags)
         {
-            targetTags[tag.Key] = tag.Value;
+            var key = tag.Key?.Trim();
+
+            if (string.IsNullOrWhiteSpace(key))
+                continue;
+
+            if (!seenKeys.Add(key))
+                throw new InvalidOperationException("Duplicate tag keys are not allowed.");
+
+            targetTags[key] = tag.Value;
         }
     }
 }
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
index a1320d85..908caa48 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
@@ -7,18 +7,16 @@ namespace AzureKeyVaultStudio.Presentation;
 
 public partial class MainViewModel : ObservableObject
 {
+    private const double PaneMaxWidth = 800;
+    private const double PaneMinWidth = 120;
     private readonly IAuthenticationService _authentication;
+    private readonly AuthService _authService;
+    private readonly IDispatcher _dispatcher;
+    private readonly KeyVaultTreeViewModel _keyVaultTreeViewModel;
     private readonly ILocalSettingsService _localSettings;
     private readonly INavigator _navigator;
-    private readonly IDispatcher _dispatcher;
-    private readonly VaultService _vaultService;
-    private readonly AuthService _authService;
     private readonly IServiceProvider _serviceProvider;
-
-    private readonly KeyVaultTreeViewModel _keyVaultTreeViewModel;
-    public KeyVaultTreeViewModel KeyVaultTreeViewModel => _keyVaultTreeViewModel;
-
-
+    private readonly VaultService _vaultService;
     public MainViewModel(
         IDispatcher dispatcher,
         IStringLocalizer localizer,
@@ -37,7 +35,7 @@ public MainViewModel(
         _dispatcher = dispatcher;
         _vaultService = vaultService;
         _serviceProvider = serviceProvider;
-        keyVaultTreeViewModel.SetDispatcher(dispatcher); // HACK 
+        keyVaultTreeViewModel.SetDispatcher(dispatcher); // HACK
         _keyVaultTreeViewModel = keyVaultTreeViewModel;
         _authService = authService;
 
@@ -56,30 +54,34 @@ public MainViewModel(
         });
     }
 
-    public string? Title { get; }
-
+    public string FontIconType => PanePlacement == SplitViewPanePlacement.Left ? "\uE8E4" : "\uE8E2";
     public ICommand GoToSecond { get; }
-
-    public ICommand Logout { get; }
-
-    //private async Task GoToSecondView()
-    //{
-    //    await _navigator.NavigateViewModelAsync<SecondViewModel>(this, data: new Entity(Name!));
-    //}
-
-    public async Task DoLogout(CancellationToken token)
+    public double InvertedSplitViewWidth
     {
-        await _authentication.LogoutAsync(token);
-    }
+        get => PaneMaxWidth - (SplitViewWidth - PaneMinWidth);
+        set
+        {
+            var clamped = Math.Clamp(value, PaneMinWidth, PaneMaxWidth);
+            var newActual = PaneMaxWidth - (clamped - PaneMinWidth);
 
-    [ObservableProperty]
-    public partial SplitViewDisplayMode SplitViewDisplay { get; set; } = SplitViewDisplayMode.Inline;
+            if (SplitViewWidth != newActual)
+            {
+                SplitViewWidth = newActual;
+                OnPropertyChanged(nameof(SplitViewWidth));
+            }
+        }
+    }
 
+    public bool IsPaneLeft => PanePlacement == SplitViewPanePlacement.Left;
     [ObservableProperty]
     public partial bool IsPaneOpen { get; set; } = true;
 
+    public KeyVaultTreeViewModel KeyVaultTreeViewModel => _keyVaultTreeViewModel;
+    public ICommand Logout { get; }
     [ObservableProperty]
-    public partial double SplitViewWidth { get; set; } = 220;
+    [NotifyPropertyChangedFor(nameof(IsPaneLeft))]
+    [NotifyPropertyChangedFor(nameof(FontIconType))]
+    public partial SplitViewPanePlacement PanePlacement { get; set; } = SplitViewPanePlacement.Right;
 
     [ObservableProperty]
     public partial string SearchQuery { get; set; } = string.Empty;
@@ -88,43 +90,24 @@ public async Task DoLogout(CancellationToken token)
     public partial object? SelectedKeyVaultItem { get; set; }
 
     [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(IsPaneLeft))]
-    [NotifyPropertyChangedFor(nameof(FontIconType))]
-    public partial SplitViewPanePlacement PanePlacement { get; set; } = SplitViewPanePlacement.Right;
-
-    public bool IsPaneLeft => PanePlacement == SplitViewPanePlacement.Left;
-
-    public string FontIconType => PanePlacement == SplitViewPanePlacement.Left ? "\uE8E4" : "\uE8E2";
-    //public FontIcon FontIconType => PanePlacement == SplitViewPanePlacement.Left ? new FontIcon() { Glyph = "&#xE8E4;" } : new FontIcon() { Glyph = "&#xE8E2;" };
-
-    private void LoadSplitViewSettings()
-    {
-        SplitViewDisplay = GetSettingsValue(nameof(SplitViewDisplay), SplitViewDisplayMode.Inline);
-        SplitViewWidth = _localSettings.GetValue(nameof(SplitViewWidth), 300d);
-        IsPaneOpen = _localSettings.GetValue(nameof(IsPaneOpen), true);
-        PanePlacement = GetSettingsValue(nameof(PanePlacement), SplitViewPanePlacement.Right);
-    }
-
+    public partial SplitViewDisplayMode SplitViewDisplay { get; set; } = SplitViewDisplayMode.Inline;
 
+    [ObservableProperty]
+    public partial double SplitViewWidth { get; set; } = 220;
 
+    public string? Title { get; }
     [RelayCommand]
-    public void ToggleSplitViewDisplay()
+    public void ClosePane()
     {
-        SplitViewDisplay = SplitViewDisplay == SplitViewDisplayMode.Overlay ? SplitViewDisplayMode.Inline : SplitViewDisplayMode.Overlay;
+        IsPaneOpen = false;
+        WeakReferenceMessenger.Default.Send(new PaneStateChangedMessage(false));
     }
 
-    [RelayCommand]
-    public void TogglePaneLocation()
+    public async Task DoLogout(CancellationToken token)
     {
-        PanePlacement = PanePlacement == SplitViewPanePlacement.Right ? SplitViewPanePlacement.Left : SplitViewPanePlacement.Right;
+        await _authentication.LogoutAsync(token);
     }
 
-
-
-    private void Save<T>(string key, T value)
-    {
-        _localSettings.SetValue(key, value);
-    }
     [RelayCommand]
     public void SaveAllSettings()
     {
@@ -134,35 +117,33 @@ public void SaveAllSettings()
         Save(nameof(IsPaneOpen), IsPaneOpen);
     }
 
-
     [RelayCommand]
-    public void ClosePane()
+    public void TogglePaneLocation()
     {
-        IsPaneOpen = false;
-        WeakReferenceMessenger.Default.Send(new PaneStateChangedMessage(false));
+        PanePlacement = PanePlacement == SplitViewPanePlacement.Right ? SplitViewPanePlacement.Left : SplitViewPanePlacement.Right;
     }
 
-    private const double PaneMinWidth = 100;
-    private const double PaneMaxWidth = 1000;
-
-    public double InvertedSplitViewWidth
+    [RelayCommand]
+    public void ToggleSplitViewDisplay()
     {
-        get => PaneMaxWidth - (SplitViewWidth - PaneMinWidth);
-        set
-        {
-            var clamped = Math.Clamp(value, PaneMinWidth, PaneMaxWidth);
-            var newActual = PaneMaxWidth - (clamped - PaneMinWidth);
-
-            if (SplitViewWidth != newActual)
-            {
-                SplitViewWidth = newActual;
-                OnPropertyChanged(nameof(SplitViewWidth));
-            }
-        }
+        SplitViewDisplay = SplitViewDisplay == SplitViewDisplayMode.Overlay ? SplitViewDisplayMode.Inline : SplitViewDisplayMode.Overlay;
     }
+
     private T GetSettingsValue<T>(string key, T defaultValue) where T : struct, Enum
     {
         var stringValue = _localSettings.GetValue(key, defaultValue.ToString());
         return Enum.TryParse<T>(stringValue, out var result) ? result : defaultValue;
     }
+
+    private void LoadSplitViewSettings()
+    {
+        SplitViewDisplay = GetSettingsValue(nameof(SplitViewDisplay), SplitViewDisplayMode.Inline);
+        SplitViewWidth = _localSettings.GetValue(nameof(SplitViewWidth), 300d);
+        IsPaneOpen = _localSettings.GetValue(nameof(IsPaneOpen), true);
+        PanePlacement = GetSettingsValue(nameof(PanePlacement), SplitViewPanePlacement.Right);
+    }
+    private void Save<T>(string key, T value)
+    {
+        _localSettings.SetValue(key, value);
+    }
 }
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
index 81a66d6d..0da0b266 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -20,16 +20,6 @@
     d:DesignWidth="400"
     mc:Ignorable="d skia">
 
-    <UserControl.Resources>
-        <UniformGridLayout
-            x:Key="UniformGridLayout2"
-            MinColumnSpacing="12"
-            MinItemHeight="108"
-            MinItemWidth="108"
-            MinRowSpacing="12" />
-
-    </UserControl.Resources>
-
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Grid.Resources>
@@ -48,12 +38,6 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <!--<local:OverrideTitlebar
-            Name="OverrideTitlebar"
-            Grid.Row="0"
-            skia:Visibility="Collapsed"
-            SecondaryTitle="{x:Bind ViewModel.OpenedItem.Name, Mode=OneWay}" />-->
-
         <CommandBar
             Grid.Row="0"
             Padding="4,0"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
index 2fbaf01d..e716efe8 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml
@@ -128,7 +128,8 @@
                         <TextBox
                             x:Name="SecretValueTextbox"
                             x:Uid="SecretValueTextbox"
-                            Height="100"
+                            MinHeight="100"
+                            MaxHeight="250"
                             AcceptsReturn="True"
                             Text="{x:Bind ViewModel.SecretValue, Mode=TwoWay}"
                             TextWrapping="Wrap" />
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
index 16c93af6..693fbff1 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewVersionDialog.xaml
@@ -103,7 +103,8 @@
                     Text="Secret Value" />
                 <TextBox
                     x:Name="SecretValueTextbox"
-                    Height="100"
+                    MinHeight="100"
+                    MaxHeight="250"
                     AcceptsReturn="True"
                     IsEnabled="{x:Bind ViewModel.IsEdit, Converter={StaticResource EmptyStringToObjectConverter}}"
                     PlaceholderText="Enter the secret"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
index 7f183e8f..1ff8e9e2 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml
@@ -19,7 +19,6 @@
             </ResourceDictionary.MergedDictionaries>
             <win:StackLayout
                 x:Key="VerticalStackLayout"
-                x:Name="VerticalStackLayout"
                 Orientation="Vertical"
                 Spacing="6" />
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
index e5bd34ea..1a2f4aaa 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/TagsEditor.xaml.cs
@@ -22,8 +22,7 @@ public TagsEditor()
             nameof(EditableTags),
             typeof(ObservableCollection<TagItem>),
             typeof(TagsEditor),
-            new PropertyMetadata(default(TagsEditor)));
-
+            new PropertyMetadata(null));
     public ObservableCollection<TagItem> EditableTags
     {
         get => (ObservableCollection<TagItem>)GetValue(EditableTagsProperty);
@@ -32,6 +31,9 @@ public ObservableCollection<TagItem> EditableTags
 
     private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
     {
+        if (EditableTags is null)
+            return;
+
         if (sender is Button button && button.CommandParameter is TagItem tagItem)
         {
             EditableTags.Remove(tagItem);
@@ -40,6 +42,9 @@ private void RemoveTagButton_Click(object sender, RoutedEventArgs e)
 
     private void AddTagButton_Click(object sender, RoutedEventArgs e)
     {
+        if (EditableTags is null)
+            EditableTags = [];
+
         EditableTags.Add(new TagItem { Key = string.Empty, Value = string.Empty });
     }
  
diff --git a/src/uno/AzureKeyVaultStudio/Directory.Packages.props b/src/uno/AzureKeyVaultStudio/Directory.Packages.props
index 6d198794..05622496 100644
--- a/src/uno/AzureKeyVaultStudio/Directory.Packages.props
+++ b/src/uno/AzureKeyVaultStudio/Directory.Packages.props
@@ -19,7 +19,7 @@
     <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="10.0.5" />
     <PackageVersion Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.11" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.5" />
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.83.1" />
+    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.83.3" />
     <PackageVersion Include="DeviceId" Version="6.11.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
     <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />

From c0ba1fa34ae2ade503b1aafadeadca62e5970af2 Mon Sep 17 00:00:00 2001
From: cricketthomas <arthurthomasiv@gmail.com>
Date: Thu, 2 Apr 2026 08:33:57 -0400
Subject: [PATCH 11/11] fix: copilot comments

- reuse existing code for tags
- don't show close and dismiss button on new item page
- fix split view width over emitting to events
- increase height for secret
---
 .gitignore                                             |  1 +
 .../Models/KeyVaultValuesAmalgamation.cs               |  2 +-
 .../AzureKeyVaultStudio/Presentation/MainViewModel.cs  |  1 -
 .../AzureKeyVaultStudio/UserControls/ItemDetails.xaml  |  2 +-
 .../AzureKeyVaultStudio/UserControls/NewItem.xaml.cs   | 10 ++++++++--
 .../UserControls/ViewModels/NewVersionViewModel.cs     |  4 ++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0debb2da..06361713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -457,3 +457,4 @@ $RECYCLE.BIN/
 /KeyVaultExplorer.Desktop/mac
 /mpdev
 .DS_Store
+/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/msbuild.ps1
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
index 5b7233d2..a7101af0 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Models/KeyVaultValuesAmalgamation.cs
@@ -210,7 +210,7 @@ private static KeyVaultItemProperties Create(
         
     }
 
-    private void ApplyEditableTags(IDictionary<string, string> targetTags)
+    public void ApplyEditableTags(IDictionary<string, string> targetTags)
     {
         targetTags.Clear();
 
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
index 908caa48..cddfb79b 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/Presentation/MainViewModel.cs
@@ -67,7 +67,6 @@ public double InvertedSplitViewWidth
             if (SplitViewWidth != newActual)
             {
                 SplitViewWidth = newActual;
-                OnPropertyChanged(nameof(SplitViewWidth));
             }
         }
     }
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
index 0da0b266..822160ea 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ItemDetails.xaml
@@ -119,7 +119,7 @@
 
                 <Border
                     Grid.Column="0"
-                    MaxHeight="120"
+                    MaxHeight="150"
                     Padding="8,6"
                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                     BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
index 48164535..3d99af2a 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/NewItem.xaml.cs
@@ -63,16 +63,22 @@ private void ShowDialogMessage(string title, string message, string dismissMessa
                     MaxHeight = 300
                 },
                
-                CloseButtonText = _localizer?["CloseButtonText"] ?? "Close",
                 XamlRoot = this.XamlRoot,
                 RequestedTheme = this.ActualTheme,
             };
 
+
+            // allow users to dismiss only if its an error alert, they can still close the window via parent. 
+            // otherwise, show just the close button since users are done with the window and we dont support creating multiple secrets aat a time, yet
             if (isError)
             {
                 contentDialog.PrimaryButtonText = dismissMessageButtonText ?? "OK";
             }
-            contentDialog.CloseButtonClick += ContentDialog_CloseButtonClick;
+            else
+            {
+                contentDialog.CloseButtonText = _localizer?["CloseButtonText"] ?? "Close";
+                contentDialog.CloseButtonClick += ContentDialog_CloseButtonClick;
+            }
             await contentDialog.ShowAsync();
         });
     }
diff --git a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
index 1b8359d8..9b08b1b0 100644
--- a/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
+++ b/src/uno/AzureKeyVaultStudio/AzureKeyVaultStudio/UserControls/ViewModels/NewVersionViewModel.cs
@@ -139,8 +139,8 @@ private async Task NewSecretVersion(CancellationToken token)
 
             newSecret.Properties.ContentType = ItemPropertiesModel.ContentType;
 
-            foreach (var tag in ItemPropertiesModel.EditableTags)
-                newSecret.Properties.Tags.Add(tag.Key, tag.Value);
+
+            ItemPropertiesModel.ApplyEditableTags(newSecret.Properties.Tags);
 
             token.ThrowIfCancellationRequested();