studiokit-scaffolding-js 4.12.1 → 5.0.0-next.1.2

package/lib/components/ActionList.d.ts

@@ -1,5 +1,5 @@
 import { FunctionComponent } from 'react';
-import { Model } from 'studiokit-net-js';
+import { Model } from '../types';
 export interface ActionListProps {
     actions?: ListAction[];
     model: Model | null;

package/lib/components/AlertDialog.d.ts

@@ -14,5 +14,4 @@ export interface AlertDialogProps {
     destroyText?: string;
     manualBackground?: boolean;
 }
-declare const AlertDialog: FunctionComponent<AlertDialogProps>;
-export default AlertDialog;
+export declare const AlertDialog: FunctionComponent<AlertDialogProps>;

package/lib/components/AlertDialog.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AlertDialog = void 0;
 var Button_1 = __importDefault(require("@material-ui/core/Button"));
 var react_1 = __importDefault(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
@@ -18,4 +19,4 @@ var AlertDialog = function (props) {
             !hideCancel && (react_1.default.createElement(Button_1.default, { id: "alert-dialog-cancel-btn", color: "primary", "aria-label": cancelText || 'Cancel', className: "btn-text ttc" + (onDestroy ? ' fr' : ' fl') + " " + (onProceed ? ' mr1' : ''), onClick: onCancel }, cancelText || 'Cancel')),
             !!onDestroy && (react_1.default.createElement(Button_1.default, { id: "alert-dialog-destroy-btn", "aria-label": destroyText || 'Destroy', color: "secondary", className: "btn-text color-red ttc fl", onClick: onDestroy }, destroyText || 'Destroy')))));
 };
-exports.default = AlertDialog;
+exports.AlertDialog = AlertDialog;

package/lib/components/AlertWithIcon.d.ts

@@ -3,5 +3,4 @@ import { AlertProps } from 'react-bootstrap';
 export interface AlertWithIconProps extends AlertProps {
     iconClassName?: string;
 }
-declare const AlertWithIcon: FunctionComponent<AlertWithIconProps>;
-export default AlertWithIcon;
+export declare const AlertWithIcon: FunctionComponent<AlertWithIconProps>;

package/lib/components/AlertWithIcon.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AlertWithIcon = void 0;
 var CheckCircle_1 = __importDefault(require("@material-ui/icons/CheckCircle"));
 var Error_1 = __importDefault(require("@material-ui/icons/Error"));
 var Info_1 = __importDefault(require("@material-ui/icons/Info"));
@@ -54,4 +55,4 @@ var AlertWithIcon = function (props) {
         Icon,
         props.children));
 };
-exports.default = AlertWithIcon;
+exports.AlertWithIcon = AlertWithIcon;

package/lib/components/Dropdowns/GroupsDropdown.d.ts

