Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into validation

Author: prafull-opensignlabs

apps/OpenSign/package-lock.json

@@ -25,8 +25,8 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.5",
     "react-confetti": "^6.1.0",
-    "react-cookie": "^7.2.1",
-    "react-datepicker": "^7.4.0",
+    "react-cookie": "^7.2.2",
+    "react-datepicker": "^7.5.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dnd-multi-backend": "^8.0.3",
@@ -52,7 +52,7 @@
     "redux": "^5.0.1",
     "redux-thunk": "^3.1.0",
     "regex-parser": "^2.3.0",
-    "serve": "^14.2.3",
+    "serve": "^14.2.4",
     "styled-components": "^5.3.0",
     "web-vitals": "^4.2.3",
     "ws": "^8.18.0"
@@ -95,10 +95,10 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.25.8",
-    "@babel/preset-env": "^7.25.8",
-    "@babel/preset-react": "^7.25.7",
-    "@babel/runtime-corejs2": "^7.25.7",
+    "@babel/core": "^7.26.0",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.25.9",
+    "@babel/runtime-corejs2": "^7.26.0",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
     "clean-webpack-plugin": "^4.0.0",
@@ -108,7 +108,7 @@
     "daisyui": "^4.12.13",
     "dotenv": "^16.4.5",
     "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.12.0",
+    "eslint": "^9.13.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.1",
     "lint-staged": "^15.2.10",

apps/OpenSign/package.json

@@ -292,7 +292,7 @@
   "subject": "Subject",
   "body": "Body",
   "add-contact": "Add Contact",
-  "add-signer-alert": "Contact already exist!",
+  "add-signer-alert": "Contact already exist! Please select it from ‘Signers’ dropdown",
   "record-delete-alert": "Record deleted successfully!",
   "record-revoke-alert": "Record revoked successfully!",
   "mail-sent-alert": "Mail sent successfully.",
@@ -681,14 +681,15 @@
      "p3":"Tip: If your signers are familiar with OpenSign and frequently use it, you may want to disable the guided tour for a more seamless experience. Choose the option that best fits your document signing needs."
    },
    "form-title-1":"Document Flow Setting",
-   "form-title-2":"Security Setting",
+   "form-title-2":"Security Settings",
   "public-tour-message":"The template needs to be public before you can generate a shareable link.",
   "add-user-template": "You need to add a role before you can add fields for it.",
   "pdf-uncompatible": "This pdf is not compatible with opensign, please contact <[email protected]>",
   "text-field-tour":"Fields of type 'Text' must be filled in advance before the document is sent. If you need the signers to provide input, use the 'Text Input' field instead.",
   "attach-signer-tour":"You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour.",
   "allowed-signature-types": "Allowed signature types",
   "at-least-one-signature-type": "At least one signature type should be enabled.",
