@licklist/design 0.67.3 → 0.67.4-dev.0

package/src/iframe/event/event-card/IframeEventCard.tsx

@@ -1,4 +1,4 @@
-import { Card } from "react-bootstrap";
+import { Button, Card } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import { useIntl } from "react-intl";
 import clsx from "clsx";
@@ -47,6 +47,7 @@ export function IframeEventCard({
   descriptionId,
   imageClassName,
   showMoreInfo,
+  snippetSetting,
 }: IframeEventCardProps) {
   const { formatNumber } = useIntl();
   const { t } = useTranslation("Design");
@@ -69,7 +70,11 @@ export function IframeEventCard({
         { "list-view": isListView },
         className,
       )}
-      onClick={goToDetails ? onClick : undefined}
+      onClick={
+        goToDetails || !snippetSetting.displayBookingButtonOnEventList
+          ? onClick
+          : undefined
+      }
     >
       {showMoreInfo && <div className="iframe-event-card__info-icon">i</div>}
       {imageSrc && (
@@ -133,6 +138,15 @@ export function IframeEventCard({
               />
             </Card.Text>
           )}
+          {!!snippetSetting.displayBookingButtonOnEventList && showMoreInfo && (
+            <Button
+              className="step-save-btn w-25 mt-4"
+              type="button"
+              onClick={onClick}
+            >
+              {t("book")}
+            </Button>
+          )}
         </div>
       </Card.Body>
     </Card>

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/modals/confirmation/ConfirmModal.tsx

@@ -20,6 +20,9 @@ export type ConfirmModalTypes =
 export interface ConfirmModalProps {
   type?: ConfirmModalTypes;
   children?: (confirm: (action: ConfirmAction) => void) => ReactNode;
+  // confirm function  memoize the callback function. It's an alternative function
+  confirmationHandler?: () => Promise<boolean | undefined>;
+  disabledButtons?: boolean;
   title?: string;
   content?: string | ReactNode;
   onClose?: () => void;
@@ -37,7 +40,9 @@ export function ConfirmModal({
   type = "default",
   children,
   onClose,
+  confirmationHandler,
   title,
+  disabledButtons,
   content,
   hideButtons = false,
 }: ConfirmModalProps) {
@@ -52,10 +57,16 @@ export function ConfirmModal({
     setIsOpen(() => true);
   };
 
-  const handleConfirmation = (e) => {
+  const handleConfirmation = async (e) => {
     e.stopPropagation();
-    if (!actionRef.current) return;
-
+    if (!actionRef.current && !confirmationHandler) return;
+    if (confirmationHandler) {
+      const res = await confirmationHandler();
+      if (res) {
+        setIsOpen(() => false);
+      }
+      return;
+    }
     actionRef.current();
     setIsOpen(() => false);
   };
@@ -88,6 +99,7 @@ export function ConfirmModal({
           <Button
             variant="danger"
             className="btn-sm rounded"
+            disabled={disabledButtons}
             onClick={handleClose}
             data-id={CONFIRM_MODAL_ACTION_DECLINE}
           >
@@ -105,12 +117,14 @@ export function ConfirmModal({
                   variant="outline"
                   className="cancel-button"
                   onClick={handleClose}
+                  disabled={disabledButtons}
                   data-id={CONFIRM_MODAL_ACTION_DECLINE}
                 >
                   {t("cancel")}
                 </Button>
                 <Button
                   variant="danger"
+                  disabled={disabledButtons}
                   onClick={handleConfirmation}
                   data-id={CONFIRM_MODAL_ACTION_CONFIRM}
                 >
@@ -121,6 +135,7 @@ export function ConfirmModal({
               <>
                 <Button
                   variant="danger"
+                  disabled={disabledButtons}
                   onClick={handleClose}
                   data-id={CONFIRM_MODAL_ACTION_DECLINE}
                 >
@@ -128,6 +143,7 @@ export function ConfirmModal({
                 </Button>
                 <Button
                   variant="success"
+                  disabled={disabledButtons}
                   onClick={handleConfirmation}
                   data-id={CONFIRM_MODAL_ACTION_CONFIRM}
                 >

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/card/ProductSetCard.tsx

@@ -9,15 +9,20 @@ import RouteService from "@licklist/plugins/dist/services/Route/RouteService";
 import { FaEllipsisH, FaEye, FaTrashAlt } from "react-icons/fa";
 import { ConfirmModal } from "../../modals";
 import { MenuButton } from "../../table/MenuButton";
+import { ProductSetNameControl } from "../form/ProductSetNameControl";
 
 export interface ProductSetCardProps extends HasPermissionProp {
   name: string;
   rrule?: string;
   href: string;
-  onCopy: () => void;
+  duplicateProductSetName: string;
+  onChangeDuplicateProductSetName: (value: string) => void;
+  onCopy: () => Promise<boolean | undefined>;
   onRemove: () => void;
+  isLoading?: boolean;
   className?: string;
   override?: number;
+  duplicateProductSetError?: string;
 }
 
 export function ProductSetCard({
@@ -26,6 +31,10 @@ export function ProductSetCard({
   href,
   onCopy,
   onRemove,
+  onChangeDuplicateProductSetName,
+  duplicateProductSetName,
+  duplicateProductSetError,
+  isLoading,
   className = "",
   hasPermission = true,
   override = 0,
@@ -35,19 +44,23 @@ export function ProductSetCard({
   const productSetCardClasses = `product-set-card ${className}`;
   const [isOverlayVisibile, setIsOverlayVisible] = useState(false);
 
+  const onCardClick = () => {
+    RouteService.redirectTo(href);
+  };
   return (
+    // eslint-disable-next-line jsx-a11y/click-events-have-key-events
     <div
       role="button"
       tabIndex={0}
       className="border-0 product-set-card-wrapper w-100 pb-0"
-      onClick={() => RouteService.redirectTo(href)}
-      onKeyUp={() => RouteService.redirectTo(href)}
+      onClick={onCardClick}
     >
       <div className={productSetCardClasses}>
         <div className="product-set-card-link">
           <div className="d-flex flex-column">
             <div>
-              {name} {rrule && `(${RRule.fromString(rrule).toText()})`}
+              {name}
+              {rrule && `(${RRule.fromString(rrule).toText()})`}
             </div>
             {!!override && (
               <div className="h6 bold ml-1">
@@ -79,14 +92,33 @@ export function ProductSetCard({
                 >
                   {hasPermission && (
                     <>
-                      <ListGroup.Item action as="div">
+                      <ListGroup.Item
+                        action
+                        as="div"
+                        role="button"
+                        tabIndex={0}
+                        onClick={(e) => e.stopPropagation()}
+                      >
                         {Boolean(onCopy) && (
-                          <ConfirmModal>
+                          <ConfirmModal
+                            // confirm function  memoize the callback function and it leads to bugs
+                            confirmationHandler={onCopy}
+                            disabledButtons={isLoading}
+                            content={
+                              <ProductSetNameControl
+                                value={duplicateProductSetName}
+                                onChange={onChangeDuplicateProductSetName}
+                                error={duplicateProductSetError}
+                              />
+                            }
+                          >
                             {(confirm) => (
                               <MenuButton
                                 onClick={() => {
                                   setIsOverlayVisible(false);
-                                  confirm(onCopy);
+                                  onChangeDuplicateProductSetName(name);
+                                  // confirm function  memoize the callback function and it leads to bugs
+                                  confirm(() => {});
                                 }}
                                 name={t("duplicate")}
                                 className="product-set-card-menu-item-text"
@@ -95,7 +127,14 @@ export function ProductSetCard({
                           </ConfirmModal>
                         )}
                       </ListGroup.Item>
-                      <ListGroup.Item action className="text-danger" as="div">
+                      <ListGroup.Item
+                        action
+                        className="text-danger"
+                        as="div"
+                        role="button"
+                        tabIndex={0}
+                        onClick={(e) => e.stopPropagation()}
+                      >
                         {Boolean(onRemove) && (
                           <ConfirmModal>
                             {(confirm) => (

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

@@ -28,17 +28,16 @@ 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;
+  timeZone: string;
 }
 
 export const DateAndRecurrenceInput = ({
@@ -46,6 +45,7 @@ export const DateAndRecurrenceInput = ({
   providerHasBookingManagement,
   workHours,
   isLoading,
+  timeZone,
 }: DateAndRecurrenceInputProps) => {
   const {
     control,
@@ -90,7 +90,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId()!;
+  const popoverId = useId();
 
   const { t } = useTranslation("Design");
 
@@ -228,6 +228,8 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
+                workHours={workHours}
+                timeZone={timeZone}
               >
                 {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

@@ -1,9 +1,7 @@
-import { useEffect } from "react";
 import { Col, Form, Row } from "react-bootstrap";
 import { Controller, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import clsx from "clsx";
-import { DateTime } from "luxon";
 import {
   OPERATIONAL_COST_CUSTOMER,
   OPERATIONAL_COST_PROVIDER,
@@ -16,7 +14,6 @@ import {
   RELY_ON_PEOPLE_TYPES,
   RelyOnPeopleType,
 } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
-import { DATE_MONTH_LOCALE_FORMAT } from "@licklist/core/dist/Config";
 import { useId } from "@react-aria/utils";
 import { FieldSet } from "@licklist/core/dist/DataMapper/Order/FieldSetDataMapper";
 import { EmailTemplate } from "@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper";
@@ -88,11 +85,11 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
-  occurrenceStartAtDate?: string;
   isCreateNewOverrides?: boolean;
+  timeZone: string;
 }
 
 export function ProductSetControl({
@@ -109,8 +106,8 @@ export function ProductSetControl({
   workHours,
   providerHasBookingManagement = false,
   isOverrides = false,
-  occurrenceStartAtDate,
   isCreateNewOverrides = false,
+  timeZone,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -119,12 +116,10 @@ export function ProductSetControl({
     formState: { errors },
     watch,
     setError,
-    setValue,
     clearErrors,
   } = useFormContext<ProductSetControlValues>();
 
   const steps = watch("steps");
-  const productSetName = watch("name");
 
   const nameId = useId();
   const termsAndConditionsId = useId();
@@ -138,13 +133,6 @@ export function ProductSetControl({
     productCategories?.some((category) => checkIfZoneCategory(category?.type)),
   );
 
-  useEffect(() => {
-    if (!occurrenceStartAtDate) return;
-    const eventStartDate = DateTime.fromISO(occurrenceStartAtDate);
-    const eventStart = eventStartDate.toFormat(DATE_MONTH_LOCALE_FORMAT);
-    setValue("name", `${productSetName} (${eventStart})`);
-  }, [setValue, occurrenceStartAtDate]);
-
   return (
     <Row
       className={`product-set-form ${
@@ -200,6 +188,7 @@ export function ProductSetControl({
                 workHours={isZoneAdded ? workHours : undefined}
                 isLoading={isLoading}
                 providerHasBookingManagement={providerHasBookingManagement}
+                timeZone={timeZone}
               />
             )}
           </>

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

@@ -8,6 +8,7 @@ import {
   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;
@@ -54,6 +59,7 @@ export interface ProductSetFormProps
   isOverrides?: boolean;
   workHours?: WorkHour[];
   isCreateNewOverrides?: boolean;
+  timeZone: string;
 }
 
 export function ProductSetForm({
@@ -72,6 +78,7 @@ export function ProductSetForm({
   workHours,
   isOverrides,
   isCreateNewOverrides,
+  timeZone,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -82,6 +89,7 @@ export function ProductSetForm({
     onApproveDialog,
     onDeclineDialog,
   } = useDialogContext();
+  const [errorMessage, setErrorMessage] = useState("");
 
   const form = useForm<ProductSetFormValues>({
     defaultValues,
@@ -119,11 +127,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 +165,12 @@ export function ProductSetForm({
         onDecline={onDeclineDialog}
       />
 
+      <ErrorModal
+        message={errorMessage}
+        isOpen={!!errorMessage}
+        onClose={() => setErrorMessage("")}
+      />
+
       <FormProvider {...form}>
         <Form onSubmit={form.handleSubmit(submitHandler(onSubmitAndRedirect))}>
           <ProductSetLoadingContext.Consumer>
@@ -175,6 +196,7 @@ export function ProductSetForm({
                     providerHasBookingManagement={providerHasBookingManagement}
                     isOverrides={isOverrides}
                     isCreateNewOverrides={isCreateNewOverrides}
+                    timeZone={timeZone}
                   />
                   <Row>
                     <Col md={6} sm={12} />

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

@@ -0,0 +1,27 @@
+import { Form } from "react-bootstrap";
+import { useTranslation } from "react-i18next";
+
+export const ProductSetNameControl = ({
+  value,
+  onChange,
+  error,
+}: {
+  value: string;
+  onChange: (value: string) => void;
+  error?: string;
+}) => {
+  const { t } = useTranslation(["Design"]);
+  return (
+    <Form.Group>
+      <Form.Label>{t("Design:ProductSetName")}*</Form.Label>
+      <Form.Control
+        value={value}
+        maxLength={255}
+        onChange={(e) => onChange(e.target.value)}
+        placeholder={t("Design:placeholderProductSetName")}
+        isInvalid={Boolean(error)}
+      />
+      <Form.Control.Feedback type="invalid">{error}</Form.Control.Feedback>
+    </Form.Group>
+  );
+};

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,
       ),
     ],
   });