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

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

@@ -13,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" | "ref" | "title" | "key" | "anyRoleButLearner">>;
+declare const _default: import("react-redux").ConnectedComponent<typeof GroupsDropdown, Pick<React.ClassAttributes<GroupsDropdown> & Props, "title" | "ref" | "id" | "key" | "anyRoleButLearner">>;
 export default _default;

package/lib/components/Dropdowns/GroupsDropdown.js

@@ -37,7 +37,6 @@ var react_bootstrap_1 = require("react-bootstrap");
 var react_redux_1 = require("react-redux");
 var react_router_bootstrap_1 = require("react-router-bootstrap");
 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");
@@ -48,7 +47,7 @@ var GroupsDropdown = /** @class */ (function (_super) {
     function GroupsDropdown() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.loadGroups = function () {
-            actionCreator_1.dispatchAction(actions_1.NET_ACTION.DATA_REQUESTED, { modelName: 'groups' });
+            actionCreator_1.dispatchModelFetchRequest({ modelName: 'groups' });
         };
         _this.didToggle = function (isOpen) {
             if (isOpen) {

package/lib/components/Dropdowns/UserDropdown.js

@@ -56,7 +56,7 @@ var IconStopImpersonating_1 = require("../Icons/IconStopImpersonating");
 var UserDetail_1 = require("../Impersonation/UserDetail");
 var ManagedNavDropdown_1 = require("./ManagedNavDropdown");
 var doLogOut = function () {
-    actionCreator_1.dispatchAction(actions_1.AUTH_ACTION.LOG_OUT_REQUESTED, {});
+    actionCreator_1.dispatchAction({ type: actions_1.AUTH_ACTION_TYPE.LOG_OUT_REQUESTED });
 };
 var UserDropdown = function (_a) {
     var userInfo = _a.userInfo, children = _a.children, props = __rest(_a, ["userInfo", "children"]);

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

@@ -24,8 +24,8 @@ var react_bootstrap_1 = require("react-bootstrap");
 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 types_1 = require("../../../types");
 var model_1 = require("../../../utils/model");
 var shard_1 = require("../../../utils/shard");
 var user_1 = require("../../../utils/user");
@@ -89,14 +89,14 @@ var ExternalGroupsAttach = /** @class */ (function (_super) {
             if (shard_1.isPurdueShard() && ownerSchedule.status === constants_1.MODEL_STATUS.UNINITIALIZED && !ownerSchedule.externalGroups) {
                 noStoreSaga_1.registerNoStoreActionHook(ownerSchedule.hookId, function (data) {
                     noStoreSaga_1.unregisterNoStoreActionHook(ownerSchedule.hookId);
-                    if (data && data.errorData) {
+                    if (!data || types_1.isFetchErrorData(data)) {
                         _this.setState({ isShowingErrorAlert: true, isUniTimeScheduleLoadingDone: true });
                     }
                     else {
                         _this.setUserUniTimeGroups(userId, data.externalGroups);
                     }
                 });
-                actionCreator_1.dispatchAction(actions_1.NET_ACTION.DATA_REQUESTED, {
+                actionCreator_1.dispatchModelFetchRequest({
                     modelName: 'uniTimeInstructorSchedule',
                     queryParams: {
                         externalTermId: externalTermId,

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

@@ -15,7 +15,7 @@ export declare function configureCollectionComponent<TModel extends Model, TOwnP
         componentDidMount(): void;
         componentDidUpdate(prevProps: TOwnProps & CollectionComponentProps<TModel>): void;
         componentWillUnmount(): void;
-        changeModelStatus: (newModelStatus: MODEL_STATUS, fetchingId?: string | undefined) => void;
+        changeModelStatus: (newModelStatus: MODEL_STATUS, fetchingId?: string | number | undefined) => void;
         getCollectionMethodConfig: () => CollectionMethodConfiguration;
         load: (params?: CollectionLoadParams) => void;
         stopPeriodicLoad: (taskId: string) => void;
@@ -46,7 +46,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" | "queryParams" | "modelName" | "guid" | "location" | "history" | "staticContext" | "pathParams" | "disableAutoLoad" | "disableAutoLoadOnParamsChange">>(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>, "guid" | "match" | "modelName" | "pathParams" | "queryParams" | "location" | "history" | "staticContext" | "disableAutoLoad" | "disableAutoLoadOnParamsChange">>(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

@@ -99,8 +99,7 @@ function configureCollectionComponent(WrappedComponent, LoaderComponent) {
                 collection_1.loadCollection(_this.getCollectionMethodConfig(), params);
             };
             _this.stopPeriodicLoad = function (taskId) {
-                var modelName = _this.props.modelName;
-                collection_1.stopCollectionPeriodicLoad(modelName, taskId);
+                collection_1.stopCollectionPeriodicLoad(taskId);
             };
             _this.create = function (params) {
                 collection_1.createItemInCollection(_this.getCollectionMethodConfig(), params);

package/lib/components/HOC/CollectionFirstItemComponent.js

@@ -86,7 +86,7 @@ function configureCollectionFirstItemComponent(WrappedComponent) {
             var modelMinusRelations = this.getModelMinusRelations(firstItem);
             var p = __spreadArrays(pathParams);
             if (firstItem.id) {
-                p.push(firstItem.id.toString());
+                p.push(firstItem.id);
             }
             return (react_1.default.createElement(WrappedComponent, __assign({}, this.props, { pathParams: p, model: firstItem, modelMinusRelations: modelMinusRelations })));
         };

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

@@ -45,7 +45,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" | "queryParams" | "modelName" | "guid" | "location" | "history" | "staticContext" | "pathParams" | "disableAutoLoad" | "disableAutoLoadOnParamsChange">>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps) => import("../../types").CollectionSelectorMethodResponse<Model>;
+export declare const configureMapStateToProps: <TModel extends Model, TOwnProps extends Pick<CollectionItemComponentProps<TModel>, "guid" | "match" | "modelName" | "pathParams" | "queryParams" | "location" | "history" | "staticContext" | "disableAutoLoad" | "disableAutoLoadOnParamsChange">>(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

@@ -98,8 +98,7 @@ function configureCollectionItemComponent(WrappedComponent, LoaderComponent) {
                 collection_1.loadCollectionItem(_this.getCollectionMethodConfig(), params);
             };
             _this.stopPeriodicLoad = function (taskId) {
-                var modelName = _this.props.modelName;
-                collection_1.stopCollectionPeriodicLoad(modelName, taskId);
+                collection_1.stopCollectionPeriodicLoad(taskId);
             };
             _this.create = function (params) {
                 var model = _this.props.model;

package/lib/components/HOC/ConnectedModalComponent.js

@@ -89,7 +89,12 @@ function configureConnectedModalComponent(WrappedComponent, isFullscreen) {
                 var _b = _this.props, guid = _b.guid, modals = _b.modals;
                 // Store each modal's GUID in redux with a zero-based index to determine the order in which they were opened
                 var maxModal = lodash_1.maxBy(Object.values(modals), function (modal) { return modal.index; });
-                actionCreator_1.dispatchAction(actions_1.ACTION.MODAL_ENTERING, { guid: guid, index: ((_a = maxModal === null || maxModal === void 0 ? void 0 : maxModal.index) !== null && _a !== void 0 ? _a : -1) + 1, isFullscreen: isFullscreen });
+                actionCreator_1.dispatchAction({
+                    type: actions_1.MODAL_ACTION_TYPE.MODAL_ENTERING,
+                    guid: guid,
+                    index: ((_a = maxModal === null || maxModal === void 0 ? void 0 : maxModal.index) !== null && _a !== void 0 ? _a : -1) + 1,
+                    isFullscreen: isFullscreen
+                });
                 _this.setState({
                     isModalOpen: true
                 });
@@ -98,7 +103,7 @@ function configureConnectedModalComponent(WrappedComponent, isFullscreen) {
                 var guid = _this.props.guid;
                 var isModalOpen = _this.state.isModalOpen;
                 if (isModalOpen) {
-                    actionCreator_1.dispatchAction(actions_1.ACTION.MODAL_EXITED, { guid: guid });
+                    actionCreator_1.dispatchAction({ type: actions_1.MODAL_ACTION_TYPE.MODAL_EXITED, guid: guid });
                 }
                 _this.setState({
                     isModalOpen: false

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/components/HOC/SearchPersistorComponent.js

@@ -200,7 +200,7 @@ var configureMapDispatchToProps = function (key) { return function (dispatch) {
     var dispatchPersistSearch = function (search) {
         var _a;
         dispatch({
-            type: actions_1.ACTION.PERSIST_SEARCH,
+            type: actions_1.SEARCH_ACTION_TYPE.PERSIST_SEARCH,
             data: (_a = {},
                 _a["" + key] = search,
                 _a)

package/lib/components/Lti/CreateNonLtiGroupAlertDialog.d.ts

@@ -9,5 +9,5 @@ export interface CreateNonLtiGroupAlertDialogProps extends Omit<AlertDialogProps
 }
 export declare const CreateNonLtiGroupAlertDialog: FunctionComponent<CreateNonLtiGroupAlertDialogProps>;
 export declare const mapStateToProps: (state: BaseReduxState) => CreateNonLtiGroupAlertDialogReduxProps;
-declare const _default: import("react-redux").ConnectedComponent<React.FunctionComponent<CreateNonLtiGroupAlertDialogProps>, Pick<CreateNonLtiGroupAlertDialogProps, "id" | "description" | "isOpen" | "onProceed" | "proceedText" | "onCancel" | "cancelText" | "hideCancel" | "onDestroy" | "destroyText" | "manualBackground" | "externalHelpResourcePageUrl">>;
+declare const _default: import("react-redux").ConnectedComponent<React.FunctionComponent<CreateNonLtiGroupAlertDialogProps>, Pick<CreateNonLtiGroupAlertDialogProps, "description" | "id" | "isOpen" | "onProceed" | "proceedText" | "onCancel" | "cancelText" | "hideCancel" | "onDestroy" | "destroyText" | "manualBackground" | "externalHelpResourcePageUrl">>;
 export default _default;

package/lib/components/Notifications.js

@@ -112,7 +112,8 @@ var Notifications = /** @class */ (function (_super) {
             if (!notification) {
                 return;
             }
-            actionCreator_1.dispatchAction(actions_1.ACTION.REMOVE_NOTIFICATION, {
+            actionCreator_1.dispatchAction({
+                type: actions_1.NOTIFICATION_ACTION_TYPE.REMOVE_NOTIFICATION,
                 notification: notification
             });
         };

package/lib/components/UserRoles/index.d.ts

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { BaseReduxState, ExternalProvider, FetchError, Model, ModelCollection, RoleDescriptions, UserRole, UserWithRoles } from '../../types';
+import { BaseReduxState, ExternalProvider, FetchErrorData, Model, ModelCollection, RoleDescriptions, UserRole, UserWithRoles } from '../../types';
 import { CollectionComponentWrappedProps } from '../HOC/CollectionComponent';
 export interface UserRolesReduxProps {
     /** Is the current user allowed to add, update, and delete user roles? */
@@ -96,7 +96,7 @@ export declare class UserRoles extends Component<UserRolesProps, UserRolesState>
     textForRole: (role: string, lowercase?: boolean) => string;
     singularArticleForRole: (role: string) => string;
     addUserRoles: (identifiers: string[], role: string) => void;
-    didAdd: (data?: FetchError | AddBusinessModel | undefined) => void;
+    didAdd: (data?: FetchErrorData | AddBusinessModel | undefined) => void;
     updateUserRole: (userRoleToUpdate: UserRole, newRole: string) => void;
     didUpdate: (isSuccess: boolean) => void;
     alertRemoveUserRole: (userRoleToRemove: UserRole) => void;
@@ -107,5 +107,5 @@ export declare class UserRoles extends Component<UserRolesProps, UserRolesState>
     render(): JSX.Element;
 }
 export declare const mapStateToProps: (state: BaseReduxState, ownProps: UserRolesOwnProps) => UserRolesReduxProps;
-declare const _default: import("react-redux").ConnectedComponent<typeof UserRoles, Pick<React.ClassAttributes<UserRoles> & UserRolesProps, "ref" | "queryParams" | "modelName" | "externalProviders" | "model" | "key" | "readOnly" | "guid" | "entityName" | "load" | "pathParams" | "modelStatus" | "disableAutoLoad" | "disableAutoLoadOnParamsChange" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "previousModelStatus" | "fetchingId" | "textForRole" | "defaultRole" | "roleDescriptions" | "renderAddDescription" | "isUpdateDisabled" | "isDeleteDisabled" | "allowMultipleRoles" | "requiredRole" | "isAddDisabled" | "modifyUserRoleActivityName" | "deleteOwnUserRoleActivityName" | "addRoleExcludeList" | "entity" | "filterUsers" | "onAdd" | "onUpdate" | "onRemove" | "renderTableDescription" | "lowercaseTextForRole" | "singularArticleForRole"> & UserRolesOwnProps>;
+declare const _default: import("react-redux").ConnectedComponent<typeof UserRoles, Pick<React.ClassAttributes<UserRoles> & UserRolesProps, "guid" | "ref" | "modelName" | "pathParams" | "queryParams" | "externalProviders" | "model" | "key" | "readOnly" | "entityName" | "load" | "modelStatus" | "disableAutoLoad" | "disableAutoLoadOnParamsChange" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "previousModelStatus" | "fetchingId" | "textForRole" | "defaultRole" | "roleDescriptions" | "renderAddDescription" | "isUpdateDisabled" | "isDeleteDisabled" | "allowMultipleRoles" | "requiredRole" | "isAddDisabled" | "modifyUserRoleActivityName" | "deleteOwnUserRoleActivityName" | "addRoleExcludeList" | "entity" | "filterUsers" | "onAdd" | "onUpdate" | "onRemove" | "renderTableDescription" | "lowercaseTextForRole" | "singularArticleForRole"> & UserRolesOwnProps>;
 export default _default;

package/lib/components/UserRoles/index.js

@@ -42,16 +42,18 @@ var AlertDialog_1 = require("../../components/AlertDialog");
 var Loading_1 = require("../../components/Loading");
 var Add_1 = require("../../components/UserRoles/Add");
 var Table_1 = require("../../components/UserRoles/Table");
+var constants_1 = require("../../constants");
 var baseRole_1 = require("../../constants/baseRole");
 var modelStatus_1 = require("../../constants/modelStatus");
 var actionCreator_1 = require("../../redux/actionCreator");
 var actions_1 = require("../../redux/actions");
-var fetchSaga_1 = require("../../redux/sagas/fetchSaga");
 var noStoreSaga_1 = require("../../redux/sagas/noStoreSaga");
+var types_1 = require("../../types");
 var baseActivity_1 = require("../../utils/baseActivity");
 var baseRole_2 = require("../../utils/baseRole");
 var domainIdentifier_1 = require("../../utils/domainIdentifier");
 var entityUserRole_1 = require("../../utils/entityUserRole");
+var modelFetch_1 = require("../../utils/modelFetch");
 var sort_1 = require("../../utils/sort");
 var user_1 = require("../../utils/user");
 var userRole_1 = require("../../utils/userRole");
@@ -126,7 +128,7 @@ var UserRoles = /** @class */ (function (_super) {
                 _this.didAdd(data);
             });
             var rootModelName = entityUserRole_1.getRootModelName(_this.props);
-            actionCreator_1.dispatchAction(actions_1.NET_ACTION.DATA_REQUESTED, {
+            actionCreator_1.dispatchModelFetchRequest({
                 modelName: (rootModelName ? rootModelName + "." : '') + "addUserRoles",
                 pathParams: entity ? [entity.id] : undefined,
                 body: {
@@ -144,7 +146,7 @@ var UserRoles = /** @class */ (function (_super) {
             if (!roleForAdd || !identifiersToAdd || identifiersToAdd.length === 0) {
                 throw new Error('didAdd was called in the incorrect state');
             }
-            if (!data || data.errorData) {
+            if (!data || types_1.isFetchErrorData(data)) {
                 var failMessage_1 = "The following identifiers were not added" + (entityName ? " to your " + entityName : '') + ":\r\n" + identifiersToAdd.join('\r\n');
                 _this.setState({
                     shouldResetAddForm: true,
@@ -155,7 +157,7 @@ var UserRoles = /** @class */ (function (_super) {
                 });
                 return;
             }
-            var _c = data, addedUserRoles = _c.addedUserRoles, existingUserRoles = _c.existingUserRoles, blockedUserRoles = _c.blockedUserRoles, invalidIdentifiers = _c.invalidIdentifiers, allowedDomains = _c.allowedDomains, invalidDomainIdentifiers = _c.invalidDomainIdentifiers;
+            var addedUserRoles = data.addedUserRoles, existingUserRoles = data.existingUserRoles, blockedUserRoles = data.blockedUserRoles, invalidIdentifiers = data.invalidIdentifiers, allowedDomains = data.allowedDomains, invalidDomainIdentifiers = data.invalidDomainIdentifiers;
             var roleString = _this.textForRole(roleForAdd, true);
             var singularArticleString = _this.singularArticleForRole(roleForAdd);
             var addedNames = !!addedUserRoles && addedUserRoles.length > 0
@@ -207,9 +209,15 @@ var UserRoles = /** @class */ (function (_super) {
                 // update redux with added userRoles
                 var updatedModel_1 = lodash_1.cloneDeep(model);
                 addedUserRoles.forEach(function (userRole) { return (updatedModel_1[userRole.id] = lodash_1.cloneDeep(userRole)); });
-                var prepareFetchResult = fetchSaga_1.prepareFetch({ type: actions_1.NET_ACTION.DATA_REQUESTED, modelName: modelName, pathParams: pathParams });
-                actionCreator_1.dispatchAction(actions_1.NET_ACTION.FETCH_RESULT_RECEIVED, {
-                    modelName: prepareFetchResult.modelName,
+                // create a dummy action and call `prepareFetch` to get the final `modelPath`
+                var modelPath = modelFetch_1.prepareFetch({
+                    type: actions_1.MODEL_FETCH_REQUEST_TYPE.FETCH_REQUEST,
+                    modelName: modelName,
+                    pathParams: pathParams
+                }, constants_1.getEndpointMappings()).modelPath;
+                actionCreator_1.dispatchAction({
+                    type: actions_1.MODEL_FETCH_RESULT_TYPE.FETCH_RESULT_RECEIVED,
+                    modelPath: modelPath,
                     data: updatedModel_1
                 });
                 if (onAdd) {
@@ -228,7 +236,7 @@ var UserRoles = /** @class */ (function (_super) {
                 failMessage: undefined
             });
             _this.props.update({
-                id: userRoleToUpdate.id.toString(),
+                id: userRoleToUpdate.id,
                 body: {},
                 queryParams: {
                     roleName: newRole

package/lib/endpointMappings.d.ts

@@ -1,5 +1,4 @@
 import { EndpointMapping, EndpointMappings } from './types';
 export declare const entityUserRoleEndpointMappings: (endpointName: string) => EndpointMappings;
 export declare const groupEndpointMapping: EndpointMapping;
-export declare const authEndpointMappings: EndpointMappings;
 export declare const endpointMappings: EndpointMappings;

package/lib/endpointMappings.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.endpointMappings = exports.authEndpointMappings = exports.groupEndpointMapping = exports.entityUserRoleEndpointMappings = void 0;
+exports.endpointMappings = exports.groupEndpointMapping = exports.entityUserRoleEndpointMappings = void 0;
 var entityUserRoleEndpointMappings = function (endpointName) {
     var _a;
     return _a = {},
@@ -47,7 +47,7 @@ exports.groupEndpointMapping = __assign({ _config: {
             }
         }
     } }, exports.entityUserRoleEndpointMappings('groupUserRoles'));
-exports.authEndpointMappings = {
+exports.endpointMappings = {
     codeFromLocalCredentials: {
         _config: {
             fetch: {
@@ -59,13 +59,13 @@ exports.authEndpointMappings = {
     codeFromCasV1: {
         _config: {
             fetch: {
-                path: '/api/account/CasV1',
+                path: '/api/account/casV1',
                 method: 'POST'
             }
         }
     },
     codeFromCasTicket: {
-        _config: { fetch: { path: '/api/Account/ValidateCasTicket' } }
+        _config: { fetch: { path: '/api/account/validateCasTicket' } }
     },
     getToken: {
         _config: {
@@ -80,11 +80,9 @@ exports.authEndpointMappings = {
     },
     user: {
         userInfo: {
-            _config: { fetch: { path: '/api/Account/UserInfo' } }
+            _config: { fetch: { path: '/api/account/userInfo' } }
         }
-    }
-};
-exports.endpointMappings = {
+    },
     urlChecker: {
         _config: {
             fetch: {

package/lib/hooks/useCollection.js

@@ -14,9 +14,6 @@ function useCollection(props) {
         if (params === void 0) { params = {}; }
         collection_1.loadCollection(methodConfig, params);
     }, [methodConfig]);
-    var stopPeriodicLoad = react_1.useCallback(function (taskId) {
-        collection_1.stopCollectionPeriodicLoad(modelName, taskId);
-    }, [modelName]);
     var create = react_1.useCallback(function (params) {
         collection_1.createItemInCollection(methodConfig, params);
     }, [methodConfig]);
@@ -63,7 +60,7 @@ function useCollection(props) {
         previousModelStatus: previousModelStatus,
         fetchingId: fetchingId,
         load: load,
-        stopPeriodicLoad: stopPeriodicLoad,
+        stopPeriodicLoad: collection_1.stopCollectionPeriodicLoad,
         create: create,
         update: update,
         delete: deleteItem

package/lib/hooks/useCollectionConfiguration.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { Dictionary } from 'lodash';
 import { CollectionCommonProps, CollectionCommonState, CollectionMethodConfiguration, CollectionSelectorMethod, Model, ModelCollection } from '../types';
 /** Configuration returned by `useCollectionConfiguration` for use in `useCollection` and `useCollectionItem` */
 export interface CollectionConfiguration<TModel extends Model> extends CollectionCommonState {
@@ -9,10 +8,10 @@ export interface CollectionConfiguration<TModel extends Model> extends Collectio
     modelArray?: TModel[];
     modelMinusRelations?: Partial<TModel>;
     previousModel: TModel | ModelCollection<TModel>;
-    pathParams: string[];
-    previousPathParams: string[];
-    queryParams?: Dictionary<string>;
-    previousQueryParams?: Dictionary<string>;
+    pathParams: Array<string | number>;
+    previousPathParams: Array<string | number>;
+    queryParams?: Record<string, string | number | boolean>;
+    previousQueryParams?: Record<string, string | number | boolean>;
     methodConfig: CollectionMethodConfiguration;
     isInitialized: boolean;
     setIsInitialized: (value: React.SetStateAction<boolean>) => void;

package/lib/hooks/useCollectionItem.js

@@ -14,9 +14,6 @@ function useCollectionItem(props) {
         if (params === void 0) { params = {}; }
         collection_1.loadCollectionItem(methodConfig, params);
     }, [methodConfig]);
-    var stopPeriodicLoad = react_1.useCallback(function (taskId) {
-        collection_1.stopCollectionPeriodicLoad(modelName, taskId);
-    }, [modelName]);
     var create = react_1.useCallback(function (params) {
         collection_1.createCollectionItem(model, methodConfig, params);
     }, [model, methodConfig]);
@@ -56,7 +53,7 @@ function useCollectionItem(props) {
         modelStatus: modelStatus,
         previousModelStatus: previousModelStatus,
         load: load,
-        stopPeriodicLoad: stopPeriodicLoad,
+        stopPeriodicLoad: collection_1.stopCollectionPeriodicLoad,
         create: create,
         update: update,
         delete: deleteItem

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 export * from './constants';
 export * from './types';
 export * from './redux/actions';
+export { dispatchAction, dispatchModelFetchRequest, dispatchPeriodicModelFetchRequest, dispatchPeriodicModelFetchTerminateAction, dispatchModelRemoveKeyAction, addNotification } from './redux/actionCreator';
 export { default as configureStore } from './redux/configureStore';
 export { setOtherDependentSagas } from './redux/sagas/rootSaga';
 export { setOnPostLoginSaga } from './redux/sagas/postLoginDataSaga';

package/lib/index.js

@@ -13,10 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setConfigureModelsReducer = exports.setOtherReducers = exports.updatePersistBlacklist = exports.setOnPostLoginSaga = exports.setOtherDependentSagas = exports.configureStore = void 0;
+exports.setConfigureModelsReducer = exports.setOtherReducers = exports.updatePersistBlacklist = exports.setOnPostLoginSaga = exports.setOtherDependentSagas = exports.configureStore = exports.addNotification = exports.dispatchModelRemoveKeyAction = exports.dispatchPeriodicModelFetchTerminateAction = exports.dispatchPeriodicModelFetchRequest = exports.dispatchModelFetchRequest = exports.dispatchAction = void 0;
 __exportStar(require("./constants"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./redux/actions"), exports);
+var actionCreator_1 = require("./redux/actionCreator");
+Object.defineProperty(exports, "dispatchAction", { enumerable: true, get: function () { return actionCreator_1.dispatchAction; } });
+Object.defineProperty(exports, "dispatchModelFetchRequest", { enumerable: true, get: function () { return actionCreator_1.dispatchModelFetchRequest; } });
+Object.defineProperty(exports, "dispatchPeriodicModelFetchRequest", { enumerable: true, get: function () { return actionCreator_1.dispatchPeriodicModelFetchRequest; } });
+Object.defineProperty(exports, "dispatchPeriodicModelFetchTerminateAction", { enumerable: true, get: function () { return actionCreator_1.dispatchPeriodicModelFetchTerminateAction; } });
+Object.defineProperty(exports, "dispatchModelRemoveKeyAction", { enumerable: true, get: function () { return actionCreator_1.dispatchModelRemoveKeyAction; } });
+Object.defineProperty(exports, "addNotification", { enumerable: true, get: function () { return actionCreator_1.addNotification; } });
 var configureStore_1 = require("./redux/configureStore");
 Object.defineProperty(exports, "configureStore", { enumerable: true, get: function () { return __importDefault(configureStore_1).default; } });
 var rootSaga_1 = require("./redux/sagas/rootSaga");

package/lib/redux/actionCreator.d.ts

@@ -1,4 +1,10 @@
 import { Action, Store } from 'redux';
+import { Notification } from '../types/Notification';
+import { ModelFetchRequestAction, ModelRemoveKeyAction, PeriodicModelFetchRequestAction, PeriodicModelFetchTerminationAction } from './actions';
 export declare const setStore: (storeParam: Store) => void;
-export declare const dispatchAction: (type: string, payload?: any) => void;
-export declare const createAction: (type: string, payload?: any) => Action;
+export declare const dispatchAction: <A extends Action<any>>(action: A) => void;
+export declare const dispatchModelFetchRequest: (action: Omit<ModelFetchRequestAction, 'type'>) => void;
+export declare const dispatchPeriodicModelFetchRequest: (action: Omit<PeriodicModelFetchRequestAction, 'type'>) => void;
+export declare const dispatchPeriodicModelFetchTerminateAction: (action: Omit<PeriodicModelFetchTerminationAction, 'type'>) => void;
+export declare const dispatchModelRemoveKeyAction: (action: Omit<ModelRemoveKeyAction, 'type'>) => void;
+export declare const addNotification: ({ text, type, modalId }: Omit<Notification, 'id'>) => void;

package/lib/redux/actionCreator.js

@@ -1,17 +1,55 @@
 "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);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAction = exports.dispatchAction = exports.setStore = void 0;
-var lodash_1 = require("lodash");
+exports.addNotification = exports.dispatchModelRemoveKeyAction = exports.dispatchPeriodicModelFetchTerminateAction = exports.dispatchPeriodicModelFetchRequest = exports.dispatchModelFetchRequest = exports.dispatchAction = exports.setStore = void 0;
+var uuid_1 = require("uuid");
+var actions_1 = require("./actions");
+var NotificationAction_1 = require("./actions/NotificationAction");
 var store;
 var setStore = function (storeParam) {
     store = storeParam;
 };
 exports.setStore = setStore;
-var dispatchAction = function (type, payload) {
-    store.dispatch(exports.createAction(type, payload));
+var dispatchAction = function (action) {
+    store.dispatch(action);
 };
 exports.dispatchAction = dispatchAction;
-var createAction = function (type, payload) {
-    return lodash_1.merge({}, { type: type }, payload);
+var dispatchModelFetchRequest = function (action) {
+    exports.dispatchAction(__assign({ type: actions_1.MODEL_FETCH_REQUEST_TYPE.FETCH_REQUEST }, action));
+};
+exports.dispatchModelFetchRequest = dispatchModelFetchRequest;
+var dispatchPeriodicModelFetchRequest = function (action) {
+    exports.dispatchAction(__assign({ type: actions_1.MODEL_FETCH_REQUEST_TYPE.PERIODIC_FETCH_REQUEST }, action));
+};
+exports.dispatchPeriodicModelFetchRequest = dispatchPeriodicModelFetchRequest;
+var dispatchPeriodicModelFetchTerminateAction = function (action) {
+    exports.dispatchAction(__assign({ type: actions_1.PERIODIC_MODEL_FETCH_TERMINATION_TYPE.TERMINATE }, action));
+};
+exports.dispatchPeriodicModelFetchTerminateAction = dispatchPeriodicModelFetchTerminateAction;
+var dispatchModelRemoveKeyAction = function (action) {
+    exports.dispatchAction(__assign({ type: actions_1.MODEL_REMOVE_KEY_TYPE }, action));
+};
+exports.dispatchModelRemoveKeyAction = dispatchModelRemoveKeyAction;
+var addNotification = function (_a) {
+    var text = _a.text, type = _a.type, modalId = _a.modalId;
+    exports.dispatchAction({
+        type: NotificationAction_1.NOTIFICATION_ACTION_TYPE.ADD_NOTIFICATION,
+        notification: {
+            id: uuid_1.v4(),
+            text: text,
+            type: type,
+            modalId: modalId
+        }
+    });
 };
-exports.createAction = createAction;
+exports.addNotification = addNotification;

package/lib/redux/actions/AuthAction.d.ts

@@ -0,0 +1,54 @@
+import { Action } from 'redux';
+import { CasV1LoginRequestBody, IdentityProvider } from '../../types';
+import { LocalLoginRequestBody } from '../../types/auth/LocalLoginRequestBody';
+import { OAuthToken, OAuthTokenOrNull } from '../../types/net';
+import { BaseModelFetchRequestAction } from './ModelAction';
+export declare enum AUTH_ACTION_TYPE {
+    CAS_LOGIN_REQUESTED = "auth/CAS_LOGIN_REQUESTED",
+    LOGIN_REQUESTED = "auth/LOGIN_REQUESTED",
+    LOG_OUT_REQUESTED = "auth/LOG_OUT_REQUESTED",
+    TOKEN_REFRESH_FAILED = "auth/TOKEN_REFRESH_FAILED",
+    LOGIN_FAILED = "auth/LOGIN_FAILED"
+}
+/**
+ * Action with no additional properties.
+ */
+export interface AuthAction extends Action<AUTH_ACTION_TYPE> {
+}
+export declare enum AUTH_TOKEN_ACTION_TYPE {
+    AUTH_INITIALIZED = "auth/INITIALIZED"
+}
+/**
+ * Action with a nullable `oauthToken`.
+ */
+export interface AuthTokenAction extends Action<AUTH_TOKEN_ACTION_TYPE> {
+    oauthToken: OAuthTokenOrNull;
+}
+export declare enum AUTH_TOKEN_SUCCESS_ACTION_TYPE {
+    GET_TOKEN_SUCCEEDED = "auth/GET_TOKEN_SUCCEEDED",
+    TOKEN_REFRESH_SUCCEEDED = "auth/TOKEN_REFRESH_SUCCEEDED"
+}
+/**
+ * Action with an `oauthToken`.
+ */
+export interface AuthTokenSuccessAction extends Action<AUTH_TOKEN_SUCCESS_ACTION_TYPE> {
+    oauthToken: OAuthToken;
+}
+export declare enum AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE {
+    IDENTITY_PROVIDER_LOGIN_REQUESTED = "auth/IDENTITY_PROVIDER_LOGIN_REQUESTED"
+}
+export interface AuthIdentityProviderRequestAction extends Action<AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE> {
+    identityProvider: IdentityProvider;
+}
+export declare enum AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE {
+    CAS_V1_LOGIN_REQUEST = "auth/CAS_V1_LOGIN_REQUEST"
+}
+export interface AuthCasV1LoginRequestAction extends Omit<BaseModelFetchRequestAction<AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE>, 'modelName' | 'pathParams'> {
+    body: CasV1LoginRequestBody;
+}
+export declare enum AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE {
+    LOCAL_LOGIN_REQUEST = "auth/LOCAL_LOGIN_REQUEST"
+}
+export interface AuthLocalLoginRequestAction extends Omit<BaseModelFetchRequestAction<AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE>, 'modelName' | 'pathParams'> {
+    body: LocalLoginRequestBody;
+}

package/lib/redux/actions/AuthAction.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE = exports.AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE = exports.AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE = exports.AUTH_TOKEN_SUCCESS_ACTION_TYPE = exports.AUTH_TOKEN_ACTION_TYPE = exports.AUTH_ACTION_TYPE = void 0;
+var AUTH_ACTION_TYPE;
+(function (AUTH_ACTION_TYPE) {
+    AUTH_ACTION_TYPE["CAS_LOGIN_REQUESTED"] = "auth/CAS_LOGIN_REQUESTED";
+    AUTH_ACTION_TYPE["LOGIN_REQUESTED"] = "auth/LOGIN_REQUESTED";
+    AUTH_ACTION_TYPE["LOG_OUT_REQUESTED"] = "auth/LOG_OUT_REQUESTED";
+    AUTH_ACTION_TYPE["TOKEN_REFRESH_FAILED"] = "auth/TOKEN_REFRESH_FAILED";
+    AUTH_ACTION_TYPE["LOGIN_FAILED"] = "auth/LOGIN_FAILED";
+})(AUTH_ACTION_TYPE = exports.AUTH_ACTION_TYPE || (exports.AUTH_ACTION_TYPE = {}));
+var AUTH_TOKEN_ACTION_TYPE;
+(function (AUTH_TOKEN_ACTION_TYPE) {
+    AUTH_TOKEN_ACTION_TYPE["AUTH_INITIALIZED"] = "auth/INITIALIZED";
+})(AUTH_TOKEN_ACTION_TYPE = exports.AUTH_TOKEN_ACTION_TYPE || (exports.AUTH_TOKEN_ACTION_TYPE = {}));
+var AUTH_TOKEN_SUCCESS_ACTION_TYPE;
+(function (AUTH_TOKEN_SUCCESS_ACTION_TYPE) {
+    AUTH_TOKEN_SUCCESS_ACTION_TYPE["GET_TOKEN_SUCCEEDED"] = "auth/GET_TOKEN_SUCCEEDED";
+    AUTH_TOKEN_SUCCESS_ACTION_TYPE["TOKEN_REFRESH_SUCCEEDED"] = "auth/TOKEN_REFRESH_SUCCEEDED";
+})(AUTH_TOKEN_SUCCESS_ACTION_TYPE = exports.AUTH_TOKEN_SUCCESS_ACTION_TYPE || (exports.AUTH_TOKEN_SUCCESS_ACTION_TYPE = {}));
+var AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE;
+(function (AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE) {
+    AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE["IDENTITY_PROVIDER_LOGIN_REQUESTED"] = "auth/IDENTITY_PROVIDER_LOGIN_REQUESTED";
+})(AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE = exports.AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE || (exports.AUTH_IDENTITY_PROVIDER_REQUEST_ACTION_TYPE = {}));
+var AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE;
+(function (AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE) {
+    AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE["CAS_V1_LOGIN_REQUEST"] = "auth/CAS_V1_LOGIN_REQUEST";
+})(AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE = exports.AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE || (exports.AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE = {}));
+var AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE;
+(function (AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE) {
+    AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE["LOCAL_LOGIN_REQUEST"] = "auth/LOCAL_LOGIN_REQUEST";
+})(AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE = exports.AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE || (exports.AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE = {}));