@licklist/design 0.67.0 → 0.67.2-dev.0

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.
Files changed (249) hide show
  1. package/.storybook/main.cjs +15 -12
  2. package/dist/auth/Login/LoginComponent.js +2 -1
  3. package/dist/calendar/components/CalendarButtons/CalendarButtons.d.ts.map +1 -1
  4. package/dist/calendar/components/CalendarButtons/CalendarButtons.js +35 -40
  5. package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.d.ts.map +1 -1
  6. package/dist/events/edit-event-modal/component/EditEventForm/EditEventForm.js +4 -2
  7. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts +2 -1
  8. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.d.ts.map +1 -1
  9. package/dist/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.js +13 -11
  10. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.d.ts +2 -1
  11. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.d.ts.map +1 -1
  12. package/dist/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.js +4 -2
  13. package/dist/events/edit-event-modal/utils/getDefaultProductSet.d.ts.map +1 -1
  14. package/dist/events/edit-event-modal/utils/getDefaultProductSet.js +0 -1
  15. package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.d.ts.map +1 -1
  16. package/dist/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.js +2 -0
  17. package/dist/iframe/payment/order-items-table/utils/paymentSummary.d.ts.map +1 -1
  18. package/dist/layout/DropDown.d.ts +2 -1
  19. package/dist/layout/DropDown.d.ts.map +1 -1
  20. package/dist/layout/DropDownToggle.d.ts.map +1 -1
  21. package/dist/layout/DropDownToggle.js +1 -0
  22. package/dist/product-set/control/DateAndRecurrenceInput.d.ts +1 -1
  23. package/dist/product-set/control/DateAndRecurrenceInput.d.ts.map +1 -1
  24. package/dist/product-set/control/DateAndRecurrenceInput.js +1 -0
  25. package/dist/product-set/control/DateInput.d.ts.map +1 -1
  26. package/dist/product-set/control/DateInput.js +2 -2
  27. package/dist/product-set/control/ProductSetControl.d.ts +3 -2
  28. package/dist/product-set/control/ProductSetControl.d.ts.map +1 -1
  29. package/dist/product-set/control/ProductSetControl.js +15 -2
  30. package/dist/product-set/form/ProductCategoriesControl.d.ts.map +1 -1
  31. package/dist/product-set/form/ProductCategoriesControl.js +48 -2
  32. package/dist/product-set/form/ProductSetForm.d.ts +4 -1
  33. package/dist/product-set/form/ProductSetForm.d.ts.map +1 -1
  34. package/dist/product-set/form/ProductSetForm.js +60 -2
  35. package/dist/product-set/form/ProductZonesControl.d.ts.map +1 -1
  36. package/dist/product-set/form/ProductZonesControl.js +0 -2
  37. package/dist/product-set/form/SelectCategoryModal.d.ts +12 -0
  38. package/dist/product-set/form/SelectCategoryModal.d.ts.map +1 -1
  39. package/dist/product-set/form/SelectCategoryModal.js +1 -1
  40. package/dist/product-set/form/SubProductsControl.d.ts.map +1 -1
  41. package/dist/product-set/form/SubProductsControl.js +0 -3
  42. package/dist/product-set/form/VenueMapsControl.d.ts.map +1 -1
  43. package/dist/product-set/form/VenueMapsControl.js +0 -3
  44. package/dist/provider/location-input/LocationInput.d.ts +4 -1
  45. package/dist/provider/location-input/LocationInput.d.ts.map +1 -1
  46. package/dist/provider/location-input/LocationInput.js +46 -2
  47. package/dist/provider/location-input/index.d.ts +1 -0
  48. package/dist/provider/location-input/index.d.ts.map +1 -1
  49. package/dist/provider/provider-form/ProviderForm.d.ts +3 -1
  50. package/dist/provider/provider-form/ProviderForm.d.ts.map +1 -1
  51. package/dist/provider/provider-form/ProviderForm.js +26 -5
  52. package/dist/provider/venue-form/VenueForm.d.ts +3 -1
  53. package/dist/provider/venue-form/VenueForm.d.ts.map +1 -1
  54. package/dist/provider/venue-form/VenueForm.js +4 -2
  55. package/dist/provider/working-hours-input/WorkingHoursInputDescription.d.ts.map +1 -1
  56. package/dist/provider/working-hours-input/WorkingHoursInputDescription.js +4 -8
  57. package/dist/recurring-date-picker-input/RecurringDatePickerInput.d.ts +3 -1
  58. package/dist/recurring-date-picker-input/RecurringDatePickerInput.d.ts.map +1 -1
  59. package/dist/recurring-date-picker-input/RecurringDatePickerInput.js +6 -3
  60. package/dist/recurring-date-picker-input/utils.d.ts +5 -0
  61. package/dist/recurring-date-picker-input/utils.d.ts.map +1 -1
  62. package/dist/recurring-date-picker-input/utils.js +75 -3
  63. package/dist/sales/booking/results/components/ResultCard.d.ts.map +1 -1
  64. package/dist/sales/booking/results/components/ResultCard.js +0 -2
  65. package/dist/setting/admin/AdminSettingForm.d.ts +2 -2
  66. package/dist/setting/admin/AdminSettingForm.d.ts.map +1 -1
  67. package/dist/snippet/snippet-template/preview/Preview.d.ts.map +1 -1
  68. package/dist/snippet/snippet-template/preview/Preview.js +6 -0
  69. package/dist/sortable-tree/SortableTreeItem.d.ts +2 -1
  70. package/dist/sortable-tree/SortableTreeItem.d.ts.map +1 -1
  71. package/dist/sortable-tree/SortableTreeItem.js +10 -4
  72. package/dist/styles/auth/AccessDenied.scss +1 -1
  73. package/dist/styles/back-button/BackButton.scss +25 -24
  74. package/dist/styles/back-button/_index.scss +1 -1
  75. package/dist/styles/company-user-form/UserForm.scss +4 -7
  76. package/dist/styles/company-user-form/_index.scss +1 -1
  77. package/dist/styles/custom-fields/CreateSortableListItem.scss +2 -1
  78. package/dist/styles/custom-fields/_index.scss +1 -1
  79. package/dist/styles/customers/Filter.scss +5 -5
  80. package/dist/styles/events/EditEventModal.scss +1 -3
  81. package/dist/styles/events/EventVenueMap.scss +7 -7
  82. package/dist/styles/form/Input.scss +1 -1
  83. package/dist/styles/header/Header.scss +1 -1
  84. package/dist/styles/header/elements/CompanySelector.scss +2 -2
  85. package/dist/styles/iframe-events/Calendar.scss +0 -1
  86. package/dist/styles/iframe-events/CalendarSelect.scss +1 -1
  87. package/dist/styles/iframe-events/CategoryStepsForm.scss +6 -7
  88. package/dist/styles/iframe-events/Event.scss +2 -4
  89. package/dist/styles/iframe-events/EventForm.scss +54 -54
  90. package/dist/styles/iframe-events/EventNavigationFooter.scss +1 -0
  91. package/dist/styles/iframe-events/TicketDescription.scss +1 -1
  92. package/dist/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
  93. package/dist/styles/iframe-payments/PaymentForm.scss +1 -1
  94. package/dist/styles/layout/BackgroundVideoContainer.scss +2 -2
  95. package/dist/styles/notification/Notification.scss +1 -1
  96. package/dist/styles/order-items-table/OrderItemsTable.scss +1 -2
  97. package/dist/styles/product-set/CreateProductSetItem.scss +15 -13
  98. package/dist/styles/product-set/DateAndRecurrenceInput.scss +6 -8
  99. package/dist/styles/product-set/EditCategoryModal.scss +4 -4
  100. package/dist/styles/product-set/EditProductModal.scss +3 -3
  101. package/dist/styles/product-set/EditStepModal.scss +4 -4
  102. package/dist/styles/product-set/EditVenueMapSetModal.scss +6 -6
  103. package/dist/styles/product-set/ProductSetForm.scss +25 -2
  104. package/dist/styles/product-set/TutorialGifCard.scss +1 -1
  105. package/dist/styles/product-set/_index.scss +2 -2
  106. package/dist/styles/report/ReportCard.scss +1 -0
  107. package/dist/styles/report/_index.scss +1 -1
  108. package/dist/styles/resources-blocking/_index.scss +4 -0
  109. package/dist/styles/sales/BookingFilter.scss +2 -2
  110. package/dist/styles/sales/BookingResults.scss +1 -1
  111. package/dist/styles/sales/BookingTabs.scss +7 -5
  112. package/dist/styles/sales/Filters.scss +5 -4
  113. package/dist/styles/sales/GuestProfile.scss +170 -175
  114. package/dist/styles/sales/LifeTimeSales.scss +1 -1
  115. package/dist/styles/sales/ManualBooking.scss +4 -2
  116. package/dist/styles/snippet-templates/_snippetVariables.scss +63 -244
  117. package/dist/styles/sortable-field/SortableField.scss +16 -16
  118. package/dist/styles/sortable-field/_index.scss +1 -1
  119. package/dist/styles/sortable-tree/Item.scss +4 -4
  120. package/dist/styles/table/Table.scss +1 -1
  121. package/dist/styles/themes/bookedit/_variables.scss +10 -32
  122. package/dist/styles/themes/licklist/_variables.scss +1 -1
  123. package/dist/styles/tiptap-editor/TiptapEditor.scss +9 -10
  124. package/dist/styles/tiptap-editor/_index.scss +1 -1
  125. package/dist/styles/venue-map-sets/VenueMapSetForm.scss +5 -4
  126. package/dist/styles/virtualized/_index.scss +1 -1
  127. package/dist/styles/zones/ZoneForm.scss +1 -0
  128. package/dist/styles/zones/ZoneRecurrencesControl.scss +6 -8
  129. package/dist/zone/form/ZoneForm.d.ts +2 -2
  130. package/dist/zone/form/ZoneForm.d.ts.map +1 -1
  131. package/dist/zone/form/ZoneForm.js +3 -2
  132. package/dist/zone/form/components/ZoneControl.d.ts +2 -2
  133. package/dist/zone/form/components/ZoneControl.d.ts.map +1 -1
  134. package/dist/zone/form/components/ZoneControl.js +4 -2
  135. package/dist/zone/form/components/ZoneRecurrencesControl.d.ts +4 -4
  136. package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map +1 -1
  137. package/dist/zone/form/components/ZoneRecurrencesControl.js +4 -2
  138. package/dist/zone/form/utils/dates.d.ts.map +1 -1
  139. package/package.json +7 -7
  140. package/src/auth/ChangePassword/ChangePassword.stories.tsx +1 -1
  141. package/src/auth/Login/LoginComponent.tsx +1 -1
  142. package/src/auth/ResetPassword/ResetPassword.stories.tsx +1 -1
  143. package/src/calendar/components/CalendarButtons/CalendarButtons.tsx +31 -28
  144. package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx +2 -0
  145. package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx +18 -12
  146. package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx +4 -0
  147. package/src/events/edit-event-modal/utils/getDefaultProductSet.ts +0 -1
  148. package/src/header/elements/Elements.stories.tsx +1 -1
  149. package/src/help/popover/Popover.stories.tsx +1 -1
  150. package/src/iframe/event/event-venue-map/IframeEventVenueMap.stories.tsx +3 -3
  151. package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx +1 -0
  152. package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx +1 -0
  153. package/src/layout/DropDown.tsx +2 -1
  154. package/src/layout/DropDownToggle.tsx +2 -0
  155. package/src/product-set/card/ProductSetCard.stories.tsx +3 -1
  156. package/src/product-set/control/DateAndRecurrenceInput.tsx +3 -4
  157. package/src/product-set/control/DateInput.tsx +2 -1
  158. package/src/product-set/control/ProductSetControl.tsx +15 -1
  159. package/src/product-set/control/ProductSetRecurrenceControl.stories.tsx +2 -2
  160. package/src/product-set/form/ProductCategoriesControl.tsx +38 -2
  161. package/src/product-set/form/ProductSetForm.tsx +22 -3
  162. package/src/product-set/form/ProductZonesControl.tsx +4 -7
  163. package/src/product-set/form/SelectCategoryModal.stories.tsx +1 -1
  164. package/src/product-set/form/SelectCategoryModal.tsx +2 -2
  165. package/src/product-set/form/SubProductsControl.tsx +0 -3
  166. package/src/product-set/form/VenueMapsControl.tsx +0 -3
  167. package/src/product-set/product/advanced-options/AdvancedOptions.tsx +5 -5
  168. package/src/product-set/product/booking-management/ProductBookingManagement.stories.tsx +1 -1
  169. package/src/product-set/product/quantity/ProductQuantity.stories.tsx +1 -1
  170. package/src/product-set/product-zone/ProductZoneControl.tsx +9 -9
  171. package/src/provider/location-input/LocationInput.tsx +40 -1
  172. package/src/provider/location-input/index.ts +1 -0
  173. package/src/provider/provider-form/ProviderForm.tsx +26 -2
  174. package/src/provider/venue-form/VenueForm.tsx +4 -1
  175. package/src/provider/working-hours-input/WorkingHoursInputDescription.tsx +4 -18
  176. package/src/recurring-date-picker-input/RecurringDatePickerInput.stories.tsx +11 -4
  177. package/src/recurring-date-picker-input/RecurringDatePickerInput.tsx +12 -1
  178. package/src/recurring-date-picker-input/utils.ts +91 -1
  179. package/src/sales/booking/results/components/ResultCard.tsx +0 -2
  180. package/src/setting/admin/AdminSetting.stories.tsx +1 -0
  181. package/src/setting/admin/AdminSettingForm.tsx +2 -2
  182. package/src/setting/system/SystemSetting.stories.tsx +1 -1
  183. package/src/snippet/snippet-template/preview/Preview.tsx +6 -0
  184. package/src/sortable-tree/SortableTreeItem.tsx +13 -1
  185. package/src/styles/auth/AccessDenied.scss +1 -1
  186. package/src/styles/back-button/BackButton.scss +25 -24
  187. package/src/styles/back-button/_index.scss +1 -1
  188. package/src/styles/company-user-form/UserForm.scss +4 -7
  189. package/src/styles/company-user-form/_index.scss +1 -1
  190. package/src/styles/custom-fields/CreateSortableListItem.scss +2 -1
  191. package/src/styles/custom-fields/_index.scss +1 -1
  192. package/src/styles/customers/Filter.scss +5 -5
  193. package/src/styles/events/EditEventModal.scss +1 -3
  194. package/src/styles/events/EventVenueMap.scss +7 -7
  195. package/src/styles/form/Input.scss +1 -1
  196. package/src/styles/header/Header.scss +1 -1
  197. package/src/styles/header/elements/CompanySelector.scss +2 -2
  198. package/src/styles/iframe-events/Calendar.scss +0 -1
  199. package/src/styles/iframe-events/CalendarSelect.scss +1 -1
  200. package/src/styles/iframe-events/CategoryStepsForm.scss +6 -7
  201. package/src/styles/iframe-events/Event.scss +2 -4
  202. package/src/styles/iframe-events/EventForm.scss +54 -54
  203. package/src/styles/iframe-events/EventNavigationFooter.scss +1 -0
  204. package/src/styles/iframe-events/TicketDescription.scss +1 -1
  205. package/src/styles/iframe-external-modal/IframeExternalModal.scss +2 -2
  206. package/src/styles/iframe-payments/PaymentForm.scss +1 -1
  207. package/src/styles/layout/BackgroundVideoContainer.scss +2 -2
  208. package/src/styles/notification/Notification.scss +1 -1
  209. package/src/styles/order-items-table/OrderItemsTable.scss +1 -2
  210. package/src/styles/product-set/CreateProductSetItem.scss +15 -13
  211. package/src/styles/product-set/DateAndRecurrenceInput.scss +6 -8
  212. package/src/styles/product-set/EditCategoryModal.scss +4 -4
  213. package/src/styles/product-set/EditProductModal.scss +3 -3
  214. package/src/styles/product-set/EditStepModal.scss +4 -4
  215. package/src/styles/product-set/EditVenueMapSetModal.scss +6 -6
  216. package/src/styles/product-set/ProductSetForm.scss +25 -2
  217. package/src/styles/product-set/TutorialGifCard.scss +1 -1
  218. package/src/styles/product-set/_index.scss +2 -2
  219. package/src/styles/report/ReportCard.scss +1 -0
  220. package/src/styles/report/_index.scss +1 -1
  221. package/src/styles/resources-blocking/_index.scss +4 -0
  222. package/src/styles/sales/BookingFilter.scss +2 -2
  223. package/src/styles/sales/BookingResults.scss +1 -1
  224. package/src/styles/sales/BookingTabs.scss +7 -5
  225. package/src/styles/sales/Filters.scss +5 -4
  226. package/src/styles/sales/GuestProfile.scss +170 -175
  227. package/src/styles/sales/LifeTimeSales.scss +1 -1
  228. package/src/styles/sales/ManualBooking.scss +4 -2
  229. package/src/styles/snippet-templates/_snippetVariables.scss +63 -244
  230. package/src/styles/sortable-field/SortableField.scss +16 -16
  231. package/src/styles/sortable-field/_index.scss +1 -1
  232. package/src/styles/sortable-tree/Item.scss +4 -4
  233. package/src/styles/table/Table.scss +1 -1
  234. package/src/styles/themes/bookedit/_variables.scss +10 -32
  235. package/src/styles/themes/licklist/_variables.scss +1 -1
  236. package/src/styles/tiptap-editor/TiptapEditor.scss +9 -10
  237. package/src/styles/tiptap-editor/_index.scss +1 -1
  238. package/src/styles/venue-map-sets/VenueMapSetForm.scss +5 -4
  239. package/src/styles/virtualized/_index.scss +1 -1
  240. package/src/styles/zones/ZoneForm.scss +1 -0
  241. package/src/styles/zones/ZoneRecurrencesControl.scss +6 -8
  242. package/src/tiptap-editor/TipTapEditor.stories.tsx +6 -4
  243. package/src/tiptap-editor/TipTapMenu/TipTapMenu.stories.tsx +5 -2
  244. package/src/zone/form/ZoneForm.tsx +3 -2
  245. package/src/zone/form/components/ZoneControl.tsx +3 -3
  246. package/src/zone/form/components/ZoneRecurrencesControl.tsx +7 -5
  247. package/src/zone/form/utils/dates.ts +9 -10
  248. package/yarn.lock +127 -114
  249. package/dist/assets/iframe/selectArrow.svg.js +0 -17
