Merge pull request #341 from OpenSignLabs/staging

apps/OpenSign/src/components/pdf/Placeholder.js

@@ -76,20 +76,7 @@ const changeDateToMomentFormat = (format) => {
 };
 //function to get default format
 const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
-//function to convert formated date to new Date() format
-const getDefaultDate = (dateStr, format) => {
-  //get valid date format for moment to convert formated date to new Date() format
-  const formats = changeDateToMomentFormat(format);
-  const parsedDate = moment(dateStr, formats);
-  let date;
-  if (parsedDate.isValid()) {
-    date = new Date(parsedDate.toISOString());
-    return date;
-  } else {
-    date = new Date();
-    return date;
-  }
-};
+
 function Placeholder(props) {
   //'isTouchDevice' is used to detect whether a device has a touchscreen or is mouse-based
   const isTouchDevice = navigator.maxTouchPoints > 0;
@@ -104,14 +91,7 @@ function Placeholder(props) {
   const [selectDate, setSelectDate] = useState({});
   const [dateFormat, setDateFormat] = useState([]);
   const [clickonWidget, setClickonWidget] = useState({});
-  const [startDate, setStartDate] = useState(
-    props?.pos?.options?.response
-      ? getDefaultDate(
-          props?.pos?.options?.response,
-          props.pos?.options?.validation?.format
-        )
-      : new Date()
-  );
+  const [startDate, setStartDate] = useState(new Date());
   const [getCheckboxRenderWidth, setGetCheckboxRenderWidth] = useState({
     width: null,
     height: null
@@ -459,7 +439,7 @@ function Placeholder(props) {
     if (props.pos.type === "date") {
       const isDateChange = true;
       const dateObj = {
-        date: startDate,
+        date: startDate || new Date(),
         format: getDefaultFormat(props.pos?.options?.validation?.format)
       };
       handleSaveDate(dateObj, isDateChange); //function to save date and format in local array

apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js

@@ -35,8 +35,7 @@ const makeEmail = async (
   bcc,
   filename,
   certificatePath,
-  replyto,
-  testPdf
+  replyto
 ) => {
   const publicUrl = new URL(process.env.SERVER_URL);
   const htmlContent = html;
@@ -47,7 +46,7 @@ const makeEmail = async (
   let str;
   if (url) {
     let attachments;
-    let Pdf = fs.createWriteStream(testPdf);
+    let Pdf = fs.createWriteStream('test.pdf');
     const writeToLocalDisk = () => {
       return new Promise((resolve, reject) => {
         const isSecure =
@@ -162,8 +161,6 @@ export default async function sendMailGmailProvider(_extRes, template) {
       // Construct email message
       const from = sender || _extRes.Email || 'me';
       const to = receiver;
-      const randomNumber = Math.floor(Math.random() * 5000);
-      const testPdf = `test_${randomNumber}.pdf`;
       const email = await makeEmail(
         to,
         from,
@@ -174,8 +171,7 @@ export default async function sendMailGmailProvider(_extRes, template) {
         bcc,
         filename,
         certificatePath,
-        replyto,
-        testPdf
+        replyto
       );
       // Update Gmail client with new access token
       const newGmail = createGmailClient(access_token);
@@ -193,13 +189,6 @@ export default async function sendMailGmailProvider(_extRes, template) {
           console.log('Err in unlink certificate sendmailgmail provider');
         }
       }
-      if (fs.existsSync(testPdf)) {
-        try {
-          fs.unlinkSync(testPdf);
-        } catch (err) {
-          console.log('Err in unlink pdf sendmailv3');
-        }
-      }
       return { code: 200, message: 'Email sent successfully' };
     } catch (error) {
       console.error('Error sending email:', error);

apps/OpenSignServer/cloud/parsefunction/sendMailv3.js

@@ -29,9 +29,7 @@ async function sendMailProvider(req, plan, monthchange) {
       }
     }
     if (req.params.url) {
-      const randomNumber = Math.floor(Math.random() * 5000);
-      const testPdf = `test_${randomNumber}.pdf`;
-      let Pdf = fs.createWriteStream(testPdf);
+      let Pdf = fs.createWriteStream('test.pdf');
       const writeToLocalDisk = () => {
         return new Promise((resolve, reject) => {
           const isSecure =
@@ -131,13 +129,6 @@ async function sendMailProvider(req, plan, monthchange) {
                 console.log('Err in unlink certificate sendmailv3');
               }
             }
-            if (fs.existsSync(testPdf)) {
-              try {
-                fs.unlinkSync(testPdf);
-              } catch (err) {
-                console.log('Err in unlink pdf sendmailv3');
-              }
-            }
             return { status: 'success' };
           }
         } else {
@@ -155,13 +146,6 @@ async function sendMailProvider(req, plan, monthchange) {
                   console.log('Err in unlink certificate sendmailv3');
                 }
               }
-              if (fs.existsSync(testPdf)) {
-                try {
-                  fs.unlinkSync(testPdf);
-                } catch (err) {
-                  console.log('Err in unlink pdf sendmailv3');
-                }
-              }
               return { status: 'success' };
             }
           } else {
@@ -172,13 +156,6 @@ async function sendMailProvider(req, plan, monthchange) {
                 console.log('Err in unlink certificate sendmailv3');
               }
             }
-            if (fs.existsSync(testPdf)) {
-              try {
-                fs.unlinkSync(testPdf);
-              } catch (err) {
-                console.log('Err in unlink pdf sendmailv3');
-              }
-            }
             return { status: 'error' };
           }
         }