mirror of
https://github.com/apache/superset.git
synced 2026-04-24 10:35:01 +00:00
chore(sqllab): Remove schemaOptions from redux store (#23257)
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
import React, { useState, useEffect, useRef } from 'react';
|
||||
import React, { useState, useEffect, useRef, useMemo } from 'react';
|
||||
import { useDispatch } from 'react-redux';
|
||||
import { css, styled, usePrevious } from '@superset-ui/core';
|
||||
|
||||
@@ -39,6 +39,7 @@ import {
|
||||
FullSQLEditor as AceEditor,
|
||||
} from 'src/components/AsyncAceEditor';
|
||||
import useQueryEditor from 'src/SqlLab/hooks/useQueryEditor';
|
||||
import { useSchemas } from 'src/hooks/apiResources';
|
||||
|
||||
type HotKey = {
|
||||
key: string;
|
||||
@@ -80,6 +81,7 @@ const StyledAceEditor = styled(AceEditor)`
|
||||
}
|
||||
`}
|
||||
`;
|
||||
|
||||
const AceEditorWrapper = ({
|
||||
autocomplete,
|
||||
onBlur = () => {},
|
||||
@@ -97,14 +99,27 @@ const AceEditorWrapper = ({
|
||||
'dbId',
|
||||
'sql',
|
||||
'functionNames',
|
||||
'schemaOptions',
|
||||
'tableOptions',
|
||||
'validationResult',
|
||||
'schema',
|
||||
]);
|
||||
const { data: schemaOptions } = useSchemas({ dbId: queryEditor.dbId });
|
||||
const currentSql = queryEditor.sql ?? '';
|
||||
const functionNames = queryEditor.functionNames ?? [];
|
||||
const schemas = queryEditor.schemaOptions ?? [];
|
||||
|
||||
// Loading schema, table and column names as auto-completable words
|
||||
const { schemas, schemaWords } = useMemo(
|
||||
() => ({
|
||||
schemas: schemaOptions ?? [],
|
||||
schemaWords: (schemaOptions ?? []).map(s => ({
|
||||
name: s.label,
|
||||
value: s.value,
|
||||
score: SCHEMA_AUTOCOMPLETE_SCORE,
|
||||
meta: 'schema',
|
||||
})),
|
||||
}),
|
||||
[schemaOptions],
|
||||
);
|
||||
const tables = queryEditor.tableOptions ?? [];
|
||||
|
||||
const [sql, setSql] = useState(currentSql);
|
||||
@@ -192,14 +207,7 @@ const AceEditorWrapper = ({
|
||||
onChange(text);
|
||||
};
|
||||
|
||||
const setAutoCompleter = () => {
|
||||
// Loading schema, table and column names as auto-completable words
|
||||
const schemaWords = schemas.map(s => ({
|
||||
name: s.label,
|
||||
value: s.value,
|
||||
score: SCHEMA_AUTOCOMPLETE_SCORE,
|
||||
meta: 'schema',
|
||||
}));
|
||||
function setAutoCompleter() {
|
||||
const columns = {};
|
||||
|
||||
const tableWords = tables.map(t => {
|
||||
@@ -263,7 +271,7 @@ const AceEditorWrapper = ({
|
||||
}));
|
||||
|
||||
setWords(words);
|
||||
};
|
||||
}
|
||||
|
||||
const getAceAnnotations = () => {
|
||||
const { validationResult } = queryEditor;
|
||||
|
||||
Reference in New Issue
Block a user