studiokit-scaffolding-js 5.2.0-next.2.4 → 5.2.0-next.2.6

package/lib/constants/fetchErrorData.d.ts

@@ -0,0 +1,3 @@
+import { FetchErrorData } from '..';
+export declare const unknownErrorData: FetchErrorData;
+export declare const networkOfflineErrorData: FetchErrorData;

package/lib/constants/fetchErrorData.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.networkOfflineErrorData = exports.unknownErrorData = void 0;
+var __1 = require("..");
+exports.unknownErrorData = {
+    title: 'Unknown Error',
+    detail: 'An unknown error has occurred.',
+    status: __1.CUSTOM_ERROR_STATUS_CODE.UNKNOWN
+};
+exports.networkOfflineErrorData = {
+    title: 'Network Offline',
+    detail: 'There is no network connection.',
+    status: __1.CUSTOM_ERROR_STATUS_CODE.NO_NETWORK_CONNECTION
+};

package/lib/constants/mockData.d.ts

@@ -1,4 +1,4 @@
-import { AppConfiguration, ExternalProvider, ExternalTerm, Group, GroupUserRole, ModelCollection, SimpleLocation, UserInfo, UserRole } from '../types';
+import { AppConfiguration, ExternalProvider, ExternalTerm, FetchErrorData, Group, GroupUserRole, ModelCollection, SimpleLocation, UserInfo, UserRole } from '../types';
 export declare const defaultAppConfiguration: AppConfiguration;
 export declare const defaultLocation: SimpleLocation;
 export declare function mockHistory(): History;
