Merge pull request #122 from prafull-opensignlabs/staging

add progess bar for file_upload
2026-08-22 07:32:31 +02:00 · 2023-11-03 14:06:37 +05:30
parent 789c4bd97f d823696f4f
commit 6fc7a41b8d
5 changed files with 151 additions and 86 deletions
@@ -156,7 +156,35 @@ const DashboardCard = (props) => {
            if (props.Data.key !== "count") {
              setresponse(res.data.results[0][props.Data.key]);
            } else {
-              setresponse(res.data[props.Data.key]);
+              if (props.Label === "Need your Signature") {
+                const listData = res.data?.results.filter(
+                  (x) => x.Signers.length > 0
+                );
+                let arr = [];
+                for (const obj of listData) {
+                  const isSigner = obj.Signers.some(
+                    (item) => item.UserId.objectId === currentUser.id
+                  );
+                  if (isSigner) {
+                    let isRecord;
+                    if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
+                      isRecord = obj?.AuditTrail.some(
+                        (item) =>
+                          item?.UserPtr?.UserId?.objectId === currentUser.id &&
+                          item.Activity === "Signed"
+                      );
+                    } else {
+                      isRecord = false;
+                    }
+                    if (isRecord === false) {
+                      arr.push(obj);
+                    }
+                  }
+                }
+                setresponse(arr.length);
+              } else {
+                setresponse(res.data[props.Data.key]);
+              }
            }
          } else {
            setresponse(0);
@@ -34,10 +34,39 @@ function DashboardReport(props) {
        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
      };
      try {
-        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}`;
+        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&include=AuditTrail.UserPtr`;
        const res = await axios.get(url, { headers: headers });
        // console.log("res ", res.data?.results);
-        setList(res.data?.results);
+        if (id === "5Go51Q7T8r") {
+          const currentUser = Parse.User.current().id;
+          const listData = res.data?.results.filter(
+            (x) => x.Signers.length > 0
+          );
+          let arr = [];
+          for (const obj of listData) {
+            const isSigner = obj.Signers.some(
+              (item) => item.UserId.objectId === currentUser
+            );
+            if (isSigner) {
+              let isRecord;
+              if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
+                isRecord = obj?.AuditTrail.some(
+                  (item) =>
+                    item?.UserPtr?.UserId?.objectId === currentUser &&
+                    item.Activity === "Signed"
+                );
+              } else {
+                isRecord = false;
+              }
+              if (isRecord === false) {
+                arr.push(obj);
+              }
+            }
+          }
+          setList(arr);
+        } else {
+          setList(res.data?.results);
+        }
        setIsLoader(false);
      } catch (err) {
        console.log("err ", err);
@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from "react";
 import { SaveFileSize } from "../../constant/saveFileSize";
-import Parse from "parse";
-import sanitizeFileName from "../../primitives/sanitizeFileName";
+// import Parse from "parse";
+// import sanitizeFileName from "../../primitives/sanitizeFileName";
+import axios from "axios";

 const FileUpload = (props) => {
  const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
@@ -11,7 +12,7 @@ const FileUpload = (props) => {

  const [localValue, setLocalValue] = useState("");
  const [Message] = useState(false);
-  const [percentage] = useState(0);
+  const [percentage, setpercentage] = useState(0);

  const REQUIRED_FIELD_SYMBOL = "*";

@@ -68,33 +69,50 @@ const FileUpload = (props) => {
  };

  const handleFileUpload = async (file) => {
-    Parse.serverURL = parseBaseUrl;
-    Parse.initialize(parseAppId);
-    const size = file.size;
-    const fileName = file.name;
-    const name = sanitizeFileName(fileName);
    setfileload(true);
-    const pdfFile = file;
-    const parseFile = new Parse.File(name, pdfFile);
+    const file_url = parseBaseUrl.slice(0, -4);
+    const url = `${file_url}file_upload`;
+    const formData = new FormData();
+    formData.append("file", file);
+    const config = {
+      headers: {
+        "content-type": "multipart/form-data",
+        "X-Parse-Application-Id": parseAppId
+      },
+      onUploadProgress: function (progressEvent) {
+        var percentCompleted = Math.round(
+          (progressEvent.loaded * 100) / progressEvent.total
+        );
+        setpercentage(percentCompleted);
+      }
+    };

    try {
-      const response = await parseFile.save();
+      await axios
+        .post(url, formData, config)
+        .then((res) => {
+          if (res.data.status === "Error") {
+            alert(res.data.message);
+          }
+          setFileUpload(res.data.imageUrl);
+          props.onChange(res.data.imageUrl);
+          setfileload(false);
+          setpercentage(0);

-      setFileUpload(response.url());
-      props.onChange(response.url());
-      setfileload(false);
-      // The response object will contain information about the uploaded file
-      // console.log("File uploaded:", response);
-
-      // You can access the URL of the uploaded file using response.url()
-      // console.log("File URL:", response.url());
-      if (response.url()) {
-        SaveFileSize(size, response.url());
-
-        return response.url();
-      }
+          if (res.data.imageUrl) {
+            SaveFileSize(file.size, res.data.imageUrl);
+            return res.data.imageUrl;
+          }
+        })
+        .catch((err) => {
+          alert(`${err.message}`);
+          setfileload(false);
+          setpercentage(0);
+        });
    } catch (error) {
-      console.error("Error uploading file:", error);
+      alert(error.message);
+      setfileload(false);
+      setpercentage(0);
    }
  };

@@ -106,7 +124,7 @@ const FileUpload = (props) => {
        <a
          href={props.formData}
          title={props.formData}
-          style={{ paddingBottom: "10px", color: "blue" }}
+          style={{ paddingBottom: "10px", color: "blue"}}
        >
          Download
        </a>
@@ -133,12 +151,14 @@ const FileUpload = (props) => {
            <span className="required">{REQUIRED_FIELD_SYMBOL}</span>
          )}
          {fileload ? (
-            <div className="progress pull-right">
-              <div
-                className="progress__bar"
-                style={{ width: `${percentage}%` }}
-              ></div>
-              <span className="progress__value">{percentage}%</span>
+            <div className="flex items-center gap-x-2">
+              <div className="h-2 rounded-full w-[200px] md:w-[400px] bg-gray-200">
+                <div
+                  className="h-2 rounded-full bg-blue-500"
+                  style={{ width: `${percentage}%` }}
+                ></div>
+              </div>
+              <span className="text-black text-sm">{percentage}%</span>
            </div>
          ) : (
            Message && (
@@ -1,8 +1,6 @@
 import Parse from "parse";
 export default function reportJson(id) {
  const currentUserId = Parse.User.current().id;
-  // const extendedCls = localStorage.getItem("Extand_Class");
-  // const json = JSON.parse(extendedCls)?.[0];
  // console.log("json ", json);

  switch (id) {
@@ -55,28 +53,7 @@ export default function reportJson(id) {
          ExpiryDate: {
            $gt: { __type: "Date", iso: new Date().toISOString() }
          },
-          $and: [
-            {
-              "AuditTrail.UserPtr": {
-                $ne: {
-                  __type: "Pointer",
-                  className: "contracts_Users",
-                  objectId: "CkpaR0F6mj"
-                }
-              }
-            },
-            { "AuditTrail.Activity": { $ne: "Signed" } }
-          ],
-          Placeholders: { $ne: null },
-          Signers: {
-            $in: [
-              {
-                __type: "Pointer",
-                className: "contracts_Users",
-                objectId: "CkpaR0F6mj"
-              }
-            ]
-          }
+          Placeholders: { $ne: null }
        },
        keys: [
          "Name",
@@ -84,7 +61,9 @@ export default function reportJson(id) {
          "Folder.Name",
          "URL",
          "ExtUserPtr.Name",
-          "Signers.Name"
+          "Signers.Name",
+          "Signers.UserId",
+          "AuditTrail"
        ],
        orderBy: "-updatedAt",
        actions: [
@@ -342,28 +321,7 @@ export default function reportJson(id) {
          ExpiryDate: {
            $gt: { __type: "Date", iso: new Date().toISOString() }
          },
-          $and: [
-            {
-              "AuditTrail.UserPtr": {
-                $ne: {
-                  __type: "Pointer",
-                  className: "contracts_Users",
-                  objectId: "CkpaR0F6mj"
-                }
-              }
-            },
-            { "AuditTrail.Activity": { $ne: "Signed" } }
-          ],
-          Placeholders: { $ne: null },
-          Signers: {
-            $in: [
-              {
-                __type: "Pointer",
-                className: "contracts_Users",
-                objectId: "CkpaR0F6mj"
-              }
-            ]
-          }
+          Placeholders: { $ne: null }
        },
        keys: [
          "Name",
@@ -371,7 +329,9 @@ export default function reportJson(id) {
          "Folder.Name",
          "URL",
          "ExtUserPtr.Name",
-          "Signers.Name"
+          "Signers.Name",
+          "Signers.UserId",
+          "AuditTrail"
        ],
        orderBy: "-updatedAt",
        actions: [
@@ -27,6 +27,7 @@ const Report = () => {
      const { className, params, keys, orderBy } = json;
      Parse.serverURL = localStorage.getItem("BaseUrl12");
      Parse.initialize(localStorage.getItem("AppID12"));
+      const currentUser = Parse.User.current().id;
      const serverURL =
        localStorage.getItem("BaseUrl12") + "classes/" + className;

@@ -38,10 +39,37 @@ const Report = () => {
        "X-Parse-Session-Token": localStorage.getItem("accesstoken")
      };
      try {
-        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}`;
+        const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&include=AuditTrail.UserPtr`;
        const res = await axios.get(url, { headers: headers });
-        // console.log("res ", res.data?.results);
-        setList(res.data?.results);
+        if (id === "4Hhwbp482K") {
+          const listData = res.data?.results.filter(
+            (x) => x.Signers.length > 0
+          );
+          let arr = [];
+          for (const obj of listData) {
+            const isSigner = obj.Signers.some(
+              (item) => item.UserId.objectId === currentUser
+            );
+            if (isSigner) {
+              let isRecord;
+              if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
+                isRecord = obj?.AuditTrail.some(
+                  (item) =>
+                    item?.UserPtr?.UserId?.objectId === currentUser &&
+                    item.Activity === "Signed"
+                );
+              } else {
+                isRecord = false;
+              }
+              if (isRecord === false) {
+                arr.push(obj);
+              }
+            }
+          }
+          setList(arr);
+        } else {
+          setList(res.data?.results);
+        }
        setIsLoader(false);
      } catch (err) {
        console.log("err ", err);