@qoretechnologies/reqraft 0.6.9 → 0.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/hooks/useFetch/useFetch.d.ts +2 -0
  2. package/dist/hooks/useFetch/useFetch.d.ts.map +1 -1
  3. package/dist/hooks/useFetch/useFetch.js +5 -1
  4. package/dist/hooks/useFetch/useFetch.js.map +1 -1
  5. package/dist/utils/fetch.js +1 -1
  6. package/dist/utils/fetch.js.map +1 -1
  7. package/package.json +2 -2
  8. package/src/hooks/useFetch/useFetch.stories.tsx +226 -3
  9. package/src/hooks/useFetch/useFetch.tsx +6 -1
  10. package/src/utils/fetch.ts +1 -1
package/dist/hooks/useFetch/useFetch.d.ts CHANGED
@@ -4,6 +4,7 @@ export interface IReqraftUseFetch<T> {
4
4
  loading: boolean;
5
5
  load: () => Promise<T>;
6
6
  error: Error | undefined;
7
+ errorData?: any;
7
8
  }
8
9
  export interface IReqraftUseFetchOptions<T> extends IReqraftQueryConfig {
9
10
  defaultData?: T;
@@ -17,5 +18,6 @@ export declare function useFetch<T>({ url, method, body, cache, defaultData, loa
17
18
  mergeBodies?: boolean;
18
19
  }) => Promise<void>;
19
20
  error: Error;
21
+ errorData: any;
20
22
  };
21
23
  //# sourceMappingURL=useFetch.d.ts.map
