@licklist/design 0.66.3 → 0.66.5

package/src/report/ReportRunnerModal/ReportRunnerModal.stories.tsx

@@ -0,0 +1,307 @@
+import { Meta, Story } from "@storybook/react";
+import React from "react";
+import { Card } from "react-bootstrap";
+import { ReportRunnerModal, ReportRunnerModalProps } from "./ReportRunnerModal";
+
+export default {
+  title: "Report/ReportRunnerModal",
+  component: ReportRunnerModal,
+} as Meta;
+
+export const Default: Story<ReportRunnerModalProps> = (args) => (
+  <Card style={{ maxWidth: "max-content" }}>
+    <Card.Body>
+      <ReportRunnerModal {...args} />
+    </Card.Body>
+  </Card>
+);
+
+Default.args = {
+  reportId: 47,
+  show: true,
+  generate: { isLoading: false },
+  download: { isLoading: false },
+  useShowReportFields: (type) => ({ data: [], isLoading: false }),
+  onHide: () => {},
+  onEdit: () => {},
+  reports: [
+    {
+      id: 47,
+      providerId: null,
+      type: "payments",
+      name: "Test 1",
+      createdAt: "2024-04-26 08:16:59",
+      updatedAt: "2024-04-26 08:16:59",
+      deletedAt: null,
+      reportFieldValues: [
+        {
+          id: 580,
+          reportId: 47,
+          reportFieldId: 16,
+        },
+        {
+          id: 581,
+          reportId: 47,
+          reportFieldId: 17,
+        },
+        {
+          id: 582,
+          reportId: 47,
+          reportFieldId: 18,
+        },
+        {
+          id: 583,
+          reportId: 47,
+          reportFieldId: 19,
+        },
+        {
+          id: 584,
+          reportId: 47,
+          reportFieldId: 20,
+        },
+        {
+          id: 585,
+          reportId: 47,
+          reportFieldId: 21,
+        },
+        {
+          id: 586,
+          reportId: 47,
+          reportFieldId: 22,
+        },
+        {
+          id: 587,
+          reportId: 47,
+          reportFieldId: 23,
+        },
+        {
+          id: 588,
+          reportId: 47,
+          reportFieldId: 24,
+        },
+        {
+          id: 589,
+          reportId: 47,
+          reportFieldId: 26,
+        },
+        {
+          id: 590,
+          reportId: 47,
+          reportFieldId: 27,
+        },
+        {
+          id: 591,
+          reportId: 47,
+          reportFieldId: 28,
+        },
+        {
+          id: 592,
+          reportId: 47,
+          reportFieldId: 40,
+        },
+        {
+          id: 593,
+          reportId: 47,
+          reportFieldId: 41,
+        },
+        {
+          id: 594,
+          reportId: 47,
+          reportFieldId: 42,
+        },
+      ],
+    },
+    {
+      id: 52,
+      providerId: null,
+      type: "bookings",
+      name: "new report",
+      createdAt: "2024-04-29 16:05:51",
+      updatedAt: "2024-04-29 16:08:39",
+      deletedAt: null,
+      reportFieldValues: [
+        {
+          id: 635,
+          reportId: 52,
+          reportFieldId: 1,
+        },
+        {
+          id: 636,
+          reportId: 52,
+          reportFieldId: 2,
+        },
+        {
+          id: 637,
+          reportId: 52,
+          reportFieldId: 3,
+        },
+        {
+          id: 638,
+          reportId: 52,
+          reportFieldId: 4,
+        },
+        {
+          id: 639,
+          reportId: 52,
+          reportFieldId: 5,
+        },
+        {
+          id: 640,
+          reportId: 52,
+          reportFieldId: 6,
+        },
+        {
+          id: 641,
+          reportId: 52,
+          reportFieldId: 7,
+        },
+        {
+          id: 642,
+          reportId: 52,
+          reportFieldId: 8,
+        },
+        {
+          id: 643,
+          reportId: 52,
+          reportFieldId: 9,
+        },
+        {
+          id: 644,
+          reportId: 52,
+          reportFieldId: 10,
+        },
+        {
+          id: 645,
+          reportId: 52,
+          reportFieldId: 11,
+        },
+        {
+          id: 646,
+          reportId: 52,
+          reportFieldId: 12,
+        },
+        {
+          id: 647,
+          reportId: 52,
+          reportFieldId: 13,
+        },
+        {
+          id: 648,
+          reportId: 52,
+          reportFieldId: 14,
+        },
+        {
+          id: 649,
+          reportId: 52,
+          reportFieldId: 15,
+        },
+        {
+          id: 650,
+          reportId: 52,
+          reportFieldId: 36,
+        },
+        {
+          id: 651,
+          reportId: 52,
+          reportFieldId: 37,
+        },
+        {
+          id: 652,
+          reportId: 52,
+          reportFieldId: 38,
+        },
+        {
+          id: 653,
+          reportId: 52,
+          reportFieldId: 39,
+        },
+        {
+          id: 654,
+          reportId: 52,
+          reportFieldId: 47,
+        },
+        {
+          id: 655,
+          reportId: 52,
+          reportFieldId: 48,
+        },
+      ],
+    },
+    {
+      id: 53,
+      providerId: null,
+      type: "tickets",
+      name: "tickets",
+      createdAt: "2024-04-29 16:12:36",
+      updatedAt: "2024-04-29 16:12:36",
+      deletedAt: null,
+      reportFieldValues: [
+        {
+          id: 656,
+          reportId: 53,
+          reportFieldId: 29,
+        },
+        {
+          id: 657,
+          reportId: 53,
+          reportFieldId: 30,
+        },
+        {
+          id: 658,
+          reportId: 53,
+          reportFieldId: 31,
+        },
+        {
+          id: 659,
+          reportId: 53,
+          reportFieldId: 32,
+        },
+        {
+          id: 660,
+          reportId: 53,
+          reportFieldId: 33,
+        },
+        {
+          id: 661,
+          reportId: 53,
+          reportFieldId: 34,
+        },
+        {
+          id: 662,
+          reportId: 53,
+          reportFieldId: 35,
+        },
+        {
+          id: 663,
+          reportId: 53,
+          reportFieldId: 43,
+        },
+        {
+          id: 664,
+          reportId: 53,
+          reportFieldId: 44,
+        },
+        {
+          id: 665,
+          reportId: 53,
+          reportFieldId: 45,
+        },
+        {
+          id: 666,
+          reportId: 53,
+          reportFieldId: 46,
+        },
+        {
+          id: 667,
+          reportId: 53,
+          reportFieldId: 51,
+        },
+        {
+          id: 668,
+          reportId: 53,
+          reportFieldId: 52,
+        },
+      ],
+    },
+  ],
+};

