@licklist/design 0.66.0-dev.0 → 0.66.0

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -40,10 +40,6 @@ export const SelectEventProductSet = ({
   const productSetId = watch("productSetId");
   const editedProductSet = watch("editedProductSet");
 
-  const selectedProductSet = productSets.find(
-    (productSet) => productSet.id === productSetId
-  )?.parentMenuId;
-
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId));
@@ -88,9 +84,6 @@ export const SelectEventProductSet = ({
     setValue("productSetId", value);
   };
 
-  const showOverrideProductSet =
-    !showEditProductSet && productSetId && !selectedProductSet;
-
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues["editedProductSet"]) => {
     setShowEditProductSet(false);
@@ -166,7 +159,7 @@ export const SelectEventProductSet = ({
                           {t("addNewProductSet")}
                         </Button>
                       )}
-                      {showOverrideProductSet && (
+                      {!showEditProductSet && productSetId && (
                         <Button
                           variant=""
                           className="btn product-set-button "
@@ -206,12 +199,14 @@ export const SelectEventProductSet = ({
         </Form.Group>
       </div>
       {showEditProductSet && productSetId && (
-        <EditEventProductSet
-          onSubmit={onSubmit}
-          defaultValues={
-            productSetId === editedProductSet?.id && editedProductSet
-          }
-        />
+        <>
+          <EditEventProductSet
+            onSubmit={onSubmit}
+            defaultValues={
+              productSetId === editedProductSet?.id && editedProductSet
+            }
+          />
+        </>
       )}
     </>
   );

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -124,8 +124,6 @@ export const EditEventProductSet = ({
             companyName={selectedCompany?.title}
             fee={feeInPercent}
             isEventEditProductSet
-            isOverrides
-            workHours={undefined}
           />
           <Button
             disabled={isLoading}

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

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

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

@@ -28,13 +28,15 @@ 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[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -88,7 +90,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId();
+  const popoverId = useId()!;
 
   const { t } = useTranslation("Design");
 
@@ -226,7 +228,6 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
-                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

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

@@ -5,7 +5,7 @@ import { Form, OverlayTrigger, Popover } from "react-bootstrap";
 import { useFieldArray, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useClickAway } from "react-use";
-import { UTC_TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
+import { TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { DateTime } from "luxon";
 import RRule, { Frequency } from "rrule";
@@ -136,7 +136,7 @@ export const DateInput = ({
       until: (start as DateTime).toJSDate(),
       byweekday: [],
       freq: Frequency.DAILY,
-      tzid: UTC_TIMEZONE,
+      tzid: TIMEZONE,
       interval: 1,
     }).replace("RRULE:", "");
 

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

@@ -85,10 +85,9 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours: WorkHour[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetControl({
@@ -105,7 +104,6 @@ export function ProductSetControl({
   workHours,
   providerHasBookingManagement = false,
   isOverrides = false,
-  isCreateNewOverrides = false,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -125,11 +123,6 @@ export function ProductSetControl({
 
   const showSmsTemplateSelector = showSmsTemplate && !isOverrides;
   const showEmailTemplateSelector = showEmailTemplate && !isOverrides;
-  const showDateSelector = !isEventEditProductSet && isOverrides;
-
-  const isZoneAdded = steps.some(({ productCategories }) =>
-    productCategories.some(({ zoneId }) => zoneId)
-  );
 
   return (
     <Row
@@ -172,9 +165,9 @@ export function ProductSetControl({
           </Form.Control.Feedback>
         </Form.Group>
 
-        {showDateSelector ? (
+        {isOverrides ? (
           <DateInput
-            workHours={isZoneAdded ? workHours : undefined}
+            workHours={workHours}
             isLoading={isLoading}
             providerHasBookingManagement={providerHasBookingManagement}
           />
@@ -183,7 +176,7 @@ export function ProductSetControl({
             {isCreateAction && (
               <DateAndRecurrenceInput
                 isEventEditProductSet={isEventEditProductSet}
-                workHours={isZoneAdded ? workHours : undefined}
+                workHours={workHours}
                 isLoading={isLoading}
                 providerHasBookingManagement={providerHasBookingManagement}
               />
@@ -195,12 +188,7 @@ export function ProductSetControl({
 
         <TutorialGifCard isOverrides={isOverrides} />
 
-        <StepsControl
-          isLoading={isLoading}
-          isEventEditProductSet={isEventEditProductSet}
-          isOverrides={isOverrides}
-          isCreateNewOverrides={isCreateNewOverrides}
-        />
+        <StepsControl isLoading={isLoading} isOverrides={isOverrides} />
       </Col>
       <Col md={6} sm={12}>
         <div className="second-column">

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

@@ -36,8 +36,6 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 interface ProductCategoriesControlProps extends WithIsLoading {
   stepIndex: number;
   isOverrides?: boolean;
-  isEventEditProductSet?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
 const getCategoryDefaultValue = (
@@ -69,8 +67,6 @@ export function ProductCategoriesControl({
   isLoading,
   stepIndex,
   isOverrides,
-  isEventEditProductSet,
-  isCreateNewOverrides,
 }: ProductCategoriesControlProps) {
   const { t } = useTranslation("Design");
   const {
@@ -218,11 +214,6 @@ export function ProductCategoriesControl({
             ? String(productCategory.id)
             : productCategory.uniqueId;
 
-          const isOverridesCategory = productCategory.products.some((product) =>
-            isEventEditProductSet ? !!product.id : !!product.originalProductId
-          );
-          const isNewOverridesCategory =
-            isCreateNewOverrides && !!productCategory.id;
           const onSetIsExpanded = () => {
             setIsExpanded(productCategoryId);
           };
@@ -278,10 +269,7 @@ export function ProductCategoriesControl({
                       categoryName={value}
                       stepIndex={stepIndex}
                       productCategoryIndex={index}
-                      isOverride={
-                        isNewOverridesCategory ||
-                        (isOverrides && isOverridesCategory)
-                      }
+                      isOverride={isOverrides}
                     />
                   }
                   isOverride={isOverrides}
@@ -308,8 +296,6 @@ export function ProductCategoriesControl({
                     productCategoryIndex={index}
                     categoryType={productCategory.type}
                     isOverrides={isOverrides}
-                    isEventEditProductSet={isEventEditProductSet}
-                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                 </SortableTree.Item>
               )}
@@ -319,7 +305,9 @@ export function ProductCategoriesControl({
       </SortableTree>
       <CreateProductSetItem
         title={t("addCategory")}
+        isOverride={isOverrides}
         onClick={() => {
+          if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />
@@ -328,6 +316,7 @@ export function ProductCategoriesControl({
         isVisible={isSelectCategoryVisible}
         onHide={() => setIsSelectCategoryVisible(false)}
         onCategorySelect={(categoryType) => {
+          if (isOverrides) return;
           append(getCategoryDefaultValue(categoryType, fields.length));
           setShowCategoryModal(true);
           if (

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

@@ -26,16 +26,12 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
 export interface WithIsLoading {
   isLoading: boolean;
 }
-export interface WithIdOptional {
-  id?: number;
-}
-
 export interface WithId {
   id: number;
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithIdOptional,
+    WithId,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;
@@ -57,7 +53,6 @@ export interface ProductSetFormProps
   isCreateAction?: boolean;
   isOverrides?: boolean;
   workHours?: WorkHour[];
-  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetForm({
@@ -75,7 +70,6 @@ export function ProductSetForm({
   isCreateAction,
   workHours,
   isOverrides,
-  isCreateNewOverrides,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -121,11 +115,7 @@ export function ProductSetForm({
   }, [serverErrors, setError]);
 
   useEffect(() => {
-    window.history.pushState(
-      null,
-      "",
-      window.location.pathname + window.location.search
-    );
+    window.history.pushState(null, "", window.location.pathname);
     window.addEventListener("beforeunload", onBeforeUnload);
     window.addEventListener("popstate", onPopState);
 
@@ -176,7 +166,6 @@ export function ProductSetForm({
                     workHours={workHours}
                     providerHasBookingManagement={providerHasBookingManagement}
                     isOverrides={isOverrides}
-                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                   <Row>
                     <Col md={6} sm={12} />

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

@@ -35,8 +35,6 @@ interface ProductsControlProps extends WithIsLoading {
   categoryType: CategoryType;
   zones?: Zone[];
   isOverrides?: boolean;
-  isEventEditProductSet?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -59,7 +57,6 @@ const getDefaultProductValue = (sort: number): Product => ({
   quantitySelector: 1,
   hasSpecialNotes: false,
   weight: 0,
-  originalProductId: null,
   type: DEFAULT_PRODUCT_TYPE,
   tierId: Number(uniqueId()),
   zoneId: null,
@@ -82,8 +79,6 @@ export function ProductsControl({
   categoryType,
   zones,
   isOverrides,
-  isEventEditProductSet,
-  isCreateNewOverrides,
 }: ProductsControlProps) {
   const { t } = useTranslation("Design");
   const form = useFormContext<ProductSetFormValues>();
@@ -208,101 +203,90 @@ export function ProductsControl({
         onDragEnd={handleDragEnd}
         sensors={[mouseSensor]}
       >
-        {fields.map((product, index) => {
-          const isOverridesProductSet = isEventEditProductSet
-            ? !!product.id
-            : isOverrides && !!product.originalProductId;
-
-          const isNewProductOverrides = isCreateNewOverrides && !!product.id;
-
-          return (
-            <Controller
-              key={product._id}
-              control={control}
-              name={`${productControlFieldName}.${index}.name` as const}
-              rules={{
-                required: t("Validation:fieldRequired", {
-                  attribute: t("name"),
-                }) as string,
-              }}
-              render={({ field: { value, onChange } }) => (
-                <SortableTree.Item
-                  key={`product-${product._id}`}
-                  id={String(product._id)}
-                  isExpanded={isFirstProductAdded}
-                  isInvalid={!!categoryProductErrors}
-                  title={value}
-                  isOverride={isOverrides}
-                  badge={
-                    <Badge className="product-badge">{t("product")}</Badge>
-                  }
-                  isIconInHeader={false}
-                  cancelChanges={() => cancelChanges(index)}
-                  edit={() => edit(index)}
-                  secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
-                  subTitle={
-                    <div className="product-set-badges-container">
-                      <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
-                      <span>
-                        {`£${prices[index]} ${t("each")} - ${t("qty")}:${
-                          !isUnlimitedQuantities[index]
-                            ? ` ${quantities[index]}`
-                            : t(" unlimited")
-                        } ${
-                          !isUnlimitedQuantities[index]
-                            ? ` - ${t("possibleRevenue")} £${
-                                prices[index] * quantities[index]
-                              }`
-                            : ""
-                        } `}
-                      </span>
-                    </div>
-                  }
-                  modalLabel={t("addNewProduct")}
-                  modalClass={ProductSetModalClasses.product}
-                  isNewAdded={showProductModal}
-                  body={
-                    <ProductControl<ProductSetFormValues>
-                      isLoading={isLoading}
-                      quantityType={quantityType}
-                      allowDeposits={allowDeposits}
-                      hasBookingManagement={false}
-                      fieldNamePrefix={
-                        `${productControlFieldName}.${index}` as const
-                      }
-                      productName={value}
-                      onProductNameChange={onChange}
-                      hasTicket={hasTicket}
-                      categoryType={categoryType}
-                      zoneDuration={catergoryZone?.defaultDuration}
-                      isOverrides={
-                        isNewProductOverrides || isOverridesProductSet
-                      }
-                    />
-                  }
-                  onDelete={() => onProductRemove(index)}
-                  validate={() =>
-                    trigger(`${productControlFieldName}.${index}`)
-                  }
-                  saveValidField={saveValidField}
-                  // preItem={<Popover className="d-none d-sm-block" />}
-                >
-                  <SubProductsControl
+        {fields.map((product, index) => (
+          <Controller
+            key={product._id}
+            control={control}
+            name={`${productControlFieldName}.${index}.name` as const}
+            rules={{
+              required: t("Validation:fieldRequired", {
+                attribute: t("name"),
+              }) as string,
+            }}
+            render={({ field: { value, onChange } }) => (
+              <SortableTree.Item
+                key={`product-${product._id}`}
+                id={String(product._id)}
+                isExpanded={isFirstProductAdded}
+                isInvalid={!!categoryProductErrors}
+                title={value}
+                isOverride={isOverrides}
+                badge={<Badge className="product-badge">{t("product")}</Badge>}
+                isIconInHeader={false}
+                cancelChanges={() => cancelChanges(index)}
+                edit={() => edit(index)}
+                isProduct
+                secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
+                subTitle={
+                  <div className="product-set-badges-container">
+                    <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
+                    <span>
+                      {`£${prices[index]} ${t("each")} - ${t("qty")}:${
+                        !isUnlimitedQuantities[index]
+                          ? ` ${quantities[index]}`
+                          : t(" unlimited")
+                      } ${
+                        !isUnlimitedQuantities[index]
+                          ? ` - ${t("possibleRevenue")} £${
+                              prices[index] * quantities[index]
+                            }`
+                          : ""
+                      } `}
+                    </span>
+                  </div>
+                }
+                modalLabel={t("addNewProduct")}
+                modalClass={ProductSetModalClasses.product}
+                isNewAdded={showProductModal}
+                body={
+                  <ProductControl<ProductSetFormValues>
                     isLoading={isLoading}
                     quantityType={quantityType}
-                    stepIndex={stepIndex}
-                    productCategoryIndex={productCategoryIndex}
-                    productIndex={index}
+                    allowDeposits={allowDeposits}
+                    hasBookingManagement={false}
+                    fieldNamePrefix={
+                      `${productControlFieldName}.${index}` as const
+                    }
+                    productName={value}
+                    onProductNameChange={onChange}
+                    hasTicket={hasTicket}
+                    categoryType={categoryType}
+                    zoneDuration={catergoryZone?.defaultDuration}
+                    isOverrides={isOverrides}
                   />
-                </SortableTree.Item>
-              )}
-            />
-          );
-        })}
+                }
+                onDelete={() => onProductRemove(index)}
+                validate={() => trigger(`${productControlFieldName}.${index}`)}
+                saveValidField={saveValidField}
+                // preItem={<Popover className="d-none d-sm-block" />}
+              >
+                <SubProductsControl
+                  isLoading={isLoading}
+                  quantityType={quantityType}
+                  stepIndex={stepIndex}
+                  productCategoryIndex={productCategoryIndex}
+                  productIndex={index}
+                />
+              </SortableTree.Item>
+            )}
+          />
+        ))}
       </SortableTree>
       <CreateProductSetItem
         title={t("addProduct")}
+        isOverride={isOverrides}
         onClick={() => {
+          if (isOverrides) return;
           append(getDefaultProductValue(fields.length));
           setShowProductModal(true);
 

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

@@ -19,16 +19,9 @@ import { ProductSetFormValues } from "./ProductSetForm";
 interface StepsControlProps {
   isLoading: boolean;
   isOverrides?: boolean;
-  isEventEditProductSet?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
-export function StepsControl({
-  isLoading,
-  isOverrides,
-  isEventEditProductSet,
-  isCreateNewOverrides,
-}: StepsControlProps) {
+export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
   const form = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
   const [showStepModal, setShowStepModal] = useState(false);
@@ -75,9 +68,9 @@ export function StepsControl({
     <>
       {fields.map((step, index) => {
         const stepFieldName = `steps.${index}` as const;
+
         const stepData = getValues(stepFieldName);
-        const isOverrideStep =
-          (isOverrides || isCreateNewOverrides) && !!step.id;
+
         return (
           <Controller
             key={`step-${step._id}`}
@@ -99,9 +92,9 @@ export function StepsControl({
                 modalLabel={t("addNewStep")}
                 modalClass={ProductSetModalClasses.step}
                 isNewAdded={showStepModal}
-                edit={() => edit(index)}
+                edit={() => !isOverrides && edit(index)}
                 cancelChanges={() => cancelChanges(index)}
-                isOverride={isOverrideStep}
+                isOverride={isOverrides}
                 subTitle={
                   <div className="product-set-badges-container">
                     <div className="product-set-subtitle-dot product-set-subtitle-step-dot" />
@@ -117,7 +110,6 @@ export function StepsControl({
                     stepIndex={index}
                     stepName={value}
                     onStepNameChange={onChange}
-                    isOverrides={isOverrideStep}
                   />
                 }
                 onDelete={() => remove(index)}
@@ -148,8 +140,6 @@ export function StepsControl({
                   isLoading={isLoading}
                   stepIndex={index}
                   isOverrides={isOverrides}
-                  isCreateNewOverrides={isCreateNewOverrides}
-                  isEventEditProductSet={isEventEditProductSet}
                 />
               </SortableTree.Item>
             )}
@@ -159,7 +149,9 @@ export function StepsControl({
 
       <CreateProductSetItem
         title={t("addStep")}
+        isOverride={isOverrides}
         onClick={() => {
+          if (isOverrides) return;
           append(getDefaultStepsValues());
           setShowStepModal(true);
           if (errors.steps?.type === HookFormService.manualErrorType) {

package/src/product-set/product/ProductControl.tsx

@@ -7,17 +7,14 @@ import {
   QUANTITY_TYPE_LIST_DTO,
   QUANTITY_TYPE_RECHARGING,
 } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
-import {
-  ProductType,
-  PRODUCT_DEfAULT_COLORS,
-} from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import { ProductType } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import clsx from "clsx";
 import {
   FieldNamePrefixPath,
   FormValues,
 } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { useId } from "@react-aria/utils";
+import clsx from "clsx";
 import React, {
   ChangeEvent,
   useCallback,
@@ -39,7 +36,7 @@ import {
 } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useImages } from "@licklist/plugins/dist/hooks/Media/useImages";
-
+import { PRODUCT_DEfAULT_COLORS } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import {
   Image,
   IMAGE_TYPE_IMAGE,
@@ -89,7 +86,6 @@ export interface ProductControlValues
   totalQuantity: number;
   isAvailable: boolean;
   isSoldOut: boolean;
-  originalProductId: number | null;
   isUnlimited: boolean;
   isRequired: boolean;
   quantitySelector: number;
@@ -160,6 +156,7 @@ export function ProductControl<T extends FormValues>({
   );
   const capacity = watch(`${fieldNamePrefix}.capacity` as Path<T>);
   const disabledDuration = capacity === "0" || !capacity;
+
   const advancedId = useId();
   const nameId = useId();
 
@@ -413,7 +410,7 @@ export function ProductControl<T extends FormValues>({
                 `${fieldNamePrefix}.productGroupId` as Path<T>,
                 errors
               )}
-              disabled={isLoading || isOverrides}
+              disabled={isLoading}
               defaultValue=""
             >
               <option value="">{t("Design:selectProductGroup")}</option>

package/src/product-set/step/StepControl.tsx

@@ -26,7 +26,6 @@ export interface StepControlProps extends IsDeletableEvent {
   stepIndex: number;
   stepName: string;
   onStepNameChange: (args: any) => void;
-  isOverrides?: boolean;
 }
 
 export function StepControl({
@@ -34,7 +33,6 @@ export function StepControl({
   stepIndex,
   stepName,
   onStepNameChange,
-  isOverrides = false,
 }: StepControlProps) {
   const { providerHasMap } = useContext(ProductSetLoadingContext);
   const {
@@ -44,6 +42,7 @@ export function StepControl({
     watch,
   } = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
+
   const fieldName = `steps.${stepIndex}.name` as const;
   const productCategoriesFieldName =
     `steps.${stepIndex}.productCategories` as const;
@@ -72,7 +71,7 @@ export function StepControl({
                     fieldName,
                     errors
                   )}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}
@@ -115,7 +114,7 @@ export function StepControl({
                           name={name}
                           value={Boolean(value)}
                           onChange={onChange}
-                          disabled={isLoading || isOverrides}
+                          disabled={isLoading}
                         />
                       )}
                       control={control}