Merge branch 'alpha' into metrics-service

IvanJosipovic · Jan 28, 2025 · 0d15202 · 0d15202
2 parents 6a87868 + f2e972b
commit 0d15202
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ Supported Platforms (AMD64 and ARM64):
 - Linux
 - Mac ([*Note Issue](https://github.com/IvanJosipovic/KubeUI/issues/688))
 - Windows
+  - `winget install KubeUI`
   - [![Microsoft Store](https://get.microsoft.com/images/en-us%20dark.svg)](https://apps.microsoft.com/detail/XP9MRWDV3N310N?mode=direct)
 
 ## Example

diff --git a/src/KubeUI/KubeUI.csproj b/src/KubeUI/KubeUI.csproj
@@ -40,10 +40,10 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="DynamicData" Version="9.0.4" />
+    <PackageReference Include="DynamicData" Version="9.1.1" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="JsonPathLINQ" Version="1.0.0-alpha.10" />
-    <PackageReference Include="KubernetesClient" Version="16.0.1" />
+    <PackageReference Include="KubernetesClient" Version="16.0.2" />
     <PackageReference Include="KubernetesCRDModelGen" Version="1.0.0-alpha.425" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.186">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/KubeUI/ViewModels/Workloads/Pod/PodConsoleViewModel.cs b/src/KubeUI/ViewModels/Workloads/Pod/PodConsoleViewModel.cs
@@ -334,15 +334,17 @@ public ConsoleColorizer(Terminal terminal)
     /// <inheritdoc/>
     protected override void ColorizeLine(DocumentLine line)
     {
+        var lineNumber = line.LineNumber - 1 + _terminal.Buffer.YBase;
+
         if (line.Length > 0)
         {
             var colors = new HighlightingColor[line.Length];
 
             for (var cell = 0; cell < line.Length; cell++)
             {
-                if (_terminal.Buffer.Lines.Length > line.LineNumber - 1)
+                if (_terminal.Buffer.Lines.Length > lineNumber)
                 {
-                    var row = _terminal.Buffer.Lines[line.LineNumber - 1];
+                    var row = _terminal.Buffer.Lines[lineNumber];
 
                     if (row.Length > cell)
                     {

diff --git a/tests/KubeUI.Tests/KubeUI.Tests.csproj b/tests/KubeUI.Tests/KubeUI.Tests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.3" />
     <PackageReference Include="CliWrap" Version="3.7.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>