Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into react-tour

Author: raktima-opensignlabs

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

@@ -132,7 +132,8 @@
     "View": "View",
     "option": "Option",
     "Embed": "Embed",
-    "Copy TemplateId":"Copy TemplateId"
+    "Copy TemplateId":"Copy TemplateId",
+    "Copy Public URL":"Copy Public URL"
   },
   "report-heading": {
     "Sr.No": "Sr.No",
@@ -639,7 +640,7 @@
   "public-template-mssg-3"  :"Need more details or examples?",
   "public-template-mssg-4": "Visit the",
   "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
-  "public-template-mssg-6" :"You need to set this template as public before you can utilize this code snippet.",
+  "public-template-mssg-6" :"Before you can use this code snippet, you must make this template public.",
   "copy-code":"COPY",
   "copied-code":"COPIED",
   "Installation":"Installation",
@@ -669,11 +670,14 @@
   "download-pdf":"Download Pdf",
   "pdf-certificate":"Download Pdf + Certificate",
   "document-logs":"Document logs",
-  "enable-tour":"Enable Tour",
-  "istourenabled-help":{
-    "p1":"This will enable a guided tour for signers, providing instructions during the signing process.",
-    "p2":"This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
-    "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."
-  }
+  "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
+  "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
+   "public-tour-message":"Please make template public to copy public URL",
+   "enable-tour":"Enable Tour",
+   "istourenabled-help":{
+     "p1":"This will enable a guided tour for signers, providing instructions during the signing process.",
+     "p2":"This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
+     "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."
+   }
 
 }

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

@@ -152,7 +152,8 @@
     "View": "Voir",
     "option": "Option",
     "Embed": "Intégrer",
-    "Copy TemplateId": "Copier l'ID du modèle"
+    "Copy TemplateId": "Copier l'ID du modèle",
+    "Copy Public URL":"Copier l'URL publique"
   },
   "report-help": {
     "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -638,7 +639,7 @@
   "public-template-mssg-3" :"Besoin de plus de détails ou d'exemples ?",
   "public-template-mssg-4": "Visitez le",
   "public-template-mssg-5":  "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
-  "public-template-mssg-6":"Vous devez définir ce modèle comme public avant de pouvoir utiliser cet extrait de code.",
+  "public-template-mssg-6":"Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
   "copy-code":"COPIE",
   "copied-code":"COPIÉ",
   "Installation":"Installation",
@@ -668,11 +669,15 @@
    "download-pdf" :"Télécharger le PDF",
   "pdf-certificate"  :"Télécharger Pdf + Certificat",
   "document-logs":"Journaux de documents",
+  "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.",
+  "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.",
+  "public-tour-message":"Veuillez rendre le modèle public pour copier l'URL publique",
   "enable-tour": "Activer la visite",
   "istourenabled-otp-help":{
     "p1": "Cela permettra une visite guidée pour les signataires, fournissant des instructions pendant le processus de signature.",
     "p2": "Cela désactivera la visite guidée, garantissant ainsi une expérience de signature plus rapide et ininterrompue.",
     "p3":  "Conseil : si vos signataires connaissent OpenSign et l'utilisent fréquemment, vous souhaiterez peut-être désactiver la visite guidée pour une expérience plus fluide. Choisissez l'option qui correspond le mieux à vos besoins en matière de signature de documents."
   }
 
+
 }

apps/OpenSign/public/version.txt

@@ -2,7 +2,6 @@ import React, { useState, useEffect, useRef } from "react";
 import "../../styles/opensigndrive.css";
 import axios from "axios";
 import * as ContextMenu from "@radix-ui/react-context-menu";
-import { saveAs } from "file-saver";
 import { useNavigate } from "react-router-dom";
 import Table from "react-bootstrap/Table";
 import * as HoverCard from "@radix-ui/react-hover-card";
@@ -264,12 +263,6 @@ function DriveBody(props) {
       setIsOpenMoveModal(false);
     }
   };
