@licklist/design 0.63.2 → 0.63.3-dev.0

package/dist/zone/form/components/ZoneControl.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),t=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,o=require("react-bootstrap"),n=require("./NameControl.js"),l=require("./ZoneTypeControl.js"),a=require("./SortControl.js"),i=require("./ZoneRecurrencesControl.js"),m=require("./DescriptionControl.js"),s=require("./ZoneImageControl.js"),c=require("./GameDurationControl.js");exports.ZoneControl=function(e){var r=e.isLoading;return t.createElement(o.Row,null,t.createElement(o.Col,{md:6,sm:12,className:"pr-5"},t.createElement(n.NameControl,{isLoading:r}),t.createElement(i.ZoneRecurrencesControl,null),t.createElement("hr",null),t.createElement(o.Row,null,t.createElement(o.Col,{md:6,sm:6},t.createElement(l.ZoneTypeControl,{isLoading:r}),t.createElement(a.SortControl,{isLoading:r}),t.createElement(c.GameDurationControl,{isLoading:r})),t.createElement(o.Col,{md:6,sm:6},t.createElement(s.ZoneImageControl,{isLoading:r}))),t.createElement("hr",null),t.createElement(o.Row,null,t.createElement(o.Col,{md:12,sm:12},t.createElement(m.DescriptionControl,{isLoading:r})))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("react"),o=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,t=require("react-bootstrap"),n=require("./NameControl.js"),l=require("./ZoneTypeControl.js"),a=require("./SortControl.js"),i=require("./ZoneRecurrencesControl.js"),s=require("./DescriptionControl.js"),m=require("./ZoneImageControl.js"),c=require("./GameDurationControl.js");exports.ZoneControl=function(e){var r=e.isLoading,u=e.workHours;return o.createElement(t.Row,null,o.createElement(t.Col,{md:6,sm:12,className:"pr-5"},o.createElement(n.NameControl,{isLoading:r}),o.createElement(i.ZoneRecurrencesControl,{workHours:u}),o.createElement("hr",null),o.createElement(t.Row,null,o.createElement(t.Col,{md:6,sm:6},o.createElement(l.ZoneTypeControl,{isLoading:r}),o.createElement(a.SortControl,{isLoading:r}),o.createElement(c.GameDurationControl,{isLoading:r})),o.createElement(t.Col,{md:6,sm:6},o.createElement(m.ZoneImageControl,{isLoading:r}))),o.createElement("hr",null),o.createElement(t.Row,null,o.createElement(t.Col,{md:12,sm:12},o.createElement(s.DescriptionControl,{isLoading:r})))))};

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts

@@ -4,9 +4,9 @@ import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMa
 export interface DateAndRecurrenceInputValues {
     zoneRecurrences?: Partial<ZoneRecurrence>[];
 }
-export type ZoneRecurrenceControlProps = {
-    workHours?: WorkHour[];
-    isLoading?: boolean;
+type ZoneRecurrenceControlProps = {
+    workHours: WorkHour[] | undefined;
 };
-export declare const ZoneRecurrencesControl: () => JSX.Element;
+export declare const ZoneRecurrencesControl: ({ workHours, }: ZoneRecurrenceControlProps) => JSX.Element;
+export {};
 //# sourceMappingURL=ZoneRecurrencesControl.d.ts.map

package/dist/zone/form/components/ZoneRecurrencesControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,sBAAsB,mBAsMlC,CAAC"}
+{"version":3,"file":"ZoneRecurrencesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/ZoneRecurrencesControl.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAWtF,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;CAC7C;AAED,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,mBAEhC,0BAA0B,gBAuM5B,CAAC"}

package/dist/zone/form/components/ZoneRecurrencesControl.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("tslib"),t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,i=require("react-i18next"),o=require("react-bootstrap"),a=require("../../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),c=require("react-use");require("../../../static/index.js");var d=require("@dnd-kit/core"),s=require("@dnd-kit/sortable"),m=require("../../../modals/confirmation/ConfirmModal.js"),v=require("../../../recurring-date-picker-input/RecurringDatePickerInput.js"),f=require("../../../product-set/control/DateAndRecurrenceInput.js"),p=require("./ZoneRecurrenceControl.js");exports.ZoneRecurrencesControl=function(){var e,g,_=u.useFormContext(),E=_.control,q=_.register,x=_.formState.errors,C=_.getValues,D=_.setValue,R=_.clearErrors,b=u.useFieldArray({name:"zoneRecurrences",control:E,keyName:"_id"}),y=b.fields,I=b.append,S=b.update,k=b.move,z=r.__read(t.useState(!1),2),N=z[0],h=z[1],j=r.__read(t.useState({index:null,values:null}),2),T=j[0],A=j[1],w=function(){return A({index:null,values:null})},F=t.useRef();c.useClickAway(F,(function(e){var r,t,n;m.CONFIRM_MODAL_ACTIONS.includes(null===(n=null===(t=null===(r=e.target)||void 0===r?void 0:r.attributes)||void 0===t?void 0:t.getNamedItem("data-id"))||void 0===n?void 0:n.value)||(h(!1),w())}));var M=l.useId(),P=i.useTranslation(["Design","Validation"]).t,O=function(){w(),h((function(e){return!e}))};return t.useEffect((function(){y.length&&R("zoneRecurrences")}),[y,R]),n.createElement(o.Form.Group,null,n.createElement(o.Form.Label,null,P("zoneAvailable")),n.createElement(o.OverlayTrigger,{show:N,overlay:n.createElement(o.Popover,{id:M,className:"rounded"},n.createElement(o.Popover.Content,{className:"shadow-lg rounded",ref:F},n.createElement(v.RecurringDatePickerInput,{defaultValues:T.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,n,i;return r.__generator(this,(function(r){return t={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime},(null===(n=T.values)||void 0===n?void 0:n.id)&&(t.id=null===(i=T.values)||void 0===i?void 0:i.id),null!==T.index?S(T.index,t):I(t),h((function(){return!1})),w(),[2]}))}))},onDelete:function(){var e=T.index;h(!1),w(),setTimeout((function(){var r=C().zoneRecurrences;D("zoneRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},setInitialStartDateAfterSelect:!0}))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[f.sameWidthPopperModifier]}},n.createElement("div",{className:"zone-recurrences"},n.createElement(d.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var n=y.findIndex((function(e){return String(e._id)===t.id})),i=y.findIndex((function(e){return String(e._id)===r.id}));k(n,i)}}},n.createElement(s.SortableContext,{items:null!==(e=null==y?void 0:y.map((function(e){return String(e._id)})))&&void 0!==e?e:[],strategy:s.verticalListSortingStrategy},null==y?void 0:y.map((function(e,r){return n.createElement(p.ZoneRecurrenceControl,{key:e._id,zoneRecurrence:e,onEdit:function(){return function(e,r){w(),A({index:r,values:e}),h((function(){return!0}))}(e,r)}})})))),n.createElement("div",{className:"zone-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:O,onKeyDown:O},n.createElement(a.default,{type:"plus-circle",height:"1rem",className:"zone-recurrence-icon-add mr-2"}),P("addDates")),n.createElement(o.Form.Control,r.__assign({type:"hidden"},q("zoneRecurrences",{required:{value:!0,message:P("Validation:fieldMinNumber",{attribute:P("dates"),min:1})}}))),n.createElement("div",{className:"manual-form-error"},null===(g=x.zoneRecurrences)||void 0===g?void 0:g.message))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("tslib"),t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,i=require("react-i18next"),o=require("react-bootstrap"),a=require("../../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),c=require("react-use");require("../../../static/index.js");var d=require("@dnd-kit/core"),s=require("@dnd-kit/sortable"),m=require("../../../modals/confirmation/ConfirmModal.js"),v=require("../../../recurring-date-picker-input/RecurringDatePickerInput.js"),f=require("../../../product-set/control/DateAndRecurrenceInput.js"),p=require("./ZoneRecurrenceControl.js");exports.ZoneRecurrencesControl=function(e){var g,_,E=e.workHours,q=u.useFormContext(),x=q.control,C=q.register,D=q.formState.errors,R=q.getValues,b=q.setValue,k=q.clearErrors,y=u.useFieldArray({name:"zoneRecurrences",control:x,keyName:"_id"}),I=y.fields,S=y.append,z=y.update,N=y.move,h=r.__read(t.useState(!1),2),j=h[0],w=h[1],T=r.__read(t.useState({index:null,values:null}),2),A=T[0],F=T[1],M=function(){return F({index:null,values:null})},P=t.useRef();c.useClickAway(P,(function(e){var r,t,n;m.CONFIRM_MODAL_ACTIONS.includes(null===(n=null===(t=null===(r=e.target)||void 0===r?void 0:r.attributes)||void 0===t?void 0:t.getNamedItem("data-id"))||void 0===n?void 0:n.value)||(w(!1),M())}));var O=l.useId(),V=i.useTranslation(["Design","Validation"]).t,L=function(){M(),w((function(e){return!e}))};return t.useEffect((function(){I.length&&k("zoneRecurrences")}),[I,k]),n.createElement(o.Form.Group,null,n.createElement(o.Form.Label,null,V("zoneAvailable")),n.createElement(o.OverlayTrigger,{show:j,overlay:n.createElement(o.Popover,{id:O,className:"rounded"},n.createElement(o.Popover.Content,{className:"shadow-lg rounded",ref:P},n.createElement(v.RecurringDatePickerInput,{defaultValues:A.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,n,i;return r.__generator(this,(function(r){return t={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime},(null===(n=A.values)||void 0===n?void 0:n.id)&&(t.id=null===(i=A.values)||void 0===i?void 0:i.id),null!==A.index?z(A.index,t):S(t),w((function(){return!1})),M(),[2]}))}))},onDelete:function(){var e=A.index;w(!1),M(),setTimeout((function(){var r=R().zoneRecurrences;b("zoneRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},setInitialStartDateAfterSelect:!0,workHours:E}))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[f.sameWidthPopperModifier]}},n.createElement("div",{className:"zone-recurrences"},n.createElement(d.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var n=I.findIndex((function(e){return String(e._id)===t.id})),i=I.findIndex((function(e){return String(e._id)===r.id}));N(n,i)}}},n.createElement(s.SortableContext,{items:null!==(g=null==I?void 0:I.map((function(e){return String(e._id)})))&&void 0!==g?g:[],strategy:s.verticalListSortingStrategy},null==I?void 0:I.map((function(e,r){return n.createElement(p.ZoneRecurrenceControl,{key:e._id,zoneRecurrence:e,onEdit:function(){return function(e,r){M(),F({index:r,values:e}),w((function(){return!0}))}(e,r)}})})))),n.createElement("div",{className:"zone-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:L,onKeyDown:L},n.createElement(a.default,{type:"plus-circle",height:"1rem",className:"zone-recurrence-icon-add mr-2"}),V("addDates")),n.createElement(o.Form.Control,r.__assign({type:"hidden"},C("zoneRecurrences",{required:{value:!0,message:V("Validation:fieldMinNumber",{attribute:V("dates"),min:1})}}))),n.createElement("div",{className:"manual-form-error"},null===(_=D.zoneRecurrences)||void 0===_?void 0:_.message))))};

package/dist/zone/form/utils/dates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aA0C9D,CAAC"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/utils/dates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAOtF,eAAO,MAAM,qBAAqB,cACrB,MAAM,WACR,MAAM,6BAuChB,CAAC;AAEF,eAAO,MAAM,wBAAwB,eAAgB,QAAQ,EAAE,aAyC9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.63.2",
+  "version": "0.63.3-dev.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -16,14 +16,11 @@
     "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"
@@ -53,9 +50,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",
-    "@licklist/eslint-config": "0.3.4",
-    "@licklist/plugins": "^0.27.2",
+    "@licklist/core": ">=0.25.1-dev.2 < 0.25.1",
+    "@licklist/eslint-config": "0.4.5",
+    "@licklist/plugins": ">=0.28.0-dev.3 < 0.28.0",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",
@@ -73,10 +70,6 @@
     "@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",
@@ -99,14 +92,10 @@
     "@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-date-range": "1.4.9",
     "@types/react-email-editor": "1.1.7",
     "@types/react-loader": "2.4.4",
     "@types/react-phone-number-input": "3.0.6",
@@ -116,7 +105,6 @@
     "@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",
@@ -128,21 +116,16 @@
     "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",
@@ -150,18 +133,18 @@
     "luxon": "1.26.0",
     "moment": "2.29.1",
     "prettier": "2.5.1",
-    "react": "16.14.0",
+    "react": "17.0.2",
     "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": "16.14.0",
+    "react-date-range": "1.4.0",
+    "react-dom": "17.0.2",
     "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": "16.13.0-6",
+    "react-konva": "^17.0.2-6",
     "react-loader": "2.4.7",
     "react-loading-skeleton": "^3.3.1",
     "react-overlays": "4.1.1",
@@ -186,7 +169,6 @@
     "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",
@@ -194,24 +176,17 @@
   },
   "resolutions": {
     "@types/react": "17.0.2",
-    "@types/react-dom": "17.0.1"
-  },
-  "jest": {
-    "setupFilesAfterEnv": [
-      "./jest.config.js"
-    ],
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ]
+    "@types/react-dom": "17.0.2"
   },
   "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();
+const date = DateTime.now().plus({ hour: 1 });
 
 export const Default: Story<DateTimeButtonProps> = (args) => {
   return <DateTimeButton {...args} />;
@@ -19,6 +19,7 @@ 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 isTimeInPast = isTimeVariant && isDateInPast(date);
+  const isPast = variant === Variant.time ? isPastTime(date) : isPastDate(date);
 
   const noResources =
     shouldCalculateResources &&
@@ -55,7 +55,7 @@ export const DateTimeButton = ({
       !has(resources, "bookedResources") ||
       !has(resources, "totalResources"));
 
-  const isDisabled = _isDisabled || isSoldOut || isTimeInPast || noResources;
+  const isDisabled = _isDisabled || isSoldOut || isPast || noResources;
 
   return (
     <button
@@ -85,7 +85,7 @@ export const DateTimeButton = ({
       {showResources && resources && (
         <AvailabilityIndicator
           resources={resources}
-          isUnavailable={_isDisabled || isTimeInPast}
+          isUnavailable={_isDisabled || isPast}
           isSoldOut={isSoldOut}
         />
       )}
@@ -93,5 +93,7 @@ export const DateTimeButton = ({
   );
 };
 
-const isDateInPast = (date: DateTime): boolean =>
-  date.toUTC() <= DateTime.now().toUTC();
+const isPastTime = (date: DateTime): boolean => DateTime.now() > date;
+
+const isPastDate = (date: DateTime): boolean =>
+  DateTime.now() > date.set({ hour: 23, minute: 59, second: 59 });

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

@@ -40,6 +40,10 @@ export const SelectEventProductSet = ({
   const productSetId = watch("productSetId");
   const editedProductSet = watch("editedProductSet");
 
+  const selectedProductSet = productSets.find(
+    (productSet) => productSet.id === productSetId
+  )?.parentMenuId;
+
   const onEditProductSet = useCallback(
     () => {
       setEditProductSetId(String(productSetId));
@@ -84,6 +88,9 @@ export const SelectEventProductSet = ({
     setValue("productSetId", value);
   };
 
+  const showOverrideProductSet =
+    !showEditProductSet && productSetId && !selectedProductSet;
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const onSubmit = (value: EditEventFormValues["editedProductSet"]) => {
     setShowEditProductSet(false);
@@ -159,7 +166,7 @@ export const SelectEventProductSet = ({
                           {t("addNewProductSet")}
                         </Button>
                       )}
-                      {!showEditProductSet && productSetId && (
+                      {showOverrideProductSet && (
                         <Button
                           variant=""
                           className="btn product-set-button "
@@ -199,14 +206,12 @@ export const SelectEventProductSet = ({
         </Form.Group>
       </div>
       {showEditProductSet && productSetId && (
-        <>
-          <EditEventProductSet
-            onSubmit={onSubmit}
-            defaultValues={
-              productSetId === editedProductSet?.id && editedProductSet
-            }
-          />
-        </>
+        <EditEventProductSet
+          onSubmit={onSubmit}
+          defaultValues={
+            productSetId === editedProductSet?.id && editedProductSet
+          }
+        />
       )}
     </>
   );

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

@@ -124,6 +124,8 @@ export const EditEventProductSet = ({
             companyName={selectedCompany?.title}
             fee={feeInPercent}
             isEventEditProductSet
+            isOverrides
+            workHours={undefined}
           />
           <Button
             disabled={isLoading}

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

@@ -63,6 +63,7 @@ const processedPaymentSummary = ({
   const total = calculateTotalPrice(order, externalPaymentDetail);
 
   const totalDiscount = calculateTotalDiscount(order.payments);
+
   let summaryItems: SummaryItem[] = [
     {
       translateKey: AMOUNT_TOTAL,

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

@@ -28,15 +28,13 @@ import {
   AvailableTimesControlRef,
 } from "../../zone/form/components/AvailableTimesControl";
 
-// eslint-disable-next-line max-len
-
 export interface DateAndRecurrenceInputValues {
   menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement: boolean;
   isLoading?: boolean;
 }
@@ -90,7 +88,7 @@ export const DateAndRecurrenceInput = ({
     clearEditState();
   });
 
-  const popoverId = useId()!;
+  const popoverId = useId();
 
   const { t } = useTranslation("Design");
 
@@ -228,6 +226,7 @@ export const DateAndRecurrenceInput = ({
                 defaultValues={editState.values}
                 onChange={handleRecurringDateChange}
                 onDelete={handleDelete}
+                workHours={workHours}
               >
                 {providerHasBookingManagement && (
                   <AvailableTimesControl

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

@@ -5,7 +5,7 @@ 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 { TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
+import { UTC_TIMEZONE, TIME_FORMAT } from "@licklist/core/dist/Config/Date";
 import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { DateTime } from "luxon";
 import RRule, { Frequency } from "rrule";
@@ -136,7 +136,7 @@ export const DateInput = ({
       until: (start as DateTime).toJSDate(),
       byweekday: [],
       freq: Frequency.DAILY,
-      tzid: TIMEZONE,
+      tzid: UTC_TIMEZONE,
       interval: 1,
     }).replace("RRULE:", "");
 

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

@@ -85,9 +85,10 @@ export interface ProductSetControlProps {
   fieldSets?: FieldSet[];
   showEmailTemplate?: boolean;
   showSmsTemplate?: boolean;
-  workHours?: WorkHour[];
+  workHours: WorkHour[] | undefined;
   providerHasBookingManagement?: boolean;
   isOverrides?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetControl({
@@ -104,6 +105,7 @@ export function ProductSetControl({
   workHours,
   providerHasBookingManagement = false,
   isOverrides = false,
+  isCreateNewOverrides = false,
 }: ProductSetControlProps) {
   const { t } = useTranslation(["Design", "Validation", "Notification"]);
   const {
@@ -123,7 +125,7 @@ export function ProductSetControl({
 
   const showSmsTemplateSelector = showSmsTemplate && !isOverrides;
   const showEmailTemplateSelector = showEmailTemplate && !isOverrides;
-
+  const showDateSelector = !isEventEditProductSet && isOverrides;
   return (
     <Row
       className={`product-set-form ${
@@ -165,7 +167,7 @@ export function ProductSetControl({
           </Form.Control.Feedback>
         </Form.Group>
 
-        {isOverrides ? (
+        {showDateSelector ? (
           <DateInput
             workHours={workHours}
             isLoading={isLoading}
@@ -188,7 +190,12 @@ export function ProductSetControl({
 
         <TutorialGifCard isOverrides={isOverrides} />
 
-        <StepsControl isLoading={isLoading} isOverrides={isOverrides} />
+        <StepsControl
+          isLoading={isLoading}
+          isEventEditProductSet={isEventEditProductSet}
+          isOverrides={isOverrides}
+          isCreateNewOverrides={isCreateNewOverrides}
+        />
       </Col>
       <Col md={6} sm={12}>
         <div className="second-column">

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

@@ -36,6 +36,8 @@ import { useSortableTreeFunctions } from "../hooks/useSortableTreeFunctions";
 interface ProductCategoriesControlProps extends WithIsLoading {
   stepIndex: number;
   isOverrides?: boolean;
+  isEventEditProductSet?: boolean;
+  isCreateNewOverrides?: boolean;
 }
 
 const getCategoryDefaultValue = (
@@ -67,6 +69,8 @@ export function ProductCategoriesControl({
   isLoading,
   stepIndex,
   isOverrides,
+  isEventEditProductSet,
+  isCreateNewOverrides,
 }: ProductCategoriesControlProps) {
   const { t } = useTranslation("Design");
   const {
@@ -214,6 +218,11 @@ export function ProductCategoriesControl({
             ? String(productCategory.id)
             : productCategory.uniqueId;
 
+          const isOverridesCategory = productCategory.products.some((product) =>
+            isEventEditProductSet ? !!product.id : !!product.originalProductId
+          );
+          const isNewOverridesCategory =
+            isCreateNewOverrides && !!productCategory.id;
           const onSetIsExpanded = () => {
             setIsExpanded(productCategoryId);
           };
@@ -269,7 +278,10 @@ export function ProductCategoriesControl({
                       categoryName={value}
                       stepIndex={stepIndex}
                       productCategoryIndex={index}
-                      isOverride={isOverrides}
+                      isOverride={
+                        isNewOverridesCategory ||
+                        (isOverrides && isOverridesCategory)
+                      }
                     />
                   }
                   isOverride={isOverrides}
@@ -296,6 +308,8 @@ export function ProductCategoriesControl({
                     productCategoryIndex={index}
                     categoryType={productCategory.type}
                     isOverrides={isOverrides}
+                    isEventEditProductSet={isEventEditProductSet}
+                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                 </SortableTree.Item>
               )}
@@ -305,9 +319,7 @@ export function ProductCategoriesControl({
       </SortableTree>
       <CreateProductSetItem
         title={t("addCategory")}
-        isOverride={isOverrides}
         onClick={() => {
-          if (isOverrides) return;
           setIsSelectCategoryVisible(true);
         }}
       />
@@ -316,7 +328,6 @@ export function ProductCategoriesControl({
         isVisible={isSelectCategoryVisible}
         onHide={() => setIsSelectCategoryVisible(false)}
         onCategorySelect={(categoryType) => {
-          if (isOverrides) return;
           append(getCategoryDefaultValue(categoryType, fields.length));
           setShowCategoryModal(true);
           if (

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

@@ -26,12 +26,16 @@ 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,
-    WithId,
+    WithIdOptional,
     ProductSetControlValues {
   steps: Step[];
   isOverrides?: boolean;
@@ -53,6 +57,7 @@ export interface ProductSetFormProps
   isCreateAction?: boolean;
   isOverrides?: boolean;
   workHours?: WorkHour[];
+  isCreateNewOverrides?: boolean;
 }
 
 export function ProductSetForm({
@@ -70,6 +75,7 @@ export function ProductSetForm({
   isCreateAction,
   workHours,
   isOverrides,
+  isCreateNewOverrides,
   ...shared
 }: ProductSetFormProps) {
   const { t } = useTranslation("Design");
@@ -115,7 +121,11 @@ export function ProductSetForm({
   }, [serverErrors, setError]);
 
   useEffect(() => {
-    window.history.pushState(null, "", window.location.pathname);
+    window.history.pushState(
+      null,
+      "",
+      window.location.pathname + window.location.search
+    );
     window.addEventListener("beforeunload", onBeforeUnload);
     window.addEventListener("popstate", onPopState);
 
@@ -166,6 +176,7 @@ export function ProductSetForm({
                     workHours={workHours}
                     providerHasBookingManagement={providerHasBookingManagement}
                     isOverrides={isOverrides}
+                    isCreateNewOverrides={isCreateNewOverrides}
                   />
                   <Row>
                     <Col md={6} sm={12} />