@licklist/design 0.66.10-dev.0 → 0.66.10-dev.3

package/dist/product-set/product-zone/ProductZoneControl.js

@@ -0,0 +1,263 @@
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import { useContext, useMemo, useEffect } from 'react';
+import { Row, Col, Form } from 'react-bootstrap';
+import { useFormContext, useWatch, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { CATEGORY_TYPE_FIXED_DURATION, CATEGORY_TYPE_GAME } from '@licklist/core/dist/DataMapper/Product/ProductCategoryDataMapper';
+import { HookFormService } from '@licklist/plugins';
+import { ProductDurationControl } from '../product/duration/ProductDurationControl.js';
+import { FormNumberInput } from '../../static/form-number-input/FormNumberInput.js';
+import { FixedDurationOptions } from '../product/fixed-duration-fields/FixedDurationOptions.js';
+import { ProductSetLoadingContext } from '../form/context.js';
+
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+var ProductZoneControl = function(param) {
+    var isOverrides = param.isOverrides, categoryType = param.categoryType, fieldNamePrefix = param.fieldNamePrefix, productZonesFieldName = param.productZonesFieldName;
+    var t = useTranslation([
+        "Design",
+        "Validation",
+        "ProductSet"
+    ]).t;
+    var _useFormContext = useFormContext(), trigger = _useFormContext.trigger, control = _useFormContext.control, setValue = _useFormContext.setValue, clearErrors = _useFormContext.clearErrors, errors = _useFormContext.formState.errors;
+    var productZones = useWatch({
+        control: control,
+        name: productZonesFieldName
+    });
+    var _useWatch = useWatch({
+        control: control,
+        name: "".concat(fieldNamePrefix)
+    }), capacity = _useWatch.capacity, zoneId = _useWatch.zoneId;
+    var disabledDuration = capacity === "0" || !capacity;
+    var _useContext = useContext(ProductSetLoadingContext), providerHasBookingManagement = _useContext.providerHasBookingManagement, _useContext_zones = _useContext.zones, zones = _useContext_zones === void 0 ? [] : _useContext_zones;
+    var currentZoneData = zones.find(function(zone) {
+        return zone.id === Number(zoneId);
+    });
+    var availableZones = useMemo(function() {
+        return zones.filter(function(zone) {
+            return !productZones.find(function(productZone) {
+                return Number(productZone.zoneId) === zone.id && productZone.zoneId !== zoneId;
+            });
+        });
+    }, [
+        zones,
+        productZones,
+        zoneId
+    ]);
+    useEffect(function() {
+        if (!disabledDuration) {
+            trigger("".concat(fieldNamePrefix, ".duration"));
+            return;
+        }
+        setValue("".concat(fieldNamePrefix, ".duration"), /* @ts-expect-error 6385 */ 0);
+        clearErrors("".concat(fieldNamePrefix, ".duration"));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        disabledDuration
+    ]);
+    var onChangeGameCapacity = function(value) {
+        if (!(currentZoneData === null || currentZoneData === void 0 ? void 0 : currentZoneData.defaultDuration)) {
+            return;
+        }
+        setValue("".concat(fieldNamePrefix, ".duration"), /* @ts-expect-error 6385 */ value * (currentZoneData === null || currentZoneData === void 0 ? void 0 : currentZoneData.defaultDuration));
+    };
+    return /*#__PURE__*/ jsxs(Fragment, {
+        children: [
+            /*#__PURE__*/ jsx(Fragment, {
+                children: /*#__PURE__*/ jsx(Row, {
+                    children: /*#__PURE__*/ jsx(Col, {
+                        children: /*#__PURE__*/ jsxs(Form.Group, {
+                            children: [
+                                /*#__PURE__*/ jsx(Form.Label, {
+                                    children: t("Design:zone")
+                                }),
+                                /*#__PURE__*/ jsx(Controller, {
+                                    control: control,
+                                    name: "".concat(fieldNamePrefix, ".zoneId"),
+                                    render: function(param) {
+                                        var field = param.field;
+                                        return /*#__PURE__*/ jsxs(Form.Control, _object_spread_props(_object_spread({
+                                            as: "select",
+                                            disabled: isOverrides,
+                                            isInvalid: HookFormService.isInvalid("".concat(fieldNamePrefix, ".zoneId"), errors)
+                                        }, field), {
+                                            children: [
+                                                /*#__PURE__*/ jsx("option", {
+                                                    value: null,
+                                                    children: t("Design:choose")
+                                                }),
+                                                availableZones.map(function(zone) {
+                                                    return /*#__PURE__*/ jsx("option", {
+                                                        value: zone.id,
+                                                        children: zone.name
+                                                    }, zone.id);
+                                                })
+                                            ]
+                                        }));
+                                    },
+                                    rules: {
+                                        required: {
+                                            value: providerHasBookingManagement,
+                                            message: t("Validation:fieldRequired", {
+                                                attribute: t("zone")
+                                            })
+                                        }
+                                    }
+                                }),
+                                /*#__PURE__*/ jsx(Form.Control.Feedback, {
+                                    type: "invalid",
+                                    children: HookFormService.getErrors("".concat(fieldNamePrefix, ".zoneId"), errors)
+                                })
+                            ]
+                        })
+                    })
+                })
+            }),
+            categoryType === CATEGORY_TYPE_FIXED_DURATION && /*#__PURE__*/ jsxs(Row, {
+                className: "align-items-start duration-capacity-container",
+                children: [
+                    /*#__PURE__*/ jsx(ProductDurationControl, {
+                        fieldNamePrefix: fieldNamePrefix,
+                        disabled: disabledDuration || isOverrides
+                    }),
+                    /*#__PURE__*/ jsx(Col, {
+                        lg: 4,
+                        md: 4,
+                        children: /*#__PURE__*/ jsx(FormNumberInput, {
+                            fieldName: "".concat(fieldNamePrefix, ".capacity"),
+                            label: t("capacity"),
+                            disabled: isOverrides,
+                            rules: {
+                                min: {
+                                    value: 0,
+                                    message: t("Validation:fieldMinNumber", {
+                                        attribute: t("capacity"),
+                                        min: 0
+                                    })
+                                }
+                            }
+                        })
+                    }),
+                    disabledDuration && /*#__PURE__*/ jsx("div", {
+                        className: "duration-hint duration-capacity-container",
+                        children: t("Design:forDurationEditing")
+                    })
+                ]
+            }),
+            categoryType === CATEGORY_TYPE_GAME && /*#__PURE__*/ jsxs(Fragment, {
+                children: [
+                    /*#__PURE__*/ jsxs(Row, {
+                        className: "align-items-start duration-capacity-container",
+                        children: [
+                            /*#__PURE__*/ jsx(Col, {
+                                lg: 4,
+                                md: 4,
+                                children: /*#__PURE__*/ jsx(FormNumberInput, {
+                                    fieldName: "".concat(fieldNamePrefix, ".capacity"),
+                                    label: t("capacity"),
+                                    onChange: onChangeGameCapacity,
+                                    disabled: isOverrides,
+                                    rules: {
+                                        min: {
+                                            value: 0,
+                                            message: t("Validation:fieldMinNumber", {
+                                                attribute: t("capacity"),
+                                                min: 1
+                                            })
+                                        }
+                                    }
+                                })
+                            }),
+                            /*#__PURE__*/ jsx(Col, {
+                                lg: 4,
+                                md: 4,
+                                children: /*#__PURE__*/ jsx(FormNumberInput, {
+                                    fieldName: "".concat(fieldNamePrefix, ".duration"),
+                                    label: t("durationMinutes"),
+                                    disabled: disabledDuration || isOverrides,
+                                    rules: {
+                                        min: {
+                                            value: 0,
+                                            message: t("Validation:fieldMinNumber", {
+                                                attribute: t("duration"),
+                                                min: 0
+                                            })
+                                        },
+                                        validate: function(val) {
+                                            if (!disabledDuration && (!val || val < 1)) {
+                                                return t("Validation:fieldRequired", {
+                                                    attribute: t("duration")
+                                                });
+                                            }
+                                            return true;
+                                        }
+                                    }
+                                })
+                            })
+                        ]
+                    }),
+                    disabledDuration && /*#__PURE__*/ jsx("div", {
+                        className: "duration-hint pl-0",
+                        children: t("Design:forDurationEditing")
+                    })
+                ]
+            }),
+            /*#__PURE__*/ jsx(FixedDurationOptions, {
+                fieldNamePrefix: fieldNamePrefix,
+                isOverrides: isOverrides
+            })
+        ]
+    });
+};
+
+export { ProductZoneControl };

package/dist/product-set/product-zone/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./ProductZoneControl";
+//# sourceMappingURL=index.d.ts.map

package/dist/product-set/product-zone/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/product-set/product-zone/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}

