Adding links to logs

- Added icons to menus - Added view log context menu
timheuer · Jul 21, 2023 · e18bb28 · e18bb28
1 parent 6b40399
commit e18bb28
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 9 deletions.
diff --git a/src/Converters/NullToVisibilityConverter.cs b/src/Converters/NullToVisibilityConverter.cs
@@ -0,0 +1,17 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace GitHubActionsVS.Converters;
+public class NullToVisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value == null ? Visibility.Hidden: Visibility.Visible;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/GitHubActionsVS.csproj b/src/GitHubActionsVS.csproj
@@ -49,6 +49,7 @@
     <Compile Include="Commands\RefreshRepoCommand.cs" />
     <Compile Include="Converters\ConclusionColorConverter.cs" />
     <Compile Include="Converters\ConclusionIconConverter.cs" />
+    <Compile Include="Converters\NullToVisibilityConverter.cs" />
     <Compile Include="Helpers\CredentialManager.cs" />
     <Compile Include="Helpers\RepoInfo.cs" />
     <Compile Include="Models\BaseWorkflowType.cs" />
@@ -80,6 +81,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Resource Include="Resources\OpenWebSite.png" />
     <Resource Include="Resources\codicon.ttf" />
     <Content Include="LICENSE">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -93,10 +95,12 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\Icon.png">
+    <Resource Include="Resources\AddItem.png" />
+    <Resource Include="Resources\Delete.png" />
+    <Resource Include="Resources\Edit.png" />
+    <Resource Include="Resources\Icon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
+    </Resource>
   </ItemGroup>
   <ItemGroup>
     <VSCTCompile Include="VSCommandTable.vsct">

diff --git a/src/Resources/AddItem.png b/src/Resources/AddItem.png
diff --git a/src/Resources/Delete.png b/src/Resources/Delete.png
diff --git a/src/Resources/Edit.png b/src/Resources/Edit.png
diff --git a/src/Resources/OpenWebSite.png b/src/Resources/OpenWebSite.png
diff --git a/src/ToolWindows/GHActionsToolWindow.xaml b/src/ToolWindows/GHActionsToolWindow.xaml
@@ -19,6 +19,7 @@
         <FontFamily x:Key="CodiconFont">pack://application:,,,/GitHubActionsVS;component/Resources/#codicon</FontFamily>
         <ivc:ConclusionIconConverter x:Key="ConclusionIconConverter" />
         <ivc:ConclusionColorConverter x:Key="ConclusionColorConverter" />
+        <ivc:NullToVisibilityConverter x:Key="NullVisibilityConverter" />
         <Style TargetType="{x:Type Expander}">
             <Setter Property="toolkit:Themes.UseVsTheme" Value="True" />
         </Style>
@@ -35,7 +36,11 @@
             <TextBlock Text="{Binding}">
                 <TextBlock.ContextMenu>
                     <ContextMenu>
-                        <MenuItem Header="Add Secret" Click="AddSecret_Click" />
+                        <MenuItem Header="Add Secret" Click="AddSecret_Click">
+                            <MenuItem.Icon>
+                                <Image Source="pack://application:,,,/GitHubActionsVS;component/Resources/AddItem.png" />
+                            </MenuItem.Icon>
+                        </MenuItem>
                     </ContextMenu>
                 </TextBlock.ContextMenu>
             </TextBlock>
@@ -45,7 +50,17 @@
                 <TextBlock VerticalAlignment="Center" FontFamily="{StaticResource CodiconFont}" 
                    Foreground="{Binding Path=Conclusion, Converter={StaticResource ConclusionColorConverter}}"
                    Text="{Binding Path=Conclusion, Converter={StaticResource ConclusionIconConverter}}"/>
-                <emoji:TextBlock Text="{Binding DisplayName}" VerticalAlignment="Bottom" />
+                <emoji:TextBlock Text="{Binding DisplayName}" VerticalAlignment="Bottom" Tag="{Binding Url}">
+                    <TextBlock.ContextMenu>
+                        <ContextMenu Visibility="{Binding Url, Converter={StaticResource NullVisibilityConverter}}">
+                            <MenuItem Header="View Log" Click="ViewLog_Click" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+                                <MenuItem.Icon>
+                                    <Image Source="pack://application:,,,/GitHubActionsVS;component/Resources/OpenWebSite.png" />
+                                </MenuItem.Icon>
+                            </MenuItem>
+                        </ContextMenu>
+                    </TextBlock.ContextMenu>
+                </emoji:TextBlock>
             </StackPanel>
         </HierarchicalDataTemplate>
         <DataTemplate x:Key="EnvironmentItemTemplate">
@@ -75,8 +90,16 @@
                                             <TextBlock Text="{Binding}">
                                                 <TextBlock.ContextMenu>
                                                     <ContextMenu>
-                                                        <MenuItem Header="Edit Secret" Click="EditSecret_Click" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
-                                                        <MenuItem Header="Delete Secret" Click="DeleteSecret_Click" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}" />
+                                                        <MenuItem Header="Edit Secret" Click="EditSecret_Click" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+                                                            <MenuItem.Icon>
+                                                                <Image Source="pack://application:,,,/GitHubActionsVS;component/Resources/Edit.png" />
+                                                            </MenuItem.Icon>
+                                                        </MenuItem>
+                                                        <MenuItem Header="Delete Secret" Click="DeleteSecret_Click" CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ContextMenu}}}">
+                                                            <MenuItem.Icon>
+                                                                <Image Source="pack://application:,,,/GitHubActionsVS;component/Resources/Delete.png" />
+                                                            </MenuItem.Icon>
+                                                        </MenuItem>
                                                     </ContextMenu>
                                                 </TextBlock.ContextMenu>
                                             </TextBlock>

diff --git a/src/ToolWindows/GHActionsToolWindow.xaml.cs b/src/ToolWindows/GHActionsToolWindow.xaml.cs
@@ -333,7 +333,7 @@ private async void EditSecret_Click(object sender, RoutedEventArgs e)
     {
         MenuItem menuItem = (MenuItem)sender;
         TextBlock tvi = GetParentTreeViewItem(menuItem);
-        if (tvi is not null)
+        if (tvi is not null && tvi.Text.ToLowerInvariant() != "no repository secrets defined") // yes a hack
         {
             string header = tvi.Text.ToString();
             string secretName = header.Substring(0, header.IndexOf(" ("));
@@ -360,7 +360,7 @@ private async void DeleteSecret_Click(object sender, RoutedEventArgs e)
         MenuItem menuItem = (MenuItem)sender;
         TextBlock tvi = GetParentTreeViewItem(menuItem);
 
-        if (tvi is not null)
+        if (tvi is not null && tvi.Text.ToLowerInvariant() != "no repository secrets defined") // yes a hack
         {
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             // confirm the delete first
@@ -405,5 +405,18 @@ private async Task UpsertRepositorySecret(string secretName)
             await RefreshSecretsAsync(client);
         }
     }
+
+    private void ViewLog_Click(object sender, RoutedEventArgs e)
+    {
+        MenuItem menuItem = (MenuItem)sender;
+        TextBlock tvi = GetParentTreeViewItem(menuItem);
+
+        // check the tag value to ensure it isn't null
+        if (tvi is not null && tvi.Tag is not null)
+        {
+            string logUrl = tvi.Tag.ToString();
+            Process.Start(logUrl);
+        }
+    }
 }