Merge branch 'alpha' of https://github.com/IvanJosipovic/KubeUI into …

…alpha
IvanJosipovic · Sep 9, 2024 · 18efe19 · 18efe19
2 parents bdc83e4 + cbb0afb
commit 18efe19
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/src/KubeUI.Desktop/info.plist b/src/KubeUI.Desktop/info.plist
@@ -27,7 +27,7 @@
     <key>LSEnvironment</key>
     <dict>
         <key>PATH</key>
-        <string>/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:</string>
+        <string>/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/homebrew/bin:/opt/homebrew/sbin</string>
     </dict>
   </dict>
 </plist>
diff --git a/src/KubeUI/App.axaml b/src/KubeUI/App.axaml
@@ -12,7 +12,10 @@
         <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
         <u-semi:SemiTheme Locale="en-US" />
         <styling:FluentAvaloniaTheme />
-        <!--  https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml  -->
+        <!--
+          https://theme.xaml.live/
+          https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Accents/BaseColorsPalette.xaml
+        -->
         <FluentTheme DensityStyle="Compact">
             <FluentTheme.Palettes>
                 <ColorPaletteResources

diff --git a/src/KubeUI/ViewModels/ResourceListViewModel.cs b/src/KubeUI/ViewModels/ResourceListViewModel.cs
@@ -1,6 +1,8 @@
 using System.Collections.Specialized;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
+using Avalonia.Data.Converters;
+using Avalonia.Styling;
 using Dock.Model.Core;
 using DynamicData;
 using DynamicData.Binding;
@@ -353,6 +355,27 @@ private void SelectedNamespaces_CollectionChanged(object? sender, NotifyCollecti
                     Width = "80"
                 },
             ];
+
+            definition.SetStyle = () => [
+                new Style<DataGridRow>()
+                    .Setter(DataGridRow.ForegroundProperty, new Binding("Value.Type")
+                    {
+                        Converter = new FuncValueConverter<string, IBrush>(x =>
+                        {
+                            if (string.Equals(x, "Warning", StringComparison.Ordinal))
+                            {
+                                return Brushes.Red;
+                            }
+
+                            if (Application.Current.ActualThemeVariant == ThemeVariant.Light)
+                            {
+                                return Brushes.Black; //todo reference style
+                            }
+
+                            return Brushes.White; //todo reference style
+                        }),
+                    }),
+                ];
         }
         else if (resourceType == typeof(V1Pod))
         {
@@ -1161,4 +1184,6 @@ public class ResourceListViewMenuItem
     public bool ShowNamespaces { get; set; } = true;
 
     public bool ShowNewResource { get; set; } = true;
+
+    public Func<StyleGroup>? SetStyle { get; set; } = () => [];
 }
diff --git a/src/KubeUI/Views/ResourceListView.cs b/src/KubeUI/Views/ResourceListView.cs
@@ -29,7 +29,7 @@ private void GenerateGrid()
         {
             try
             {
-                var columnDisplay = (Func<T,string>)columnDefinition.GetType().GetProperty(nameof(ResourceListViewDefinitionColumn<T, string>.Display)).GetValue(columnDefinition);
+                var columnDisplay = (Func<T, string>)columnDefinition.GetType().GetProperty(nameof(ResourceListViewDefinitionColumn<T, string>.Display)).GetValue(columnDefinition);
 
                 var columnField = columnDefinition.GetType().GetProperty(nameof(ResourceListViewDefinitionColumn<T, string>.Field)).GetValue(columnDefinition);
 
@@ -216,6 +216,11 @@ private List<Style> GenerateStyles(ResourceListViewMenuItem menu, int level = 0)
         return styles;
     }
 
+    protected override StyleGroup? BuildStyles()
+    {
+        return ViewModel.ViewDefinition.SetStyle.Invoke();
+    }
+
     protected override object Build(ResourceListViewModel<T>? vm)
     {
         var controls = new Grid()

diff --git a/tests/KubeUI.Tests/KubeUI.Tests.csproj b/tests/KubeUI.Tests/KubeUI.Tests.csproj
@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.20.71" />
     <PackageReference Include="xunit" Version="2.9.0" />