package/dist/product-set/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/product-set/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,UAAU,yBAAyB;IACjC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAChD,CAAC,EAAE,SAAS,CAAC;CACd;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAC1B,CAAC,EAAE,aACC,MAAM,aACN,MAAM,QAQlB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,CAAC,EAAE;;IAE7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,eACnB,aAAa,EAAE,GAAG,WAAW,EAAE,kBAC3B,YAAY,EAAE,KAC7B,YAAY,EAAE,GAAG,SAmBnB,CAAC;AAEF,eAAO,MAAM,yBAAyB,6BAInC,yBAAyB,YAuB3B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/product-set/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,UAAU,yBAAyB;IACjC,MAAM,EAAE,oBAAoB,CAAC;IAC7B,QAAQ,EAAE,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAChD,CAAC,EAAE,SAAS,CAAC;CACd;AAED,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAC1B,CAAC,EAAE,aACC,MAAM,aACN,MAAM,QAQlB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,CAAC,EAAE;;IAE7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,eACnB,aAAa,EAAE,GAAG,WAAW,EAAE,kBAC3B,YAAY,EAAE,KAC7B,YAAY,EAAE,GAAG,SAmBnB,CAAC;AAEF,eAAO,MAAM,yBAAyB,6BAInC,yBAAyB,YA0B3B,CAAC"}