package/dist/hooks/useFetch/useFetch.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useFetch.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetch/useFetch.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,CAAE,SAAQ,mBAAmB;IACrE,WAAW,CAAC,EAAE,CAAC,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAC1B,GAAG,EACH,MAAc,EACd,IAAI,EACJ,KAAK,EACL,WAAW,EACX,WAAW,GACZ,EAAE,uBAAuB,CAAC,CAAC,CAAC;;;gDAuBxB;QAAE,IAAI,CAAC,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE;;EAsBlE"}
1
+ {"version":3,"file":"useFetch.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFetch/useFetch.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,SAAS,CAAC,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,CAAE,SAAQ,mBAAmB;IACrE,WAAW,CAAC,EAAE,CAAC,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAC1B,GAAG,EACH,MAAc,EACd,IAAI,EACJ,KAAK,EACL,WAAW,EACX,WAAW,GACZ,EAAE,uBAAuB,CAAC,CAAC,CAAC;;;gDAwBxB;QAAE,IAAI,CAAC,EAAE,OAAO,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE;;;EAyBlE"}
package/dist/hooks/useFetch/useFetch.js CHANGED
@@ -71,6 +71,7 @@ function useFetch(_a) {
71
71
  var _c = (0, react_1.useState)(loadOnMount), loading = _c[0], setLoading = _c[1];
72
72
  var _d = (0, react_1.useState)(defaultData), data = _d[0], setData = _d[1];
73
73
  var _e = (0, react_1.useState)(), error = _e[0], setError = _e[1];
74
+ var _f = (0, react_1.useState)(), errorData = _f[0], setErrorData = _f[1];
74
75
  function load() {
75
76
  return __awaiter(this, arguments, void 0, function (_a) {
76
77
  var _body, response;
@@ -85,10 +86,13 @@ function useFetch(_a) {
85
86
  response = _c.sent();
86
87
  setLoading(false);
87
88
  if (response.ok) {
89
+ setError(undefined);
90
+ setErrorData(undefined);
88
91
  setData(response.data);
89
92
  }
90
93
  else {
91
94
  setError(response.error);
95
+ setErrorData(response.data);
92
96
  }
93
97
  return [2 /*return*/];
94
98
  }
@@ -100,7 +104,7 @@ function useFetch(_a) {
100
104
  load();
101
105
  }
102
106
  });
103
- return { data: data, loading: loading, load: load, error: error };
107
+ return { data: data, loading: loading, load: load, error: error, errorData: errorData };
104
108
  }
105
109
  exports.useFetch = useFetch;
106
110
  //# sourceMappingURL=useFetch.js.map
package/dist/hooks/useFetch/useFetch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"useFetch.js","sourceRoot":"","sources":["../../../src/hooks/useFetch/useFetch.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAiC;AACjC,uCAA0C;AAC1C,6DAA0D;AAC1D,4DAA2D;AAe3D,SAAgB,QAAQ,CAAI,EAOC;QAN3B,GAAG,SAAA,EACH,cAAc,EAAd,MAAM,mBAAG,KAAK,KAAA,EACd,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,WAAW,iBAAA,EACX,WAAW,iBAAA;IAEX,IAAM,KAAK,GAAG,IAAA,yCAAkB,EAAC,2BAAY,EAAE,UAAC,OAAO;QACrD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB,KAAK,MAAM;gBACT,OAAO,OAAO,CAAC,IAAI,CAAC;YACtB,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB;gBACE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAC,CAAC;IAEG,IAAA,KAAwB,IAAA,gBAAQ,EAAC,WAAW,CAAC,EAA5C,OAAO,QAAA,EAAE,UAAU,QAAyB,CAAC;IAC9C,IAAA,KAAkB,IAAA,gBAAQ,EAAgB,WAAW,CAAC,EAArD,IAAI,QAAA,EAAE,OAAO,QAAwC,CAAC;IACvD,IAAA,KAAoB,IAAA,gBAAQ,GAAqB,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IAExD,SAAe,IAAI;4DAAC,EAGkD;;gBAHlD,qBAGgD,EAAE,KAAA,EAF9D,UAAU,UAAA,EAChB,WAAW,iBAAA;;;;wBAEX,UAAU,CAAC,IAAI,CAAC,CAAC;wBAEX,KAAK,GAAG,WAAW,CAAC,CAAC,uBAAM,IAAI,GAAK,UAAU,EAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC;wBAC3D,qBAAM,KAAK,CAAI,EAAE,GAAG,KAAA,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,OAAA,EAAE,CAAC,EAAA;;wBAAtD,QAAQ,GAAG,SAA2C;wBAE5D,UAAU,CAAC,KAAK,CAAC,CAAC;wBAElB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;4BAChB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBACzB,CAAC;6BAAM,CAAC;4BACN,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBAC3B,CAAC;;;;;KACF;IAED,IAAA,yBAAa,EAAC;QACZ,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,MAAA,EAAE,OAAO,SAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,CAAC;AACxC,CAAC;AApDD,4BAoDC"}
1
+ {"version":3,"file":"useFetch.js","sourceRoot":"","sources":["../../../src/hooks/useFetch/useFetch.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAAiC;AACjC,uCAA0C;AAC1C,6DAA0D;AAC1D,4DAA2D;AAgB3D,SAAgB,QAAQ,CAAI,EAOC;QAN3B,GAAG,SAAA,EACH,cAAc,EAAd,MAAM,mBAAG,KAAK,KAAA,EACd,IAAI,UAAA,EACJ,KAAK,WAAA,EACL,WAAW,iBAAA,EACX,WAAW,iBAAA;IAEX,IAAM,KAAK,GAAG,IAAA,yCAAkB,EAAC,2BAAY,EAAE,UAAC,OAAO;QACrD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB,KAAK,MAAM;gBACT,OAAO,OAAO,CAAC,IAAI,CAAC;YACtB,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,OAAO,CAAC,GAAG,CAAC;YACrB;gBACE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACtC,CAAC;IACH,CAAC,CAAC,CAAC;IAEG,IAAA,KAAwB,IAAA,gBAAQ,EAAC,WAAW,CAAC,EAA5C,OAAO,QAAA,EAAE,UAAU,QAAyB,CAAC;IAC9C,IAAA,KAAkB,IAAA,gBAAQ,EAAgB,WAAW,CAAC,EAArD,IAAI,QAAA,EAAE,OAAO,QAAwC,CAAC;IACvD,IAAA,KAAoB,IAAA,gBAAQ,GAAqB,EAAhD,KAAK,QAAA,EAAE,QAAQ,QAAiC,CAAC;IAClD,IAAA,KAA4B,IAAA,gBAAQ,GAAO,EAA1C,SAAS,QAAA,EAAE,YAAY,QAAmB,CAAC;IAElD,SAAe,IAAI;4DAAC,EAGkD;;gBAHlD,qBAGgD,EAAE,KAAA,EAF9D,UAAU,UAAA,EAChB,WAAW,iBAAA;;;;wBAEX,UAAU,CAAC,IAAI,CAAC,CAAC;wBAEX,KAAK,GAAG,WAAW,CAAC,CAAC,uBAAM,IAAI,GAAK,UAAU,EAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC;wBAC3D,qBAAM,KAAK,CAAI,EAAE,GAAG,KAAA,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,OAAA,EAAE,CAAC,EAAA;;wBAAtD,QAAQ,GAAG,SAA2C;wBAE5D,UAAU,CAAC,KAAK,CAAC,CAAC;wBAElB,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;4BAChB,QAAQ,CAAC,SAAS,CAAC,CAAC;4BACpB,YAAY,CAAC,SAAS,CAAC,CAAC;4BACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBACzB,CAAC;6BAAM,CAAC;4BACN,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;4BACzB,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBAC9B,CAAC;;;;;KACF;IAED,IAAA,yBAAa,EAAC;QACZ,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,IAAI,MAAA,EAAE,OAAO,SAAA,EAAE,IAAI,MAAA,EAAE,KAAK,OAAA,EAAE,SAAS,WAAA,EAAE,CAAC;AACnD,CAAC;AAxDD,4BAwDC"}
package/dist/utils/fetch.js CHANGED
@@ -121,7 +121,7 @@ function query(_a) {
121
121
  if (!requestData.ok) {
122
122
  queryClient.invalidateQueries({ queryKey: [cacheKey] });
123
123
  return [2 /*return*/, {
124
- data: null,
124
+ data: requestData.data,
125
125
  ok: false,
126
126
  code: requestData.status,
127
127
  error: requestData.statusText,
package/dist/utils/fetch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qoretechnologies/reqraft",
3
- "version": "0.6.9",
3
+ "version": "0.6.10",
4
4
  "description": "ReQraft is a collection of React components and hooks that are used across Qore Technologies' products made using the ReQore component library from Qore.",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -53,7 +53,7 @@
53
53
  "@babel/preset-typescript": "^7.12.7",
54
54
  "@chromatic-com/storybook": "^2.0.2",
55
55
  "@netsells/storybook-mockdate": "^0.3.3",
56
- "@qoretechnologies/reqore": "^0.48.12",
56
+ "@qoretechnologies/reqore": "^0.48.18",
57
57
  "@storybook/addon-actions": "^8.3.5",
58
58
  "@storybook/addon-essentials": "^8.3.5",
59
59
  "@storybook/addon-interactions": "^8.3.5",
package/src/hooks/useFetch/useFetch.stories.tsx CHANGED
@@ -9,13 +9,16 @@ const meta = {
9
9
  render: (args) => {
10
10
  const {
11
11
  data = {},
12
+ errorData,
12
13
  load,
13
14
  loading,
14
15
  } = useFetch<any>({ url: 'public/info', method: args.method, loadOnMount: true });
15
16
 
16
- return loading ?
17
- <ReqoreSpinner />
18
- : <ReqoreTree data={data} bottomActions={[{ label: 'Refetch', onClick: load }]} />;
17
+ return loading ? (
18
+ <ReqoreSpinner />
19
+ ) : (
20
+ <ReqoreTree data={errorData || data} bottomActions={[{ label: 'Refetch', onClick: load }]} />
21
+ );
19
22
  },
20
23
  } as StoryMeta<any>;
21
24
 
@@ -118,3 +121,223 @@ export const del: Story = {
118
121
  await testsWaitForText('"Successfuly deleted"');
119
122
  },
120
123
  };
124
+
125
+ export const Error409: Story = {
126
+ args: {
127
+ method: 'POST',
128
+ },
129
+ parameters: {
130
+ mockData: [
131
+ {
132
+ // An array of mock objects which will add in every story
133
+ url: 'https://hq.qoretechnologies.com:8092/api/latest/public/info',
134
+ method: 'POST',
135
+ status: 409,
136
+ response: {
137
+ type: 'User',
138
+ file: 'AbstractQorusCoreService.qc',
139
+ line: 871,
140
+ endline: 871,
141
+ source: '',
142
+ offset: 0,
143
+ lang: 'Qore',
144
+ callstack: [
145
+ {
146
+ function: 'AbstractQorusCoreService::logRethrowException',
147
+ line: 984,
148
+ endline: 984,
149
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
150
+ offset: 0,
151
+ lang: 'Qore',
152
+ typecode: 3,
153
+ type: 'rethrow',
154
+ },
155
+ {
156
+ function: 'AbstractQorusCoreService::logRethrowException',
157
+ line: -1,
158
+ endline: -1,
159
+ file: '<builtin>',
160
+ offset: 0,
161
+ lang: 'Qore',
162
+ typecode: 0,
163
+ type: 'user',
164
+ programid: 1,
165
+ statementid: 12282,
166
+ },
167
+ {
168
+ function: 'ServiceManagerBase::callMethod',
169
+ line: 3964,
170
+ endline: 3964,
171
+ file: 'QorusRestApiHandlerV8.qc',
172
+ offset: 0,
173
+ lang: 'Qore',
174
+ typecode: 1,
175
+ type: 'builtin',
176
+ programid: 1,
177
+ statementid: 12282,
178
+ },
179
+ {
180
+ function: 'FsmsRestClassV8::doCreateFsmDraftFromText',
181
+ line: 3951,
182
+ endline: 3951,
183
+ file: 'QorusRestApiHandlerV8.qc',
184
+ offset: 0,
185
+ lang: 'Qore',
186
+ typecode: 0,
187
+ type: 'user',
188
+ programid: 1,
189
+ statementid: 12266,
190
+ },
191
+ {
192
+ function: 'FsmsRestClassV8::postCreateDraftFromText',
193
+ line: -1,
194
+ endline: -1,
195
+ file: '<builtin>',
196
+ offset: 0,
197
+ lang: 'Qore',
198
+ typecode: 0,
199
+ type: 'user',
200
+ programid: 20,
201
+ statementid: 28,
202
+ },
203
+ {
204
+ function: 'call_object_method_args',
205
+ line: 941,
206
+ endline: 941,
207
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
208
+ offset: 0,
209
+ lang: 'Qore',
210
+ typecode: 1,
211
+ type: 'builtin',
212
+ programid: 20,
213
+ statementid: 28,
214
+ },
215
+ {
216
+ function: 'AbstractRestClass::dispatch',
217
+ line: 1544,
218
+ endline: 1544,
219
+ file: 'QorusRestApiHandler.qc',
220
+ offset: 0,
221
+ lang: 'Qore',
222
+ typecode: 0,
223
+ type: 'user',
224
+ programid: 1,
225
+ statementid: 22271,
226
+ },
227
+ {
228
+ function: 'QorusRestClass::dispatch',
229
+ line: 849,
230
+ endline: 849,
231
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
232
+ offset: 0,
233
+ lang: 'Qore',
234
+ typecode: 0,
235
+ type: 'user',
236
+ programid: 20,
237
+ statementid: 117,
238
+ },
239
+ {
240
+ function: 'AbstractRestClass::handleRequest',
241
+ line: 860,
242
+ endline: 860,
243
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
244
+ offset: 0,
245
+ lang: 'Qore',
246
+ typecode: 0,
247
+ type: 'user',
248
+ programid: 20,
249
+ statementid: 121,
250
+ },
251
+ {
252
+ function: 'AbstractRestClass::handleRequest',
253
+ line: 1569,
254
+ endline: 1569,
255
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
256
+ offset: 0,
257
+ lang: 'Qore',
258
+ typecode: 0,
259
+ type: 'user',
260
+ programid: 20,
261
+ statementid: 415,
262
+ },
263
+ {
264
+ function: 'RestHandler::dispatchRequest',
265
+ line: 1476,
266
+ endline: 1476,
267
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm',
268
+ offset: 0,
269
+ lang: 'Qore',
270
+ typecode: 0,
271
+ type: 'user',
272
+ programid: 20,
273
+ statementid: 270,
274
+ },
275
+ {
276
+ function: 'RestHandler::handleRequest',
277
+ line: 17303,
278
+ endline: 17303,
279
+ file: 'QorusRestApiHandler.qc',
280
+ offset: 0,
281
+ lang: 'Qore',
282
+ typecode: 0,
283
+ type: 'user',
284
+ programid: 1,
285
+ statementid: 27032,
286
+ },
287
+ {
288
+ function: 'WebAppHandler::handleRequest',
289
+ line: 1781,
290
+ endline: 1781,
291
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm',
292
+ offset: 0,
293
+ lang: 'Qore',
294
+ typecode: 0,
295
+ type: 'user',
296
+ programid: 28,
297
+ statementid: 931,
298
+ },
299
+ {
300
+ function: 'HttpServer::handleRequest',
301
+ line: 2797,
302
+ endline: 2798,
303
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm',
304
+ offset: 0,
305
+ lang: 'Qore',
306
+ typecode: 0,
307
+ type: 'user',
308
+ programid: 28,
309
+ statementid: 346,
310
+ },
311
+ {
312
+ function: 'HttpListener::connectionThread',
313
+ line: 2599,
314
+ endline: 2599,
315
+ file: '/export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm',
316
+ offset: 0,
317
+ lang: 'Qore',
318
+ typecode: 0,
319
+ type: 'user',
320
+ programid: 28,
321
+ statementid: 2,
322
+ },
323
+ {
324
+ function: 'HttpListener::<anonymous closure>',
325
+ line: -1,
326
+ endline: -1,
327
+ file: '<builtin>',
328
+ offset: 0,
329
+ lang: 'Qore',
330
+ typecode: 0,
331
+ type: 'user',
332
+ },
333
+ ],
334
+ err: 'ACTION-ERROR',
335
+ desc: 'system service: nli v6.1 (217):97 (Qore source "/export/home2/dnichols/src/Qorus/git/qorus/system/nli-v6.1.qsd":97) (while calling system.nli.buildFsm()): User exception: system service: nli v6.1 (217):97 (Qore source "/export/home2/dnichols/src/Qorus/git/qorus/system/nli-v6.1.qsd":97): ACTION-ERROR: Could not match any apps from the input\n Nli::buildFsm() called at <builtin>:-1 (Qore user code)\n call_object_method_args() called at LocalQorusService.qc:957 (Qore builtin code)\n LocalQorusService::callMethodImpl() called at Service.qc:101 (Qore user code)\n Service::callMethodImpl() called at <builtin>:-1 (Qore user code)\n ServiceManagerBase::callMethod() called at QorusRestApiHandlerV8.qc:3964 (Qore builtin code)\n FsmsRestClassV8::doCreateFsmDraftFromText() called at QorusRestApiHandlerV8.qc:3951 (Qore user code)\n FsmsRestClassV8::postCreateDraftFromText() called at <builtin>:-1 (Qore user code)\n call_object_method_args() called at /export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm:941 (Qore builtin code)\n AbstractRestClass::dispatch() called at QorusRestApiHandler.qc:1544 (Qore user code)\n QorusRestClass::dispatch() called at /export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm:849 (Qore user code)\n AbstractRestClass::handleRequest() called at /export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm:860 (Qore user code)\n AbstractRestClass::handleRequest() called at /export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm:1569 (Qore user code)\n RestHandler::dispatchRequest() called at /export/home2/dnichols/src/Qorus/current/qlib/RestHandler.qm:1476 (Qore user code)\n RestHandler::handleRequest() called at QorusRestApiHandler.qc:17303 (Qore user code)\n WebAppHandler::handleRequest() called at /export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm:1781 (Qore user code)\n HttpServer::handleRequest() called at /export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm:2797 (Qore user code)\n HttpListener::connectionThread() called at /export/home2/dnichols/src/Qorus/current/qlib/HttpServer.qm:2599 (Qore user code)\n HttpListener::<anonymous closure>() called at <builtin>:-1 (Qore user code)',
336
+ },
337
+ },
338
+ ],
339
+ },
340
+ play: async () => {
341
+ await testsWaitForText('"AbstractQorusCoreService.qc"');
342
+ },
343
+ };
package/src/hooks/useFetch/useFetch.tsx CHANGED
@@ -9,6 +9,7 @@ export interface IReqraftUseFetch<T> {
9
9
  loading: boolean;
10
10
  load: () => Promise<T>;
11
11
  error: Error | undefined;
12
+ errorData?: any;
12
13
  }
13
14
 
14
15
  export interface IReqraftUseFetchOptions<T> extends IReqraftQueryConfig {
@@ -42,6 +43,7 @@ export function useFetch<T>({
42
43
  const [loading, setLoading] = useState(loadOnMount);
43
44
  const [data, setData] = useState<T | undefined>(defaultData);
44
45
  const [error, setError] = useState<Error | undefined>();
46
+ const [errorData, setErrorData] = useState<any>();
45
47
 
46
48
  async function load({
47
49
  body: customBody,
@@ -55,9 +57,12 @@ export function useFetch<T>({
55
57
  setLoading(false);
56
58
 
57
59
  if (response.ok) {
60
+ setError(undefined);
61
+ setErrorData(undefined);
58
62
  setData(response.data);
59
63
  } else {
60
64
  setError(response.error);
65
+ setErrorData(response.data);
61
66
  }
62
67
  }
63
68
 
@@ -67,5 +72,5 @@ export function useFetch<T>({
67
72
  }
68
73
  });
69
74
 
70
- return { data, loading, load, error };
75
+ return { data, loading, load, error, errorData };
71
76
  }
package/src/utils/fetch.ts CHANGED
@@ -106,7 +106,7 @@ export async function query<T>({
106
106
  queryClient.invalidateQueries({ queryKey: [cacheKey] });
107
107
 
108
108
  return {
109
- data: null,
109
+ data: requestData.data,
110
110
  ok: false,
111
111
  code: requestData.status,
112
112
  error: requestData.statusText,