@licklist/design 0.44.485-dev.4 → 0.44.485-dev.40

package/src/notification/sms-template/form/SmsTemplateForm.stories.tsx

@@ -38,12 +38,26 @@ Default.args = {
     isDefault: false,
     body: "Some random sms string",
   },
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };
 
 Empty.args = {
   onSubmit: (data) => console.log(data),
   isLoading: true,
   placeholders: [],
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
 };
 
 ServerErrors.args = {
@@ -54,4 +68,18 @@ ServerErrors.args = {
     body: ["Body field is required"],
     name: ["Name Field is required"],
   },
+  type: "confirmation",
+  notificationTypes: [
+    "confirmation",
+    "paymentLink",
+    "afterBooking",
+    "preliminaryMail",
+  ],
+  defaultValues: {
+    name: "",
+    isActive: false,
+    isDefault: false,
+    body: "Some random sms string",
+    id: 5,
+  },
 };

package/src/notification/sms-template/form/SmsTemplateForm.tsx

@@ -8,6 +8,7 @@ import { NotificationPlaceholder } from "@licklist/core/dist/DataMapper/Notifica
 import { ServerError } from "@licklist/plugins/dist/hooks/Api/useHttpQuery";
 import FormErrorService from "@licklist/plugins/dist/services/Form/FormErrorService";
 
+import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
 import { NotificationPlaceholders } from "../../components/NotificationPlaceholders";
 import { SmsTemplateControl } from "../control/SmsTemplateControl";
 