-
-  const sanitizeFileName = (pdfName) => {
-    // Replace spaces with underscore
-    return pdfName.replace(/ /g, "_");
-  };
-
   const handleEnterPress = (e, data) => {
     if (e.key === "Enter") {
       handledRenameDoc(data);

apps/OpenSign/src/components/opensigndrive/DriveBody.js

@@ -34,7 +34,7 @@ export function App() {
       <Opensign
         onLoad={() => console.log("success")}
         onLoadError={(error) => console.log(error)}
-        templateId= {"${props.templateId}"}
+        templateId= "${props.templateId}"
       />
     </div>
   );
@@ -63,10 +63,10 @@ import {OpensignComponent} from "@opensign/angular"
   selector:'app-root',
   standalone: true,
   imports: [OpensignComponent], 
-  template: '<opensign templateId={"${props.templateId}"}
+  template:\`<opensign templateId="${props.templateId}"
             (onLoad)="handleLoad()"
             (onLoadError)="handleError($event)"
-             ></opensign>',
+             ></opensign>\`,
 })
 export class AppComponent{
   handleLoad() {
@@ -129,9 +129,11 @@ export class AppComponent{
                   <p className="font-medium text-[18px]">
                     {t(`${data.title}`)}
                   </p>
-                  <p className="text-[13px] mt-2">
-                    {t("public-template-mssg-1")}
-                  </p>
+                  {ind === 0 && (
+                    <p className="text-[13px] mt-2">
+                      {t("public-template-mssg-1")}
+                    </p>
+                  )}
                   <div className="relative p-1">
                     <div
                       onClick={() => handleCopy(data.codeString, ind)}
@@ -210,11 +212,11 @@ export class AppComponent{
                     <p className="font-medium text-[18px]">
                       {t(`${data.title}`)}
                     </p>
-
-                    <p className="text-[13px] mt-2">
-                      {t("angular-npm-mssg-1")}
-                    </p>
-
+                    {ind === 0 && (
+                      <p className="text-[13px] mt-2">
+                        {t("angular-npm-mssg-1")}
+                      </p>
+                    )}
                     <div className="relative p-1">
                       <div
                         onClick={() => handleCopy(data.codeString, ind)}

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

@@ -725,7 +725,9 @@ function Placeholder(props) {
               : props?.pos?.zIndex
                 ? props.pos.zIndex
                 : "5",
-          background: props.data ? props.data.blockColor : "rgb(203 233 237)"
+          background: props.data
+            ? props.data?.blockColor + "b0"
+            : "rgba(203, 233, 237, 0.69)"
         }}
         onDrag={() => {
           setDraggingEnabled(true);

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

@@ -596,7 +596,7 @@ function SignPad({
                           borderRadius: "2px"
                         }
                       }}
-                      backgroundColor="rgb(255, 255, 255)"
+                      // backgroundColor="rgb(255, 255, 255)"
                       onEnd={() =>
                         handleSignatureChange(canvasRef.current?.toDataURL())
                       }

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

@@ -1351,11 +1351,6 @@ export const multiSignEmbed = async (
       widgetsPositionArr.map(async (url) => {
         let signUrl = url.SignUrl && url.SignUrl;
         if (signUrl) {
-          if (url.ImageType === "image/png") {
-            //function for convert signature png base64 url to jpeg base64
-            const newUrl = await convertPNGtoJPEG(signUrl);
-            signUrl = newUrl;
-          }
           const res = await fetch(signUrl);
           return res.arrayBuffer();
         }
@@ -1365,19 +1360,14 @@ export const multiSignEmbed = async (
     widgetsPositionArr.forEach(async (position, id) => {
       let img;
       if (["signature", "stamp", "initials", "image"].includes(position.type)) {
-        if (
-          (position.ImageType && position.ImageType === "image/png") ||
-          position.ImageType === "image/jpeg"
-        ) {
+        if (position.ImageType && position.ImageType === "image/jpeg") {
           img = await pdfDoc.embedJpg(images[id]);
         } else {
           img = await pdfDoc.embedPng(images[id]);
         }
       } else if (!position.type) {
-        if (
-          (position.ImageType && position.ImageType === "image/png") ||
-          position.ImageType === "image/jpeg"
-        ) {
+        //  to handle old widget when only stamp and signature are exists
+        if (position.ImageType && position.ImageType === "image/jpeg") {
           img = await pdfDoc.embedJpg(images[id]);
         } else {
           img = await pdfDoc.embedPng(images[id]);
@@ -1937,7 +1927,11 @@ export const getAppLogo = async () => {
       }
     } catch (err) {
       console.log("err in getlogo ", err);
-      return { logo: appInfo.applogo, user: "exist" };
+      if (err?.message?.includes("valid JSON")) {
+        return { logo: appInfo.applogo, user: "exist", error: "invalid_json" };
+      } else {
+        return { logo: appInfo.applogo, user: "exist" };
+      }
     }
   }
 };

apps/OpenSign/src/constant/Utils.js

@@ -39,6 +39,13 @@ export default function reportJson(id) {
           hoverLabel: "Copy TemplateId",
           btnIcon: "fa-light fa-copy",
           action: "CopyTemplateId"
+        },
+        {
+          btnId: "2434",
+          btnLabel: "Copy Public URL",
+          hoverLabel: "Copy Public URL",
+          btnIcon: "fa-light fa-copy",
+          action: "CopyPublicURL"
         }
       ]
     : [];
@@ -405,18 +412,15 @@ export default function reportJson(id) {
             if (item.action === "option") {
               // Make a shallow copy of the item
               const newItem = { ...item };
-              newItem.subaction = [
-                {
-                  btnId: "1873",
-                  btnLabel: "Share with team",
-                  hoverLabel: "Share with team",
-                  btnIcon: "fa-light fa-share-nodes",
-                  redirectUrl: "",
-                  action: "sharewith"
-                },
-                ...newItem.subaction
-              ];
-
+              //splice method used to add `Share with team` option on second index of list
+              newItem.subaction.splice(1, 0, {
+                btnId: "1873",
+                btnLabel: "Share with team",
+                hoverLabel: "Share with team",
+                btnIcon: "fa-light fa-share-nodes",
+                redirectUrl: "",
+                action: "sharewith"
+              });
               return newItem;
             }
             return item;

apps/OpenSign/src/json/ReportJson.js

@@ -46,7 +46,7 @@ const AddAdmin = () => {
     try {
       const app = await getAppLogo();
       if (app?.user === "exist") {
-        setErrMsg(t("admin-already-exist"));
+        setErrMsg(t("admin-exists"));
       }
     } catch (err) {
       setErrMsg(t("something-went-wrong-mssg"));