+  "add-signer-note": "Note - This contact will be added to your contact list",
   "allowed-signature-types-help": {
     "p1": "This signature preference controls which signing options are available to your signers. Only the signature types you select will appear in the signature widget when a document is signed. For example, if you choose only the 'Draw' option in preferences, your signer will see only the 'Draw' option in the signature widget, while the other three options will not be available.",
     "l1": "Create a handwritten signature directly on the screen using your finger or a stylus.",

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

@@ -292,7 +292,7 @@
   "subject": "Asunto",
   "body": "Cuerpo",
   "add-contact": "Agregar contacto",
-  "add-signer-alert": "¡El contacto ya existe!",
+  "add-signer-alert": "¡El contacto ya existe! Selecciónelo en el menú desplegable 'Firmantes'",
   "record-delete-alert": "¡Entrada eliminada exitosamente!",
   "record-revoke-alert": "¡Entrada revocada exitosamente!",
   "mail-sent-alert": "Correo enviado exitosamente.",
@@ -689,6 +689,7 @@
    "attach-signer-tour" :"Debe adjuntar un firmante a cada función. Puede hacerlo haciendo clic en este icono. Una vez que seleccione un Firmante, se adjuntará a todos los campos asociados con ese rol que aparecen en el mismo color.",
    "allowed-signature-types": "Tipos de firma permitidos",
    "at-least-one-signature-type": "Se debe habilitar al menos un tipo de firma.",
+   "add-signer-note": "Nota - Este contacto se agregará a su lista de contactos",
    "allowed-signature-types-help": {
     "p1": "Esta preferencia de firma controla qué opciones de firma están disponibles para sus firmantes. Solo los tipos de firma que seleccione aparecerán en el widget de firma cuando se firme un documento. Por ejemplo, si elige sólo la opción 'Draw' en las preferencias, su firmante verá sólo la opción 'Draw' en el widget de firma, mientras que las otras tres opciones no estarán disponibles.",
     "l1": "Cree una firma manuscrita directamente en la pantalla usando su dedo o un lápiz.",

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

@@ -291,7 +291,7 @@
   "subject": "Sujet",
   "body": "Corps",
   "add-contact": "Ajouter le contact",
-  "add-signer-alert": "Le contact existe déjà !",
+  "add-signer-alert": "Le contact existe déjà ! Veuillez le sélectionner dans la liste déroulante 'Signataires'",
   "record-delete-alert": "Enregistrement supprimé avec succès !",
   "record-revoke-alert": " Enregistrement révoqué avec succès ! ",
   "mail-sent-alert": "Courriel envoyé avec succès.",
@@ -688,6 +688,7 @@
   "attach-signer-tour" :"Vous devez associer un signataire à chaque rôle. Vous pouvez le faire en cliquant sur cette icône. Une fois que vous avez sélectionné un signataire, il sera attaché à tous les champs associés à ce rôle qui apparaissent dans la même couleur.",
   "allowed-signature-types": "Types de signature autorisés",
   "at-least-one-signature-type": "Au moins un type de signature doit être activé.",
+  "add-signer-note": "Remarque - Ce contact sera ajouté à votre liste de contacts",
   "allowed-signature-types-help": {
     "p1": "Cette préférence de signature contrôle les options de signature disponibles pour vos signataires. Seuls les types de signature que vous sélectionnez apparaîtront dans le widget de signature lorsqu'un document est signé. Par exemple, si vous choisissez uniquement l'option 'Draw' dans les préférences, votre signataire ne verra que l'option 'Draw' dans le widget de signature, tandis que les trois autres options ne seront pas disponibles.",
     "l1": "Créez une signature manuscrite directement sur l'écran à l'aide de votre doigt ou d'un stylet.",

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

@@ -206,6 +206,7 @@ const AddSigner = (props) => {
         </div>
       )}
       <div className="w-full mx-auto p-2 text-base-content">
+        <p className="mb-3">{t("add-signer-note")}</p>
         {isUserExist && (
           <div className="mb-3 flex items-center">
             <input

apps/OpenSign/src/components/AddSigner.js

@@ -16,7 +16,7 @@ import { useTranslation } from "react-i18next";
 import ModalUi from "../primitives/ModalUi";
 import QuotaCard from "../primitives/QuotaCard";
 
-const Header = ({ showSidebar }) => {
+const Header = ({ showSidebar, setIsMenu }) => {
   const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const { width } = useWindowSize();
@@ -40,7 +40,7 @@ const Header = ({ showSidebar }) => {
   const toggleDropdown = () => {
     setIsOpen(!isOpen);
     if (width <= 768) {
-      showSidebar();
+      setIsMenu(false);
     }
   };
   useEffect(() => {

apps/OpenSign/src/components/Header.js

@@ -339,9 +339,9 @@ function DropdownWidgetOption(props) {
                 value={
                   props.fontSize ||
                   props.currWidgetsDetails?.options?.fontSize ||
-                  "12"
+                  12
                 }
-                onChange={(e) => props.setFontSize(e.target.value)}
+                onChange={(e) => props.setFontSize(parseInt(e.target.value))}
               >
                 {fontsizeArr.map((size, ind) => {
                   return (

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

@@ -412,7 +412,7 @@ function Placeholder(props) {
       data?.format,
       null,
       null,
-      props.fontSize || props.pos?.options?.fontSize || "12",
+      props.fontSize || props.pos?.options?.fontSize || 12,
       props.fontColor || props.pos?.options?.fontColor || "black"
     );
     setSelectDate({ date: date, format: data?.format });
@@ -647,7 +647,7 @@ function Placeholder(props) {
     const fontSize = (size || 12) * containerScale * props.scale;
     //isMinHeight to set text box minimum height
     if (isMinHeight) {
-      return fontSize * 1.5 + "px";
+      return fontSize * 1.2 + "px";
     } else {
       return fontSize + "px";
     }
@@ -834,7 +834,7 @@ function Placeholder(props) {
         )}
         {isTabAndMobile ? (
           <div
-            className="flex items-stretch"
+            className="flex items-stretch justify-center"
             style={{
               left: xPos(props.pos, props.isSignYourself),
               top: yPos(props.pos, props.isSignYourself),
@@ -944,8 +944,8 @@ function Placeholder(props) {
             <span>{t("font-size")} :</span>
             <select
               className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
-              value={props.fontSize || clickonWidget.options?.fontSize || "12"}
-              onChange={(e) => props.setFontSize(e.target.value)}
+              value={props.fontSize || clickonWidget.options?.fontSize || 12}
+              onChange={(e) => props.setFontSize(parseInt(e.target.value))}
             >
               {fontsizeArr.map((size, ind) => {
                 return (

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

@@ -21,9 +21,11 @@ function TextFontSetting(props) {
             value={
               props.fontSize ||
               props.currWidgetsDetails?.options?.fontSize ||
-              "12"
+              12
             }
-            onChange={(e) => props.setFontSize(e.target.value)}
+            onChange={(e) => {
+              props.setFontSize(parseInt(e.target.value));
+            }}
           >
             {fontsizeArr.map((size, ind) => {
               return (