From 75dddead76e7040a6069337f72cef27d2c74f4dc Mon Sep 17 00:00:00 2001 From: Wroud Date: Mon, 11 Jan 2021 16:18:29 +0300 Subject: [PATCH] fix(plugin-sql-editor): CB-184 handle unknown dialect --- .../src/SqlEditor/CodeEditor/CodeEditorController.tsx | 6 ++++-- .../src/SqlEditor/CodeEditor/codemirror.meta.d.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx index a0560e452d..9ba4e0206c 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx +++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/CodeEditorController.tsx @@ -75,9 +75,11 @@ export class CodeEditorController { [value]: value, }), {}); - if (this.bindings.options && this.dialect.name) { + if (this.bindings.options) { + const name = this.dialect.name && findModeByName(this.dialect.name)?.mime; + this.bindings.options.mode = { - name: findModeByName(this.dialect.name).mime, + name: name || COMMON_EDITOR_CONFIGURATION.mode, keywords, builtin, }; diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/codemirror.meta.d.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/codemirror.meta.d.ts index 6ac9d7127a..8b6bc08ce4 100644 --- a/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/codemirror.meta.d.ts +++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/CodeEditor/codemirror.meta.d.ts @@ -16,5 +16,5 @@ declare module 'codemirror' { ext?: string[]; alias?: string[]; } - function findModeByName(name: string): ModeInfo; + function findModeByName(name: string): ModeInfo | undefined; }