package/dist/product-set/utils/index.js

@@ -1,3 +1,5 @@
+import { checkIfZoneCategory } from '@licklist/plugins';
+
 function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -113,7 +115,7 @@ var checkAvailableTimesErrors = function(param) {
     var hasError = false;
     var hasCategoryWithZone = values === null || values === void 0 ? void 0 : (_values_steps = values.steps) === null || _values_steps === void 0 ? void 0 : _values_steps.some(function(step) {
         return !!(step === null || step === void 0 ? void 0 : step.productCategories.some(function(category) {
-            return !!(category === null || category === void 0 ? void 0 : category.zoneId);
+            return checkIfZoneCategory(category.type);
         }));
     });
     if (!hasCategoryWithZone) {

package/dist/sortable-tree/SortableTreeItem.d.ts

@@ -3,6 +3,7 @@ export declare const ProductSetModalClasses: {
     readonly step: "edit-product-step";
     readonly category: "edit-product-category";
     readonly product: "edit-product";
+    readonly productZones: "edit-product-zone";
 };
 export type ProductSetModalClassesType = (typeof ProductSetModalClasses)[keyof typeof ProductSetModalClasses];
 export interface SortableTreeItemProps {
@@ -16,6 +17,7 @@ export interface SortableTreeItemProps {
     postItem?: ReactNode;
     sortableItems?: string[];
     isExpanded?: boolean;
+    shouldExpand?: boolean;
     isInvalid?: boolean;
     isIconInHeader?: boolean;
     treeLineIconColor?: string;
@@ -34,5 +36,5 @@ export interface SortableTreeItemProps {
     setIsExpanded?: () => void;
     isOverride?: boolean;
 }
-export declare function SortableTreeItem({ id, title, badge, subTitle, body, children, preItem, postItem, sortableItems, isExpanded, isInvalid, isIconInHeader, treeLineIconColor, modalLabel, modalClass, isNewAdded, onDelete, validate, cancelChanges, saveValidField, edit, secondaryBadge, setIsExpanded, isOverride, }: SortableTreeItemProps): import("react/jsx-runtime").JSX.Element;
+export declare function SortableTreeItem({ id, title, badge, subTitle, body, children, preItem, postItem, sortableItems, isExpanded, shouldExpand, isInvalid, isIconInHeader, treeLineIconColor, modalLabel, modalClass, isNewAdded, onDelete, validate, cancelChanges, saveValidField, edit, secondaryBadge, setIsExpanded, isOverride, }: SortableTreeItemProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=SortableTreeItem.d.ts.map

package/dist/sortable-tree/SortableTreeItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SortableTreeItem.d.ts","sourceRoot":"","sources":["../../src/sortable-tree/SortableTreeItem.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoC,MAAM,OAAO,CAAC;AAiBpE,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAC;AAEX,MAAM,MAAM,0BAA0B,GACpC,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,OAAO,sBAAsB,CAAC,CAAC;AAEvE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,0BAA0B,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,cAAc,CAAC,EAAE;QACf,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAkB,EAClB,SAAiB,EACjB,cAAqB,EACrB,iBAAsB,EACtB,UAAe,EACf,UAAU,EACV,UAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,cAAc,EACd,IAAI,EACJ,cAAc,EACd,aAAa,EACb,UAAU,GACX,EAAE,qBAAqB,2CAgTvB"}
+{"version":3,"file":"SortableTreeItem.d.ts","sourceRoot":"","sources":["../../src/sortable-tree/SortableTreeItem.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoC,MAAM,OAAO,CAAC;AAiBpE,eAAO,MAAM,sBAAsB;;;;;CAKzB,CAAC;AAEX,MAAM,MAAM,0BAA0B,GACpC,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,OAAO,sBAAsB,CAAC,CAAC;AAEvE,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,0BAA0B,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,cAAc,CAAC,EAAE;QACf,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,EAAE,EACF,KAAK,EACL,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAkB,EAClB,YAAmB,EACnB,SAAiB,EACjB,cAAqB,EACrB,iBAAsB,EACtB,UAAe,EACf,UAAU,EACV,UAAkB,EAClB,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,cAAc,EACd,IAAI,EACJ,cAAc,EACd,aAAa,EACb,UAAU,GACX,EAAE,qBAAqB,2CA2TvB"}

package/dist/sortable-tree/SortableTreeItem.js

@@ -236,10 +236,11 @@ var DRAG_RADIUS_LIMIT = 5;
 var ProductSetModalClasses = {
     step: "edit-product-step",
     category: "edit-product-category",
-    product: "edit-product"
+    product: "edit-product",
+    productZones: "edit-product-zone"
 };
 function SortableTreeItem(param) {
-    var id = param.id, title = param.title, badge = param.badge, subTitle = param.subTitle, body = param.body, children = param.children, preItem = param.preItem, postItem = param.postItem, sortableItems = param.sortableItems, _param_isExpanded = param.isExpanded, isExpanded = _param_isExpanded === void 0 ? false : _param_isExpanded, _param_isInvalid = param.isInvalid, isInvalid = _param_isInvalid === void 0 ? false : _param_isInvalid, _param_isIconInHeader = param.isIconInHeader, isIconInHeader = _param_isIconInHeader === void 0 ? true : _param_isIconInHeader, _param_treeLineIconColor = param.treeLineIconColor, treeLineIconColor = _param_treeLineIconColor === void 0 ? "" : _param_treeLineIconColor, _param_modalLabel = param.modalLabel, modalLabel = _param_modalLabel === void 0 ? "" : _param_modalLabel, modalClass = param.modalClass, _param_isNewAdded = param.isNewAdded, isNewAdded = _param_isNewAdded === void 0 ? false : _param_isNewAdded, onDelete = param.onDelete, validate = param.validate, cancelChanges = param.cancelChanges, saveValidField = param.saveValidField, edit = param.edit, secondaryBadge = param.secondaryBadge, setIsExpanded = param.setIsExpanded, isOverride = param.isOverride;
+    var id = param.id, title = param.title, badge = param.badge, subTitle = param.subTitle, body = param.body, children = param.children, preItem = param.preItem, postItem = param.postItem, sortableItems = param.sortableItems, _param_isExpanded = param.isExpanded, isExpanded = _param_isExpanded === void 0 ? false : _param_isExpanded, _param_shouldExpand = param.shouldExpand, shouldExpand = _param_shouldExpand === void 0 ? true : _param_shouldExpand, _param_isInvalid = param.isInvalid, isInvalid = _param_isInvalid === void 0 ? false : _param_isInvalid, _param_isIconInHeader = param.isIconInHeader, isIconInHeader = _param_isIconInHeader === void 0 ? true : _param_isIconInHeader, _param_treeLineIconColor = param.treeLineIconColor, treeLineIconColor = _param_treeLineIconColor === void 0 ? "" : _param_treeLineIconColor, _param_modalLabel = param.modalLabel, modalLabel = _param_modalLabel === void 0 ? "" : _param_modalLabel, modalClass = param.modalClass, _param_isNewAdded = param.isNewAdded, isNewAdded = _param_isNewAdded === void 0 ? false : _param_isNewAdded, onDelete = param.onDelete, validate = param.validate, cancelChanges = param.cancelChanges, saveValidField = param.saveValidField, edit = param.edit, secondaryBadge = param.secondaryBadge, setIsExpanded = param.setIsExpanded, isOverride = param.isOverride;
     var _useState = _sliced_to_array(useState(isExpanded), 2), expanded = _useState[0], setExpanded = _useState[1];
     var _useState1 = _sliced_to_array(useState(isNewAdded), 2), isModalVisible = _useState1[0], setIsModalVisible = _useState1[1];
     var t = useTranslation("Design").t;
@@ -252,9 +253,12 @@ function SortableTreeItem(param) {
     }), 2), position = _useState2[0], setPosition = _useState2[1];
     var _useDraggable = useDraggable({
         id: id,
-        disabled: isOverride
+        disabled: isOverride || !shouldExpand
     }), isDragging = _useDraggable.isDragging, dragAttributes = _useDraggable.attributes, dragListeners = _useDraggable.listeners, setDragNodeRef = _useDraggable.setNodeRef, dragTransform = _useDraggable.transform;
     var onHandleExpand = useCallback(function(event) {
+        if (!shouldExpand) {
+            return;
+        }
         var deltaX = event.pageX - position.pageX;
         var deltaY = event.pageY - position.pageY;
         var euclidean = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
@@ -270,15 +274,21 @@ function SortableTreeItem(param) {
         });
     }, [
         position,
+        shouldExpand,
         setIsExpanded
     ]);
     var isVisibleDeleteButton = Boolean(onDelete) && !isOverride;
     var onButtonMouseDown = useCallback(function(event) {
+        if (!shouldExpand) {
+            return;
+        }
         setPosition({
             pageX: event.pageX,
             pageY: event.pageY
         });
-    }, []);
+    }, [
+        shouldExpand
+    ]);
     var onHide = function() {
         var _ref = _async_to_generator(function() {
             var success;
@@ -356,7 +366,7 @@ function SortableTreeItem(param) {
                 opacity: isDragging ? 0.7 : 1
             } : null,
             children: [
-                /*#__PURE__*/ jsxs("div", {
+                shouldExpand && /*#__PURE__*/ jsxs("div", {
                     className: "sortable-tree-line",
                     children: [
                         /*#__PURE__*/ jsx(Button, {

package/dist/styles/product-set/CreateProductSetItem.scss

@@ -17,6 +17,14 @@ $product-set-item-hover-bg-color: #d9efff !default;
   }
 }
 
+.product-set-item-wrapper-zone {
+  color:#84269B;
+  background-color: rgba($color: #84269B, $alpha: 0.1);
+  .product-set-item-icon {
+    background-color: #84269B;
+  }
+}
+
 .product-set-item-wrapper-category {
   color: #1A93AA;
   background-color: rgba($color: #1A93AA, $alpha: 0.1);

package/dist/styles/product-set/EditZoneSettingModal.scss

@@ -0,0 +1,16 @@
+.edit-right-form-modal.edit-product-zone {
+    padding: 0;
+    .top-label-container {
+      background-color: #EFE9F5;
+      span {
+        color:#84269B;
+      }
+    }
+    @include media-breakpoint-down(sm) {
+      top: 5%;
+      .step-save-btn {
+        margin-top: 1rem;
+        width: 100%;
+      }
+    }
+  }

package/dist/styles/product-set/ProductSetForm.scss

@@ -50,7 +50,7 @@
 
   .step-badge,
   .category-badge,
-  .product-badge {
+  .product-badge  {
     font-size: 0.875rem;
     font-weight: 600;
   }
@@ -67,6 +67,8 @@
     background-color: #e9f5ea;
     color: #269b36;
   }
+
+
 }
 
 .product-set-mobile-footer {
@@ -174,3 +176,14 @@
     }
   }
 }
+
+
+.sortable-tree-item-toggle {
+
+  .product-zone-badge {
+    background-color: #EFE9F5;
+    color:#84269B;
+    font-size: 0.875rem;
+    font-weight: 600;
+  }
+}

package/dist/styles/product-set/_index.scss

@@ -10,4 +10,5 @@
 @import "./EditCategoryModal.scss";
 @import "./EditProductModal.scss";
 @import "./EditVenueMapSetModal";
-@import './SelectCategoryModal.scss'
+@import './SelectCategoryModal.scss';
+@import "./EditZoneSettingModal.scss"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.66.10-dev.0",
+  "version": "0.66.10-dev.3",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/auth/Login/LoginComponent.tsx

@@ -44,7 +44,7 @@ const LoginComponent = ({
   const handleError = (error: any) => {
     notification.danger({
       title: "Error",
-      message: error.message,
+      message: error?.response?.data?.message || error.message,
     });
   };
 

package/src/events/edit-event-modal/utils/getDefaultProductSet.ts

@@ -33,15 +33,13 @@ export const getDefaultValues = (
         productCategories?.map(({ products, ...productCategory }) => ({
           ...productCategory,
           products:
-            products?.map(({ zoneId, subProducts, ...product }) => ({
+            products?.map(({ subProducts, ...product }) => ({
               ...product,
-              subProducts: subProducts?.map(({ zoneId, ...subProducts }) => ({
+              subProducts: subProducts?.map(({ ...subProducts }) => ({
                 ...subProducts,
                 productCategoryId: undefined,
-                zoneId,
               })),
               productCategoryId: undefined,
-              zoneId,
             })) ?? [],
         })) ?? [],
       venueMapSetId: step?.venueMapSet ? step?.venueMapSet?.id : null,

package/src/layout/DropDown.tsx

@@ -1,4 +1,4 @@
-import { forwardRef } from "react";
+import React, { forwardRef } from "react";
 
 interface Props {
   children?: React.ReactNode | React.ReactNode[];

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

@@ -21,6 +21,7 @@ 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 { checkIfZoneCategory } from "@licklist/plugins";
 import { WarningMessage } from "../../static";
 import { SelectItem } from "../../types/generic/SelectItem";
 import {
@@ -127,7 +128,7 @@ export function ProductSetControl({
   const showDateSelector = !isEventEditProductSet && isOverrides;
 
   const isZoneAdded = steps?.some(({ productCategories }) =>
-    productCategories?.some(({ zoneId }) => zoneId),
+    productCategories?.some((category) => checkIfZoneCategory(category?.type)),
   );
 
   return (

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

@@ -61,7 +61,6 @@ const getCategoryDefaultValue = (
   isReusable: false,
   hasSubEvents: false,
   products: [],
-  zoneId: null,
   sort,
 });
 
@@ -77,7 +76,6 @@ export function ProductCategoriesControl({
     providerHasMap,
     expandedProductCategories,
     setExpandedProductCategories,
-    zones,
   } = useContext(ProductSetLoadingContext);
   const form = useFormContext<ProductSetFormValues>();
   const [isSelectCategoryVisible, setIsSelectCategoryVisible] = useState(false);
@@ -307,7 +305,6 @@ export function ProductCategoriesControl({
                     quantityType={productCategory.quantityType}
                     hasTicket={productCategory?.hasTicket}
                     stepIndex={stepIndex}
-                    zones={zones}
                     productCategoryIndex={index}
                     categoryType={productCategory.type}
                     isOverrides={isOverrides}