@@ -1,13 +1,14 @@
1
1
  import { useEffect, useState, useContext } from "react";
2
2
  import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
3
3
  import { uniqueId } from "lodash";
4
- import { Badge } from "react-bootstrap";
4
+ import { Badge, Button } from "react-bootstrap";
5
5
  import {
6
6
  Controller,
7
7
  useFieldArray,
8
8
  useFormContext,
9
9
  useWatch,
10
10
  } from "react-hook-form";
11
+ import { FaBars, FaBowlingBall, FaCalendar, FaTicketAlt } from "react-icons/fa";
11
12
  import { useTranslation } from "react-i18next";
12
13
  import { useSensor, MouseSensor } from "@dnd-kit/core";
13
14
  import {
@@ -25,7 +26,11 @@ import { ProductCategoryControl } from "../product-category";
25
26
  import { ProductCategory } from "../types";
26
27
  import { ProductsControl } from "./ProductsControl";
27
28
  import { ProductSetFormValues, WithIsLoading } from "./ProductSetForm";
28
- import { SelectCategoryModal } from "./SelectCategoryModal";
29
+ import {
30
+ SelectCategoryModal,
31
+ CATEGORY_TYPES_NAMES,
32
+ CategoryConfig,
33
+ } from "./SelectCategoryModal";
29
34
  import { ProductSetLoadingContext } from "./context";
30
35
  import { VenueMapSetModal } from "./VenueMapSetModal";
31
36
  import { moveArrayElements, sortArrayByIndex } from "../utils";
@@ -33,6 +38,29 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
33
38
  // @TODO not for first release
34
39
  // import Popover from "./ProductSetFormPopover";
35
40
 
41
+ const CATEGORIES_TYPE: Partial<Record<CategoryType, CategoryConfig>> = {
42
+ [CATEGORY_TYPES_NAMES.tickets]: {
43
+ label: "tickets",
44
+ icon: <FaTicketAlt color="#0e8ce2" size={10} />,
45
+ },
46
+ [CATEGORY_TYPES_NAMES.bookings]: {
47
+ label: "bookings",
48
+ icon: <FaCalendar color="#0e8ce2" size={10} />,
49
+ },
50
+ [CATEGORY_TYPES_NAMES.menuItems]: {
51
+ label: "menuItems",
52
+ icon: <FaBars color="#0e8ce2" size={10} />,
53
+ },
54
+ [CATEGORY_TYPES_NAMES.game]: {
55
+ label: "game",
56
+ icon: <FaBowlingBall color="#0e8ce2" size={10} />,
57
+ },
58
+ [CATEGORY_TYPES_NAMES.fixedDuration]: {
59
+ label: "fixedDuration",
60
+ icon: <FaCalendar color="#0e8ce2" size={10} />,
61
+ },
62
+ };
63
+
36
64
  interface ProductCategoriesControlProps extends WithIsLoading {
37
65
  stepIndex: number;
38
66
  isOverrides?: boolean;
@@ -228,6 +256,8 @@ export function ProductCategoriesControl({
228
256
  setIsExpanded(productCategoryId);
229
257
  };
230
258
 
259
+ const categoryType = CATEGORIES_TYPE[productCategory.type];
260
+
231
261
  return (
232
262
  <Controller
233
263
  key={`product-category-${productCategory._id}`}
@@ -272,6 +302,12 @@ export function ProductCategoriesControl({
272
302
  )}
273
303
  modalClass={ProductSetModalClasses.category}
274
304
  isNewAdded={showCategoryModal}
305
+ itemButton={
306
+ <div className="btn-outline-primary item-icon sm border border-primary rounded-sm">
307
+ {categoryType.icon}
308
+ <span className="ml-2">{t(categoryType.label)}</span>
309
+ </div>
310
+ }
275
311
  body={
276
312
  <ProductCategoryControl
277
313
  isLoading={isLoading}
@@ -1,4 +1,4 @@
1
- import { useEffect } from "react";
1
+ import { useEffect, useState } from "react";
2
2
  import { FormValues } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
3
3
  import { Button, Form, Col, Row } from "react-bootstrap";
4
4
  import { FormProvider, useForm } from "react-hook-form";
@@ -22,16 +22,21 @@ import { Step } from "../types";
22
22
  import { ProductSetContextProvider, ProductSetLoadingContext } from "./context";
23
23
  import { SelectItem } from "../../types/generic/SelectItem";
24
24
  import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
25
+ import { ErrorModal } from "../../iframe/order-process/components/ErrorModal";
25
26
 
26
27
  export interface WithIsLoading {
27
28
  isLoading: boolean;
28
29
  }
30
+ export interface WithIdOptional {
31
+ id?: number;
32
+ }
33
+
29
34
  export interface WithId {
30
35
  id: number;
31
36
  }
32
37
  export interface ProductSetFormValues
33
38
  extends FormValues,
34
- WithId,
39
+ WithIdOptional,
35
40
  ProductSetControlValues {
36
41
  steps: Step[];
37
42
  isOverrides?: boolean;
@@ -82,6 +87,7 @@ export function ProductSetForm({
82
87
  onApproveDialog,
83
88
  onDeclineDialog,
84
89
  } = useDialogContext();
90
+ const [errorMessage, setErrorMessage] = useState("");
85
91
 
86
92
  const form = useForm<ProductSetFormValues>({
87
93
  defaultValues,
@@ -119,11 +125,18 @@ export function ProductSetForm({
119
125
  if (!serverErrors) {
120
126
  return;
121
127
  }
128
+ if (Array.isArray(serverErrors) && serverErrors[0]) {
129
+ setErrorMessage(serverErrors[0]);
130
+ }
122
131
  FormErrorService.handleServerErrors(serverErrors, setError);
123
132
  }, [serverErrors, setError]);
124
133
 
125
134
  useEffect(() => {
126
- window.history.pushState(null, "", window.location.pathname);
135
+ window.history.pushState(
136
+ null,
137
+ "",
138
+ window.location.pathname + window.location.search,
139
+ );
127
140
  window.addEventListener("beforeunload", onBeforeUnload);
128
141
  window.addEventListener("popstate", onPopState);
129
142
 
@@ -150,6 +163,12 @@ export function ProductSetForm({
150
163
  onDecline={onDeclineDialog}
151
164
  />
152
165
 
166
+ <ErrorModal
167
+ message={errorMessage}
168
+ isOpen={!!errorMessage}
169
+ onClose={() => setErrorMessage("")}
170
+ />
171
+
153
172
  <FormProvider {...form}>
154
173
  <Form onSubmit={form.handleSubmit(submitHandler(onSubmitAndRedirect))}>
155
174
  <ProductSetLoadingContext.Consumer>
@@ -1,7 +1,4 @@
1
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
2
- // @ts-nocheck
3
- import React, { useContext, useState } from "react";
4
-
1
+ import { useContext, useState } from "react";
5
2
  import {
6
3
  ArrayPath,
7
4
  Controller,
@@ -82,14 +79,14 @@ export const ProductZonesControl = <T extends FormValues>({
82
79
 
83
80
  const productZonesError = HookFormService.getErrors<T>(
84
81
  `${productZonesFieldName}.root` as Path<T>,
85
- errors
82
+ errors,
86
83
  );
87
84
 
88
85
  const zoneCapacity = useWatch({
89
86
  control,
90
87
  name: [
91
88
  ...fields.map(
92
- (_, index) => `${productZonesFieldName}.${index}.capacity` as const
89
+ (_, index) => `${productZonesFieldName}.${index}.capacity` as const,
93
90
  ),
94
91
  ],
95
92
  });
@@ -98,7 +95,7 @@ export const ProductZonesControl = <T extends FormValues>({
98
95
  control,
99
96
  name: [
100
97
  ...fields.map(
101
- (_, index) => `${productZonesFieldName}.${index}.duration` as const
98
+ (_, index) => `${productZonesFieldName}.${index}.duration` as const,
102
99
  ),
103
100
  ],
104
101
  });
@@ -29,7 +29,7 @@ Default.args = {
29
29
  };
30
30
 
31
31
  export const WithBookingManagement: Story<SelectCategoryModalProps> = (
32
- args,
32
+ args
33
33
  ) => (
34
34
  <ProductSetLoadingContext.Provider value={contextValue}>
35
35
  <SelectCategoryModal {...args} />
@@ -25,7 +25,7 @@ import {
25
25
  } from "react-icons/fa";
26
26
  import { ProductSetLoadingContext } from "./context";
27
27
 
28
- const CATEGORY_TYPES_NAMES = {
28
+ export const CATEGORY_TYPES_NAMES = {
29
29
  menuItems: CATEGORY_TYPE_MENU_ITEMS,
30
30
  tickets: CATEGORY_TYPE_TICKETS,
31
31
  bookings: CATEGORY_TYPE_BOOKINGS,
@@ -33,7 +33,7 @@ const CATEGORY_TYPES_NAMES = {
33
33
  fixedDuration: CATEGORY_TYPE_FIXED_DURATION,
34
34
  } as const;
35
35
 
36
- type CategoryConfig = { label: string; icon: ReactElement };
36
+ export type CategoryConfig = { label: string; icon: ReactElement };
37
37
 
38
38
  const MAIN_CATEGORIES: Partial<Record<CategoryType, CategoryConfig>> = {
39
39
  [CATEGORY_TYPES_NAMES.tickets]: {
@@ -71,9 +71,6 @@ export function SubProductsControl({
71
71
  images: subProducts[index]?.images as Image[],
72
72
  };
73
73
  // @ts-expect-error TS2345
74
- // @TODO fix prod type error
75
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
76
- // @ts-ignore
77
74
  append(subProductCopy);
78
75
  }}
79
76
  />
@@ -47,9 +47,6 @@ export const VenueMapsControl = ({
47
47
  url={image.url}
48
48
  name={name}
49
49
  points={points}
50
- // @TODO fix prod type error
51
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
52
- // @ts-ignore
53
50
  products={products}
54
51
  pointProducts={pointProducts}
55
52
  onPointProductsChange={onPointProductsChange}
@@ -1,4 +1,4 @@
1
- import React, { useContext } from "react";
1
+ import { useContext } from "react";
2
2
  import { Col, Form } from "react-bootstrap";
3
3
  import { Controller, Path, useFormContext } from "react-hook-form";
4
4
  import { HookFormService } from "@licklist/plugins";
@@ -98,7 +98,7 @@ export const AdvancedOptions = <T extends FormValues>({
98
98
  {...register(`${fieldNamePrefix}.productGroupId` as Path<T>)}
99
99
  isInvalid={HookFormService.isInvalid<T>(
100
100
  `${fieldNamePrefix}.productGroupId` as Path<T>,
101
- errors
101
+ errors,
102
102
  )}
103
103
  disabled={isLoading || isOverrides}
104
104
  defaultValue=""
@@ -115,7 +115,7 @@ export const AdvancedOptions = <T extends FormValues>({
115
115
  <Form.Control.Feedback type="invalid">
116
116
  {HookFormService.getErrors<T>(
117
117
  `${fieldNamePrefix}.productGroupId` as Path<T>,
118
- errors
118
+ errors,
119
119
  )}
120
120
  </Form.Control.Feedback>
121
121
  </Form.Group>
@@ -134,7 +134,7 @@ export const AdvancedOptions = <T extends FormValues>({
134
134
  onChange={onChange}
135
135
  isInvalid={HookFormService.isInvalid<T>(
136
136
  `${fieldNamePrefix}.termsAndConditions` as Path<T>,
137
- errors
137
+ errors,
138
138
  )}
139
139
  disabled={isLoading || isOverrides}
140
140
  name={name}
@@ -147,7 +147,7 @@ export const AdvancedOptions = <T extends FormValues>({
147
147
  <Form.Control.Feedback type="invalid">
148
148
  {HookFormService.getErrors<T>(
149
149
  `${fieldNamePrefix}.termsAndConditions` as Path<T>,
150
- errors
150
+ errors,
151
151
  )}
152
152
  </Form.Control.Feedback>
153
153
  </Form.Group>
@@ -12,7 +12,7 @@ export default {
12
12
  } as Meta;
13
13
 
14
14
  export const Default: Story<ProductBookingManagementControlProps<{}>> = (
15
- args,
15
+ args
16
16
  ) => {
17
17
  const form = useForm<ProductBookingManagementControlValues>({
18
18
  mode: "onChange",
@@ -42,7 +42,7 @@ export const Default: Story<ProductQuantityControlProps<{}>> = (args) => {
42
42
  };
43
43
 
44
44
  export const ConstantForm: Story<ProductQuantityConstantControlProps<{}>> = (
45
- args,
45
+ args
46
46
  ) => {
47
47
  const form = useForm<ProductQuantityConstantControlValues>({
48
48
  mode: "onChange",
@@ -1,4 +1,4 @@
1
- import React, { useContext, useEffect, useMemo } from "react";
1
+ import { useContext, useEffect, useMemo } from "react";
2
2
  import { Col, Form, Row } from "react-bootstrap";
3
3
  import {
4
4
  ArrayPath,
@@ -63,7 +63,7 @@ export const ProductZoneControl = <T extends FormValues>({
63
63
  const disabledDuration = capacity === "0" || !capacity;
64
64
 
65
65
  const { providerHasBookingManagement, zones = [] } = useContext(
66
- ProductSetLoadingContext
66
+ ProductSetLoadingContext,
67
67
  );
68
68
 
69
69
  const currentZoneData = zones.find((zone) => zone.id === Number(zoneId));
@@ -75,10 +75,10 @@ export const ProductZoneControl = <T extends FormValues>({
75
75
  !productZones.find(
76
76
  (productZone) =>
77
77
  Number(productZone.zoneId) === zone.id &&
78
- productZone.zoneId !== zoneId
79
- )
78
+ productZone.zoneId !== zoneId,
79
+ ),
80
80
  ),
81
- [zones, productZones, zoneId]
81
+ [zones, productZones, zoneId],
82
82
  );
83
83
 
84
84
  useEffect(() => {
@@ -89,7 +89,7 @@ export const ProductZoneControl = <T extends FormValues>({
89
89
  setValue(
90
90
  `${fieldNamePrefix}.duration` as Path<T>,
91
91
  /* @ts-expect-error 6385 */
92
- 0 as UnpackNestedValue<PathValue<T, Path<T>>>
92
+ 0 as UnpackNestedValue<PathValue<T, Path<T>>>,
93
93
  );
94
94
  clearErrors(`${fieldNamePrefix}.duration` as Path<T>);
95
95
  // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -104,7 +104,7 @@ export const ProductZoneControl = <T extends FormValues>({
104
104
  /* @ts-expect-error 6385 */
105
105
  (value * currentZoneData?.defaultDuration) as UnpackNestedValue<
106
106
  PathValue<T, Path<T>>
107
- >
107
+ >,
108
108
  );
109
109
  };
110
110
  return (
@@ -123,7 +123,7 @@ export const ProductZoneControl = <T extends FormValues>({
123
123
  disabled={isOverrides}
124
124
  isInvalid={HookFormService.isInvalid(
125
125
  `${fieldNamePrefix}.zoneId`,
126
- errors
126
+ errors,
127
127
  )}
128
128
  {...field}
129
129
  >
@@ -147,7 +147,7 @@ export const ProductZoneControl = <T extends FormValues>({
147
147
  <Form.Control.Feedback type="invalid">
148
148
  {HookFormService.getErrors(
149
149
  `${fieldNamePrefix}.zoneId` as Path<T>,
150
- errors
150
+ errors,
151
151
  )}
152
152
  </Form.Control.Feedback>
153
153
  </Form.Group>
@@ -2,18 +2,22 @@ import { useId } from "@react-aria/utils";
2
2
  import { Form } from "react-bootstrap";
3
3
  import { useFormContext } from "react-hook-form";
4
4
  import { useTranslation } from "react-i18next";
5
+ import { TimeZonePath, useTimeZoneApi } from "@licklist/plugins";
5
6
  import CountryCodeSelect from "../../static/CountryCodeSelect";
6
7
  import { LocationInputValues } from ".";
7
8
  import { FormGroupControll } from "./components";
8
9
 
9
- export function LocationInput() {
10
+ export function LocationInput({ path }: { path: TimeZonePath }) {
10
11
  const {
11
12
  register,
12
13
  formState: { errors },
13
14
  } = useFormContext<LocationInputValues>();
14
15
  const { t } = useTranslation("Design");
15
16
 
17
+ const { data, isLoading } = useTimeZoneApi(path).useAll();
18
+
16
19
  const countryId = useId();
20
+ const timeZoneId = useId();
17
21
 
18
22
  return (
19
23
  <>
@@ -39,6 +43,7 @@ export function LocationInput() {
39
43
  name="location.postcode"
40
44
  label={t("locationPostcode")}
41
45
  />
46
+
42
47
  <Form.Group controlId={countryId}>
43
48
  <Form.Label>{t("locationCountry")}</Form.Label>
44
49
  <CountryCodeSelect
@@ -47,6 +52,40 @@ export function LocationInput() {
47
52
  error={errors?.location?.country?.message}
48
53
  />
49
54
  </Form.Group>
55
+
56
+ <Form.Group controlId={timeZoneId}>
57
+ <Form.Label>{t("locationTimeZone")}</Form.Label>
58
+ <Form.Control
59
+ {...register("location.timeZone", {
60
+ required: t("Validation:fieldRequired", {
61
+ attribute: t("locationTimeZone"),
62
+ }) as string,
63
+ })}
64
+ as="select"
65
+ custom
66
+ isInvalid={Boolean(errors?.location?.timeZone?.message)}
67
+ >
68
+ {isLoading ? (
69
+ <option key="" value="" disabled>
70
+ {t("loading")}
71
+ </option>
72
+ ) : (
73
+ <>
74
+ <option key="" value="" disabled>
75
+ {t("chooseTimeZone")}
76
+ </option>
77
+ {data.map((zone) => (
78
+ <option key={zone.id} value={zone.id}>
79
+ {zone.name}
80
+ </option>
81
+ ))}
82
+ </>
83
+ )}
84
+ </Form.Control>
85
+ <Form.Control.Feedback type="invalid">
86
+ {errors?.location?.timeZone?.message}
87
+ </Form.Control.Feedback>
88
+ </Form.Group>
50
89
  </>
51
90
  );
52
91
  }
@@ -10,5 +10,6 @@ export type LocationInputValues = {
10
10
  country: string;
11
11
  latitude: string;
12
12
  longitude: string;
13
+ timeZone: string;
13
14
  };
14
15
  };
@@ -10,6 +10,9 @@ import {
10
10
  } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
11
11
  import { useMultipleImages } from "@licklist/plugins/dist/hooks/Media/useMultipleImages";
12
12
  import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
13
+ import { ENDPOINTS } from "@licklist/core/dist/Config";
14
+ import { TimeZonePath, useTimeZoneApi } from "@licklist/plugins";
15
+ import { DateTime } from "luxon";
13
16
  import { CollapsibleInputGroup } from "../../collapsible-input-group";
14
17
  import {
15
18
  CategoriesInput,
@@ -41,6 +44,7 @@ export interface ProviderFormProps extends HasPermissionProp {
41
44
  companiesOptions?: TypeaheadOptions[];
42
45
  onSubmit: (values: ProviderFormValues) => void;
43
46
  intent?: "create" | "update";
47
+ path: TimeZonePath;
44
48
  }
45
49
 
46
50
  const providerImageTypes = {
@@ -56,14 +60,34 @@ export function ProviderForm({
56
60
  onSubmit,
57
61
  intent = "update",
58
62
  hasPermission = true,
63
+ path,
59
64
  }: ProviderFormProps) {
60
- const form = useForm<ProviderFormValues>({ defaultValues });
65
+ const { data } = useTimeZoneApi(ENDPOINTS.TIME_ZONE_ADMIN).useAll();
66
+
67
+ const defaultTimeZone = data
68
+ ?.find((zone) => zone.name === DateTime.now().zoneName)
69
+ ?.id?.toString();
70
+
71
+ const form = useForm<ProviderFormValues>({
72
+ defaultValues: defaultValues ?? {
73
+ location: { timeZone: defaultTimeZone },
74
+ },
75
+ });
76
+
61
77
  const {
62
78
  setValue,
63
79
  handleSubmit,
64
80
  formState: { isSubmitting, errors },
65
81
  getValues,
66
82
  } = form;
83
+
84
+ useEffect(() => {
85
+ if (!defaultValues.location.timeZone) {
86
+ setValue("location.timeZone", defaultTimeZone);
87
+ }
88
+ // eslint-disable-next-line react-hooks/exhaustive-deps
89
+ }, [defaultTimeZone]);
90
+
67
91
  const { t } = useTranslation("Design");
68
92
  const [initialImages, setInitialImages] = useState<Image[] | null>(null);
69
93
 
@@ -104,7 +128,7 @@ export function ProviderForm({
104
128
  description={<LocationInputDescription />}
105
129
  error={errors?.location?.country?.message}
106
130
  >
107
- <LocationInput />
131
+ <LocationInput path={path} />
108
132
  </CollapsibleInputGroup>
109
133
  {categories && categories.length > 0 && (
110
134
  <CollapsibleInputGroup
@@ -11,6 +11,7 @@ import {
11
11
  import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
12
12
  import { useMultipleImages } from "@licklist/plugins/dist/hooks/Media/useMultipleImages";
13
13
  import { parseServerErrorForFormValidation } from "@licklist/plugins/dist/utils/parseError";
14
+ import { TimeZonePath } from "@licklist/plugins";
14
15
  import { CollapsibleInputGroup } from "../../collapsible-input-group";
15
16
  import {
16
17
  CategoriesInput,
@@ -50,6 +51,7 @@ export interface VenueFormProps extends HasPermissionProp {
50
51
  intent?: "create" | "update";
51
52
  isLoading?: boolean;
52
53
  errorResponse?: unknown;
54
+ path: TimeZonePath;
53
55
  }
54
56
 
55
57
  const providerImageTypes = {
@@ -67,6 +69,7 @@ export function VenueForm({
67
69
  hasPermission = true,
68
70
  isLoading,
69
71
  errorResponse,
72
+ path,
70
73
  }: VenueFormProps) {
71
74
  const form = useForm<VenueFormValues>({ defaultValues, mode: "onChange" });
72
75
  const {
@@ -143,7 +146,7 @@ export function VenueForm({
143
146
  }))
144
147
  }
145
148
  >
146
- <LocationInput />
149
+ <LocationInput path={path} />
147
150
  </CollapsibleInputGroup>
148
151
  <CollapsibleInputGroup
149
152
  eventKey="workingHours"
@@ -1,8 +1,6 @@
1
- import { DateTime } from "luxon";
2
1
  import { Col, Row } from "react-bootstrap";
3
2
  import { useFormContext } from "react-hook-form";
4
3
  import { useTranslation } from "react-i18next";
5
- import { TIME_FORMAT } from "@licklist/core/dist/Config";
6
4
  import { WorkingHoursInputValues } from ".";
7
5
  import { useWeekdays } from "./utils";
8
6
 
@@ -24,22 +22,10 @@ export function WorkingHoursInputDescription() {
24
22
  <Row key={i}>
25
23
  <Col xs="auto">{weekdays[i]}:</Col>
26
24
  <Col>
27
- {weekday?.end
28
- ? weekday.start
29
- ? t("timeInterval", {
30
- start: DateTime.fromISO(weekday.start).toFormat(
31
- TIME_FORMAT,
32
- ),
33
- end: DateTime.fromISO(weekday.start).toFormat(
34
- TIME_FORMAT,
35
- ),
36
- })
37
- : t("timeFrom", {
38
- start: DateTime.fromISO(weekday.start).toFormat(
39
- TIME_FORMAT,
40
- ),
41
- })
42
- : null}
25
+ {t("timeInterval", {
26
+ start: weekday.start,
27
+ end: weekday.end,
28
+ })}
43
29
  </Col>
44
30
  </Row>
45
31
  );
@@ -12,9 +12,7 @@ export default {
12
12
  component: RecurringDatePickerInput,
13
13
  } as Meta;
14
14
 
15
- type DefaultRecurringDatePickerInputProps = RecurringDatePickerInputProps;
16
-
17
- export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
15
+ export const Default: Story<RecurringDatePickerInputProps> = (args) => {
18
16
  return (
19
17
  <Card style={{ maxWidth: "max-content" }}>
20
18
  <Card.Body>
@@ -23,7 +21,7 @@ export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
23
21
  </Card>
24
22
  );
25
23
  };
26
- export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
24
+ export const Valid: Story<RecurringDatePickerInputProps> = (args) => {
27
25
  return (
28
26
  <Card style={{ maxWidth: "max-content" }}>
29
27
  <Card.Body>
@@ -34,6 +32,15 @@ export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
34
32
  };
35
33
  Default.args = {
36
34
  onChange: (data) => console.log("onSubmit", data),
35
+ workHours: [
36
+ { start: "20:00", end: "04:00", day: 0, description: "" },
37
+ { start: "20:00", end: "04:00", day: 1, description: "" },
38
+ { start: "20:00", end: "04:00", day: 2, description: "" },
39
+ { start: "20:00", end: "12:00", day: 3, description: "" },
40
+ { start: "20:00", end: "23:00", day: 4, description: "" },
41
+ { start: "08:00", end: "12:00", day: 5, description: "" },
42
+ { start: "10:00", end: "16:00", day: 6, description: "" },
43
+ ],
37
44
  };
38
45
  Valid.args = {
39
46
  onChange: (data) => console.log("onSubmit", data),
@@ -12,9 +12,14 @@ import {
12
12
  import { usePreviousValue } from "@licklist/plugins/dist/hooks/Value/usePreviousValue";
13
13
  import { FormProvider, useForm } from "react-hook-form";
14
14
  import { Form } from "react-bootstrap";
15
+ import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
15
16
  import RecurrenceIntervalAndFrequencyInput from "./RecurrenceIntervalAndFrequencyInput";
16
17
  import RecurrenceWeekdaysInput from "./RecurrenceWeekdaysInput";
17
- import { parseAndValidateRRule, SupportedFrequency } from "./utils";
18
+ import {
19
+ parseAndValidateRRule,
20
+ SupportedFrequency,
21
+ useWorkHoursValidation,
22
+ } from "./utils";
18
23
  import { ConfirmModal } from "../modals";
19
24
  import { DeleteFieldButton } from "../product-set/elements";
20
25
 
@@ -26,6 +31,7 @@ export interface RecurringDatePickerInputProps {
26
31
  initialFrequency?: Frequency;
27
32
  setInitialStartDateAfterSelect?: boolean;
28
33
  minDate?: string;
34
+ workHours: WorkHour[] | undefined;
29
35
  }
30
36
 
31
37
  export interface RecurringDatePickerInputValues {
@@ -51,6 +57,7 @@ export function RecurringDatePickerInput({
51
57
  setInitialStartDateAfterSelect = false,
52
58
  children,
53
59
  minDate,
60
+ workHours,
54
61
  }: PropsWithChildren<RecurringDatePickerInputProps>) {
55
62
  const { t } = useTranslation(["Design"]);
56
63
 
@@ -84,6 +91,8 @@ export function RecurringDatePickerInput({
84
91
  byWeekDay,
85
92
  });
86
93
 
94
+ const validator = useWorkHoursValidation(byWeekDay, workHours);
95
+
87
96
  const onSubmit = (nextState: RecurringDatePickerInputValues) => {
88
97
  const end = getDateTimeObject(endDate, endTime || "23:59:59");
89
98
 
@@ -188,6 +197,8 @@ export function RecurringDatePickerInput({
188
197
  <RecurrenceIntervalAndFrequencyInput
189
198
  disabled={disabled}
190
199
  minDate={minDate}
200
+ startTimeRules={validator}
201
+ endTimeRules={validator}
191
202
  />
192
203
 
193
204
  {children}