Merge pull request #1941 from OpenSignLabs/updates-17737216200

v2.28.0

Author: prafull-opensignlabs

apps/OpenSign/package.json

@@ -51,7 +51,7 @@
     "reactour": "^1.19.4",
     "redux": "^5.0.1",
     "regex-parser": "^2.3.1",
-    "serve": "^14.2.4",
+    "serve": "^14.2.5",
     "styled-components": "^5.3.11",
     "web-vitals": "^5.1.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"

apps/OpenSign/public/locales/de/translation.json

@@ -8,7 +8,7 @@
   "dark-mode": "Dunkelmodus",
   "name": "Name",
   "phone": "Telefon",
-  "phone-optional": "optional",
+  "phone-optional": "Optional",
   "email": "E-Mail",
   "company": "Unternehmen",
   "job-title": "Berufsbezeichnung",
@@ -1210,5 +1210,12 @@
   "otp-email": "Wir haben einen Bestätigungscode gesendet",
   "save-as-temp-warn": "Hinweis: Dieses Dokument enthält vorausgefüllte Widgets, die automatisch entfernt werden, da sie bereits im Basisdokument integriert sind.",
   "edit-document": "Dokument bearbeiten",
-  "otp-email": "Wir haben einen Bestätigungscode gesendet"
+  "modify": "Ändern",
+  "merge-certificate-to-pdf": "Zertifikat mit PDF zusammenführen",
+  "merge-cc-to-pdf-help": {
+    "p1": "Dies stellt sicher, dass das Abschlusszertifikat im endgültigen PDF-Dokument enthalten ist. Bitte beachten Sie jedoch, dass das Zertifikat nach dem Zusammenführen nicht mehr vom Hauptdokument getrennt werden kann.",
+    "p2": "Wenn Sie sich entscheiden, nicht zusammenzuführen, wird das Abschlusszertifikat als separate PDF-Datei zusammen mit dem unterzeichneten Dokument bereitgestellt."
+  },
+  "enter-name": "Name eingeben",
+  "enter-email": "E-Mail eingeben"
 }

apps/OpenSign/public/locales/en/translation.json

@@ -8,7 +8,7 @@
   "dark-mode": "Dark mode",
   "name": "Name",
   "phone": "Phone",
-  "phone-optional": "optional",
+  "phone-optional": "Optional",
   "email": "Email",
   "company": "Company",
   "job-title": "Job title",
@@ -1211,5 +1211,12 @@
   "otp-email":"We’ve sent a verification code to",
   "save-as-temp-warn":"Note: This document includes prefilled widgets, which will be automatically removed as they are already incorporated into the base document.",
   "edit-document": "Edit document",
-  "otp-email":"We've sent a verification code to"
+  "modify": "Modify",
+  "merge-certificate-to-pdf": "Merge Certificate to PDF",
+  "merge-cc-to-pdf-help": {
+    "p1": "This will ensure that the completion certificate is included in the final PDF document. However, please note that once merged, the certificate cannot be separated from the main document.",
+    "p2": "If you choose not to merge, the completion certificate will be provided as a separate PDF file along with the signed document."
+  },
+  "enter-name": "Enter name",
+  "enter-email": "Enter email"
 }

apps/OpenSign/public/locales/es/translation.json

@@ -8,7 +8,7 @@
   "dark-mode": "Modo oscuro",
   "name": "Nombre",
   "phone": "Teléfono",
-  "phone-optional": "opcional",
+  "phone-optional": "Opcional",
   "email": "Correo",
   "company": "Compañía",
   "job-title": "Título del puesto",
@@ -1211,5 +1211,12 @@
   "otp-email": "Hemos enviado un código de verificación",
   "save-as-temp-warn": "Nota: Este documento incluye widgets prellenados, que se eliminarán automáticamente ya que ya están incorporados en el documento base.",
   "edit-document": "Editar documento",
-  "otp-email": "Hemos enviado un código de verificación"
+  "modify": "Modificar",
+  "merge-certificate-to-pdf": "Combinar certificado con PDF",
+  "merge-cc-to-pdf-help": {
+    "p1": "Esto garantizará que el certificado de finalización esté incluido en el documento PDF final. Sin embargo, tenga en cuenta que una vez combinado, el certificado no se podrá separar del documento principal.",
+    "p2": "Si elige no combinar, el certificado de finalización se proporcionará como un archivo PDF separado junto con el documento firmado."
+  },
+  "enter-name": "Ingrese nombre",
+  "enter-email": "Ingrese correo electrónico"
 }

apps/OpenSign/public/locales/fr/translation.json

@@ -8,7 +8,7 @@
   "dark-mode": "Mode sombre",
   "name": "Nom et Prénom",
   "phone": "Téléphone",
-  "phone-optional": "(facultatif)",
+  "phone-optional": "Optionnel",
   "email": "E-mail",
   "company": "Organisation",
   "job-title": "Votre Fonction",
@@ -1210,5 +1210,12 @@
   "otp-email": "Nous avons envoyé un code de vérification",
   "save-as-temp-warn": "Remarque : Ce document contient des widgets préremplis, qui seront automatiquement supprimés car ils sont déjà intégrés dans le document de base.",
   "edit-document": "Modifier le document",
