Fixing some error condition on secrets node

timheuer · Aug 8, 2023 · 2d5ee3c · 2d5ee3c
1 parent 0f193c2
commit 2d5ee3c
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/src/Resources/UIStrings.Designer.cs b/src/Resources/UIStrings.Designer.cs
diff --git a/src/Resources/UIStrings.resx b/src/Resources/UIStrings.resx
@@ -181,6 +181,10 @@
     <value>Workflows</value>
     <comment>Header for workflow top-level node</comment>
   </data>
+  <data name="INSUFFICIENT_SECRET_PERMS" xml:space="preserve">
+    <value>Insufficient permissions to retrieve Secrets</value>
+    <comment>Error for when you don't have perms</comment>
+  </data>
   <data name="LABEL_NAME" xml:space="preserve">
     <value>Name:</value>
     <comment>Label for secret form for name</comment>

diff --git a/src/ToolWindows/GHActionsToolWindow.xaml.cs b/src/ToolWindows/GHActionsToolWindow.xaml.cs
@@ -361,7 +361,7 @@ private async Task RefreshSecretsAsync(GitHubClient client)
             if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized || ex.StatusCode == System.Net.HttpStatusCode.Forbidden)
             {
                 await _pane.WriteLineAsync($"Error retrieving Secrets: {ex.Message}:{ex.StatusCode}");
-                secretList.Add("Insufficient permissions to retrieve Secrets");
+                secretList.Add(resx.INSUFFICIENT_SECRET_PERMS);
                 await ex.LogAsync(ex.Message);
             }
         }
@@ -410,14 +410,29 @@ private void HandlePreviewMouseWheel(object sender, MouseWheelEventArgs e)
 
     private async void AddSecret_Click(object sender, RoutedEventArgs e)
     {
-        await UpsertRepositorySecret(string.Empty);
+        try
+        {
+            await UpsertRepositorySecret(string.Empty);
+        }
+        catch (ApiException ex)
+        {
+            if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized || ex.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                await _pane.WriteLineAsync($"Error saving Secret: {ex.Message}:{ex.StatusCode}");
+                await ex.LogAsync(ex.Message);
+            }
+        }
+        catch (Exception ex)
+        {
+            await ex.LogAsync();
+        }
     }
 
     private async void EditSecret_Click(object sender, RoutedEventArgs e)
     {
         MenuItem menuItem = (MenuItem)sender;
         TextBlock tvi = GetParentTreeViewItem(menuItem);
-        if (tvi is not null && tvi.Text.ToLowerInvariant() != resx.NO_REPO_SECRETS.ToLowerInvariant()) // yes a hack
+        if (tvi is not null && !tvi.Text.ToLowerInvariant().Contains(" (")) // yes a hack
         {
             string header = tvi.Text.ToString();
             string secretName = header.Substring(0, header.IndexOf(" ("));
@@ -444,7 +459,7 @@ private async void DeleteSecret_Click(object sender, RoutedEventArgs e)
         MenuItem menuItem = (MenuItem)sender;
         TextBlock tvi = GetParentTreeViewItem(menuItem);
 
-        if (tvi is not null && tvi.Text.ToLowerInvariant() != resx.NO_REPO_SECRETS.ToLowerInvariant()) // yes a hack
+        if (tvi is not null && !tvi.Text.ToLowerInvariant().Contains(" (")) // yes a hack
         {
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             // confirm the delete first
@@ -528,7 +543,7 @@ private void RunWorkflow_Click(object sender, RoutedEventArgs e)
     private async void Secret_MouseDoubleClick(object sender, MouseButtonEventArgs e)
     {
         // get the items Tag
-        if (sender is TreeViewItem item && item.Header is not null)
+        if (sender is TreeViewItem item && item.Header is not null && item.Header.ToString().ToLowerInvariant().Contains(" ("))
         {
             string header = item.Header.ToString();
             string secretName = header.Substring(0, header.IndexOf(" ("));