@licklist/design 0.63.0-dev.0 → 0.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.63.0-dev.0",
+  "version": "0.63.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -16,11 +16,14 @@
     "type-check:watch": "yarn type-check -- --watch",
     "build": "rollup -c",
     "watch": "yarn build -- -w",
+    "test": "jest --verbose --coverage --watchAll=false",
+    "run-test": "jest --verbose --watchAll=false",
     "lint": "eslint --ext .ts,.tsx .",
     "lint:fix": "yarn run lint -- --fix",
     "lint:format": "prettier \"**/*.{md,json,yml,scss}\" --check",
     "lint:format:fix": "prettier \"**/*.{md,json,yml,scss}\" --write",
     "prepare": "husky install",
+    "test-staged": "CI=true jest --passWithNoTests --findRelatedTests",
     "tests": "yarn tests-staged",
     "prettier-write": "prettier --write",
     "tsc": "bash -c tsc -p tsconfig.json -b"
@@ -50,9 +53,9 @@
     "@fortawesome/free-brands-svg-icons": "5.15.2",
     "@fortawesome/free-solid-svg-icons": "5.15.2",
     "@fortawesome/react-fontawesome": "0.1.9",
-    "@licklist/core": ">=0.25.1-dev.0 < 0.25.1",
-    "@licklist/eslint-config": "0.4.5",
-    "@licklist/plugins": ">=0.28.0-dev.2 < 0.28.0",
+    "@licklist/core": "^0.23.1",
+    "@licklist/eslint-config": "0.3.4",
+    "@licklist/plugins": "^0.27.2",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",
@@ -70,6 +73,10 @@
     "@svgr/rollup": "5.5.0",
     "@svgr/webpack": "5.5.0",
     "@tanstack/react-table": "8.10.6",
+    "@testing-library/jest-dom": "5.16.1",
+    "@testing-library/react": "11.2.5",
+    "@testing-library/react-hooks": "5.1.0",
+    "@testing-library/user-event": "13.5.0",
     "@tiptap/core": "2.0.0-beta.176",
     "@tiptap/extension-blockquote": "2.0.0-beta.29",
     "@tiptap/extension-bold": "2.0.0-beta.28",
@@ -92,10 +99,14 @@
     "@tiptap/react": "2.0.0-beta.109",
     "@tiptap/suggestion": "2.0.0-beta.92",
     "@types/babel__core": "7.1.12",
+    "@types/enzyme-adapter-react-16": "1.0.6",
+    "@types/jest": "26.0.20",
     "@types/luxon": "1.26.2",
     "@types/mdx-js__react": "1.5.3",
+    "@types/react": "17.0.2",
     "@types/react-bootstrap": "1.0.1",
     "@types/react-date-range": "^1.4.4",
+    "@types/react-dom": "17.0.1",
     "@types/react-email-editor": "1.1.7",
     "@types/react-loader": "2.4.4",
     "@types/react-phone-number-input": "3.0.6",
@@ -105,6 +116,7 @@
     "@typescript-eslint/eslint-plugin": "5.8.1",
     "@typescript-eslint/parser": "5.8.1",
     "@wojtekmaj/react-daterange-picker": "^4.1.0",
+    "babel-jest": "26.6.3",
     "babel-loader": "8.2.2",
     "babel-plugin-inline-react-svg": "2.0.1",
     "bootstrap": "4.6.0",
@@ -116,16 +128,21 @@
     "emojibase": "6.1.0",
     "emojibase-data": "7.0.1",
     "emojibase-regex": "6.0.1",
+    "enzyme": "3.11.0",
+    "enzyme-adapter-react-16": "1.15.6",
     "eslint": "7.32.0",
     "eslint-config-airbnb": "18.2.1",
     "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-jest": "25.3.2",
     "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-testing-library": "5.0.1",
     "framer-motion": "4.1.17",
     "history": "5.3.0",
     "husky": "7.0.4",
     "i18next": "19.4.5",
