merge conflicts

pinterest · Aug 9, 2024 · eb97ad2 · eb97ad2
1 parent b0262d3
commit eb97ad2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/querybook/webapp/components/QueryEditor/QueryEditor.tsx b/querybook/webapp/components/QueryEditor/QueryEditor.tsx
@@ -23,8 +23,6 @@ import {
 import { useAutoComplete } from 'hooks/queryEditor/useAutoComplete';
 import { useCodeAnalysis } from 'hooks/queryEditor/useCodeAnalysis';
 import { useLint } from 'hooks/queryEditor/useLint';
-import { useUserQueryEditorConfig } from 'hooks/redux/useUserQueryEditorConfig';
-import { useUserQueryEditorConfig } from 'hooks/redux/useUserQueryEditorConfig';
 import { useDebouncedFn } from 'hooks/useDebouncedFn';
 import CodeMirror, { CodeMirrorKeyMap } from 'lib/codemirror';
 import { SQL_JINJA_MODE } from 'lib/codemirror/codemirror-mode';
@@ -60,7 +58,6 @@ export interface IQueryEditorProps extends IStyledQueryEditorProps {
     className?: string;
     autoCompleteType?: AutoCompleteType;
     querySuggestionsEnabled?: boolean;
-    querySuggestionsEnabled?: boolean;
 
     /**
      * If provided, then the container component will handle the fullscreen logic
@@ -120,7 +117,6 @@ export const QueryEditor: React.FC<
             className,
             autoCompleteType = 'all',
             querySuggestionsEnabled,
-            querySuggestionsEnabled,
             onFullScreen,
 
             onChange,
@@ -542,16 +538,6 @@ export const QueryEditor: React.FC<
             });
         }, [codeAnalysis]);
 
-        useEffect(() => {
-            if (querySuggestionsEnabled) {
-                // Enable copilot suggestion feature
-                enableCopilotSuggestions();
-            } else {
-                // Disable copilot suggestion feature
-                disableCopilotSuggestions();
-            }
-        }, [querySuggestionsEnabled]);
-
         useImperativeHandle(
             ref,
             () => ({

diff --git a/querybook/webapp/lib/codemirror/index.ts b/querybook/webapp/lib/codemirror/index.ts
@@ -48,10 +48,6 @@ declare module 'codemirror' {
     function normalizeKeyMap(
         keyMap: Record<string, string | (() => any)>
     ): Record<string, string | (() => any)>;
-
-    interface Editor {
-        querySuggestions(): void;
-    }
 }
 
 attachCustomCommand(CodeMirror.commands);