Fix script output.

immense · Jul 27, 2023 · 3d33fe1 · 3d33fe1
1 parent 105f811
commit 3d33fe1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Server/Pages/DeviceDetails.razor b/Server/Pages/DeviceDetails.razor
@@ -255,9 +255,9 @@ else
                                 <td>@scriptResult.TimeStamp</td>
                                 <td>@scriptResult.SenderUserName</td>
                                 <td>@scriptResult.RunTime</td>
-                                <td>@GetTrimmedText($"{scriptResult.ScriptInput}", 25)</td>
-                                <td>@GetTrimmedText($"{scriptResult.StandardOutput}", 25)</td>
-                                <td>@GetTrimmedText($"{scriptResult.ErrorOutput}", 25)</td>
+                                <td>@GetTrimmedText(scriptResult.ScriptInput, 25)</td>
+                                <td>@GetTrimmedText(scriptResult.StandardOutput, 25)</td>
+                                <td>@GetTrimmedText(scriptResult.ErrorOutput, 25)</td>
                                 <td>
                                     <button class="btn btn-sm btn-primary" @onclick="() => ShowFullScriptOutput(scriptResult)">Show Full</button>
                                 </td>

diff --git a/Server/Pages/DeviceDetails.razor.cs b/Server/Pages/DeviceDetails.razor.cs
@@ -156,7 +156,7 @@ private void GetScriptHistory()
         }
     }
 
-    private string GetTrimmedText(string source, int stringLength)
+    private string GetTrimmedText(string? source, int stringLength)
     {
         if (string.IsNullOrWhiteSpace(source))
         {
@@ -171,6 +171,12 @@ private string GetTrimmedText(string source, int stringLength)
         return source[0..25] + "...";
     }
 
+    private string GetTrimmedText(string[]? source, int stringLength)
+    {
+        source ??= Array.Empty<string>();
+        return GetTrimmedText(string.Join("", source), stringLength);
+    }
+
     private Task HandleValidSubmit()
     {
         if (_device is null)
@@ -215,8 +221,8 @@ private void ShowFullScriptOutput(ScriptResult result)
     {
         void outputModal(RenderTreeBuilder builder)
         {
-            var output = string.Join("\r\n", $"{result.StandardOutput}");
-            var error = string.Join("\r\n", $"{result.ErrorOutput}");
+            var output = string.Join("\r\n", result.StandardOutput ?? Array.Empty<string>());
+            var error = string.Join("\r\n", result.ErrorOutput ?? Array.Empty<string>());
             var textareaStyle = "width: 100%; height: 200px; white-space: pre;";
 
             builder.AddMarkupContent(0, "<h5>Input</h5>");