package/src/report/ReportRunnerModal/ReportRunnerModal.tsx

@@ -23,7 +23,7 @@ interface ReportField {
   title: string;
 }
 
-type ReportRunnerModalProps = {
+export type ReportRunnerModalProps = {
   reportId: Report["id"] | null;
   show: boolean;
   useShowReportFields: (
@@ -136,28 +136,38 @@ export const ReportRunnerModal = ({
           </Button>
 
           <form noValidate>
-            <div className="period-by">
-              {PERIOD_BY_TYPES.map((type) => (
-                <div key={type}>
-                  <Form.Group>
+            <div
+              className={`pl-1 ${
+                errors.periodBy?.message && "border-danger border rounded"
+              }`}
+            >
+              <div className="period-by">
+                {PERIOD_BY_TYPES.map((type) => (
+                  <div key={type}>
                     <Form.Check
                       inline
-                      isInvalid={!!errors.periodBy}
                       label={t(labelByPeriodType[type])}
                       type="radio"
                       id={type}
+                      required
                       value={type}
-                      {...register("periodBy")}
+                      {...register("periodBy", {
+                        required: `${t("Validation:fieldRequired", {
+                          attribute: t("Design:period"),
+                        })}`,
+                      })}
                     />
-                    <Form.Control.Feedback type="invalid">
-                      {errors.periodBy?.message}
-                    </Form.Control.Feedback>
-                  </Form.Group>
+                  </div>
+                ))}
+              </div>
+              {errors.periodBy?.message && (
+                <div className="iframe-event__message-error justify-content-start mb-1">
+                  {errors.periodBy?.message}
                 </div>
-              ))}
+              )}
             </div>
 
-            <div className="controls">
+            <div className="controls mt-4">
               <Form.Group controlId="from-input">
                 <Form.Label>{t("Design:from")}</Form.Label>
                 <Form.Control
@@ -168,7 +178,7 @@ export const ReportRunnerModal = ({
                     required: {
                       value: true,
                       message: `${t("Validation:fieldRequired", {
-                        attribute: t("Design:to"),
+                        attribute: t("Design:from"),
                       })}`,
                     },
                   })}

package/src/sortable-tree/SortableTreeItem.tsx

@@ -53,7 +53,6 @@ export interface SortableTreeItemProps {
   };
   setIsExpanded?: () => void;
   isOverride?: boolean;
-  isProduct?: boolean;
 }
 
 export function SortableTreeItem({
@@ -81,7 +80,6 @@ export function SortableTreeItem({
   secondaryBadge,
   setIsExpanded,
   isOverride,
-  isProduct = false,
 }: SortableTreeItemProps) {
   const [expanded, setExpanded] = useState(isExpanded);
   const [isModalVisible, setIsModalVisible] = useState(isNewAdded);
@@ -152,7 +150,6 @@ export function SortableTreeItem({
   };
 
   const onEdit = (e) => {
-    if (isOverride && !isProduct) return;
     e.stopPropagation();
     if (edit && !isModalVisible) edit();
     setIsModalVisible(true);