@steroidsjs/core 2.2.71 → 2.2.74

package/package.json

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

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/DateField/useDateInputState.d.ts

@@ -36,9 +36,17 @@ export interface IDateInputStateInput extends IFieldWrapperInputProps {
      */
     valueFormat?: string;
     /**
-     * Использовать всемирное время (UTC) вместо местного для даты, отправляемой на сервер
+     * Приводить значение даты к часовому поясу UTC
+     * (пример: с бэкенда приходит дата в какой-либо временной зоне (не UTC), но нужно отбразить ее
+     * в часовом поясе UTC. В этом случае dateInUTC = false, а useUTC = true)
      */
     useUTC?: boolean;
+    /**
+     * Задано ли значение даты в часовом поясе UTC
+     * (пример: с бэкенда приходит дата в UTC, но нужно отбразить ее в локальном времени.
+     * В этом случае dateInUTC = true, а useUTC = false)
+     */
+    dateInUTC?: boolean;
 }
 export interface IDateInputStateOutput {
     /**

package/ui/form/DateField/useDateInputState.js

@@ -23,7 +23,7 @@ function useDateInputState(props) {
     var propsDisplayValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [
         props.valueFormat,
         props.displayFormat,
-    ], props.displayFormat, false, props.useUTC) || ''; }, [props.displayFormat, props.input.value, props.valueFormat]);
+    ], props.displayFormat, props.useUTC, props.dateInUTC) || ''; }, [props.displayFormat, props.input.value, props.valueFormat]);
     // Display value state
     var _a = react_1.useState(propsDisplayValue), displayValue = _a[0], setDisplayValue = _a[1];
     // Update display value on update props input value
@@ -41,7 +41,7 @@ function useDateInputState(props) {
     var onDisplayValueChange = react_1.useCallback(function (value) {
         value = value.replace(/[^0-9:. ]/g, '');
         setDisplayValue(value);
-        var parsedValue = calendar_1.convertDate(value, props.displayFormat, props.valueFormat, props.useUTC);
+        var parsedValue = calendar_1.convertDate(value, props.displayFormat, props.valueFormat, props.useUTC, props.dateInUTC);
         var newValue = parsedValue || !value ? parsedValue || null : false;
         if (newValue && newValue !== props.input.value) {
             props.input.onChange.call(null, newValue);
@@ -49,7 +49,7 @@ function useDateInputState(props) {
                 props.onChange.call(null, value);
             }
         }
-    }, [props.displayFormat, props.input.onChange, props.input.value, props.onChange, props.valueFormat, props.useUTC]);
+    }, [props.displayFormat, props.input.onChange, props.input.value, props.onChange, props.valueFormat, props.useUTC, props.dateInUTC]);
     // Dropdown opened state
     var _b = react_1.useState(false), isOpened = _b[0], setIsOpened = _b[1];
     // Focus/blur handlers

package/ui/form/DateField/useDateTime.d.ts

@@ -1,5 +1,5 @@
 import { IDateInputStateInput } from '../../form/DateField/useDateInputState';
-interface IUseDateTimeProps extends Pick<IDateInputStateInput, 'displayFormat' | 'valueFormat' | 'input' | 'useUTC'> {
+interface IUseDateTimeProps extends Pick<IDateInputStateInput, 'displayFormat' | 'valueFormat' | 'input' | 'useUTC' | 'dateInUTC'> {
     dateTimeSeparator: string;
 }
 /**

package/ui/form/DateField/useDateTime.js

@@ -13,16 +13,24 @@ var calendar_1 = require("../../../utils/calendar");
  */
 function useDateTime(props) {
     var _a = props.valueFormat.split(props.dateTimeSeparator), dateValueFormat = _a[0], timeValueFormat = _a[1];
-    var dateValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.valueFormat, props.displayFormat], dateValueFormat, false, props.useUTC); }, [dateValueFormat, props.displayFormat, props.input.value, props.valueFormat]);
-    var timeValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.displayFormat, props.valueFormat], timeValueFormat, false, props.useUTC); }, [props.displayFormat, props.input.value, props.valueFormat, timeValueFormat]);
+    var dateValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.valueFormat, props.displayFormat], dateValueFormat, props.useUTC, props.dateInUTC); }, [dateValueFormat, props.displayFormat, props.input.value, props.valueFormat]);
+    var timeValue = react_1.useMemo(function () { return calendar_1.convertDate(props.input.value, [props.displayFormat, props.valueFormat], timeValueFormat, props.useUTC, props.dateInUTC); }, [props.displayFormat, props.input.value, props.valueFormat, timeValueFormat]);
     // Handler for calendar and time picker changes
     var onDateSelect = react_1.useCallback(function (date) {
         var result = date + props.dateTimeSeparator + (timeValue || '00:00');
-        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, props.useUTC));
+        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, 
+        // converting to UTC here depends on whether the date is stored in UTC
+        props.dateInUTC, 
+        // whether the date provided from onSelect is in UTC or not depends on this flag
+        props.useUTC));
     }, [props.dateTimeSeparator, props.input.onChange, props.valueFormat, timeValue]);
     var onTimeSelect = react_1.useCallback(function (time) {
         var result = (dateValue || moment_1["default"]().format(dateValueFormat)) + props.dateTimeSeparator + time;
-        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, props.useUTC));
+        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, 
+        // converting to UTC here depends on whether the date is stored in UTC
+        props.dateInUTC, 
+        // whether the date provided from onSelect is in UTC or not depends on this flag
+        props.useUTC));
     }, [dateValue, dateValueFormat, props.dateTimeSeparator, props.input.onChange, props.valueFormat]);
     return {
         dateValue: dateValue,

package/ui/form/DateTimeField/DateTimeField.js

@@ -35,15 +35,16 @@ function DateTimeField(props) {
         placeholder: props.placeholder,
         valueFormat: props.valueFormat,
         displayFormat: props.displayFormat,
-        useUTC: props.useUTC
+        useUTC: props.useUTC,
+        dateInUTC: props.dateInUTC
     }), onClear = _a.onClear, onClose = _a.onClose, isOpened = _a.isOpened, inputProps = _a.inputProps;
