Return key trigger submit event

altair-graphql · Aug 12, 2023 · 1904133 · 1904133
1 parent e1aad65
commit 1904133
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/altair-app/src/app/modules/altair/components/x-input/x-input.component.ts b/packages/altair-app/src/app/modules/altair/components/x-input/x-input.component.ts
@@ -5,6 +5,7 @@ import {
   EventEmitter,
   forwardRef,
   Input,
+  NgZone,
   Output,
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
@@ -83,7 +84,8 @@ export class XInputComponent implements AfterViewInit, ControlValueAccessor {
 
   constructor(
     private store: Store<RootState>,
-    private environmentService: EnvironmentService
+    private environmentService: EnvironmentService,
+    private zone: NgZone
   ) {}
   ngAfterViewInit(): void {
     this.ready = true;
@@ -126,7 +128,16 @@ export class XInputComponent implements AfterViewInit, ControlValueAccessor {
     return [
       inputTheme,
       placeholder(this.placeholder),
-      keymap.of([...completionKeymap]),
+      keymap.of([
+        {
+          key: 'Enter',
+          run: () => {
+            this.zone.run(() => this.submitChange.emit());
+            return false;
+          },
+        },
+        ...completionKeymap,
+      ]),
       autocompletion({
         override: [
           (ctx: CompletionContext) => {

diff --git a/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator.ts b/packages/altair-app/src/app/modules/altair/services/pre-request/evaluator.ts
@@ -71,7 +71,7 @@ export class ScriptEvaluator {
                   } catch (err) {
                     worker.postMessage({
                       type: getErrorEvent(key),
-                      payload: { id, error: err },
+                      payload: { id, error: `${(err as any).message ?? err}` },
                     });
                   }
                 })();