studiokit-scaffolding-js 5.1.4 → 5.1.5-alpha.1

package/lib/components/ConnectedModal.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="react" />
-declare const _default: import("react").ComponentClass<import("react-bootstrap/esm/helpers").ReplaceProps<import("react").ElementType<any>, import("react-bootstrap/esm/helpers").BsPrefixProps<import("react").ElementType<any>> & import("react-bootstrap").ModalProps>, any>;
+import React from 'react';
+import { ModalProps } from 'react-bootstrap';
+declare const _default: React.ComponentClass<ModalProps, any>;
 /**
  * Wrapped version of "react-bootstrap"'s `Modal` component. Uses `ConnectedModalComponent` to coordinate modal state in redux.
  */

package/lib/components/ConnectedModal.js

@@ -1,11 +1,40 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importDefault(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
 var ConnectedModalComponent_1 = __importDefault(require("./HOC/ConnectedModalComponent"));
+var ConnectedModal = function (_a) {
+    var 
+    // exclude props that shouldn't be passed to the Modal
+    guid = _a.guid, modals = _a.modals, isTopOpenFullscreenModal = _a.isTopOpenFullscreenModal, dispatch = _a.dispatch, modalProps = __rest(_a, ["guid", "modals", "isTopOpenFullscreenModal", "dispatch"]);
+    return react_1.default.createElement(react_bootstrap_1.Modal, __assign({}, modalProps));
+};
 /**
  * Wrapped version of "react-bootstrap"'s `Modal` component. Uses `ConnectedModalComponent` to coordinate modal state in redux.
  */
-exports.default = ConnectedModalComponent_1.default(react_bootstrap_1.Modal);
+exports.default = ConnectedModalComponent_1.default(ConnectedModal);

package/lib/components/HOC/ConnectedModalComponent.d.ts

@@ -2,6 +2,9 @@ import React, { ComponentClass, ComponentType } from 'react';
 import { ModalsState } from '../../redux/reducers/modalsReducer';
 import { BaseReduxState } from '../../types';
 import { GuidComponentWrappedProps } from '../HOC/GuidComponent';
+export declare type ConnectedModalReduxProps = {
+    modals: ModalsState;
+};
 export interface ConnectedModalWrappedProps {
     onEntering: () => void;
     onExited: () => void;
@@ -10,9 +13,6 @@ export interface ConnectedModalWrappedProps {
 export interface ConnectedModalState {
     isModalOpen: boolean;
 }
-export declare type ConnectedModalReduxProps = {
-    modals: ModalsState;
-};
 export declare const configureMapStateToProps: () => (state: BaseReduxState) => ConnectedModalReduxProps;
 /**
  * HOC that provides modal lifecycle event methods to coordinate modal state in redux.
@@ -23,15 +23,15 @@ export declare const configureMapStateToProps: () => (state: BaseReduxState) =>
  * @param {*} isFullscreen Are we rendering a fullscreen modal?
  */
 export declare function configureConnectedModalComponent<TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps>, isFullscreen?: boolean): {
-    new (props: TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps): {
+    new (props: TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps): {
         componentWillUnmount(): void;
         onEntering: () => void;
         onExited: () => void;
         render(): JSX.Element;
         context: any;
-        setState<K extends "isModalOpen">(state: ConnectedModalState | ((prevState: Readonly<ConnectedModalState>, props: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>) => ConnectedModalState | Pick<ConnectedModalState, K> | null) | Pick<ConnectedModalState, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends "isModalOpen">(state: ConnectedModalState | ((prevState: Readonly<ConnectedModalState>, props: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>) => ConnectedModalState | Pick<ConnectedModalState, K> | null) | Pick<ConnectedModalState, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps> & Readonly<{
+        readonly props: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps> & Readonly<{
             children?: React.ReactNode;
         }>;
         state: Readonly<ConnectedModalState>;
@@ -39,16 +39,16 @@ export declare function configureConnectedModalComponent<TOwnProps extends {}>(W
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): boolean;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, prevState: Readonly<ConnectedModalState>): any;
-        componentDidUpdate?(prevProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, prevState: Readonly<ConnectedModalState>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, prevState: Readonly<ConnectedModalState>): any;
+        componentDidUpdate?(prevProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, prevState: Readonly<ConnectedModalState>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalWrappedProps & GuidComponentWrappedProps & ConnectedModalReduxProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<TOwnProps & ConnectedModalReduxProps & GuidComponentWrappedProps>, nextState: Readonly<ConnectedModalState>, nextContext: any): void;
     };
     contextType?: React.Context<any> | undefined;
 };

package/lib/components/HOC/ConnectedModalComponent.js

@@ -42,6 +42,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -103,11 +114,11 @@ function configureConnectedModalComponent(WrappedComponent, isFullscreen) {
         };
         ConnectedModalComponent.prototype.render = function () {
             var _a, _b;
-            var _c = this.props, modals = _c.modals, guid = _c.guid;
+            var _c = this.props, modals = _c.modals, guid = _c.guid, ownProps = __rest(_c, ["modals", "guid"]);
             var topOpenFullscreenModal = lodash_1.maxBy(Object.values(modals).filter(function (m) { return m.isFullscreen; }), function (modal) { return modal.index; });
             var thisModalIndex = (_b = (_a = modals[guid]) === null || _a === void 0 ? void 0 : _a.index) !== null && _b !== void 0 ? _b : null;
             var isTopOpenFullscreenModal = (topOpenFullscreenModal === null || topOpenFullscreenModal === void 0 ? void 0 : topOpenFullscreenModal.index) === thisModalIndex;
-            return (react_1.default.createElement(WrappedComponent, __assign({}, this.props, { onEntering: this.onEntering, onExited: this.onExited, isTopOpenFullscreenModal: isTopOpenFullscreenModal })));
+            return (react_1.default.createElement(WrappedComponent, __assign({}, ownProps, { guid: guid, onEntering: this.onEntering, onExited: this.onExited, isTopOpenFullscreenModal: isTopOpenFullscreenModal })));
         };
         return ConnectedModalComponent;
     }(react_1.Component));

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

@@ -0,0 +1,2 @@
+/// <reference types="connected-react-router" />
+export default function downtimeApiErrorSaga(runIndefinitely?: boolean): Generator<import("redux-saga/effects").TakeEffect | import("redux-saga/effects").PutEffect<import("connected-react-router").CallHistoryMethodAction<[import("history").LocationDescriptorObject<unknown>]>>, void, unknown>;

package/lib/redux/sagas/downtimeApiErrorSaga.js

@@ -0,0 +1,66 @@
+"use strict";
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var connected_react_router_1 = require("connected-react-router");
+var effects_1 = require("redux-saga/effects");
+var actions_1 = require("../actions");
+function downtimeApiErrorSaga(runIndefinitely) {
+    if (runIndefinitely === void 0) { runIndefinitely = true; }
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: 
+            // wait for any downtime error response
+            return [4 /*yield*/, effects_1.take(function (action) {
+                    var _a, _b;
+                    var title = (_a = action === null || action === void 0 ? void 0 : action.errorData) === null || _a === void 0 ? void 0 : _a.title;
+                    return ((action === null || action === void 0 ? void 0 : action.type) === actions_1.NET_ACTION.TRY_FETCH_FAILED &&
+                        ((_b = action === null || action === void 0 ? void 0 : action.errorData) === null || _b === void 0 ? void 0 : _b.status) === 403 &&
+                        !!(title === null || title === void 0 ? void 0 : title.includes("We'll be right back!")));
+                })
+                // redirect to downtime route
+            ];
+            case 1:
+                // wait for any downtime error response
+                _a.sent();
+                // redirect to downtime route
+                return [4 /*yield*/, effects_1.put(connected_react_router_1.push({
+                        pathname: '/downtime'
+                    }))];
+            case 2:
+                // redirect to downtime route
+                _a.sent();
+                _a.label = 3;
+            case 3:
+                if (runIndefinitely) return [3 /*break*/, 0];
+                _a.label = 4;
+            case 4: return [2 /*return*/];
+        }
+    });
+}
+exports.default = downtimeApiErrorSaga;

