Skip to content

SUP-383 Fail useNodeInfo gracefully, propagate error message #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2024
Merged

SUP-383 Fail useNodeInfo gracefully, propagate error message #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions packages/data-helper/src/hooks/useNodeInfo/useNodeInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,25 @@ const timeoutHandler = (client: ApolloClient<object>) => {

mergedQueue.forEach(mergedRequest => {
const {variables, queryOptions, options, originals} = mergedRequest;
const {query, generatedVariables, skip} = getQuery(variables, schemaResult, options);
let query: any;
let generatedVariables: any;
let skip;

try {
const r = getQuery(variables, schemaResult, options);
query = r.query;
generatedVariables = r.generatedVariables;
skip = r.skip;
} catch (e) {
const error = {message: `One of the batched queries resulted in error: ${e.message}`} as ApolloError;
originals.forEach(request => {
request.setResult({
loading: false,
error
});
});
}

if (skip) {
// No query to execute
originals.forEach(request => {
Expand Down Expand Up @@ -135,7 +153,15 @@ export const useNodeInfo = (variables: {[key:string]: unknown}, options?: NodeIn
}, [client, currentRequest]);

if (queryHasChanged && queryOptions?.fetchPolicy !== 'no-cache' && queryOptions?.fetchPolicy !== 'network-only') {
const infoQuery = getQuery(currentRequest.variables, schemaResult, currentRequest.options);
let infoQuery;

try {
infoQuery = getQuery(currentRequest.variables, schemaResult, currentRequest.options);
} catch (e) {
const error = {message: e.message} as ApolloError;
return {loading: false, error};
}

const res = client.readQuery({query: infoQuery.query, variables: infoQuery.generatedVariables});
if (res) {
const result = getResult(res, {}, currentRequest.options, infoQuery.query, infoQuery.generatedVariables);
Expand Down