-    console.log("DATETIME INPUT", inputProps);
     var _b = useDateTime_1["default"]({
         displayFormat: props.displayFormat,
         dateTimeSeparator: DATE_TIME_SEPARATOR,
         input: props.input,
         valueFormat: props.valueFormat,
-        useUTC: props.useUTC
+        useUTC: props.useUTC,
+        dateInUTC: props.dateInUTC
     }), dateValueFormat = _b.dateValueFormat, dateValue = _b.dateValue, timeValue = _b.timeValue, onDateSelect = _b.onDateSelect, onTimeSelect = _b.onTimeSelect;
     // Calendar props
     var calendarProps = react_1.useMemo(function () { return ({
@@ -72,6 +73,7 @@ DateTimeField.defaultProps = {
     className: '',
     displayFormat: 'DD.MM.YYYY' + DATE_TIME_SEPARATOR + 'HH:mm',
     valueFormat: 'YYYY-MM-DD' + DATE_TIME_SEPARATOR + 'HH:mm',
-    useUTC: true
+    useUTC: true,
+    dateInUTC: false
 };
 exports["default"] = fieldWrapper_1["default"]('DateTimeField', DateTimeField);

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,

package/ui/form/TimeField/TimeField.js

@@ -29,7 +29,8 @@ function TimeField(props) {
         placeholder: props.placeholder,
         valueFormat: props.valueFormat,
         displayFormat: props.displayFormat,
-        useUTC: props.useUTC
+        useUTC: props.useUTC,
+        dateInUTC: props.dateInUTC
     }), onNow = _a.onNow, onClear = _a.onClear, onClose = _a.onClose, isOpened = _a.isOpened, inputProps = _a.inputProps;
     var timePanelViewProps = react_1.useMemo(function () { return (__assign({ onNow: onNow,
         onClose: onClose, value: inputProps.value, onSelect: inputProps.onChange }, props.timePanelViewProps)); }, [inputProps.onChange, inputProps.value, onClose, onNow, props.timePanelViewProps]);
@@ -49,6 +50,7 @@ TimeField.defaultProps = {
     showRemove: true,
     type: 'text',
     valueFormat: 'HH:mm',
-    useUTC: true
+    useUTC: true,
+    dateInUTC: false
 };
 exports["default"] = fieldWrapper_1["default"]('TimeField', TimeField);