-  "otp-email": "Nous avons envoyé un code de vérification"
+  "modify": "Modifier",
+  "merge-certificate-to-pdf": "Fusionner le certificat avec le PDF",
+  "merge-cc-to-pdf-help": {
+    "p1": "Cela garantira que le certificat de finalisation est inclus dans le document PDF final. Cependant, veuillez noter qu'une fois fusionné, le certificat ne peut plus être séparé du document principal.",
+    "p2": "Si vous choisissez de ne pas fusionner, le certificat de finalisation sera fourni sous forme de fichier PDF distinct accompagné du document signé."
+  },
+  "enter-name": "Saisir le nom",
+  "enter-email": "Saisir l'e-mail"
 }

apps/OpenSign/public/locales/hi/translation.json

@@ -1210,5 +1210,13 @@
   "otp-email": "हमने एक सत्यापन कोड भेजा है",
   "save-as-temp-warn": "नोट: इस दस्तावेज़ में पहले से भरे हुए विजेट शामिल हैं, जिन्हें स्वचालित रूप से हटा दिया जाएगा क्योंकि वे पहले से ही मूल दस्तावेज़ में सम्मिलित हैं।",
   "edit-document": "दस्तावेज़ संपादित करें",
-  "otp-email": "हमने एक सत्यापन कोड भेजा है"
+  "modify": "संशोधित करें",
+  "merge-certificate-to-pdf": "प्रमाणपत्र को PDF में मिलाएँ",
+  "merge-cc-to-pdf-help": {
+    "p1": "यह सुनिश्चित करेगा कि पूर्णता प्रमाणपत्र अंतिम PDF दस्तावेज़ में शामिल हो। हालाँकि, कृपया ध्यान दें कि एक बार मिलाने के बाद, प्रमाणपत्र को मुख्य दस्तावेज़ से अलग नहीं किया जा सकता।",
+    "p2": "यदि आप मिलाना नहीं चुनते हैं, तो पूर्णता प्रमाणपत्र हस्ताक्षरित दस्तावेज़ के साथ एक अलग PDF फ़ाइल के रूप में प्रदान किया जाएगा।"
+  },
+  "enter-name": "नाम दर्ज करें",
+  "enter-email": "ईमेल दर्ज करें"
+
 }

apps/OpenSign/public/locales/it/translation.json

@@ -8,7 +8,7 @@
   "dark-mode": "Modalità scura",
   "name": "Nome",
   "phone": "Telefono",
-  "phone-optional": "facoltativo",
+  "phone-optional": "Opzionale",
   "email": "Email",
   "company": "Azienda",
   "job-title": "Titolo professionale",
@@ -1210,5 +1210,12 @@
   "otp-email": "Abbiamo inviato un codice di verifica",
   "save-as-temp-warn": "Nota: Questo documento include widget precompilati, che verranno automaticamente rimossi poiché sono già incorporati nel documento di base.",
   "edit-document": "Modifica documento",
-  "otp-email": "Abbiamo inviato un codice di verifica"
+  "modify": "Modifica",
+  "merge-certificate-to-pdf": "Unisci certificato al PDF",
+  "merge-cc-to-pdf-help": {
+    "p1": "Questo garantirà che il certificato di completamento sia incluso nel documento PDF finale. Tuttavia, si noti che una volta unito, il certificato non può essere separato dal documento principale.",
+    "p2": "Se scegli di non unire, il certificato di completamento sarà fornito come file PDF separato insieme al documento firmato."
+  },
+  "enter-name": "Inserisci nome",
+  "enter-email": "Inserisci e-mail"
 }

apps/OpenSign/src/components/AddSigner.jsx

@@ -244,6 +244,7 @@ const AddSigner = (props) => {
               onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
               onInput={(e) => e.target.setCustomValidity("")}
               className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              placeholder={t("enter-name")}
             />
           </div>
           <div className="mb-3">
@@ -263,6 +264,7 @@ const AddSigner = (props) => {
               onInput={(e) => e.target.setCustomValidity("")}
               disabled={addYourself}
               className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+              placeholder={t("enter-email")}
             />
           </div>
           <div className="mb-3">

apps/OpenSign/src/components/AddUser.jsx

@@ -179,6 +179,7 @@ const AddUser = (props) => {
                           onInput={(e) => e.target.setCustomValidity("")}
                           required
                           className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                          placeholder={t("enter-name")}
                         />
                       </div>
                       <div className="mb-3">
@@ -200,6 +201,7 @@ const AddUser = (props) => {
                           }
                           onInput={(e) => e.target.setCustomValidity("")}
                           className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+                          placeholder={t("enter-email")}
                         />
                       </div>
                       <div className="mb-3">

apps/OpenSign/src/components/dashboard/DashboardCard.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import axios from "axios";
 import Parse from "parse";
 import getReplacedHashQuery from "../../constant/getReplacedHashQuery";
@@ -168,25 +168,21 @@ const DashboardCard = (props) => {
                 }
               }
               setresponse(arr.length);
-              setLoading(false);
             });
         } else {
           await axios.get(url, { headers: headers }).then((res) => {
-            if (res.data.results.length > 0) {
-              setLoading(false);
-              if (props.Data.key !== "count") {
-                setresponse(res.data.results[0][props.Data.key]);
-              } else {
-                setresponse(res.data[props.Data.key]);
-              }
+            if (res?.data?.[props.Data.key]) {
+              setresponse(parseInt(res.data[props.Data.key]));
+            } else if (res?.data?.results?.length > 0) {
+              setresponse(res.data.results.length);
             } else {
               setresponse(0);
-              setLoading(false);
             }
           });
         }
       } catch (e) {
         console.error("Problem", e);
+      } finally {
         setLoading(false);
       }
     }