+    "jest": "26.6.0",
     "klona": "2.0.4",
     "konva": "6.0.0",
     "lint-staged": "11.1.2",
@@ -133,18 +150,18 @@
     "luxon": "1.26.0",
     "moment": "2.29.1",
     "prettier": "2.5.1",
-    "react": "17.0.2",
+    "react": "16.14.0",
     "react-bootstrap": "1.6.1",
     "react-color": "2.19.3",
     "react-copy-to-clipboard": "5.0.3",
     "react-date-range": "^1.4.0",
-    "react-dom": "17.0.2",
+    "react-dom": "16.14.0",
     "react-email-editor": "1.6.1",
     "react-highlighter": "0.4.3",
     "react-hook-form": "7.13.0",
     "react-i18next": "11.8.8",
     "react-intl": "5.15.8",
-    "react-konva": "^17.0.2-6",
+    "react-konva": "16.13.0-6",
     "react-loader": "2.4.7",
     "react-loading-skeleton": "^3.3.1",
     "react-overlays": "4.1.1",
@@ -169,6 +186,7 @@
     "sass": "1.32.8",
     "sass-loader": "10.1.1",
     "style-loader": "2.0.0",
+    "ts-jest": "26.5.2",
     "twemoji-parser": "14.0.0",
     "typescript": "4.9.5",
     "url-loader": "4.1.1",
