@licklist/design 0.72.0-dev.0 → 0.72.0-dev.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts +2 -1
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts.map +1 -1
- package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.js +22 -4
- package/dist/events/edit-event-modal/utils/checkIfEventBooked.d.ts +5 -0
- package/dist/events/edit-event-modal/utils/checkIfEventBooked.d.ts.map +1 -0
- package/dist/events/edit-event-modal/utils/checkIfEventBooked.js +27 -0
- package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.d.ts +6 -1
- package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.d.ts.map +1 -1
- package/dist/events/edit-recurrent-event-modal/EditRecurrentEventModal.js +13 -4
- package/dist/events/event-card/EventCard.d.ts +2 -1
- package/dist/events/event-card/EventCard.d.ts.map +1 -1
- package/dist/events/event-card/EventCard.js +11 -2
- package/dist/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.js +2 -2
- package/dist/product-set/form/ProductsControl.js +1 -1
- package/dist/recurrence-input/RecurrenceInput.d.ts.map +1 -1
- package/dist/recurrence-input/RecurrenceInput.js +2 -2
- package/package.json +1 -1
- package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx +33 -2
- package/src/events/edit-event-modal/utils/checkIfEventBooked.ts +44 -0
- package/src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx +37 -9
- package/src/events/event-card/EventCard.tsx +15 -4
- package/src/iframe/order-process/components/BookingSummary/components/ProductSummary/ProductSummary.tsx +2 -2
- package/src/product-set/form/ProductsControl.tsx +1 -1
- package/src/recurrence-input/RecurrenceInput.tsx +1 -0
- package/yarn.lock +128 -127
|
@@ -38,6 +38,7 @@ export interface EditEventFormProps extends HasPermissionProp {
|
|
|
38
38
|
overrideNameError?: string;
|
|
39
39
|
disabledRecurrent?: boolean;
|
|
40
40
|
isCopyCreate?: boolean;
|
|
41
|
+
isBooked?: boolean;
|
|
41
42
|
}
|
|
42
|
-
export declare const EditEventForm: ({ disabled, categories, title, hasPermission, defaultEventValues, serverErrors, onSaveEvent, productSets, createProductSet, setEditProductSetId, isExternalPaymentLinkEnabled, timeZone, eventProductSet, overrideNameError, disabledRecurrent, isCopyCreate, }: EditEventFormProps) => import("react/jsx-runtime").JSX.Element;
|
|
43
|
+
export declare const EditEventForm: ({ disabled, categories, title, hasPermission, defaultEventValues, serverErrors, onSaveEvent, productSets, createProductSet, setEditProductSetId, isExternalPaymentLinkEnabled, timeZone, eventProductSet, overrideNameError, disabledRecurrent, isCopyCreate, isBooked, }: EditEventFormProps) => import("react/jsx-runtime").JSX.Element;
|
|
43
44
|
//# sourceMappingURL=EditEventForm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;
|
|
1
|
+
{"version":3,"file":"EditEventForm.d.ts","sourceRoot":"","sources":["../../../../../src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,EACN,MAAM,sDAAsD,CAAA;AAO7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAGtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAA;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAS5D,OAAO,EAAiB,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAKlF,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC9D,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAA;IACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAA;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;IACtB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;CACxC;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,EAAE,aAAa,EAAE,CAAA;IAC3B,KAAK,EAAE,MAAM,CAAA;IACb,kBAAkB,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,YAAY,CAAC,EAAE,WAAW,CAAA;IAC1B,WAAW,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAClD,WAAW,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;IACjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,gBAAgB,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAA;IACtD,mBAAmB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,4BAA4B,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,UAAU,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAOD,eAAO,MAAM,aAAa,8QAkBvB,kBAAkB,4CAiYpB,CAAA"}
|
|
@@ -11,6 +11,9 @@ import { useMultipleImages } from '@licklist/plugins/dist/hooks/Media/useMultipl
|
|
|
11
11
|
import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorService';
|
|
12
12
|
import { scrollToError } from '@licklist/plugins/dist/utils/ScrollUtils';
|
|
13
13
|
import { getFirstErrorKey } from '@licklist/plugins/dist/utils/FormValues';
|
|
14
|
+
import { ConfirmModal } from '../../../../modals/confirmation/ConfirmModal.js';
|
|
15
|
+
import { Dialog } from '../../../../modals/dialog/Dialog.js';
|
|
16
|
+
import { useDialogContext } from '../../../../modals/dialog/DialogContext.js';
|
|
14
17
|
import { SaleDeadline } from '../SaleDeadline/SaleDeadline.js';
|
|
15
18
|
import { CategoriesInput } from '../../../../provider/categories-input/CategoriesInput.js';
|
|
16
19
|
import { CategoriesInputDescription } from '../../../../provider/categories-input/CategoriesInputDescription.js';
|
|
@@ -33,9 +36,8 @@ import { TipTapEditor } from '../../../../tiptap-editor/TipTapEditor.js';
|
|
|
33
36
|
import { FileUpload } from '../../../../file-upload/FileUpload.js';
|
|
34
37
|
import { IntervalInput } from '../../IntervalInput.js';
|
|
35
38
|
import { SelectEventProductSet } from '../SelectEventProductSet/SelectEventProductSet.js';
|
|
36
|
-
import { Dialog } from '../../../../modals/dialog/Dialog.js';
|
|
37
|
-
import { useDialogContext } from '../../../../modals/dialog/DialogContext.js';
|
|
38
39
|
import { isUrlValid } from '../../utils/isUrlValid.js';
|
|
40
|
+
import { toSimpleDateTime } from '../../utils/checkIfEventBooked.js';
|
|
39
41
|
|
|
40
42
|
/* eslint-disable react-hooks/exhaustive-deps */ function _array_like_to_array(arr, len) {
|
|
41
43
|
if (len == null || len > arr.length) len = arr.length;
|
|
@@ -140,7 +142,7 @@ var eventImageTypes = {
|
|
|
140
142
|
uploadCover: IMAGE_TYPE_MAP[IMAGE_TYPE_COVER]
|
|
141
143
|
};
|
|
142
144
|
var EditEventForm = function(param) {
|
|
143
|
-
var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, categories = param.categories, title = param.title, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, defaultEventValues = param.defaultEventValues, serverErrors = param.serverErrors, onSaveEvent = param.onSaveEvent, productSets = param.productSets, createProductSet = param.createProductSet, setEditProductSetId = param.setEditProductSetId, isExternalPaymentLinkEnabled = param.isExternalPaymentLinkEnabled, timeZone = param.timeZone, eventProductSet = param.eventProductSet, overrideNameError = param.overrideNameError, _param_disabledRecurrent = param.disabledRecurrent, disabledRecurrent = _param_disabledRecurrent === void 0 ? false : _param_disabledRecurrent, _param_isCopyCreate = param.isCopyCreate, isCopyCreate = _param_isCopyCreate === void 0 ? false : _param_isCopyCreate;
|
|
145
|
+
var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? false : _param_disabled, categories = param.categories, title = param.title, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, defaultEventValues = param.defaultEventValues, serverErrors = param.serverErrors, onSaveEvent = param.onSaveEvent, productSets = param.productSets, createProductSet = param.createProductSet, setEditProductSetId = param.setEditProductSetId, isExternalPaymentLinkEnabled = param.isExternalPaymentLinkEnabled, timeZone = param.timeZone, eventProductSet = param.eventProductSet, overrideNameError = param.overrideNameError, _param_disabledRecurrent = param.disabledRecurrent, disabledRecurrent = _param_disabledRecurrent === void 0 ? false : _param_disabledRecurrent, _param_isCopyCreate = param.isCopyCreate, isCopyCreate = _param_isCopyCreate === void 0 ? false : _param_isCopyCreate, _param_isBooked = param.isBooked, isBooked = _param_isBooked === void 0 ? false : _param_isBooked;
|
|
144
146
|
var _defaultEventValues_rrule, _defaultEventValues_rrule1, _errors_name, _errors_externalPaymentLink, _errors_integrationUrl;
|
|
145
147
|
var t = useTranslation([
|
|
146
148
|
'Design',
|
|
@@ -221,6 +223,8 @@ var EditEventForm = function(param) {
|
|
|
221
223
|
rrule
|
|
222
224
|
]);
|
|
223
225
|
var isChanged = !isEqual(watchedValues, sanitizeDefaultValues(defaultEventValues));
|
|
226
|
+
var isChangedTime = (watchedValues === null || watchedValues === void 0 ? void 0 : watchedValues.start) !== toSimpleDateTime((defaultEventValues === null || defaultEventValues === void 0 ? void 0 : defaultEventValues.startAt) || '') || (watchedValues === null || watchedValues === void 0 ? void 0 : watchedValues.end) !== toSimpleDateTime((defaultEventValues === null || defaultEventValues === void 0 ? void 0 : defaultEventValues.endAt) || '');
|
|
227
|
+
var isSinglEventWithBooked = !rrule && isBooked && isChangedTime;
|
|
224
228
|
return /*#__PURE__*/ jsxs(Fragment, {
|
|
225
229
|
children: [
|
|
226
230
|
/*#__PURE__*/ jsx(Dialog, {
|
|
@@ -484,7 +488,21 @@ var EditEventForm = function(param) {
|
|
|
484
488
|
eventProductSet: eventProductSet,
|
|
485
489
|
overrideNameError: overrideNameError
|
|
486
490
|
}),
|
|
487
|
-
|
|
491
|
+
isSinglEventWithBooked && /*#__PURE__*/ jsx(ConfirmModal, {
|
|
492
|
+
content: t('App:confirmChangeEventDate'),
|
|
493
|
+
children: function(confirm) {
|
|
494
|
+
return /*#__PURE__*/ jsx(Button, {
|
|
495
|
+
disabled: disabled || formState.isSubmitting || !isChanged || isImagesLoading || isCoverImagesLoading,
|
|
496
|
+
className: "save-event",
|
|
497
|
+
type: "button",
|
|
498
|
+
onClick: function() {
|
|
499
|
+
return confirm(handleSubmit(onSaveEvent, onErrorSubmit));
|
|
500
|
+
},
|
|
501
|
+
children: formState.isSubmitting ? "".concat(t('saveAndAdd'), "...") : t('saveAndAdd')
|
|
502
|
+
});
|
|
503
|
+
}
|
|
504
|
+
}),
|
|
505
|
+
hasPermission && !showEditProductSet && !isSinglEventWithBooked && /*#__PURE__*/ jsx(Button, {
|
|
488
506
|
disabled: disabled || formState.isSubmitting || !isChanged || isImagesLoading || isCoverImagesLoading,
|
|
489
507
|
className: "save-event",
|
|
490
508
|
type: "submit",
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { EventWithMetadata } from '@licklist/plugins';
|
|
2
|
+
import { RecurrentEventMode } from 'src/events/edit-recurrent-event-modal';
|
|
3
|
+
export declare const checkIfEventIsBooked: (event?: EventWithMetadata, date?: string, activityMode?: RecurrentEventMode) => boolean;
|
|
4
|
+
export declare const toSimpleDateTime: (dateTime: string) => string;
|
|
5
|
+
//# sourceMappingURL=checkIfEventBooked.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkIfEventBooked.d.ts","sourceRoot":"","sources":["../../../../src/events/edit-event-modal/utils/checkIfEventBooked.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAGL,kBAAkB,EACnB,MAAM,uCAAuC,CAAA;AAE9C,eAAO,MAAM,oBAAoB,WACvB,iBAAiB,SAClB,MAAM,iBACE,kBAAkB,YAsBlC,CAAA;AAGD,eAAO,MAAM,gBAAgB,aAAc,MAAM,WAM7C,CAAA"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config';
|
|
2
|
+
import { DateTime } from 'luxon';
|
|
3
|
+
import { MODE_ALL_EVENTS, MODE_THIS_AND_FOLLOWING_EVENTS } from '../../edit-recurrent-event-modal/EditRecurrentEventModal.js';
|
|
4
|
+
|
|
5
|
+
var checkIfEventIsBooked = function(event, date, activityMode) {
|
|
6
|
+
var _event_eventStatistic, _Object_keys;
|
|
7
|
+
if (!event || !date) return false;
|
|
8
|
+
var productCategorySummary = event === null || event === void 0 ? void 0 : (_event_eventStatistic = event.eventStatistic) === null || _event_eventStatistic === void 0 ? void 0 : _event_eventStatistic.productCategorySummary;
|
|
9
|
+
if (!productCategorySummary) return false;
|
|
10
|
+
var summaryFormattedDate = DateTime.fromISO(date).toUTC().toFormat(DATE_FORMAT);
|
|
11
|
+
var summaryDays = (_Object_keys = Object.keys(productCategorySummary)) === null || _Object_keys === void 0 ? void 0 : _Object_keys.map(function(date) {
|
|
12
|
+
return DateTime.fromFormat(date, DATE_TIME_FULL_FORMAT).toFormat(DATE_FORMAT);
|
|
13
|
+
});
|
|
14
|
+
if (activityMode && (activityMode === MODE_ALL_EVENTS || activityMode === MODE_THIS_AND_FOLLOWING_EVENTS)) {
|
|
15
|
+
return !!summaryDays.length;
|
|
16
|
+
}
|
|
17
|
+
return summaryDays.includes(summaryFormattedDate);
|
|
18
|
+
};
|
|
19
|
+
var toSimpleDateTime = function(dateTime) {
|
|
20
|
+
return dateTime && DateTime.fromISO(dateTime).toISO({
|
|
21
|
+
includeOffset: false,
|
|
22
|
+
suppressMilliseconds: true,
|
|
23
|
+
suppressSeconds: true
|
|
24
|
+
});
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
export { checkIfEventIsBooked, toSimpleDateTime };
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EventWithMetadata } from '@licklist/plugins';
|
|
1
2
|
export declare const MODE_THIS_EVENT = "thisEvent";
|
|
2
3
|
export declare const MODE_THIS_AND_FOLLOWING_EVENTS = "thisAndFollowingEvents";
|
|
3
4
|
export declare const MODE_ALL_EVENTS = "allEvents";
|
|
@@ -22,7 +23,11 @@ export type EditRecurrentEventModalProps = {
|
|
|
22
23
|
title: string;
|
|
23
24
|
onSubmit: (values: EditRecurrentEventModalValues) => void;
|
|
24
25
|
isDateWasChanged?: boolean;
|
|
26
|
+
isChangeDateOrTime?: boolean;
|
|
27
|
+
event?: EventWithMetadata;
|
|
28
|
+
date?: string;
|
|
29
|
+
isRemoveModal?: boolean;
|
|
25
30
|
};
|
|
26
|
-
export declare const EditRecurrentEventModal: ({ disabled, isOpen, onHide, title, onSubmit, isDateWasChanged }: EditRecurrentEventModalProps) => import("react/jsx-runtime").JSX.Element;
|
|
31
|
+
export declare const EditRecurrentEventModal: ({ disabled, isOpen, onHide, title, onSubmit, isDateWasChanged, isChangeDateOrTime, event, date, isRemoveModal, }: EditRecurrentEventModalProps) => import("react/jsx-runtime").JSX.Element;
|
|
27
32
|
export {};
|
|
28
33
|
//# sourceMappingURL=EditRecurrentEventModal.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditRecurrentEventModal.d.ts","sourceRoot":"","sources":["../../../src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EditRecurrentEventModal.d.ts","sourceRoot":"","sources":["../../../src/events/edit-recurrent-event-modal/EditRecurrentEventModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,eAAO,MAAM,eAAe,cAAc,CAAA;AAC1C,eAAO,MAAM,8BAA8B,2BAA2B,CAAA;AACtE,eAAO,MAAM,eAAe,cAAc,CAAA;AAE1C,QAAA,MAAM,KAAK,+DAID,CAAA;AAEV,eAAO,MAAM,2BAA2B,cAAkB,CAAA;AAE1D,eAAO,MAAM,yBAAyB;;;;CAIrC,CAAA;AAED,eAAO,MAAM,gCAAgC;;CAE5C,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;AAEvD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,kBAAkB,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE,OAAO,CAAA;IACf,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,CAAC,MAAM,EAAE,6BAA6B,KAAK,IAAI,CAAA;IACzD,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,uBAAuB,qHAWjC,4BAA4B,4CAoG9B,CAAA"}
|
|
@@ -3,6 +3,7 @@ import { Modal, Form, Button } from 'react-bootstrap';
|
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
4
|
import { useForm, Controller } from 'react-hook-form';
|
|
5
5
|
import { FaTimes } from 'react-icons/fa';
|
|
6
|
+
import { checkIfEventIsBooked } from '../edit-event-modal/utils/checkIfEventBooked.js';
|
|
6
7
|
|
|
7
8
|
function _define_property(obj, key, value) {
|
|
8
9
|
if (key in obj) {
|
|
@@ -25,14 +26,17 @@ var _obj;
|
|
|
25
26
|
var RECURRENT_MODE_TYPES_LIST = (_obj = {}, _define_property(_obj, MODE_THIS_EVENT, 1), _define_property(_obj, MODE_THIS_AND_FOLLOWING_EVENTS, 2), _define_property(_obj, MODE_ALL_EVENTS, 3), _obj);
|
|
26
27
|
var RECURRENT_MODE_TYPES_WITHOUT_ALL = _define_property({}, MODE_THIS_EVENT, 1);
|
|
27
28
|
var EditRecurrentEventModal = function(param) {
|
|
28
|
-
var disabled = param.disabled, isOpen = param.isOpen, onHide = param.onHide, title = param.title, onSubmit = param.onSubmit, _param_isDateWasChanged = param.isDateWasChanged, isDateWasChanged = _param_isDateWasChanged === void 0 ? false : _param_isDateWasChanged;
|
|
29
|
+
var disabled = param.disabled, isOpen = param.isOpen, onHide = param.onHide, title = param.title, onSubmit = param.onSubmit, _param_isDateWasChanged = param.isDateWasChanged, isDateWasChanged = _param_isDateWasChanged === void 0 ? false : _param_isDateWasChanged, _param_isChangeDateOrTime = param.isChangeDateOrTime, isChangeDateOrTime = _param_isChangeDateOrTime === void 0 ? false : _param_isChangeDateOrTime, event = param.event, date = param.date, _param_isRemoveModal = param.isRemoveModal, isRemoveModal = _param_isRemoveModal === void 0 ? false : _param_isRemoveModal;
|
|
29
30
|
var t = useTranslation('Design').t;
|
|
30
31
|
var _useForm = useForm({
|
|
31
32
|
defaultValues: {
|
|
32
33
|
mode: DEFAULT_RECURRENT_MODE_TYPE
|
|
33
34
|
}
|
|
34
|
-
}), control = _useForm.control, handleSubmit = _useForm.handleSubmit;
|
|
35
|
+
}), control = _useForm.control, watch = _useForm.watch, handleSubmit = _useForm.handleSubmit;
|
|
36
|
+
var activityMode = watch('mode');
|
|
37
|
+
var isBooked = checkIfEventIsBooked(event, date, activityMode);
|
|
35
38
|
var recurrentListMode = isDateWasChanged ? RECURRENT_MODE_TYPES_WITHOUT_ALL : RECURRENT_MODE_TYPES_LIST;
|
|
39
|
+
var confirmDescription = isChangeDateOrTime && isBooked || isBooked && isRemoveModal;
|
|
36
40
|
return /*#__PURE__*/ jsx(Modal, {
|
|
37
41
|
show: isOpen,
|
|
38
42
|
onHide: onHide,
|
|
@@ -61,6 +65,11 @@ var EditRecurrentEventModal = function(param) {
|
|
|
61
65
|
})
|
|
62
66
|
]
|
|
63
67
|
}),
|
|
68
|
+
confirmDescription && /*#__PURE__*/ jsx(Modal.Dialog, {
|
|
69
|
+
className: "pl-4",
|
|
70
|
+
contentClassName: "border-0",
|
|
71
|
+
children: t(isRemoveModal ? 'App:confirmRemoveEventWithBooking' : 'App:confirmChangeEventDate')
|
|
72
|
+
}),
|
|
64
73
|
/*#__PURE__*/ jsx(Modal.Body, {
|
|
65
74
|
className: "p-0 ml-4",
|
|
66
75
|
children: /*#__PURE__*/ jsx(Form.Group, {
|
|
@@ -106,14 +115,14 @@ var EditRecurrentEventModal = function(param) {
|
|
|
106
115
|
onClick: onHide,
|
|
107
116
|
className: "text-decoration-none",
|
|
108
117
|
disabled: disabled,
|
|
109
|
-
children: t('cancel')
|
|
118
|
+
children: t(confirmDescription ? 'App:cancelChangeDate' : 'cancel')
|
|
110
119
|
}),
|
|
111
120
|
/*#__PURE__*/ jsx(Button, {
|
|
112
121
|
variant: "success",
|
|
113
122
|
type: "submit",
|
|
114
123
|
className: "text-decoration-none",
|
|
115
124
|
disabled: disabled,
|
|
116
|
-
children: t('
|
|
125
|
+
children: t(confirmDescription ? 'App:saveChangeDate' : 'OK')
|
|
117
126
|
})
|
|
118
127
|
]
|
|
119
128
|
})
|
|
@@ -16,6 +16,7 @@ export interface EventCardProps extends HasPermissionProp {
|
|
|
16
16
|
titleId?: string;
|
|
17
17
|
descriptionId?: string;
|
|
18
18
|
productSetName?: string;
|
|
19
|
+
eventID?: string;
|
|
19
20
|
}
|
|
20
|
-
export declare function EventCard({ name, description, date, imageUrl, sales, onPreview, onEdit, onCopy, onRemove, hasPermission, productSetName, onStatistic, eventStatistic, titleId, descriptionId, }: EventCardProps): import("react/jsx-runtime").JSX.Element;
|
|
21
|
+
export declare function EventCard({ name, description, date, imageUrl, sales, onPreview, onEdit, onCopy, onRemove, hasPermission, productSetName, onStatistic, eventStatistic, titleId, descriptionId, eventID, }: EventCardProps): import("react/jsx-runtime").JSX.Element;
|
|
21
22
|
//# sourceMappingURL=EventCard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventCard.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/EventCard.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAQjG,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAS3C,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;IACtC,WAAW,EAAE,MAAM,IAAI,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"EventCard.d.ts","sourceRoot":"","sources":["../../../src/events/event-card/EventCard.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AACtF,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAA;AAQjG,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAS3C,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,CAAA;IACtC,WAAW,EAAE,MAAM,IAAI,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,WAAW,EACX,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,SAAS,EACT,MAAM,EACN,MAAM,EACN,QAAQ,EACR,aAAoB,EACpB,cAAc,EACd,WAAW,EACX,cAAc,EACd,OAAO,EACP,aAAa,EACb,OAAO,GACR,EAAE,cAAc,2CA0JhB"}
|
|
@@ -38,7 +38,7 @@ function _object_without_properties_loose(source, excluded) {
|
|
|
38
38
|
return target;
|
|
39
39
|
}
|
|
40
40
|
function EventCard(param) {
|
|
41
|
-
var name = param.name, description = param.description, date = param.date, imageUrl = param.imageUrl, sales = param.sales, onPreview = param.onPreview, onEdit = param.onEdit, onCopy = param.onCopy, onRemove = param.onRemove, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, productSetName = param.productSetName, onStatistic = param.onStatistic, eventStatistic = param.eventStatistic, titleId = param.titleId, descriptionId = param.descriptionId;
|
|
41
|
+
var name = param.name, description = param.description, date = param.date, imageUrl = param.imageUrl, sales = param.sales, onPreview = param.onPreview, onEdit = param.onEdit, onCopy = param.onCopy, onRemove = param.onRemove, _param_hasPermission = param.hasPermission, hasPermission = _param_hasPermission === void 0 ? true : _param_hasPermission, productSetName = param.productSetName, onStatistic = param.onStatistic, eventStatistic = param.eventStatistic, titleId = param.titleId, descriptionId = param.descriptionId, eventID = param.eventID;
|
|
42
42
|
var t = useTranslation('Design').t;
|
|
43
43
|
var _useIntl = useIntl(), formatNumber = _useIntl.formatNumber, formatDate = _useIntl.formatDate;
|
|
44
44
|
var _getStatisticInfo = getStatisticInfo(eventStatistic, date), totalViews = _getStatisticInfo.totalViews, statistics = _object_without_properties(_getStatisticInfo, [
|
|
@@ -79,7 +79,16 @@ function EventCard(param) {
|
|
|
79
79
|
children: [
|
|
80
80
|
/*#__PURE__*/ jsx(Card.Title, {
|
|
81
81
|
id: titleId,
|
|
82
|
-
children:
|
|
82
|
+
children: eventID ? /*#__PURE__*/ jsxs("div", {
|
|
83
|
+
className: "d-flex",
|
|
84
|
+
children: [
|
|
85
|
+
name,
|
|
86
|
+
/*#__PURE__*/ jsx("p", {
|
|
87
|
+
className: "text-secondary ml-2",
|
|
88
|
+
children: "(ID:".concat(eventID, ")")
|
|
89
|
+
})
|
|
90
|
+
]
|
|
91
|
+
}) : name
|
|
83
92
|
}),
|
|
84
93
|
/*#__PURE__*/ jsxs("div", {
|
|
85
94
|
className: "flex-grow-1",
|
|
@@ -9,7 +9,7 @@ var ProductSummary = function(param) {
|
|
|
9
9
|
var t = useTranslation('Design').t;
|
|
10
10
|
var formatNumber = useIntl().formatNumber;
|
|
11
11
|
var priceForOneProduct = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.price;
|
|
12
|
-
var modifiersSets = (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderModifiersSets) || (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderProductModifiers);
|
|
12
|
+
var modifiersSets = (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderModifiersSets) || (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.orderProductModifiers) || [];
|
|
13
13
|
var fullPrice = formatNumber(priceForOneProduct * (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.quantity), {
|
|
14
14
|
style: 'currency',
|
|
15
15
|
currency: Config.Currency.GBP
|
|
@@ -38,7 +38,7 @@ var ProductSummary = function(param) {
|
|
|
38
38
|
})
|
|
39
39
|
]
|
|
40
40
|
}),
|
|
41
|
-
!!modifiersSets.length && /*#__PURE__*/ jsx(Fragment, {
|
|
41
|
+
!!(modifiersSets === null || modifiersSets === void 0 ? void 0 : modifiersSets.length) && /*#__PURE__*/ jsx(Fragment, {
|
|
42
42
|
children: modifiersSets.map(function(modifier, index) {
|
|
43
43
|
return /*#__PURE__*/ jsx(ProductWithModifier, {
|
|
44
44
|
modifier: modifier,
|
|
@@ -235,7 +235,7 @@ function ProductsControl(param) {
|
|
|
235
235
|
id: String(product._id),
|
|
236
236
|
isExpanded: isFirstProductAdded,
|
|
237
237
|
isInvalid: !!categoryProductErrors,
|
|
238
|
-
title: value,
|
|
238
|
+
title: "".concat(value, " (ID:").concat(product.id, ")"),
|
|
239
239
|
isOverride: isOverrides,
|
|
240
240
|
badge: /*#__PURE__*/ jsx(Badge, {
|
|
241
241
|
className: "product-badge",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecurrenceInput.d.ts","sourceRoot":"","sources":["../../src/recurrence-input/RecurrenceInput.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAWjD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,gBAAgB,CAAC,EAAE,SAAS,CAAA;CAC7B;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAgB,EAChB,IAAI,EACJ,OAAO,EACP,KAAK,EACL,QAAQ,EACR,gBAAmC,GACpC,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"RecurrenceInput.d.ts","sourceRoot":"","sources":["../../src/recurrence-input/RecurrenceInput.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAWjD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,gBAAgB,CAAC,EAAE,SAAS,CAAA;CAC7B;AAED,wBAAgB,eAAe,CAAC,EAC9B,QAAgB,EAChB,IAAI,EACJ,OAAO,EACP,KAAK,EACL,QAAQ,EACR,gBAAmC,GACpC,EAAE,oBAAoB,2CAyEtB"}
|
|
@@ -117,13 +117,13 @@ function RecurrenceInput(param) {
|
|
|
117
117
|
})), 2), state = _useReducer[0], updateState = _useReducer[1];
|
|
118
118
|
useEffect(// TODO: unhardcode timezone
|
|
119
119
|
function() {
|
|
120
|
-
return onChange(RRule.optionsToString({
|
|
120
|
+
return onChange(RRule.optionsToString(_object_spread({
|
|
121
121
|
freq: state.freq,
|
|
122
122
|
count: state.count,
|
|
123
123
|
interval: state.interval,
|
|
124
124
|
byweekday: state.byweekday,
|
|
125
125
|
tzid: 'Europe/London'
|
|
126
|
-
}).replace('RRULE:', ''));
|
|
126
|
+
}, state)).replace('RRULE:', ''));
|
|
127
127
|
}, [
|
|
128
128
|
state
|
|
129
129
|
]);
|
package/package.json
CHANGED
|
@@ -19,6 +19,7 @@ import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery'
|
|
|
19
19
|
import { scrollToError } from '@licklist/plugins/dist/utils/ScrollUtils'
|
|
20
20
|
import { getFirstErrorKey } from '@licklist/plugins/dist/utils/FormValues'
|
|
21
21
|
import { ProductSet } from '@licklist/core/dist/DataMapper/Product/ProductSetDataMapper'
|
|
22
|
+
import { ConfirmModal } from 'src/modals'
|
|
22
23
|
import { CategoryGroup } from '../../../../types/categories'
|
|
23
24
|
import { SaleDeadline } from '../SaleDeadline/SaleDeadline'
|
|
24
25
|
import {
|
|
@@ -33,6 +34,8 @@ import { SelectEventProductSet } from '../SelectEventProductSet'
|
|
|
33
34
|
import { Dialog, useDialogContext } from '../../../../modals/dialog'
|
|
34
35
|
import { ProductSetFormValues } from '../../../../product-set/form/ProductSetForm'
|
|
35
36
|
import { isUrlValid } from '../../utils/isUrlValid'
|
|
37
|
+
import { toSimpleDateTime } from '../../utils/checkIfEventBooked'
|
|
38
|
+
|
|
36
39
|
|
|
37
40
|
export interface EditEventFormValues extends IntervalInputValues {
|
|
38
41
|
name: string
|
|
@@ -68,6 +71,7 @@ export interface EditEventFormProps extends HasPermissionProp {
|
|
|
68
71
|
overrideNameError?: string
|
|
69
72
|
disabledRecurrent?: boolean
|
|
70
73
|
isCopyCreate?: boolean
|
|
74
|
+
isBooked?: boolean
|
|
71
75
|
}
|
|
72
76
|
|
|
73
77
|
const eventImageTypes = {
|
|
@@ -92,6 +96,7 @@ export const EditEventForm = ({
|
|
|
92
96
|
overrideNameError,
|
|
93
97
|
disabledRecurrent = false,
|
|
94
98
|
isCopyCreate = false,
|
|
99
|
+
isBooked = false,
|
|
95
100
|
}: EditEventFormProps) => {
|
|
96
101
|
const { t } = useTranslation(['Design', 'Validation'])
|
|
97
102
|
|
|
@@ -195,8 +200,11 @@ export const EditEventForm = ({
|
|
|
195
200
|
rrule && setValue('rrule', rrule?.concat(`;EXDATE=${defaultExDate}`))
|
|
196
201
|
}, [defaultExDate, rrule])
|
|
197
202
|
|
|
198
|
-
|
|
199
203
|
const isChanged = !isEqual(watchedValues, sanitizeDefaultValues(defaultEventValues));
|
|
204
|
+
const isChangedTime =
|
|
205
|
+
watchedValues?.start !== toSimpleDateTime(defaultEventValues?.startAt || '') ||
|
|
206
|
+
watchedValues?.end !== toSimpleDateTime(defaultEventValues?.endAt || '')
|
|
207
|
+
const isSinglEventWithBooked = !rrule && isBooked && isChangedTime
|
|
200
208
|
|
|
201
209
|
return (
|
|
202
210
|
<>
|
|
@@ -432,7 +440,28 @@ export const EditEventForm = ({
|
|
|
432
440
|
overrideNameError={overrideNameError}
|
|
433
441
|
/>
|
|
434
442
|
|
|
435
|
-
{
|
|
443
|
+
{isSinglEventWithBooked && (
|
|
444
|
+
<ConfirmModal content={t('App:confirmChangeEventDate')}>
|
|
445
|
+
{(confirm) => (
|
|
446
|
+
<Button
|
|
447
|
+
disabled={
|
|
448
|
+
disabled ||
|
|
449
|
+
formState.isSubmitting ||
|
|
450
|
+
!isChanged ||
|
|
451
|
+
isImagesLoading ||
|
|
452
|
+
isCoverImagesLoading
|
|
453
|
+
}
|
|
454
|
+
className='save-event'
|
|
455
|
+
type='button'
|
|
456
|
+
onClick={() => confirm(handleSubmit(onSaveEvent, onErrorSubmit))}
|
|
457
|
+
>
|
|
458
|
+
{formState.isSubmitting ? `${t('saveAndAdd')}...` : t('saveAndAdd')}
|
|
459
|
+
</Button>
|
|
460
|
+
)}
|
|
461
|
+
</ConfirmModal>
|
|
462
|
+
)}
|
|
463
|
+
|
|
464
|
+
{hasPermission && !showEditProductSet && !isSinglEventWithBooked && (
|
|
436
465
|
<Button
|
|
437
466
|
disabled={
|
|
438
467
|
disabled ||
|
|
@@ -490,3 +519,5 @@ const sanitizeDefaultValues = (
|
|
|
490
519
|
recurrenceEndAt: values?.recurrenceEndAt ?? undefined,
|
|
491
520
|
}
|
|
492
521
|
}
|
|
522
|
+
|
|
523
|
+
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { DATE_FORMAT, DATE_TIME_FULL_FORMAT } from '@licklist/core/dist/Config'
|
|
2
|
+
import { EventWithMetadata } from '@licklist/plugins'
|
|
3
|
+
import { DateTime } from 'luxon'
|
|
4
|
+
import {
|
|
5
|
+
MODE_ALL_EVENTS,
|
|
6
|
+
MODE_THIS_AND_FOLLOWING_EVENTS,
|
|
7
|
+
RecurrentEventMode,
|
|
8
|
+
} from 'src/events/edit-recurrent-event-modal'
|
|
9
|
+
|
|
10
|
+
export const checkIfEventIsBooked = (
|
|
11
|
+
event?: EventWithMetadata,
|
|
12
|
+
date?: string,
|
|
13
|
+
activityMode?: RecurrentEventMode,
|
|
14
|
+
) => {
|
|
15
|
+
if (!event || !date) return false
|
|
16
|
+
const productCategorySummary = event?.eventStatistic?.productCategorySummary
|
|
17
|
+
|
|
18
|
+
if (!productCategorySummary) return false
|
|
19
|
+
const summaryFormattedDate = DateTime.fromISO(date)
|
|
20
|
+
.toUTC()
|
|
21
|
+
.toFormat(DATE_FORMAT)
|
|
22
|
+
|
|
23
|
+
const summaryDays = Object.keys(productCategorySummary)?.map((date) =>
|
|
24
|
+
DateTime.fromFormat(date, DATE_TIME_FULL_FORMAT).toFormat(DATE_FORMAT),
|
|
25
|
+
)
|
|
26
|
+
if (
|
|
27
|
+
activityMode &&
|
|
28
|
+
(activityMode === MODE_ALL_EVENTS ||
|
|
29
|
+
activityMode === MODE_THIS_AND_FOLLOWING_EVENTS)
|
|
30
|
+
) {
|
|
31
|
+
return !!summaryDays.length
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
return summaryDays.includes(summaryFormattedDate)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
export const toSimpleDateTime = (dateTime: string) =>
|
|
39
|
+
dateTime &&
|
|
40
|
+
DateTime.fromISO(dateTime).toISO({
|
|
41
|
+
includeOffset: false,
|
|
42
|
+
suppressMilliseconds: true,
|
|
43
|
+
suppressSeconds: true,
|
|
44
|
+
})
|
|
@@ -2,6 +2,8 @@ import { Form, Modal, Button } from 'react-bootstrap'
|
|
|
2
2
|
import { useTranslation } from 'react-i18next'
|
|
3
3
|
import { Controller, useForm } from 'react-hook-form'
|
|
4
4
|
import { FaTimes } from 'react-icons/fa'
|
|
5
|
+
import { EventWithMetadata } from '@licklist/plugins'
|
|
6
|
+
import { checkIfEventIsBooked } from '../edit-event-modal/utils/checkIfEventBooked'
|
|
5
7
|
|
|
6
8
|
export const MODE_THIS_EVENT = 'thisEvent'
|
|
7
9
|
export const MODE_THIS_AND_FOLLOWING_EVENTS = 'thisAndFollowingEvents'
|
|
@@ -38,6 +40,10 @@ export type EditRecurrentEventModalProps = {
|
|
|
38
40
|
title: string
|
|
39
41
|
onSubmit: (values: EditRecurrentEventModalValues) => void
|
|
40
42
|
isDateWasChanged?: boolean
|
|
43
|
+
isChangeDateOrTime?: boolean
|
|
44
|
+
event?: EventWithMetadata
|
|
45
|
+
date?: string
|
|
46
|
+
isRemoveModal?: boolean
|
|
41
47
|
}
|
|
42
48
|
|
|
43
49
|
export const EditRecurrentEventModal = ({
|
|
@@ -46,17 +52,30 @@ export const EditRecurrentEventModal = ({
|
|
|
46
52
|
onHide,
|
|
47
53
|
title,
|
|
48
54
|
onSubmit,
|
|
49
|
-
isDateWasChanged = false
|
|
55
|
+
isDateWasChanged = false,
|
|
56
|
+
isChangeDateOrTime = false,
|
|
57
|
+
event,
|
|
58
|
+
date,
|
|
59
|
+
isRemoveModal = false,
|
|
50
60
|
}: EditRecurrentEventModalProps) => {
|
|
51
61
|
const { t } = useTranslation('Design')
|
|
52
62
|
|
|
53
|
-
const { control, handleSubmit } =
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
63
|
+
const { control, watch, handleSubmit } =
|
|
64
|
+
useForm<EditRecurrentEventModalValues>({
|
|
65
|
+
defaultValues: {
|
|
66
|
+
mode: DEFAULT_RECURRENT_MODE_TYPE,
|
|
67
|
+
},
|
|
68
|
+
})
|
|
58
69
|
|
|
59
|
-
const
|
|
70
|
+
const activityMode = watch('mode')
|
|
71
|
+
|
|
72
|
+
const isBooked = checkIfEventIsBooked(event, date, activityMode)
|
|
73
|
+
const recurrentListMode = isDateWasChanged
|
|
74
|
+
? RECURRENT_MODE_TYPES_WITHOUT_ALL
|
|
75
|
+
: RECURRENT_MODE_TYPES_LIST
|
|
76
|
+
|
|
77
|
+
const confirmDescription =
|
|
78
|
+
(isChangeDateOrTime && isBooked) || (isBooked && isRemoveModal)
|
|
60
79
|
|
|
61
80
|
return (
|
|
62
81
|
<Modal
|
|
@@ -78,6 +97,15 @@ export const EditRecurrentEventModal = ({
|
|
|
78
97
|
<FaTimes size={16} />
|
|
79
98
|
</Button>
|
|
80
99
|
</Modal.Header>
|
|
100
|
+
{confirmDescription && (
|
|
101
|
+
<Modal.Dialog className='pl-4' contentClassName='border-0'>
|
|
102
|
+
{t(
|
|
103
|
+
isRemoveModal
|
|
104
|
+
? 'App:confirmRemoveEventWithBooking'
|
|
105
|
+
: 'App:confirmChangeEventDate',
|
|
106
|
+
)}
|
|
107
|
+
</Modal.Dialog>
|
|
108
|
+
)}
|
|
81
109
|
<Modal.Body className='p-0 ml-4'>
|
|
82
110
|
<Form.Group className='m-0'>
|
|
83
111
|
<Controller
|
|
@@ -115,7 +143,7 @@ export const EditRecurrentEventModal = ({
|
|
|
115
143
|
className='text-decoration-none'
|
|
116
144
|
disabled={disabled}
|
|
117
145
|
>
|
|
118
|
-
{t('cancel')}
|
|
146
|
+
{t(confirmDescription ? 'App:cancelChangeDate' : 'cancel')}
|
|
119
147
|
</Button>
|
|
120
148
|
<Button
|
|
121
149
|
variant='success'
|
|
@@ -123,7 +151,7 @@ export const EditRecurrentEventModal = ({
|
|
|
123
151
|
className='text-decoration-none'
|
|
124
152
|
disabled={disabled}
|
|
125
153
|
>
|
|
126
|
-
{t('
|
|
154
|
+
{t(confirmDescription ? 'App:saveChangeDate' : 'OK')}
|
|
127
155
|
</Button>
|
|
128
156
|
</Modal.Footer>
|
|
129
157
|
</Form>
|
|
@@ -43,6 +43,7 @@ export interface EventCardProps extends HasPermissionProp {
|
|
|
43
43
|
titleId?: string
|
|
44
44
|
descriptionId?: string
|
|
45
45
|
productSetName?: string
|
|
46
|
+
eventID?: string
|
|
46
47
|
}
|
|
47
48
|
|
|
48
49
|
export function EventCard({
|
|
@@ -61,6 +62,7 @@ export function EventCard({
|
|
|
61
62
|
eventStatistic,
|
|
62
63
|
titleId,
|
|
63
64
|
descriptionId,
|
|
65
|
+
eventID,
|
|
64
66
|
}: EventCardProps) {
|
|
65
67
|
const { t } = useTranslation('Design')
|
|
66
68
|
const { formatNumber, formatDate } = useIntl()
|
|
@@ -93,7 +95,16 @@ export function EventCard({
|
|
|
93
95
|
</Badge>
|
|
94
96
|
</div>
|
|
95
97
|
<Card.Body>
|
|
96
|
-
<Card.Title id={titleId}>
|
|
98
|
+
<Card.Title id={titleId}>
|
|
99
|
+
{eventID ? (
|
|
100
|
+
<div className="d-flex">
|
|
101
|
+
{name}
|
|
102
|
+
<p className="text-secondary ml-2">{`(ID:${eventID})`}</p>
|
|
103
|
+
</div>
|
|
104
|
+
) : (
|
|
105
|
+
name
|
|
106
|
+
)}
|
|
107
|
+
</Card.Title>
|
|
97
108
|
<div className='flex-grow-1'>
|
|
98
109
|
<TipTapEditor
|
|
99
110
|
viewMode
|
|
@@ -109,9 +120,9 @@ export function EventCard({
|
|
|
109
120
|
{t(key)}:{' '}
|
|
110
121
|
{key === 'totalAmount'
|
|
111
122
|
? formatNumber(statistics[key], {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
123
|
+
style: 'currency',
|
|
124
|
+
currency: Config.Currency.GBP,
|
|
125
|
+
})
|
|
115
126
|
: statistics[key]}
|
|
116
127
|
</span>
|
|
117
128
|
</div>
|
|
@@ -26,7 +26,7 @@ export const ProductSummary = ({
|
|
|
26
26
|
const { formatNumber } = useIntl()
|
|
27
27
|
const priceForOneProduct = orderProduct?.price
|
|
28
28
|
|
|
29
|
-
const modifiersSets = orderProduct?.orderModifiersSets || orderProduct?.orderProductModifiers
|
|
29
|
+
const modifiersSets = orderProduct?.orderModifiersSets || orderProduct?.orderProductModifiers || []
|
|
30
30
|
|
|
31
31
|
const fullPrice = formatNumber(priceForOneProduct * orderProduct?.quantity, {
|
|
32
32
|
style: 'currency',
|
|
@@ -44,7 +44,7 @@ export const ProductSummary = ({
|
|
|
44
44
|
<p className='price'>{fullPrice}</p>
|
|
45
45
|
</div>
|
|
46
46
|
|
|
47
|
-
{!!modifiersSets
|
|
47
|
+
{!!modifiersSets?.length && (
|
|
48
48
|
<>
|
|
49
49
|
{modifiersSets.map((modifier, index) => (
|
|
50
50
|
<ProductWithModifier
|
|
@@ -229,7 +229,7 @@ export function ProductsControl({
|
|
|
229
229
|
id={String(product._id)}
|
|
230
230
|
isExpanded={isFirstProductAdded}
|
|
231
231
|
isInvalid={!!categoryProductErrors}
|
|
232
|
-
title={value}
|
|
232
|
+
title={`${value} (ID:${product.id})`}
|
|
233
233
|
isOverride={isOverrides}
|
|
234
234
|
badge={
|
|
235
235
|
<Badge className='product-badge'>{t('product')}</Badge>
|
package/yarn.lock
CHANGED
|
@@ -3202,11 +3202,11 @@ __metadata:
|
|
|
3202
3202
|
linkType: hard
|
|
3203
3203
|
|
|
3204
3204
|
"@react-types/shared@npm:^3.9.0":
|
|
3205
|
-
version: 3.
|
|
3206
|
-
resolution: "@react-types/shared@npm:3.
|
|
3205
|
+
version: 3.28.0
|
|
3206
|
+
resolution: "@react-types/shared@npm:3.28.0"
|
|
3207
3207
|
peerDependencies:
|
|
3208
3208
|
react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
|
|
3209
|
-
checksum: 10c0/
|
|
3209
|
+
checksum: 10c0/d5dbba060c9b3204bb6d6db1fec4c7d8b56a185ce000fe0676a136b07a2655885a9db3cd3e6b30564f1761bf91de12fb36ba869bc90152c865bebec8ce8e3b0a
|
|
3210
3210
|
languageName: node
|
|
3211
3211
|
linkType: hard
|
|
3212
3212
|
|
|
@@ -3303,135 +3303,135 @@ __metadata:
|
|
|
3303
3303
|
languageName: node
|
|
3304
3304
|
linkType: hard
|
|
3305
3305
|
|
|
3306
|
-
"@rollup/rollup-android-arm-eabi@npm:4.
|
|
3307
|
-
version: 4.
|
|
3308
|
-
resolution: "@rollup/rollup-android-arm-eabi@npm:4.
|
|
3306
|
+
"@rollup/rollup-android-arm-eabi@npm:4.35.0":
|
|
3307
|
+
version: 4.35.0
|
|
3308
|
+
resolution: "@rollup/rollup-android-arm-eabi@npm:4.35.0"
|
|
3309
3309
|
conditions: os=android & cpu=arm
|
|
3310
3310
|
languageName: node
|
|
3311
3311
|
linkType: hard
|
|
3312
3312
|
|
|
3313
|
-
"@rollup/rollup-android-arm64@npm:4.
|
|
3314
|
-
version: 4.
|
|
3315
|
-
resolution: "@rollup/rollup-android-arm64@npm:4.
|
|
3313
|
+
"@rollup/rollup-android-arm64@npm:4.35.0":
|
|
3314
|
+
version: 4.35.0
|
|
3315
|
+
resolution: "@rollup/rollup-android-arm64@npm:4.35.0"
|
|
3316
3316
|
conditions: os=android & cpu=arm64
|
|
3317
3317
|
languageName: node
|
|
3318
3318
|
linkType: hard
|
|
3319
3319
|
|
|
3320
|
-
"@rollup/rollup-darwin-arm64@npm:4.
|
|
3321
|
-
version: 4.
|
|
3322
|
-
resolution: "@rollup/rollup-darwin-arm64@npm:4.
|
|
3320
|
+
"@rollup/rollup-darwin-arm64@npm:4.35.0":
|
|
3321
|
+
version: 4.35.0
|
|
3322
|
+
resolution: "@rollup/rollup-darwin-arm64@npm:4.35.0"
|
|
3323
3323
|
conditions: os=darwin & cpu=arm64
|
|
3324
3324
|
languageName: node
|
|
3325
3325
|
linkType: hard
|
|
3326
3326
|
|
|
3327
|
-
"@rollup/rollup-darwin-x64@npm:4.
|
|
3328
|
-
version: 4.
|
|
3329
|
-
resolution: "@rollup/rollup-darwin-x64@npm:4.
|
|
3327
|
+
"@rollup/rollup-darwin-x64@npm:4.35.0":
|
|
3328
|
+
version: 4.35.0
|
|
3329
|
+
resolution: "@rollup/rollup-darwin-x64@npm:4.35.0"
|
|
3330
3330
|
conditions: os=darwin & cpu=x64
|
|
3331
3331
|
languageName: node
|
|
3332
3332
|
linkType: hard
|
|
3333
3333
|
|
|
3334
|
-
"@rollup/rollup-freebsd-arm64@npm:4.
|
|
3335
|
-
version: 4.
|
|
3336
|
-
resolution: "@rollup/rollup-freebsd-arm64@npm:4.
|
|
3334
|
+
"@rollup/rollup-freebsd-arm64@npm:4.35.0":
|
|
3335
|
+
version: 4.35.0
|
|
3336
|
+
resolution: "@rollup/rollup-freebsd-arm64@npm:4.35.0"
|
|
3337
3337
|
conditions: os=freebsd & cpu=arm64
|
|
3338
3338
|
languageName: node
|
|
3339
3339
|
linkType: hard
|
|
3340
3340
|
|
|
3341
|
-
"@rollup/rollup-freebsd-x64@npm:4.
|
|
3342
|
-
version: 4.
|
|
3343
|
-
resolution: "@rollup/rollup-freebsd-x64@npm:4.
|
|
3341
|
+
"@rollup/rollup-freebsd-x64@npm:4.35.0":
|
|
3342
|
+
version: 4.35.0
|
|
3343
|
+
resolution: "@rollup/rollup-freebsd-x64@npm:4.35.0"
|
|
3344
3344
|
conditions: os=freebsd & cpu=x64
|
|
3345
3345
|
languageName: node
|
|
3346
3346
|
linkType: hard
|
|
3347
3347
|
|
|
3348
|
-
"@rollup/rollup-linux-arm-gnueabihf@npm:4.
|
|
3349
|
-
version: 4.
|
|
3350
|
-
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.
|
|
3348
|
+
"@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0":
|
|
3349
|
+
version: 4.35.0
|
|
3350
|
+
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0"
|
|
3351
3351
|
conditions: os=linux & cpu=arm & libc=glibc
|
|
3352
3352
|
languageName: node
|
|
3353
3353
|
linkType: hard
|
|
3354
3354
|
|
|
3355
|
-
"@rollup/rollup-linux-arm-musleabihf@npm:4.
|
|
3356
|
-
version: 4.
|
|
3357
|
-
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.
|
|
3355
|
+
"@rollup/rollup-linux-arm-musleabihf@npm:4.35.0":
|
|
3356
|
+
version: 4.35.0
|
|
3357
|
+
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0"
|
|
3358
3358
|
conditions: os=linux & cpu=arm & libc=musl
|
|
3359
3359
|
languageName: node
|
|
3360
3360
|
linkType: hard
|
|
3361
3361
|
|
|
3362
|
-
"@rollup/rollup-linux-arm64-gnu@npm:4.
|
|
3363
|
-
version: 4.
|
|
3364
|
-
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.
|
|
3362
|
+
"@rollup/rollup-linux-arm64-gnu@npm:4.35.0":
|
|
3363
|
+
version: 4.35.0
|
|
3364
|
+
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.35.0"
|
|
3365
3365
|
conditions: os=linux & cpu=arm64 & libc=glibc
|
|
3366
3366
|
languageName: node
|
|
3367
3367
|
linkType: hard
|
|
3368
3368
|
|
|
3369
|
-
"@rollup/rollup-linux-arm64-musl@npm:4.
|
|
3370
|
-
version: 4.
|
|
3371
|
-
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.
|
|
3369
|
+
"@rollup/rollup-linux-arm64-musl@npm:4.35.0":
|
|
3370
|
+
version: 4.35.0
|
|
3371
|
+
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.35.0"
|
|
3372
3372
|
conditions: os=linux & cpu=arm64 & libc=musl
|
|
3373
3373
|
languageName: node
|
|
3374
3374
|
linkType: hard
|
|
3375
3375
|
|
|
3376
|
-
"@rollup/rollup-linux-loongarch64-gnu@npm:4.
|
|
3377
|
-
version: 4.
|
|
3378
|
-
resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.
|
|
3376
|
+
"@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0":
|
|
3377
|
+
version: 4.35.0
|
|
3378
|
+
resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0"
|
|
3379
3379
|
conditions: os=linux & cpu=loong64 & libc=glibc
|
|
3380
3380
|
languageName: node
|
|
3381
3381
|
linkType: hard
|
|
3382
3382
|
|
|
3383
|
-
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.
|
|
3384
|
-
version: 4.
|
|
3385
|
-
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.
|
|
3383
|
+
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0":
|
|
3384
|
+
version: 4.35.0
|
|
3385
|
+
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0"
|
|
3386
3386
|
conditions: os=linux & cpu=ppc64 & libc=glibc
|
|
3387
3387
|
languageName: node
|
|
3388
3388
|
linkType: hard
|
|
3389
3389
|
|
|
3390
|
-
"@rollup/rollup-linux-riscv64-gnu@npm:4.
|
|
3391
|
-
version: 4.
|
|
3392
|
-
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.
|
|
3390
|
+
"@rollup/rollup-linux-riscv64-gnu@npm:4.35.0":
|
|
3391
|
+
version: 4.35.0
|
|
3392
|
+
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0"
|
|
3393
3393
|
conditions: os=linux & cpu=riscv64 & libc=glibc
|
|
3394
3394
|
languageName: node
|
|
3395
3395
|
linkType: hard
|
|
3396
3396
|
|
|
3397
|
-
"@rollup/rollup-linux-s390x-gnu@npm:4.
|
|
3398
|
-
version: 4.
|
|
3399
|
-
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.
|
|
3397
|
+
"@rollup/rollup-linux-s390x-gnu@npm:4.35.0":
|
|
3398
|
+
version: 4.35.0
|
|
3399
|
+
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.35.0"
|
|
3400
3400
|
conditions: os=linux & cpu=s390x & libc=glibc
|
|
3401
3401
|
languageName: node
|
|
3402
3402
|
linkType: hard
|
|
3403
3403
|
|
|
3404
|
-
"@rollup/rollup-linux-x64-gnu@npm:4.
|
|
3405
|
-
version: 4.
|
|
3406
|
-
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.
|
|
3404
|
+
"@rollup/rollup-linux-x64-gnu@npm:4.35.0":
|
|
3405
|
+
version: 4.35.0
|
|
3406
|
+
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.35.0"
|
|
3407
3407
|
conditions: os=linux & cpu=x64 & libc=glibc
|
|
3408
3408
|
languageName: node
|
|
3409
3409
|
linkType: hard
|
|
3410
3410
|
|
|
3411
|
-
"@rollup/rollup-linux-x64-musl@npm:4.
|
|
3412
|
-
version: 4.
|
|
3413
|
-
resolution: "@rollup/rollup-linux-x64-musl@npm:4.
|
|
3411
|
+
"@rollup/rollup-linux-x64-musl@npm:4.35.0":
|
|
3412
|
+
version: 4.35.0
|
|
3413
|
+
resolution: "@rollup/rollup-linux-x64-musl@npm:4.35.0"
|
|
3414
3414
|
conditions: os=linux & cpu=x64 & libc=musl
|
|
3415
3415
|
languageName: node
|
|
3416
3416
|
linkType: hard
|
|
3417
3417
|
|
|
3418
|
-
"@rollup/rollup-win32-arm64-msvc@npm:4.
|
|
3419
|
-
version: 4.
|
|
3420
|
-
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.
|
|
3418
|
+
"@rollup/rollup-win32-arm64-msvc@npm:4.35.0":
|
|
3419
|
+
version: 4.35.0
|
|
3420
|
+
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.35.0"
|
|
3421
3421
|
conditions: os=win32 & cpu=arm64
|
|
3422
3422
|
languageName: node
|
|
3423
3423
|
linkType: hard
|
|
3424
3424
|
|
|
3425
|
-
"@rollup/rollup-win32-ia32-msvc@npm:4.
|
|
3426
|
-
version: 4.
|
|
3427
|
-
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.
|
|
3425
|
+
"@rollup/rollup-win32-ia32-msvc@npm:4.35.0":
|
|
3426
|
+
version: 4.35.0
|
|
3427
|
+
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.35.0"
|
|
3428
3428
|
conditions: os=win32 & cpu=ia32
|
|
3429
3429
|
languageName: node
|
|
3430
3430
|
linkType: hard
|
|
3431
3431
|
|
|
3432
|
-
"@rollup/rollup-win32-x64-msvc@npm:4.
|
|
3433
|
-
version: 4.
|
|
3434
|
-
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.
|
|
3432
|
+
"@rollup/rollup-win32-x64-msvc@npm:4.35.0":
|
|
3433
|
+
version: 4.35.0
|
|
3434
|
+
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.35.0"
|
|
3435
3435
|
conditions: os=win32 & cpu=x64
|
|
3436
3436
|
languageName: node
|
|
3437
3437
|
linkType: hard
|
|
@@ -5692,11 +5692,11 @@ __metadata:
|
|
|
5692
5692
|
linkType: hard
|
|
5693
5693
|
|
|
5694
5694
|
"@types/node@npm:*":
|
|
5695
|
-
version: 22.13.
|
|
5696
|
-
resolution: "@types/node@npm:22.13.
|
|
5695
|
+
version: 22.13.10
|
|
5696
|
+
resolution: "@types/node@npm:22.13.10"
|
|
5697
5697
|
dependencies:
|
|
5698
5698
|
undici-types: "npm:~6.20.0"
|
|
5699
|
-
checksum: 10c0/
|
|
5699
|
+
checksum: 10c0/a3865f9503d6f718002374f7b87efaadfae62faa499c1a33b12c527cfb9fd86f733e1a1b026b80c5a0e4a965701174bc3305595a7d36078aa1abcf09daa5dee9
|
|
5700
5700
|
languageName: node
|
|
5701
5701
|
linkType: hard
|
|
5702
5702
|
|
|
@@ -6227,30 +6227,30 @@ __metadata:
|
|
|
6227
6227
|
languageName: node
|
|
6228
6228
|
linkType: hard
|
|
6229
6229
|
|
|
6230
|
-
"@volar/language-core@npm:2.4.
|
|
6231
|
-
version: 2.4.
|
|
6232
|
-
resolution: "@volar/language-core@npm:2.4.
|
|
6230
|
+
"@volar/language-core@npm:2.4.12, @volar/language-core@npm:~2.4.0-alpha.18":
|
|
6231
|
+
version: 2.4.12
|
|
6232
|
+
resolution: "@volar/language-core@npm:2.4.12"
|
|
6233
6233
|
dependencies:
|
|
6234
|
-
"@volar/source-map": "npm:2.4.
|
|
6235
|
-
checksum: 10c0/
|
|
6234
|
+
"@volar/source-map": "npm:2.4.12"
|
|
6235
|
+
checksum: 10c0/060978fe9fcd08b39dddf0dd41283d7b615491aab19634f69ecad72a2a7f111972b2137ed24777f58fd52f4f76d122b91d9bf9aaf5f7261ebb316dd63733c4e0
|
|
6236
6236
|
languageName: node
|
|
6237
6237
|
linkType: hard
|
|
6238
6238
|
|
|
6239
|
-
"@volar/source-map@npm:2.4.
|
|
6240
|
-
version: 2.4.
|
|
6241
|
-
resolution: "@volar/source-map@npm:2.4.
|
|
6242
|
-
checksum: 10c0/
|
|
6239
|
+
"@volar/source-map@npm:2.4.12":
|
|
6240
|
+
version: 2.4.12
|
|
6241
|
+
resolution: "@volar/source-map@npm:2.4.12"
|
|
6242
|
+
checksum: 10c0/433b5d6a9f1e1df1c7410d2dfca43e9c880f4688dde13323ee1c8d2f36cec7dce3e0549d444038384c279c0e1cf9a2764b401278bbfdf1ecfa427092c84fb944
|
|
6243
6243
|
languageName: node
|
|
6244
6244
|
linkType: hard
|
|
6245
6245
|
|
|
6246
6246
|
"@volar/typescript@npm:^2.3.4, @volar/typescript@npm:~2.4.0-alpha.18":
|
|
6247
|
-
version: 2.4.
|
|
6248
|
-
resolution: "@volar/typescript@npm:2.4.
|
|
6247
|
+
version: 2.4.12
|
|
6248
|
+
resolution: "@volar/typescript@npm:2.4.12"
|
|
6249
6249
|
dependencies:
|
|
6250
|
-
"@volar/language-core": "npm:2.4.
|
|
6250
|
+
"@volar/language-core": "npm:2.4.12"
|
|
6251
6251
|
path-browserify: "npm:^1.0.1"
|
|
6252
6252
|
vscode-uri: "npm:^3.0.8"
|
|
6253
|
-
checksum: 10c0/
|
|
6253
|
+
checksum: 10c0/fa08dccecc1c41b1b44aa9d4582e75d67c484cc6366075fc84de5e4611b6d7f6fed72a30bad0794a6b3f16003c49a19b5cd1759b79ae4b1c6bc9c8aa4012e413
|
|
6254
6254
|
languageName: node
|
|
6255
6255
|
linkType: hard
|
|
6256
6256
|
|
|
@@ -6604,11 +6604,11 @@ __metadata:
|
|
|
6604
6604
|
linkType: hard
|
|
6605
6605
|
|
|
6606
6606
|
"acorn@npm:^8.14.0, acorn@npm:^8.5.0, acorn@npm:^8.8.2":
|
|
6607
|
-
version: 8.14.
|
|
6608
|
-
resolution: "acorn@npm:8.14.
|
|
6607
|
+
version: 8.14.1
|
|
6608
|
+
resolution: "acorn@npm:8.14.1"
|
|
6609
6609
|
bin:
|
|
6610
6610
|
acorn: bin/acorn
|
|
6611
|
-
checksum: 10c0/
|
|
6611
|
+
checksum: 10c0/dbd36c1ed1d2fa3550140000371fcf721578095b18777b85a79df231ca093b08edc6858d75d6e48c73e431c174dcf9214edbd7e6fa5911b93bd8abfa54e47123
|
|
6612
6612
|
languageName: node
|
|
6613
6613
|
linkType: hard
|
|
6614
6614
|
|
|
@@ -7278,9 +7278,9 @@ __metadata:
|
|
|
7278
7278
|
linkType: hard
|
|
7279
7279
|
|
|
7280
7280
|
"axe-core@npm:^4.2.0, axe-core@npm:^4.3.5":
|
|
7281
|
-
version: 4.10.
|
|
7282
|
-
resolution: "axe-core@npm:4.10.
|
|
7283
|
-
checksum: 10c0/
|
|
7281
|
+
version: 4.10.3
|
|
7282
|
+
resolution: "axe-core@npm:4.10.3"
|
|
7283
|
+
checksum: 10c0/1b1c24f435b2ffe89d76eca0001cbfff42dbf012ad9bd37398b70b11f0d614281a38a28bc3069e8972e3c90ec929a8937994bd24b0ebcbaab87b8d1e241ab0c7
|
|
7284
7284
|
languageName: node
|
|
7285
7285
|
linkType: hard
|
|
7286
7286
|
|
|
@@ -8032,7 +8032,7 @@ __metadata:
|
|
|
8032
8032
|
languageName: node
|
|
8033
8033
|
linkType: hard
|
|
8034
8034
|
|
|
8035
|
-
"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3":
|
|
8035
|
+
"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3, call-bound@npm:^1.0.4":
|
|
8036
8036
|
version: 1.0.4
|
|
8037
8037
|
resolution: "call-bound@npm:1.0.4"
|
|
8038
8038
|
dependencies:
|
|
@@ -8100,9 +8100,9 @@ __metadata:
|
|
|
8100
8100
|
linkType: hard
|
|
8101
8101
|
|
|
8102
8102
|
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001688":
|
|
8103
|
-
version: 1.0.
|
|
8104
|
-
resolution: "caniuse-lite@npm:1.0.
|
|
8105
|
-
checksum: 10c0/
|
|
8103
|
+
version: 1.0.30001703
|
|
8104
|
+
resolution: "caniuse-lite@npm:1.0.30001703"
|
|
8105
|
+
checksum: 10c0/ed88e318da28e9e59c4ac3a2e3c42859558b7b713aebf03696a1f916e4ed4b70734dda82be04635e2b62ec355b8639bbed829b7b12ff528d7f9cc31a3a5bea91
|
|
8106
8106
|
languageName: node
|
|
8107
8107
|
linkType: hard
|
|
8108
8108
|
|
|
@@ -9889,9 +9889,9 @@ __metadata:
|
|
|
9889
9889
|
linkType: hard
|
|
9890
9890
|
|
|
9891
9891
|
"electron-to-chromium@npm:^1.3.564, electron-to-chromium@npm:^1.5.73":
|
|
9892
|
-
version: 1.5.
|
|
9893
|
-
resolution: "electron-to-chromium@npm:1.5.
|
|
9894
|
-
checksum: 10c0/
|
|
9892
|
+
version: 1.5.114
|
|
9893
|
+
resolution: "electron-to-chromium@npm:1.5.114"
|
|
9894
|
+
checksum: 10c0/cb86057d78f1aeb53ab6550dedacfd9496bcc6676bab7b48466c3958ba9ce0ed78c7213b1eab99ba38542cbaaa176eb7f8ea8b0274c0688b8ce3058291549430
|
|
9895
9895
|
languageName: node
|
|
9896
9896
|
linkType: hard
|
|
9897
9897
|
|
|
@@ -11236,7 +11236,7 @@ __metadata:
|
|
|
11236
11236
|
languageName: node
|
|
11237
11237
|
linkType: hard
|
|
11238
11238
|
|
|
11239
|
-
"for-each@npm:^0.3.3":
|
|
11239
|
+
"for-each@npm:^0.3.3, for-each@npm:^0.3.5":
|
|
11240
11240
|
version: 0.3.5
|
|
11241
11241
|
resolution: "for-each@npm:0.3.5"
|
|
11242
11242
|
dependencies:
|
|
@@ -13804,9 +13804,9 @@ __metadata:
|
|
|
13804
13804
|
linkType: hard
|
|
13805
13805
|
|
|
13806
13806
|
"libphonenumber-js@npm:^1.9.11":
|
|
13807
|
-
version: 1.12.
|
|
13808
|
-
resolution: "libphonenumber-js@npm:1.12.
|
|
13809
|
-
checksum: 10c0/
|
|
13807
|
+
version: 1.12.5
|
|
13808
|
+
resolution: "libphonenumber-js@npm:1.12.5"
|
|
13809
|
+
checksum: 10c0/8d892015c70da77d1bfa77023ffe150c1443c31778d39dca0b41000e527273b39d60442168f41131330279b11367ecfcbedd971afa36dad4edf5041d90206127
|
|
13810
13810
|
languageName: node
|
|
13811
13811
|
linkType: hard
|
|
13812
13812
|
|
|
@@ -14966,11 +14966,11 @@ __metadata:
|
|
|
14966
14966
|
linkType: hard
|
|
14967
14967
|
|
|
14968
14968
|
"nanoid@npm:^3.3.7, nanoid@npm:^3.3.8":
|
|
14969
|
-
version: 3.3.
|
|
14970
|
-
resolution: "nanoid@npm:3.3.
|
|
14969
|
+
version: 3.3.9
|
|
14970
|
+
resolution: "nanoid@npm:3.3.9"
|
|
14971
14971
|
bin:
|
|
14972
14972
|
nanoid: bin/nanoid.cjs
|
|
14973
|
-
checksum: 10c0/
|
|
14973
|
+
checksum: 10c0/4515abe53db7b150cf77074558efc20d8e916d6910d557b5ce72e8bbf6f8e7554d3d7a0d180bfa65e5d8e99aa51b207aa8a3bf5f3b56233897b146d592e30b24
|
|
14974
14974
|
languageName: node
|
|
14975
14975
|
linkType: hard
|
|
14976
14976
|
|
|
@@ -16751,9 +16751,9 @@ __metadata:
|
|
|
16751
16751
|
linkType: hard
|
|
16752
16752
|
|
|
16753
16753
|
"prismjs@npm:^1.21.0":
|
|
16754
|
-
version: 1.
|
|
16755
|
-
resolution: "prismjs@npm:1.
|
|
16756
|
-
checksum: 10c0/
|
|
16754
|
+
version: 1.30.0
|
|
16755
|
+
resolution: "prismjs@npm:1.30.0"
|
|
16756
|
+
checksum: 10c0/f56205bfd58ef71ccfcbcb691fd0eb84adc96c6ff21b0b69fc6fdcf02be42d6ef972ba4aed60466310de3d67733f6a746f89f2fb79c00bf217406d465b3e8f23
|
|
16757
16757
|
languageName: node
|
|
16758
16758
|
linkType: hard
|
|
16759
16759
|
|
|
@@ -18928,28 +18928,28 @@ __metadata:
|
|
|
18928
18928
|
linkType: hard
|
|
18929
18929
|
|
|
18930
18930
|
"rollup@npm:^4.13.0":
|
|
18931
|
-
version: 4.
|
|
18932
|
-
resolution: "rollup@npm:4.
|
|
18933
|
-
dependencies:
|
|
18934
|
-
"@rollup/rollup-android-arm-eabi": "npm:4.
|
|
18935
|
-
"@rollup/rollup-android-arm64": "npm:4.
|
|
18936
|
-
"@rollup/rollup-darwin-arm64": "npm:4.
|
|
18937
|
-
"@rollup/rollup-darwin-x64": "npm:4.
|
|
18938
|
-
"@rollup/rollup-freebsd-arm64": "npm:4.
|
|
18939
|
-
"@rollup/rollup-freebsd-x64": "npm:4.
|
|
18940
|
-
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.
|
|
18941
|
-
"@rollup/rollup-linux-arm-musleabihf": "npm:4.
|
|
18942
|
-
"@rollup/rollup-linux-arm64-gnu": "npm:4.
|
|
18943
|
-
"@rollup/rollup-linux-arm64-musl": "npm:4.
|
|
18944
|
-
"@rollup/rollup-linux-loongarch64-gnu": "npm:4.
|
|
18945
|
-
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.
|
|
18946
|
-
"@rollup/rollup-linux-riscv64-gnu": "npm:4.
|
|
18947
|
-
"@rollup/rollup-linux-s390x-gnu": "npm:4.
|
|
18948
|
-
"@rollup/rollup-linux-x64-gnu": "npm:4.
|
|
18949
|
-
"@rollup/rollup-linux-x64-musl": "npm:4.
|
|
18950
|
-
"@rollup/rollup-win32-arm64-msvc": "npm:4.
|
|
18951
|
-
"@rollup/rollup-win32-ia32-msvc": "npm:4.
|
|
18952
|
-
"@rollup/rollup-win32-x64-msvc": "npm:4.
|
|
18931
|
+
version: 4.35.0
|
|
18932
|
+
resolution: "rollup@npm:4.35.0"
|
|
18933
|
+
dependencies:
|
|
18934
|
+
"@rollup/rollup-android-arm-eabi": "npm:4.35.0"
|
|
18935
|
+
"@rollup/rollup-android-arm64": "npm:4.35.0"
|
|
18936
|
+
"@rollup/rollup-darwin-arm64": "npm:4.35.0"
|
|
18937
|
+
"@rollup/rollup-darwin-x64": "npm:4.35.0"
|
|
18938
|
+
"@rollup/rollup-freebsd-arm64": "npm:4.35.0"
|
|
18939
|
+
"@rollup/rollup-freebsd-x64": "npm:4.35.0"
|
|
18940
|
+
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.35.0"
|
|
18941
|
+
"@rollup/rollup-linux-arm-musleabihf": "npm:4.35.0"
|
|
18942
|
+
"@rollup/rollup-linux-arm64-gnu": "npm:4.35.0"
|
|
18943
|
+
"@rollup/rollup-linux-arm64-musl": "npm:4.35.0"
|
|
18944
|
+
"@rollup/rollup-linux-loongarch64-gnu": "npm:4.35.0"
|
|
18945
|
+
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.35.0"
|
|
18946
|
+
"@rollup/rollup-linux-riscv64-gnu": "npm:4.35.0"
|
|
18947
|
+
"@rollup/rollup-linux-s390x-gnu": "npm:4.35.0"
|
|
18948
|
+
"@rollup/rollup-linux-x64-gnu": "npm:4.35.0"
|
|
18949
|
+
"@rollup/rollup-linux-x64-musl": "npm:4.35.0"
|
|
18950
|
+
"@rollup/rollup-win32-arm64-msvc": "npm:4.35.0"
|
|
18951
|
+
"@rollup/rollup-win32-ia32-msvc": "npm:4.35.0"
|
|
18952
|
+
"@rollup/rollup-win32-x64-msvc": "npm:4.35.0"
|
|
18953
18953
|
"@types/estree": "npm:1.0.6"
|
|
18954
18954
|
fsevents: "npm:~2.3.2"
|
|
18955
18955
|
dependenciesMeta:
|
|
@@ -18995,7 +18995,7 @@ __metadata:
|
|
|
18995
18995
|
optional: true
|
|
18996
18996
|
bin:
|
|
18997
18997
|
rollup: dist/bin/rollup
|
|
18998
|
-
checksum: 10c0/
|
|
18998
|
+
checksum: 10c0/5a04add5a48173b1d95deb5422a96833b7df91b14ccec462c048be48241a79ecee2c1b843511b91ca8b6124bdbae134ccfebe80d4222a93e98e73795d161d3cc
|
|
18999
18999
|
languageName: node
|
|
19000
19000
|
linkType: hard
|
|
19001
19001
|
|
|
@@ -22016,16 +22016,17 @@ __metadata:
|
|
|
22016
22016
|
linkType: hard
|
|
22017
22017
|
|
|
22018
22018
|
"which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.18":
|
|
22019
|
-
version: 1.1.
|
|
22020
|
-
resolution: "which-typed-array@npm:1.1.
|
|
22019
|
+
version: 1.1.19
|
|
22020
|
+
resolution: "which-typed-array@npm:1.1.19"
|
|
22021
22021
|
dependencies:
|
|
22022
22022
|
available-typed-arrays: "npm:^1.0.7"
|
|
22023
22023
|
call-bind: "npm:^1.0.8"
|
|
22024
|
-
call-bound: "npm:^1.0.
|
|
22025
|
-
for-each: "npm:^0.3.
|
|
22024
|
+
call-bound: "npm:^1.0.4"
|
|
22025
|
+
for-each: "npm:^0.3.5"
|
|
22026
|
+
get-proto: "npm:^1.0.1"
|
|
22026
22027
|
gopd: "npm:^1.2.0"
|
|
22027
22028
|
has-tostringtag: "npm:^1.0.2"
|
|
22028
|
-
checksum: 10c0/
|
|
22029
|
+
checksum: 10c0/702b5dc878addafe6c6300c3d0af5983b175c75fcb4f2a72dfc3dd38d93cf9e89581e4b29c854b16ea37e50a7d7fca5ae42ece5c273d8060dcd603b2404bbb3f
|
|
22029
22030
|
languageName: node
|
|
22030
22031
|
linkType: hard
|
|
22031
22032
|
|