@licklist/design 0.44.485-dev.65 → 0.44.485-dev.66

package/dist/events/edit-event-modal/IntervalInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IntervalInput.d.ts","sourceRoot":"","sources":["../../../src/events/edit-event-modal/IntervalInput.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAC;AAIzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,UAAU,kBAAkB;IAC1B,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACxC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,GACZ,EAAE,kBAAkB,eA4IpB"}
+{"version":3,"file":"IntervalInput.d.ts","sourceRoot":"","sources":["../../../src/events/edit-event-modal/IntervalInput.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,6DAA6D,CAAC;AAIzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,UAAU,kBAAkB;IAC1B,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACxC,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,wBAAgB,aAAa,CAAC,EAC5B,QAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,WAAW,GACZ,EAAE,kBAAkB,eAgJpB"}

package/dist/events/edit-event-modal/IntervalInput.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),n=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,a=require("react-i18next"),o=require("react-bootstrap"),i=require("react-hook-form"),l=require("@react-aria/utils"),u=require("../../static/WarningMessage.js"),d=require("luxon");require("../../static/index.js");var s=require("react-intl"),c=require("../../recurrence-input/RecurrenceInput.js");var m=function(){var e=i.useFormContext().watch,n=e("start"),a=e("end"),o=s.useIntl(),l=o.formatList,u=o.formatNumber;return r.useMemo((function(){var e=d.Interval.fromDateTimes(d.DateTime.fromISO(n),d.DateTime.fromISO(a)).toDuration(["days","hours","minutes"]);if(e.isValid){var r=function(e,t){return u(e,{style:"unit",unit:t,unitDisplay:"long"})},o=[[e.days,"day"],[e.hours,"hour"],[e.minutes,"minute"]].filter((function(e){return t.__read(e,1)[0]}));return l(o.map((function(e){return r.apply(void 0,t.__spreadArray([],t.__read(e),!1))})),{style:"long",type:"unit"})}}),[n,a])},f=function(){var e=i.useFormContext().watch,t=a.useTranslation(["Design","Validation"]).t,n=e("start"),o=e("end");return{start:r.useMemo((function(){return{required:t("Validation:fieldRequired",{attribute:t("start")}),validate:function(e){return d.DateTime.fromISO(e).diffNow().toMillis()>0||t("Validation:fieldValidEventStart")}}}),[]),end:r.useMemo((function(){return{validate:function(e){return!e||(d.DateTime.fromISO(e).diff(d.DateTime.fromISO(n)).toMillis()>0||t("Validation:fieldValidEventEnd"))}}}),[n,o])}};exports.IntervalInput=function(e){var s,v,p=e.disabled,E=void 0!==p&&p,g=e.editedProductSet,I=e.productSetId,F=e.productSets,C=a.useTranslation(["Design","Validation"]).t,h=i.useFormContext(),b=h.register,_=h.formState.errors,y=h.watch,q=h.control,S=h.setValue,D=m(),T=f(),k=y("rrule"),x=y("start"),M=y("end"),O=t.__read(r.useState(Boolean(k)),2),V=O[0],w=O[1],R=t.__read(r.useState(!1),2),B=R[0],j=R[1],G=l.useId(),P=r.useRef(null),L=r.useRef(null);return r.useEffect((function(){g&&w(!1)}),[g]),r.useEffect((function(){if(F){var e=F.find((function(e){return g&&(null==e?void 0:e.id)===(null==g?void 0:g.id)||Boolean(null==e?void 0:e.parentMenuId)&&(null==e?void 0:e.id)===I}));j(Boolean(e))}}),[F,I,j,g]),n.createElement(n.Fragment,null,n.createElement(o.Form.Row,{className:"interval-container"},n.createElement(o.Form.Group,{as:o.Col,controlId:"start"},n.createElement(o.Form.Label,null,C("start")),n.createElement(o.Form.Control,t.__assign({type:"datetime-local"},b("start",T.start),{value:x,name:"start",required:!0,isInvalid:Boolean(_.start),onChange:function(e){var t=e.target.value;w(!1),S("start",t),d.DateTime.fromISO(M).diff(d.DateTime.fromISO(t)).toMillis()<0&&S("end",t)},onClick:function(){var e;return null===(e=null==P?void 0:P.current)||void 0===e?void 0:e.showPicker()},ref:P,disabled:E})),n.createElement(o.Form.Control.Feedback,{type:"invalid"},null===(s=_.start)||void 0===s?void 0:s.message)),n.createElement(o.Form.Group,{as:o.Col,controlId:"end"},n.createElement(o.Form.Label,null,C("end")),n.createElement(o.Form.Control,t.__assign({type:"datetime-local"},b("end",T.end),{value:M,name:"end",onChange:function(e){var t=e.target.value;return S("end",t)},min:x,isInvalid:Boolean(_.end),onClick:function(){var e;return null===(e=null==L?void 0:L.current)||void 0===e?void 0:e.showPicker()},ref:L,disabled:E})),n.createElement(o.Form.Control.Feedback,{type:"invalid"},null===(v=_.end)||void 0===v?void 0:v.message),n.createElement(o.Form.Text,{muted:!0},D&&"lasts ".concat(D)))),x&&n.createElement(o.Form.Group,{controlId:G},n.createElement(o.Form.Check,{label:"Recurrent",custom:!0,checked:V,onChange:function(e){var t=e.target.checked;w(t)},disabled:E||Boolean(g)}),!V&&n.createElement(o.Form.Text,{muted:!0},C("reccurentDescription",{item:C("event")}))),B&&n.createElement(u.default,{message:C("recurrentOverridesWarining")}),V&&x&&n.createElement(o.Form.Group,null,n.createElement(i.Controller,{control:q,name:"rrule",render:function(e){var t=e.field,r=t.value,a=t.onChange;return n.createElement(c.RecurrenceInput,{value:r,onChange:a,date:x,disabled:E})}})))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),n=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,a=require("react-i18next"),o=require("react-bootstrap"),i=require("react-hook-form"),l=require("@react-aria/utils"),u=require("../../static/WarningMessage.js"),d=require("luxon");require("../../static/index.js");var s=require("react-intl"),c=require("../../recurrence-input/RecurrenceInput.js");var m=function(){var e=i.useFormContext().watch,n=e("start"),a=e("end"),o=s.useIntl(),l=o.formatList,u=o.formatNumber;return r.useMemo((function(){var e=d.Interval.fromDateTimes(d.DateTime.fromISO(n),d.DateTime.fromISO(a)).toDuration(["days","hours","minutes"]);if(e.isValid){var r=function(e,t){return u(e,{style:"unit",unit:t,unitDisplay:"long"})},o=[[e.days,"day"],[e.hours,"hour"],[e.minutes,"minute"]].filter((function(e){return t.__read(e,1)[0]}));return l(o.map((function(e){return r.apply(void 0,t.__spreadArray([],t.__read(e),!1))})),{style:"long",type:"unit"})}}),[n,a])},f=function(){var e=i.useFormContext().watch,t=a.useTranslation(["Design","Validation"]).t,n=e("start"),o=e("end");return{start:r.useMemo((function(){return{required:t("Validation:fieldRequired",{attribute:t("start")}),validate:function(e){return d.DateTime.fromISO(e).diffNow().toMillis()>0||t("Validation:fieldValidEventStart")}}}),[]),end:r.useMemo((function(){return{validate:function(e){return!e||(d.DateTime.fromISO(e).diff(d.DateTime.fromISO(n)).toMillis()>0||t("Validation:fieldValidEventEnd"))}}}),[n,o])}};exports.IntervalInput=function(e){var s,v,p=e.disabled,g=void 0!==p&&p,E=e.editedProductSet,I=e.productSetId,F=e.productSets,C=a.useTranslation(["Design","Validation"]).t,h=i.useFormContext(),b=h.register,_=h.formState.errors,y=h.watch,q=h.control,S=h.trigger,D=h.setValue,T=m(),k=f(),x=y("rrule"),M=y("start"),O=y("end"),V=t.__read(r.useState(Boolean(x)),2),w=V[0],R=V[1],B=t.__read(r.useState(!1),2),j=B[0],G=B[1],P=l.useId(),L=r.useRef(null),N=r.useRef(null);return r.useEffect((function(){E&&R(!1)}),[E]),r.useEffect((function(){if(F){var e=F.find((function(e){return E&&(null==e?void 0:e.id)===(null==E?void 0:E.id)||Boolean(null==e?void 0:e.parentMenuId)&&(null==e?void 0:e.id)===I}));G(Boolean(e))}}),[F,I,G,E]),n.createElement(n.Fragment,null,n.createElement(o.Form.Row,{className:"interval-container"},n.createElement(o.Form.Group,{as:o.Col,controlId:"start"},n.createElement(o.Form.Label,null,C("start")),n.createElement(o.Form.Control,t.__assign({type:"datetime-local"},b("start",k.start),{value:M,name:"start",required:!0,isInvalid:Boolean(_.start),onChange:function(e){var t=e.target.value;R(!1),D("start",t),d.DateTime.fromISO(O).diff(d.DateTime.fromISO(t)).toMillis()<0&&D("end",t)},onClick:function(){var e;return null===(e=null==L?void 0:L.current)||void 0===e?void 0:e.showPicker()},ref:L,disabled:g})),n.createElement(o.Form.Control.Feedback,{type:"invalid"},null===(s=_.start)||void 0===s?void 0:s.message)),n.createElement(o.Form.Group,{as:o.Col,controlId:"end"},n.createElement(o.Form.Label,null,C("end")),n.createElement(o.Form.Control,t.__assign({type:"datetime-local"},b("end",k.end),{value:O,name:"end",onChange:function(e){return function(e){D("end",e),S("end")}(e.target.value)},min:M,isInvalid:Boolean(_.end),onClick:function(){var e;return null===(e=null==N?void 0:N.current)||void 0===e?void 0:e.showPicker()},ref:N,disabled:g})),n.createElement(o.Form.Control.Feedback,{type:"invalid"},null===(v=_.end)||void 0===v?void 0:v.message),n.createElement(o.Form.Text,{muted:!0},T&&"lasts ".concat(T)))),M&&n.createElement(o.Form.Group,{controlId:P},n.createElement(o.Form.Check,{label:"Recurrent",custom:!0,checked:w,onChange:function(e){var t=e.target.checked;R(t)},disabled:g||Boolean(E)}),!w&&n.createElement(o.Form.Text,{muted:!0},C("reccurentDescription",{item:C("event")}))),j&&n.createElement(u.default,{message:C("recurrentOverridesWarining")}),w&&M&&n.createElement(o.Form.Group,null,n.createElement(i.Controller,{control:q,name:"rrule",render:function(e){var t=e.field,r=t.value,a=t.onChange;return n.createElement(c.RecurrenceInput,{value:r,onChange:a,date:M,disabled:g})}})))};

