Merge pull request #1660 from jumpserver/pr@dev@fix_acl_reject_toast

fix(chen): toast ACL command rejection

Author: Zxc4wonder

ui/chen/composables/useChenQueryConsole.ts

@@ -6,6 +6,7 @@ import type {
   ChenQueryConsoleTab,
   ChenQueryLikeWorkspaceTab,
   ChenQueryResultTab,
+  ChenSqlExecutionError,
   ChenTableStructureWorkspaceTab,
   ChenWorkspaceTab
 } from "~/chen/types";
@@ -57,6 +58,7 @@ export function useChenQueryConsole(
   ) => boolean | void,
   options: {
     onLog?: (tab: ChenWorkspaceTab, line: unknown, content: string) => void;
+    onError?: (tab: ChenQueryLikeWorkspaceTab, error: ChenSqlExecutionError) => void;
     translate?: (key: string) => string;
   } = {}
 ) {
@@ -270,16 +272,18 @@ export function useChenQueryConsole(
       case "sql_error":
         if ((tab.kind === "query" || tab.kind === "console") && packet.data && typeof packet.data === "object") {
           const message = String(packet.data.message || "SQL execution failed");
-          tab.lastSqlError = {
+          const sqlError: ChenSqlExecutionError = {
             ...packet.data,
             message
           };
+          tab.lastSqlError = sqlError;
           if (tab.kind === "console") {
             const entry = activeConsoleEntry(tab);
             if (entry) entry.status = "error";
           } else {
             appendLog(tab, { ...packet.data, level: 0, message });
           }
+          if (packet.data.kind === "acl") options.onError?.(tab, sqlError);
         }
         break;
       case "update_state": {

ui/chen/workspaces/DatabaseSessionSurface.vue

@@ -340,7 +340,16 @@ function clearLogConsole() {
   unreadLogErrorCount.value = 0;
 }
 
-const queryConsole = useChenQueryConsole(sendConsoleAction, { onLog: appendLogConsoleEntry, translate: t });
+const queryConsole = useChenQueryConsole(sendConsoleAction, {
+  onLog: appendLogConsoleEntry,
+  onError: (_tab, error) => {
+    addErrorToast({
+      title: error.title || t("Chen.Message"),
+      ...(error.message && error.message !== error.title ? { description: error.message } : {})
+    });
+  },
+  translate: t
+});
 const session = useChenSession({
   authenticate: auth.authenticate,
   translate: t,