Improved copilot error handling

MarkMpn · Jul 8, 2024 · 71dd652 · 71dd652
1 parent 9fd57a2
commit 71dd652
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/MarkMpn.Sql4Cds.XTB/Resources/Copilot.html b/MarkMpn.Sql4Cds.XTB/Resources/Copilot.html
@@ -233,12 +233,16 @@
             const icon = document.getElementById(type).cloneNode(true);
             div.appendChild(icon);
             div.appendChild(block);
-            const button = document.createElement('button');
-            button.textContent = action;
-            button.addEventListener('click', () => {
-                sendMessage(message);
-            });
-            block.appendChild(button);
+
+            if (action) {
+                const button = document.createElement('button');
+                button.textContent = action;
+                button.addEventListener('click', () => {
+                    sendMessage(message);
+                });
+                block.appendChild(button);
+            }
+
             result.appendChild(div);
             div.scrollIntoView(false);
         }

diff --git a/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs b/MarkMpn.Sql4Cds.XTB/SqlQueryControl.cs
@@ -32,6 +32,7 @@
 using MarkMpn.Sql4Cds.Export.DataStorage;
 using McTools.Xrm.Connection;
 using Microsoft.ApplicationInsights;
+using Microsoft.Identity.Client;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 using Microsoft.Web.WebView2.WinForms;
 using Microsoft.Xrm.Sdk;
@@ -2417,6 +2418,7 @@ public async Task<string[]> SendMessage(string request)
             }
             catch (Exception ex)
             {
+                await ShowPromptSuggestionAsync("warning", HttpUtility.HtmlEncode(ex.Message), null, null);
                 return new[] { ex.Message };
             }
             finally