package/dist/product-set/product/quantity/ProductQuantityRechargingControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProductQuantityRechargingControl.d.ts","sourceRoot":"","sources":["../../../../src/product-set/product/quantity/ProductQuantityRechargingControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EACL,mBAAmB,EACnB,UAAU,EACX,MAAM,8DAA8D,CAAC;AAStE,MAAM,WAAW,sCAAuC,SAAQ,UAAU;IACxE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qCAAqC,CAAC,CAAC,CACtD,SAAQ,mBAAmB,CAAC,CAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;CAC7C;AAED,wBAAgB,gCAAgC,CAAC,CAAC,SAAS,UAAU,EACnE,KAAK,EAAE,qCAAqC,CAAC,CAAC,CAAC,eAkGhD"}
+{"version":3,"file":"ProductQuantityRechargingControl.d.ts","sourceRoot":"","sources":["../../../../src/product-set/product/quantity/ProductQuantityRechargingControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoB,MAAM,OAAO,CAAC;AAEzC,OAAO,EACL,mBAAmB,EACnB,UAAU,EACX,MAAM,8DAA8D,CAAC;AAStE,MAAM,WAAW,sCAAuC,SAAQ,UAAU;IACxE,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qCAAqC,CAAC,CAAC,CACtD,SAAQ,mBAAmB,CAAC,CAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,cAAc,KAAK,IAAI,CAAC;CAC7C;AAED,wBAAgB,gCAAgC,CAAC,CAAC,SAAS,UAAU,EACnE,KAAK,EAAE,qCAAqC,CAAC,CAAC,CAAC,eA+FhD"}

package/dist/product-set/product/quantity/ProductQuantityRechargingControl.js

@@ -1 +1 @@
-"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("react"),r=e(t),a=require("react-i18next"),n=require("react-bootstrap"),o=require("react-hook-form"),i=e(require("@licklist/plugins/dist/services/Form/HookFormService")),l=require("@react-aria/utils"),u=require("../../../assets/dashboard/increment.svg.js"),c=e(require("react-bootstrap/InputGroup"));exports.ProductQuantityRechargingControl=function(e){var s=e.isLoading,m=void 0!==s&&s,d=e.fieldNamePrefix,y=e.disabled,p=void 0!==y&&y,f=e.onFocus,b=o.useFormContext(),E=b.control,v=b.clearErrors,Q=b.setError,g=b.watch,F=b.formState.errors,x=a.useTranslation("Design").t,q=l.useId(),C=g("".concat(d,".maxQuantity")),h=g("".concat(d,".totalQuantity"));return t.useEffect((function(){0===Number(h)?Q("".concat(d,".totalQuantity"),{type:i.manualErrorType,message:x("Validation:fieldMinNumber",{attribute:x("totalQuantity"),min:1})}):Number(C)>Number(h)?Q("".concat(d,".totalQuantity"),{type:i.manualErrorType,message:x("Validation:fieldTotalNumber",{attribute:x("totalQuantity"),max:x("maxOrderQuantity")})}):v("".concat(d,".totalQuantity"))}),[h,C,Q,v]),r.createElement(r.Fragment,null,r.createElement(n.Form.Group,{controlId:q},r.createElement(n.Form.Label,null,x("totalQuantity")),r.createElement(c,{hasValidation:!0},r.createElement(c.Prepend,null,r.createElement(c.Text,{className:"py-0 px-3"},r.createElement(u.ReactComponent,null))),r.createElement(o.Controller,{render:function(e){var t=e.field,a=t.value,o=t.onChange,l=t.ref;return r.createElement(n.Form.Control,{ref:l,type:"number",min:0,step:1,value:a,onFocus:f,onChange:o,isInvalid:i.isInvalid("".concat(d,".totalQuantity"),F),disabled:m||p})},control:E,name:"".concat(d,".totalQuantity"),rules:p?{required:!1,min:0}:{}}),r.createElement(n.Form.Control.Feedback,{type:"invalid"},i.getErrors("".concat(d,".totalQuantity"),F)))))};
+"use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),a=e(r),n=require("react-i18next"),o=require("react-bootstrap"),i=require("react-hook-form"),l=e(require("@licklist/plugins/dist/services/Form/HookFormService")),u=require("@react-aria/utils"),c=require("../../../assets/dashboard/increment.svg.js"),s=e(require("react-bootstrap/InputGroup"));exports.ProductQuantityRechargingControl=function(e){var m=e.isLoading,d=void 0!==m&&m,f=e.fieldNamePrefix,b=e.disabled,p=void 0!==b&&b,v=e.onFocus,y=i.useFormContext(),g=y.control,E=y.trigger,F=y.watch,Q=y.register,q=y.formState.errors,x=n.useTranslation("Design").t,C=u.useId(),h=F("".concat(f,".maxQuantity"));return r.useEffect((function(){E("".concat(f,".totalQuantity"))}),[h]),a.createElement(a.Fragment,null,a.createElement(o.Form.Group,{controlId:C},a.createElement(o.Form.Label,null,x("totalQuantity")),a.createElement(s,{hasValidation:!0},a.createElement(s.Prepend,null,a.createElement(s.Text,{className:"py-0 px-3"},a.createElement(c.ReactComponent,null))),a.createElement(i.Controller,{render:function(e){var r=e.field,n=r.value,i=r.onChange,u=r.ref;return a.createElement(o.Form.Control,t.__assign({ref:u,type:"number",min:0,step:1},Q("".concat(f,".totalQuantity"),{validate:function(e){var t=Number(h),r=Number(e);return r<1?x("Validation:fieldMinNumber",{attribute:x("totalQuantity"),min:1}):!(r<t)||x("Validation:fieldTotalNumber",{attribute:x("totalQuantity"),max:x("maxOrderQuantity")})}}),{value:n,onFocus:v,onChange:i,isInvalid:l.isInvalid("".concat(f,".totalQuantity"),q),disabled:d||p}))},control:g,name:"".concat(f,".totalQuantity"),rules:p?{required:!1,min:0}:{}}),a.createElement(o.Form.Control.Feedback,{type:"invalid"},l.getErrors("".concat(f,".totalQuantity"),q)))))};

package/package.json

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

package/src/events/edit-event-modal/IntervalInput.tsx

@@ -37,6 +37,7 @@ export function IntervalInput({
     formState: { errors },
     watch,
     control,
+    trigger,
     setValue,
   } = useFormContext<IntervalInputValues>();
 
@@ -84,6 +85,11 @@ export function IntervalInput({
     setIsOverriden(Boolean(isOverridenProductSet));
   }, [productSets, productSetId, setIsOverriden, editedProductSet]);
 
+  const onChangeEndDate = (nextEndtDate: string) => {
+    setValue("end", nextEndtDate);
+    trigger("end");
+  };
+
   return (
     <>
       <Form.Row className="interval-container">
@@ -113,9 +119,7 @@ export function IntervalInput({
             {...register("end", validationOptions.end)}
             value={end}
             name="end"
-            onChange={({ target: { value: nextEndtDate } }) =>
-              setValue("end", nextEndtDate)
-            }
+            onChange={({ target: { value: nextEndtDate } }) => onChangeEndDate(nextEndtDate)}
             min={start}
             isInvalid={Boolean(errors.end)}
             onClick={() => endDateInput?.current?.showPicker()}

package/src/product-set/product/quantity/ProductQuantityRechargingControl.tsx

@@ -34,42 +34,19 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
   } = props;
   const {
     control,
-    clearErrors,
-    setError,
+    trigger,
     watch,
+    register,
     formState: { errors },
   } = useFormContext<T>();
   const { t } = useTranslation("Design");
   const totalQuantityId = useId();
 
   const maxQuantityValue = watch(`${fieldNamePrefix}.maxQuantity` as Path<T>);
-  const totalQuantityValue = watch(
-    `${fieldNamePrefix}.totalQuantity` as Path<T>
-  );
-
 
   useEffect(() => {
-    if (Number(totalQuantityValue) === 0) {
-      setError(`${fieldNamePrefix}.totalQuantity` as Path<T>, {
-        type: HookFormService.manualErrorType,
-        message: t("Validation:fieldMinNumber", {
-          attribute: t("totalQuantity"),
-          min: 1,
-        }),
-      });
-    } else if (Number(maxQuantityValue) > Number(totalQuantityValue)) {
-      setError(`${fieldNamePrefix}.totalQuantity` as Path<T>, {
-        type: HookFormService.manualErrorType,
-        message: t("Validation:fieldTotalNumber", {
-          attribute: t("totalQuantity"),
-          max: t("maxOrderQuantity"),
-        }),
-      });
-    } else {
-      clearErrors(`${fieldNamePrefix}.totalQuantity` as Path<T>);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [totalQuantityValue, maxQuantityValue, setError, clearErrors]);
+    trigger(`${fieldNamePrefix}.totalQuantity` as Path<T>);
+  }, [maxQuantityValue]);
 
   return (
     <>
@@ -90,6 +67,26 @@ export function ProductQuantityRechargingControl<T extends FormValues>(
                 type="number"
                 min={0}
                 step={1}
+                {...register(`${fieldNamePrefix}.totalQuantity` as Path<T>, {
+                  validate: (value) => {
+                    const min = 1;
+                    const maxQuantity = Number(maxQuantityValue);
+                    const totalQuantity = Number(value);
+                    if (totalQuantity < min) {
+                      return t("Validation:fieldMinNumber", {
+                        attribute: t("totalQuantity"),
+                        min: 1,
+                      }) as string;
+                    }
+                    if (totalQuantity < maxQuantity) {
+                      return t("Validation:fieldTotalNumber", {
+                        attribute: t("totalQuantity"),
+                        max: t("maxOrderQuantity"),
+                      }) as string;
+                    }
+                    return true;
+                  }
+                })}
                 value={value as string}
                 onFocus={onFocus}
                 onChange={onChange}