@licklist/design 0.44.486-dev.83 → 0.44.486

package/src/notification/email-template/form/EmailTemplateForm.tsx

@@ -13,13 +13,12 @@ import { ServerError } from "@licklist/plugins/dist/hooks/Api/useHttpQuery";
 import FormErrorService from "@licklist/plugins/dist/services/Form/FormErrorService";
 import { AttachmentsWithHash } from "@licklist/plugins/dist/hooks/Media/useAttachments";
 import { UploadPermanentImage } from "@licklist/core/dist/DataMapper/Media/UploadPermanentImageDataMapper";
-import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
+
 import { NotificationPlaceholders } from "../../components/NotificationPlaceholders";
 import { EmailTemplateControl } from "../control/EmailTemplateControl";
 import { BlockLoader } from "../../../static";
 
 export interface EmailTemplateValues extends FormValues {
-  id?: number | string;
   name: string;
   subject: string;
   isActive: boolean;
@@ -30,7 +29,6 @@ export interface EmailTemplateValues extends FormValues {
   attachments?: Attachment[];
   templateOptionValues?: TemplateOptionValue[];
   imagesMetadata?: UploadPermanentImage[];
-  type?: NotificationType;
 }
 
 export interface EmailTemplateProps extends HasPermissionProp {
@@ -41,12 +39,9 @@ export interface EmailTemplateProps extends HasPermissionProp {
   placeholders?: NotificationPlaceholder[];
   options?: TemplateOption[];
   serverErrors?: ServerError;
-  notificationTypes?: NotificationType[];
-  getDefaultTemplateMetaByType?: (type?: NotificationType | null) => string;
-  onTypeChange?: (type?: NotificationType | null) => void;
 }
 
-export const EmailTemplateForm = ({
+export function EmailTemplateForm({
   defaultValues,
   onSubmitSave,
   onSubmitSaveAndSend,
@@ -54,10 +49,7 @@ export const EmailTemplateForm = ({
   placeholders = [],
   options = [],
   serverErrors,
-  notificationTypes = [],
-  getDefaultTemplateMetaByType,
-  onTypeChange,
-}: EmailTemplateProps) => {
+}: EmailTemplateProps) {
   const { t } = useTranslation("Design");
   const [isLoading, setIsLoading] = useState(false);
   const emailEditorRef = useRef(null);
@@ -67,20 +59,12 @@ export const EmailTemplateForm = ({
     defaultValues,
   });
 
-  const { setError, watch } = form;
-  const type = watch("type");
+  const { setError } = form;
 
   useEffect(() => {
     FormErrorService.handleServerErrors(serverErrors, setError);
   }, [serverErrors, setError]);
 
-  useEffect(() => {
-    if (!onTypeChange) return;
-
-    onTypeChange(type);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [type]);
-
   return (
     <FormProvider {...form}>
       {isLoading && <BlockLoader />}
@@ -97,8 +81,6 @@ export const EmailTemplateForm = ({
           meta={defaultValues?.meta || null}
           defaultAttachments={defaultValues?.attachments || []}
           options={options}
-          notificationTypes={notificationTypes}
-          getDefaultTemplateMetaByType={getDefaultTemplateMetaByType}
         />
         <NotificationPlaceholders placeholders={placeholders} />
         {/* update email template */}
@@ -124,4 +106,4 @@ export const EmailTemplateForm = ({
       </Form>
     </FormProvider>
   );
-};
+}

package/src/notification/sms-template/card/SmsTemplateCard.stories.tsx

@@ -14,9 +14,7 @@ export const Default: Story<SmsTemplateCardProps> = (args) => (
 
 Default.args = {
   href: "#",
-  name: "Default Sms Template with Long name",
+  name: "Default Sms Template",
   hasPermission: true,
   isDefault: true,
-  templateType: "confirmation",
-  isActive: true,
 };

package/src/notification/sms-template/card/SmsTemplateCard.tsx

@@ -1,19 +1,16 @@
 import React from "react";
 import { Link } from "react-router-dom";
-import { useTranslation } from "react-i18next";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
-import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
+import { useTranslation } from "react-i18next";
+
 import { ConfirmModal, ConfirmModalType } from "../../../modals";
 import { Icon } from "../../../static";
-import { useTranslatedParameters } from "../../hooks/useTranslatedParameters";
 
 export interface SmsTemplateCardProps extends HasPermissionProp {
   name: string;
   href: string;
   onRemove: () => void;
   isDefault: boolean;
-  isActive: boolean;
-  type: NotificationType;
 }
 
 export function SmsTemplateCard({
@@ -22,13 +19,9 @@ export function SmsTemplateCard({
   onRemove,
   hasPermission = true,
   isDefault = false,
-  isActive = false,
-  type,
 }: SmsTemplateCardProps) {
   const { t } = useTranslation(["Design"]);
 
-  const texts = useTranslatedParameters({ isActive, isDefault });
-
   return (
     <div className="snippet-template-card">
       <div className="snippet-template-card-header">
@@ -57,10 +50,7 @@ export function SmsTemplateCard({
         )}
       </div>
       <div className="mt-2">
-        {!!texts.length && <p className="mb-1">{texts}</p>}
-        <p className="mb-0">
-          {t(`Design:type`)}:&nbsp;{t(`Design:${type}`)}
-        </p>
+        {Boolean(isDefault) && <p className="mb-1">{t("Design:default")}</p>}
       </div>
     </div>
   );

package/src/notification/sms-template/control/SmsTemplateControl.tsx

@@ -4,18 +4,12 @@ import { Col, Row, Form } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import { NotificationType } from "@licklist/core/dist/DataMapper/Notification/NotificationTypeDataMapper";
+
 import { SmsTemplateValues } from "../form";
 
 const MAX_SMS_LENGTH = 300;
 
-type SmsTemplateControlProps = {
-  notificationTypes: NotificationType[];
-};
-
-export const SmsTemplateControl = ({
-  notificationTypes = [],
-}: SmsTemplateControlProps) => {
+export const SmsTemplateControl = () => {
   const { t } = useTranslation(["Design"]);
   const {
     register,
@@ -26,39 +20,9 @@ export const SmsTemplateControl = ({
   } = useFormContext<SmsTemplateValues>();
 
   const smsBody = watch("body");
-  const id = watch("id");
 
   return (
     <>
-      <Row>
-        <Form.Group as={Col} controlId="type" xs sm={12} md={8} lg={10} xl={12}>
-          <Form.Label>{t("type")}</Form.Label>
-
-          <Form.Control
-            as="select"
-            {...register("type", {
-              required: t("Validation:fieldRequired", {
-                attribute: t("type"),
-              }) as string,
-            })}
-            name="type"
-            required
-            isInvalid={Boolean(errors.type)}
-            placeholder={t("Design:type")}
-            disabled={!!id}
-          >
-            <option value="">{t("Design:choose")}</option>
-            {notificationTypes.map((key) => (
-              <option key={key} value={key}>
-                {t(`Design:${key}`)}
-              </option>
-            ))}
-          </Form.Control>
-          <Form.Control.Feedback type="invalid">
-            {errors.type?.message}
-          </Form.Control.Feedback>
-        </Form.Group>
-      </Row>
       <Row>
         <Form.Group
           as={Col}
@@ -98,8 +62,6 @@ export const SmsTemplateControl = ({
           <Form.Label>{t("Design:smsBody")}</Form.Label>
           <Form.Control
             isInvalid={Boolean(errors.body)}
-            as="textarea"
-            rows={3}
             {...register("body", {
               required: true,
               maxLength: MAX_SMS_LENGTH,

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

@@ -38,26 +38,12 @@ 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 = {
@@ -68,18 +54,4 @@ 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,7 +8,6 @@ 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";
 
@@ -17,8 +16,6 @@ export interface SmsTemplateValues extends FormValues {
   isActive: boolean;
   isDefault: boolean;
   body: string;
-  type?: NotificationType;
-  id?: number | string;
 }
 
 export interface SmsTemplateProps extends HasPermissionProp {
@@ -27,7 +24,6 @@ export interface SmsTemplateProps extends HasPermissionProp {
   defaultValues?: SmsTemplateValues;
   placeholders?: NotificationPlaceholder[];
   serverErrors?: ServerError;
-  notificationTypes?: NotificationType[];
 }
 
 export function SmsTemplateForm({
@@ -36,7 +32,6 @@ export function SmsTemplateForm({
   hasPermission = true,
   placeholders = [],
   serverErrors,
-  notificationTypes = [],
 }: SmsTemplateProps) {
   const { t } = useTranslation("Design");
 
@@ -51,7 +46,7 @@ export function SmsTemplateForm({
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
-        <SmsTemplateControl notificationTypes={notificationTypes} />
+        <SmsTemplateControl />
         <NotificationPlaceholders placeholders={placeholders} />
 
         {hasPermission && (

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

@@ -1,15 +1,12 @@
 import React, { useEffect, useRef, useState } from "react";
-import { Modifier } from "@popperjs/core";
+import type Popper from "@popperjs/core";
 import { useId } from "@react-aria/utils";
 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 { DateTime } from "luxon";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { DndContext } from "@dnd-kit/core";
-import { TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import {
   SortableContext,
   verticalListSortingStrategy,
@@ -23,11 +20,6 @@ import {
   RecurringDatePickerInputValues,
 } from "../../recurring-date-picker-input/RecurringDatePickerInput";
 import { ProductSetRecurrenceControl } from "./ProductSetRecurrenceControl";
-import {
-  AvailableTimesControl,
-  AvailableTimesControlRef,
-} from "../../zone/form/components/AvailableTimesControl";
-
 // eslint-disable-next-line max-len
 
 export interface DateAndRecurrenceInputValues {
@@ -36,16 +28,10 @@ export interface DateAndRecurrenceInputValues {
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours?: WorkHour[];
-  providerHasBookingManagement: boolean;
-  isLoading?: boolean;
 }
 
 export const DateAndRecurrenceInput = ({
   isEventEditProductSet,
-  providerHasBookingManagement,
-  workHours,
-  isLoading,
 }: DateAndRecurrenceInputProps) => {
   const {
     control,
@@ -56,9 +42,6 @@ export const DateAndRecurrenceInput = ({
     clearErrors,
   } = useFormContext<DateAndRecurrenceInputValues>();
 
-  const [availableTimes, setAvailableTimes] = useState<string[]>([]);
-  const availableTimesFormRef = useRef<AvailableTimesControlRef>();
-
   const { fields, append, update, move } = useFieldArray({
     name: "menuRecurrences",
     control,
@@ -95,46 +78,13 @@ export const DateAndRecurrenceInput = ({
   const { t } = useTranslation("Design");
 
   // in this method we should fulfill the form with a proper data
-  const handleRecurringDateChange = async (
-    next: RecurringDatePickerInputValues
-  ) => {
-    const isAvailableTimesFormValid =
-      await availableTimesFormRef.current?.trigger();
-
-    if (next?.startTime && next?.endTime && isAvailableTimesFormValid) {
-      const startTime = DateTime.fromISO(next.startTime);
-      const endTime = DateTime.fromISO(next.endTime);
-      const { availableTimes } = availableTimesFormRef.current.getValues();
-      const validAvalilableTimes = availableTimes.every((time) => {
-        const currentAvailableTime = DateTime.fromFormat(time, TIME_FORMAT);
-
-        return (
-          currentAvailableTime.diff(startTime, "minutes").minutes >= 0 &&
-          currentAvailableTime.diff(endTime, "minutes").minutes <= 0
-        );
-      });
-      if (!validAvalilableTimes) {
-        availableTimesFormRef.current.setError("availableTimes", {
-          message: t("Validation:fieldTimeBetween", {
-            attribute: t("Design:startTimesSmall"),
-            min: startTime.toFormat(TIME_FORMAT),
-            max: endTime.toFormat(TIME_FORMAT),
-          }),
-        });
-
-        return;
-      }
-    }
-
-    const availableTime = availableTimesFormRef?.current?.getValues()?.availableTimes || null;
-
+  const handleRecurringDateChange = (next: RecurringDatePickerInputValues) => {
     const values = {
       rrule: next.rrule,
       startDate: next.startDate,
       endDate: next.endDate,
       startTime: next.startTime,
       endTime: next.endTime,
-      availableTimes: availableTime,
     } as Partial<ProductSetRecurrence>;
 
     if (editState.values?.id) {
@@ -157,7 +107,6 @@ export const DateAndRecurrenceInput = ({
     // Hotfix for an issue with Popover close & open actions
     setTimeout(() => {
       setEditState({ index, values: next });
-      setAvailableTimes(next.availableTimes || []);
       setIsDatePopoverVisible(() => true);
     }, 100);
   };
@@ -227,25 +176,7 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
-              >
-                {providerHasBookingManagement && (
-                  <AvailableTimesControl
-                    workHours={workHours}
-                    isLoading={isLoading}
-                    defaultValues={availableTimes}
-                    ref={availableTimesFormRef}
-                    errorMessage={
-                      errors?.menuRecurrences?.[`${editState?.index}`]
-                        ?.availableTimes?.message
-                    }
-                    clearErrorMessage={() =>
-                      clearErrors(
-                        `menuRecurrences.${editState?.index}.availableTimes`
-                      )
-                    }
-                  />
-                )}
-              </RecurringDatePickerInput>
+              />
             </Popover.Content>
           </Popover>
         }
@@ -270,10 +201,6 @@ export const DateAndRecurrenceInput = ({
                   key={menuRecurrence._id}
                   menuRecurrence={menuRecurrence}
                   onEdit={() => handleOnEdit(menuRecurrence, index)}
-                  errorMessage={
-                    errors?.menuRecurrences?.[`${index}`]?.availableTimes
-                      ?.message
-                  }
                 />
               ))}
             </SortableContext>
@@ -318,7 +245,7 @@ export const DateAndRecurrenceInput = ({
   );
 };
 
-export const sameWidthPopperModifier: Modifier<
+const sameWidthPopperModifier: Popper.Modifier<
   "sameWidth",
   Record<string, unknown>
 > = {

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

@@ -67,6 +67,7 @@ Empty.args = {
     type: "sale",
     termsAndConditions: "",
     operationalCost: OPERATIONAL_COST_CUSTOMER,
+    isDefault: false,
     menuRecurrence: {
       id: 38,
       menuId: 257,
@@ -86,6 +87,7 @@ Default.args = {
     type: "sale",
     termsAndConditions: "",
     operationalCost: OPERATIONAL_COST_CUSTOMER,
+    isDefault: true,
     menuRecurrence: {
       id: 38,
       menuId: 257,