studiokit-scaffolding-js 7.0.5-alpha.3.6 → 7.0.5

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

@@ -8,7 +8,7 @@ import { GuidComponentWrappedProps } from './GuidComponent';
 export interface CollectionComponentProps<TModel extends Model> extends CollectionCommonProps, GuidComponentWrappedProps, RouteComponentProps, CollectionReduxResponse<TModel> {
 }
 /** The props passed down to the `WrappedComponent`. */
-export interface CollectionComponentWrappedProps<TModel extends Model> extends CollectionCommonProps, GuidComponentWrappedProps, CollectionReduxResponse<TModel>, CollectionDerivedProps<TModel>, CollectionMethods, CollectionCommonState {
+export interface CollectionComponentWrappedProps<TModel extends Model> extends Omit<CollectionComponentProps<TModel>, keyof RouteComponentProps>, CollectionDerivedProps<TModel>, CollectionMethods, CollectionCommonState {
 }
 export declare function configureCollectionComponent<TModel extends Model, TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps & CollectionComponentWrappedProps<TModel>>, LoaderComponent?: ComponentType): {
     new (props: TOwnProps & CollectionComponentProps<TModel>): {
@@ -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 {}>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps & GuidComponentWrappedProps & RouteComponentProps<{}, import("react-router").StaticContext, unknown> & CollectionCommonProps) => CollectionReduxResponse<TModel>;
+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`.
  *
@@ -58,4 +58,4 @@ export declare const configureMapStateToProps: <TModel extends Model, TOwnProps
  * Can override at render time, e.g. `<C modelName="otherModel" />`.
  * @param LoaderComponent Component to use as the Loader. Defaults to `<Loading />`.
  */
-export default function collectionComponent<TModel extends Model, TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps & CollectionComponentWrappedProps<TModel>>, modelName: string, LoaderComponent?: ComponentType): ComponentClass<TOwnProps & CollectionCommonProps>;
+export default function collectionComponent<TModel extends Model, TOwnProps extends CollectionComponentWrappedProps<TModel>>(WrappedComponent: ComponentType<TOwnProps>, modelName: string, LoaderComponent?: ComponentType): ComponentClass<Omit<TOwnProps, keyof CollectionComponentWrappedProps<TModel>> & Partial<CollectionCommonProps>>;

package/lib/components/HOC/CollectionComponent.js

@@ -142,22 +142,20 @@ function configureCollectionComponent(WrappedComponent, LoaderComponent) {
             if (modelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED) {
                 return react_1.default.createElement(LoaderComponent, null);
             }
-            var wrappedProps = __assign(__assign({}, otherProps), { modelArray: this.getModelArray(this.props.model, this.props.guid), modelStatus: modelStatus, previousModelStatus: previousModelStatus, fetchingId: fetchingId, load: this.load, stopPeriodicLoad: this.stopPeriodicLoad, create: this.create, update: this.update, delete: this.delete });
-            return react_1.default.createElement(WrappedComponent, __assign({}, wrappedProps));
+            return (react_1.default.createElement(WrappedComponent, __assign({}, otherProps, { modelArray: this.getModelArray(this.props.model, this.props.guid), modelStatus: modelStatus, previousModelStatus: previousModelStatus, fetchingId: fetchingId, load: this.load, stopPeriodicLoad: this.stopPeriodicLoad, create: this.create, update: this.update, delete: this.delete })));
         };
         return CollectionComponent;
     }(react_1.Component));
 }
 exports.configureCollectionComponent = configureCollectionComponent;
 var configureMapStateToProps = function (modelName) { return function (state, ownProps) {
-    var _a = collection_1.selectCollectionFromState({
+    return collection_1.selectCollectionFromState({
         guid: ownProps.guid,
         modelName: ownProps.modelName || modelName,
         pathParams: ownProps.pathParams,
         routeMatchParams: ownProps.match.params,
         state: state
-    }), model = _a.model, remaining = __rest(_a, ["model"]);
-    return __assign(__assign({}, remaining), { model: model });
+    });
 }; };
 exports.configureMapStateToProps = configureMapStateToProps;
 /**

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

@@ -67,4 +67,4 @@ export declare function configureCollectionFirstItemComponent<TModel extends Mod
     };
     contextType?: React.Context<any> | undefined;
 };
-export default function collectionFirstItemComponent<TModel extends Model, TOwnProps extends {}>(wrappedComponent: ComponentType<TOwnProps & CollectionFirstItemComponentWrappedProps<TModel>>): ComponentClass<TOwnProps & CollectionComponentWrappedProps<TModel>>;
+export default function collectionFirstItemComponent<TModel extends Model, TOwnProps extends CollectionFirstItemComponentWrappedProps<TModel>>(wrappedComponent: ComponentType<TOwnProps>): ComponentClass<Omit<TOwnProps, keyof CollectionFirstItemComponentWrappedProps<TModel>> & CollectionComponentWrappedProps<TModel>>;

package/lib/components/HOC/CollectionFirstItemComponent.js

@@ -95,6 +95,7 @@ function configureCollectionFirstItemComponent(WrappedComponent) {
 }
 exports.configureCollectionFirstItemComponent = configureCollectionFirstItemComponent;
 function collectionFirstItemComponent(wrappedComponent) {
+    // @ts-ignore: Could not match inferred type from HOC
     return configureCollectionFirstItemComponent(wrappedComponent);
 }
 exports.default = collectionFirstItemComponent;

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 {}>(modelName: string) => (state: BaseReduxState, ownProps: TOwnProps & CollectionCommonProps & GuidComponentWrappedProps & RouteComponentProps<{}, import("react-router").StaticContext, unknown>) => CollectionItemReduxResponse<TModel>;
+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`.
  *
@@ -57,4 +57,4 @@ export declare const configureMapStateToProps: <TModel extends Model, TOwnProps
  * Can override at render time, e.g. `<C modelName="otherModel" />`.
  * @param LoaderComponent Component to use as the Loader. Defaults to `<Loading />`.
  */
-export default function collectionItemComponent<TModel extends Model, TOwnProps extends {}>(WrappedComponent: ComponentType<TOwnProps & CollectionItemComponentWrappedProps<TModel>>, modelName: string, LoaderComponent?: ComponentType): ComponentClass<TOwnProps & CollectionCommonProps>;
+export default function collectionItemComponent<TModel extends Model, TOwnProps extends CollectionItemComponentWrappedProps<TModel>>(WrappedComponent: ComponentType<TOwnProps>, modelName: string, LoaderComponent?: ComponentType): ComponentClass<Omit<TOwnProps, keyof CollectionItemComponentWrappedProps<TModel>> & Partial<CollectionCommonProps>>;

package/lib/components/HOC/CollectionItemComponent.js

@@ -146,14 +146,13 @@ function configureCollectionItemComponent(WrappedComponent, LoaderComponent) {
 }
 exports.configureCollectionItemComponent = configureCollectionItemComponent;
 var configureMapStateToProps = function (modelName) { return function (state, ownProps) {
-    var _a = collection_1.selectCollectionItemFromState({
+    return collection_1.selectCollectionItemFromState({
         guid: ownProps.guid,
         modelName: ownProps.modelName || modelName,
         pathParams: ownProps.pathParams,
         routeMatchParams: ownProps.match.params,
         state: state
-    }), model = _a.model, remaining = __rest(_a, ["model"]);
-    return __assign(__assign({}, remaining), { model: model });
+    });
 }; };
 exports.configureMapStateToProps = configureMapStateToProps;
 /**

package/lib/components/HOC/FullscreenModalComponent.js

@@ -134,6 +134,7 @@ function configureFullscreenModalComponent(WrappedComponent) {
         };
         FullscreenModalComponent.prototype.render = function () {
             var _a = this.props, contentLabel = _a.contentLabel, isTopOpenFullscreenModal = _a.isTopOpenFullscreenModal, onEntering = _a.onEntering, onExited = _a.onExited, _ = _a.isOpen, closeModal = _a.closeModal, guid = _a.guid, remainingProps = __rest(_a, ["contentLabel", "isTopOpenFullscreenModal", "onEntering", "onExited", "isOpen", "closeModal", "guid"]);
+            // do not pass ConnectedModalWrappedProps & GuidComponentWrappedProps to wrapped component
             var wrappedProps = __assign(__assign({}, remainingProps), { closeModal: this.closeModal });
             var isOpen = this.state.isOpen;
             return (react_1.default.createElement(react_modal_1.default, { isOpen: isOpen, contentLabel: contentLabel, style: {

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

@@ -107,5 +107,5 @@ export declare class UserRoles extends Component<UserRolesProps, UserRolesState>
     render(): React.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, "guid" | "ref" | "modelName" | "pathParams" | "queryParams" | "externalProviders" | "model" | "key" | "readOnly" | "entityName" | "load" | "disableAutoLoad" | "disableAutoLoadOnParamsChange" | "modelStatus" | "previousModelStatus" | "fetchingId" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "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" | "disableAutoLoad" | "disableAutoLoadOnParamsChange" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "modelStatus" | "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/utils/collection.js

@@ -160,7 +160,21 @@ function createCollectionItem(model, config, params) {
     if (model.id) {
         throw new Error('model already exists');
     }
-    createItemInCollection(config, params);
+    var guid = config.guid, modelName = config.modelName, pathParams = config.pathParams, configQueryParams = config.queryParams, changeModelStatus = config.changeModelStatus;
+    var body = params.body, contentType = params.contentType, queryParams = params.queryParams;
+    if (pathParams && pathParams.length < route_1.getMinRequiredPathParamsCount(modelName)) {
+        throw new Error('pathParams length does not match length of path components');
+    }
+    changeModelStatus(constants_1.MODEL_STATUS.CREATING);
+    actionCreator_1.dispatchModelFetchRequest({
+        modelName: modelName,
+        guid: guid,
+        method: 'POST',
+        body: body,
+        pathParams: pathParams,
+        contentType: contentType,
+        queryParams: queryParams || configQueryParams
+    });
 }
 exports.createCollectionItem = createCollectionItem;
 //#endregion Create

package/package.json

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