mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

GQL third pass (#5641)

Browse Source 
* fallback to {} and only auto prettify

* tolerate operation name change

* fallback to first element on change

* handle empty query

* update operation names on empty query

* update the ast when we update the query

* remove log

Co-authored-by: gatzjames <jamesgatzos@gmail.com>
This commit is contained in:
Jack Kavanagh 2023-01-10 15:41:06 +01:00 committed by GitHub
parent 4899ccdc37
commit 18771f7a94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/insomnia/src/ui/components/editors/body/graph-ql-editor.tsx
View File

@ -161,14 +161,15 @@ export const GraphQLEditor: FC<Props> = ({
} catch (error) { } catch (error) {
documentAST = null; documentAST = null;
} }
const operations = documentAST?.definitions.filter(isOperationDefinition)?.map(def => def.name?.value || '') || [];
const operationName = requestBody.operationName || operations[0] || '';
const [state, setState] = useState<State>({ const [state, setState] = useState<State>({
body: { body: {
query: requestBody.query || '', query: requestBody.query || '',
variables: requestBody.variables, variables: requestBody.variables,
operationName: requestBody.operationName, operationName,
}, },
operations: documentAST?.definitions.filter(isOperationDefinition)?.map(def => def.name?.value || '') || [], operations,
hideSchemaFetchErrors: false, hideSchemaFetchErrors: false,
variablesSyntaxError: '', variablesSyntaxError: '',
activeReference: null, activeReference: null,
@ -222,9 +223,7 @@ export const GraphQLEditor: FC<Props> = ({
useTabs: editorIndentWithTabs, useTabs: editorIndentWithTabs,
tabWidth: editorIndentSize, tabWidth: editorIndentSize,
}); });
const prettyVariables = body.variables && JSON.parse(jsonPrettify(JSON.stringify(body.variables)));
changeQuery(prettyQuery); changeQuery(prettyQuery);
changeVariables(prettyVariables);
// Update editor contents // Update editor contents
if (editorRef.current) { if (editorRef.current) {
editorRef.current?.setValue(prettyQuery); editorRef.current?.setValue(prettyQuery);
@ -240,7 +239,7 @@ export const GraphQLEditor: FC<Props> = ({
}; };
const changeVariables = (variablesInput: string) => { const changeVariables = (variablesInput: string) => {
try { try {
const variables = JSON.parse(variablesInput || 'null'); const variables = JSON.parse(variablesInput || '{}');
onChange(JSON.stringify({ ...state.body, variables })); onChange(JSON.stringify({ ...state.body, variables }));
setState(state => ({ setState(state => ({
...state, ...state,
@ -252,17 +251,36 @@ export const GraphQLEditor: FC<Props> = ({
} }
}; };
const changeQuery = (query: string) => { const changeQuery = (query: string) => {
onChange(JSON.stringify({ ...state.body, query }));
try { try {
const documentAST = parse(query); const documentAST = parse(query);
const operations = documentAST.definitions.filter(isOperationDefinition)?.map(def => def.name?.value || '');
// default to first operation when none selected
let operationName = state.body.operationName || operations[0] || '';
if (operations.length && state.body.operationName) {
const operationsChanged = state.operations.join() !== operations.join();
const operationNameWasChanged = !operations.includes(state.body.operationName);
if (operationsChanged && operationNameWasChanged) {
// preserve selection during name change or fallback to first operation
const oldPostion = state.operations.indexOf(state.body.operationName);
operationName = operations[oldPostion] || operations[0] || '';
}
}
onChange(JSON.stringify({ ...state.body, query, operationName }));
setState(state => ({ setState(state => ({
...state, ...state,
body: { ...state.body, query }, documentAST,
operations: documentAST.definitions.filter(isOperationDefinition)?.map(def => def.name?.value || ''), body: { ...state.body, query, operationName },
operations,
})); }));
} catch (error) { } catch (error) {
console.warn('failed to parse', error); console.warn('failed to parse', error);
setState(state => ({ ...state, documentAST: null, body: { ...state.body, query } })); setState(state => ({
...state,
documentAST: null,
body: { ...state.body, query, operationName: query ? state.body.operationName : 'Operations' },
operations: query ? state.operations : [],
}));
} }
}; };
@ -392,6 +410,7 @@ export const GraphQLEditor: FC<Props> = ({
}, },
}; };
} }
const canShowSchema = schema && !schemaIsFetching && !schemaFetchError && schemaLastFetchTime > 0; const canShowSchema = schema && !schemaIsFetching && !schemaFetchError && schemaLastFetchTime > 0;
return ( return (
<div className="graphql-editor"> <div className="graphql-editor">