package/lib/redux/sagas/rootSaga.js

@@ -75,6 +75,7 @@ var authSaga_1 = __importStar(require("./authSaga"));
 var caliperSaga_1 = __importDefault(require("./caliperSaga"));
 var clockOffsetSaga_1 = __importDefault(require("./clockOffsetSaga"));
 var configurationSaga_1 = __importDefault(require("./configurationSaga"));
+var downtimeApiErrorSaga_1 = __importDefault(require("./downtimeApiErrorSaga"));
 var errorSaga_1 = __importDefault(require("./errorSaga"));
 var fetchSaga_1 = __importDefault(require("./fetchSaga"));
 var googleAnalyticsSaga_1 = __importDefault(require("./googleAnalyticsSaga"));
@@ -96,7 +97,7 @@ exports.setOtherDependentSagas = setOtherDependentSagas;
 function dependentSagas() {
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, effects_1.all(__assign({ noStoreSaga: noStoreSaga_1.default(), configurationSaga: configurationSaga_1.default(), caliperSaga: caliperSaga_1.default(), userIdSaga: userIdSaga_1.default(), sentrySaga: sentrySaga_1.default(), googleAnalyticsSaga: googleAnalyticsSaga_1.default(), appInsightsSaga: appInsightsSaga_1.default(), initialDataLoadSaga: initialDataLoadSaga_1.default(), identityProviderSaga: identityProviderSaga_1.default(), postLoginRedirectSaga: postLoginRedirectSaga_1.default(), postLoginDataSaga: postLoginDataSaga_1.default(), clockOffsetSaga: clockOffsetSaga_1.default(), lockDownBrowserErrorSaga: lockDownBrowserErrorSaga_1.default() }, otherDependentSagas))];
+            case 0: return [4 /*yield*/, effects_1.all(__assign({ noStoreSaga: noStoreSaga_1.default(), configurationSaga: configurationSaga_1.default(), caliperSaga: caliperSaga_1.default(), userIdSaga: userIdSaga_1.default(), sentrySaga: sentrySaga_1.default(), googleAnalyticsSaga: googleAnalyticsSaga_1.default(), appInsightsSaga: appInsightsSaga_1.default(), initialDataLoadSaga: initialDataLoadSaga_1.default(), identityProviderSaga: identityProviderSaga_1.default(), postLoginRedirectSaga: postLoginRedirectSaga_1.default(), postLoginDataSaga: postLoginDataSaga_1.default(), clockOffsetSaga: clockOffsetSaga_1.default(), lockDownBrowserErrorSaga: lockDownBrowserErrorSaga_1.default(), downtimeApiErrorSaga: downtimeApiErrorSaga_1.default() }, otherDependentSagas))];
             case 1:
                 _a.sent();
                 return [2 /*return*/];

package/package.json

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