@licklist/design 0.67.1 → 0.67.2-dev.0

package/dist/zone/form/ZoneForm.js

@@ -86,7 +86,7 @@ function _object_without_properties_loose(source, excluded) {
     return target;
 }
 var ZoneForm = function(param) {
-    var defaultValues = param.defaultValues, onSubmit = param.onSubmit, serverErrors = param.serverErrors, _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading;
+    var defaultValues = param.defaultValues, onSubmit = param.onSubmit, serverErrors = param.serverErrors, _param_isLoading = param.isLoading, isLoading = _param_isLoading === void 0 ? false : _param_isLoading, workHours = param.workHours;
     var t = useTranslation("Design").t;
     var form = useForm({
         mode: "onChange",
@@ -121,7 +121,8 @@ var ZoneForm = function(param) {
             onSubmit: handleSubmit(onFormSubmit),
             children: [
                 /*#__PURE__*/ jsx(ZoneControl, {
-                    isLoading: isLoading
+                    isLoading: isLoading,
+                    workHours: workHours
                 }),
                 /*#__PURE__*/ jsxs(Row, {
                     children: [

package/dist/zone/form/components/ZoneControl.d.ts

@@ -1,7 +1,7 @@
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 export type ZoneControlProps = {
     isLoading: boolean;
-    workHours?: WorkHour[];
+    workHours: WorkHour[] | undefined;
 };
-export declare const ZoneControl: ({ isLoading }: ZoneControlProps) => import("react/jsx-runtime").JSX.Element;
+export declare const ZoneControl: ({ isLoading, workHours }: ZoneControlProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ZoneControl.d.ts.map

package/dist/zone/form/components/ZoneControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,WAAW,kBAAmB,gBAAgB,4CA0B1D,CAAC"}
+{"version":3,"file":"ZoneControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneControl.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAStF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,WAAW,6BAA8B,gBAAgB,4CA0BrE,CAAC"}

package/dist/zone/form/components/ZoneControl.js

@@ -9,7 +9,7 @@ import { ZoneImageControl } from './ZoneImageControl.js';
 import { GameDurationControl } from './GameDurationControl.js';
 
 var ZoneControl = function(param) {
-    var isLoading = param.isLoading;
+    var isLoading = param.isLoading, workHours = param.workHours;
     return /*#__PURE__*/ jsx(Row, {
         children: /*#__PURE__*/ jsxs(Col, {
             md: 6,
@@ -19,7 +19,9 @@ var ZoneControl = function(param) {
                 /*#__PURE__*/ jsx(NameControl, {
                     isLoading: isLoading
                 }),
-                /*#__PURE__*/ jsx(ZoneRecurrencesControl, {}),
+                /*#__PURE__*/ jsx(ZoneRecurrencesControl, {
+                    workHours: workHours
+                }),
                 /*#__PURE__*/ jsx("hr", {}),
                 /*#__PURE__*/ jsxs(Row, {
                     children: [

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts

@@ -3,9 +3,9 @@ import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMa
 export interface DateAndRecurrenceInputValues {
     zoneRecurrences?: Partial<ZoneRecurrence>[];
 }
-export type ZoneRecurrenceControlProps = {
-    workHours?: WorkHour[];
-    isLoading?: boolean;
+type ZoneRecurrenceControlProps = {
+    workHours: WorkHour[] | undefined;
 };
-export declare const ZoneRecurrencesControl: () => import("react/jsx-runtime").JSX.Element;
+export declare const ZoneRecurrencesControl: ({ workHours, }: ZoneRecurrenceControlProps) => import("react/jsx-runtime").JSX.Element;
+export {};
 //# sourceMappingURL=ZoneRecurrencesControl.d.ts.map

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB,+CAkMlC,CAAC"}
+{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,mBAEhC,0BAA0B,4CAmM5B,CAAC"}

package/dist/zone/form/components/ZoneRecurrencesControl.js

@@ -211,7 +211,8 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-var ZoneRecurrencesControl = function() {
+var ZoneRecurrencesControl = function(param) {
+    var workHours = param.workHours;
     var _errors_zoneRecurrences;
     var _useFormContext = useFormContext(), control = _useFormContext.control, register = _useFormContext.register, errors = _useFormContext.formState.errors, getValues = _useFormContext.getValues, setValue = _useFormContext.setValue, clearErrors = _useFormContext.clearErrors;
     var _useFieldArray = useFieldArray({
@@ -348,7 +349,8 @@ var ZoneRecurrencesControl = function() {
                             defaultValues: editState.values,
                             onChange: handleRecurringDateChange,
                             onDelete: handleDelete,
-                            setInitialStartDateAfterSelect: true
+                            setInitialStartDateAfterSelect: true,
+                            workHours: workHours
                         })
                     })
                 }),

package/dist/zone/form/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aA0C9D,CAAC"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aAyC9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.67.1",
+  "version": "0.67.2-dev.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -42,9 +42,9 @@
     ]
   },
   "peerDependencies": {
-    "@licklist/core": "0.29.1",
+    "@licklist/core": "0.28.6-dev.2",
     "@licklist/eslint-config": "0.5.5",
-    "@licklist/plugins": "0.32.0",
+    "@licklist/plugins": "0.32.0-dev.0",
     "lodash": "4.17.21",
     "luxon": "1.26.0",
     "react": "17.0.2",
@@ -61,10 +61,9 @@
     "@dnd-kit/utilities": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.2.34",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
-    "@fortawesome/react-fontawesome": "0.1.9",
-    "@licklist/core": "0.29.1",
+    "@licklist/core": "0.28.6-dev.1",
     "@licklist/eslint-config": "0.5.5",
-    "@licklist/plugins": "0.32.0",
+    "@licklist/plugins": "0.30.4-dev.3",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",
@@ -200,5 +199,6 @@
   "volta": {
     "node": "20.9.0",
     "yarn": "4.4.0"
-  }
+  },
+  "stableVersion": "0.66.7-dev.5"
 }

package/src/auth/ChangePassword/ChangePassword.stories.tsx

@@ -15,7 +15,7 @@ export const ChangePassword: Story<{}> = (args) => (
 );
 
 export const ChangePasswordForm: Story<ChangePasswordFormComponentProps> = (
-  args,
+  args
 ) => (
   <>
     <Router>

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: "Error",
-      message: error.message,
+      message: error?.response?.data?.message || error.message,
     });
   };
 

package/src/auth/ResetPassword/ResetPassword.stories.tsx

@@ -14,7 +14,7 @@ export const ResetPassword: Story<{}> = (args) => (
   <ResetPasswordComponent {...args} />
 );
 export const ResetPasswordForm: Story<ResetPasswordFormComponentProps> = (
-  args,
+  args
 ) => (
   <>
     <Router>

package/src/calendar/components/CalendarButtons/CalendarButtons.tsx

@@ -2,7 +2,7 @@ import { useCallback, useMemo } from "react";
 import { Button } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import { range } from "lodash";
-import { ReactComponent as SelectArrow } from "../../../assets/iframe/selectArrow.svg";
+import { DateTime } from "luxon";
 import { CalendarSelect } from "../CalendarSelect";
 import { CalendarProps } from "../../Calendar";
 
@@ -26,15 +26,21 @@ export const CalendarButtons = ({
 }: CalendarButtonsProps) => {
   const { t } = useTranslation("Design");
 
-  const onSelectNextMonth = useCallback(() => {
-    setCurrentDate((prevDate) => prevDate.plus({ months: 1 }));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  const onSelectMonth = useCallback(
+    (value: string) => {
+      const selectedMonth = Number(value);
+      const nextDateTime = currentDate.set({ month: selectedMonth });
+
+      if (nextDateTime <= initialDate) {
+        setCurrentDate(initialDate);
+        return;
+      }
 
-  const onSelectPreviousMonth = useCallback(() => {
-    setCurrentDate((prevDate) => prevDate.minus({ month: 1 }));
+      setCurrentDate(nextDateTime);
+    },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+    [setCurrentDate, currentDate],
+  );
 
   const yearOptions = useMemo(() => {
     return range(initialDate.year, initialDate.year + 5, 1).map((year) => {
@@ -42,10 +48,18 @@ export const CalendarButtons = ({
     });
   }, [initialDate]);
 
-  const canMoveBack = useMemo(
-    () => currentDate > initialDate,
-    [currentDate, initialDate],
-  );
+  const monthOptions = useMemo(() => {
+    const initialMonth =
+      currentDate.year > initialDate.year ? 1 : initialDate.month;
+    return range(initialMonth, 13).map((monthNumber) => {
+      return {
+        label: DateTime.fromObject({ month: monthNumber }).toLocaleString({
+          month: "long",
+        }),
+        value: monthNumber,
+      };
+    });
+  }, [initialDate, currentDate]);
 
   const onSelectYear = (value: string) => {
     const selectedYear = Number(value);
@@ -107,22 +121,11 @@ export const CalendarButtons = ({
       <hr />
       <div className="calendar-buttons">
         <div className="buttons-wrapper">
-          <Button
-            className="calendar-button left-button"
-            onClick={onSelectPreviousMonth}
-            disabled={!canMoveBack}
-            variant="link"
-          >
-            <SelectArrow />
-          </Button>
-          <div className="month-title">{currentDate.toFormat("MMMM")}</div>
-          <Button
-            className="calendar-button"
-            onClick={onSelectNextMonth}
-            variant="link"
-          >
-            <SelectArrow />
-          </Button>
+          <CalendarSelect
+            options={monthOptions}
+            onChange={onSelectMonth}
+            value={currentDate.month}
+          />
         </div>
         <CalendarSelect
           options={yearOptions}

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -37,7 +37,6 @@ export const getDefaultValues = (
               ...product,
               subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
-                originalProductId: null,
                 productCategoryId: undefined,
               })),
               productCategoryId: undefined,

package/src/header/elements/Elements.stories.tsx

@@ -22,7 +22,7 @@ CompanySelector.args = {
 };
 
 export const CompanySelectorWithOneItem: Story<CompanySelectorProps> = (
-  args,
+  args
 ) => {
   return <CompanySelectorComponent {...args} />;
 };

package/src/help/popover/Popover.stories.tsx

@@ -17,7 +17,7 @@ export const HelpPopoverPrimaryVariant: Story<HelpPopoverProps> = (args) => (
   <HelpPopover {...args} />
 );
 export const HelpPopoverOutlinedInfoVariant: Story<HelpPopoverProps> = (
-  args,
+  args
 ) => <HelpPopover {...args} />;
 
 DefaultHelpPopover.args = {

package/src/iframe/event/event-venue-map/IframeEventVenueMap.stories.tsx

@@ -260,9 +260,9 @@ export function Default() {
                 (point) =>
                   Boolean(
                     MENU_STEPS[0].pointProducts.find(
-                      (pointProduct) => pointProduct.pointId === point.id,
-                    ),
-                  ),
+                      (pointProduct) => pointProduct.pointId === point.id
+                    )
+                  )
               )}
               pointProducts={MENU_STEPS[0].pointProducts}
               usedInIframe={usedInIframe}

package/src/iframe/order-process/components/CategoryProduct/components/ProductQuantityInput/ProductQuantityInput.tsx

@@ -51,6 +51,7 @@ export const ProductQuantityInput = ({
       hasDeposit: category.allowDeposits && product?.deposit < product.price,
       price: product.price,
       productCategoryId: category.id,
+      zoneId: category.zone?.id,
       quantity,
       capacity: product?.capacity,
     });

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -63,6 +63,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

package/src/layout/DropDown.tsx

@@ -1,4 +1,4 @@
-import { forwardRef } from "react";
+import React, { forwardRef } from "react";
 
 interface Props {
   children?: React.ReactNode | React.ReactNode[];
@@ -24,4 +24,5 @@ const DropDown = forwardRef((props: Props, ref: any) => {
 });
 
 DropDown.displayName = "DropDown";
+
 export default DropDown;

package/src/layout/DropDownToggle.tsx

@@ -19,4 +19,6 @@ const DropDownToggle = forwardRef((props: Props, ref: any) => {
   );
 });
 
+DropDownToggle.displayName = "DropDownToggle";
+
 export default DropDownToggle;

package/src/product-set/card/ProductSetCard.stories.tsx

@@ -9,7 +9,8 @@ export default {
 
 export const Default: Story<ProductSetCardProps> = (args) => (
   <ProductSetCard {...args} />
-);
+)
+
 
 Default.args = {
   href: "#",
@@ -17,3 +18,4 @@ Default.args = {
   rrule: "FREQ=WEEKLY;BYDAY=WE",
   hasPermission: true,
 };
+

package/src/product-set/control/DateAndRecurrenceInput.tsx

@@ -28,15 +28,13 @@ import {
   AvailableTimesControlRef,
 } from "../../zone/form/components/AvailableTimesControl";
 
-// eslint-disable-next-line max-len
-
 export interface DateAndRecurrenceInputValues {
   menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -90,7 +88,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId()!;
+  const popoverId = useId();
 
   const { t } = useTranslation("Design");
 
@@ -228,6 +226,7 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
+                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

package/src/product-set/control/DateInput.tsx

@@ -247,7 +247,8 @@ export const DateInput = ({
               menuRecurrence={menuRecurrence}
               onEdit={() => handleOnEdit(menuRecurrence, index)}
               errorMessage={
-                errors?.menuRecurrences?.[`${index}`]?.availableTimes?.message
+                errors?.menuRecurrences?.[`${index}`]?.availableTimes
+                  ?.message || errors?.menuRecurrences?.[`${index}`]?.message
               }
             />
           ))}

package/src/product-set/control/ProductSetControl.tsx

@@ -88,7 +88,7 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
   occurrenceStartAtDate?: string;

package/src/product-set/control/ProductSetRecurrenceControl.stories.tsx

@@ -23,7 +23,7 @@ interface ProductSetRecurrences {
 
 export const Default: Story<ProductSetRecurrences> = (args) => {
   const [items, setItems] = useState(
-    args.menuRecurrences?.sort((a, b) => a.sort - b.sort) ?? [],
+    args.menuRecurrences?.sort((a, b) => a.sort - b.sort) ?? []
   );
 
   const onDragEnd = ({ over, active }) => {
@@ -31,7 +31,7 @@ export const Default: Story<ProductSetRecurrences> = (args) => {
 
     setItems((items) => {
       const prevIndex = items.findIndex(
-        (item) => String(item.id) === active.id,
+        (item) => String(item.id) === active.id
       );
       const nextIndex = items.findIndex((item) => String(item.id) === over.id);
 

package/src/product-set/form/ProductCategoriesControl.tsx

@@ -1,13 +1,14 @@
 import { useEffect, useState, useContext } from "react";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
 import { uniqueId } from "lodash";
-import { Badge } from "react-bootstrap";
+import { Badge, Button } from "react-bootstrap";
 import {
   Controller,
   useFieldArray,
   useFormContext,
   useWatch,
 } from "react-hook-form";
+import { FaBars, FaBowlingBall, FaCalendar, FaTicketAlt } from "react-icons/fa";
 import { useTranslation } from "react-i18next";
 import { useSensor, MouseSensor } from "@dnd-kit/core";
 import {
@@ -25,7 +26,11 @@ import { ProductCategoryControl } from "../product-category";
 import { ProductCategory } from "../types";
 import { ProductsControl } from "./ProductsControl";
 import { ProductSetFormValues, WithIsLoading } from "./ProductSetForm";
-import { SelectCategoryModal } from "./SelectCategoryModal";
+import {
+  SelectCategoryModal,
+  CATEGORY_TYPES_NAMES,
+  CategoryConfig,
+} from "./SelectCategoryModal";
 import { ProductSetLoadingContext } from "./context";
 import { VenueMapSetModal } from "./VenueMapSetModal";
 import { moveArrayElements, sortArrayByIndex } from "../utils";
@@ -33,6 +38,29 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 // @TODO not for first release
 // import Popover from "./ProductSetFormPopover";
 
+const CATEGORIES_TYPE: Partial<Record<CategoryType, CategoryConfig>> = {
+  [CATEGORY_TYPES_NAMES.tickets]: {
+    label: "tickets",
+    icon: <FaTicketAlt color="#0e8ce2" size={10} />,
+  },
+  [CATEGORY_TYPES_NAMES.bookings]: {
+    label: "bookings",
+    icon: <FaCalendar color="#0e8ce2" size={10} />,
+  },
+  [CATEGORY_TYPES_NAMES.menuItems]: {
+    label: "menuItems",
+    icon: <FaBars color="#0e8ce2" size={10} />,
+  },
+  [CATEGORY_TYPES_NAMES.game]: {
+    label: "game",
+    icon: <FaBowlingBall color="#0e8ce2" size={10} />,
+  },
+  [CATEGORY_TYPES_NAMES.fixedDuration]: {
+    label: "fixedDuration",
+    icon: <FaCalendar color="#0e8ce2" size={10} />,
+  },
+};
+
 interface ProductCategoriesControlProps extends WithIsLoading {
   stepIndex: number;
   isOverrides?: boolean;
@@ -228,6 +256,8 @@ export function ProductCategoriesControl({
             setIsExpanded(productCategoryId);
           };
 
+          const categoryType = CATEGORIES_TYPE[productCategory.type];
+
           return (
             <Controller
               key={`product-category-${productCategory._id}`}
@@ -272,6 +302,12 @@ export function ProductCategoriesControl({
                   )}
                   modalClass={ProductSetModalClasses.category}
                   isNewAdded={showCategoryModal}
+                  itemButton={
+                    <div className="btn-outline-primary item-icon sm border border-primary rounded-sm">
+                      {categoryType.icon}
+                      <span className="ml-2">{t(categoryType.label)}</span>
+                    </div>
+                  }
                   body={
                     <ProductCategoryControl
                       isLoading={isLoading}

package/src/product-set/form/ProductSetForm.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { FormValues } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { Button, Form, Col, Row } from "react-bootstrap";
 import { FormProvider, useForm } from "react-hook-form";
@@ -22,16 +22,21 @@ import { Step } from "../types";
 import { ProductSetContextProvider, ProductSetLoadingContext } from "./context";
 import { SelectItem } from "../../types/generic/SelectItem";
 import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
+import { ErrorModal } from "../../iframe/order-process/components/ErrorModal";
 
 export interface WithIsLoading {
   isLoading: boolean;
 }
+export interface WithIdOptional {
+  id?: number;
+}
+
 export interface WithId {
   id: number;
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithId,
+    WithIdOptional,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;
@@ -82,6 +87,7 @@ export function ProductSetForm({
     onApproveDialog,
     onDeclineDialog,
   } = useDialogContext();
+  const [errorMessage, setErrorMessage] = useState("");
 
   const form = useForm<ProductSetFormValues>({
     defaultValues,
@@ -119,11 +125,18 @@ export function ProductSetForm({
     if (!serverErrors) {
       return;
     }
+    if (Array.isArray(serverErrors) && serverErrors[0]) {
+      setErrorMessage(serverErrors[0]);
+    }
     FormErrorService.handleServerErrors(serverErrors, setError);
   }, [serverErrors, setError]);
 
   useEffect(() => {
-    window.history.pushState(null, "", window.location.pathname);
+    window.history.pushState(
+      null,
+      "",
+      window.location.pathname + window.location.search,
+    );
     window.addEventListener("beforeunload", onBeforeUnload);
     window.addEventListener("popstate", onPopState);
 
@@ -150,6 +163,12 @@ export function ProductSetForm({
         onDecline={onDeclineDialog}
       />
 
+      <ErrorModal
+        message={errorMessage}
+        isOpen={!!errorMessage}
+        onClose={() => setErrorMessage("")}
+      />
+
       <FormProvider {...form}>
         <Form onSubmit={form.handleSubmit(submitHandler(onSubmitAndRedirect))}>
           <ProductSetLoadingContext.Consumer>

package/src/product-set/form/ProductZonesControl.tsx

@@ -1,7 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import React, { useContext, useState } from "react";
-
+import { useContext, useState } from "react";
 import {
   ArrayPath,
   Controller,
@@ -82,14 +79,14 @@ export const ProductZonesControl = <T extends FormValues>({
 
   const productZonesError = HookFormService.getErrors<T>(
     `${productZonesFieldName}.root` as Path<T>,
-    errors
+    errors,
   );
 
   const zoneCapacity = useWatch({
     control,
     name: [
       ...fields.map(
-        (_, index) => `${productZonesFieldName}.${index}.capacity` as const
+        (_, index) => `${productZonesFieldName}.${index}.capacity` as const,
       ),
     ],
   });
@@ -98,7 +95,7 @@ export const ProductZonesControl = <T extends FormValues>({
     control,
     name: [
       ...fields.map(
-        (_, index) => `${productZonesFieldName}.${index}.duration` as const
+        (_, index) => `${productZonesFieldName}.${index}.duration` as const,
       ),
     ],
   });

package/src/product-set/form/SelectCategoryModal.stories.tsx

@@ -29,7 +29,7 @@ Default.args = {
 };
 
 export const WithBookingManagement: Story<SelectCategoryModalProps> = (
-  args,
+  args
 ) => (
   <ProductSetLoadingContext.Provider value={contextValue}>
     <SelectCategoryModal {...args} />

package/src/product-set/form/SelectCategoryModal.tsx

@@ -25,7 +25,7 @@ import {
 } from "react-icons/fa";
 import { ProductSetLoadingContext } from "./context";
 
-const CATEGORY_TYPES_NAMES = {
+export const CATEGORY_TYPES_NAMES = {
   menuItems: CATEGORY_TYPE_MENU_ITEMS,
   tickets: CATEGORY_TYPE_TICKETS,
   bookings: CATEGORY_TYPE_BOOKINGS,
@@ -33,7 +33,7 @@ const CATEGORY_TYPES_NAMES = {
   fixedDuration: CATEGORY_TYPE_FIXED_DURATION,
 } as const;
 
-type CategoryConfig = { label: string; icon: ReactElement };
+export type CategoryConfig = { label: string; icon: ReactElement };
 
 const MAIN_CATEGORIES: Partial<Record<CategoryType, CategoryConfig>> = {
   [CATEGORY_TYPES_NAMES.tickets]: {