@@ -31,6 +31,7 @@ export declare const defaultNamelessUserInfo: {
     dateDemoGenerationSucceeded: string | null;
     dateStored: string;
     dateLastUpdated: string;
+    /** 5/15/18 - 8/14/18 */
     isImpersonated: boolean;
     lockDownBrowserTestLaunchUrl: string | null;
     id: string;
@@ -52,6 +53,7 @@ export declare const defaultNamedUserInfo: {
     dateDemoGenerationSucceeded: string | null;
     dateStored: string;
     dateLastUpdated: string;
+    /** 5/15/18 - 8/14/18 */
     isImpersonated: boolean;
     lockDownBrowserTestLaunchUrl: string | null;
     id: string;
@@ -81,3 +83,9 @@ export declare function mockPastGroups(activities?: string[], roles?: string[]):
 export declare function mockPastAndCurrentGroups(activities?: string[], roles?: string[]): ModelCollection<Group>;
 export declare const defaultExternalProviders: ModelCollection<ExternalProvider>;
 export declare const defaultExternalTerms: ModelCollection<ExternalTerm>;
+export declare const internalServerErrorData: FetchErrorData;
+export declare const requestTimedOutErrorData: FetchErrorData;
+export declare const forbiddenErrorData: FetchErrorData;
+export declare const unauthorizedErrorData: FetchErrorData;
+export declare const badRequestErrorData: FetchErrorData;
+export declare const badRequestFullErrorData: FetchErrorData;

package/lib/constants/mockData.js

@@ -11,9 +11,10 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultExternalTerms = exports.defaultExternalProviders = exports.mockPastAndCurrentGroups = exports.mockPastGroups = exports.mockTermAndUniTimeGroups = exports.mockTermGroups = exports.mockLtiGroups = exports.mockSyncedGroups = exports.mockGroups = exports.defaultGroup = exports.defaultAdminUserRoles = exports.defaultGroupUserRoles = exports.defaultGroupGrader = exports.defaultExternalGroupLearner = exports.defaultGroupLearner = exports.defaultNamedGroupLearner = exports.defaultNamelessGroupLearner = exports.defaultGroupOwner = exports.defaultGroupOwnerUserInfo = exports.mockUser = exports.defaultNamedUserInfo = exports.defaultNamelessUserInfo = exports.defaultUser = exports.defaultDate = exports.currentDates = exports.pastDates = exports.mockHistory = exports.defaultLocation = exports.defaultAppConfiguration = void 0;
+exports.badRequestFullErrorData = exports.badRequestErrorData = exports.unauthorizedErrorData = exports.forbiddenErrorData = exports.requestTimedOutErrorData = exports.internalServerErrorData = exports.defaultExternalTerms = exports.defaultExternalProviders = exports.mockPastAndCurrentGroups = exports.mockPastGroups = exports.mockTermAndUniTimeGroups = exports.mockTermGroups = exports.mockLtiGroups = exports.mockSyncedGroups = exports.mockGroups = exports.defaultGroup = exports.defaultAdminUserRoles = exports.defaultGroupUserRoles = exports.defaultGroupGrader = exports.defaultExternalGroupLearner = exports.defaultGroupLearner = exports.defaultNamedGroupLearner = exports.defaultNamelessGroupLearner = exports.defaultGroupOwner = exports.defaultGroupOwnerUserInfo = exports.mockUser = exports.defaultNamedUserInfo = exports.defaultNamelessUserInfo = exports.defaultUser = exports.defaultDate = exports.currentDates = exports.pastDates = exports.mockHistory = exports.defaultLocation = exports.defaultAppConfiguration = void 0;
 var lodash_1 = require("lodash");
 var externalProviderType_1 = require("../constants/externalProviderType");
+var types_1 = require("../types");
 var baseRole_1 = require("./baseRole");
 var tier_1 = require("./tier");
 //#region General
@@ -335,3 +336,39 @@ exports.defaultExternalTerms = {
     }
 };
 //#endregion ExternalTerms + ExternalProviders
+//#region FetchErrorData
+exports.internalServerErrorData = {
+    title: 'Error',
+    detail: 'An error has occurred.',
+    status: types_1.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR
+};
+exports.requestTimedOutErrorData = {
+    title: 'Request Timeout',
+    detail: null,
+    status: types_1.HTTP_STATUS_CODE.REQUEST_TIMEOUT
+};
+exports.forbiddenErrorData = {
+    title: 'Forbidden',
+    detail: 'Your request has been denied. You do not have access.',
+    status: types_1.HTTP_STATUS_CODE.FORBIDDEN
+};
+exports.unauthorizedErrorData = {
+    title: 'Unauthorized',
+    detail: 'Your request is unauthorized. You must authenticate.',
+    status: types_1.HTTP_STATUS_CODE.UNAUTHORIZED
+};
+exports.badRequestErrorData = {
+    status: types_1.HTTP_STATUS_CODE.BAD_REQUEST,
+    title: 'Bad Request',
+    detail: 'Reasons'
+};
+exports.badRequestFullErrorData = {
+    status: types_1.HTTP_STATUS_CODE.BAD_REQUEST,
+    title: 'Bad Request',
+    detail: 'Reasons',
+    // include all optional properties
+    type: 'https://tools.ietf.org/html/rfc7231#section-6.6.1',
+    instance: 'instance',
+    traceId: '00-3914b43b452b94e3ff4c327922880a03-4cfed6fe42afdd8f-00'
+};
+//#endregion FetchErrorData

package/lib/redux/sagas/authSaga.js

@@ -137,8 +137,7 @@ function getTokenFromRefreshToken(oauthTokenParam) {
                 _a = _c.sent(), fetchResultAction = _a.fetchResultAction, fetchErrorAction = _a.fetchErrorAction;
                 // any error response
                 if (fetchErrorAction) {
-                    // ignore time outs and server errors
-                    // TODO - redux updates: how to ignore timeouts? which code?
+                    // ignore server errors
                     if (((_b = fetchErrorAction.errorData) === null || _b === void 0 ? void 0 : _b.status) && fetchErrorAction.errorData.status >= 500) {
                         return [2 /*return*/, oauthTokenParam];
                     }

package/lib/redux/sagas/modelFetchSaga.js

@@ -34,6 +34,7 @@ exports.modelFetchRecurring = exports.modelFetchLoop = exports.modelFetch = expo
 var lodash_1 = require("lodash");
 var moment_timezone_1 = __importDefault(require("moment-timezone"));
 var effects_1 = require("redux-saga/effects");
+var fetchErrorData_1 = require("../../constants/fetchErrorData");
 var dateService_1 = require("../../services/dateService");
 var fetchService_1 = require("../../services/fetchService");
 var windowService_1 = require("../../services/windowService");
@@ -278,13 +279,7 @@ function modelFetch(modelFetchRequestAction) {
                 baseErrorMessage = "'modelFetch' failed for '" + modelPath + "'";
                 error = error_1.constructErrorFromCaughtError(caughtError_1, 'ModelFetchError', baseErrorMessage);
                 isNetworkOnline = windowService_1.windowService.getIsOnline();
-                errorData = {
-                    title: isNetworkOnline ? 'Unknown Error' : 'Network Offline',
-                    detail: isNetworkOnline ? 'An unknown error has occurred.' : 'There is no network connection.',
-                    status: isNetworkOnline
-                        ? types_1.CUSTOM_ERROR_STATUS_CODE.UNKNOWN
-                        : types_1.CUSTOM_ERROR_STATUS_CODE.NO_NETWORK_CONNECTION
-                };
+                errorData = isNetworkOnline ? fetchErrorData_1.unknownErrorData : fetchErrorData_1.networkOfflineErrorData;
                 // update `errorData` from the `fetchResult.data`
                 // for when the fetch got a result, but it was an unsuccessful status
                 if ((fetchResult === null || fetchResult === void 0 ? void 0 : fetchResult.data) && types_1.isFetchErrorData(fetchResult.data)) {

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

@@ -1,4 +1,7 @@
+/** Commonly used HTTP status code values */
 export declare enum HTTP_STATUS_CODE {
+    OK = 200,
+    NO_CONTENT = 204,
     BAD_REQUEST = 400,
     UNAUTHORIZED = 401,
     FORBIDDEN = 403,

package/lib/types/net/HTTPStatusCode.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTP_STATUS_CODE = void 0;
+/** Commonly used HTTP status code values */
 var HTTP_STATUS_CODE;
 (function (HTTP_STATUS_CODE) {
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["OK"] = 200] = "OK";
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["NO_CONTENT"] = 204] = "NO_CONTENT";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["BAD_REQUEST"] = 400] = "BAD_REQUEST";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["FORBIDDEN"] = 403] = "FORBIDDEN";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "5.2.0-next.2.4",
+	"version": "5.2.0-next.2.6",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",
@@ -90,7 +90,7 @@
 		]
 	},
 	"resolutions": {
-		"@sentry/browser": "^7.112.2",
+		"@sentry/browser": "^7.113.0",
 		"@types/react": "^17.0.0",
 		"@types/react-router": "^5.1.11",
 		"kind-of": "^6.0.3",
@@ -104,7 +104,7 @@
 		"@material-ui/lab": "^4.0.0-alpha.57",
 		"@microsoft/applicationinsights-web": "^3.1.0",
 		"@redux-saga/types": "^1.1.0",
-		"@sentry/react": "^7.112.2",
+		"@sentry/react": "^7.113.0",
 		"@types/history": "^4.7.8",
 		"@types/lodash": "^4.14.168",
 		"@types/pluralize": "^0.0.29",