@steroidsjs/core 2.2.69 → 2.2.72

package/hooks/useDataProvider.js

@@ -117,21 +117,22 @@ function useDataProvider(config) {
     react_1.useEffect(function () {
         var fetchRemote = function (isAuto) { return __awaiter(_this, void 0, void 0, function () {
             var searchHandler, result, newItems;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         searchHandler = dataProvider.onSearch || (typeof dataProvider.action === 'function'
                             ? function (method, params) { return method(components.api, params).then(function (response) { return response.data; }); }
                             : function (method, params) { return components.http.send(dataProvider.actionMethod, method, params)
                                 .then(function (response) { return response.data; }); });
-                        result = searchHandler(dataProvider.action, __assign(__assign({ query: config.query }, (isAuto ? { ids: config.initialSelectedIds } : null)), config.dataProvider.params));
+                        result = searchHandler(dataProvider.action, __assign(__assign(__assign({ query: config.query }, (isAuto ? { ids: config.initialSelectedIds } : null)), (((_a = config.initialSelectedIds) === null || _a === void 0 ? void 0 : _a.length) > 0 ? { withIds: config.initialSelectedIds } : null)), config.dataProvider.params));
                         if (!(result && isFunction_1["default"](result.then))) return [3 /*break*/, 2];
                         setIsLoading(true);
                         return [4 /*yield*/, result];
                     case 1:
-                        newItems = _a.sent();
+                        newItems = _b.sent();
                         setIsLoading(false);
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         // Update items
                         newItems = data_1.normalizeItems(newItems);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.69",
+  "version": "2.2.72",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {

package/reducers/router.js

@@ -96,7 +96,9 @@ exports.buildUrl = buildUrl;
 var checkIsActive = function (state, item) {
     // Check is active
     var pathname = !process.env.IS_SSR && window.location.protocol === 'file:'
-        ? window.location.hash.replace(/^#/, '')
+        ? window.location.hash
+            .replace(/^#/, '')
+            .replace(/\?.*$/, '')
         : get_1["default"](state, 'location.pathname');
     var checkActive = function (subPathname, subItem) {
         var match = react_router_1.matchPath(subPathname, pick_1["default"](subItem, ['exact', 'strict', 'path']));

package/ui/crud/Crud/Crud.d.ts

@@ -34,6 +34,7 @@ export interface ICrudClickProps {
     record?: Record<string, unknown>;
     components: IComponents;
     goToAction: (nextAction: string) => any;
+    errorHandler?: (error: any, dispatch: any) => void;
 }
 export interface ICrudProps {
     crudId?: string;
@@ -56,6 +57,7 @@ export interface ICrudProps {
     form?: IFormProps | React.ReactNode;
     detail?: any;
     crudView?: CustomView;
+    errorHandler?: (error: any, dispatch: any) => void;
     [key: string]: any;
 }
 export interface ICrudChildrenProps extends ICrudProps, IConnectHocOutput, IComponentsHocOutput {

package/ui/crud/Crud/Crud.js

@@ -112,7 +112,8 @@ function Crud(props) {
         recordId: recordId,
         record: record,
         components: components,
-        goToAction: goToAction
+        goToAction: goToAction,
+        errorHandler: props.errorHandler
     }); }, [components, goToAction, props.crudId, props.mode, props.primaryKey, props.queryKey,
         props.restApi, props.restUrl, record, recordId, routeAction, routeId, routeParams]);
     // Handler for convert control item to props for button

package/ui/crud/Crud/utils.js

@@ -101,16 +101,23 @@ var normalizeItems = function (sourceItems, fromProps) {
                             return [4 /*yield*/, props.restApi["delete"](props.components.api, (_a = {}, _a[props.primaryKey] = props.recordId, _a))];
                         case 1:
                             _b.sent();
-                            return [3 /*break*/, 4];
+                            props.goToAction(exports.CRUD_ACTION_INDEX);
+                            return [2 /*return*/];
                         case 2:
                             if (!props.restUrl) return [3 /*break*/, 4];
-                            return [4 /*yield*/, props.components.http["delete"](props.restUrl + "/" + props.recordId)];
+                            return [4 /*yield*/, props.components.http["delete"](props.restUrl + "/" + props.recordId)
+                                    .then(function () { return props.goToAction(exports.CRUD_ACTION_INDEX); })["catch"](function (error) {
+                                    if (props.errorHandler) {
+                                        props.errorHandler(error, props.components.store.dispatch);
+                                    }
+                                    else {
+                                        throw error;
+                                    }
+                                })];
                         case 3:
                             _b.sent();
-                            _b.label = 4;
-                        case 4:
-                            props.goToAction(exports.CRUD_ACTION_INDEX);
                             return [2 /*return*/];
+                        case 4: throw new Error('Either restApi or restUrl must be set');
                     }
                 });
             }); }