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

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

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

@@ -0,0 +1,47 @@
+import React, { PropsWithChildren } from "react";
+import { MainFilterSection } from "./components/MainFilterSection";
+import { AdditionalFilterSection } from "./components/AdditionalFIlterSection";
+import { SearchingForSection } from "./components/SearchingForSection";
+
+export type BookingFilterProps = PropsWithChildren<{
+  onAddFiltersClick?: () => void;
+  onCancelFilterClick?: () => void;
+  onRefreshClick?: () => void;
+  onFullscreenButtonClick?: () => void;
+  isFilterOpen?: boolean;
+  autoFocusOnMount?: boolean;
+  isFullscreenMode?: boolean;
+}>;
+
+export const BookingFilter = ({
+  isFilterOpen = true,
+  autoFocusOnMount = false,
+  isFullscreenMode = false,
+  children,
+  ...props
+}: BookingFilterProps) => {
+  return (
+    <div className="booking-filter">
+      <MainFilterSection
+        {...props}
+        isFilterOpen={isFilterOpen}
+        autoFocusOnMount={autoFocusOnMount}
+        isFullscreenMode={isFullscreenMode}
+      />
+      {isFilterOpen ? (
+        <>
+          <AdditionalFilterSection />
+          <div className="separator-horizontal" />
+          <SearchingForSection />
+        </>
+      ) : (
+        children && (
+          <>
+            <div className="separator-horizontal" />
+            {children}
+          </>
+        )
+      )}
+    </div>
+  );
+};

package/src/sales/booking/filter/components/AdditionalFIlterSection.tsx

