console (bugfix): Fix broken highlighting of errors in the GraphiQL tab

[DSF-465]: https://hasurahq.atlassian.net/browse/DSF-465?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/9836
GitOrigin-RevId: d701a746a2c09436ca99c1c30b5415bd371105aa
This commit is contained in:
Nicolas Inchauspe 2023-07-18 12:07:28 +02:00 committed by hasura-bot
parent 151a888289
commit 0ea522ba30
3 changed files with 91 additions and 22 deletions

View File

@ -254,6 +254,14 @@ class OneGraphExplorer extends React.Component {
);
}
if (!schema) {
return (
<div className="h-full flex">
<Spinner />
</div>
);
}
const graphiql = renderGraphiql({
query: query,
onEditQuery: this.editQuery,

View File

@ -28,7 +28,9 @@
"npm": ">=8"
},
"resolutions": {
"@types/react": "17.0.39"
"@types/react": "17.0.39",
"codemirror-graphql": "0.12.0-alpha.0",
"graphql-language-service-interface": "2.4.0-alpha.0"
},
"dependencies": {
"@ant-design/icons": "4.7.0",

View File

@ -15037,16 +15037,16 @@ __metadata:
languageName: node
linkType: hard
"codemirror-graphql@npm:^0.12.0-alpha.0":
version: 0.12.4
resolution: "codemirror-graphql@npm:0.12.4"
"codemirror-graphql@npm:0.12.0-alpha.0":
version: 0.12.0-alpha.0
resolution: "codemirror-graphql@npm:0.12.0-alpha.0"
dependencies:
graphql-language-service-interface: ^2.4.3
graphql-language-service-parser: ^1.6.5
graphql-language-service-interface: ^2.4.0-alpha.0
graphql-language-service-parser: ^1.5.3-alpha.0
peerDependencies:
codemirror: ^5.54.0
graphql: ^14.0.0 || ^15.0.0
checksum: 6e7de2d0ece9dda1e43b4afaa25a0dd80269e04b00b4a3241e0034b6fd8ba89603dd3b243668b0d2294b52a7b37f873975ba277d5bb19ae0329fb09b761787c1
codemirror: ^5.26.0
graphql: ^0.12.0 || ^0.13.0 || ^14.0.0
checksum: 8df4dbda170ad799d8ce0311a1724b3b38b1ce3c5355c78496c72c0b6c646a4af70ea110869b95798b5e9577105a12c552fdc5b8ec4c470819610267c7e1f202
languageName: node
linkType: hard
@ -15741,6 +15741,16 @@ __metadata:
languageName: node
linkType: hard
"cross-fetch@npm:2.2.2":
version: 2.2.2
resolution: "cross-fetch@npm:2.2.2"
dependencies:
node-fetch: 2.1.2
whatwg-fetch: 2.0.4
checksum: 882026e147d8f7798555fed7093867623d77db53c56696a2be6f10c493e19c697c45053f43d7877363372f7a67e348db6dc099b8118d48ec8e3da232ed8041a9
languageName: node
linkType: hard
"cross-fetch@npm:^3.1.5":
version: 3.1.6
resolution: "cross-fetch@npm:3.1.6"
@ -20400,6 +20410,21 @@ __metadata:
languageName: node
linkType: hard
"graphql-config@npm:2.2.1":
version: 2.2.1
resolution: "graphql-config@npm:2.2.1"
dependencies:
graphql-import: ^0.7.1
graphql-request: ^1.5.0
js-yaml: ^3.10.0
lodash: ^4.17.4
minimatch: ^3.0.4
peerDependencies:
graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0
checksum: 4b70bd9e2a949dec611608b74b6f3c0c88a0dafb182bc3d2d65fc1075fd8497943afa3f58fc18dd419b8a4283f9faf316739dd8bb371f245073e7f4085e879e9
languageName: node
linkType: hard
"graphql-config@npm:4.3.6":
version: 4.3.6
resolution: "graphql-config@npm:4.3.6"
@ -20448,22 +20473,33 @@ __metadata:
languageName: node
linkType: hard
"graphql-language-service-interface@npm:^2.4.3":
version: 2.10.2
resolution: "graphql-language-service-interface@npm:2.10.2"
"graphql-import@npm:^0.7.1":
version: 0.7.1
resolution: "graphql-import@npm:0.7.1"
dependencies:
graphql-config: ^4.1.0
graphql-language-service-parser: ^1.10.4
graphql-language-service-types: ^1.8.7
graphql-language-service-utils: ^2.7.1
vscode-languageserver-types: ^3.15.1
lodash: ^4.17.4
resolve-from: ^4.0.0
peerDependencies:
graphql: ^15.5.0 || ^16.0.0
checksum: 301a1602987099868dcca5fd21e963089bf526f6315b4c6fbabb2bcd7bebf7dcb23652844bd03123f8e0badf00adfce89e0b50f8a7589d342d6b385f92a7e776
graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0
checksum: 26997dee29f9134477a64db264e5a7cf0d4b9c93b6585506bcbf809763efd8af6a35f2802208965c82f9c070794b86040d9353bbab077b30b44db159b28eeb4c
languageName: node
linkType: hard
"graphql-language-service-parser@npm:^1.10.4, graphql-language-service-parser@npm:^1.6.5":
"graphql-language-service-interface@npm:2.4.0-alpha.0":
version: 2.4.0-alpha.0
resolution: "graphql-language-service-interface@npm:2.4.0-alpha.0"
dependencies:
graphql-config: 2.2.1
graphql-language-service-parser: ^1.5.3-alpha.0
graphql-language-service-types: ^1.6.0-alpha.0
graphql-language-service-utils: ^2.4.0-alpha.0
peerDependencies:
graphql: ^0.12.0 || ^0.13.0 || ^14.0.0
checksum: 2e3cba0e89e5137b6cbf1fe54cd6bcc630c09b746692e4a6739beaa2334411e26ccaa1cb8486a4023768bde7ce420bbcf90affe81a07b6f5070b204f62fecdf7
languageName: node
linkType: hard
"graphql-language-service-parser@npm:^1.5.3-alpha.0":
version: 1.10.4
resolution: "graphql-language-service-parser@npm:1.10.4"
dependencies:
@ -20474,7 +20510,7 @@ __metadata:
languageName: node
linkType: hard
"graphql-language-service-types@npm:^1.8.7":
"graphql-language-service-types@npm:^1.6.0-alpha.0, graphql-language-service-types@npm:^1.8.7":
version: 1.8.7
resolution: "graphql-language-service-types@npm:1.8.7"
dependencies:
@ -20486,7 +20522,7 @@ __metadata:
languageName: node
linkType: hard
"graphql-language-service-utils@npm:^2.7.1":
"graphql-language-service-utils@npm:^2.4.0-alpha.0":
version: 2.7.1
resolution: "graphql-language-service-utils@npm:2.7.1"
dependencies:
@ -20510,6 +20546,15 @@ __metadata:
languageName: node
linkType: hard
"graphql-request@npm:^1.5.0":
version: 1.8.2
resolution: "graphql-request@npm:1.8.2"
dependencies:
cross-fetch: 2.2.2
checksum: 6cc391e9f502774e9cf0277ac61c5d5b075bad0fefe100776491c0ad548a7513d00a7fcb0f1ad08323032f3c2c0df2b9dc1a69862cf064f860ac114750a1e671
languageName: node
linkType: hard
"graphql-request@npm:^6.0.0":
version: 6.1.0
resolution: "graphql-request@npm:6.1.0"
@ -26706,6 +26751,13 @@ __metadata:
languageName: node
linkType: hard
"node-fetch@npm:2.1.2":
version: 2.1.2
resolution: "node-fetch@npm:2.1.2"
checksum: 4c235a1c0d806046ee3874ff920e7e99200b1b1eec8df8c39318ddfb9f1d839ff738fcd0d876d1ad00f2f70ff19a7a43ab977a65260db787ce2ff335c51805ce
languageName: node
linkType: hard
"node-fetch@npm:^1.0.1":
version: 1.7.3
resolution: "node-fetch@npm:1.7.3"
@ -35980,6 +36032,13 @@ __metadata:
languageName: node
linkType: hard
"whatwg-fetch@npm:2.0.4":
version: 2.0.4
resolution: "whatwg-fetch@npm:2.0.4"
checksum: de7c65a68d7d62e2f144a6b30293370b3ad82b65ebcd68f2ac8e8bbe7ede90febd98ba9486b78c1cbc950e0e8838fa5c2727f939899ab3fc7b71a04be52d33a5
languageName: node
linkType: hard
"whatwg-fetch@npm:>=0.10.0, whatwg-fetch@npm:^3.0.0, whatwg-fetch@npm:^3.6.2":
version: 3.6.2
resolution: "whatwg-fetch@npm:3.6.2"