@licklist/design 0.44.485-dev.88 → 0.44.485-dev.9

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

@@ -21,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";
@@ -86,25 +85,16 @@ export function ProductsControl({
     trigger,
     setValue,
     watch,
-    getValues,
   } = form;
 
   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`
   );
@@ -166,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
@@ -208,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">
@@ -247,9 +219,8 @@ export function ProductsControl({
                     categoryType={categoryType}
                   />
                 }
-                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;
@@ -139,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
@@ -159,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,7 +189,7 @@ export function ProductControl<T extends FormValues>({
 
   const onImageRemove = useCallback(
     (id, path) => {
-      handleImageRemove(String(id), path);
+      handleImageRemove(id, path);
     },
     [handleImageRemove]
   );
@@ -203,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>>>
@@ -217,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>
@@ -256,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>
@@ -283,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}
               />
@@ -291,7 +282,7 @@ export function ProductControl<T extends FormValues>({
           ) : (
             <ProductPriceControl<T>
               isLoading={isLoading}
-              fieldNamePrefix={`${fieldNamePrefix}.price` as Path<T>}
+              fieldNamePrefix={fieldNamePrefix}
             />
           )}
 
@@ -562,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/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>

package/src/product-set/product/quantity/ProductQuantityRechargingControl.tsx

@@ -33,22 +33,18 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
     onFocus,
   } = props;
   const {
-    control,
     trigger,
-    watch,
-    register,
+    control,
     formState: { errors },
   } = useFormContext<T>();
   const { t } = useTranslation("Design");
-  const totalQuantityId = useId();
 
-  const maxQuantityValue = watch(`${fieldNamePrefix}.maxQuantity` as Path<T>);
-  const unlimited = watch(`${fieldNamePrefix}.isUnlimited` as Path<T>);
+  const totalQuantityId = useId();
 
+  // trigger total quantity field's validation if disabled state was changed
   useEffect(() => {
     trigger(`${fieldNamePrefix}.totalQuantity` as Path<T>);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [maxQuantityValue, unlimited]);
+  }, [disabled, fieldNamePrefix, trigger]);
 
   return (
     <>
@@ -69,27 +65,6 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
                 type="number"
                 min={0}
                 step={1}
-                {...register(`${fieldNamePrefix}.totalQuantity` as Path<T>, {
-                  validate: (value) => {
-                    if (unlimited) return true;
-                    const min = 1;
-                    const maxQuantity = Number(maxQuantityValue);
-                    const totalQuantity = Number(value);
-                    if (totalQuantity < min) {
-                      return t("Validation:fieldMinNumber", {
-                        attribute: t("totalQuantity"),
-                        min: 1,
-                      }) as string;
-                    }
-                    if (totalQuantity < maxQuantity) {
-                      return t("Validation:fieldTotalNumber", {
-                        attribute: t("totalQuantity"),
-                        max: t("maxOrderQuantity"),
-                      }) as string;
-                    }
-                    return true;
-                  },
-                })}
                 value={value as string}
                 onFocus={onFocus}
                 onChange={onChange}
@@ -108,7 +83,18 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
                     required: false,
                     min: 0,
                   }
-                : {}
+                : {
+                    required: t("Validation:fieldRequired", {
+                      attribute: t("totalQuantity"),
+                    }) as string,
+                    min: {
+                      value: 1,
+                      message: t("Validation:fieldMinNumber", {
+                        attribute: t("totalQuantity"),
+                        min: 1,
+                      }) as string,
+                    },
+                  }
             }
           />
 

package/src/product-set/product-category/ProductCategoryControl.tsx

@@ -105,7 +105,7 @@ export function ProductCategoryControl({
 
   const allowDepositsId = useId();
   const remainderExpireAfterId = useId();
-  const { providerHasBookingManagement, zones = [] } = useContext(
+  const { providerHasBookingManagement, zones } = useContext(
     ProductSetLoadingContext
   );
 

package/src/product-set/utils/index.ts

@@ -1,7 +1,3 @@
-import { EmailTemplate } from "@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper";
-import { SmsTemplate } from "@licklist/core/dist/DataMapper/Notification/SmsTemplateDataMapper";
-import { TemplateItem } from "../control/ProductSetControl";
-
 export const moveArrayElements = <T>(
   array: T[],
   prevIndex: number,
@@ -18,27 +14,3 @@ export const moveArrayElements = <T>(
 export const sortArrayByIndex = <T>(array: T[]) => {
   return array.map((element: T, index) => ({ ...element, sort: index }));
 };
-
-export const getFilteredTemplates = (
-  templates?: EmailTemplate[] | SmsTemplate[],
-  formTemplates?: TemplateItem[]
-): TemplateItem[] | undefined => {
-  if (!templates) {
-    return undefined;
-  }
-
-  return templates
-    ?.filter(
-      (template) =>
-        template.notification.isActive &&
-        !formTemplates?.find(
-          (formTemplate) =>
-            formTemplate.value.notification.type === template.notification.type
-        )
-    )
-    ?.map((template) => ({
-      id: template?.id,
-      value: template,
-      label: template?.notification?.name,
-    }));
-};

package/src/provider/provider-details-input/ProviderDetailsInput.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { Form } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
@@ -6,7 +6,6 @@ import { useId } from "@react-aria/utils";
 import { Image } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
 import { Typeahead, TypeaheadOptions } from "../../typeahead";
-import { MAX_DESCRIPTION_CHARACTERS_LENGTH } from "../constants";
 import {
   ProviderLinksInput,
   ProviderLinksInputProps,
@@ -34,9 +33,8 @@ export function ProviderDetailsInput({
 }: ProviderDetailsInputProps) {
   const {
     register,
-    watch,
-    trigger,
     formState: { errors },
+    setValue,
   } = useFormContext<ProviderDetailsInputValues>();
   const { t } = useTranslation(["App", "Design", "Validation"]);
 
@@ -47,14 +45,6 @@ export function ProviderDetailsInput({
   const websiteId = useId();
   const companyId = useId();
 
-  const description = watch("description");
-
-  useEffect(() => {
-    if (MAX_DESCRIPTION_CHARACTERS_LENGTH > description.length) return;
-    trigger("description");
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [description.length]);
-
   return (
     <>
       <Form.Group controlId={nameId}>
@@ -78,26 +68,11 @@ export function ProviderDetailsInput({
       <Form.Group controlId={descriptionId}>
         <Form.Label>{t("Design:description")}</Form.Label>
         <Form.Control
-          {...register("description", {
-            validate: (value) => {
-              const descriptionLength = value.length;
-              if (descriptionLength > MAX_DESCRIPTION_CHARACTERS_LENGTH) {
-                return t("Validation:descriptionTooManyCharactersMessage", {
-                  max: MAX_DESCRIPTION_CHARACTERS_LENGTH,
-                }) as string;
-              }
-              return true;
-            },
-          })}
+          {...register("description")}
           as="textarea"
           name="description"
           rows={6}
-          isInvalid={Boolean(errors.description)}
         />
-        <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.description, "validate") &&
-            errors.description?.message}
-        </Form.Control.Feedback>
       </Form.Group>
 
       <Form.Group controlId={emailId}>
@@ -174,6 +149,7 @@ export function ProviderDetailsInput({
           <Typeahead
             name="company"
             options={companiesOptions}
+            setValue={setValue}
             placeholder={t("App:select")}
             noOptionsMessage={t("App:noMatchesFound")}
           />

package/src/sales/booking/filter/BookingFilter.stories.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import { MemoryRouter } from "react-router-dom";
+import { boolean } from "@storybook/addon-knobs";
+import { Meta, Story } from "@storybook/react";
+import { BookingContextProvider } from "@licklist/plugins/dist/context/booking/BookingContext";
+import { BookingFilter, BookingFilterProps } from "./BookingFilter";
+
+export default {
+  title: "Sales/Booking/Filter",
+  component: BookingFilter,
+} as Meta;
+
+export const Default: Story<BookingFilterProps> = () => {
+  const isFilterOpen = boolean("isFilterOpen", false);
+  const autoFocusOnMount = boolean("autoFocusOnMount", true);
+
+  return (
+    <MemoryRouter>
+      <BookingContextProvider>
+        <BookingFilter
+          isFilterOpen={isFilterOpen}
+          autoFocusOnMount={autoFocusOnMount}
+        />
+      </BookingContextProvider>
+    </MemoryRouter>
+  );
+};