@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
-import { ModelCollection } from 'studiokit-net-js';
-import { ExternalTerm, Group } from '../../types';
+import { ExternalTerm, Group, ModelCollection } from '../../types';
 interface Props {
     title: string;
     id: string;
@@ -14,5 +13,5 @@ declare class GroupsDropdown extends Component<Props> {
     renderGroupMenu: (groups: Group[]) => JSX.Element[] | null;
     render(): JSX.Element | null;
 }
-declare const _default: import("react-redux").ConnectedComponent<typeof GroupsDropdown, Pick<React.ClassAttributes<GroupsDropdown> & Props, "id" | "title" | "ref" | "key" | "anyRoleButLearner">>;
+declare const _default: import("react-redux").ConnectedComponent<typeof GroupsDropdown, Pick<React.ClassAttributes<GroupsDropdown> & Props, "id" | "ref" | "title" | "key" | "anyRoleButLearner">>;
 export default _default;

package/lib/components/Dropdowns/GroupsDropdown.js

@@ -31,27 +31,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
 var react_redux_1 = require("react-redux");
 var react_router_bootstrap_1 = require("react-router-bootstrap");
-var studiokit_net_js_1 = require("studiokit-net-js");
 var actionCreator_1 = require("../../redux/actionCreator");
+var actions_1 = require("../../redux/actions");
 var date_1 = require("../../utils/date");
 var groupDates_1 = require("../../utils/groupDates");
 var groupRoles_1 = require("../../utils/groupRoles");
 var sort_1 = require("../../utils/sort");
-var ManagedNavDropdown_1 = __importDefault(require("./ManagedNavDropdown"));
+var ManagedNavDropdown_1 = require("./ManagedNavDropdown");
 var GroupsDropdown = /** @class */ (function (_super) {
     __extends(GroupsDropdown, _super);
     function GroupsDropdown() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.loadGroups = function () {
-            actionCreator_1.dispatchAction(studiokit_net_js_1.NET_ACTION.DATA_REQUESTED, { modelName: 'groups' });
+            actionCreator_1.dispatchAction(actions_1.NET_ACTION.DATA_REQUESTED, { modelName: 'groups' });
         };
         _this.didToggle = function (isOpen) {
             if (isOpen) {
@@ -77,7 +74,7 @@ var GroupsDropdown = /** @class */ (function (_super) {
         if (currentGroups.length === 0) {
             return null;
         }
-        return (react_1.default.createElement(ManagedNavDropdown_1.default, { title: title, id: id, didToggle: this.didToggle }, this.renderGroupMenu(currentGroups)));
+        return (react_1.default.createElement(ManagedNavDropdown_1.ManagedNavDropdown, { title: title, id: id, didToggle: this.didToggle }, this.renderGroupMenu(currentGroups)));
     };
     return GroupsDropdown;
 }(react_1.Component));

package/lib/components/Dropdowns/ManagedNavDropdown.d.ts

@@ -29,4 +29,4 @@ export declare class ManagedNavDropdown extends Component<ManagedNavDropdownProp
     didToggle: () => void;
     render(): JSX.Element;
 }
-export default ManagedNavDropdown;
+export {};

package/lib/components/Dropdowns/ManagedNavDropdown.js

@@ -115,4 +115,3 @@ var ManagedNavDropdown = /** @class */ (function (_super) {
     return ManagedNavDropdown;
 }(react_1.Component));
 exports.ManagedNavDropdown = ManagedNavDropdown;
-exports.default = ManagedNavDropdown;

package/lib/components/Dropdowns/UserDropdown.js

@@ -48,15 +48,15 @@ exports.UserDropdown = void 0;
 var Lock_1 = __importDefault(require("@material-ui/icons/Lock"));
 var react_1 = __importStar(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
-var studiokit_auth_js_1 = require("studiokit-auth-js");
 var uuid_1 = require("uuid");
 var actionCreator_1 = require("../../redux/actionCreator");
+var actions_1 = require("../../redux/actions");
 var user_1 = require("../../utils/user");
 var IconStopImpersonating_1 = require("../Icons/IconStopImpersonating");
 var UserDetail_1 = require("../Impersonation/UserDetail");
-var ManagedNavDropdown_1 = __importDefault(require("./ManagedNavDropdown"));
+var ManagedNavDropdown_1 = require("./ManagedNavDropdown");
 var doLogOut = function () {
-    actionCreator_1.dispatchAction(studiokit_auth_js_1.AUTH_ACTION.LOG_OUT_REQUESTED, {});
+    actionCreator_1.dispatchAction(actions_1.AUTH_ACTION.LOG_OUT_REQUESTED, {});
 };
 var UserDropdown = function (_a) {
     var userInfo = _a.userInfo, children = _a.children, props = __rest(_a, ["userInfo", "children"]);
@@ -64,7 +64,7 @@ var UserDropdown = function (_a) {
     var dropdownTitle = userInfo.isImpersonated ? (react_1.default.createElement(UserDetail_1.ImpersonationUserDetail, __assign({ userInfo: userInfo }, props))) : (react_1.default.createElement(react_1.default.Fragment, null,
         "Hi, ",
         user_1.displayFirstName(userInfo)));
-    return (react_1.default.createElement(ManagedNavDropdown_1.default, { id: "user-menu", className: "user-menu" + (userInfo.isImpersonated ? ' user-menu-impersonated' : ''), title: dropdownTitle },
+    return (react_1.default.createElement(ManagedNavDropdown_1.ManagedNavDropdown, { id: "user-menu", className: "user-menu" + (userInfo.isImpersonated ? ' user-menu-impersonated' : ''), title: dropdownTitle },
         children,
         userInfo.isImpersonated && (react_1.default.createElement(react_bootstrap_1.NavDropdown.Item, { onSelect: function () { return user_1.stopImpersonation(guid); } },
             react_1.default.createElement(IconStopImpersonating_1.IconStopImpersonating, { className: "menu-icon" }),

package/lib/components/EntityOwnerList.d.ts

@@ -5,7 +5,7 @@ export interface EntityOwnerListProps {
     canReadAnyUserGlobally: boolean;
     displayAsInstructors?: boolean;
 }
-export default class EntityOwnerList extends Component<EntityOwnerListProps> {
+export declare class EntityOwnerList extends Component<EntityOwnerListProps> {
     renderOwner: (owner: User, className: string) => JSX.Element;
     render(): JSX.Element;
 }

package/lib/components/EntityOwnerList.js

@@ -32,6 +32,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityOwnerList = void 0;
 var react_1 = __importStar(require("react"));
 var react_router_dom_1 = require("react-router-dom");
 var user_1 = require("../utils/user");
@@ -60,4 +61,4 @@ var EntityOwnerList = /** @class */ (function (_super) {
     };
     return EntityOwnerList;
 }(react_1.Component));
-exports.default = EntityOwnerList;
+exports.EntityOwnerList = EntityOwnerList;

package/lib/components/Error.js

@@ -26,4 +26,5 @@ var Error = function (props) {
                         react_1.default.createElement("a", { href: "mailto:tlt@purdue.edu" }, "tlt@purdue.edu")),
                     lockDownBrowserInfo.isClientLockDownBrowser && react_1.default.createElement(ExitButton_1.LockDownBrowserExitButton, null))))));
 };
+// required for use in Routes / AsyncComponent
 exports.default = Error;

package/lib/components/Forms/DateField.d.ts

@@ -6,7 +6,7 @@ export interface DateFieldProps extends Pick<StandardTextFieldProps, Exclude<key
     maxDate?: string;
     onChange: (dateString: string, date?: Date) => void;
 }
-export default class DateField extends Component<DateFieldProps> {
+export declare class DateField extends Component<DateFieldProps> {
     onChange: React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>;
     isDateValid: (dateString: string) => boolean;
     render(): JSX.Element;

package/lib/components/Forms/DateField.js

@@ -46,6 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateField = void 0;
 var TextField_1 = __importDefault(require("@material-ui/core/TextField"));
 var moment_1 = __importDefault(require("moment"));
 var react_1 = __importStar(require("react"));
@@ -96,4 +97,4 @@ var DateField = /** @class */ (function (_super) {
     };
     return DateField;
 }(react_1.Component));
-exports.default = DateField;
+exports.DateField = DateField;

package/lib/components/Forms/TimeField.d.ts

@@ -4,7 +4,7 @@ export interface TimeFieldProps extends Pick<StandardTextFieldProps, Exclude<key
     value?: string;
     onChange: (timeString: string, time?: Date) => void;
 }
-export default class TimeField extends Component<TimeFieldProps> {
+export declare class TimeField extends Component<TimeFieldProps> {
     onChange: React.ChangeEventHandler<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>;
     isTimeValid: (timeString: string) => boolean;
     render(): JSX.Element;

package/lib/components/Forms/TimeField.js

@@ -46,6 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimeField = void 0;
 var TextField_1 = __importDefault(require("@material-ui/core/TextField"));
 var Help_1 = __importDefault(require("@material-ui/icons/Help"));
 var moment_1 = __importDefault(require("moment"));
@@ -109,4 +110,4 @@ var TimeField = /** @class */ (function (_super) {
     };
     return TimeField;
 }(react_1.Component));
-exports.default = TimeField;
+exports.TimeField = TimeField;

package/lib/components/Groups/ExternalGroups/Attach.d.ts

@@ -1,7 +1,6 @@
 import { Dictionary } from 'lodash';
 import { Component } from 'react';
-import { ModelCollection } from 'studiokit-net-js';
-import { ExternalGroup, GroupUserRole, LtiLaunch, OwnerSchedule, UniTimeGroup, UserInfo } from '../../../types';
+import { ExternalGroup, GroupUserRole, LtiLaunch, ModelCollection, OwnerSchedule, UniTimeGroup, UserInfo } from '../../../types';
 export interface ExternalGroupsAttachProps {
     userInfo: UserInfo;
     canReadExternalGroups: boolean;

package/lib/components/Groups/ExternalGroups/Attach.js

@@ -21,15 +21,16 @@ var lodash_1 = require("lodash");
 var react_1 = __importDefault(require("react"));
 var react_2 = require("react");
 var react_bootstrap_1 = require("react-bootstrap");
-var studiokit_net_js_1 = require("studiokit-net-js");
 var uuid_1 = require("uuid");
 var constants_1 = require("../../../constants");
 var actionCreator_1 = require("../../../redux/actionCreator");
+var actions_1 = require("../../../redux/actions");
+var noStoreSaga_1 = require("../../../redux/sagas/noStoreSaga");
 var model_1 = require("../../../utils/model");
 var shard_1 = require("../../../utils/shard");
 var user_1 = require("../../../utils/user");
-var AlertWithIcon_1 = __importDefault(require("../../AlertWithIcon"));
-var Loading_1 = __importDefault(require("../../Loading"));
+var AlertWithIcon_1 = require("../../AlertWithIcon");
+var Loading_1 = require("../../Loading");
 var ExternalGroupsAttach = /** @class */ (function (_super) {
     __extends(ExternalGroupsAttach, _super);
     function ExternalGroupsAttach(props) {
@@ -86,8 +87,8 @@ var ExternalGroupsAttach = /** @class */ (function (_super) {
         };
         _this.getOwnerUniTimeGroups = function (ownerSchedule, userId, externalTermId) {
             if (shard_1.isPurdueShard() && ownerSchedule.status === constants_1.MODEL_STATUS.UNINITIALIZED && !ownerSchedule.externalGroups) {
-                studiokit_net_js_1.hooks.registerNoStoreActionHook(ownerSchedule.hookId, function (data) {
-                    studiokit_net_js_1.hooks.unregisterNoStoreActionHook(ownerSchedule.hookId);
+                noStoreSaga_1.registerNoStoreActionHook(ownerSchedule.hookId, function (data) {
+                    noStoreSaga_1.unregisterNoStoreActionHook(ownerSchedule.hookId);
                     if (data && data.errorData) {
                         _this.setState({ isShowingErrorAlert: true, isUniTimeScheduleLoadingDone: true });
                     }
@@ -95,7 +96,7 @@ var ExternalGroupsAttach = /** @class */ (function (_super) {
                         _this.setUserUniTimeGroups(userId, data.externalGroups);
                     }
                 });
-                actionCreator_1.dispatchAction(studiokit_net_js_1.NET_ACTION.DATA_REQUESTED, {
+                actionCreator_1.dispatchAction(actions_1.NET_ACTION.DATA_REQUESTED, {
                     modelName: 'uniTimeInstructorSchedule',
                     queryParams: {
                         externalTermId: externalTermId,
@@ -155,7 +156,7 @@ var ExternalGroupsAttach = /** @class */ (function (_super) {
     };
     ExternalGroupsAttach.prototype.componentWillUnmount = function () {
         var ownerSchedules = this.state.ownerSchedules;
-        lodash_1.forEach(ownerSchedules, function (os) { return studiokit_net_js_1.hooks.unregisterNoStoreActionHook(os.hookId); });
+        lodash_1.forEach(ownerSchedules, function (os) { return noStoreSaga_1.unregisterNoStoreActionHook(os.hookId); });
     };
     ExternalGroupsAttach.prototype.componentDidUpdate = function (prevProps) {
         var prevExternalTermId = prevProps.externalTermId, prevGroupUserRoles = prevProps.groupUserRoles;
@@ -174,13 +175,13 @@ var ExternalGroupsAttach = /** @class */ (function (_super) {
         var _a = this.state, ownerSchedules = _a.ownerSchedules, isUniTimeScheduleLoadingDone = _a.isUniTimeScheduleLoadingDone, isShowingErrorAlert = _a.isShowingErrorAlert;
         var hasAnyExternalGroups = lodash_1.some(ownerSchedules, function (os) { return !!os.externalGroups && os.externalGroups.length > 0; });
         return (react_1.default.createElement("div", null,
-            !isUniTimeScheduleLoadingDone && react_1.default.createElement(Loading_1.default, null),
+            !isUniTimeScheduleLoadingDone && react_1.default.createElement(Loading_1.Loading, null),
             isUniTimeScheduleLoadingDone && (react_1.default.createElement("div", null,
-                !hasAnyExternalGroups && (react_1.default.createElement(AlertWithIcon_1.default, { variant: "info" },
+                !hasAnyExternalGroups && (react_1.default.createElement(AlertWithIcon_1.AlertWithIcon, { variant: "info" },
                     react_1.default.createElement("p", null, "No course sections eligible for roster sync."))),
-                !!disabledInfoMessage && hasAnyExternalGroups && (react_1.default.createElement(AlertWithIcon_1.default, { variant: "info" },
+                !!disabledInfoMessage && hasAnyExternalGroups && (react_1.default.createElement(AlertWithIcon_1.AlertWithIcon, { variant: "info" },
                     react_1.default.createElement("p", null, disabledInfoMessage))),
-                isShowingErrorAlert && (react_1.default.createElement(AlertWithIcon_1.default, { variant: "warning", onClose: function () {
+                isShowingErrorAlert && (react_1.default.createElement(AlertWithIcon_1.AlertWithIcon, { variant: "warning", onClose: function () {
                         return _this.setState({
                             isShowingErrorAlert: false
                         });

package/lib/components/Groups/ExternalGroups/Table.d.ts

@@ -1,6 +1,5 @@
 import { FunctionComponent, TableHTMLAttributes } from 'react';
-import { ModelCollection } from 'studiokit-net-js';
-import { ExternalGroup, Group, GroupUserRole, LtiLaunch, UniTimeGroup } from '../../../types';
+import { ExternalGroup, Group, GroupUserRole, LtiLaunch, ModelCollection, UniTimeGroup } from '../../../types';
 export interface ExternalGroupsTableProps extends TableHTMLAttributes<Element> {
     group: Partial<Group>;
     externalGroups: Array<ExternalGroup | LtiLaunch | UniTimeGroup>;

package/lib/components/HOC/AccessibleAppComponent.js

@@ -42,15 +42,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAccessibleComponent = void 0;
 var react_1 = __importStar(require("react"));
 var react_router_dom_1 = require("react-router-dom");
 var configuration_1 = require("../../constants/configuration");
-var documentService_1 = __importDefault(require("../../services/documentService"));
+var documentService_1 = require("../../services/documentService");
 function setupAccessibleComponent(WrappedComponent) {
     return /** @class */ (function (_super) {
         __extends(AccessibleComponent, _super);
@@ -106,7 +103,7 @@ function setupAccessibleComponent(WrappedComponent) {
             // Do not reset focus if the new route matches the same router path
             if (this.shouldResetFocus(prevProps.location.pathname, this.props.location.pathname)) {
                 if (!!this.root && !!this.root.current) {
-                    documentService_1.default.setActiveDocument(this.root.current);
+                    documentService_1.documentService.setActiveDocument(this.root.current);
                 }
             }
         };

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

@@ -1,6 +1,5 @@
 import React, { ComponentClass, ComponentType } from 'react';
-import { Model } from 'studiokit-net-js';
-import { BaseReduxState, OptionalRecord } from '../../types';
+import { BaseReduxState, Model, OptionalRecord } from '../../types';
 import { ActivityOptions } from '../../utils/baseActivity';
 export interface ActivityRequiredStateProps {
     hasAccess: boolean;

package/lib/components/HOC/AsyncComponent.js

@@ -78,13 +78,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var ErrorBoundary_1 = require("../ErrorBoundary");
-var Loading_1 = __importDefault(require("../Loading"));
+var Loading_1 = require("../Loading");
 function asyncComponent(importComponent, showLoader) {
     if (showLoader === void 0) { showLoader = true; }
     return /** @class */ (function (_super) {
@@ -125,7 +122,7 @@ function asyncComponent(importComponent, showLoader) {
         AsyncComponent.prototype.render = function () {
             var ImportedComponent = this.state.component;
             if (!ImportedComponent) {
-                return showLoader ? react_1.default.createElement(Loading_1.default, null) : null;
+                return showLoader ? react_1.default.createElement(Loading_1.Loading, null) : null;
             }
             return (react_1.default.createElement(ErrorBoundary_1.ErrorBoundary, null,
                 react_1.default.createElement(ImportedComponent, __assign({}, this.props))));

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

@@ -1,7 +1,6 @@
 import React, { ComponentClass, ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { AuthState } from 'studiokit-auth-js';
-import { BaseReduxState } from '../../types';
+import { AuthState, BaseReduxState } from '../../types';
 export declare type AuthenticatedComponentStateProps = Pick<AuthState, 'isAuthenticating' | 'isAuthenticated'>;
 export interface AuthenticatedComponentProps extends AuthenticatedComponentStateProps, RouteComponentProps {
 }

package/lib/components/HOC/AuthenticatedComponent.js

@@ -58,7 +58,7 @@ exports.configureMapStateToProps = exports.configureAuthenticatedComponent = voi
 var react_1 = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
 var react_router_dom_1 = require("react-router-dom");
-var persistenceService_1 = __importStar(require("../../services/persistenceService"));
+var persistenceService_1 = require("../../services/persistenceService");
 var configureAuthenticatedComponent = function (WrappedComponent) {
     return /** @class */ (function (_super) {
         __extends(AuthenticatedComponent, _super);
@@ -71,9 +71,9 @@ var configureAuthenticatedComponent = function (WrappedComponent) {
         };
         AuthenticatedComponent.prototype.persistReturnUrlIfNeeded = function () {
             var pathname = this.props.location.pathname;
-            var returnUrl = persistenceService_1.default.getItem(persistenceService_1.returnUrlKey);
+            var returnUrl = persistenceService_1.persistenceService.getItem(persistenceService_1.returnUrlKey);
             if (!returnUrl) {
-                void persistenceService_1.default.setItem(persistenceService_1.returnUrlKey, pathname);
+                void persistenceService_1.persistenceService.setItem(persistenceService_1.returnUrlKey, pathname);
             }
         };
         AuthenticatedComponent.prototype.render = function () {

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

@@ -1,8 +1,7 @@
 import React, { ComponentClass, ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router';
-import { Model } from 'studiokit-net-js';
-import MODEL_STATUS from '../../constants/modelStatus';
-import { BaseReduxState } from '../../types';
+import { MODEL_STATUS } from '../../constants/modelStatus';
+import { BaseReduxState, Model } from '../../types';
 import { CollectionCommonProps, CollectionCommonState, CollectionCreateParams, CollectionDeleteParams, CollectionLoadParams, CollectionMethodConfiguration, CollectionMethods, CollectionReduxResponse, CollectionUpdateParams } from '../../types/Collection';
 import { GuidComponentWrappedProps } from './GuidComponent';
 /** The props passed into `CollectionComponent` from the user and other HOCs. */
@@ -46,7 +45,7 @@ export declare function configureCollectionComponent<TModel extends Model, TOwnP
     };
     contextType?: React.Context<any> | undefined;
 };
-export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionComponentProps<TModel>, "match" | "guid" | "location" | "history" | "staticContext" | "modelName" | "pathParams" | "queryParams" | "disableAutoLoad">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps & Partial<CollectionComponentProps<TModel>>) => import("../../types").CollectionSelectorMethodResponse<Model>;
+export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionComponentProps<TModel>, "match" | "queryParams" | "modelName" | "guid" | "location" | "history" | "staticContext" | "pathParams" | "disableAutoLoad">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps & Partial<CollectionComponentProps<TModel>>) => import("../../types").CollectionSelectorMethodResponse<Model>;
 /**
  * HOC that provides "collection" related functionality, using redux `connect()`, react-router-dom `withRouter()`, and `GuidComponent`.
  *

package/lib/components/HOC/CollectionComponent.js

@@ -61,13 +61,13 @@ exports.configureMapStateToProps = exports.configureCollectionComponent = void 0
 var react_1 = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
 var react_router_1 = require("react-router");
-var modelStatus_1 = __importDefault(require("../../constants/modelStatus"));
+var modelStatus_1 = require("../../constants/modelStatus");
 var collection_1 = require("../../utils/collection");
 var model_1 = require("../../utils/model");
-var Loading_1 = __importDefault(require("../Loading"));
+var Loading_1 = require("../Loading");
 var GuidComponent_1 = __importDefault(require("./GuidComponent"));
 function configureCollectionComponent(WrappedComponent, LoaderComponent) {
-    if (LoaderComponent === void 0) { LoaderComponent = Loading_1.default; }
+    if (LoaderComponent === void 0) { LoaderComponent = Loading_1.Loading; }
     return /** @class */ (function (_super) {
         __extends(CollectionComponent, _super);
         function CollectionComponent(props) {
@@ -112,8 +112,8 @@ function configureCollectionComponent(WrappedComponent, LoaderComponent) {
             };
             _this.state = {
                 // initializing until model is loaded
-                modelStatus: modelStatus_1.default.UNINITIALIZED,
-                previousModelStatus: modelStatus_1.default.UNINITIALIZED,
+                modelStatus: modelStatus_1.MODEL_STATUS.UNINITIALIZED,
+                previousModelStatus: modelStatus_1.MODEL_STATUS.UNINITIALIZED,
                 fetchingId: undefined
             };
             return _this;
@@ -136,7 +136,7 @@ function configureCollectionComponent(WrappedComponent, LoaderComponent) {
         CollectionComponent.prototype.render = function () {
             var _a = this.props, history = _a.history, match = _a.match, location = _a.location, staticContext = _a.staticContext, otherProps = __rest(_a, ["history", "match", "location", "staticContext"]);
             var _b = this.state, modelStatus = _b.modelStatus, previousModelStatus = _b.previousModelStatus, fetchingId = _b.fetchingId;
-            if (modelStatus === modelStatus_1.default.UNINITIALIZED) {
+            if (modelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED) {
                 return react_1.default.createElement(LoaderComponent, null);
             }
             return (react_1.default.createElement(WrappedComponent, __assign({}, otherProps, { modelStatus: modelStatus, previousModelStatus: previousModelStatus, fetchingId: fetchingId, load: this.load, stopPeriodicLoad: this.stopPeriodicLoad, create: this.create, update: this.update, delete: this.delete })));

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

@@ -1,6 +1,5 @@
 import React, { ComponentClass, ComponentType } from 'react';
-import { Model } from 'studiokit-net-js';
-import { CollectionItemReduxResponse } from '../../types/Collection';
+import { CollectionItemReduxResponse, Model } from '../../types';
 import { CollectionComponentWrappedProps } from './CollectionComponent';
 /** The props passed into `WrappedComponent`. */
 export interface CollectionFirstItemComponentWrappedProps<TModel extends Model> extends Omit<CollectionComponentWrappedProps<TModel>, 'model'>, CollectionItemReduxResponse<TModel> {

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

@@ -1,9 +1,7 @@
 import React, { ComponentClass, ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router';
-import { Model } from 'studiokit-net-js';
 import { MODEL_STATUS } from '../../constants/modelStatus';
-import { BaseReduxState } from '../../types';
-import { CollectionCommonProps, CollectionCommonState, CollectionCreateParams, CollectionItemDeleteParams, CollectionItemLoadParams, CollectionItemMethods, CollectionItemReduxResponse, CollectionItemUpdateParams, CollectionMethodConfiguration } from '../../types/Collection';
+import { BaseReduxState, CollectionCommonProps, CollectionCommonState, CollectionCreateParams, CollectionItemDeleteParams, CollectionItemLoadParams, CollectionItemMethods, CollectionItemReduxResponse, CollectionItemUpdateParams, CollectionMethodConfiguration, Model } from '../../types';
 import { GuidComponentWrappedProps } from './GuidComponent';
 /** The props passed into `CollectionItemComponent` from the user and other HOCs. */
 export interface CollectionItemComponentProps<TModel extends Model> extends CollectionCommonProps, GuidComponentWrappedProps, RouteComponentProps, CollectionItemReduxResponse<TModel> {
@@ -46,7 +44,7 @@ export declare function configureCollectionItemComponent<TModel extends Model, T
     };
     contextType?: React.Context<any> | undefined;
 };
-export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionItemComponentProps<TModel>, "match" | "guid" | "location" | "history" | "staticContext" | "modelName" | "pathParams" | "queryParams" | "disableAutoLoad">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps) => import("../../types").CollectionSelectorMethodResponse<Model>;
+export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionItemComponentProps<TModel>, "match" | "queryParams" | "modelName" | "guid" | "location" | "history" | "staticContext" | "pathParams" | "disableAutoLoad">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps) => import("../../types").CollectionSelectorMethodResponse<Model>;
 /**
  * HOC that provides "collection" related functionality for a single item in a collection, using redux `connect()`, react-router-dom `withRouter()`, and `GuidComponent`.
  *

package/lib/components/HOC/CollectionItemComponent.js

@@ -64,10 +64,10 @@ var react_router_1 = require("react-router");
 var modelStatus_1 = require("../../constants/modelStatus");
 var collection_1 = require("../../utils/collection");
 var model_1 = require("../../utils/model");
-var Loading_1 = __importDefault(require("../Loading"));
+var Loading_1 = require("../Loading");
 var GuidComponent_1 = __importDefault(require("./GuidComponent"));
 function configureCollectionItemComponent(WrappedComponent, LoaderComponent) {
-    if (LoaderComponent === void 0) { LoaderComponent = Loading_1.default; }
+    if (LoaderComponent === void 0) { LoaderComponent = Loading_1.Loading; }
     return /** @class */ (function (_super) {
         __extends(CollectionItemComponent, _super);
         function CollectionItemComponent(props) {

package/lib/components/HOC/DataDependentComponent.js

@@ -53,14 +53,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureMapStateToProps = exports.configureDataDependentComponent = void 0;
 var react_1 = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
-var Loading_1 = __importDefault(require("../Loading"));
+var Loading_1 = require("../Loading");
 var configureDataDependentComponent = function (WrappedComponent) {
     return /** @class */ (function (_super) {
         __extends(DataDependentComponent, _super);
@@ -69,7 +66,7 @@ var configureDataDependentComponent = function (WrappedComponent) {
         }
         DataDependentComponent.prototype.render = function () {
             var _a = this.props, hasData = _a.hasData, ownProps = __rest(_a, ["hasData"]);
-            return this.props.hasData ? react_1.default.createElement(WrappedComponent, __assign({}, ownProps)) : react_1.default.createElement(Loading_1.default, null);
+            return this.props.hasData ? react_1.default.createElement(WrappedComponent, __assign({}, ownProps)) : react_1.default.createElement(Loading_1.Loading, null);
         };
         return DataDependentComponent;
     }(react_1.Component));

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

@@ -1,6 +1,5 @@
 import { ComponentClass, ComponentType } from 'react';
-import { Model } from 'studiokit-net-js';
-import { BaseReduxState } from '../../types/BaseReduxState';
+import { BaseReduxState, Model } from '../../types';
 import { ActivityOptions } from '../../utils/baseActivity';
 import { ActivityRequiredStateProps } from './ActivityRequiredComponent';
 import { CollectionItemComponentWrappedProps } from './CollectionItemComponent';

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ComponentType } from 'react';
 import { RouteComponentProps } from 'react-router';
-import { Model } from 'studiokit-net-js';
+import { Model } from '../../types';
 export interface ModelContextDependencyVerifyComponentProps {
     model: Model;
 }

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

@@ -1,5 +1,5 @@
 import React, { ComponentType } from 'react';
-import { Model } from 'studiokit-net-js';
+import { Model } from '../../types';
 import { CollectionComponentWrappedProps } from './CollectionComponent';
 import { CollectionItemComponentWrappedProps } from './CollectionItemComponent';
 /**

package/lib/components/HOC/ModelErrorRedirectComponent.js

@@ -42,13 +42,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_router_dom_1 = require("react-router-dom");
-var modelStatus_1 = __importDefault(require("../../constants/modelStatus"));
+var modelStatus_1 = require("../../constants/modelStatus");
 /**
  * This component exists as a child to CollectionItemComponent to
  * redirect the user to a 404/500 page if errors occur while fetching data.
@@ -69,14 +66,14 @@ function modelErrorRedirectComponent(WrappedComponent) {
         }
         ModelErrorRedirectComponent.prototype.render = function () {
             var _a = this.props, model = _a.model, modelStatus = _a.modelStatus, previousModelStatus = _a.previousModelStatus;
-            var notFoundRoute = previousModelStatus === modelStatus_1.default.UNINITIALIZED &&
-                modelStatus === modelStatus_1.default.ERROR &&
+            var notFoundRoute = previousModelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED &&
+                modelStatus === modelStatus_1.MODEL_STATUS.ERROR &&
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&
                 model._metadata.lastFetchErrorData.code === 404;
-            var errorRoute = previousModelStatus === modelStatus_1.default.UNINITIALIZED &&
-                modelStatus === modelStatus_1.default.ERROR &&
+            var errorRoute = previousModelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED &&
+                modelStatus === modelStatus_1.MODEL_STATUS.ERROR &&
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&