@licklist/design 0.44.542 → 0.44.543
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/availability-indicator/AvailabilityIndicator.d.ts +5 -4
- package/dist/availability-indicator/AvailabilityIndicator.d.ts.map +1 -1
- package/dist/availability-indicator/AvailabilityIndicator.js +1 -1
- package/dist/calendar/Calendar.d.ts +2 -4
- package/dist/calendar/Calendar.d.ts.map +1 -1
- package/dist/date-time-button/DateTimeButton.d.ts +4 -5
- package/dist/date-time-button/DateTimeButton.d.ts.map +1 -1
- package/dist/date-time-button/DateTimeButton.js +1 -1
- package/dist/events/edit-event-modal/utils/getDefaultProductSet.d.ts.map +1 -1
- package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +1 -1
- package/dist/iframe/activity-card/ActivityCard.d.ts +1 -3
- package/dist/iframe/activity-card/ActivityCard.d.ts.map +1 -1
- package/dist/iframe/activity-card/ActivityCard.js +1 -1
- package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.d.ts +3 -1
- package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.d.ts.map +1 -1
- package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.js +1 -1
- package/dist/product-set/control/DateAndRecurrenceInput.d.ts +5 -1
- package/dist/product-set/control/DateAndRecurrenceInput.d.ts.map +1 -1
- package/dist/product-set/control/DateAndRecurrenceInput.js +1 -1
- package/dist/product-set/control/ProductSetControl.d.ts +4 -2
- package/dist/product-set/control/ProductSetControl.d.ts.map +1 -1
- package/dist/product-set/control/ProductSetControl.js +1 -1
- package/dist/product-set/control/ProductSetRecurrenceControl.d.ts +2 -1
- package/dist/product-set/control/ProductSetRecurrenceControl.d.ts.map +1 -1
- package/dist/product-set/control/ProductSetRecurrenceControl.js +1 -1
- package/dist/product-set/form/ProductSetForm.d.ts +3 -1
- package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
- package/dist/product-set/form/ProductSetForm.js +1 -1
- package/dist/product-set/utils/index.d.ts +10 -0
- package/dist/product-set/utils/index.d.ts.map +1 -1
- package/dist/product-set/utils/index.js +1 -1
- package/dist/recurring-date-picker-input/RecurringDatePickerInput.js +1 -1
- package/dist/sales/payment-form/SalePaymentForm.js +1 -1
- package/dist/styles/activity-card/GridActivitiesCard.scss +0 -8
- package/dist/styles/form/CustomCheckbox.scss +1 -0
- package/dist/styles/zones/ZoneForm.scss +3 -0
- package/dist/zone/form/ZoneForm.d.ts +1 -1
- package/dist/zone/form/ZoneForm.d.ts.map +1 -1
- package/dist/zone/form/ZoneForm.js +1 -1
- package/dist/zone/form/components/AvailableTimesControl.d.ts +2 -0
- package/dist/zone/form/components/AvailableTimesControl.d.ts.map +1 -1
- package/dist/zone/form/components/AvailableTimesControl.js +1 -1
- package/dist/zone/form/components/ZoneControl.d.ts +1 -1
- package/dist/zone/form/components/ZoneControl.d.ts.map +1 -1
- package/dist/zone/form/components/ZoneControl.js +1 -1
- package/dist/zone/form/components/ZoneRecurrencesControl.d.ts +1 -1
- package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map +1 -1
- package/dist/zone/form/components/ZoneRecurrencesControl.js +1 -1
- package/package.json +1 -1
- package/src/availability-indicator/AvailabilityIndicator.tsx +41 -33
- package/src/calendar/Calendar.tsx +2 -3
- package/src/date-time-button/DateTimeButton.tsx +11 -6
- package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.stories.tsx +0 -3
- package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +0 -1
- package/src/iframe/activity-card/ActivityCard.stories.tsx +27 -51
- package/src/iframe/activity-card/ActivityCard.tsx +2 -13
- package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx +13 -32
- package/src/product-set/control/DateAndRecurrenceInput.tsx +73 -2
- package/src/product-set/control/ProductSetControl.stories.tsx +0 -2
- package/src/product-set/control/ProductSetControl.tsx +8 -10
- package/src/product-set/control/ProductSetRecurrenceControl.tsx +6 -1
- package/src/product-set/form/ProductSetForm.stories.tsx +6 -6
- package/src/product-set/form/ProductSetForm.tsx +19 -3
- package/src/product-set/utils/index.ts +38 -0
- package/src/styles/activity-card/GridActivitiesCard.scss +0 -8
- package/src/styles/form/CustomCheckbox.scss +1 -0
- package/src/styles/zones/ZoneForm.scss +3 -0
- package/src/zone/form/ZoneForm.tsx +1 -2
- package/src/zone/form/components/AvailableTimesControl.tsx +89 -83
- package/src/zone/form/components/ZoneControl.tsx +2 -5
- package/src/zone/form/components/ZoneRecurrencesControl.tsx +2 -51
|
@@ -11,8 +11,6 @@ import {
|
|
|
11
11
|
} from "@dnd-kit/sortable";
|
|
12
12
|
import { DndContext } from "@dnd-kit/core";
|
|
13
13
|
import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
|
|
14
|
-
import { DateTime } from "luxon";
|
|
15
|
-
import { TIME_FORMAT } from "@licklist/core/dist/Config";
|
|
16
14
|
|
|
17
15
|
import { CONFIRM_MODAL_ACTIONS } from "../../../modals/confirmation/ConfirmModal";
|
|
18
16
|
import { Icon } from "../../../static";
|
|
@@ -21,10 +19,6 @@ import {
|
|
|
21
19
|
RecurringDatePickerInputValues,
|
|
22
20
|
} from "../../../recurring-date-picker-input/RecurringDatePickerInput";
|
|
23
21
|
import { ZoneRecurrenceControl } from "./ZoneRecurrenceControl";
|
|
24
|
-
import {
|
|
25
|
-
AvailableTimesControl,
|
|
26
|
-
AvailableTimesControlRef,
|
|
27
|
-
} from "./AvailableTimesControl";
|
|
28
22
|
import { sameWidthPopperModifier } from "../../../product-set/control/DateAndRecurrenceInput";
|
|
29
23
|
|
|
30
24
|
export interface DateAndRecurrenceInputValues {
|
|
@@ -36,10 +30,7 @@ export type ZoneRecurrenceControlProps = {
|
|
|
36
30
|
isLoading?: boolean;
|
|
37
31
|
};
|
|
38
32
|
|
|
39
|
-
export const ZoneRecurrencesControl = ({
|
|
40
|
-
workHours,
|
|
41
|
-
isLoading = false,
|
|
42
|
-
}: ZoneRecurrenceControlProps) => {
|
|
33
|
+
export const ZoneRecurrencesControl = () => {
|
|
43
34
|
const {
|
|
44
35
|
control,
|
|
45
36
|
register,
|
|
@@ -63,9 +54,7 @@ export const ZoneRecurrencesControl = ({
|
|
|
63
54
|
values: null,
|
|
64
55
|
});
|
|
65
56
|
const clearEditState = () => setEditState({ index: null, values: null });
|
|
66
|
-
const [availableTimes, setAvailableTimes] = useState<string[]>([]);
|
|
67
57
|
const popoverRef = useRef<HTMLDivElement>();
|
|
68
|
-
const availableTimesFormRef = useRef<AvailableTimesControlRef>();
|
|
69
58
|
|
|
70
59
|
useClickAway(popoverRef, (event) => {
|
|
71
60
|
const isModal = CONFIRM_MODAL_ACTIONS.includes(
|
|
@@ -88,42 +77,12 @@ export const ZoneRecurrencesControl = ({
|
|
|
88
77
|
const handleRecurringDateChange = async (
|
|
89
78
|
next: RecurringDatePickerInputValues
|
|
90
79
|
) => {
|
|
91
|
-
const isAvailableTimesFormValid =
|
|
92
|
-
await availableTimesFormRef.current?.trigger();
|
|
93
|
-
if (!isAvailableTimesFormValid) {
|
|
94
|
-
return;
|
|
95
|
-
}
|
|
96
|
-
if (next?.startTime && next?.endTime) {
|
|
97
|
-
const startTime = DateTime.fromISO(next.startTime);
|
|
98
|
-
const endTime = DateTime.fromISO(next.endTime);
|
|
99
|
-
const { availableTimes } = availableTimesFormRef.current.getValues();
|
|
100
|
-
const validAvalilableTimes = availableTimes.every((time) => {
|
|
101
|
-
const currentAvailableTime = DateTime.fromFormat(time, TIME_FORMAT);
|
|
102
|
-
|
|
103
|
-
return (
|
|
104
|
-
currentAvailableTime.diff(startTime, "minutes").minutes >= 0 &&
|
|
105
|
-
currentAvailableTime.diff(endTime, "minutes").minutes <= 0
|
|
106
|
-
);
|
|
107
|
-
});
|
|
108
|
-
if (!validAvalilableTimes) {
|
|
109
|
-
availableTimesFormRef.current.setError("availableTimes", {
|
|
110
|
-
message: t("Validation:fieldTimeBetween", {
|
|
111
|
-
attribute: t("Design:startTimesSmall"),
|
|
112
|
-
min: startTime.toFormat(TIME_FORMAT),
|
|
113
|
-
max: endTime.toFormat(TIME_FORMAT),
|
|
114
|
-
}),
|
|
115
|
-
});
|
|
116
|
-
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
80
|
const values = {
|
|
121
81
|
rrule: next.rrule,
|
|
122
82
|
startDate: next.startDate,
|
|
123
83
|
endDate: next.endDate,
|
|
124
84
|
startTime: next.startTime,
|
|
125
85
|
endTime: next.endTime,
|
|
126
|
-
...availableTimesFormRef.current.getValues(),
|
|
127
86
|
} as Partial<ZoneRecurrence>;
|
|
128
87
|
|
|
129
88
|
if (editState.values?.id) {
|
|
@@ -144,7 +103,6 @@ export const ZoneRecurrencesControl = ({
|
|
|
144
103
|
clearEditState();
|
|
145
104
|
|
|
146
105
|
setEditState({ index, values: next });
|
|
147
|
-
setAvailableTimes(next.availableTimes || []);
|
|
148
106
|
setIsDatePopoverVisible(() => true);
|
|
149
107
|
};
|
|
150
108
|
|
|
@@ -208,14 +166,7 @@ export const ZoneRecurrencesControl = ({
|
|
|
208
166
|
onChange={handleRecurringDateChange}
|
|
209
167
|
onDelete={handleDelete}
|
|
210
168
|
setInitialStartDateAfterSelect
|
|
211
|
-
|
|
212
|
-
<AvailableTimesControl
|
|
213
|
-
workHours={workHours}
|
|
214
|
-
isLoading={isLoading}
|
|
215
|
-
defaultValues={availableTimes}
|
|
216
|
-
ref={availableTimesFormRef}
|
|
217
|
-
/>
|
|
218
|
-
</RecurringDatePickerInput>
|
|
169
|
+
/>
|
|
219
170
|
</Popover.Content>
|
|
220
171
|
</Popover>
|
|
221
172
|
}
|