@flozy/editor 10.7.0 → 10.7.1

package/dist/Editor/common/Uploader.js

@@ -1,9 +1,13 @@
-import React, { useState } from "react";
-import { Grid, Button, Typography } from "@mui/material";
+import React, { useRef, useState } from "react";
+import Grid from "@mui/material/Grid";
+import Button from "@mui/material/Button";
+import Typography from "@mui/material/Typography";
+import Box from "@mui/material/Box";
+import CircularProgress from "@mui/material/CircularProgress";
 import { convertBase64 } from "../utils/helper";
-import { uploadFile } from "../service/fileupload";
 import Icon from "./Icon";
 import UploadStyles from "../common/ImageSelector/UploadStyles";
+import { allowedTypes, extensionMap } from "../Elements/Form/Workflow/constant";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -12,35 +16,94 @@ const Uploader = props => {
     value,
     onUploaded,
     customProps,
-    title
+    title,
+    setS3UploadProp,
+    setUniqueId,
+    uniqueId
   } = props;
   const classes = UploadStyles();
   const [base64, setBase64] = useState(value?.url);
   const [fileName, setFileName] = useState("");
-  const [uploading, setUploading] = useState(false);
+  const allowedFormat = {
+    Document: ".pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.txt,.rtf",
+    Image: "image/*",
+    Video: "video/*",
+    Embed: "*"
+  };
+  const {
+    uploadFile,
+    services,
+    uploadTerminator
+  } = customProps;
+  const [uploadStatus, setUploadStatus] = useState({
+    isUploading: false,
+    uploadPercentage: 0
+  });
+  const [error, setError] = useState(null);
+  const xhrRef = useRef(null);
   const handleChange = async e => {
+    setError("");
     const uFile = e.target.files[0];
-    const strImage = await convertBase64(uFile);
-    setBase64(strImage);
-    setFileName(uFile?.name);
-    doUpload(strImage, e.target.files[0]);
+    if (!uFile) return;
+    const maxAllowedSize = 5 * 1024 * 1024;
+
+    // ✅ Check file size
+    if (uFile.size > maxAllowedSize) {
+      const sizeInMB = Math.round(maxAllowedSize / (1024 * 1024));
+      setError(`File size exceeds ${sizeInMB}MB for ${uFile.name.toLowerCase()}.`);
+      return;
+    }
+
+    // ✅ File type check with fallback to extension
+    const validTypes = allowedTypes["Image"];
+    const fileType = uFile.type;
+    const fileName = uFile.name.toLowerCase();
+    const fileExtension = fileName.split(".").pop();
+    const isValid = title === "Embed" || validTypes.includes(fileType) || extensionMap["Image"]?.includes(fileExtension);
+    if (!isValid) {
+      setError(`Invalid file format. Please upload a valid ${title.toLowerCase()}.`);
+      return;
+    }
+    try {
+      const strImage = await convertBase64(uFile);
+      setBase64(strImage);
+      setFileName(uFile?.name);
+      doUpload(strImage, e.target.files[0]);
+    } catch (error) {
+      setError("Failed to read file.");
+    }
+  };
+  const onSave = url => {
+    if (!uploadStatus?.isUploading) {
+      setS3UploadProp({
+        file: true
+      });
+    }
+    onUploaded(url);
   };
   const doUpload = async (strImage, file) => {
-    setUploading(true);
     const formData = new FormData();
     formData.set("file", file);
     formData.set("resource_type", "pages");
     formData.set("resource_id", customProps?.page_id);
-    const result = await uploadFile(formData, customProps);
-    setUploading(false);
-    if (result && result?.imageURL) {
-      onUploaded(result?.imageURL[0]);
+    const id = crypto?.randomUUID();
+    setUniqueId(id);
+    const result = await services("uploadFile", file);
+    if (result?.data?.[0]) {
+      const fileEntry = {
+        file: file,
+        xhrRef,
+        presidnedURL: result.data?.[0],
+        status: "uploading"
+      };
+      uploadFile(id, fileEntry, setUploadStatus, onSave, "image");
     }
   };
   const {
     translation
   } = customProps;
   const onRemoveBG = () => {
+    uploadTerminator(uniqueId, setUploadStatus);
     setBase64(null);
     onUploaded("none");
   };
@@ -59,6 +122,7 @@ const Uploader = props => {
   const renderThumb = () => {
     switch (title) {
       case "Document":
+      case "Video":
         return /*#__PURE__*/_jsxs(_Fragment, {
           children: [/*#__PURE__*/_jsx(Typography, {
             style: {
@@ -82,11 +146,54 @@ const Uploader = props => {
         });
     }
   };
+  const UploadingProgress = () => {
+    return /*#__PURE__*/_jsx(Grid, {
+      container: true,
+      direction: "row",
+      justifyContent: "space-between",
+      alignItems: "center",
+      children: /*#__PURE__*/_jsx(Box, {
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "flex-start",
+        justifyContent: "space-between",
+        sx: {
+          gap: 1,
+          mb: 1,
+          mt: 1
+        },
+        children: /*#__PURE__*/_jsxs(Box, {
+          display: "flex",
+          alignItems: "center",
+          gap: 1,
+          children: [/*#__PURE__*/_jsx(Typography, {
+            variant: "body",
+            children: `Uploading ${uploadStatus?.fileSize}`
+          }), /*#__PURE__*/_jsx(CircularProgress, {
+            variant: "determinate",
+            value: uploadStatus?.uploadPercentage ?? 0,
+            className: "circularProgress-cls",
+            size: 15,
+            thickness: 8
+          }), /*#__PURE__*/_jsx(Typography, {
+            variant: "body",
+            children: `${uploadStatus?.uploadPercentage?.toFixed(0) ?? 0}%`
+          })]
+        })
+      })
+    });
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Grid, {
+    children: [/*#__PURE__*/_jsxs(Grid, {
       item: true,
       xs: 12,
-      children: uploading ? translation("uploadingText") : ""
+      children: [!error && uploadStatus?.isUploading ? /*#__PURE__*/_jsx(UploadingProgress, {}) : "", error && /*#__PURE__*/_jsx(Typography, {
+        style: {
+          color: "red",
+          marginBottom: "8px"
+        },
+        children: error
+      })]
     }), /*#__PURE__*/_jsx(Grid, {
       container: true,
       sx: classes.uploadContainer,
@@ -98,7 +205,7 @@ const Uploader = props => {
           ...getBackground()
         },
         sx: classes.uploadField,
-        children: !uploading ? /*#__PURE__*/_jsx(Grid, {
+        children: !uploadStatus?.isUploading ? /*#__PURE__*/_jsx(Grid, {
           className: "uploadImageSection",
           children: base64 ? renderThumb() : /*#__PURE__*/_jsx(Grid, {
             className: "uploadImageText",
@@ -112,6 +219,7 @@ const Uploader = props => {
               sx: classes.uploadIcon,
               children: [/*#__PURE__*/_jsx("input", {
                 type: "file",
+                accept: allowedFormat["Image"],
                 style: {
                   opacity: 0,
                   width: "0px"

package/dist/Editor/common/UploaderWithProgress.js

@@ -0,0 +1,183 @@
+import React, { useState } from "react";
+import { Grid, Button, Typography } from "@mui/material";
+import { convertBase64 } from "../utils/helper";
+import Icon from "./Icon";
+import UploadStyles from "../common/ImageSelector/UploadStyles";
+import { allowedFormat, maxSizeMap, allowedTypes, extensionMap } from "../Elements/Form/Workflow/constant";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const UploaderWithProgress = props => {
+  const {
+    value,
+    onUploaded,
+    customProps,
+    setS3UploadProp,
+    s3UploadProp
+  } = props;
+  const title = props.title || "Image";
+  const classes = UploadStyles();
+  const [base64, setBase64] = useState(value?.url);
+  const [fileName, setFileName] = useState("");
+  const [uploading, setUploading] = useState(false);
+  const [error, setError] = useState("");
+  const handleChange = async e => {
+    setError("");
+    const uFile = e.target.files[0];
+    if (!uFile) return;
+    const maxAllowedSize = maxSizeMap[title] || 5 * 1024 * 1024;
+
+    // ✅ Check file size
+    if (uFile.size > maxAllowedSize) {
+      const sizeInMB = Math.round(maxAllowedSize / (1024 * 1024));
+      setError(`File size exceeds ${sizeInMB}MB for ${title.toLowerCase()}.`);
+      return;
+    }
+
+    // ✅ File type check with fallback to extension
+    const validTypes = allowedTypes[title];
+    const fileType = uFile.type;
+    const fileName = uFile.name.toLowerCase();
+    const fileExtension = fileName.split(".").pop();
+    const isValid = title === "Embed" || validTypes.includes(fileType) || extensionMap[title]?.includes(fileExtension);
+    if (!isValid) {
+      setError(`Invalid file format. Please upload a valid ${title.toLowerCase()}.`);
+      return;
+    }
+    try {
+      const strImage = await convertBase64(uFile);
+      setBase64(strImage);
+      setFileName(uFile?.name);
+      doUpload(strImage, uFile);
+    } catch (err) {
+      setError("Failed to read file.");
+    }
+  };
+  const doUpload = async (strImage, file) => {
+    setUploading(true);
+    setS3UploadProp({
+      ...s3UploadProp,
+      file: file,
+      pageId: customProps?.page_id,
+      services: customProps?.services
+    });
+    setUploading(false);
+  };
+  const {
+    translation
+  } = customProps;
+  const onRemoveBG = () => {
+    setBase64(null);
+    onUploaded("");
+    setS3UploadProp({
+      ...s3UploadProp,
+      file: null
+    });
+  };
+  const getBackground = () => {
+    switch (title) {
+      case "Document":
+        return {
+          backgroundImage: `url()`
+        };
+      default:
+        return {
+          backgroundImage: base64 ? `url(${base64})` : "none"
+        };
+    }
+  };
+  const renderThumb = () => {
+    switch (title) {
+      case "Video":
+      case "Document":
+        return /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx(Typography, {
+            style: {
+              padding: "8px",
+              fontSize: "12px",
+              color: "#2563eb",
+              textAlign: "center"
+            },
+            children: fileName
+          }), /*#__PURE__*/_jsx(Grid, {
+            className: "removeImageText",
+            onClick: onRemoveBG,
+            children: translation("Remove")
+          })]
+        });
+      default:
+        return /*#__PURE__*/_jsx(Grid, {
+          className: "removeImageText",
+          onClick: onRemoveBG,
+          children: translation("Remove")
+        });
+    }
+  };
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: /*#__PURE__*/_jsxs(Grid, {
+      style: {
+        height: error ? "fit-content" : "inherit"
+      },
+      className: "uploaderRoot",
+      children: [/*#__PURE__*/_jsx(Grid, {
+        item: true,
+        xs: 12,
+        children: error && /*#__PURE__*/_jsx(Typography, {
+          style: {
+            color: "red",
+            marginBottom: "8px"
+          },
+          children: error
+        })
+      }), /*#__PURE__*/_jsx(Grid, {
+        container: true,
+        sx: classes.uploadContainer,
+        style: {
+          minHeight: error ? "250px" : "none"
+        },
+        className: "uploaderDragPlace",
+        children: /*#__PURE__*/_jsx(Grid, {
+          item: true,
+          xs: 12,
+          className: "btn--wrpr",
+          style: {
+            ...getBackground()
+          },
+          sx: classes.uploadField,
+          children: !uploading ? /*#__PURE__*/_jsx(Grid, {
+            className: "uploadImageSection",
+            children: base64 ? renderThumb() : /*#__PURE__*/_jsx(Grid, {
+              className: "uploadImageText",
+              children: /*#__PURE__*/_jsxs(Button, {
+                component: "label",
+                variant: "text",
+                style: {
+                  background: "none",
+                  width: "100%"
+                },
+                sx: classes.uploadIcon,
+                children: [/*#__PURE__*/_jsx("input", {
+                  type: "file",
+                  accept: allowedFormat[title],
+                  style: {
+                    opacity: 0,
+                    width: "0px"
+                  },
+                  onChange: handleChange
+                }), /*#__PURE__*/_jsx(Icon, {
+                  icon: "fileUpload"
+                }), /*#__PURE__*/_jsx("span", {
+                  style: {
+                    paddingLeft: "8px"
+                  },
+                  children: `${translation("upload")} ${translation(title) || translation("image")}`
+                })]
+              })
+            })
+          }) : null
+        })
+      })]
+    })
+  });
+};
+export default UploaderWithProgress;

package/dist/Editor/common/iconslist.js

@@ -1677,6 +1677,27 @@ export const CloseIcon = props => /*#__PURE__*/_jsxs("svg", {
     strokeLinejoin: "round"
   })]
 });
+export const CloseIcon2 = props => /*#__PURE__*/_jsxs("svg", {
+  width: "10",
+  height: "10",
+  viewBox: "0 0 10 10",
+  fill: "none",
+  xmlns: "http://www.w3.org/2000/svg",
+  ...(props || {}),
+  children: [/*#__PURE__*/_jsx("path", {
+    d: "M9.12476 0.875L0.875176 9.12458",
+    stroke: "#8F9CAE",
+    strokeWidth: "1.5",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  }), /*#__PURE__*/_jsx("path", {
+    d: "M0.875183 0.875L9.12476 9.12458",
+    stroke: "#8F9CAE",
+    strokeWidth: "1.5",
+    strokeLinecap: "round",
+    strokeLinejoin: "round"
+  })]
+});
 export const SearchIcon = () => /*#__PURE__*/_jsxs("svg", {
   width: "18",
   height: "18",