@licklist/design 0.63.1-dev.7 → 0.63.2

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

@@ -35,8 +35,6 @@ interface ProductsControlProps extends WithIsLoading {
   categoryType: CategoryType;
   zones?: Zone[];
   isOverrides?: boolean;
-  isEventEditProductSet?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
 const getDefaultProductValue = (sort: number): Product => ({
@@ -59,7 +57,6 @@ const getDefaultProductValue = (sort: number): Product => ({
   quantitySelector: 1,
   hasSpecialNotes: false,
   weight: 0,
-  originalProductId: null,
   type: DEFAULT_PRODUCT_TYPE,
   tierId: Number(uniqueId()),
   zoneId: null,
@@ -82,8 +79,6 @@ export function ProductsControl({
   categoryType,
   zones,
   isOverrides,
-  isEventEditProductSet,
-  isCreateNewOverrides,
 }: ProductsControlProps) {
   const { t } = useTranslation("Design");
   const form = useFormContext<ProductSetFormValues>();
@@ -208,101 +203,90 @@ export function ProductsControl({
         onDragEnd={handleDragEnd}
         sensors={[mouseSensor]}
       >
-        {fields.map((product, index) => {
-          const isOverridesProductSet = isEventEditProductSet
-            ? !!product.id
-            : isOverrides && !!product.originalProductId;
-
-          const isNewProductOverrides = isCreateNewOverrides && !!product.id;
-
-          return (
-            <Controller
-              key={product._id}
-              control={control}
-              name={`${productControlFieldName}.${index}.name` as const}
-              rules={{
-                required: t("Validation:fieldRequired", {
-                  attribute: t("name"),
-                }) as string,
-              }}
-              render={({ field: { value, onChange } }) => (
-                <SortableTree.Item
-                  key={`product-${product._id}`}
-                  id={String(product._id)}
-                  isExpanded={isFirstProductAdded}
-                  isInvalid={!!categoryProductErrors}
-                  title={value}
-                  isOverride={isOverrides}
-                  badge={
-                    <Badge className="product-badge">{t("product")}</Badge>
-                  }
-                  isIconInHeader={false}
-                  cancelChanges={() => cancelChanges(index)}
-                  edit={() => edit(index)}
-                  secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
-                  subTitle={
-                    <div className="product-set-badges-container">
-                      <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
-                      <span>
-                        {`£${prices[index]} ${t("each")} - ${t("qty")}:${
-                          !isUnlimitedQuantities[index]
-                            ? ` ${quantities[index]}`
-                            : t(" unlimited")
-                        } ${
-                          !isUnlimitedQuantities[index]
-                            ? ` - ${t("possibleRevenue")} £${
-                                prices[index] * quantities[index]
-                              }`
-                            : ""
-                        } `}
-                      </span>
-                    </div>
-                  }
-                  modalLabel={t("addNewProduct")}
-                  modalClass={ProductSetModalClasses.product}
-                  isNewAdded={showProductModal}
-                  body={
-                    <ProductControl<ProductSetFormValues>
-                      isLoading={isLoading}
-                      quantityType={quantityType}
-                      allowDeposits={allowDeposits}
-                      hasBookingManagement={false}
-                      fieldNamePrefix={
-                        `${productControlFieldName}.${index}` as const
-                      }
-                      productName={value}
-                      onProductNameChange={onChange}
-                      hasTicket={hasTicket}
-                      categoryType={categoryType}
-                      zoneDuration={catergoryZone?.defaultDuration}
-                      isOverrides={
-                        isNewProductOverrides || isOverridesProductSet
-                      }
-                    />
-                  }
-                  onDelete={() => onProductRemove(index)}
-                  validate={() =>
-                    trigger(`${productControlFieldName}.${index}`)
-                  }
-                  saveValidField={saveValidField}
-                  // preItem={<Popover className="d-none d-sm-block" />}
-                >
-                  <SubProductsControl
+        {fields.map((product, index) => (
+          <Controller
+            key={product._id}
+            control={control}
+            name={`${productControlFieldName}.${index}.name` as const}
+            rules={{
+              required: t("Validation:fieldRequired", {
+                attribute: t("name"),
+              }) as string,
+            }}
+            render={({ field: { value, onChange } }) => (
+              <SortableTree.Item
+                key={`product-${product._id}`}
+                id={String(product._id)}
+                isExpanded={isFirstProductAdded}
+                isInvalid={!!categoryProductErrors}
+                title={value}
+                isOverride={isOverrides}
+                badge={<Badge className="product-badge">{t("product")}</Badge>}
+                isIconInHeader={false}
+                cancelChanges={() => cancelChanges(index)}
+                edit={() => edit(index)}
+                isProduct
+                secondaryBadge={getBadgeConfig(categoryType, t(categoryType))}
+                subTitle={
+                  <div className="product-set-badges-container">
+                    <div className="product-set-subtitle-dot product-set-subtitle-product-dot" />
+                    <span>
+                      {`£${prices[index]} ${t("each")} - ${t("qty")}:${
+                        !isUnlimitedQuantities[index]
+                          ? ` ${quantities[index]}`
+                          : t(" unlimited")
+                      } ${
+                        !isUnlimitedQuantities[index]
+                          ? ` - ${t("possibleRevenue")} £${
+                              prices[index] * quantities[index]
+                            }`
+                          : ""
+                      } `}
+                    </span>
+                  </div>
+                }
+                modalLabel={t("addNewProduct")}
+                modalClass={ProductSetModalClasses.product}
+                isNewAdded={showProductModal}
+                body={
+                  <ProductControl<ProductSetFormValues>
                     isLoading={isLoading}
                     quantityType={quantityType}
-                    stepIndex={stepIndex}
-                    productCategoryIndex={productCategoryIndex}
-                    productIndex={index}
+                    allowDeposits={allowDeposits}
+                    hasBookingManagement={false}
+                    fieldNamePrefix={
+                      `${productControlFieldName}.${index}` as const
+                    }
+                    productName={value}
+                    onProductNameChange={onChange}
+                    hasTicket={hasTicket}
+                    categoryType={categoryType}
+                    zoneDuration={catergoryZone?.defaultDuration}
+                    isOverrides={isOverrides}
                   />
-                </SortableTree.Item>
-              )}
-            />
-          );
-        })}
+                }
+                onDelete={() => onProductRemove(index)}
+                validate={() => trigger(`${productControlFieldName}.${index}`)}
+                saveValidField={saveValidField}
+                // preItem={<Popover className="d-none d-sm-block" />}
+              >
+                <SubProductsControl
+                  isLoading={isLoading}
+                  quantityType={quantityType}
+                  stepIndex={stepIndex}
+                  productCategoryIndex={productCategoryIndex}
+                  productIndex={index}
+                />
+              </SortableTree.Item>
+            )}
+          />
+        ))}
       </SortableTree>
       <CreateProductSetItem
         title={t("addProduct")}
+        isOverride={isOverrides}
         onClick={() => {
+          if (isOverrides) return;
           append(getDefaultProductValue(fields.length));
           setShowProductModal(true);
 

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

@@ -19,16 +19,9 @@ import { ProductSetFormValues } from "./ProductSetForm";
 interface StepsControlProps {
   isLoading: boolean;
   isOverrides?: boolean;
-  isEventEditProductSet?: boolean;
-  isCreateNewOverrides?: boolean;
 }
 
-export function StepsControl({
-  isLoading,
-  isOverrides,
-  isEventEditProductSet,
-  isCreateNewOverrides,
-}: StepsControlProps) {
+export function StepsControl({ isLoading, isOverrides }: StepsControlProps) {
   const form = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
   const [showStepModal, setShowStepModal] = useState(false);
@@ -75,9 +68,9 @@ export function StepsControl({
     <>
       {fields.map((step, index) => {
         const stepFieldName = `steps.${index}` as const;
+
         const stepData = getValues(stepFieldName);
-        const isOverrideStep =
-          (isOverrides || isCreateNewOverrides) && !!step.id;
+
         return (
           <Controller
             key={`step-${step._id}`}
@@ -99,9 +92,9 @@ export function StepsControl({
                 modalLabel={t("addNewStep")}
                 modalClass={ProductSetModalClasses.step}
                 isNewAdded={showStepModal}
-                edit={() => edit(index)}
+                edit={() => !isOverrides && edit(index)}
                 cancelChanges={() => cancelChanges(index)}
-                isOverride={isOverrideStep}
+                isOverride={isOverrides}
                 subTitle={
                   <div className="product-set-badges-container">
                     <div className="product-set-subtitle-dot product-set-subtitle-step-dot" />
@@ -117,7 +110,6 @@ export function StepsControl({
                     stepIndex={index}
                     stepName={value}
                     onStepNameChange={onChange}
-                    isOverrides={isOverrideStep}
                   />
                 }
                 onDelete={() => remove(index)}
@@ -148,8 +140,6 @@ export function StepsControl({
                   isLoading={isLoading}
                   stepIndex={index}
                   isOverrides={isOverrides}
-                  isCreateNewOverrides={isCreateNewOverrides}
-                  isEventEditProductSet={isEventEditProductSet}
                 />
               </SortableTree.Item>
             )}
@@ -159,7 +149,9 @@ export function StepsControl({
 
       <CreateProductSetItem
         title={t("addStep")}
+        isOverride={isOverrides}
         onClick={() => {
+          if (isOverrides) return;
           append(getDefaultStepsValues());
           setShowStepModal(true);
           if (errors.steps?.type === HookFormService.manualErrorType) {

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

@@ -7,17 +7,14 @@ import {
   QUANTITY_TYPE_LIST_DTO,
   QUANTITY_TYPE_RECHARGING,
 } from "@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper";
-import {
-  ProductType,
-  PRODUCT_DEfAULT_COLORS,
-} from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
+import { ProductType } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
-import clsx from "clsx";
 import {
   FieldNamePrefixPath,
   FormValues,
 } from "@licklist/plugins/dist/types/services/Form/hook-form-service";
 import { useId } from "@react-aria/utils";
+import clsx from "clsx";
 import React, {
   ChangeEvent,
   useCallback,
@@ -39,7 +36,7 @@ import {
 } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useImages } from "@licklist/plugins/dist/hooks/Media/useImages";
-
+import { PRODUCT_DEfAULT_COLORS } from "@licklist/core/dist/DataMapper/Product/ProductDataMapper";
 import {
   Image,
   IMAGE_TYPE_IMAGE,
@@ -89,7 +86,6 @@ export interface ProductControlValues
   totalQuantity: number;
   isAvailable: boolean;
   isSoldOut: boolean;
-  originalProductId: number | null;
   isUnlimited: boolean;
   isRequired: boolean;
   quantitySelector: number;
@@ -150,7 +146,7 @@ export function ProductControl<T extends FormValues>({
     clearErrors,
   } = useFormContext<T>();
 
-  const { setLoading, productGroupList } = useContext(ProductSetLoadingContext);
+  const { setLoading } = useContext(ProductSetLoadingContext);
   const { t } = useTranslation(["Design", "Validation", "ProductSet"]);
   const [expanded, setExpanded] = useState(false);
   const [initialImages, setInitialImages] = useState<Image[] | null>(null);
@@ -160,10 +156,11 @@ export function ProductControl<T extends FormValues>({
   );
   const capacity = watch(`${fieldNamePrefix}.capacity` as Path<T>);
   const disabledDuration = capacity === "0" || !capacity;
+
   const advancedId = useId();
   const nameId = useId();
-
-  const productGroupId = useId();
+  // @TODO: no need for v1 release
+  // const productGroupId = useId();
   const descriptionId = useId();
   const termsAndConditionsId = useId();
   const isAvailableId = useId();
@@ -403,35 +400,6 @@ export function ProductControl<T extends FormValues>({
             isRequired={false}
             defaultColors={PRODUCT_DEfAULT_COLORS}
           />
-
-          <Form.Group controlId={productGroupId}>
-            <Form.Label>{t("productGroup")}</Form.Label>
-            <Form.Control
-              as="select"
-              {...register(`${fieldNamePrefix}.productGroupId` as Path<T>)}
-              isInvalid={HookFormService.isInvalid<T>(
-                `${fieldNamePrefix}.productGroupId` as Path<T>,
-                errors
-              )}
-              disabled={isLoading || isOverrides}
-              defaultValue=""
-            >
-              <option value="">{t("Design:selectProductGroup")}</option>
-              {productGroupList.map((productGroup) => {
-                return (
-                  <option value={productGroup.id} key={productGroup.id}>
-                    {productGroup.value}
-                  </option>
-                );
-              })}
-            </Form.Control>
-            <Form.Control.Feedback type="invalid">
-              {HookFormService.getErrors<T>(
-                `${fieldNamePrefix}.productGroupId` as Path<T>,
-                errors
-              )}
-            </Form.Control.Feedback>
-          </Form.Group>
         </Col>
       </Row>
 
@@ -704,6 +672,38 @@ export function ProductControl<T extends FormValues>({
         </Collapse>
 
         <Row>
+          {/* @TODO: no need for v1 release
+            <Col xs={12} sm={6}>
+              <Form.Group controlId={productGroupId}>
+                <Form.Label>{t("productGroup")}</Form.Label>
+                <Form.Control
+                  as="select"
+                  {...register(`${fieldNamePrefix}.productGroupId` as Path<T>)}
+                  isInvalid={HookFormService.isInvalid<T>(
+                    `${fieldNamePrefix}.productGroupId` as Path<T>,
+                    errors
+                  )}
+                  disabled={isLoading}
+                  defaultValue=""
+                >
+                  <option value="">{t("Design:selectProductGroup")}</option>
+                  {productGroupList.map((productGroup) => {
+                    return (
+                      <option value={productGroup.id} key={productGroup.id}>
+                        {productGroup.value}
+                      </option>
+                    );
+                  })}
+                </Form.Control>
+                <Form.Control.Feedback type="invalid">
+                  {HookFormService.getErrors<T>(
+                    `${fieldNamePrefix}.productGroupId` as Path<T>,
+                    errors
+                  )}
+                </Form.Control.Feedback>
+              </Form.Group>
+            </Col> */}
+
           <Col xs={12}>
             {hasBookingManagement && (
               <ProductBookingManagementControl<T>

package/src/product-set/step/StepControl.tsx

@@ -26,7 +26,6 @@ export interface StepControlProps extends IsDeletableEvent {
   stepIndex: number;
   stepName: string;
   onStepNameChange: (args: any) => void;
-  isOverrides?: boolean;
 }
 
 export function StepControl({
@@ -34,7 +33,6 @@ export function StepControl({
   stepIndex,
   stepName,
   onStepNameChange,
-  isOverrides = false,
 }: StepControlProps) {
   const { providerHasMap } = useContext(ProductSetLoadingContext);
   const {
@@ -44,6 +42,7 @@ export function StepControl({
     watch,
   } = useFormContext<ProductSetFormValues>();
   const { t } = useTranslation("Design");
+
   const fieldName = `steps.${stepIndex}.name` as const;
   const productCategoriesFieldName =
     `steps.${stepIndex}.productCategories` as const;
@@ -72,7 +71,7 @@ export function StepControl({
                     fieldName,
                     errors
                   )}
-                  disabled={isLoading || isOverrides}
+                  disabled={isLoading}
                 />
               )}
               control={control}
@@ -115,7 +114,7 @@ export function StepControl({
                           name={name}
                           value={Boolean(value)}
                           onChange={onChange}
-                          disabled={isLoading || isOverrides}
+                          disabled={isLoading}
                         />
                       )}
                       control={control}

package/src/provider/working-hours-input/WorkingHoursInputDescription.tsx

@@ -1,7 +1,9 @@
+import { DateTime } from "luxon";
 import React from "react";
 import { Col, Row } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
 import { WorkingHoursInputValues } from ".";
 import { useWeekdays } from "./utils";
 
@@ -23,10 +25,22 @@ export function WorkingHoursInputDescription() {
             <Row key={i}>
               <Col xs="auto">{weekdays[i]}:</Col>
               <Col>
-                {t("timeInterval", {
-                  start: weekday.start,
-                  end: weekday.end,
-                })}
+                {weekday?.end
+                  ? weekday.start
+                    ? t("timeInterval", {
+                        start: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                        end: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                      })
+                    : t("timeFrom", {
+                        start: DateTime.fromISO(weekday.start).toFormat(
+                          TIME_FORMAT
+                        ),
+                      })
+                  : null}
               </Col>
             </Row>
           );

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

@@ -1,19 +1,22 @@
 import React from "react";
 import { Meta, Story } from "@storybook/react";
 import { Card } from "react-bootstrap";
-import { DateTime } from "luxon";
-import { DATE_FORMAT, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import {
   RecurringDatePickerInput,
   RecurringDatePickerInputProps,
 } from "./RecurringDatePickerInput";
+import { DateTime } from "luxon";
+import { DATE_FORMAT, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 
 export default {
   title: "RecurringDatePickerInput",
   component: RecurringDatePickerInput,
 } as Meta;
 
-export const Default: Story<RecurringDatePickerInputProps> = (args) => {
+interface DefaultRecurringDatePickerInputProps
+  extends RecurringDatePickerInputProps {}
+
+export const Default: Story<DefaultRecurringDatePickerInputProps> = (args) => {
   return (
     <Card style={{ maxWidth: "max-content" }}>
       <Card.Body>
@@ -22,7 +25,7 @@ export const Default: Story<RecurringDatePickerInputProps> = (args) => {
     </Card>
   );
 };
-export const Valid: Story<RecurringDatePickerInputProps> = (args) => {
+export const Valid: Story<DefaultRecurringDatePickerInputProps> = (args) => {
   return (
     <Card style={{ maxWidth: "max-content" }}>
       <Card.Body>
@@ -33,15 +36,6 @@ export const Valid: Story<RecurringDatePickerInputProps> = (args) => {
 };
 Default.args = {
   onChange: (data) => console.log("onSubmit", data),
-  workHours: [
-    { start: "20:00", end: "04:00", day: 0, description: "" },
-    { start: "20:00", end: "04:00", day: 1, description: "" },
-    { start: "20:00", end: "04:00", day: 2, description: "" },
-    { start: "20:00", end: "12:00", day: 3, description: "" },
-    { start: "20:00", end: "23:00", day: 4, description: "" },
-    { start: "08:00", end: "12:00", day: 5, description: "" },
-    { start: "10:00", end: "16:00", day: 6, description: "" },
-  ],
 };
 Valid.args = {
   onChange: (data) => console.log("onSubmit", data),

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

@@ -12,14 +12,9 @@ import {
 import { usePreviousValue } from "@licklist/plugins/dist/hooks/Value/usePreviousValue";
 import { FormProvider, useForm } from "react-hook-form";
 import { Form } from "react-bootstrap";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import RecurrenceIntervalAndFrequencyInput from "./RecurrenceIntervalAndFrequencyInput";
 import RecurrenceWeekdaysInput from "./RecurrenceWeekdaysInput";
-import {
-  parseAndValidateRRule,
-  SupportedFrequency,
-  useWorkHoursValidation,
-} from "./utils";
+import { parseAndValidateRRule, SupportedFrequency } from "./utils";
 import { ConfirmModal } from "../modals";
 import { DeleteFieldButton } from "../product-set/elements";
 
@@ -31,7 +26,6 @@ export interface RecurringDatePickerInputProps {
   initialFrequency?: Frequency;
   setInitialStartDateAfterSelect?: boolean;
   minDate?: string;
-  workHours: WorkHour[] | undefined;
 }
 
 export interface RecurringDatePickerInputValues {
@@ -57,7 +51,6 @@ export function RecurringDatePickerInput({
   setInitialStartDateAfterSelect = false,
   children,
   minDate,
-  workHours,
 }: PropsWithChildren<RecurringDatePickerInputProps>) {
   const { t } = useTranslation(["Design"]);
 
@@ -91,8 +84,6 @@ export function RecurringDatePickerInput({
     byWeekDay,
   });
 
-  const validator = useWorkHoursValidation(byWeekDay, workHours);
-
   const onSubmit = (nextState: RecurringDatePickerInputValues) => {
     const end = getDateTimeObject(endDate, endTime || "23:59:59");
 
@@ -197,8 +188,6 @@ export function RecurringDatePickerInput({
         <RecurrenceIntervalAndFrequencyInput
           disabled={disabled}
           minDate={minDate}
-          startTimeRules={validator}
-          endTimeRules={validator}
         />
 
         {children}