@@ -0,0 +1,95 @@
+import React, { useContext, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { Form, Button, Row, Col } from "react-bootstrap";
+import { useForm } from "react-hook-form";
+import {
+  ORDER_STATUS_PENDING,
+  ORDER_STATUS_CANCELLED,
+  ORDER_STATUS_COMPLETED,
+  ORDER_STATUS_ACTION_REQUIRED,
+} from "@licklist/core/dist/DataMapper/Order/OrderDataMapper";
+import {
+  BookingContext,
+  BookingFilters,
+} from "@licklist/plugins/dist/context/booking/BookingContext";
+
+const ORDER_STATUSES_FOR_UPDATE = [
+  ORDER_STATUS_PENDING,
+  ORDER_STATUS_CANCELLED,
+  ORDER_STATUS_COMPLETED,
+  ORDER_STATUS_ACTION_REQUIRED,
+];
+
+export type AdditionalFilterSectionProps = {
+  onAddFiltersClick?: () => void;
+  onCancelFilterClick?: () => void;
+  onRefreshClick?: () => void;
+  onFullscreenButtonClick?: () => void;
+  isFilterOpen?: boolean;
+};
+
+export const AdditionalFilterSection = () => {
+  const { t } = useTranslation("Design");
+  const { filters, setFilters } = useContext(BookingContext);
+
+  const { handleSubmit, register, reset } = useForm<Partial<BookingFilters>>({
+    defaultValues: filters,
+  });
+
+  const onFormSubmit = (values: Partial<BookingFilters>) => {
+    setFilters(values);
+  };
+
+  useEffect(() => {
+    reset(filters);
+  }, [filters, reset]);
+
+  return (
+    <div className="additional-filter-section">
+      <Form onSubmit={handleSubmit(onFormSubmit)}>
+        <Row>
+          <Col md="3">
+            <Form.Group>
+              <Form.Label>{t("staffMember")}</Form.Label>
+              <Form.Control {...register("staffMember")} as="select">
+                <option value="">{t("Design:choose")}</option>
+              </Form.Control>
+            </Form.Group>
+          </Col>
+
+          <Col md="3">
+            <Form.Group>
+              <Form.Label>{t("bookingStatus")}</Form.Label>
+              <Form.Control {...register("status")} as="select">
+                <option value="">{t("Design:choose")}</option>
+                {Object.keys(ORDER_STATUSES_FOR_UPDATE).map((key: string) => (
+                  <option
+                    key={ORDER_STATUSES_FOR_UPDATE[key]}
+                    value={ORDER_STATUSES_FOR_UPDATE[key]}
+                  >
+                    {t(`Design:${ORDER_STATUSES_FOR_UPDATE[key]}`)}
+                  </option>
+                ))}
+              </Form.Control>
+            </Form.Group>
+          </Col>
+
+          <Col md="3">
+            <Form.Group>
+              <Form.Label>{t("date")}</Form.Label>
+              <Form.Control {...register("date")} type="date" />
+            </Form.Group>
+          </Col>
+
+          <Col md="3" className="d-flex align-items-end">
+            <Form.Group>
+              <Button type="submit" className="shadow-none">
+                {t("apply")}
+              </Button>
+            </Form.Group>
+          </Col>
+        </Row>
+      </Form>
+    </div>
+  );
+};

package/src/sales/booking/filter/components/MainFilterSection.tsx

@@ -0,0 +1,131 @@
+import React, { useContext, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Form, Button } from "react-bootstrap";
+import clsx from "clsx";
+import useDebounce from "use-debounce/lib/useDebounce";
+import { BookingContext } from "@licklist/plugins/dist/context/booking/BookingContext";
+import Icon from "../../../../static/Icon";
+import { BookingFilterProps } from "../BookingFilter";
+import { ReactComponent as RefreshIcon } from "../../../../assets/dashboard/refresh.svg";
+import { ReactComponent as FullscreenIcon } from "../../../../assets/dashboard/fullscreen.svg";
+import { ReactComponent as MinimizeIcon } from "../../../../assets/dashboard/minimize.svg";
+
+export type MainFilterSectionProps = BookingFilterProps;
+
+const DEBOUNCE_QUERY_TIME = 300;
+
+export const MainFilterSection = ({
+  isFilterOpen,
+  onAddFiltersClick,
+  onCancelFilterClick,
+  onRefreshClick,
+  onFullscreenButtonClick,
+  autoFocusOnMount,
+  isFullscreenMode,
+}: MainFilterSectionProps) => {
+  const { t } = useTranslation("Design");
+  const { filters, onQueryChange } = useContext(BookingContext);
+  const { search = "" } = filters;
+
+  const [queryValue, setQueryValue] = useState<string>(search);
+  const [debouncedQueryValue] = useDebounce(queryValue, DEBOUNCE_QUERY_TIME);
+
+  const onSearchQueryChange = ({ target: { value } }) => {
+    setQueryValue(value);
+  };
+
+  const onSearchQueryBlur = ({ target: { value } }) => {
+    onQueryChange(value);
+  };
+
+  useEffect(() => {
+    onQueryChange(debouncedQueryValue);
+  }, [onQueryChange, debouncedQueryValue]);
+
+  useEffect(() => {
+    if (queryValue !== search) {
+      setQueryValue(search);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [search]);
+
+  return (
+    <div className="main-filter-section">
+      <div className="search">
+        <Form.Group>
+          <Form.Label>{t("searchBookings")}:</Form.Label>
+          <div className="control-with-icon">
+            <Icon
+              type="search"
+              width="1rem"
+              height="1rem"
+              className="search-icon"
+            />
+            <Form.Control
+              value={queryValue}
+              onChange={onSearchQueryChange}
+              onBlur={onSearchQueryBlur}
+              placeholder={t("searchBookingsPlaceholder")}
+              autoFocus={autoFocusOnMount}
+            />
+          </div>
+        </Form.Group>
+      </div>
+      <div className="buttons">
+        {isFilterOpen ? (
+          <Button
+            variant="link"
+            className="shadow-none cancel-button"
+            onClick={onCancelFilterClick}
+          >
+            <div className="icon">
+              <Icon type="plus" style={{ width: 10 }} />
+            </div>
+            {t("cancel")}
+          </Button>
+        ) : (
+          <Button
+            variant="link"
+            className="shadow-none add-filters-button"
+            onClick={onAddFiltersClick}
+          >
+            <div className="icon">
+              <Icon type="plus" style={{ width: 10 }} />
+            </div>
+            {t("addFilters")}
+          </Button>
+        )}
+
+        <div className="separator" />
+
+        <Button
+          variant="link"
+          className="shadow-none refresh-button"
+          onClick={onRefreshClick}
+        >
+          <div className="icon">
+            <RefreshIcon />
+          </div>
+          {t("refresh")}
+        </Button>
+
+        <div className="separator active" />
+
+        <Button
+          variant="link"
+          className={clsx(
+            "shadow-none",
+            !isFullscreenMode && "fullscreen-button",
+            isFullscreenMode && "minimize-button"
+          )}
+          onClick={onFullscreenButtonClick}
+        >
+          <div className="icon">
+            {isFullscreenMode ? <MinimizeIcon /> : <FullscreenIcon />}
+          </div>
+          {t(isFullscreenMode ? "minimize" : "fullScreen")}
+        </Button>
+      </div>
+    </div>
+  );
+};

package/src/sales/booking/filter/components/ResultTagButton.tsx

@@ -0,0 +1,33 @@
+import React from "react";
+import Icon from "../../../../static/Icon";
+
+export type ResultTagButtonProps = {
+  tagKey: string;
+  value: string;
+  onRemoveClick: (tagKey: string) => void;
+};
+
+export const ResultTagButton = ({
+  tagKey,
+  value,
+  onRemoveClick,
+}: ResultTagButtonProps) => {
+  const onButtonClick = () => {
+    onRemoveClick(tagKey);
+  };
+
+  return (
+    <div className="result-tag rounded-pill shadow-none">
+      {value}
+      <div
+        className="icon"
+        role="button"
+        tabIndex={0}
+        onClick={onButtonClick}
+        onKeyUp={onButtonClick}
+      >
+        <Icon type="plus" style={{ width: 10 }} color="#727272" />
+      </div>
+    </div>
+  );
+};