@steroidsjs/core 2.2.70 → 2.2.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.70",
+  "version": "2.2.73",
   "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');
                     }
                 });
             }); }

package/ui/form/RadioListField/RadioListField.js

@@ -17,15 +17,18 @@ exports.__esModule = true;
 var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../../form/Field/fieldWrapper"));
+var react_use_1 = require("react-use");
+var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
 function RadioListField(props) {
     var components = hooks_1.useComponents();
+    var inputSelectedIds = react_1.useMemo(function () { return props.selectedIds || [].concat(props.input.value || []); }, [props.input.value, props.selectedIds]);
     // Data provider
     var items = hooks_1.useDataProvider({
         items: props.items
     }).items;
     // Data select
     var _a = hooks_1.useDataSelect({
-        selectedIds: props.selectedIds,
+        selectedIds: inputSelectedIds,
         selectFirst: props.selectFirst,
         primaryKey: props.primaryKey,
         items: items,
@@ -36,10 +39,14 @@ function RadioListField(props) {
     }, [setSelectedIds]);
     var inputProps = react_1.useMemo(function () { return (__assign(__assign({}, props.inputProps), { type: 'radio', name: props.input.name, disabled: props.disabled, onChange: function (value) { return props.input.onChange(value); } })); }, [props.disabled, props.input, props.inputProps]);
     // Sync with form
+    var prevSelectedIds = react_use_1.usePrevious(selectedIds);
     react_1.useEffect(function () {
-        var _a;
-        props.input.onChange.call(null, selectedIds[0]);
-        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(null, selectedIds[0]);
+        if (!isEqual_1["default"](prevSelectedIds || [], selectedIds)) {
+            props.input.onChange.call(null, selectedIds[0]);
+            if (props.onChange) {
+                props.onChange.call(null, selectedIds[0]);
+            }
+        }
     }, [props.input.onChange, selectedIds]);
     return components.ui.renderView(props.view || 'form.RadioListFieldView', __assign(__assign({}, props), { items: items,
         inputProps: inputProps,