@licklist/design 0.44.486-dev.83 → 0.44.486

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

@@ -11,7 +11,6 @@ import { isEqual } from "lodash";
 // eslint-disable-next-line max-len
 import { ProviderBookingManagementSetting } from "@licklist/core/dist/DataMapper/Provider/ProviderBookingManagementSettingDataMapper";
 import { Zone } from "@licklist/core/dist/DataMapper/Provider/ZoneDataMapper";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { Dialog, useDialogContext } from "../../modals/dialog";
 import {
   ProductSetControl,
@@ -21,7 +20,6 @@ import {
 import { Step } from "../types";
 import { ProductSetContextProvider, ProductSetLoadingContext } from "./context";
 import { SelectItem } from "../../types/generic/SelectItem";
-import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
 
 export interface WithIsLoading {
   isLoading: boolean;
@@ -50,7 +48,6 @@ export interface ProductSetFormProps
   providerHasBookingManagement?: ProviderBookingManagementSetting["hasBookingManagement"];
   zones?: Zone[] | null;
   isCreateAction?: boolean;
-  workHours?: WorkHour[];
 }
 
 export function ProductSetForm({
@@ -66,7 +63,6 @@ export function ProductSetForm({
   providerHasBookingManagement,
   zones,
   isCreateAction,
-  workHours,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -86,15 +82,6 @@ export function ProductSetForm({
   const { setError, reset } = form;
   const formValues = form.watch();
 
-  const submitHandler = (onSubmit: (values: ProductSetFormValues) => void) => {
-    return (values: ProductSetFormValues) => {
-      if (checkAvailableTimesErrors({ values, setError, t })) {
-        return;
-      }
-      onSubmit(values);
-    };
-  };
-
   useEffect(() => {
     if (!defaultValues || isEqual(defaultValues, formValues)) {
       return;
@@ -139,28 +126,16 @@ export function ProductSetForm({
       />
 
       <FormProvider {...form}>
-        <Form onSubmit={form.handleSubmit(submitHandler(onSubmitAndRedirect))}>
+        <Form onSubmit={form.handleSubmit(onSubmitAndRedirect)}>
           <ProductSetLoadingContext.Consumer>
             {({ isLoading: contextIsLoading }) => {
               return (
                 <>
                   <ProductSetControl
                     {...shared}
-                    smsTemplates={getFilteredTemplates(
-                      shared?.smsTemplates,
-                      formValues?.smsTemplates
-                    )}
-                    emailTemplates={getFilteredTemplates(
-                      shared?.emailTemplates,
-                      formValues?.emailTemplates
-                    )}
-                    showEmailTemplate={!!shared?.emailTemplates}
-                    showSmsTemplate={!!shared?.smsTemplates}
                     isLoading={isLoading}
                     isCreateAction={isCreateAction}
                     companyName={companyName}
-                    workHours={workHours}
-                    providerHasBookingManagement={providerHasBookingManagement}
                   />
                   <Row>
                     <Col md={6} sm={12} />
@@ -172,9 +147,7 @@ export function ProductSetForm({
                       {onSubmitNoRedirect && (
                         <Button
                           className="product-set-save-btn mt-5 ml-5 d-no dne d-md-block"
-                          onClick={form.handleSubmit(
-                            submitHandler(onSubmitNoRedirect)
-                          )}
+                          onClick={form.handleSubmit(onSubmitNoRedirect)}
                           disabled={
                             isLoading || contextIsLoading || !formValues.name
                           }

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

@@ -14,7 +14,6 @@ import { generateUuid } from "@licklist/core/dist/Services";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
 
 import { CategoryType } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
-import { Zone } from "@licklist/core/dist/DataMapper/Provider/ZoneDataMapper";
 import { ProductControl, ProductControlProps, ProductSetFormValues } from "..";
 import { SortableTree } from "../../sortable-tree";
 import { CreateProductSetItem } from "../item/CreateProductSetItem";
@@ -22,7 +21,6 @@ import { Product } from "../types";
 import { WithIsLoading } from "./ProductSetForm";
 // @TODO not for first release
 // import Popover from "./ProductSetFormPopover";
-import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 import { SubProductsControl } from "./SubProductsControl";
 import { ProductSetModalClasses } from "../../sortable-tree/SortableTreeItem";
 import { getBadgeConfig } from "./ProductCategoriesControl";
@@ -33,7 +31,6 @@ interface ProductsControlProps extends WithIsLoading {
   productCategoryIndex: number;
   hasTicket?: boolean;
   categoryType: CategoryType;
-  zones?: Zone[];
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -76,7 +73,6 @@ export function ProductsControl({
   productCategoryIndex,
   hasTicket,
   categoryType,
-  zones,
 }: ProductsControlProps) {
   const { t } = useTranslation("Design");
   const form = useFormContext<ProductSetFormValues>();
@@ -89,31 +85,16 @@ export function ProductsControl({
     trigger,
     setValue,
     watch,
-    getValues,
   } = form;
 
-  const zoneId = watch(
-    `steps.${stepIndex}.productCategories.${productCategoryIndex}.zoneId`
-  );
-
-  const catergoryZone = zones?.find((zone) => zone.id === Number(zoneId));
-
   const productControlFieldName =
     `steps.${stepIndex}.productCategories.${productCategoryIndex}.products` as const;
 
-  const productPointsKey = `steps.${stepIndex}.pointProducts` as const;
-
   const { fields, append, remove, move } = useFieldArray({
     name: productControlFieldName,
     control,
     keyName: "_id",
   });
-
-  const { edit, saveValidField, cancelChanges } = useSortableTreeFunctions({
-    fieldName: productControlFieldName,
-    remove,
-  });
-
   const allowDeposits = watch(
     `steps.${stepIndex}.productCategories.${productCategoryIndex}.allowDeposits`
   );
@@ -175,22 +156,6 @@ export function ProductsControl({
     });
   };
 
-  const onProductRemove = (index: number) => {
-    const currentProduct = getValues(
-      `${productControlFieldName}.${index}` as const
-    );
-
-    const currentPointProducts = getValues(productPointsKey);
-
-    setValue(
-      productPointsKey,
-      currentPointProducts?.filter(
-        (product) => product.productUuid !== currentProduct.uuid
-      ) || []
-    );
-    remove(index);
-  };
-
   return (
     <>
       <SortableTree
@@ -217,8 +182,6 @@ export function ProductsControl({
                 title={value}
                 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">
@@ -254,12 +217,10 @@ export function ProductsControl({
                     onProductNameChange={onChange}
                     hasTicket={hasTicket}
                     categoryType={categoryType}
-                    zoneDuration={catergoryZone?.defaultDuration}
                   />
                 }
-                onDelete={() => onProductRemove(index)}
+                onDelete={() => remove(index)}
                 validate={() => trigger(`${productControlFieldName}.${index}`)}
-                saveValidField={saveValidField}
                 // preItem={<Popover className="d-none d-sm-block" />}
               >
                 <SubProductsControl

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

@@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next";
 import Badge from "react-bootstrap/Badge";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
 
-import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 import { SortableTree } from "../../sortable-tree";
 import { ProductSetModalClasses } from "../../sortable-tree/SortableTreeItem";
 import { CreateProductSetItem } from "../item/CreateProductSetItem";
@@ -12,7 +11,6 @@ import { StepControl } from "../step/StepControl";
 import { Step } from "../types";
 import { ProductCategoriesControl } from "./ProductCategoriesControl";
 import { ProductSetFormValues } from "./ProductSetForm";
-
 // @TODO not for first release
 // import Popover from "./ProductSetFormPopover";
 
@@ -30,7 +28,6 @@ export function StepsControl({ isLoading }: StepsControlProps) {
     formState: { errors, isSubmitting },
     clearErrors,
     getValues,
-    setFocus,
   } = form;
 
   const { fields, append, remove } = useFieldArray({
@@ -39,11 +36,6 @@ export function StepsControl({ isLoading }: StepsControlProps) {
     keyName: "_id",
   });
 
-  const { edit, saveValidField, cancelChanges } = useSortableTreeFunctions({
-    fieldName: "steps",
-    remove,
-  });
-
   useEffect(() => {
     if (!isSubmitting) {
       return;
@@ -65,14 +57,12 @@ export function StepsControl({ isLoading }: StepsControlProps) {
   return (
     <>
       {fields.map((step, index) => {
-        const stepFieldName = `steps.${index}` as const;
-
-        const stepData = getValues(stepFieldName);
+        const stepData: any = getValues(`steps.${index}` as const);
 
         return (
           <Controller
             key={`step-${step._id}`}
-            name={`${stepFieldName}.name` as const}
+            name={`steps.${index}.name` as const}
             control={control}
             rules={{
               required: t("Validation:fieldRequired", {
@@ -84,14 +74,12 @@ export function StepsControl({ isLoading }: StepsControlProps) {
                 id={step._id}
                 title={value}
                 badge={<Badge className="step-badge">{t("step")}</Badge>}
-                isExpanded={isFirstStepAdded || !!errors.steps?.[index]}
+                isExpanded={isFirstStepAdded}
                 isInvalid={!!errors.steps?.[index]}
                 isIconInHeader={false}
                 modalLabel={t("addNewStep")}
                 modalClass={ProductSetModalClasses.step}
                 isNewAdded={showStepModal}
-                edit={() => edit(index)}
-                cancelChanges={() => cancelChanges(index)}
                 subTitle={
                   <div className="product-set-badges-container">
                     <div className="product-set-subtitle-dot product-set-subtitle-step-dot" />
@@ -116,22 +104,6 @@ export function StepsControl({ isLoading }: StepsControlProps) {
                     ? step.productCategories.map(({ id }) => String(id))
                     : []
                 }
-                validate={() => {
-                  // @TODO investigate why form return true in case
-                  // when required field not filled. Looks like
-                  // we cann't use default hookForm trigger function
-                  // because we have venueMap outside this form.
-                  // So before closing we need to check directly by
-                  // error on name field. Instead of run trugger.
-                  const error = errors.steps?.[index]?.name;
-
-                  if (error) {
-                    setFocus(`${stepFieldName}.name` as const);
-                  }
-
-                  return Promise.resolve(!error);
-                }}
-                saveValidField={saveValidField}
               >
                 <ProductCategoriesControl
                   isLoading={isLoading}

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

@@ -64,7 +64,6 @@ import { IsDeletableEvent } from "../types";
 import { FixedDurationOptions } from "./fixed-duration-fields";
 import { ProductDurationControl } from "./duration";
 import { ProductPriceControl } from "./price";
-import { MAX_PRODUCT_DESCRIPTION_CHARACTERS_LENGTH } from "./constants";
 
 // TO DO refactor this file
 // and add correct types
@@ -87,7 +86,6 @@ export interface ProductControlValues
   isRequired: boolean;
   quantitySelector: number;
   hasSpecialNotes: boolean;
-  minSpend?: number | null;
   type?: ProductType;
   weight?: number;
   tierId?: number;
@@ -113,7 +111,6 @@ export interface ProductControlProps<T>
   productName: string;
   hasTicket?: boolean;
   categoryType?: CategoryType;
-  zoneDuration?: number;
 }
 
 export function ProductControl<T extends FormValues>({
@@ -127,7 +124,6 @@ export function ProductControl<T extends FormValues>({
   productName,
   hasTicket,
   categoryType,
-  zoneDuration,
 }: ProductControlProps<T>) {
   const {
     register,
@@ -141,7 +137,7 @@ export function ProductControl<T extends FormValues>({
   const { setLoading, providerHasBookingManagement } = useContext(
     ProductSetLoadingContext
   );
-  const { t } = useTranslation(["Design", "Validation"]);
+  const { t } = useTranslation("Design");
   const [expanded, setExpanded] = useState(false);
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
   // @TODO: After checking "isUnlimited" checkbox need to reset field totalQuantity
@@ -161,7 +157,6 @@ export function ProductControl<T extends FormValues>({
   const quantitySelectorId = useId();
   const hasSpecialNotesId = useId();
   const unlimitedQuantityId = useId();
-  const minSpendId = useId();
 
   const quantitySelectorList: SelectItem[] = [
     { id: 1, value: t("quantitySelector") },
@@ -192,19 +187,9 @@ export function ProductControl<T extends FormValues>({
     [handleImageUploading]
   );
 
-  const onChangeGameCapacity = (value: number) => {
-    if (!zoneDuration) {
-      return;
-    }
-    setValue(
-      `${fieldNamePrefix}.duration` as Path<T>,
-      (value * zoneDuration) as UnpackNestedValue<PathValue<T, Path<T>>>
-    );
-  };
-
   const onImageRemove = useCallback(
     (id, path) => {
-      handleImageRemove(String(id), path);
+      handleImageRemove(id, path);
     },
     [handleImageRemove]
   );
@@ -215,13 +200,7 @@ export function ProductControl<T extends FormValues>({
   }, [setLoading, isImageUploading]);
 
   useEffect(() => {
-    const formImages = getValues(`${fieldNamePrefix}.images` as Path<T>);
-
-    setInitialImages(formImages as Image[]);
-  }, [getValues, setInitialImages, fieldNamePrefix]);
-
-  useEffect(() => {
-    if (Array.isArray(images)) {
+    if (Array.isArray(images) && images?.length > 0) {
       setValue(
         `${fieldNamePrefix}.images` as Path<T>,
         images as UnpackNestedValue<PathValue<T, Path<T>>>
@@ -229,8 +208,15 @@ export function ProductControl<T extends FormValues>({
     }
   }, [images, fieldNamePrefix, setValue]);
 
+  useEffect(() => {
+    const formImages = getValues(`${fieldNamePrefix}.images` as Path<T>);
+
+    setInitialImages(formImages as Image[]);
+  }, [getValues, setInitialImages, fieldNamePrefix]);
+
   const quantitySelector = quantityValue ?? "1";
   const quantity = QUANTITY_TYPE_LIST_DTO[quantitySelector as string];
+
   return (
     <>
       <Row>
@@ -268,24 +254,17 @@ export function ProductControl<T extends FormValues>({
                   disabled={isLoading}
                 />
               )}
-              rules={{
-                maxLength: {
-                  value: MAX_PRODUCT_DESCRIPTION_CHARACTERS_LENGTH,
-                  message: t("Validation:descriptionTooManyCharactersMessage", {
-                    max: MAX_PRODUCT_DESCRIPTION_CHARACTERS_LENGTH,
-                  }) as string,
-                },
-              }}
               control={control}
               name={`${fieldNamePrefix}.description` as Path<T>}
             />
+
+            <Form.Control.Feedback type="invalid">
+              {HookFormService.getErrors<T>(
+                `${fieldNamePrefix}.description` as Path<T>,
+                errors
+              )}
+            </Form.Control.Feedback>
           </Form.Group>
-          <div className="invalid-feedback field-values-error d-block">
-            {HookFormService.getErrors<T>(
-              `${fieldNamePrefix}.description` as Path<T>,
-              errors
-            )}
-          </div>
 
           {allowDeposits ? (
             <Row>
@@ -295,7 +274,7 @@ export function ProductControl<T extends FormValues>({
               />
               <ProductPriceControl<T>
                 isLoading={isLoading}
-                fieldNamePrefix={`${fieldNamePrefix}.price` as Path<T>}
+                fieldNamePrefix={fieldNamePrefix}
                 title={t("totalPrice")}
                 allowDeposits={allowDeposits}
               />
@@ -303,7 +282,7 @@ export function ProductControl<T extends FormValues>({
           ) : (
             <ProductPriceControl<T>
               isLoading={isLoading}
-              fieldNamePrefix={`${fieldNamePrefix}.price` as Path<T>}
+              fieldNamePrefix={fieldNamePrefix}
             />
           )}
 
@@ -384,14 +363,6 @@ export function ProductControl<T extends FormValues>({
             <FormNumberInput
               fieldName={`${fieldNamePrefix}.capacity`}
               label={t("capacity")}
-              rules={{
-                min: {
-                  value: 1,
-                  message: t("Validation:fieldRequired", {
-                    attribute: t("capacity"),
-                  }) as string,
-                },
-              }}
             />
           </Col>
         </Row>
@@ -403,11 +374,7 @@ export function ProductControl<T extends FormValues>({
             <FormNumberInput
               fieldName={`${fieldNamePrefix}.capacity`}
               label={t("capacity")}
-              onChange={onChangeGameCapacity}
               rules={{
-                required: t("Validation:fieldRequired", {
-                  attribute: t("capacity"),
-                }) as string,
                 min: {
                   value: 1,
                   message: t("Validation:fieldRequired", {
@@ -422,13 +389,10 @@ export function ProductControl<T extends FormValues>({
               fieldName={`${fieldNamePrefix}.duration`}
               label={t("durationMinutes")}
               rules={{
-                required: t("Validation:fieldRequired", {
-                  attribute: t("capacity"),
-                }) as string,
                 min: {
                   value: 1,
                   message: t("Validation:fieldRequired", {
-                    attribute: t("capacity"),
+                    attribute: t("duration"),
                   }) as string,
                 },
               }}
@@ -589,22 +553,10 @@ export function ProductControl<T extends FormValues>({
                 name={`${fieldNamePrefix}.hasSpecialNotes` as Path<T>}
               />
             </Form.Group>
-            {[CATEGORY_TYPE_GAME, CATEGORY_TYPE_FIXED_DURATION].includes(
-              categoryType
-            ) && <FixedDurationOptions fieldNamePrefix={fieldNamePrefix} />}
-            <Form.Group
-              controlId={minSpendId}
-              className="advanced-switch-container"
-            >
-              <ProductPriceControl
-                title={t("minSpend")}
-                isRequired={false}
-                isMoreThanZero
-                allowDeposits={false}
-                isLoading={isLoading}
-                fieldNamePrefix={`${fieldNamePrefix}.minSpend` as Path<T>}
-              />
-            </Form.Group>
+
+            {categoryType === CATEGORY_TYPE_FIXED_DURATION && (
+              <FixedDurationOptions fieldNamePrefix={fieldNamePrefix} />
+            )}
           </div>
         </Collapse>
 

package/src/product-set/product/duration/ProductDurationControl.tsx

@@ -66,7 +66,7 @@ export const ProductDurationControl = <T,>({
         },
         min: {
           value: 1,
-          message: t("Validation:fieldMinNumber", {
+          message: t("Validation:fieldMin", {
             attribute: t("duration"),
           }),
         },

package/src/product-set/product/price/ProductPriceControl.tsx

@@ -1,6 +1,9 @@
 import React from "react";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import { FormValues } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
+import {
+  FieldNamePrefixPath,
+  FormValues,
+} from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { useId } from "@react-aria/utils";
 import { Form } from "react-bootstrap";
 import Col from "react-bootstrap/Col";
@@ -13,13 +16,10 @@ export interface ProductPriceControlValues extends FormValues {
   price: number;
 }
 
-export interface ProductPriceControlProps<T> {
+export interface ProductPriceControlProps<T> extends FieldNamePrefixPath<T> {
   isLoading: boolean;
   title?: string;
   allowDeposits?: boolean;
-  fieldNamePrefix: Path<T>;
-  isRequired?: boolean;
-  isMoreThanZero?: boolean;
 }
 
 export function ProductPriceControl<T extends FormValues>({
@@ -27,15 +27,13 @@ export function ProductPriceControl<T extends FormValues>({
   fieldNamePrefix,
   title,
   allowDeposits,
-  isRequired = true,
-  isMoreThanZero,
 }: ProductPriceControlProps<T>) {
   const {
     control,
     formState: { errors },
   } = useFormContext<T>();
   const { t } = useTranslation("Design");
-  const productTitle = title ?? t("price");
+
   const priceId = useId();
 
   return (
@@ -45,7 +43,7 @@ export function ProductPriceControl<T extends FormValues>({
       className={!allowDeposits && "p-0"}
     >
       <Form.Group controlId={priceId}>
-        <Form.Label>{productTitle}</Form.Label>
+        <Form.Label>{title ?? t("price")}</Form.Label>
 
         <InputGroup hasValidation>
           <InputGroup.Prepend>
@@ -66,58 +64,38 @@ export function ProductPriceControl<T extends FormValues>({
                 name={name}
                 onChange={onChange}
                 isInvalid={HookFormService.isInvalid<T>(
-                  `${fieldNamePrefix}` as Path<T>,
+                  `${fieldNamePrefix}.price` as Path<T>,
                   errors
                 )}
                 disabled={isLoading}
               />
             )}
             control={control}
-            name={`${fieldNamePrefix}` as Path<T>}
+            name={`${fieldNamePrefix}.price` as Path<T>}
             rules={{
-              required: isRequired
-                ? (t("Validation:fieldRequired", {
-                    attribute: productTitle,
-                  }) as string)
-                : false,
-              min: !isMoreThanZero
-                ? {
-                    value: 0,
-                    message: t("Validation:fieldMinNumber", {
-                      attribute: productTitle,
-                      min: 0,
-                    }) as string,
-                  }
-                : undefined,
+              required: t("Validation:fieldRequired", {
+                attribute: t("price"),
+              }) as string,
+              min: {
+                value: 0,
+                message: t("Validation:fieldMinNumber", {
+                  attribute: t("price"),
+                  min: 0,
+                }) as string,
+              },
               max: {
                 value: 999999.99,
                 message: t("Validation:fieldMaxNumber", {
-                  attribute: productTitle,
+                  attribute: t("price"),
                   max: 999999.99,
                 }) as string,
               },
-
-              validate: (value) => {
-                if (
-                  !isMoreThanZero ||
-                  (isMoreThanZero &&
-                    (value === undefined || value === null || value === "")) ||
-                  (isMoreThanZero && Number(value) > 0)
-                ) {
-                  return true;
-                }
-
-                return t("Validation:fieldGreaterMinNumber", {
-                  attribute: productTitle,
-                  min: 0,
-                }) as string;
-              },
             }}
           />
 
           <Form.Control.Feedback type="invalid">
             {HookFormService.getErrors<T>(
-              `${fieldNamePrefix}` as Path<T>,
+              `${fieldNamePrefix}.price` as Path<T>,
               errors
             )}
           </Form.Control.Feedback>