@@ -176,17 +194,24 @@
   },
   "resolutions": {
     "@types/react": "17.0.2",
-    "@types/react-dom": "17.0.2"
+    "@types/react-dom": "17.0.1"
+  },
+  "jest": {
+    "setupFilesAfterEnv": [
+      "./jest.config.js"
+    ],
+    "snapshotSerializers": [
+      "enzyme-to-json/serializer"
+    ]
   },
   "lint-staged": {
     "*.{ts,tsx}": [
+      "yarn test-staged",
       "yarn prettier-write",
       "yarn lint:fix"
     ]
   },
   "devDependencies": {
-    "@types/react": "17.0.2",
-    "@types/react-dom": "17.0.2",
     "identity-obj-proxy": "^3.0.0"
   },
   "volta": {

package/src/date-time-button/DateTimeButton.stories.tsx

@@ -8,7 +8,7 @@ export default {
   component: DateTimeButton,
 } as Meta;
 
-const date = DateTime.now().plus({ hour: 1 });
+const date = DateTime.now();
 
 export const Default: Story<DateTimeButtonProps> = (args) => {
   return <DateTimeButton {...args} />;
@@ -19,7 +19,6 @@ Default.args = {
   isSelected: false,
   isDisabled: false,
   onSelect: () => null,
-  shouldCalculateResources: false,
 };
 
 export const Selected: Story<DateTimeButtonProps> = (args) => {

package/src/date-time-button/DateTimeButton.tsx

@@ -46,7 +46,7 @@ export const DateTimeButton = ({
 
   const isTimeVariant = variant === Variant.time;
 
-  const isPast = variant === Variant.time ? isPastTime(date) : isPastDate(date);
+  const isTimeInPast = isTimeVariant && isDateInPast(date);
 
   const noResources =
     shouldCalculateResources &&
@@ -55,7 +55,7 @@ export const DateTimeButton = ({
       !has(resources, "bookedResources") ||
       !has(resources, "totalResources"));
 
-  const isDisabled = _isDisabled || isSoldOut || isPast || noResources;
+  const isDisabled = _isDisabled || isSoldOut || isTimeInPast || noResources;
 
   return (
     <button
@@ -85,7 +85,7 @@ export const DateTimeButton = ({
       {showResources && resources && (
         <AvailabilityIndicator
           resources={resources}
-          isUnavailable={_isDisabled || isPast}
+          isUnavailable={_isDisabled || isTimeInPast}
           isSoldOut={isSoldOut}
         />
       )}
@@ -93,7 +93,5 @@ export const DateTimeButton = ({
   );
 };
 
-const isPastTime = (date: DateTime): boolean => DateTime.now() > date;
-
-const isPastDate = (date: DateTime): boolean =>
-  DateTime.now() > date.set({ hour: 23, minute: 59, second: 59 });
+const isDateInPast = (date: DateTime): boolean =>
+  date.toUTC() <= DateTime.now().toUTC();

package/src/events/edit-event-modal/component/EditEventForm/EditEventForm.tsx

@@ -19,7 +19,6 @@ import { scrollToError } from "@licklist/plugins/dist/utils/ScrollUtils";
 import { getFirstErrorKey } from "@licklist/plugins/dist/utils/FormValues";
 
 import { ProductSet } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { CategoryGroup } from "../../../../types/categories";
 import { SaleDeadline } from "../SaleDeadline/SaleDeadline";
 import {
@@ -65,7 +64,6 @@ export interface EditEventFormProps extends HasPermissionProp {
   createProductSet: (props: EditEventFormValues) => void;
   setEditProductSetId: (value: string) => void;
   isExternalPaymentLinkEnabled?: boolean;
-  workHours: WorkHour[] | undefined;
 }
 
 const eventImageTypes = {
@@ -85,7 +83,6 @@ export const EditEventForm = ({
   createProductSet,
   setEditProductSetId,
   isExternalPaymentLinkEnabled,
-  workHours,
 }: EditEventFormProps) => {
   const { t } = useTranslation(["Design", "Validation"]);
 
@@ -406,7 +403,6 @@ export const EditEventForm = ({
             setEditProductSetId={setEditProductSetId}
             setShowEditProductSet={setShowEditProductSet}
             showEditProductSet={showEditProductSet}
-            workHours={workHours}
           />
 
           {hasPermission && !showEditProductSet && (

package/src/events/edit-event-modal/component/SelectEventProductSet/SelectEventProductSet.tsx

@@ -5,7 +5,6 @@ import { useId } from "@react-aria/utils";
 import { Controller, useFormContext } from "react-hook-form";
 import { HasPermissionProp } from "@licklist/plugins/dist/types/permission/Permission";
 import { ProductSet } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { ConfirmModal } from "../../../../modals/confirmation/ConfirmModal";
 import { EditEventFormValues } from "../EditEventForm/EditEventForm";
 import { EditEventProductSet } from "./component/EditEventProductSet";
@@ -16,7 +15,6 @@ interface SelectEventProductSetProps extends HasPermissionProp {
   setShowEditProductSet: (value: boolean) => void;
   createProductSet: (props: EditEventFormValues) => void;
   setEditProductSetId: (value: string) => void;
-  workHours: WorkHour[] | undefined;
 }
 
 export const SelectEventProductSet = ({
@@ -25,7 +23,6 @@ export const SelectEventProductSet = ({
   setEditProductSetId,
   showEditProductSet,
   setShowEditProductSet,
-  workHours,
 }: SelectEventProductSetProps) => {
   const { t } = useTranslation(["Design"]);
   const form = useFormContext<EditEventFormValues>();
@@ -202,13 +199,14 @@ export const SelectEventProductSet = ({
         </Form.Group>
       </div>
       {showEditProductSet && productSetId && (
-        <EditEventProductSet
-          onSubmit={onSubmit}
-          defaultValues={
-            productSetId === editedProductSet?.id && editedProductSet
-          }
-          workHours={workHours}
-        />
+        <>
+          <EditEventProductSet
+            onSubmit={onSubmit}
+            defaultValues={
+              productSetId === editedProductSet?.id && editedProductSet
+            }
+          />
+        </>
       )}
     </>
   );

package/src/events/edit-event-modal/component/SelectEventProductSet/component/EditEventProductSet.tsx

@@ -5,7 +5,6 @@ import { isEqual } from "lodash";
 import { useParams } from "react-router-dom";
 import { useEventEditProductSetContext } from "@licklist/plugins/dist/context/event/EventEditProductSetContext";
 import { useTranslation } from "react-i18next";
-import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
 import { BlockLoader } from "../../../../../static/loader/BlockLoader";
 import { ProductSetControl } from "../../../../../product-set";
 import { ProductSetContextProvider } from "../../../../../product-set/form/context";
@@ -23,13 +22,11 @@ export interface EventDates {
 interface EditEventProductSetProps {
   onSubmit: (value: EditEventFormValues["editedProductSet"]) => void;
   defaultValues?: EditEventFormValues["editedProductSet"];
-  workHours: WorkHour[] | undefined;
 }
 
 export const EditEventProductSet = ({
   onSubmit,
   defaultValues,
-  workHours,
 }: EditEventProductSetProps) => {
   const { companyId } = useParams<{
     companyId: string;
@@ -127,7 +124,6 @@ export const EditEventProductSet = ({
             companyName={selectedCompany?.title}
             fee={feeInPercent}
             isEventEditProductSet
-            workHours={workHours}
           />
           <Button
             disabled={isLoading}

package/src/iframe/payment/order-items-table/utils/paymentSummary.tsx

@@ -63,7 +63,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
-
+  const totalWithDiscount = total - Number(totalDiscount);
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,
@@ -74,7 +74,7 @@ const processedPaymentSummary = ({
   if (totalDiscount) {
     summaryItems.push({
       translateKey: AMOUNT_WITH_DISCOUNT,
-      price: order.totalToPayAmount,
+      price: totalWithDiscount < 0 ? 0 : totalWithDiscount,
     });
   }
 
@@ -84,17 +84,17 @@ const processedPaymentSummary = ({
 
   summaryItems.push({
     translateKey: TOTAL_PAID,
-    price: order.paidAmount,
+    price: totalWithDiscount <= 0 ? 0 : order.totalAmount,
   });
-  if (order.totalToPayAmount <= 0) {
+  if (totalWithDiscount <= 0) {
     return summaryItems;
   }
   summaryItems = [...summaryItems, ...externalPaymentDetail];
 
-  if (order.remainingToPay) {
+  if (totalWithDiscount > order.totalAmount) {
     summaryItems.push({
       translateKey: REMAINING_TO_PAY,
-      price: order.remainingToPay,
+      price: totalWithDiscount - order.totalAmount,
     });
   }
   return summaryItems;

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

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { Modifier } from "@popperjs/core";
 import { useId } from "@react-aria/utils";
 import { Form, OverlayTrigger, Popover } from "react-bootstrap";
-import { useFieldArray, useFormContext, useWatch } from "react-hook-form";
+import { useFieldArray, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useClickAway } from "react-use";
 import { DateTime } from "luxon";
@@ -14,6 +14,7 @@ import {
   SortableContext,
   verticalListSortingStrategy,
 } from "@dnd-kit/sortable";
+
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
 import { CONFIRM_MODAL_ACTIONS } from "../../modals/confirmation/ConfirmModal";
 import { Icon } from "../../static";
@@ -26,15 +27,16 @@ import {
   AvailableTimesControl,
   AvailableTimesControlRef,
 } from "../../zone/form/components/AvailableTimesControl";
-import { ProductSetControlValues } from "..";
-import {
-  getProductWithSmallestDuration,
-  getLatestAvailableDateTime,
-} from "./utils";
+
+// eslint-disable-next-line max-len
+
+export interface DateAndRecurrenceInputValues {
+  menuRecurrences?: Partial<ProductSetRecurrence>[];
+}
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours: WorkHour[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -52,9 +54,7 @@ export const DateAndRecurrenceInput = ({
     getValues,
     setValue,
     clearErrors,
-  } = useFormContext<ProductSetControlValues>();
-
-  const steps = useWatch({ control, name: "steps" });
+  } = useFormContext<DateAndRecurrenceInputValues>();
 
   const [availableTimes, setAvailableTimes] = useState<string[]>([]);
   const availableTimesFormRef = useRef<AvailableTimesControlRef>();
@@ -90,7 +90,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId();
+  const popoverId = useId()!;
 
   const { t } = useTranslation("Design");
 
@@ -101,13 +101,11 @@ export const DateAndRecurrenceInput = ({
     const isAvailableTimesFormValid =
       await availableTimesFormRef.current?.trigger();
 
-    const { availableTimes } = availableTimesFormRef.current.getValues();
-
     if (next?.startTime && next?.endTime && isAvailableTimesFormValid) {
       const startTime = DateTime.fromISO(next.startTime);
       const endTime = DateTime.fromISO(next.endTime);
-
-      const areAvailableTimesValid = availableTimes.every((time) => {
+      const { availableTimes } = availableTimesFormRef.current.getValues();
+      const validAvalilableTimes = availableTimes.every((time) => {
         const currentAvailableTime = DateTime.fromFormat(time, TIME_FORMAT);
 
         return (
@@ -115,8 +113,7 @@ export const DateAndRecurrenceInput = ({
           currentAvailableTime.diff(endTime, "minutes").minutes <= 0
         );
       });
-
-      if (!areAvailableTimesValid) {
+      if (!validAvalilableTimes) {
         availableTimesFormRef.current.setError("availableTimes", {
           message: t("Validation:fieldTimeBetween", {
             attribute: t("Design:startTimesSmall"),
@@ -129,36 +126,6 @@ export const DateAndRecurrenceInput = ({
       }
     }
 
-    // this check is required to prevent user from adding available time
-    // less than the lowest duration product, e.g. if lowest duration product
-    // is 1 hour and user tries to add time 15 minutes before end time,
-    // such time can never be booked
-    const lowestDurationProduct = getProductWithSmallestDuration(steps);
-
-    if (lowestDurationProduct) {
-      const endTime = next?.endTime
-        ? DateTime.fromFormat(next?.endTime, TIME_FORMAT)
-        : // this is to allow user to add 23:00 if end is at 23:59
-          DateTime.fromFormat("23:59", TIME_FORMAT).plus({ minutes: 1 });
-
-      const latestAvailableTime = getLatestAvailableDateTime(availableTimes);
-
-      const latestAllowedTime = endTime.minus({
-        minutes: lowestDurationProduct.duration,
-      });
-
-      if (latestAvailableTime > latestAllowedTime) {
-        availableTimesFormRef.current.setError("availableTimes", {
-          message: t("Validation:fieldTimeBefore", {
-            attribute: t("Design:timeLowercase"),
-            time: latestAllowedTime.toFormat(TIME_FORMAT),
-          }),
-        });
-
-        return;
-      }
-    }
-
     const availableTime =
       availableTimesFormRef?.current?.getValues()?.availableTimes || null;
 
@@ -261,7 +228,6 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
-                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

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

@@ -5,8 +5,9 @@ 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 { UTC_TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
+import { TIMEZONE } from "@licklist/core/dist/Config/Date";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
+import { TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import { DateTime } from "luxon";
 import RRule, { Frequency } from "rrule";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
@@ -26,6 +27,7 @@ import {
 import { ProductSetRecurrenceOverridesControl } from "./ProductSetRecurrenceOverridesControl";
 import { MAX_QUANTITY_RECURRENCE_DATE_IN_OVERRIDE } from "../product/constants";
 
+
 export interface DateAndRecurrenceInputValues {
   menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
@@ -136,7 +138,7 @@ export const DateInput = ({
       until: (start as DateTime).toJSDate(),
       byweekday: [],
       freq: Frequency.DAILY,
-      tzid: UTC_TIMEZONE,
+      tzid: TIMEZONE,
       interval: 1,
     }).replace("RRULE:", "");
 

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

@@ -2,12 +2,12 @@ import { Meta, Story } from "@storybook/react";
 import React from "react";
 import Form from "react-bootstrap/Form";
 import { FormProvider, useForm } from "react-hook-form";
-import { OPERATIONAL_COST_CUSTOMER } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
 import {
   ProductSetControl,
   ProductSetControlProps,
   ProductSetControlValues,
 } from "./ProductSetControl";
+import { OPERATIONAL_COST_CUSTOMER } from "@licklist/core/dist/DataMapper/Product/ProductSetDataMapper";
 
 export default {
   title: "Product Set/Control",

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

@@ -22,10 +22,14 @@ import { SmsTemplate } from "@licklist/core/dist/DataMapper/Notification/SmsTemp
 import HookFormService from "@licklist/plugins/dist/services/Form/HookFormService";
 import { ruleForUrlWithProtocol } from "@licklist/plugins/dist/validation/Rules/urlRule";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
-import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { WarningMessage } from "../../static";
 import { SelectItem } from "../../types/generic/SelectItem";
-import { DateAndRecurrenceInput } from "./DateAndRecurrenceInput";
+import {
+  DateAndRecurrenceInput,
+  // TODO: Show Date Component, when reccurent date bugs are fixed
+  // DateAndRecurrenceInput,
+  DateAndRecurrenceInputValues,
+} from "./DateAndRecurrenceInput";
 import TutorialGifCard from "./TutorialGifCard";
 import { Step } from "../types";
 import { StepsControl } from "../form/StepsControl";
@@ -49,7 +53,7 @@ export interface TemplateItem {
   label: string;
 }
 
-export interface ProductSetControlValues {
+export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   name: string;
   type: ProductSetType;
   termsAndConditions: string;
@@ -61,7 +65,6 @@ export interface ProductSetControlValues {
   steps: Step[];
   emailTemplates?: TemplateItem[];
   smsTemplates?: TemplateItem[];
-  menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 
 export interface ProductSetControlShared {
@@ -82,7 +85,7 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours: WorkHour[] | undefined;
+  workHours?: WorkHour[];
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
 }

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

@@ -307,7 +307,7 @@ export function ProductCategoriesControl({
         title={t("addCategory")}
         isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
+           if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />

package/src/product-set/form/ProductSetForm.stories.tsx

@@ -63,9 +63,9 @@ Default.args = {
       sort: 100,
       type: "standard",
       updatedAt: "2023-05-08T15:55:28.000+03:00",
-      defaultDuration: 30,
       zoneRecurrences: [
         {
+          availableTimes: ["10:05", "10:25", "10:45"],
           endDate: "2022-02-22",
           endTime: "22:00:00",
           id: 1,
@@ -90,6 +90,7 @@ Default.args = {
       updatedAt: "2023-05-08T15:55:28.000+03:00",
       zoneRecurrences: [
         {
+          availableTimes: ["10:05", "10:25", "10:45"],
           endDate: "2022-02-22",
           endTime: "22:00:00",
           id: 1,

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

@@ -26,16 +26,12 @@ import { checkAvailableTimesErrors, getFilteredTemplates } from "../utils";
 export interface WithIsLoading {
   isLoading: boolean;
 }
-export interface WithIdOptional {
-  id?: number;
-}
-
 export interface WithId {
   id: number;
 }
 export interface ProductSetFormValues
   extends FormValues,
-    WithIdOptional,
+    WithId,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;

package/src/product-set/hooks/useSortableTreeFunctions.ts

@@ -24,10 +24,8 @@ export const useSortableTreeFunctions = ({
   const cancelChanges = (index: number) => {
     if (isOverrides) return;
     if (!previousValue) {
-      // eslint-disable-next-line consistent-return
       return remove(index);
     }
-    // eslint-disable-next-line consistent-return
     return setValue(`${fieldName}.${index}` as const, previousValue);
   };