mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refresh CodeMirror after GraphQL prettify (Fixes #896)

Browse Source
This commit is contained in:
Gregory Schier 2018-12-11 17:47:28 -05:00
parent 6f355bc7ba
commit 959d2750f4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/insomnia-app/app/ui/components/editors/body/graph-ql-editor.js
View File

@ -58,7 +58,6 @@ type State = {
schemaIsFetching: boolean,
hideSchemaFetchErrors: boolean,
variablesSyntaxError: string,
forceRefreshKey: number,
automaticFetch: boolean
};
@ -93,7 +92,6 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
schemaIsFetching: false,
hideSchemaFetchErrors: false,
variablesSyntaxError: '',
forceRefreshKey: 0,
automaticFetch
};
}
@ -288,7 +286,7 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
}
}
_buildVariableTypes(schema: Object | null, query: string): { [string]: Object } {
_buildVariableTypes(schema: Object | null): { [string]: Object } {
if (!schema) {
return {};
}
@ -326,14 +324,16 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
}
_handlePrettify() {
const { body, forceRefreshKey } = this.state;
const { body } = this.state;
const { variables, query } = body;
const prettyQuery = query && print(parse(query));
const prettyVariables = variables && JSON.parse(prettify.json(JSON.stringify(variables)));
this._handleBodyChange(prettyQuery, prettyVariables, this.state.body.operationName);
setTimeout(() => {
this.setState({ forceRefreshKey: forceRefreshKey + 1 });
}, 200);
// Update editor contents
if (this._queryEditor) {
this._queryEditor.setValue(prettyQuery);
}
}
_getOperations() {
@ -481,7 +481,6 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
schemaFetchError,
hideSchemaFetchErrors,
variablesSyntaxError,
forceRefreshKey,
schemaIsFetching,
automaticFetch
} = this.state;
@ -490,10 +489,10 @@ class GraphQLEditor extends React.PureComponent<Props, State> {
const variables = prettify.json(JSON.stringify(variablesObject));
const variableTypes = this._buildVariableTypes(schema, query);
const variableTypes = this._buildVariableTypes(schema);
return (
<div key={forceRefreshKey} className="graphql-editor">
<div className="graphql-editor">
<Dropdown right className="graphql-editor__schema-dropdown margin-bottom-xs">
<DropdownButton className="space-left btn btn--micro btn--outlined">
schema <i className="fa fa-wrench" />

1
packages/insomnia-app/flow-typed/codemirror.js vendored
View File

@ -25,6 +25,7 @@ declare module 'codemirror' {
doc: Doc;
getCursor(): Pos;
getValue(): string;
setValue(string): void;
hasFocus(): boolean;
indexFromPos(pos: Pos): number;
}