@@ -16,6 +17,8 @@ export interface SmsTemplateValues extends FormValues {
   isActive: boolean;
   isDefault: boolean;
   body: string;
+  type?: NotificationType;
+  id?: number | string;
 }
 
 export interface SmsTemplateProps extends HasPermissionProp {
@@ -24,6 +27,7 @@ export interface SmsTemplateProps extends HasPermissionProp {
   defaultValues?: SmsTemplateValues;
   placeholders?: NotificationPlaceholder[];
   serverErrors?: ServerError;
+  notificationTypes?: NotificationType[];
 }
 
 export function SmsTemplateForm({
@@ -32,6 +36,7 @@ export function SmsTemplateForm({
   hasPermission = true,
   placeholders = [],
   serverErrors,
+  notificationTypes = [],
 }: SmsTemplateProps) {
   const { t } = useTranslation("Design");
 
@@ -46,7 +51,7 @@ export function SmsTemplateForm({
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
-        <SmsTemplateControl />
+        <SmsTemplateControl notificationTypes={notificationTypes} />
         <NotificationPlaceholders placeholders={placeholders} />
 
         {hasPermission && (

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

@@ -15,6 +15,7 @@ import { FieldSet } from "@licklist/core/dist/DataMapper/Order/FieldSetDataMappe
 import { EmailTemplate } from "@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper";
 import { SmsTemplate } from "@licklist/core/dist/DataMapper/Notification/SmsTemplateDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
+import { ruleForUrlWithProtocol } from "@licklist/plugins/dist/validation/Rules/urlRule";
 import { WarningMessage } from "../../static";
 import { SelectItem } from "../../types/generic/SelectItem";
 import {
@@ -26,23 +27,31 @@ import {
 import TutorialGifCard from "./TutorialGifCard";
 import { Step } from "../types";
 import { StepsControl } from "../form/StepsControl";
+import { Typeahead } from "../../typeahead";
 
 const OPERATIONAL_COST_TITLES = {
   [OPERATIONAL_COST_PROVIDER]: "operationalCostProvider",
   [OPERATIONAL_COST_CUSTOMER]: "operationalCostCustomer",
 } as const;
 
+export interface TemplateItem {
+  id: string;
+  value: EmailTemplate | SmsTemplate;
+  label: string;
+}
+
 export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   name: string;
   type: ProductSetType;
   termsAndConditions: string;
+  thankYouPageUrl: string;
   isDefault: boolean;
   operationalCost: OperationalCostType;
   productGroups?: SelectItem[];
   fieldSetId?: number;
   steps?: Step[];
-  emailTemplateId?: number;
-  smsTemplateId?: number;
+  emailTemplates?: TemplateItem[];
+  smsTemplates?: TemplateItem[];
 }
 
 export interface ProductSetControlShared {
@@ -52,11 +61,17 @@ export interface ProductSetControlShared {
   smsTemplates?: SmsTemplate[];
 }
 
-export interface ProductSetControlProps extends ProductSetControlShared {
+export interface ProductSetControlProps {
   companyName: string;
   isLoading: boolean;
   isEventEditProductSet?: boolean;
   isCreateAction?: boolean;
+  emailTemplates?: TemplateItem[];
+  smsTemplates?: TemplateItem[];
+  fee?: string;
+  fieldSets?: FieldSet[];
+  showEmailTemplate?: boolean;
+  showSmsTemplate?: boolean;
 }
 
 export function ProductSetControl({
@@ -68,6 +83,8 @@ export function ProductSetControl({
   smsTemplates = [],
   isEventEditProductSet,
   isCreateAction,
+  showEmailTemplate,
+  showSmsTemplate,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -80,8 +97,6 @@ export function ProductSetControl({
   } = useFormContext<ProductSetControlValues>();
 
   const steps = watch("steps");
-  const smsTemplateId = watch("smsTemplateId");
-  const emailTemplateId = watch("emailTemplateId");
 
   const nameId = useId();
   const termsAndConditionsId = useId();
@@ -219,20 +234,16 @@ export function ProductSetControl({
             <Form.Label className="mt-4">
               {t("Design:emailTemplate")}
             </Form.Label>
-            {emailTemplates.length > 0 ? (
-              <Form.Control {...register("emailTemplateId")} as="select">
-                <option value="" selected={String(emailTemplateId) === ""}>
-                  {t("Design:choose")}
-                </option>
-                {emailTemplates.map((emailTemplate) => (
-                  <option
-                    value={Number(emailTemplate.notification.id)}
-                    key={emailTemplate.id}
-                  >
-                    {emailTemplate.notification.name}
-                  </option>
-                ))}
-              </Form.Control>
+            {showEmailTemplate ? (
+              <Typeahead
+                name="emailTemplates"
+                options={emailTemplates}
+                isMultipleChoise
+                placeholder={t("Design:choose")}
+                noOptionsMessage={t("Design:noActiveTemplates", {
+                  notification: t("Design:email"),
+                })}
+              />
             ) : (
               <WarningMessage
                 message={t("Design:noActiveTemplates", {
@@ -246,20 +257,16 @@ export function ProductSetControl({
             >
               {t("Design:smsTemplate")}
             </Form.Label>
-            {smsTemplates.length > 0 ? (
-              <Form.Control {...register("smsTemplateId")} as="select">
-                <option value="" selected={String(smsTemplateId) === ""}>
-                  {t("Design:choose")}
-                </option>
-                {smsTemplates.map((smsTemplate) => (
-                  <option
-                    value={Number(smsTemplate.notification.id)}
-                    key={smsTemplate.id}
-                  >
-                    {smsTemplate.notification.name}
-                  </option>
-                ))}
-              </Form.Control>
+            {showSmsTemplate ? (
+              <Typeahead
+                name="smsTemplates"
+                options={smsTemplates}
+                isMultipleChoise
+                placeholder={t("Design:choose")}
+                noOptionsMessage={t("Design:noActiveTemplates", {
+                  notification: t("Design:sms"),
+                })}
+              />
             ) : (
               <WarningMessage
                 message={t("Design:noActiveTemplates", {
@@ -302,6 +309,27 @@ export function ProductSetControl({
               }}
             />
           </Form.Group>
+
+          <Form.Group controlId="thankYouPageUrlId">
+            <Form.Label>{t("thankYouPageUrl")}</Form.Label>
+
+            <Form.Control
+              {...register("thankYouPageUrl", {
+                validate: (url) => {
+                  if (!url) return true;
+                  if (ruleForUrlWithProtocol.test(url as string)) return true;
+                  return t("Validation:fieldValidWebURL", {
+                    attribute: t("thankYouPageUrl"),
+                  }) as string;
+                },
+              })}
+              isInvalid={HookFormService.isInvalid("thankYouPageUrl", errors)}
+            />
+
+            <Form.Control.Feedback type="invalid">
+              {HookFormService.getErrors("thankYouPageUrl", errors)}
+            </Form.Control.Feedback>
+          </Form.Group>
         </div>
       </Col>
     </Row>

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

@@ -3,6 +3,11 @@
 import React from "react";
 import { Meta, Story } from "@storybook/react";
 import { boolean } from "@storybook/addon-knobs";
+import {
+  CONFIRMATION_TYPE,
+  PAYMENT_LINK_TYPE,
+} from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
+
 import {
   OPERATIONAL_COST_CUSTOMER,
   OPERATIONAL_COST_PROVIDER,
@@ -357,12 +362,14 @@ Default.args = {
       body: "",
       meta: "",
       notification: {
-        isActive: false,
+        id: 1,
+        isActive: true,
         isDefault: false,
         name: "Template name 1",
         companyId: 1,
         providerId: 1,
         fieldSetId: 1,
+        type: CONFIRMATION_TYPE,
       },
     },
     {
@@ -371,12 +378,44 @@ Default.args = {
       body: "",
       meta: "",
       notification: {
-        isActive: false,
+        id: 2,
+        isActive: true,
+        isDefault: false,
+        name: "Tempalte name 2",
+        companyId: 1,
+        providerId: 1,
+        fieldSetId: 1,
+        type: CONFIRMATION_TYPE,
+      },
+    },
+  ],
+  smsTemplates: [
+    {
+      id: "1",
+      body: "",
+      notification: {
+        id: 3,
+        isActive: true,
+        isDefault: false,
+        name: "Tempalte name 1",
+        companyId: 1,
+        providerId: 1,
+        fieldSetId: 1,
+        type: PAYMENT_LINK_TYPE,
+      },
+    },
+    {
+      id: "2",
+      body: "",
+      notification: {
+        id: 4,
+        isActive: true,
         isDefault: false,
         name: "Tempalte name 2",
         companyId: 1,
         providerId: 1,
         fieldSetId: 1,
+        type: PAYMENT_LINK_TYPE,
       },
     },
   ],

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

@@ -20,6 +20,7 @@ import {
 import { Step } from "../types";
 import { ProductSetContextProvider, ProductSetLoadingContext } from "./context";
 import { SelectItem } from "../../types/generic/SelectItem";
+import { getFilteredTemplates } from "../utils";
 
 export interface WithIsLoading {
   isLoading: boolean;
@@ -133,6 +134,16 @@ export function ProductSetForm({
                 <>
                   <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}

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

@@ -85,11 +85,14 @@ 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,
@@ -156,6 +159,22 @@ 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
@@ -219,7 +238,7 @@ export function ProductsControl({
                     categoryType={categoryType}
                   />
                 }
-                onDelete={() => remove(index)}
+                onDelete={() => onProductRemove(index)}
                 validate={() => trigger(`${productControlFieldName}.${index}`)}
                 // preItem={<Popover className="d-none d-sm-block" />}
               >

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

@@ -28,6 +28,7 @@ export function StepsControl({ isLoading }: StepsControlProps) {
     formState: { errors, isSubmitting },
     clearErrors,
     getValues,
+    setFocus,
   } = form;
 
   const { fields, append, remove } = useFieldArray({
@@ -57,12 +58,14 @@ export function StepsControl({ isLoading }: StepsControlProps) {
   return (
     <>
       {fields.map((step, index) => {
-        const stepData: any = getValues(`steps.${index}` as const);
+        const stepFieldName = `steps.${index}` as const;
+
+        const stepData = getValues(stepFieldName);
 
         return (
           <Controller
             key={`step-${step._id}`}
-            name={`steps.${index}.name` as const}
+            name={`${stepFieldName}.name` as const}
             control={control}
             rules={{
               required: t("Validation:fieldRequired", {
@@ -104,6 +107,21 @@ 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);
+                }}
               >
                 <ProductCategoriesControl
                   isLoading={isLoading}

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

@@ -86,6 +86,7 @@ export interface ProductControlValues
   isRequired: boolean;
   quantitySelector: number;
   hasSpecialNotes: boolean;
+  minSpend?: number | null;
   type?: ProductType;
   weight?: number;
   tierId?: number;
@@ -157,6 +158,7 @@ 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") },
@@ -189,7 +191,7 @@ export function ProductControl<T extends FormValues>({
 
   const onImageRemove = useCallback(
     (id, path) => {
-      handleImageRemove(id, path);
+      handleImageRemove(String(id), path);
     },
     [handleImageRemove]
   );
@@ -200,7 +202,13 @@ export function ProductControl<T extends FormValues>({
   }, [setLoading, isImageUploading]);
 
   useEffect(() => {
-    if (Array.isArray(images) && images?.length > 0) {
+    const formImages = getValues(`${fieldNamePrefix}.images` as Path<T>);
+
+    setInitialImages(formImages as Image[]);
+  }, [getValues, setInitialImages, fieldNamePrefix]);
+
+  useEffect(() => {
+    if (Array.isArray(images)) {
       setValue(
         `${fieldNamePrefix}.images` as Path<T>,
         images as UnpackNestedValue<PathValue<T, Path<T>>>
@@ -208,12 +216,6 @@ 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];
 
@@ -274,7 +276,7 @@ export function ProductControl<T extends FormValues>({
               />
               <ProductPriceControl<T>
                 isLoading={isLoading}
-                fieldNamePrefix={fieldNamePrefix}
+                fieldNamePrefix={`${fieldNamePrefix}.price` as Path<T>}
                 title={t("totalPrice")}
                 allowDeposits={allowDeposits}
               />
@@ -282,7 +284,7 @@ export function ProductControl<T extends FormValues>({
           ) : (
             <ProductPriceControl<T>
               isLoading={isLoading}
-              fieldNamePrefix={fieldNamePrefix}
+              fieldNamePrefix={`${fieldNamePrefix}.price` as Path<T>}
             />
           )}
 
@@ -557,6 +559,19 @@ export function ProductControl<T extends FormValues>({
             {categoryType === CATEGORY_TYPE_FIXED_DURATION && (
               <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>
           </div>
         </Collapse>
 

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

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