@licklist/design 0.44.551-dev.1 → 0.44.551-dev.3

package/dist/report/ReportRunnerModal/ReportRunnerModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportRunnerModal.d.ts","sourceRoot":"","sources":["../../../src/report/ReportRunnerModal/ReportRunnerModal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAO3E,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAG9F,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC;IACd,mBAAmB,EAAE,CACnB,UAAU,CAAC,EAAE,UAAU,KACpB,uBAAuB,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAE;IACvD,QAAQ,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IAClC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3B,CAAC;AAOF,eAAO,MAAM,iBAAiB,0FAS3B,sBAAsB,gBA0IxB,CAAC"}
+{"version":3,"file":"ReportRunnerModal.d.ts","sourceRoot":"","sources":["../../../src/report/ReportRunnerModal/ReportRunnerModal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAO3E,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAG9F,UAAU,WAAW;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC;IACd,mBAAmB,EAAE,CACnB,UAAU,CAAC,EAAE,UAAU,KACpB,uBAAuB,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,CAAC;IACrD,QAAQ,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IAClC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC3B,CAAC;AAOF,eAAO,MAAM,iBAAiB,0FAS3B,sBAAsB,gBA8IxB,CAAC"}

package/dist/report/ReportRunnerModal/ReportRunnerModal.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),a=(e=r)&&"object"==typeof e&&"default"in e?e.default:e;require("../../static/loader/LoaderIndicator.js");var n=require("../../static/loader/BlockLoader.js"),o=require("react-i18next"),i=require("react-bootstrap"),l=require("react-hook-form");require("../../static/loader/ButtonLoader.js"),require("../../static/loader/SnippetLoader.js"),require("../../static/loader/PaymentLoader.js");var d=require("lodash"),s=require("@licklist/plugins/dist/utils/report");exports.ReportRunnerModal=function(e){var r,u,c=e.reportId,m=e.show,p=e.onHide,v=e.useShowReportFields,g=e.reports,E=e.generate,f=e.download,b=e.onEdit,F=o.useTranslation(["App","Design"]).t,_=null==g?void 0:g.find((function(e){return e.id===c})),q=v(null==_?void 0:_.type),y=q.data,h=void 0===y?[]:y,k=q.isLoading,w=l.useForm({mode:"onChange"}),L=w.handleSubmit,C=w.register,I=w.formState.errors,j=w.reset,B=L((function(e){f.execute(t.__assign(t.__assign({},e),{reportId:c,type:null==_?void 0:_.type}))})),D=L((function(e){return t.__awaiter(void 0,void 0,void 0,(function(){var r;return t.__generator(this,(function(a){switch(a.label){case 0:return[4,E.execute(t.__assign(t.__assign({},e),{reportId:c}))];case 1:return r=a.sent(),_&&r&&!E.isError?(s.openOnlineViewer({type:_.type,dateFrom:e.dateFrom,dateTo:e.dateTo,data:r}),[2]):[2]}}))}))})),N=function(){j(),p()},R=E.isLoading||f.isLoading||k;return a.createElement(i.Modal,{show:m,onHide:N,className:"report-runner-modal",centered:!0},a.createElement("header",null,a.createElement("h5",null,F("generateReport")),a.createElement(i.Button,{variant:"","data-testid":"cancel-button",onClick:N},F("cancel"))),R&&a.createElement(n.BlockLoader,null),!R&&a.createElement("div",null,a.createElement("div",{className:"report-type-label"},d.capitalize(null==_?void 0:_.type)),a.createElement("div",null,null==_?void 0:_.name),a.createElement("div",{className:"data-fields"},null==_?void 0:_.reportFieldValues.map((function(e){var t=null==h?void 0:h.find((function(t){return t.id===e.reportFieldId}));return t?a.createElement("span",{key:e.id},t.title):null}))),a.createElement(i.Button,{className:"edit-button",type:"button",variant:"","data-testid":"edit-button",onClick:b},F("Design:edit")),a.createElement("form",{noValidate:!0},a.createElement("div",{className:"controls"},a.createElement(i.Form.Group,{controlId:"from-input"},a.createElement(i.Form.Label,null,F("Design:from")),a.createElement(i.Form.Control,t.__assign({type:"datetime-local","data-testid":"date-from-input",isInvalid:!!I.dateFrom},C("dateFrom",{required:{value:!0,message:"".concat(F("Validation:fieldRequired",{attribute:F("Design:to")}))}}))),a.createElement(i.Form.Control.Feedback,{type:"invalid"},null===(r=I.dateFrom)||void 0===r?void 0:r.message)),a.createElement(i.Form.Group,{controlId:"to-input"},a.createElement(i.Form.Label,null,F("Design:to")),a.createElement(i.Form.Control,t.__assign({type:"datetime-local","data-testid":"date-to-input",isInvalid:!!I.dateTo},C("dateTo",{required:{value:!0,message:"".concat(F("Validation:fieldRequired",{attribute:F("Design:to")}))}}))),a.createElement(i.Form.Control.Feedback,{type:"invalid"},null===(u=I.dateTo)||void 0===u?void 0:u.message))),a.createElement("div",{className:"controls"},a.createElement(i.Button,{"data-testid":"download-button",onClick:B},F("generateDownload")),a.createElement(i.Button,{"data-testid":"view-button",onClick:D},F("generateView"))))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),a=(e=r)&&"object"==typeof e&&"default"in e?e.default:e;require("../../static/loader/LoaderIndicator.js");var n=require("../../static/loader/BlockLoader.js"),o=require("react-i18next"),i=require("react-bootstrap"),l=require("react-hook-form");require("../../static/loader/ButtonLoader.js"),require("../../static/loader/SnippetLoader.js"),require("../../static/loader/PaymentLoader.js");var d=require("lodash"),s=require("@licklist/plugins/dist/utils/report");exports.ReportRunnerModal=function(e){var r,u,c=e.reportId,m=e.show,p=e.onHide,v=e.useShowReportFields,f=e.reports,g=e.generate,E=e.download,F=e.onEdit,b=o.useTranslation(["App","Design"]).t,_=null==f?void 0:f.find((function(e){return e.id===c})),q=v(null==_?void 0:_.type),y=q.data,h=void 0===y?[]:y,w=q.isLoading,k=l.useForm({mode:"onChange"}),L=k.handleSubmit,C=k.register,I=k.formState.errors,D=k.reset,j=(0,k.watch)("dateFrom"),B=L((function(e){E.execute(t.__assign(t.__assign({},e),{reportId:c,type:null==_?void 0:_.type}))})),N=L((function(e){return t.__awaiter(void 0,void 0,void 0,(function(){var r;return t.__generator(this,(function(a){switch(a.label){case 0:return[4,g.execute(t.__assign(t.__assign({},e),{reportId:c}))];case 1:return r=a.sent(),_&&r&&!g.isError?(s.openOnlineViewer({type:_.type,dateFrom:e.dateFrom,dateTo:e.dateTo,data:r}),[2]):[2]}}))}))})),R=function(){D(),p()},T=g.isLoading||E.isLoading||w;return a.createElement(i.Modal,{show:m,onHide:R,className:"report-runner-modal",centered:!0},a.createElement("header",null,a.createElement("h5",null,b("generateReport")),a.createElement(i.Button,{variant:"","data-testid":"cancel-button",onClick:R},b("cancel"))),T&&a.createElement(n.BlockLoader,null),!T&&a.createElement("div",null,a.createElement("div",{className:"report-type-label"},d.capitalize(null==_?void 0:_.type)),a.createElement("div",null,null==_?void 0:_.name),a.createElement("div",{className:"data-fields"},null==_?void 0:_.reportFieldValues.map((function(e){var t=null==h?void 0:h.find((function(t){return t.id===e.reportFieldId}));return t?a.createElement("span",{key:e.id},t.title):null}))),a.createElement(i.Button,{className:"edit-button",type:"button",variant:"","data-testid":"edit-button",onClick:F},b("Design:edit")),a.createElement("form",{noValidate:!0},a.createElement("div",{className:"controls"},a.createElement(i.Form.Group,{controlId:"from-input"},a.createElement(i.Form.Label,null,b("Design:from")),a.createElement(i.Form.Control,t.__assign({type:"datetime-local","data-testid":"date-from-input",isInvalid:!!I.dateFrom},C("dateFrom",{required:{value:!0,message:"".concat(b("Validation:fieldRequired",{attribute:b("Design:to")}))}}))),a.createElement(i.Form.Control.Feedback,{type:"invalid"},null===(r=I.dateFrom)||void 0===r?void 0:r.message)),a.createElement(i.Form.Group,{controlId:"to-input"},a.createElement(i.Form.Label,null,b("Design:to")),a.createElement(i.Form.Control,t.__assign({type:"datetime-local","data-testid":"date-to-input",isInvalid:!!I.dateTo},C("dateTo",{required:"".concat(b("Validation:fieldRequired",{attribute:b("Design:to")})),validate:function(e){return!j||(e>j||b("toDateAfterFrom"))}}))),a.createElement(i.Form.Control.Feedback,{type:"invalid"},null===(u=I.dateTo)||void 0===u?void 0:u.message))),a.createElement("div",{className:"controls"},a.createElement(i.Button,{"data-testid":"download-button",onClick:B},b("generateDownload")),a.createElement(i.Button,{"data-testid":"view-button",onClick:N},b("generateView"))))))};

package/dist/report/ReportTypeSelect/ReportTypeSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportTypeSelect.d.ts","sourceRoot":"","sources":["../../../src/report/ReportTypeSelect/ReportTypeSelect.tsx"],"names":[],"mappings":";AAOA,eAAO,MAAM,gBAAgB,mBA2D5B,CAAC"}
+{"version":3,"file":"ReportTypeSelect.d.ts","sourceRoot":"","sources":["../../../src/report/ReportTypeSelect/ReportTypeSelect.tsx"],"names":[],"mappings":";AAQA,eAAO,MAAM,gBAAgB,mBA2D5B,CAAC"}

package/dist/report/ReportTypeSelect/ReportTypeSelect.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),o=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,a=require("react-i18next"),l=require("react-bootstrap"),n=require("react-hook-form"),i=require("@licklist/core/dist/DataMapper/Report"),p=require("../../assets/dashboard/info.svg.js");exports.ReportTypeSelect=function(){var e,r=a.useTranslation(["App","Design"]).t,s=n.useFormContext(),c=s.register,u=s.formState.errors,m=s.setValue;return o.createElement(l.Row,null,o.createElement(l.Col,{lg:6,className:"mt-4"},o.createElement(l.Form.Group,{controlId:"typeSelect"},o.createElement(l.Form.Label,null,r("reportType")),o.createElement(l.Form.Control,t.__assign({as:"select","data-testid":"report-type-select",isInvalid:!!u.type},c("type",{required:{value:!0,message:"".concat(r("Validation:fieldRequired",{attribute:r("reportType")}))}}),{onChange:function(e){c("type").onChange(e),m("reportFieldValues",[])}}),i.reportTypes.map((function(e){return o.createElement("option",{key:e,value:e},e)}))),o.createElement(l.Form.Control.Feedback,{type:"invalid"},null===(e=u.type)||void 0===e?void 0:e.message),o.createElement(l.OverlayTrigger,{trigger:"hover",overlay:o.createElement(l.Popover,{id:"report-type-popover"},o.createElement(l.Popover.Content,{className:"reports-popover"},r("reportTypeSelectInfo")))},o.createElement(p.ReactComponent,{className:"info-icon"})))))};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e,t=require("tslib"),r=require("react"),o=(e=r)&&"object"==typeof e&&"default"in e?e.default:e,a=require("react-i18next"),l=require("react-bootstrap"),n=require("react-hook-form"),i=require("lodash"),p=require("@licklist/core/dist/DataMapper/Report"),s=require("../../assets/dashboard/info.svg.js");exports.ReportTypeSelect=function(){var e,r=a.useTranslation(["App","Design"]).t,c=n.useFormContext(),u=c.register,m=c.formState.errors,d=c.setValue;return o.createElement(l.Row,null,o.createElement(l.Col,{lg:6,className:"mt-4"},o.createElement(l.Form.Group,{controlId:"typeSelect"},o.createElement(l.Form.Label,null,r("reportType")),o.createElement(l.Form.Control,t.__assign({as:"select","data-testid":"report-type-select",isInvalid:!!m.type},u("type",{required:{value:!0,message:"".concat(r("Validation:fieldRequired",{attribute:r("reportType")}))}}),{onChange:function(e){u("type").onChange(e),d("reportFieldValues",[])}}),p.reportTypes.map((function(e){return o.createElement("option",{key:e,value:e},i.capitalize(e))}))),o.createElement(l.Form.Control.Feedback,{type:"invalid"},null===(e=m.type)||void 0===e?void 0:e.message),o.createElement(l.OverlayTrigger,{trigger:"hover",overlay:o.createElement(l.Popover,{id:"report-type-popover"},o.createElement(l.Popover.Content,{className:"reports-popover"},r("reportTypeSelectInfo")))},o.createElement(s.ReactComponent,{className:"info-icon"})))))};

package/dist/styles/iframe-page/PageBody.scss

@@ -60,9 +60,9 @@
 
     .left-block-container {
       height: calc(100svh - 12rem);
-      scrollbar-width: none;
-      overflow: scroll;
-
+      overflow-y: scroll;
+      overflow-x: hidden;
+      scrollbar-width: thin;
       .iframe-event-card {
         border-bottom: 2px solid $separator-color;
       }

package/package.json

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

package/src/report/ReportRunnerModal/ReportRunnerModal.tsx

@@ -13,7 +13,7 @@ interface ReportField {
   id: number;
   key: string;
   title: string;
-};
+}
 
 type ReportRunnerModalProps = {
   reportId: Report["id"] | null;
@@ -21,7 +21,7 @@ type ReportRunnerModalProps = {
   useShowReportFields: (
     reportType?: ReportType
   ) => CachedHttpQueryResponse<ReportField[], unknown>;
-  generate?: HttpQuery<Record<string, string>[] | null> ;
+  generate?: HttpQuery<Record<string, string>[] | null>;
   download?: HttpQuery<Blob | null>;
   onHide: () => void;
   onEdit: () => void;
@@ -54,7 +54,9 @@ export const ReportRunnerModal = ({
     register,
     formState: { errors },
     reset,
+    watch,
   } = useForm<FormValues>({ mode: "onChange" });
+  const dateFrom = watch("dateFrom");
 
   const onDownload = handleSubmit((values) => {
     download.execute({ ...values, reportId, type: report?.type });
@@ -152,12 +154,14 @@ export const ReportRunnerModal = ({
                   data-testid="date-to-input"
                   isInvalid={!!errors.dateTo}
                   {...register("dateTo", {
-                    required: {
-                      value: true,
-                      message: `${t("Validation:fieldRequired", {
-                        attribute: t("Design:to"),
-                      })}`,
-                    },
+                    required: `${t("Validation:fieldRequired", {
+                      attribute: t("Design:to"),
+                    })}`,
+                    validate(value) {
+                      if (!dateFrom) return true;
+                      if (value > dateFrom) return true;
+                      return t("toDateAfterFrom") as string;
+                    }
                   })}
                 />
                 <Form.Control.Feedback type="invalid">

package/src/report/ReportTypeSelect/ReportTypeSelect.tsx

@@ -1,4 +1,5 @@
 import { reportTypes } from "@licklist/core/dist/DataMapper/Report";
+import { capitalize } from "lodash";
 import React from "react";
 import { Row, Col, Form, OverlayTrigger, Popover } from "react-bootstrap";
 import { useFormContext } from "react-hook-form";
@@ -39,7 +40,7 @@ export const ReportTypeSelect = () => {
           >
             {reportTypes.map((reportType) => (
               <option key={reportType} value={reportType}>
-                {reportType}
+                {capitalize(reportType)}
               </option>
             ))}
           </Form.Control>

package/src/styles/iframe-page/PageBody.scss

@@ -60,9 +60,9 @@
 
     .left-block-container {
       height: calc(100svh - 12rem);
-      scrollbar-width: none;
-      overflow: scroll;
-
+      overflow-y: scroll;
+      overflow-x: hidden;
+      scrollbar-width: thin;
       .iframe-event-card {
         border-bottom: 2px solid $separator-color;
       }