@licklist/design 0.44.486-dev.8 → 0.44.486-dev.81

package/src/provider/location-input/LocationInput.tsx

@@ -5,6 +5,7 @@ import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import CountryCodeSelect from "../../static/CountryCodeSelect";
 import { LocationInputValues } from ".";
+import { FormGroupControll } from "./components";
 
 export function LocationInput() {
   const {
@@ -13,32 +14,32 @@ export function LocationInput() {
   } = useFormContext<LocationInputValues>();
   const { t } = useTranslation("Design");
 
-  const addressId = useId();
-  const cityId = useId();
-  const stateId = useId();
-  const postcodeId = useId();
   const countryId = useId();
 
   return (
     <>
       <input {...register("location.latitude")} type="hidden" />
       <input {...register("location.longitude")} type="hidden" />
-      <Form.Group controlId={addressId}>
-        <Form.Label>{t("locationStreet")}</Form.Label>
-        <Form.Control {...register("location.street")} />
-      </Form.Group>
-      <Form.Group controlId={cityId}>
-        <Form.Label>{t("locationCity")}</Form.Label>
-        <Form.Control {...register("location.city")} />
-      </Form.Group>
-      <Form.Group controlId={stateId}>
-        <Form.Label>{t("locationState")}</Form.Label>
-        <Form.Control {...register("location.state")} />
-      </Form.Group>
-      <Form.Group controlId={postcodeId}>
-        <Form.Label>{t("locationPostcode")}</Form.Label>
-        <Form.Control {...register("location.postcode")} />
-      </Form.Group>
+      <FormGroupControll
+        error={errors?.location?.street}
+        name="location.street"
+        label={t("locationStreet")}
+      />
+      <FormGroupControll
+        error={errors?.location?.city}
+        name="location.city"
+        label={t("locationCity")}
+      />
+      <FormGroupControll
+        error={errors?.location?.state}
+        name="location.state"
+        label={t("locationState")}
+      />
+      <FormGroupControll
+        error={errors?.location?.postcode}
+        name="location.postcode"
+        label={t("locationPostcode")}
+      />
       <Form.Group controlId={countryId}>
         <Form.Label>{t("locationCountry")}</Form.Label>
         <CountryCodeSelect

package/src/provider/location-input/LocationInputDescription.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { ReactElement } from "react";
 import { useFormContext } from "react-hook-form";
 import en from "react-phone-number-input/locale/en.json";
 import { LocationInputValues } from ".";
@@ -13,7 +13,7 @@ export function LocationInputDescription() {
     "postcode",
     "country",
   ] as const;
-  const fields = fieldNames.reduce<JSX.Element[]>((acc, field) => {
+  const fields = fieldNames.reduce<ReactElement[]>((acc, field) => {
     const value = values?.[field];
     if (!value) return acc;
 

package/src/provider/location-input/components/FormGroupControll.tsx

@@ -0,0 +1,16 @@
+import React from "react";
+import { Form } from "react-bootstrap";
+import { useFormContext } from "react-hook-form";
+
+export const FormGroupControll = ({ name, label, error }) => {
+  const { register } = useFormContext();
+  return (
+    <Form.Group>
+      <Form.Label>{label}</Form.Label>
+      <Form.Control {...register(name)} isInvalid={!!error} />
+      <Form.Control.Feedback type="invalid">
+        {error?.message}
+      </Form.Control.Feedback>
+    </Form.Group>
+  );
+};

package/src/provider/location-input/components/index.ts

@@ -0,0 +1 @@
+export * from "./FormGroupControll";

package/src/provider/location-input/index.ts

@@ -1,6 +1,6 @@
 export * from "./LocationInput";
 export * from "./LocationInputDescription";
-
+export * from "./components";
 export type LocationInputValues = {
   location: {
     street: string;

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

@@ -4,7 +4,6 @@ import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 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 {
@@ -70,8 +69,7 @@ export function ProviderDetailsInput({
           isInvalid={Boolean(errors.name)}
         />
         <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.name, "required") &&
-            errors.name?.message}
+          {errors.name?.message}
         </Form.Control.Feedback>
       </Form.Group>
 
@@ -95,8 +93,7 @@ export function ProviderDetailsInput({
           isInvalid={Boolean(errors.description)}
         />
         <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.description, "validate") &&
-            errors.description?.message}
+          {errors.description?.message}
         </Form.Control.Feedback>
       </Form.Group>
 
@@ -120,10 +117,7 @@ export function ProviderDetailsInput({
           isInvalid={Boolean(errors.email)}
         />
         <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.email, "required") &&
-            errors.email?.message}
-          {HookFormService.hasError(errors.email, "pattern") &&
-            errors.email?.message}
+          {errors.email?.message}
         </Form.Control.Feedback>
       </Form.Group>
 
@@ -141,8 +135,7 @@ export function ProviderDetailsInput({
           isInvalid={Boolean(errors.phone)}
         />
         <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.phone, "required") &&
-            errors.phone?.message}
+          {errors.phone?.message}
         </Form.Control.Feedback>
       </Form.Group>
 
@@ -163,8 +156,7 @@ export function ProviderDetailsInput({
           isInvalid={Boolean(errors.website)}
         />
         <Form.Control.Feedback type="invalid">
-          {HookFormService.hasError(errors.website, "pattern") &&
-            errors.website?.message}
+          {errors.website?.message}
         </Form.Control.Feedback>
       </Form.Group>
       {/* If admin has only 1 company - he dont need to set up it */}

package/src/provider/venue-form/VenueForm.stories.tsx

@@ -11,6 +11,29 @@ const categories = Array.from({ length: 6 }, (_, i) => ({
   }),
 }));
 
+const errorResponse = {
+  name: ["The name field is required."],
+  email: ["The email field is required."],
+  phone: ["The phone field is required."],
+  website: ["The website must be a string."],
+  description: ["The description must be a string."],
+  "location.street": ["The location.street must be a string."],
+  "location.city": ["The location.city must be a string."],
+  "location.state": ["The location.state must be a string."],
+  "location.country": [
+    "The location.country must be a string.",
+    "Invalid ISO3166-A2 country code.",
+  ],
+  "categories.0": [
+    "The categories.0 must be an integer.",
+    "The categories.0 must be between 0 and 20 digits.",
+  ],
+  "categories.1": [
+    "The categories.1 must be an integer.",
+    "The categories.1 must be between 0 and 20 digits.",
+  ],
+};
+
 const defaultValues: VenueFormValues = {
   name: "Sample provider",
   description: "Description",
@@ -58,4 +81,5 @@ WithDefaultValues.args = {
   defaultValues,
   categories,
   linkTypes,
+  errorResponse,
 };

package/src/provider/venue-form/VenueForm.tsx

@@ -10,6 +10,7 @@ import {
 } from "@licklist/core/dist/DataMapper/Media/ImageDataMapper";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import { useMultipleImages } from "@licklist/plugins/dist/hooks/Media/useMultipleImages";
+import { parseServerErrorForFormValidation } from "@licklist/plugins/dist/utils/parseError";
 import { CollapsibleInputGroup } from "../../collapsible-input-group";
 import {
   CategoriesInput,
@@ -47,6 +48,8 @@ export interface VenueFormProps extends HasPermissionProp {
   companiesOptions?: TypeaheadOptions[];
   onSubmit: (values: VenueFormValues) => void;
   intent?: "create" | "update";
+  isLoading?: boolean;
+  errorResponse?: unknown;
 }
 
 const providerImageTypes = {
@@ -62,6 +65,8 @@ export function VenueForm({
   onSubmit,
   intent = "update",
   hasPermission = true,
+  isLoading,
+  errorResponse,
 }: VenueFormProps) {
   const form = useForm<VenueFormValues>({ defaultValues, mode: "onChange" });
   const {
@@ -69,6 +74,7 @@ export function VenueForm({
     handleSubmit,
     formState: { isSubmitting, errors },
     getValues,
+    setError,
   } = form;
   const { t } = useTranslation("Design");
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
@@ -92,6 +98,27 @@ export function VenueForm({
     }
   }, [images, setValue]);
 
+  useEffect(() => {
+    if (!errorResponse) {
+      return;
+    }
+    const errorEntriesArray = parseServerErrorForFormValidation({
+      values: getValues(),
+      error: errorResponse,
+    });
+    if (!errorEntriesArray.length) {
+      return;
+    }
+    errorEntriesArray.forEach((errorEntriesArray) => {
+      const [key, value] = errorEntriesArray;
+      setError(key as keyof VenueFormValues, {
+        message: value,
+        type: "validate",
+      });
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [errorResponse]);
+
   return (
     <FormProvider {...form}>
       <Form
@@ -108,7 +135,13 @@ export function VenueForm({
             eventKey="location"
             label={t("location")}
             description={<LocationInputDescription />}
-            error={errors?.location?.country?.message}
+            error={
+              errors?.location?.message ||
+              (errors?.location &&
+                t("Validation:isNotValidField", {
+                  attribute: "The location data",
+                }))
+            }
           >
             <LocationInput />
           </CollapsibleInputGroup>
@@ -116,7 +149,13 @@ export function VenueForm({
             eventKey="workingHours"
             label={t("workingHours")}
             description={<WorkingHoursInputDescription />}
-            error={errors.workingHours?.message}
+            error={
+              errors?.workingHours?.message ||
+              (errors?.workingHours &&
+                t("Validation:isNotValidField", {
+                  attribute: "The Working hours data",
+                }))
+            }
           >
             <WorkingHoursInput />
           </CollapsibleInputGroup>
@@ -124,6 +163,13 @@ export function VenueForm({
             <CollapsibleInputGroup
               eventKey="categories"
               label={t("categories")}
+              error={
+                errors?.categories?.message ||
+                (errors?.categories &&
+                  t("Validation:isNotValidField", {
+                    attribute: "The Categories data",
+                  }))
+              }
               description={
                 <CategoriesInputDescription categories={categories} />
               }
@@ -161,10 +207,15 @@ export function VenueForm({
         {hasPermission && (
           <Button
             type="submit"
-            disabled={isSubmitting || isImagesLoading || isCoverImagesLoading}
+            disabled={
+              isLoading ||
+              isSubmitting ||
+              isImagesLoading ||
+              isCoverImagesLoading
+            }
             className="d-flex align-items-center align-self-end"
           >
-            {isSubmitting && (
+            {(isSubmitting || isLoading) && (
               <Spinner
                 animation="border"
                 size="sm"

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

@@ -2,7 +2,7 @@ import React, { useEffect } 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 { RegisterOptions, useFormContext } from "react-hook-form";
 import { DATE_FORMAT } from "@licklist/core/dist/Config";
 import { RecurringDatePickerInputValues } from "./RecurringDatePickerInput";
 
@@ -13,6 +13,14 @@ interface RecurrenceIntervalAndFrequencyInputProps {
   startTimeLabel?: string;
   endDateLabel?: string;
   endTimeLabel?: string;
+  startTimeRules?: Pick<
+    RegisterOptions,
+    "max" | "min" | "validate" | "required" | "pattern"
+  >;
+  endTimeRules?: Pick<
+    RegisterOptions,
+    "max" | "min" | "validate" | "required" | "pattern"
+  >;
 }
 
 function RecurrenceIntervalAndFrequencyInput({
@@ -22,6 +30,8 @@ function RecurrenceIntervalAndFrequencyInput({
   startTimeLabel,
   endDateLabel,
   endTimeLabel,
+  startTimeRules,
+  endTimeRules,
 }: RecurrenceIntervalAndFrequencyInputProps) {
   const { t } = useTranslation(["Design", "Notification", "App"]);
 
@@ -30,7 +40,6 @@ function RecurrenceIntervalAndFrequencyInput({
     formState: { errors },
     register,
     trigger,
-    setValue,
   } = useFormContext<RecurringDatePickerInputValues>();
 
   const startDate = getValues("startDate");
@@ -47,6 +56,9 @@ function RecurrenceIntervalAndFrequencyInput({
   }, [startDate]);
 
   useEffect(() => {
+    if (!startTime || !endTime) {
+      return;
+    }
     trigger("endTime");
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [startTime]);
@@ -118,15 +130,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>
 
@@ -144,18 +156,16 @@ function RecurrenceIntervalAndFrequencyInput({
                   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";
@@ -38,6 +39,7 @@ export interface RecurringDatePickerInputValues {
   byweekday?: Weekday[];
   until?: Date;
   count?: number;
+  withOutEndDate?: boolean;
 }
 
 export function RecurringDatePickerInput({
@@ -101,6 +103,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 +122,8 @@ export function RecurringDatePickerInput({
 
     onChange({
       ...nextState,
+      endDate: endDateNextState,
+      endTime: endTimeNextState,
       rrule,
     });
   };

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);