@licklist/design 0.62.3-dev.2 → 0.63.0-dev.0

package/dist/product-set/control/DateAndRecurrenceInput.d.ts

@@ -1,10 +1,6 @@
 /// <reference types="react" />
 import { Modifier } from "@popperjs/core";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
-import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
-export interface DateAndRecurrenceInputValues {
-    menuRecurrences?: Partial<ProductSetRecurrence>[];
-}
 interface DateAndRecurrenceInputProps {
     isEventEditProductSet?: boolean;
     workHours: WorkHour[] | undefined;

package/dist/product-set/control/DateAndRecurrenceInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateAndRecurrenceInput.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/DateAndRecurrenceInput.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO1C,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAC;AAuB7G,MAAM,WAAW,4BAA4B;IAC3C,eAAe,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;CACnD;AAED,UAAU,2BAA2B;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,4BAA4B,EAAE,OAAO,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,sBAAsB,mFAKhC,2BAA2B,gBAgR7B,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAC5C,WAAW,EACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxB,CAAC"}
+{"version":3,"file":"DateAndRecurrenceInput.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/DateAndRecurrenceInput.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAO1C,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AA0BtF,UAAU,2BAA2B;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,4BAA4B,EAAE,OAAO,CAAC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,sBAAsB,mFAKhC,2BAA2B,gBAmT7B,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAC5C,WAAW,EACX,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBxB,CAAC"}

package/dist/product-set/control/DateAndRecurrenceInput.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"),a=require("react-bootstrap"),o=require("../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),s=require("react-use"),d=require("luxon");require("../../static/index.js");var c=require("@dnd-kit/core"),m=require("@dnd-kit/modifiers"),v=require("@dnd-kit/sortable"),f=require("../../modals/confirmation/ConfirmModal.js"),g=require("@licklist/core/dist/Config/Date"),p=require("../../recurring-date-picker-input/RecurringDatePickerInput.js"),T=require("./ProductSetRecurrenceControl.js"),b=require("../../zone/form/components/AvailableTimesControl.js"),x={name:"sameWidth",enabled:!0,phase:"beforeWrite",requires:["computeStyles"],fn:function(e){var r=e.state,t={width:"".concat(r.rects.reference.width+4,"px"),marginLeft:"-2px",maxWidth:"unset"};Object.assign(r.styles.popper,t)},effect:function(e){var r=e.state,t=r.elements.reference.getBoundingClientRect().width,n={width:"".concat(t,"px"),maxWidth:"unset"};Object.assign(r.elements.popper.style,n)}};exports.DateAndRecurrenceInput=function(e){var E,_,R,h,q,D=e.isEventEditProductSet,S=e.providerHasBookingManagement,C=e.workHours,k=e.isLoading,y=u.useFormContext(),w=y.control,I=y.register,M=y.formState.errors,A=y.getValues,O=y.setValue,F=y.clearErrors,N=r.__read(t.useState([]),2),j=N[0],P=N[1],V=t.useRef(),L=u.useFieldArray({name:"menuRecurrences",control:w,keyName:"_id"}),W=L.fields,H=L.append,B=L.update,z=L.move,G=r.__read(t.useState(!1),2),K=G[0],J=G[1],Q=r.__read(t.useState({index:null,values:null}),2),U=Q[0],X=Q[1],Y=function(){return X({index:null,values:null})},Z=t.useRef();s.useClickAway(Z,(function(e){var r,t,n;f.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)||(J(!1),Y())}));var $=l.useId(),ee=i.useTranslation("Design").t,re=function(){Y(),J((function(e){return!e}))};return t.useEffect((function(){W.length&&F("menuRecurrences")}),[W,F]),n.createElement(a.Form.Group,null,n.createElement(a.Form.Label,null,ee(D?"whenOverridesAvailable":"productSetAvailable")),n.createElement(a.OverlayTrigger,{show:K,overlay:n.createElement(a.Popover,{id:$,className:"rounded"},n.createElement(a.Popover.Content,{className:"shadow-lg rounded",ref:Z},n.createElement(p.RecurringDatePickerInput,{defaultValues:U.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,n,i,a,o,u,l,s,c,m,v;return r.__generator(this,(function(r){switch(r.label){case 0:return[4,null===(l=V.current)||void 0===l?void 0:l.trigger()];case 1:return t=r.sent(),(null==e?void 0:e.startTime)&&(null==e?void 0:e.endTime)&&t&&(n=d.DateTime.fromISO(e.startTime),i=d.DateTime.fromISO(e.endTime),a=V.current.getValues().availableTimes,!a.every((function(e){var r=d.DateTime.fromFormat(e,g.TIME_FORMAT);return r.diff(n,"minutes").minutes>=0&&r.diff(i,"minutes").minutes<=0})))?(V.current.setError("availableTimes",{message:ee("Validation:fieldTimeBetween",{attribute:ee("Design:startTimesSmall"),min:n.toFormat(g.TIME_FORMAT),max:i.toFormat(g.TIME_FORMAT)})}),[2]):(o=(null===(c=null===(s=null==V?void 0:V.current)||void 0===s?void 0:s.getValues())||void 0===c?void 0:c.availableTimes)||null,u={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime,availableTimes:o},(null===(m=U.values)||void 0===m?void 0:m.id)&&(u.id=null===(v=U.values)||void 0===v?void 0:v.id),null!==U.index?B(U.index,u):H(u),J((function(){return!1})),Y(),[2])}}))}))},onDelete:function(){var e=U.index;J(!1),Y(),setTimeout((function(){var r=A().menuRecurrences;O("menuRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},workHours:C},S&&n.createElement(b.AvailableTimesControl,{workHours:C,isLoading:k,defaultValues:j,ref:V,errorMessage:null===(R=null===(_=null===(E=null==M?void 0:M.menuRecurrences)||void 0===E?void 0:E["".concat(null==U?void 0:U.index)])||void 0===_?void 0:_.availableTimes)||void 0===R?void 0:R.message,clearErrorMessage:function(){return F("menuRecurrences.".concat(null==U?void 0:U.index,".availableTimes"))}})))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[x]}},n.createElement("div",{className:"product-set-recurrences"},n.createElement(c.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var n=W.findIndex((function(e){return String(e._id)===t.id})),i=W.findIndex((function(e){return String(e._id)===r.id}));z(n,i)}},modifiers:[m.restrictToVerticalAxis]},n.createElement(v.SortableContext,{items:null!==(h=null==W?void 0:W.map((function(e){return String(e._id)})))&&void 0!==h?h:[],strategy:v.verticalListSortingStrategy},W.map((function(e,r){var t,i,a;return n.createElement(T.ProductSetRecurrenceControl,{key:e._id,menuRecurrence:e,onEdit:function(){return function(e,r){Y(),setTimeout((function(){X({index:r,values:e}),P(e.availableTimes||[]),J((function(){return!0}))}),100)}(e,r)},errorMessage:null===(a=null===(i=null===(t=null==M?void 0:M.menuRecurrences)||void 0===t?void 0:t["".concat(r)])||void 0===i?void 0:i.availableTimes)||void 0===a?void 0:a.message})})))),(!D||(null==W?void 0:W.length)<1)&&n.createElement("div",{className:"product-set-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:re,onKeyDown:re},n.createElement(o.default,{type:"plus-circle",height:"1rem",className:"product-set-recurrence-icon-add mr-2"}),ee("addDates")),n.createElement(a.Form.Control,r.__assign({type:"hidden"},I("menuRecurrences",{required:{value:!0,message:ee("Validation:fieldMinNumber",{attribute:ee("dates"),min:1})}}))),n.createElement("div",{className:"manual-form-error"},null===(q=M.menuRecurrences)||void 0===q?void 0:q.message))))},exports.sameWidthPopperModifier=x;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,r=require("tslib"),t=require("react"),i=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,n=require("react-i18next"),a=require("react-bootstrap"),o=require("../../static/Icon.js"),u=require("react-hook-form"),l=require("@react-aria/utils"),s=require("react-use"),d=require("luxon");require("../../static/index.js");var c=require("@dnd-kit/core"),m=require("@dnd-kit/modifiers"),v=require("@dnd-kit/sortable"),f=require("../../modals/confirmation/ConfirmModal.js"),g=require("@licklist/core/dist/Config/Date"),p=require("../../recurring-date-picker-input/RecurringDatePickerInput.js"),T=require("./ProductSetRecurrenceControl.js"),b=require("../../zone/form/components/AvailableTimesControl.js"),E=require("./utils.js"),x={name:"sameWidth",enabled:!0,phase:"beforeWrite",requires:["computeStyles"],fn:function(e){var r=e.state,t={width:"".concat(r.rects.reference.width+4,"px"),marginLeft:"-2px",maxWidth:"unset"};Object.assign(r.styles.popper,t)},effect:function(e){var r=e.state,t=r.elements.reference.getBoundingClientRect().width,i={width:"".concat(t,"px"),maxWidth:"unset"};Object.assign(r.elements.popper.style,i)}};exports.DateAndRecurrenceInput=function(e){var _,R,D,h,M,q=e.isEventEditProductSet,S=e.providerHasBookingManagement,I=e.workHours,C=e.isLoading,F=u.useFormContext(),k=F.control,w=F.register,y=F.formState.errors,A=F.getValues,O=F.setValue,j=F.clearErrors,N=u.useWatch({control:k,name:"steps"}),P=r.__read(t.useState([]),2),V=P[0],L=P[1],W=t.useRef(),B=u.useFieldArray({name:"menuRecurrences",control:k,keyName:"_id"}),H=B.fields,z=B.append,G=B.update,K=B.move,J=r.__read(t.useState(!1),2),Q=J[0],U=J[1],X=r.__read(t.useState({index:null,values:null}),2),Y=X[0],Z=X[1],$=function(){return Z({index:null,values:null})},ee=t.useRef();s.useClickAway(ee,(function(e){var r,t,i;f.CONFIRM_MODAL_ACTIONS.includes(null===(i=null===(t=null===(r=e.target)||void 0===r?void 0:r.attributes)||void 0===t?void 0:t.getNamedItem("data-id"))||void 0===i?void 0:i.value)||(U(!1),$())}));var re=l.useId(),te=n.useTranslation("Design").t,ie=function(){$(),U((function(e){return!e}))};return t.useEffect((function(){H.length&&j("menuRecurrences")}),[H,j]),i.createElement(a.Form.Group,null,i.createElement(a.Form.Label,null,te(q?"whenOverridesAvailable":"productSetAvailable")),i.createElement(a.OverlayTrigger,{show:Q,overlay:i.createElement(a.Popover,{id:re,className:"rounded"},i.createElement(a.Popover.Content,{className:"shadow-lg rounded",ref:ee},i.createElement(p.RecurringDatePickerInput,{defaultValues:Y.values,onChange:function(e){return r.__awaiter(void 0,void 0,void 0,(function(){var t,i,n,a,o,u,l,s,c,m,v,f,p,T,b;return r.__generator(this,(function(r){switch(r.label){case 0:return[4,null===(v=W.current)||void 0===v?void 0:v.trigger()];case 1:return t=r.sent(),i=W.current.getValues().availableTimes,(null==e?void 0:e.startTime)&&(null==e?void 0:e.endTime)&&t&&(n=d.DateTime.fromISO(e.startTime),a=d.DateTime.fromISO(e.endTime),!i.every((function(e){var r=d.DateTime.fromFormat(e,g.TIME_FORMAT);return r.diff(n,"minutes").minutes>=0&&r.diff(a,"minutes").minutes<=0})))?(W.current.setError("availableTimes",{message:te("Validation:fieldTimeBetween",{attribute:te("Design:startTimesSmall"),min:n.toFormat(g.TIME_FORMAT),max:a.toFormat(g.TIME_FORMAT)})}),[2]):(o=E.getProductWithSmallestDuration(N))&&(u=(null==e?void 0:e.endTime)?d.DateTime.fromFormat(null==e?void 0:e.endTime,g.TIME_FORMAT):d.DateTime.fromFormat("23:59",g.TIME_FORMAT).plus({minutes:1}),l=E.getLatestAvailableDateTime(i),s=u.minus({minutes:o.duration}),l>s)?(W.current.setError("availableTimes",{message:te("Validation:fieldTimeBefore",{attribute:te("Design:timeLowercase"),time:s.toFormat(g.TIME_FORMAT)})}),[2]):(c=(null===(p=null===(f=null==W?void 0:W.current)||void 0===f?void 0:f.getValues())||void 0===p?void 0:p.availableTimes)||null,m={rrule:e.rrule,startDate:e.startDate,endDate:e.endDate,startTime:e.startTime,endTime:e.endTime,availableTimes:c},(null===(T=Y.values)||void 0===T?void 0:T.id)&&(m.id=null===(b=Y.values)||void 0===b?void 0:b.id),null!==Y.index?G(Y.index,m):z(m),U((function(){return!1})),$(),[2])}}))}))},onDelete:function(){var e=Y.index;U(!1),$(),setTimeout((function(){var r=A().menuRecurrences;O("menuRecurrences",(void 0===r?[]:r).filter((function(r,t){return t!==e})))}),100)},workHours:I},S&&i.createElement(b.AvailableTimesControl,{workHours:I,isLoading:C,defaultValues:V,ref:W,errorMessage:null===(D=null===(R=null===(_=null==y?void 0:y.menuRecurrences)||void 0===_?void 0:_["".concat(null==Y?void 0:Y.index)])||void 0===R?void 0:R.availableTimes)||void 0===D?void 0:D.message,clearErrorMessage:function(){return j("menuRecurrences.".concat(null==Y?void 0:Y.index,".availableTimes"))}})))),trigger:"click",placement:"bottom",popperConfig:{modifiers:[x]}},i.createElement("div",{className:"product-set-recurrences"},i.createElement(c.DndContext,{onDragEnd:function(e){var r=e.over,t=e.active;if(r.id!==t.id){var i=H.findIndex((function(e){return String(e._id)===t.id})),n=H.findIndex((function(e){return String(e._id)===r.id}));K(i,n)}},modifiers:[m.restrictToVerticalAxis]},i.createElement(v.SortableContext,{items:null!==(h=null==H?void 0:H.map((function(e){return String(e._id)})))&&void 0!==h?h:[],strategy:v.verticalListSortingStrategy},H.map((function(e,r){var t,n,a;return i.createElement(T.ProductSetRecurrenceControl,{key:e._id,menuRecurrence:e,onEdit:function(){return function(e,r){$(),setTimeout((function(){Z({index:r,values:e}),L(e.availableTimes||[]),U((function(){return!0}))}),100)}(e,r)},errorMessage:null===(a=null===(n=null===(t=null==y?void 0:y.menuRecurrences)||void 0===t?void 0:t["".concat(r)])||void 0===n?void 0:n.availableTimes)||void 0===a?void 0:a.message})})))),(!q||(null==H?void 0:H.length)<1)&&i.createElement("div",{className:"product-set-recurrence-icon-wrapper",role:"button",tabIndex:0,onClick:ie,onKeyDown:ie},i.createElement(o.default,{type:"plus-circle",height:"1rem",className:"product-set-recurrence-icon-add mr-2"}),te("addDates")),i.createElement(a.Form.Control,r.__assign({type:"hidden"},w("menuRecurrences",{required:{value:!0,message:te("Validation:fieldMinNumber",{attribute:te("dates"),min:1})}}))),i.createElement("div",{className:"manual-form-error"},null===(M=y.menuRecurrences)||void 0===M?void 0:M.message))))},exports.sameWidthPopperModifier=x;

package/dist/product-set/control/ProductSetControl.d.ts

@@ -4,15 +4,15 @@ import { FieldSet } from "@licklist/core/dist/DataMapper/Order/FieldSetDataMappe
 import { EmailTemplate } from "@licklist/core/dist/DataMapper/Notification/EmailTemplateDataMapper";
 import { SmsTemplate } from "@licklist/core/dist/DataMapper/Notification/SmsTemplateDataMapper";
 import { WorkHour } from "@licklist/core/dist/DataMapper/Provider/WorkHourDataMapper";
+import { ProductSetRecurrence } from "@licklist/core/dist/DataMapper/Product/ProductSetRecurrenceDataMapper";
 import { SelectItem } from "../../types/generic/SelectItem";
-import { DateAndRecurrenceInputValues } from "./DateAndRecurrenceInput";
 import { Step } from "../types";
 export interface TemplateItem {
     id: string;
     value: EmailTemplate | SmsTemplate;
     label: string;
 }
-export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
+export interface ProductSetControlValues {
     name: string;
     type: ProductSetType;
     termsAndConditions: string;
@@ -24,6 +24,7 @@ export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
     steps: Step[];
     emailTemplates?: TemplateItem[];
     smsTemplates?: TemplateItem[];
+    menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 export interface ProductSetControlShared {
     fee?: string;

package/dist/product-set/control/ProductSetControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductSetControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/ProductSetControl.tsx"],"names":[],"mappings":";AAKA,OAAO,EAOL,mBAAmB,EACnB,cAAc,EAEd,gBAAgB,EACjB,MAAM,6DAA6D,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,yDAAyD,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAEtF,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAIL,4BAA4B,EAC7B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAgBhC,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAwB,SAAQ,4BAA4B;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,mBAAmB,CAAC;IACrC,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,iBAAiB,CAAC,EAChC,WAAW,EACX,SAAS,EACT,GAAU,EACV,SAAc,EACd,cAAmB,EACnB,YAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,4BAAoC,EACpC,WAAmB,GACpB,EAAE,sBAAsB,eAgTxB"}
+{"version":3,"file":"ProductSetControl.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/ProductSetControl.tsx"],"names":[],"mappings":";AAKA,OAAO,EAOL,mBAAmB,EACnB,cAAc,EAEd,gBAAgB,EACjB,MAAM,6DAA6D,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,yDAAyD,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qEAAqE,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,mEAAmE,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uEAAuE,CAAC;AAE7G,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAgBhC,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,aAAa,GAAG,WAAW,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,mBAAmB,CAAC;IACrC,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;CACnD;AAED,MAAM,WAAW,uBAAuB;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;IAClC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,iBAAiB,CAAC,EAChC,WAAW,EACX,SAAS,EACT,GAAU,EACV,SAAc,EACd,cAAmB,EACnB,YAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,SAAS,EACT,4BAAoC,EACpC,WAAmB,GACpB,EAAE,sBAAsB,eAgTxB"}

package/dist/product-set/control/utils.d.ts

@@ -0,0 +1,5 @@
+import { DateTime } from "luxon";
+import { Product, Step } from "../types";
+export declare const getProductWithSmallestDuration: (steps: Step[]) => Product;
+export declare const getLatestAvailableDateTime: (array: string[]) => DateTime;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/product-set/control/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAczC,eAAO,MAAM,8BAA8B,UAAW,IAAI,EAAE,KAAG,OACM,CAAC;AAEtE,eAAO,MAAM,0BAA0B,UAAW,MAAM,EAAE,KAAG,QAGxB,CAAC"}

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("@licklist/core/dist/Config"),e=require("luxon"),r=require("@licklist/plugins/dist/utils/dateTime"),i=require("@licklist/plugins/dist/utils/extractObjectWithLowestKey");exports.getLatestAvailableDateTime=function(i){return i.map((function(r){return e.DateTime.fromFormat(r,t.TIME_FORMAT)})).sort(r.dateTimesSortFn("desc"))[0]},exports.getProductWithSmallestDuration=function(t){return i.extractObjectWithLowestKey(function(t){return t.reduce((function(t,e){return t.concat(e.productCategories.reduce((function(t,e){return t.concat(e.products)}),[]))}),[])}(t),"duration")};

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

@@ -12,8 +12,6 @@ type AvailableTimesControlProps = {
     isLoading: boolean;
     workHours?: WorkHour[];
     defaultValues?: string[];
-    startTime?: string;
-    endTime?: string;
     errorMessage?: string;
     clearErrorMessage: () => void;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"AvailableTimesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/AvailableTimesControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,EAAW,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM;QAAE,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9C,QAAQ,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvD,eAAO,MAAM,qBAAqB,6GA8FjC,CAAC"}
+{"version":3,"file":"AvailableTimesControl.d.ts","sourceRoot":"","sources":["../../../../src/zone/form/components/AvailableTimesControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAKN,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,eAAe,EAAW,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,4DAA4D,CAAC;AAGtF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM;QAAE,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC9C,QAAQ,EAAE,eAAe,CAAC,kBAAkB,CAAC,CAAC;CAC/C,CAAC;AAEF,KAAK,0BAA0B,GAAG;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEvD,eAAO,MAAM,qBAAqB,6GA8FjC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.62.3-dev.2",
+  "version": "0.63.0-dev.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -50,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.0-dev.0 < 0.25.0",
+    "@licklist/core": ">=0.25.1-dev.0 < 0.25.1",
     "@licklist/eslint-config": "0.4.5",
-    "@licklist/plugins": ">=0.28.0-dev.0 < 0.28.0",
+    "@licklist/plugins": ">=0.28.0-dev.2 < 0.28.0",
     "@mdx-js/react": "1.6.22",
     "@popperjs/core": "2.11.8",
     "@react-aria/utils": "3.9.0",

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 } from "react-hook-form";
+import { useFieldArray, useFormContext, useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useClickAway } from "react-use";
 import { DateTime } from "luxon";
@@ -14,7 +14,6 @@ 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";
@@ -27,12 +26,11 @@ import {
   AvailableTimesControl,
   AvailableTimesControlRef,
 } from "../../zone/form/components/AvailableTimesControl";
-
-// eslint-disable-next-line max-len
-
-export interface DateAndRecurrenceInputValues {
-  menuRecurrences?: Partial<ProductSetRecurrence>[];
-}
+import { ProductSetControlValues } from "..";
+import {
+  getProductWithSmallestDuration,
+  getLatestAvailableDateTime,
+} from "./utils";
 
 interface DateAndRecurrenceInputProps {
   isEventEditProductSet?: boolean;
@@ -54,7 +52,9 @@ export const DateAndRecurrenceInput = ({
     getValues,
     setValue,
     clearErrors,
-  } = useFormContext<DateAndRecurrenceInputValues>();
+  } = useFormContext<ProductSetControlValues>();
+
+  const steps = useWatch({ control, name: "steps" });
 
   const [availableTimes, setAvailableTimes] = useState<string[]>([]);
   const availableTimesFormRef = useRef<AvailableTimesControlRef>();
@@ -101,11 +101,13 @@ 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 { availableTimes } = availableTimesFormRef.current.getValues();
-      const validAvalilableTimes = availableTimes.every((time) => {
+
+      const areAvailableTimesValid = availableTimes.every((time) => {
         const currentAvailableTime = DateTime.fromFormat(time, TIME_FORMAT);
 
         return (
@@ -113,7 +115,8 @@ export const DateAndRecurrenceInput = ({
           currentAvailableTime.diff(endTime, "minutes").minutes <= 0
         );
       });
-      if (!validAvalilableTimes) {
+
+      if (!areAvailableTimesValid) {
         availableTimesFormRef.current.setError("availableTimes", {
           message: t("Validation:fieldTimeBetween", {
             attribute: t("Design:startTimesSmall"),
@@ -126,6 +129,36 @@ 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;
 

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,14 +22,10 @@ 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,
-  // TODO: Show Date Component, when reccurent date bugs are fixed
-  // DateAndRecurrenceInput,
-  DateAndRecurrenceInputValues,
-} from "./DateAndRecurrenceInput";
+import { DateAndRecurrenceInput } from "./DateAndRecurrenceInput";
 import TutorialGifCard from "./TutorialGifCard";
 import { Step } from "../types";
 import { StepsControl } from "../form/StepsControl";
@@ -53,7 +49,7 @@ export interface TemplateItem {
   label: string;
 }
 
-export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
+export interface ProductSetControlValues {
   name: string;
   type: ProductSetType;
   termsAndConditions: string;
@@ -65,6 +61,7 @@ export interface ProductSetControlValues extends DateAndRecurrenceInputValues {
   steps: Step[];
   emailTemplates?: TemplateItem[];
   smsTemplates?: TemplateItem[];
+  menuRecurrences?: Partial<ProductSetRecurrence>[];
 }
 
 export interface ProductSetControlShared {

package/src/product-set/control/utils.ts

@@ -0,0 +1,25 @@
+import { TIME_FORMAT } from "@licklist/core/dist/Config";
+import { dateTimesSortFn } from "@licklist/plugins/dist/utils/dateTime";
+import { extractObjectWithLowestKey } from "@licklist/plugins/dist/utils/extractObjectWithLowestKey";
+import { DateTime } from "luxon";
+import { Product, Step } from "../types";
+
+const getProductsFromSteps = (steps: Step[]): Product[] =>
+  steps.reduce(
+    (acc, step) =>
+      acc.concat(
+        step.productCategories.reduce(
+          (acc, productCategory) => acc.concat(productCategory.products),
+          []
+        )
+      ),
+    []
+  );
+
+export const getProductWithSmallestDuration = (steps: Step[]): Product =>
+  extractObjectWithLowestKey(getProductsFromSteps(steps), "duration");
+
+export const getLatestAvailableDateTime = (array: string[]): DateTime =>
+  array
+    .map((time) => DateTime.fromFormat(time, TIME_FORMAT))
+    .sort(dateTimesSortFn("desc"))[0];

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,7 +90,6 @@ 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/zone/form/components/AvailableTimesControl.tsx

@@ -21,8 +21,6 @@ type AvailableTimesControlProps = {
   isLoading: boolean;
   workHours?: WorkHour[];
   defaultValues?: string[];
-  startTime?: string;
-  endTime?: string;
   errorMessage?: string;
   clearErrorMessage: () => void;
 };