@steroidsjs/bootstrap 3.0.0-beta.110 → 3.0.0-beta.111

package/content/CalendarSystem/CalendarSystemModalView.js

@@ -11,18 +11,17 @@ var form_1 = require("@steroidsjs/core/ui/form");
 var Text_1 = __importDefault(require("@steroidsjs/core/ui/typography/Text/Text"));
 var react_1 = __importDefault(require("react"));
 var useBem_1 = __importDefault(require("@steroidsjs/core/hooks/useBem"));
-var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 function CalendarSystemModalView(props) {
     var bem = (0, useBem_1["default"])('CalendarSystemModalView');
     var eventInitialValues = react_1["default"].useMemo(function () { return props.eventInitialValues; }, [props.eventInitialValues]);
     var callOnEventSubmit = function (fields) {
-        return eventInitialValues ? props.onEventSubmit(fields, eventInitialValues) : props.onEventSubmit(fields);
+        return eventInitialValues && !props.isCreate ? props.onEventSubmit(fields, eventInitialValues) : props.onEventSubmit(fields);
     };
-    return (react_1["default"].createElement(Modal_1["default"], { title: eventInitialValues ? __('Редактирование события') : __('Новое событие'), onClose: props.onClose, className: bem.block(), shouldCloseOnEsc: true, shouldCloseOnOverlayClick: true },
+    return (react_1["default"].createElement(Modal_1["default"], { title: props.isCreate ? __('Новое событие') : __('Редактирование события'), onClose: props.onClose, className: bem.block(), shouldCloseOnEsc: true, shouldCloseOnOverlayClick: true },
         react_1["default"].createElement(form_1.Form, { className: bem.element('default-form'), onSubmit: function (fields) {
                 callOnEventSubmit(fields);
                 props.onClose();
-            }, initialValues: eventInitialValues !== null && eventInitialValues !== void 0 ? eventInitialValues : null, submitLabel: (0, isEmpty_1["default"])(eventInitialValues) ? __('Создать') : __('Сохранить') },
+            }, initialValues: eventInitialValues !== null && eventInitialValues !== void 0 ? eventInitialValues : null, submitLabel: props.isCreate ? __('Создать') : __('Сохранить') },
             react_1["default"].createElement("div", null,
                 react_1["default"].createElement(Text_1["default"], { content: __('Наименование'), className: bem.element('label') }),
                 react_1["default"].createElement(form_1.InputField, { attribute: 'title', required: true, className: bem.element('name-field') }),

package/content/CalendarSystem/MonthGrid/MonthGrid.d.ts

@@ -7,7 +7,7 @@ interface IMonthGridProps {
     getEventsFromDate: (dateFromDay: Date, currentCalendarType: CalendarEnum) => IEvent[];
     weekDays: string[];
     openEditModal: (event: IEvent) => void;
-    openCreateModal: () => void;
+    openCreateModal: (eventInitialDay?: IDay) => void;
 }
 declare function MonthGrid(props: IMonthGridProps): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof MonthGrid>;

package/content/CalendarSystem/MonthGrid/views/MonthDay/MonthDay.d.ts

@@ -5,7 +5,7 @@ interface IMonthDayProps {
     day: IDay;
     getEventsFromDate: (dateFromDay: Date, currentCalendarType: CalendarEnum) => IEvent[];
     openEditModal: (event: IEvent) => void;
-    openCreateModal: () => void;
+    openCreateModal: (eventInitialDay?: IDay) => void;
 }
 export default function MonthDay(props: IMonthDayProps): JSX.Element;
 export {};

package/content/CalendarSystem/MonthGrid/views/MonthDay/MonthDay.js

@@ -21,6 +21,7 @@ var slice_1 = __importDefault(require("lodash-es/slice"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var form_1 = require("@steroidsjs/core/ui/form");
 var useExpandClickAway_1 = __importDefault(require("@steroidsjs/core/ui/content/CalendarSystem/hooks/useExpandClickAway"));
+var cloneDeep_1 = __importDefault(require("lodash-es/cloneDeep"));
 var getFormattedExpandLabel_1 = require("../../../../../utils/getFormattedExpandLabel");
 require("./MonthDay.scss");
 var SIXTH_ELEMENT_INDEX = 6;
@@ -51,13 +52,16 @@ function MonthDay(props) {
         var requiredEvent = events.filter(function (hourEvent) { return hourEvent.id === Number(eventId); })[0];
         props.openEditModal(requiredEvent);
     }, [events, props]);
+    var handleOnContextMenuCreateClick = react_1["default"].useCallback(function (e) {
+        e.preventDefault();
+        var day = (0, cloneDeep_1["default"])(props.day);
+        day.date.setHours(0, 0, 0, 0);
+        props.openCreateModal(day);
+    }, [props]);
     return (react_1["default"].createElement("div", { className: bem(bem.block({
             outOfRange: day.outOfRange,
             isToday: day.isToday
-        })), ref: monthDayRef, onClick: handleEventClick, onContextMenu: function (e) {
-            e.preventDefault();
-            props.openCreateModal();
-        } },
+        })), ref: monthDayRef, onClick: handleEventClick, onContextMenu: handleOnContextMenuCreateClick },
         react_1["default"].createElement("div", { className: bem.element('wrapper') },
             react_1["default"].createElement("span", { className: bem.element('number') }, day.dayNumber.toString()),
             react_1["default"].createElement("div", { className: bem.element('content', {

package/content/CalendarSystem/WeekGrid/WeekGrid.d.ts

@@ -6,7 +6,7 @@ interface IWeekGridProps {
     allHours: string[];
     getEventsFromDate: (dateFromDay: Date, isMonth: boolean) => IEvent[];
     openEditModal: (event: IEvent) => void;
-    openCreateModal: () => void;
+    openCreateModal: (eventInitialDay?: IDay) => void;
 }
 declare function WeekGrid(props: IWeekGridProps): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof WeekGrid>;

package/content/CalendarSystem/WeekGrid/views/WeekHour/WeekHour.d.ts

@@ -6,7 +6,7 @@ interface IWeekHourProps {
     getEventsFromDate: (dateFromDay: Date, currentCalendarType: CalendarEnum) => IEvent[];
     hour: string;
     openEditModal: (event: IEvent) => void;
-    openCreateModal: () => void;
+    openCreateModal: (eventInitialDay?: IDay) => void;
 }
 export default function WeekHour(props: IWeekHourProps): JSX.Element;
 export {};

package/content/CalendarSystem/WeekGrid/views/WeekHour/WeekHour.js

@@ -22,6 +22,7 @@ var slice_1 = __importDefault(require("lodash-es/slice"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var Tooltip_1 = __importDefault(require("@steroidsjs/core/ui/layout/Tooltip/Tooltip"));
 var useExpandClickAway_1 = __importDefault(require("@steroidsjs/core/ui/content/CalendarSystem/hooks/useExpandClickAway"));
+var cloneDeep_1 = __importDefault(require("lodash-es/cloneDeep"));
 var getFormattedExpandLabel_1 = require("../../../../../utils/getFormattedExpandLabel");
 require("./WeekHour.scss");
 var FOURTH_ELEMENT_INDEX = 3;
@@ -59,16 +60,19 @@ function WeekHour(props) {
         var requiredEvent = events.filter(function (hourEvent) { return hourEvent.id === Number(eventId); })[0];
         props.openEditModal(requiredEvent);
     }, [events, props]);
+    var handleOnContextMenuCreateClick = react_1["default"].useCallback(function (e) {
+        e.preventDefault();
+        var day = (0, cloneDeep_1["default"])(props.dayOfWeek);
+        day.date.setHours(Number((0, calendar_1.convertDate)(props.hour, 'HH:mm', 'H')), 0, 0, 0);
+        props.openCreateModal(day);
+    }, [props]);
     return (react_1["default"].createElement("div", { className: bem.element('hour', {
             isToday: props.dayOfWeek.isToday,
             hasOneEvent: hasOneEvent,
             hasTwoEvents: hasTwoEvents,
             hasTreeEvents: hasTreeEvents,
             isExpanded: isExpanded
-        }), ref: weekHourRef, onClick: handleEventClick, onContextMenu: function (e) {
-            e.preventDefault();
-            props.openCreateModal();
-        } },
+        }), ref: weekHourRef, onClick: handleEventClick, onContextMenu: handleOnContextMenuCreateClick },
         events.map(renderEvent),
         hasMoreThanFourEvents && !isExpanded && (react_1["default"].createElement(form_1.Button, { link: true, className: bem.element('expand-button'), onClick: function () { return setIsExpanded(true); } }, formattedExpandLabel))));
 }

package/content/Kanban/views/KanbanModal/views/CreateOrEditTaskModalContent/CreateOrEditTaskModalContentView.js

@@ -45,7 +45,7 @@ function CreateOrEditTaskModalContentView(props) {
     }); }); }, []);
     return (react_1["default"].createElement(form_1.Form, { formId: props.formId, className: props.bem.element('form'), initialValues: props.task
             ? {
-                columnId: props.columnId || '',
+                columnId: props.columnId || null,
                 title: props.task.title || '',
                 description: props.task.description || '',
                 fullDescription: props.task.fullDescription || '',
@@ -53,7 +53,9 @@ function CreateOrEditTaskModalContentView(props) {
                 priority: ((_b = props.task.priority) === null || _b === void 0 ? void 0 : _b.id) || null,
                 assigner: ((_c = props.task.assigner) === null || _c === void 0 ? void 0 : _c.id) || null
             }
-            : {}, onSubmit: function (data) {
+            : {
+                columnId: props.columnId || null
+            }, onSubmit: function (data) {
             var _a;
             props.onSubmit((_a = props.task) === null || _a === void 0 ? void 0 : _a.id, data, props.columnId);
         }, useRedux: true },
@@ -64,7 +66,7 @@ function CreateOrEditTaskModalContentView(props) {
                     react_1["default"].createElement(form_1.InputField, { attribute: "title", size: "md", showClear: true, required: true, outline: true }),
                     react_1["default"].createElement("div", { className: props.bem.element('sub-right') },
                         react_1["default"].createElement(Label_1["default"], { className: props.bem.element('label'), content: __('Переместить в') }),
-                        react_1["default"].createElement(form_1.DropDownField, { attribute: 'columnId', selectedIds: [props.columnId], items: columns, size: "md", outline: true })))),
+                        react_1["default"].createElement(form_1.DropDownField, { attribute: 'columnId', items: columns, size: "md", required: true, outline: true })))),
             react_1["default"].createElement("div", { className: props.bem.element('row') },
                 react_1["default"].createElement(Label_1["default"], { className: props.bem.element('label'), content: __('Описание') }),
                 react_1["default"].createElement("div", { className: props.bem.element('right', 'column') },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steroidsjs/bootstrap",
-    "version": "3.0.0-beta.110",
+    "version": "3.0.0-beta.111",
     "description": "",
     "main": "index.js",
     "author": "Vladimir Kozhin <hello@kozhindev.com>",
@@ -37,7 +37,7 @@
         "react-use": "^17.4.0"
     },
     "devDependencies": {
-        "@steroidsjs/core": "^3.0 || >=3.0.0-beta.94",
+        "@steroidsjs/core": "^3.0 || >=3.0.0-beta.96",
         "@steroidsjs/eslint-config": "^2.1.4",
         "@types/enzyme": "^3.10.8",
         "@types/googlemaps": "^3.43.3",