@steroidsjs/core 3.0.39 → 3.0.40

package/docs-autogen-result.json

@@ -7637,6 +7637,15 @@
                     "example": null,
                     "defaultValue": null
                 },
+                {
+                    "name": "calendarDatesFormData",
+                    "decorators": [],
+                    "description": "Данные для формы с текущими датами календаря",
+                    "required": false,
+                    "type": "{dateFromAttribute: string, dateToAttribute: string, formId: string}",
+                    "example": null,
+                    "defaultValue": null
+                },
                 {
                     "name": "calendarModalProps",
                     "decorators": [],
@@ -7678,7 +7687,7 @@
                     "decorators": [],
                     "description": "Параметры для групп событий",
                     "required": true,
-                    "type": "{eventGroups: IEventGroup[], title: string}",
+                    "type": "{canAddedEventGroups: boolean, eventGroups: IEventGroup[], title: string}",
                     "example": null,
                     "defaultValue": null
                 },
@@ -7755,6 +7764,24 @@
                             "example": null
                         }
                     ]
+                },
+                {
+                    "name": "onEventClick",
+                    "decorators": [],
+                    "description": "Функция, которая вызывается по клику на событие",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": [
+                        {
+                            "name": "event",
+                            "decorators": [],
+                            "description": "",
+                            "required": true,
+                            "type": "Record",
+                            "example": null
+                        }
+                    ]
                 }
             ]
         },
@@ -7802,6 +7829,14 @@
                     "type": "default",
                     "example": null
                 },
+                {
+                    "name": "canAddedEventGroups",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "boolean",
+                    "example": null
+                },
                 {
                     "name": "children",
                     "decorators": [],
@@ -8214,7 +8249,7 @@
                     "decorators": [],
                     "description": "Идентификатор",
                     "required": true,
-                    "type": "number",
+                    "type": "string | number",
                     "example": null
                 },
                 {

package/en.json

@@ -994,6 +994,7 @@
     "Сохранение в localStorage уровней вложенности.": "",
     "Дополнительные свойства для списка календарей бокового календаря": "",
     "Дополнительные свойства для бокового календаря": "",
+    "Данные для формы с текущими датами календаря": "",
     "Свойства для сетки дня": "",
     "Свойства для сетки месяца": "",
     "Свойства для сетки недели": "",

package/package.json

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

package/ui/content/CalendarSystem/CalendarSystem.d.ts

@@ -59,7 +59,7 @@ export interface IEventGroup {
     /**
     * Идентификатор
     */
-    id: number;
+    id: number | string;
     /**
     * Название группы
     */
@@ -120,6 +120,10 @@ export interface ICalendarSystemProps extends IUiComponent {
         * Группы событий
         */
         eventGroups: IEventGroup[];
+        /**
+        * Можно ли добавлять группы событий в календарь
+        */
+        canAddedEventGroups?: boolean;
     };
     /**
     * Свойства для сетки дня
@@ -150,12 +154,25 @@ export interface ICalendarSystemProps extends IUiComponent {
      * Дочерние элементы
      */
     children?: React.ReactNode;
+    /**
+     * Функция, которая вызывается по клику на событие
+     */
+    onEventClick?: (event: Record<string, any>) => void;
+    /**
+     * Данные для формы с текущими датами календаря
+     */
+    calendarDatesFormData?: {
+        formId: string;
+        dateFromAttribute?: string;
+        dateToAttribute?: string;
+    };
     [key: string]: any;
 }
 export interface ICalendarSystemViewProps extends Pick<ICalendarSystemProps, 'className' | 'style' | 'additionalViewProps' | 'users' | 'asideCalendarProps' | 'asideCalendarCheckboxListProps'> {
     onCalendarChangedMonth: (newDate: Date) => void;
     eventGroups: IEventGroup[];
     eventGroupsTitle: string;
+    canAddedEventGroups?: boolean;
     onChangeEventGroupsIds: (selectedIds: number[]) => void;
     openCreateEventGroupModal: VoidFunction;
     dateToDisplay: string;

package/ui/content/CalendarSystem/CalendarSystem.js

@@ -36,6 +36,7 @@ function CalendarSystem(props) {
         additionalViewProps: props.additionalViewProps,
         users: calendarSystem.users,
         eventGroupsTitle: props.eventBlock.title,
+        canAddedEventGroups: props.eventBlock.canAddedEventGroups,
         asideCalendarProps: props.asideCalendarProps,
         asideCalendarCheckboxListProps: props.asideCalendarCheckboxListProps,
         children: props.children,
@@ -49,11 +50,11 @@ function CalendarSystem(props) {
         handleCalendarTypeChange: calendarSystem.handleCalendarTypeChange,
         onClickControl: calendarSystem.onClickControl,
         getEventsFromDate: calendarSystem.getEventsFromDate,
-        openEditModal: calendarSystem.openEditModal,
+        openEditModal: props.onEventClick || calendarSystem.openEditModal,
         monthGridProps: __assign({ monthGridWeekDays: calendarSystem.monthGridWeekDays, monthGridCalendarDays: calendarSystem.monthGridCalendarDays }, monthGridViews),
         weekGridProps: __assign({ weekGridTwentyFourHoursArray: calendarSystem.weekGridTwentyFourHoursArray, weekGridCurrentWeekDays: calendarSystem.weekGridCurrentWeekDays }, weekGridViews),
         dayGridProps: __assign({ dayGridTwentyFourHoursArray: calendarSystem.dayGridTwentyFourHoursArray, dayGridCurrentDay: calendarSystem.dayGridCurrentDay }, dayGridViews)
-    }); }, [props.className, props.style, props.additionalViewProps, props.eventBlock.title, props.asideCalendarProps, props.asideCalendarCheckboxListProps, props.children, calendarSystem, monthGridViews, weekGridViews, dayGridViews]);
+    }); }, [props.className, props.style, props.additionalViewProps, props.eventBlock.title, props.eventBlock.canAddedEventGroups, props.asideCalendarProps, props.asideCalendarCheckboxListProps, props.children, props.onEventClick, calendarSystem, monthGridViews, weekGridViews, dayGridViews]);
     return components.ui.renderView(props.view || 'content.CalendarSystemView', viewProps);
 }
 exports["default"] = CalendarSystem;

