studiokit-scaffolding-js 5.2.0-next.2.1 → 5.2.0-next.2.2

package/lib/components/HOC/ModelErrorRedirectComponent.js

@@ -71,13 +71,13 @@ function modelErrorRedirectComponent(WrappedComponent) {
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&
-                model._metadata.lastFetchErrorData.code === 404;
+                model._metadata.lastFetchErrorData.status === 404;
             var errorRoute = previousModelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED &&
                 modelStatus === modelStatus_1.MODEL_STATUS.ERROR &&
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&
-                model._metadata.lastFetchErrorData.code === 500;
+                model._metadata.lastFetchErrorData.status === 500;
             if (notFoundRoute) {
                 var pathname = window.location.pathname;
                 return (react_1.default.createElement(react_router_dom_1.Redirect, { to: {

package/lib/redux/configureStore.js

@@ -43,7 +43,16 @@ var actionCreator_1 = require("./actionCreator");
 var actions_1 = require("./actions");
 var configureReducers_1 = __importDefault(require("./configureReducers"));
 var rootSaga_1 = __importDefault(require("./sagas/rootSaga"));
-var keysToFilter = ['puid', 'employeeNumber', 'access_token', 'refresh_token', 'password', 'Password', 'content'];
+var keysToFilter = [
+    'puid',
+    'employeeNumber',
+    'access_token',
+    'refresh_token',
+    'password',
+    'Password',
+    'content',
+    'data'
+];
 var filterData = function (obj) {
     return lodash_1.transform(obj, function (result, value, key) {
         if (keysToFilter.includes(key)) {
@@ -65,17 +74,11 @@ var stripState = function (obj, parentKey) {
 };
 exports.stripState = stripState;
 var actionTransformer = function (action) {
-    var _a;
     // action breadcrumb filtering
     if (
-    // do not track API responses
-    action.type === actions_1.MODEL_FETCH_RESULT_TYPE.FETCH_RESULT_RECEIVED ||
-        action.type === actions_1.MODEL_FETCH_RESULT_TYPE.TRANSIENT_FETCH_RESULT_RECEIVED ||
-        // do not track modal actions
-        action.type === actions_1.MODAL_ACTION_TYPE.MODAL_ENTERING ||
-        action.type === actions_1.MODAL_ACTION_TYPE.MODAL_EXITED ||
-        // do not track API requests for tokens
-        (action.type === actions_1.MODEL_FETCH_REQUEST_TYPE && ((_a = action.data) === null || _a === void 0 ? void 0 : _a.modelName) === 'getToken')) {
+    // do not track modal actions
+    action.type === actions_1.MODAL_ACTION_TYPE.MODAL_ENTERING ||
+        action.type === actions_1.MODAL_ACTION_TYPE.MODAL_EXITED) {
         return null;
     }
     return filterData(action);

package/lib/redux/sagas/authSaga.js

@@ -68,7 +68,7 @@ var clientCredentials;
 var oauthToken = null;
 var tokenPersistenceService;
 var refreshLock;
-var logger = logger_1.getLogger();
+var logger;
 //#endregion Local Variables
 function getTokenFromCode(code) {
     var getTokenModelName, formBody, formBodyString, _a, fetchResultAction, fetchErrorAction;
@@ -139,7 +139,7 @@ function getTokenFromRefreshToken(oauthTokenParam) {
                 if (fetchErrorAction) {
                     // ignore time outs and server errors
                     // TODO - how to ignore timeouts? which code?
-                    if (((_b = fetchErrorAction.errorData) === null || _b === void 0 ? void 0 : _b.code) && fetchErrorAction.errorData.code >= 500) {
+                    if (((_b = fetchErrorAction.errorData) === null || _b === void 0 ? void 0 : _b.status) && fetchErrorAction.errorData.status >= 500) {
                         return [2 /*return*/, oauthTokenParam];
                     }
                     return [2 /*return*/, null];
@@ -286,7 +286,7 @@ function handleAuthFailure(action) {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (!(oauthToken && action.errorData && action.errorData.code === 401)) return [3 /*break*/, 2];
+                if (!(oauthToken && action.errorData && action.errorData.status === 401)) return [3 /*break*/, 2];
                 logger.debug('token expired - refreshing');
                 return [4 /*yield*/, effects_1.call(performTokenRefresh)];
             case 1:
@@ -329,6 +329,7 @@ function authSaga(clientCredentialsParam, tokenPersistenceServiceParam, ticketPr
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
+                logger = logger_1.getLogger();
                 /* istanbul ignore if */
                 if (!clientCredentialsParam) {
                     throw new Error("'clientCredentialsParam' is required for authSaga");

package/lib/redux/sagas/downtimeApiErrorSaga.js

@@ -40,7 +40,7 @@ function downtimeApiErrorSaga(runIndefinitely) {
             return [4 /*yield*/, effects_1.take(function (action) {
                     var _a, _b, _c;
                     return actions_1.isModelTryFetchErrorAction(action) &&
-                        ((_a = action.errorData) === null || _a === void 0 ? void 0 : _a.code) === types_1.HTTP_STATUS_CODE.FORBIDDEN &&
+                        ((_a = action.errorData) === null || _a === void 0 ? void 0 : _a.status) === types_1.HTTP_STATUS_CODE.FORBIDDEN &&
                         !!((_c = (_b = action.errorData) === null || _b === void 0 ? void 0 : _b.title) === null || _c === void 0 ? void 0 : _c.includes("We'll be right back!"));
                 })
                 // redirect to downtime route

package/lib/redux/sagas/lockDownBrowserErrorSaga.js

@@ -48,7 +48,7 @@ function lockDownBrowserSaga(runIndefinitely) {
                                         var _a;
                                         if (!actions_1.isModelTryFetchErrorAction(action))
                                             return false;
-                                        message = ((_a = action.errorData) === null || _a === void 0 ? void 0 : _a.message) || '';
+                                        message = ((_a = action.errorData) === null || _a === void 0 ? void 0 : _a.detail) || '';
                                         return message === null || message === void 0 ? void 0 : message.includes('LockDown Browser');
                                     })
                                     // redirect to known LDB error route

package/lib/redux/sagas/modelFetchSaga.d.ts

@@ -4,7 +4,6 @@ import { EndpointMappings, ErrorHandler, TokenAccessFunction } from '../../types
 import { ModelFetchRequestAction, PeriodicModelFetchRequestAction } from '../actions';
 /** The total number of tries for `fetchData`, including the initial request. */
 export declare const TRY_LIMIT = 5;
-export declare const getState: (state?: any) => any;
 export declare const matchesTerminationAction: (incomingAction: AnyAction, dataRequestAction: PeriodicModelFetchRequestAction) => boolean;
 export declare const takeMatchesTerminationAction: (dataRequestAction: PeriodicModelFetchRequestAction) => (incomingAction: AnyAction) => boolean;
 export declare const defaultTokenAccessFunction: TokenAccessFunction;

package/lib/redux/sagas/modelFetchSaga.js

@@ -30,7 +30,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchModelRecurring = exports.fetchModelLoop = exports.fetchModel = exports.setEndpointMappings = exports.defaultErrorHandler = exports.defaultTokenAccessFunction = exports.takeMatchesTerminationAction = exports.matchesTerminationAction = exports.getState = exports.TRY_LIMIT = void 0;
+exports.fetchModelRecurring = exports.fetchModelLoop = exports.fetchModel = exports.setEndpointMappings = exports.defaultErrorHandler = exports.defaultTokenAccessFunction = exports.takeMatchesTerminationAction = exports.matchesTerminationAction = exports.TRY_LIMIT = void 0;
 var lodash_1 = require("lodash");
 var moment_timezone_1 = __importDefault(require("moment-timezone"));
 var effects_1 = require("redux-saga/effects");
@@ -43,8 +43,6 @@ var actions_1 = require("../actions");
 /** The total number of tries for `fetchData`, including the initial request. */
 exports.TRY_LIMIT = 5;
 //#region Helpers
-var getState = function (state) { return state; };
-exports.getState = getState;
 var matchesTerminationAction = function (incomingAction, dataRequestAction) {
     return incomingAction.type === actions_1.PERIODIC_MODEL_FETCH_TERMINATION_TYPE.TERMINATE &&
         incomingAction.taskId === dataRequestAction.taskId;
@@ -146,7 +144,7 @@ function isUserIdle() {
 var endpointMappings;
 var tokenAccessFunction;
 var errorHandler;
-var logger = logger_1.getLogger();
+var logger;
 //#endregion Local Variables
 /** Set the shared EndpointMappings variable, exposed for testability */
 function setEndpointMappings(endpointMappingsParam) {
@@ -160,10 +158,9 @@ exports.setEndpointMappings = setEndpointMappings;
  * @param modelFetchRequestAction A model fetch request action with the request configuration
  */
 function fetchModel(modelFetchRequestAction) {
-    var prepareFetchResult, prepareFetchError, modelPath, fetchConfig, endpointMapping, isCollectionItemCreate, isCollectionItemDelete, tryLimit, tryCount, didFail, lastFetchResult, lastErrorData, fetchResult, oauthToken, resultActionType, data, modelPathLevels, error_1, errorData, errorData;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var prepareFetchResult, prepareFetchError, error, modelPath, fetchConfig, endpointMapping, isCollectionItemCreate, isCollectionItemDelete, tryLimit, tryCount, didFail, lastFetchResult, lastError, lastErrorData, fetchResult, oauthToken, resultActionType, data, modelPathLevels, caughtError_1, error, errorString, errorData, errorData, error;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 prepareFetchResult = undefined;
                 prepareFetchError = undefined;
@@ -174,16 +171,17 @@ function fetchModel(modelFetchRequestAction) {
                     prepareFetchError = error;
                 }
                 if (!prepareFetchResult) {
-                    prepareFetchError = prepareFetchError || new Error('Prepare Fetch Failed');
-                    logger.error(prepareFetchError);
-                    errorHandler(prepareFetchError, modelFetchRequestAction);
+                    error = prepareFetchError;
+                    error.name = 'PrepareFetchError';
+                    logger.error(error);
+                    errorHandler(error, modelFetchRequestAction);
                     return [2 /*return*/];
                 }
                 modelPath = prepareFetchResult.modelPath, fetchConfig = prepareFetchResult.fetchConfig, endpointMapping = prepareFetchResult.endpointMapping, isCollectionItemCreate = prepareFetchResult.isCollectionItemCreate, isCollectionItemDelete = prepareFetchResult.isCollectionItemDelete;
                 tryLimit = modelFetchRequestAction.noRetry ? 1 : exports.TRY_LIMIT;
                 tryCount = 0;
                 didFail = false;
-                _c.label = 1;
+                _a.label = 1;
             case 1:
                 didFail = false;
                 tryCount++;
@@ -197,14 +195,14 @@ function fetchModel(modelFetchRequestAction) {
                     })];
             case 2:
                 // dispatch that the fetch request started, which updates `_metadata` and `guid`, if provided, at the target redux `modelPath`
-                _c.sent();
+                _a.sent();
                 fetchResult = undefined;
-                _c.label = 3;
+                _a.label = 3;
             case 3:
-                _c.trys.push([3, 15, , 19]);
+                _a.trys.push([3, 13, , 17]);
                 return [4 /*yield*/, effects_1.call(tokenAccessFunction, modelFetchRequestAction.modelName)];
             case 4:
-                oauthToken = _c.sent();
+                oauthToken = _a.sent();
                 if (oauthToken === null || oauthToken === void 0 ? void 0 : oauthToken.access_token) {
                     fetchConfig.headers = lodash_1.merge({}, fetchConfig.headers, {
                         Authorization: "Bearer " + oauthToken.access_token
@@ -214,10 +212,13 @@ function fetchModel(modelFetchRequestAction) {
                     // store `fetchResult` for reference after the do-while loop
                 ];
             case 5:
-                fetchResult = _c.sent();
+                fetchResult = _a.sent();
                 // store `fetchResult` for reference after the do-while loop
                 lastFetchResult = fetchResult;
-                if (!(fetchResult && fetchResult.ok)) return [3 /*break*/, 13];
+                // throw on missing result or unsuccessful result to trigger catch+retry
+                if (!(fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.ok)) {
+                    throw new Error('fetchResult');
+                }
                 resultActionType = modelFetchRequestAction.noStore
                     ? actions_1.MODEL_FETCH_RESULT_TYPE.TRANSIENT_FETCH_RESULT_RECEIVED
                     : actions_1.MODEL_FETCH_RESULT_TYPE.FETCH_RESULT_RECEIVED;
@@ -242,7 +243,7 @@ function fetchModel(modelFetchRequestAction) {
                 ];
             case 6:
                 // add by new result's id
-                _c.sent();
+                _a.sent();
                 // remove temp item under guid key
                 return [4 /*yield*/, effects_1.put({
                         type: actions_1.MODEL_REMOVE_KEY_TYPE,
@@ -250,7 +251,7 @@ function fetchModel(modelFetchRequestAction) {
                     })];
             case 7:
                 // remove temp item under guid key
-                _c.sent();
+                _a.sent();
                 return [3 /*break*/, 12];
             case 8:
                 if (!isCollectionItemDelete) return [3 /*break*/, 10];
@@ -259,7 +260,7 @@ function fetchModel(modelFetchRequestAction) {
                         modelPath: modelPath
                     })];
             case 9:
-                _c.sent();
+                _a.sent();
                 return [3 /*break*/, 12];
             case 10: return [4 /*yield*/, effects_1.put({
                     type: resultActionType,
@@ -269,49 +270,60 @@ function fetchModel(modelFetchRequestAction) {
                     data: data
                 })];
             case 11:
-                _c.sent();
-                _c.label = 12;
-            case 12: return [3 /*break*/, 14];
-            case 13: 
-            // throw on unsuccessful result
-            throw new Error();
-            case 14: return [3 /*break*/, 19];
-            case 15:
-                error_1 = _c.sent();
+                _a.sent();
+                _a.label = 12;
+            case 12: return [3 /*break*/, 17];
+            case 13:
+                caughtError_1 = _a.sent();
                 didFail = true;
-                errorData = (_a = fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.data) !== null && _a !== void 0 ? _a : {
-                    title: 'Unknown Error',
-                    message: (_b = error_1.message) !== null && _b !== void 0 ? _b : '',
-                    code: types_1.ERROR_CODE.UNKNOWN
+                error = caughtError_1 instanceof Error ? caughtError_1 : new Error();
+                errorString = typeof caughtError_1 === 'string' ? caughtError_1 : error.message;
+                errorData = {
+                    title: 'ModelFetchError',
+                    detail: errorString === 'fetchResult' ? '' : errorString,
+                    status: types_1.CUSTOM_ERROR_STATUS_CODE.UNKNOWN
                 };
+                // use `errorData` from the `fetchResult` if it exists
+                if (errorString === 'fetchResult' && (fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.data) && types_1.isFetchErrorData(fetchResult.data)) {
+                    errorData = fetchResult.data;
+                }
+                // update `error` with custom name and details, but preserve stack trace
+                error.name = 'ModelFetchError';
+                error.message = errorData.detail;
+                // track `errorData` and `error` for after the while-loop
                 lastErrorData = errorData;
-                // dispatch that this try failed, for logging and other sagas
+                lastError = error;
+                // dispatch that this try failed
                 return [4 /*yield*/, effects_1.put({
                         type: actions_1.MODEL_FETCH_ERROR_TYPE.TRY_FETCH_FAILED,
                         modelPath: modelPath,
                         guid: modelFetchRequestAction.guid,
                         errorData: errorData
-                    })];
-            case 16:
-                // dispatch that this try failed, for logging and other sagas
-                _c.sent();
-                logger.error(error_1);
+                    })
+                    // log to the console
+                ];
+            case 14:
+                // dispatch that this try failed
+                _a.sent();
+                // log to the console
+                logger.error(caughtError_1);
                 // Do not continue to retry if the response is between 400-500 (except 408: server timeout)
-                if (errorData.code >= 400 && errorData.code < 500 && errorData.code !== 408) {
+                if (errorData.status >= 400 && errorData.status < 500 && errorData.status !== 408) {
                     tryCount = tryLimit;
                 }
-                if (!(tryCount < tryLimit)) return [3 /*break*/, 18];
+                if (!(tryCount < tryLimit)) return [3 /*break*/, 16];
                 return [4 /*yield*/, effects_1.delay(Math.pow(2, (tryCount - 1)) * 100)]; // 100, 200, 400, 800
+            case 15:
+                _a.sent(); // 100, 200, 400, 800
+                _a.label = 16;
+            case 16: return [3 /*break*/, 17];
             case 17:
-                _c.sent(); // 100, 200, 400, 800
-                _c.label = 18;
-            case 18: return [3 /*break*/, 19];
-            case 19:
                 if (tryCount < tryLimit && didFail) return [3 /*break*/, 1];
-                _c.label = 20;
-            case 20:
-                if (!(tryCount === tryLimit && didFail)) return [3 /*break*/, 22];
+                _a.label = 18;
+            case 18:
+                if (!(tryCount === tryLimit && didFail)) return [3 /*break*/, 20];
                 errorData = lastErrorData;
+                error = lastError;
                 // dispatch that the fetch failed, which updates `_metadata` (and `guid`, if provided) at the target redux `modelPath`
                 return [4 /*yield*/, effects_1.put({
                         type: modelFetchRequestAction.noStore
@@ -323,15 +335,15 @@ function fetchModel(modelFetchRequestAction) {
                     })
                     // Send error to error handler, except for 401s
                 ];
-            case 21:
+            case 19:
                 // dispatch that the fetch failed, which updates `_metadata` (and `guid`, if provided) at the target redux `modelPath`
-                _c.sent();
+                _a.sent();
                 // Send error to error handler, except for 401s
-                if (!(errorData === null || errorData === void 0 ? void 0 : errorData.code) || errorData.code !== 401) {
-                    errorHandler(new Error('Fetch Failed'), modelFetchRequestAction, fetchConfig, lastFetchResult);
+                if (errorData.status !== 401) {
+                    errorHandler(error, modelFetchRequestAction, fetchConfig, lastFetchResult, errorData);
                 }
-                _c.label = 22;
-            case 22: return [2 /*return*/];
+                _a.label = 20;
+            case 20: return [2 /*return*/];
         }
     });
 }
@@ -342,7 +354,7 @@ exports.fetchModel = fetchModel;
  * @param action An action with the request configuration
  */
 function fetchModelLoop(action) {
-    var hasFetched, error_2;
+    var hasFetched, error_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -365,10 +377,10 @@ function fetchModelLoop(action) {
                 _a.label = 6;
             case 6: return [3 /*break*/, 12];
             case 7:
-                error_2 = _a.sent();
-                logger.error(error_2);
+                error_1 = _a.sent();
+                logger.error(error_1);
                 // catch and log any unexpected errors not caught inside `fetchData`
-                errorHandler(error_2, action);
+                errorHandler(error_1, action);
                 return [3 /*break*/, 12];
             case 8: return [4 /*yield*/, effects_1.cancelled()];
             case 9:
@@ -463,6 +475,7 @@ function modelFetchSaga(endpointMappingsParam, apiRootParam, tokenAccessFunction
                 setEndpointMappings(endpointMappingsParam);
                 errorHandler = errorHandlerParam;
                 tokenAccessFunction = tokenAccessFunctionParam;
+                logger = logger_1.getLogger();
                 return [4 /*yield*/, effects_1.takeEvery(actions_1.MODEL_FETCH_REQUEST_TYPE.FETCH_REQUEST, fetchModel)];
             case 1:
                 _a.sent();

package/lib/redux/sagas/rootSaga.js

@@ -102,11 +102,13 @@ function dependentSagas() {
         }
     });
 }
-var errorHandler = function (error, fetchConfig, fetchResult) {
+var errorHandler = function (error, modelFetchRequestAction, fetchConfig, fetchResult, fetchErrorData) {
     Sentry.captureException(error, {
         contexts: {
+            'Fetch Action': __assign({}, modelFetchRequestAction),
             'Fetch Config': (fetchConfig || {}),
-            'Fetch Result': (fetchResult || {})
+            'Fetch Result': (fetchResult || {}),
+            'Fetch Error Data': (fetchErrorData || {})
         }
     });
 };

package/lib/services/fetchService.js

@@ -87,9 +87,10 @@ function isContentTypeJson(contentType) {
  */
 // TODO: provide logging injection
 function doFetch(config) {
-    var method, headers, isBodyJson, body, response, result, isResponseJson, _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var method, headers, isBodyJson, body, response, result, isResponseJson, _a, _b, errorData;
+    var _c, _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 if (!config.path) {
                     throw new Error("'config.path' is required for fetchService");
@@ -111,7 +112,7 @@ function doFetch(config) {
                         body: body
                     })];
             case 1:
-                response = _c.sent();
+                response = _j.sent();
                 if (!response) {
                     return [2 /*return*/, undefined];
                 }
@@ -140,23 +141,26 @@ function doFetch(config) {
                 if (!isResponseJson) return [3 /*break*/, 4];
                 return [4 /*yield*/, effects_1.call(function () { return response.json(); })];
             case 3:
-                _b = _c.sent();
+                _b = _j.sent();
                 return [3 /*break*/, 6];
             case 4: return [4 /*yield*/, effects_1.call(function () { return response.text(); })];
             case 5:
-                _b = _c.sent();
-                _c.label = 6;
+                _b = _j.sent();
+                _j.label = 6;
             case 6:
                 _a.data = _b;
-                _c.label = 7;
+                _j.label = 7;
             case 7:
                 if (!response.ok) {
-                    // note: error responses are expected to be JSON
-                    result.data = lodash_1.merge({}, {
-                        title: 'Error',
-                        message: response.statusText,
-                        code: response.status
-                    }, result.data);
+                    errorData = {
+                        title: ((_c = result.data) === null || _c === void 0 ? void 0 : _c.title) || 'FetchError',
+                        detail: ((_d = result.data) === null || _d === void 0 ? void 0 : _d.detail) || response.statusText,
+                        status: ((_e = result.data) === null || _e === void 0 ? void 0 : _e.status) || response.status,
+                        type: (_f = result.data) === null || _f === void 0 ? void 0 : _f.type,
+                        instance: (_g = result.data) === null || _g === void 0 ? void 0 : _g.instance,
+                        traceId: (_h = result.data) === null || _h === void 0 ? void 0 : _h.traceId
+                    };
+                    result.data = errorData;
                 }
                 return [2 /*return*/, result];
         }

package/lib/types/net/ErrorHandler.d.ts

@@ -1,4 +1,5 @@
 import { ModelFetchRequestAction, PeriodicModelFetchRequestAction } from '../../redux/actions/ModelAction';
 import { FetchConfig } from './FetchConfig';
+import { FetchErrorData } from './FetchErrorData';
 import { FetchResult } from './FetchResult';
-export declare type ErrorHandler = (error: Error, modelFetchRequestAction: ModelFetchRequestAction | PeriodicModelFetchRequestAction, fetchConfig?: FetchConfig, fetchResult?: FetchResult) => void;
+export declare type ErrorHandler = (error: Error, modelFetchRequestAction: ModelFetchRequestAction | PeriodicModelFetchRequestAction, fetchConfig?: FetchConfig, fetchResult?: FetchResult, fetchErrorData?: FetchErrorData) => void;

package/lib/types/net/FetchErrorData.d.ts

@@ -1,10 +1,13 @@
-export declare enum ERROR_CODE {
+export declare enum CUSTOM_ERROR_STATUS_CODE {
     UNKNOWN = -1,
     NO_NETWORK_CONNECTION = -2
 }
 export interface FetchErrorData {
+    status: number;
     title: string;
-    message: string;
-    code: number;
+    detail: string;
+    type?: string;
+    instance?: string;
+    traceId?: string;
 }
 export declare const isFetchErrorData: (errorData: any) => errorData is FetchErrorData;

package/lib/types/net/FetchErrorData.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFetchErrorData = exports.ERROR_CODE = void 0;
-var ERROR_CODE;
-(function (ERROR_CODE) {
-    ERROR_CODE[ERROR_CODE["UNKNOWN"] = -1] = "UNKNOWN";
-    ERROR_CODE[ERROR_CODE["NO_NETWORK_CONNECTION"] = -2] = "NO_NETWORK_CONNECTION";
-})(ERROR_CODE = exports.ERROR_CODE || (exports.ERROR_CODE = {}));
+exports.isFetchErrorData = exports.CUSTOM_ERROR_STATUS_CODE = void 0;
+var CUSTOM_ERROR_STATUS_CODE;
+(function (CUSTOM_ERROR_STATUS_CODE) {
+    CUSTOM_ERROR_STATUS_CODE[CUSTOM_ERROR_STATUS_CODE["UNKNOWN"] = -1] = "UNKNOWN";
+    CUSTOM_ERROR_STATUS_CODE[CUSTOM_ERROR_STATUS_CODE["NO_NETWORK_CONNECTION"] = -2] = "NO_NETWORK_CONNECTION";
+})(CUSTOM_ERROR_STATUS_CODE = exports.CUSTOM_ERROR_STATUS_CODE || (exports.CUSTOM_ERROR_STATUS_CODE = {}));
 var isFetchErrorData = function (errorData) {
     return typeof errorData === 'object' &&
+        Object.prototype.hasOwnProperty.call(errorData, 'status') &&
         Object.prototype.hasOwnProperty.call(errorData, 'title') &&
-        Object.prototype.hasOwnProperty.call(errorData, 'message') &&
-        Object.prototype.hasOwnProperty.call(errorData, 'code');
+        Object.prototype.hasOwnProperty.call(errorData, 'detail');
 };
 exports.isFetchErrorData = isFetchErrorData;

package/lib/utils/user.js

@@ -32,7 +32,7 @@ var startImpersonation = function (guid, userId) {
         noStoreSaga_1.unregisterNoStoreActionHook(guid);
         if (!data || types_1.isFetchErrorData(data)) {
             actionCreator_1.addNotification({
-                text: (data === null || data === void 0 ? void 0 : data.message) || 'Could not start impersonation',
+                text: (data === null || data === void 0 ? void 0 : data.detail) || 'Could not start impersonation',
                 type: constants_1.NOTIFICATION_TYPE.ERROR
             });
         }
@@ -54,7 +54,7 @@ var stopImpersonation = function (guid) {
         noStoreSaga_1.unregisterNoStoreActionHook(guid);
         if (!data || types_1.isFetchErrorData(data)) {
             actionCreator_1.addNotification({
-                text: (data === null || data === void 0 ? void 0 : data.message) || 'Could not stop impersonation',
+                text: (data === null || data === void 0 ? void 0 : data.detail) || 'Could not stop impersonation',
                 type: constants_1.NOTIFICATION_TYPE.ERROR
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "5.2.0-next.2.1",
+	"version": "5.2.0-next.2.2",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",