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

package/src/recurrence-input/RecurrenceEndInput.tsx

@@ -1,17 +1,19 @@
-import React, { useRef } from "react";
+import React, { useEffect, useRef } from "react";
 import { useId } from "@react-aria/utils";
 import { DateTime, DurationUnit } from "luxon";
 import { Col, Form, InputGroup, Row } from "react-bootstrap";
 import RRule from "rrule";
-
+import { DATE_FORMAT } from "@licklist/core/dist/Config";
+import { useTranslation } from "react-i18next";
 import { SupportedFrequency } from "./utils";
 import HTMLInputDateElement from "../types/static/HTMLInputDateElement";
 
 interface Props {
   disabled?: boolean;
-  date: string;
+  date: string; // yyyy-mm-ddThh:mm
+  minDate?: string; // should be in yyyy-mm-dd format
   frequency: SupportedFrequency;
-  until?: string;
+  until?: string; // yyyy-mm-dd
   count?: number;
   onChange: (values: { until?: string; count?: number }) => void;
 }
@@ -23,16 +25,31 @@ function RecurrenceEndInput({
   until,
   count,
   onChange,
+  minDate,
 }: Props) {
+  const { t } = useTranslation("Design");
   // unique ids for radios
   const neverId = useId();
   const onId = useId();
   const afterId = useId();
   const dateInput = useRef<HTMLInputDateElement | null>(null);
 
+  useEffect(() => {
+    const untilDatetime = DateTime.fromFormat(
+      until ?? getUntil({ date, frequency }),
+      DATE_FORMAT
+    );
+
+    const minDatetime = DateTime.fromFormat(minDate, DATE_FORMAT);
+
+    if (minDatetime > untilDatetime) {
+      onChange({ until: minDate });
+    }
+  }, [minDate, onChange, until, date, frequency]);
+
   return (
     <Form.Group>
-      <Form.Label>Ends</Form.Label>
+      <Form.Label>{t("ends")}</Form.Label>
 
       <Form.Check type="radio" id={neverId} custom className="mt-3">
         <Form.Check.Input
@@ -41,7 +58,7 @@ function RecurrenceEndInput({
           onChange={() => onChange({ count: 500 })}
           disabled={disabled}
         />
-        <Form.Check.Label>Never</Form.Check.Label>
+        <Form.Check.Label>{t("never")}</Form.Check.Label>
       </Form.Check>
 
       <Form.Check type="radio" id={onId} custom className="mt-3">
@@ -55,11 +72,12 @@ function RecurrenceEndInput({
               }
               disabled={disabled}
             />
-            <Form.Check.Label>On</Form.Check.Label>
+            <Form.Check.Label>{t("on")}</Form.Check.Label>
           </Col>
           <Col>
             <Form.Control
               type="date"
+              min={minDate}
               disabled={disabled || !until}
               aria-label="Date on which the recurrence ends"
               value={until ?? getUntil({ date, frequency })}
@@ -83,7 +101,7 @@ function RecurrenceEndInput({
               }
               disabled={disabled}
             />
-            <Form.Check.Label>After</Form.Check.Label>
+            <Form.Check.Label>{t("after")}</Form.Check.Label>
           </Col>
           <Col>
             <InputGroup>
@@ -99,7 +117,7 @@ function RecurrenceEndInput({
                 }
               />
               <InputGroup.Append>
-                <InputGroup.Text>occurrences</InputGroup.Text>
+                <InputGroup.Text>{t("occurences")}</InputGroup.Text>
               </InputGroup.Append>
             </InputGroup>
           </Col>
@@ -109,7 +127,7 @@ function RecurrenceEndInput({
   );
 }
 
-const defaultOccurrences = {
+export const defaultOccurrences = {
   [RRule.DAILY]: 30,
   [RRule.WEEKLY]: 13,
   [RRule.MONTHLY]: 12,

package/src/recurrence-input/RecurrenceInput.tsx

@@ -3,7 +3,7 @@
 import { DateTime } from "luxon";
 import React, { useEffect, useReducer } from "react";
 import RRule, { Frequency, Weekday } from "rrule";
-import RecurrenceEndInput from "./RecurrenceEndInput";
+import RecurrenceEndInput, { defaultOccurrences } from "./RecurrenceEndInput";
 import RecurrenceIntervalAndFrequencyInput from "./RecurrenceIntervalAndFrequencyInput";
 import RecurrenceMonthlyRepeatByInput from "./RecurrenceMonthlyRepeatByInput";
 import RecurrenceWeekdaysInput from "./RecurrenceWeekdaysInput";
@@ -16,6 +16,7 @@ import {
 export interface RecurrenceInputProps {
   disabled?: boolean;
   date: string;
+  minDate?: string;
   value?: string;
   onChange: (value: string) => void;
   initialFrequency?: Frequency;
@@ -24,6 +25,7 @@ export interface RecurrenceInputProps {
 export function RecurrenceInput({
   disabled = false,
   date,
+  minDate,
   value,
   onChange,
   initialFrequency = Frequency.WEEKLY,
@@ -82,6 +84,7 @@ export function RecurrenceInput({
       )}
       <RecurrenceEndInput
         date={date}
+        minDate={minDate}
         frequency={state.freq}
         until={state.until && DateTime.fromJSDate(state.until).toISODate()}
         count={state.count}
@@ -130,5 +133,12 @@ const getInitialState = ({
     byweekday = options.byweekday[0];
   }
 
-  return { ...options, byweekday };
+  return {
+    ...options,
+    count:
+      options?.count || options.until
+        ? options.count
+        : defaultOccurrences[options.freq],
+    byweekday,
+  };
 };

package/src/recurring-date-picker-input/RecurrenceIntervalAndFrequencyInput.tsx

@@ -1,9 +1,9 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { DateTime } from "luxon";
 import { Col, Form, Row } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
-import { useFormContext } from "react-hook-form";
-import { DATE_FORMAT, TIME_FULL_FORMAT } from "@licklist/core/dist/Config";
+import { RegisterOptions, useFormContext } from "react-hook-form";
+import { DATE_FORMAT } from "@licklist/core/dist/Config";
 import { RecurringDatePickerInputValues } from "./RecurringDatePickerInput";
 
 interface RecurrenceIntervalAndFrequencyInputProps {
@@ -11,8 +11,17 @@ interface RecurrenceIntervalAndFrequencyInputProps {
   minDate?: string;
   startDateLabel?: string;
   startTimeLabel?: string;
+  isProductSet?: boolean;
   endDateLabel?: string;
   endTimeLabel?: string;
+  startTimeRules?: Pick<
+    RegisterOptions,
+    "max" | "min" | "validate" | "required" | "pattern"
+  >;
+  endTimeRules?: Pick<
+    RegisterOptions,
+    "max" | "min" | "validate" | "required" | "pattern"
+  >;
 }
 
 function RecurrenceIntervalAndFrequencyInput({
@@ -22,15 +31,18 @@ function RecurrenceIntervalAndFrequencyInput({
   startTimeLabel,
   endDateLabel,
   endTimeLabel,
+  startTimeRules,
+  endTimeRules,
+  isProductSet,
 }: RecurrenceIntervalAndFrequencyInputProps) {
   const { t } = useTranslation(["Design", "Notification", "App"]);
 
   const {
     getValues,
+    setValue,
     formState: { errors },
     register,
     trigger,
-    setValue,
   } = useFormContext<RecurringDatePickerInputValues>();
 
   const startDate = getValues("startDate");
@@ -38,6 +50,14 @@ function RecurrenceIntervalAndFrequencyInput({
   const startTime = getValues("startTime");
   const endTime = getValues("endTime");
 
+  const [withOutEndDate, setWithOutEndDate] = useState<boolean>(!endDate);
+  const isProductSetWithoutEndDate = isProductSet && withOutEndDate;
+
+  const handleWithoutEndDate = () => {
+    setValue("endDate", "");
+    setWithOutEndDate((prevWithOutEndDateValue) => !prevWithOutEndDateValue);
+  };
+
   useEffect(() => {
     if (!startDate || !endDate) {
       return;
@@ -47,6 +67,9 @@ function RecurrenceIntervalAndFrequencyInput({
   }, [startDate]);
 
   useEffect(() => {
+    if (!startTime || !endTime) {
+      return;
+    }
     trigger("endTime");
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [startTime]);
@@ -78,7 +101,7 @@ function RecurrenceIntervalAndFrequencyInput({
             <Form.Control
               type="date"
               {...register("endDate", {
-                required: true,
+                required: !isProductSetWithoutEndDate,
                 validate: (date) => {
                   if (!startDate || !date) {
                     return true;
@@ -99,7 +122,7 @@ function RecurrenceIntervalAndFrequencyInput({
               })}
               defaultValue={endDate}
               className={endDate && "date-input-with-value"}
-              disabled={disabled}
+              disabled={disabled || isProductSetWithoutEndDate}
               min={startDate || undefined}
               isInvalid={Boolean(errors.endDate)}
             />
@@ -107,6 +130,21 @@ function RecurrenceIntervalAndFrequencyInput({
               {errors.endDate?.message}
             </Form.Control.Feedback>
           </Form.Group>
+          {isProductSet && (
+            <Form.Group className="custom-checkbox">
+              <Form.Check custom type="checkbox">
+                <Form.Check.Input
+                  type="checkbox"
+                  className="checkbox-input"
+                  checked={withOutEndDate}
+                  onChange={handleWithoutEndDate}
+                />
+                <Form.Check.Label>
+                  {t("Design:infiniteProductSet")}
+                </Form.Check.Label>
+              </Form.Check>
+            </Form.Group>
+          )}
         </Col>
       </Row>
 
@@ -118,15 +156,15 @@ function RecurrenceIntervalAndFrequencyInput({
             </Form.Label>
             <Form.Control
               type="time"
-              {...register("startTime", { required: false })}
-              onChange={({ target: { value } }) => {
-                setValue("startTime", `${value}:00`);
-              }}
+              {...register("startTime", { required: false, ...startTimeRules })}
               placeholder="hh:mm"
               defaultValue={startTime}
               disabled={disabled}
               isInvalid={Boolean(errors.startTime)}
             />
+            <Form.Control.Feedback type="invalid">
+              {errors.startTime?.message}
+            </Form.Control.Feedback>
           </Form.Group>
         </Col>
 
@@ -141,28 +179,19 @@ function RecurrenceIntervalAndFrequencyInput({
                   if (!startTime || !time) {
                     return true;
                   }
-                  const currentStartTime = DateTime.fromFormat(
-                    startTime,
-                    TIME_FULL_FORMAT
-                  );
-
-                  const currentEndTime = DateTime.fromFormat(
-                    time,
-                    TIME_FULL_FORMAT
-                  );
+                  const currentStartTime = DateTime.fromISO(startTime);
+                  const currentEndTime = DateTime.fromISO(time);
 
-                  return currentEndTime?.diff(currentStartTime, ["seconds"])
-                    ?.seconds > 0
+                  return currentEndTime?.diff(currentStartTime, ["minutes"])
+                    ?.minutes >= 0
                     ? true
                     : `${t(`Validation:fieldLaterDate`, {
                         attribute: t("Design:endTimeSmall"),
                         min: t("Design:startTimeSmall"),
                       })}`;
                 },
+                ...endTimeRules,
               })}
-              onChange={({ target: { value } }) => {
-                setValue("endTime", `${value}:59`, { shouldValidate: true });
-              }}
               placeholder="hh:mm"
               defaultValue={endTime}
               disabled={disabled}

package/src/recurring-date-picker-input/RecurringDatePickerInput.tsx

@@ -7,6 +7,7 @@ import { useIntl } from "react-intl";
 import {
   DATE_TIME_FORMAT,
   DATE_TIME_FULL_FORMAT,
+  TIME_FULL_FORMAT,
 } from "@licklist/core/dist/Config/Date";
 import { usePreviousValue } from "@licklist/plugins/dist/hooks/Value/usePreviousValue";
 import { FormProvider, useForm } from "react-hook-form";
@@ -25,6 +26,7 @@ export interface RecurringDatePickerInputProps {
   initialFrequency?: Frequency;
   setInitialStartDateAfterSelect?: boolean;
   minDate?: string;
+  isProductSet?: boolean;
 }
 
 export interface RecurringDatePickerInputValues {
@@ -38,6 +40,7 @@ export interface RecurringDatePickerInputValues {
   byweekday?: Weekday[];
   until?: Date;
   count?: number;
+  withOutEndDate?: boolean;
 }
 
 export function RecurringDatePickerInput({
@@ -49,6 +52,7 @@ export function RecurringDatePickerInput({
   setInitialStartDateAfterSelect = false,
   children,
   minDate,
+  isProductSet,
 }: PropsWithChildren<RecurringDatePickerInputProps>) {
   const { t } = useTranslation(["Design"]);
 
@@ -101,6 +105,11 @@ export function RecurringDatePickerInput({
         })
       : nextState.byweekday;
 
+    const endTimeNextState = nextState?.endTime
+      ? DateTime.fromISO(nextState?.endTime).toFormat(TIME_FULL_FORMAT)
+      : "";
+    const endDateNextState = nextState?.endDate ?? "";
+
     const rrule = RRule.optionsToString({
       // @TODO: investigate if we need these fields
       // dtstart: getDateTimeObject(startDate, startTime).toJSDate(),
@@ -115,6 +124,8 @@ export function RecurringDatePickerInput({
 
     onChange({
       ...nextState,
+      endDate: endDateNextState,
+      endTime: endTimeNextState,
       rrule,
     });
   };
@@ -179,6 +190,7 @@ export function RecurringDatePickerInput({
         <RecurrenceIntervalAndFrequencyInput
           disabled={disabled}
           minDate={minDate}
+          isProductSet={isProductSet}
         />
 
         {children}

package/src/report/form/ReportForm.tsx

@@ -15,7 +15,7 @@ export function ReportForm({
   onSubmit,
   onHide,
   hasPermission,
-}: ReportFormProps): JSX.Element {
+}: ReportFormProps) {
   const { t } = useTranslation(["App"]);
   const fromDateInput = useRef<HTMLInputDateElement | null>(null);
   const toDateInput = useRef<HTMLInputDateElement | null>(null);

package/src/sales/booking/results/components/ResultCard.tsx

@@ -3,6 +3,7 @@ import clsx from "clsx";
 import { useTranslation } from "react-i18next";
 import { DateTime } from "luxon";
 import { Order } from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
 import { formatDateStringForEvent } from "@licklist/plugins/dist/utils/formatDate";
 import Icon from "../../../../static/Icon";
 
@@ -55,10 +56,10 @@ export const ResultCard = ({
             {t("status")}: {t(status)}
           </p>
           <p>
-            {t("date")}: {formatDateStringForEvent(startDate)}
+            {t("date")}: {formatDateStringForEvent(startDate, false)}
           </p>
           <p>
-            {t("time")}: {DateTime.fromISO(startDate).toFormat("hh:MM")}
+            {t("time")}: {DateTime.fromISO(startDate).toFormat(TIME_FORMAT)}
           </p>
         </div>
       </div>

package/src/snippet/snippet-template/preview/Preview.tsx

@@ -7,6 +7,9 @@ import {
   SNIPPET_TYPE_VENUE_MAP,
 } from "@licklist/core/dist/DataMapper/Provider/SnippetDataMapper";
 import { ProductSet } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
+import { DateTime } from "luxon";
+import { Calendar, defaultStartDay } from "../../../calendar";
+import { getMonthCalendarDates } from "../../../calendar/utils";
 import { IframeEventCard } from "../../../iframe/event/event-card";
 import { SettingButton } from "../settings";
 import {
@@ -24,7 +27,6 @@ import {
 } from "../../../iframe";
 import { NumberInput } from "../../../iframe/order-process/components/CategoryProduct/components/NumberInput";
 import { SnippetTemplateContext } from "../context/snippetTemplate";
-import { EventCalendar } from "../../../iframe/event/event-calendar";
 
 const DEFAULT_IMAGE =
   "https://images.unsplash.com/photo-1638988319382-90e61be77c59?ixlib=rb-1.2.1&auto=format&fit=crop&w=687&q=80";
@@ -52,6 +54,10 @@ export function Preview({
     onSettingClick();
   };
 
+  const [currentDate, setCurrentDate] = useState<DateTime>(defaultStartDay);
+  const [selectedDate, setSelectedDate] = useState<DateTime | null>(null);
+  const calendarDates = getMonthCalendarDates(currentDate);
+
   return (
     <div className="w-100 h-100 snippet-template-preview">
       <Page
@@ -196,7 +202,13 @@ export function Preview({
                         className="mt-3 m-0"
                         containerClassName="mt-5 pt-5"
                       >
-                        <EventCalendar />
+                        <Calendar
+                          currentDate={currentDate}
+                          setCurrentDate={setCurrentDate}
+                          selectedDate={selectedDate}
+                          setSelectedDate={setSelectedDate}
+                          calendarDates={calendarDates}
+                        />
                       </SettingButton>
                     </div>
                     <div className="pt-4">

package/src/static/RestrictedAccess.tsx

@@ -4,7 +4,7 @@ import RouteService from "@licklist/plugins/dist/services/Route/RouteService";
 import { useTranslation } from "react-i18next";
 import Icon from "./Icon";
 
-function RestrictedAccess(): JSX.Element {
+function RestrictedAccess() {
   const { t } = useTranslation("Design");
 
   return (

package/src/static/form-number-input/FormNumberInput.tsx

@@ -15,6 +15,7 @@ interface FormNumberInputProps {
   label: string;
   fieldName: string;
   step?: number;
+  onChange?: (value: number) => void;
   disabled?: boolean;
   rules?: Pick<
     RegisterOptions,
@@ -28,6 +29,7 @@ export const FormNumberInput = ({
   step = 1,
   rules,
   disabled,
+  onChange,
 }: FormNumberInputProps) => {
   const controlId = useId();
   const { t } = useTranslation("Validation");
@@ -76,7 +78,12 @@ export const FormNumberInput = ({
               disabled={disabled}
               isInvalid={HookFormService.isInvalid(fieldName, errors)}
               {...field}
-              onChange={(event) => field.onChange(Number(event.target.value))}
+              onChange={(event) => {
+                if (onChange) {
+                  onChange(Number(event.target.value));
+                }
+                field.onChange(Number(event.target.value));
+              }}
               onFocus={onFocus}
             />
           )}

package/src/styles/{iframe-customers-journey/ActivitiesCard.scss → activity-card/GridActivitiesCard.scss}

@@ -11,7 +11,7 @@
   word-wrap: break-word;
   background-color: #fff;
   font-size: 0.8rem;
-  color: $snippet-elements-body-color;
+  background-color: $snippet-product-set-background-color;
 
   div {
     text-align: left;

package/src/styles/{iframe-customers-journey/ActivitiesSelectedCard.scss → activity-card/ListActivitiesCard.scss}

@@ -6,8 +6,9 @@
   align-items: center;
   cursor: pointer;
   height: 5rem;
+  padding: 0.375rem;
   border: 2px solid transparent;
-  border: 2px solid transparent;
+  border-radius: 0.5rem;
   background-color: $snippet-product-set-background-color;
   color: $snippet-product-set-font-color;
   transition: $color-transition;

package/src/styles/activity-card/_index.scss

@@ -0,0 +1,2 @@
+@import "./GridActivitiesCard.scss";
+@import "./ListActivitiesCard.scss";

package/src/styles/availability-indicator/AvailabilityIndicator.scss

@@ -0,0 +1,7 @@
+.availability-indicator {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5rem;
+  font-weight: 300;
+}

package/src/styles/availability-indicator/_index.scss

@@ -0,0 +1 @@
+@import "./AvailabilityIndicator.scss";

package/src/styles/{iframe-customers-journey → date-time-button}/DateTimeButton.scss

@@ -86,6 +86,12 @@
     max-width: 5.3rem;
     min-height: 2.75rem;
   }
+
+  &.calendar-view {
+    min-width: auto;
+    max-width: none;
+    min-height: auto;
+  }
 }
 
 .time {
@@ -99,15 +105,3 @@
   font-weight: 300;
   color: $snippet-calendar-button-font-color;
 }
-
-.info {
-  display: flex;
-  justify-content: center;
-  font-weight: 300;
-  flex-direction: row;
-
-  .logo {
-    width: 0.5rem;
-    margin-right: 0.5rem;
-  }
-}

package/src/styles/date-time-button/_index.scss

@@ -0,0 +1 @@
+@import "./DateTimeButton.scss";

package/src/styles/form/CustomCheckbox.scss

@@ -1,6 +1,7 @@
 .custom-checkbox {
   margin-top: 1rem;
   display: flex;
+  z-index: 2;
   align-items: center;
 
   .custom-checkbox .custom-control-label::before {
@@ -21,4 +22,8 @@
     font-weight: 400;
     font-size: 0.875rem;
   }
+
+  .checkbox-input {
+    z-index: 2;
+  }
 }

package/src/styles/header/Header.scss

@@ -11,10 +11,6 @@
     }
   }
 
-  svg {
-    max-height: 1rem;
-  }
-
   .navbar-nav {
     line-height: 1;
     margin-top: 4px;

package/src/styles/iframe-events/Card.scss

@@ -142,6 +142,7 @@
     .card-body {
       padding: 0;
       margin: 0 0 auto;
+      margin-top: 1rem;
     }
   }
 

package/src/styles/iframe-page/PageBody.scss

@@ -199,7 +199,8 @@
         color: $snippet-elements-button-color;
         border: none;
         background-color: $snippet-elements-button-background-color;
-        box-shadow: 0 0 0 $input-btn-focus-width $snippet-elements-button-background-color;
+        box-shadow: 0 0 0 $input-btn-focus-width
+          $snippet-elements-button-background-color;
       }
 
       &:disabled {
@@ -234,7 +235,7 @@
     font-weight: 500;
     border-radius: 0.25rem;
     font-size: 0.875rem;
-    height: 2.25rem;
+    min-height: 2.25rem;
 
     &:focus {
       box-shadow: unset;

package/src/styles/notification/Notification.scss

@@ -15,6 +15,10 @@
       display: none !important;
     }
   }
+
+  &.is-invalid {
+    border-color: theme-color("danger");
+  }
 }
 
 .placeholder-row {

package/src/styles/packages.scss

@@ -13,7 +13,6 @@
 @import "./static";
 @import "./table";
 @import "./back-button";
-@import "./iframe-customers-journey";
 @import "./custom-fields";
 @import "./file-upload";
 @import "./iframe-events";
@@ -41,3 +40,6 @@
 @import "./striped-static-table/";
 @import "./image-radio-input/";
 @import "./radio-card/";
+@import "./activity-card/";
+@import "./date-time-button/";
+@import "./availability-indicator/";

package/src/styles/resources-blocking/_index.scss

@@ -7,6 +7,11 @@
     overflow: auto;
   }
 
+  .modal-form-content {
+    max-height: 21rem;
+    overflow-x: hidden;
+  }
+
   .reccurrence-interval-container {
     .form-group {
       margin-bottom: 0.5rem;

package/src/styles/themes/bookedit/_index.scss

@@ -46,6 +46,7 @@
 .header {
   background-color: color("white");
   padding: 0 2.5rem;
+  z-index: 2;
   min-height: 4rem;
   border-bottom: 1px solid #f0f0f0;
 }