package/ui/content/CalendarSystem/helpers/addEventIfMatchDate.d.ts

@@ -1,3 +1,3 @@
 import dayjs from 'dayjs';
 import { IEventGroup, IEvent } from '../CalendarSystem';
-export declare const addEventIfMatchDate: (eventDateDayJs: dayjs.Dayjs, sourceDateInDayJs: dayjs.Dayjs, calendarGroup: IEventGroup, originalEvent: IEvent, unit: 'hours' | 'day', selectedEventGroupsIds: number[], resultEventsOnDate: IEvent[]) => void;
+export declare const addEventIfMatchDate: (eventDateDayJs: dayjs.Dayjs, sourceDateInDayJs: dayjs.Dayjs, calendarGroup: IEventGroup, originalEvent: IEvent, unit: 'hours' | 'day', selectedEventGroupsIds: Array<number | string>, resultEventsOnDate: IEvent[]) => void;

package/ui/content/CalendarSystem/hooks/useCalendarSystem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ICalendarSystemProps, ICalendarUser, IEventGroup } from '../CalendarSystem';
-import CalendarEnum from '../enums/CalendarType';
+import CalendarType from '../enums/CalendarType';
 export declare const useCalendarSystem: (props: ICalendarSystemProps) => {
     monthGridWeekDays: any;
     monthGridCalendarDays: import("../CalendarSystem").IDay[];
@@ -16,11 +16,11 @@ export declare const useCalendarSystem: (props: ICalendarSystemProps) => {
     dayGridCurrentDay: import("../CalendarSystem").IDay;
     dateToDisplay: any;
     innerEventGroups: IEventGroup[];
-    calendarType: CalendarEnum;
+    calendarType: CalendarType;
     users: ICalendarUser[];
     setSelectedEventGroupsIds: React.Dispatch<React.SetStateAction<number[]>>;
     handleCalendarTypeChange: (newType: string) => void;
-    getEventsFromDate: (dateFromDay: Date, currentCalendarType: CalendarEnum) => import("../CalendarSystem").IEvent[];
+    getEventsFromDate: (dateFromDay: Date, currentCalendarType: CalendarType) => import("../CalendarSystem").IEvent[];
     onCalendarChangedMonth: (newDate: Date) => void;
     openCreateEventGroupModal: () => void;
     openEditModal: (event: import("../CalendarSystem").IEvent) => void;

package/ui/content/CalendarSystem/hooks/useCalendarSystem.js

@@ -27,11 +27,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.useCalendarSystem = void 0;
+/* eslint-disable default-case */
 var react_1 = __importStar(require("react"));
+var react_use_1 = require("react-use");
+var react_redux_1 = require("react-redux");
+var last_1 = __importDefault(require("lodash-es/last"));
+var head_1 = __importDefault(require("lodash-es/head"));
 var useDisplayDate_1 = __importDefault(require("./useDisplayDate"));
 var useDayGrid_1 = require("./useDayGrid");
 var useCalendarType_1 = require("./useCalendarType");
-var CalendarType_1 = __importDefault(require("../enums/CalendarType"));
 var useMonthGrid_1 = __importDefault(require("./useMonthGrid"));
 var useWeekGrid_1 = __importDefault(require("./useWeekGrid"));
 var useCalendarControls_1 = __importDefault(require("./useCalendarControls"));
@@ -40,12 +44,24 @@ var useCalendarSystemEventGroupModals_1 = require("./useCalendarSystemEventGroup
 var useEventsFromDate_1 = require("./useEventsFromDate");
 var DisplayDateFormatType_1 = __importDefault(require("../enums/DisplayDateFormatType"));
 var utils_1 = require("../utils/utils");
+var form_1 = require("../../../../actions/form");
+var CalendarType_1 = __importDefault(require("../enums/CalendarType"));
+var DEFAULT_DATE_FROM_ATTRIBUTE = 'dateFrom';
+var DEFAULT_DATE_TO_ATTRIBUTE = 'dateTo';
 var useCalendarSystem = function (props) {
-    var _a = react_1["default"].useState(props.eventBlock.eventGroups || []), innerEventGroups = _a[0], setInnerEventGroups = _a[1];
-    var _b = react_1["default"].useState([]), selectedEventGroupsIds = _b[0], setSelectedEventGroupsIds = _b[1];
-    var _c = (0, react_1.useState)(props.users), users = _c[0], setUsers = _c[1];
+    var _a, _b;
+    var dispatch = (0, react_redux_1.useDispatch)();
+    var _c = react_1["default"].useState(props.eventBlock.eventGroups || []), innerEventGroups = _c[0], setInnerEventGroups = _c[1];
+    var _d = react_1["default"].useState([]), selectedEventGroupsIds = _d[0], setSelectedEventGroupsIds = _d[1];
+    var _e = (0, react_1.useState)(props.users), users = _e[0], setUsers = _e[1];
+    react_1["default"].useEffect(function () {
+        setInnerEventGroups(props.eventBlock.eventGroups);
+    }, [props.eventBlock.eventGroups]);
+    react_1["default"].useEffect(function () {
+        setUsers(props.users);
+    }, [props.users]);
     //Главная дата, от которой происходят все вычисления
-    var _d = react_1["default"].useState((0, utils_1.getFormattedDay)()), generalCurrentDay = _d[0], setGeneralCurrentDay = _d[1];
+    var _f = react_1["default"].useState((0, utils_1.getFormattedDay)()), generalCurrentDay = _f[0], setGeneralCurrentDay = _f[1];
     var isGeneralCurrentDayNeedsUpdate = (0, react_1.useRef)(true);
     var updateGeneralCurrentDay = (0, react_1.useCallback)(function (newDate) {
         if (!isGeneralCurrentDayNeedsUpdate.current) {
@@ -57,21 +73,59 @@ var useCalendarSystem = function (props) {
     var onCalendarChangedMonth = react_1["default"].useCallback(function (newDate) {
         updateGeneralCurrentDay(newDate);
     }, [updateGeneralCurrentDay]);
-    var _e = (0, useDisplayDate_1["default"])(generalCurrentDay), dateToDisplay = _e.dateToDisplay, changeDisplayFormat = _e.changeDisplayFormat;
-    var _f = (0, useMonthGrid_1["default"])(generalCurrentDay), monthGridWeekDays = _f.monthGridWeekDays, monthGridCalendarDays = _f.monthGridCalendarDays;
-    var _g = (0, useWeekGrid_1["default"])(generalCurrentDay), weekGridTwentyFourHoursArray = _g.weekGridTwentyFourHoursArray, weekGridCurrentWeekDays = _g.weekGridCurrentWeekDays;
-    var _h = (0, useDayGrid_1.useDayGrid)(generalCurrentDay), dayGridTwentyFourHoursArray = _h.dayGridTwentyFourHoursArray, dayGridCurrentDay = _h.dayGridCurrentDay;
-    var _j = (0, useCalendarType_1.useCalendarType)(function (newType) {
+    var _g = (0, useDisplayDate_1["default"])(generalCurrentDay), dateToDisplay = _g.dateToDisplay, changeDisplayFormat = _g.changeDisplayFormat;
+    var _h = (0, useMonthGrid_1["default"])(generalCurrentDay), monthGridWeekDays = _h.monthGridWeekDays, monthGridCalendarDays = _h.monthGridCalendarDays;
+    var _j = (0, useWeekGrid_1["default"])(generalCurrentDay), weekGridTwentyFourHoursArray = _j.weekGridTwentyFourHoursArray, weekGridCurrentWeekDays = _j.weekGridCurrentWeekDays;
+    var _k = (0, useDayGrid_1.useDayGrid)(generalCurrentDay), dayGridTwentyFourHoursArray = _k.dayGridTwentyFourHoursArray, dayGridCurrentDay = _k.dayGridCurrentDay;
+    var _l = (0, useCalendarType_1.useCalendarType)(function (newType) {
         if (newType === CalendarType_1["default"].DAY) {
             changeDisplayFormat(DisplayDateFormatType_1["default"].DAY);
             return;
         }
         changeDisplayFormat(DisplayDateFormatType_1["default"].DEFAULT);
-    }), calendarType = _j.calendarType, handleCalendarTypeChange = _j.handleCalendarTypeChange;
+    }), calendarType = _l.calendarType, handleCalendarTypeChange = _l.handleCalendarTypeChange;
     var onClickControl = (0, useCalendarControls_1["default"])(calendarType, generalCurrentDay, setGeneralCurrentDay, isGeneralCurrentDayNeedsUpdate).onClickControl;
-    var _k = (0, useCalendarSystemModals_1["default"])(props.calendarModalProps, innerEventGroups, setInnerEventGroups, users, setUsers), openCreateModal = _k.openCreateModal, openEditModal = _k.openEditModal;
+    var _m = (0, useCalendarSystemModals_1["default"])(props.calendarModalProps, innerEventGroups, setInnerEventGroups, users, setUsers), openCreateModal = _m.openCreateModal, openEditModal = _m.openEditModal;
     var openCreateEventGroupModal = (0, useCalendarSystemEventGroupModals_1.useCalendarSystemEventGroupModals)(innerEventGroups, setInnerEventGroups, props.eventGroupModalProps).openCreateEventGroupModal;
     var getEventsFromDate = (0, useEventsFromDate_1.useEventsFromDate)(innerEventGroups, selectedEventGroupsIds).getEventsFromDate;
+    // save dateTo and dateFrom in redux
+    var dateFromAttribute = ((_a = props.calendarDatesFormData) === null || _a === void 0 ? void 0 : _a.dateFromAttribute) || DEFAULT_DATE_FROM_ATTRIBUTE;
+    var dateToAttribute = ((_b = props.calendarDatesFormData) === null || _b === void 0 ? void 0 : _b.dateToAttribute) || DEFAULT_DATE_TO_ATTRIBUTE;
+    (0, react_use_1.useMount)(function () {
+        var _a;
+        if (props.calendarDatesFormData) {
+            dispatch((0, form_1.formInitialize)(props.calendarDatesFormData.formId, (_a = {},
+                _a[dateFromAttribute] = null,
+                _a[dateToAttribute] = null,
+                _a)));
+        }
+    });
+    react_1["default"].useEffect(function () {
+        var _a;
+        if (props.calendarDatesFormData) {
+            var currentDateArray = calendarType === CalendarType_1["default"].MONTH
+                ? monthGridCalendarDays
+                : weekGridCurrentWeekDays;
+            var newFormValues = (_a = {},
+                _a[dateFromAttribute] = (0, head_1["default"])(currentDateArray).date,
+                _a[dateToAttribute] = (0, last_1["default"])(currentDateArray).date,
+                _a);
+            if (calendarType === CalendarType_1["default"].DAY) {
+                newFormValues[dateFromAttribute] = dayGridCurrentDay.date;
+                newFormValues[dateToAttribute] = dayGridCurrentDay.date;
+            }
+            dispatch((0, form_1.formChange)(props.calendarDatesFormData.formId, newFormValues));
+        }
+    }, [
+        calendarType,
+        dateFromAttribute,
+        dateToAttribute,
+        dayGridCurrentDay,
+        dispatch,
+        monthGridCalendarDays,
+        props.calendarDatesFormData,
+        weekGridCurrentWeekDays,
+    ]);
     return {
         monthGridWeekDays: monthGridWeekDays,
         monthGridCalendarDays: monthGridCalendarDays,

package/ui/content/CalendarSystem/hooks/useCalendarSystemModals.d.ts

@@ -6,7 +6,7 @@ declare const useCalendarSystemModals: (calendarModalProps: IModalProps, innerEv
     openEditModal: (event: IEvent) => void;
     getEventFromGroup: (event: IEvent) => IEventGroup;
     getModalProps: (isCreate: boolean, eventInitialValues?: Partial<IEvent & {
-        eventGroupId: number;
+        eventGroupId: number | string;
     }>) => ICalendarSystemModalViewProps;
 };
 export default useCalendarSystemModals;