Skip to content

Commit fca45ce

Browse files
prafull-opensignlabsprafull-opensignlabs
authored
Merge pull request #1663 from OpenSignLabs/updates-14122971328
v2.15.0
2 parents 8373679 + ac8ab70 commit fca45ce

29 files changed

+2648
-2529
lines changed

‎apps/OpenSign/package-lock.json

Lines changed: 78 additions & 181 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/OpenSign/package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
"@radix-ui/themes": "^3.1.6",
1010
"@react-pdf/renderer": "^4.3.0",
1111
"@reduxjs/toolkit": "^2.5.1",
12-
"axios": "^1.8.3",
12+
"axios": "^1.8.4",
1313
"css-minimizer-webpack-plugin": "^7.0.2",
14+
"date-fns-tz": "^3.2.0",
1415
"file-saver": "^2.0.5",
1516
"i18next": "^23.16.8",
16-
"i18next-browser-languagedetector": "^8.0.2",
17-
"i18next-http-backend": "^3.0.1",
17+
"i18next-browser-languagedetector": "^8.0.4",
18+
"i18next-http-backend": "^3.0.2",
1819
"jszip": "^3.10.1",
1920
"jwt-decode": "^4.0.0",
2021
"moment": "^2.30.1",
@@ -35,10 +36,10 @@
3536
"react-dom": "^18.2.0",
3637
"react-gtm-module": "^2.0.11",
3738
"react-helmet": "^6.1.0",
38-
"react-i18next": "^15.4.0",
39+
"react-i18next": "^15.4.1",
3940
"react-konva": "^18.2.10",
4041
"react-pdf": "^9.2.1",
41-
"react-quill-new": "^3.4.1",
42+
"react-quill-new": "^3.4.6",
4243
"react-redux": "^9.2.0",
4344
"react-rnd": "^10.5.2",
4445
"react-router": "^7.1.5",
@@ -99,17 +100,17 @@
99100
"@babel/core": "^7.26.10",
100101
"@babel/preset-env": "^7.26.9",
101102
"@babel/preset-react": "^7.26.3",
102-
"@babel/runtime-corejs2": "^7.26.10",
103+
"@babel/runtime-corejs2": "^7.27.0",
103104
"autoprefixer": "^10.4.21",
104-
"babel-loader": "^9.2.1",
105+
"babel-loader": "^10.0.0",
105106
"commitizen": "^4.3.1",
106107
"concurrently": "^9.1.2",
107108
"css-loader": "^7.1.2",
108109
"daisyui": "^4.12.23",
109110
"dotenv": "^16.4.7",
110111
"dotenv-webpack": "^8.1.0",
111-
"eslint": "^9.22.0",
112-
"eslint-plugin-prettier": "^5.2.3",
112+
"eslint": "^9.23.0",
113+
"eslint-plugin-prettier": "^5.2.5",
113114
"eslint-plugin-react": "^7.37.4",
114115
"lint-staged": "^15.5.0",
115116
"mini-css-extract-plugin": "^2.9.2",

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"placeholder-alert-3": "Sind Sie sicher, dass Sie dieses Dokument zur Unterzeichnung senden möchten?",
459459
"placeholder-alert-4": "Sie haben erfolgreich E-Mails an alle Empfänger gesendet!",
460460
"placeholder-mail-alert": "Sie haben erfolgreich eine E-Mail an {{name}} gesendet. Die nachfolgenden Unterzeichner erhalten eine E-Mail, sobald {{name}} das Dokument unterzeichnet.",
461+
"placeholder-mail-alert-you": "Nachfolgende Unterzeichner erhalten E-Mails, sobald Sie das Dokument unterschreiben.",
461462
"placeholder-alert-5": "Möchten Sie die Dokumente jetzt unterschreiben?",
462463
"placeholder-alert-6": "Bitte richten Sie den E-Mail-Adapter ein, um E-Mails zu senden!",
463464
"placeholder-alert-7": "Bitte wählen Sie einen Unterzeichner aus, um Platzhalter hinzuzufügen!",
@@ -856,5 +857,11 @@
856857
"enabled-signature-type-help": "Die Einstellung 'Aktivierte Signaturtypen' bestimmt, welche Signaturoptionen in Ihrer Organisation verfügbar sind. Wenn Sie beispielsweise die Option 'Zeichnen' deaktivieren, wird sie den Mitgliedern Ihrer Organisation im Signatur-Widget nicht angezeigt, während die anderen drei Optionen weiterhin zugänglich bleiben.",
857858
"indexing-public-profile": "Erlaube die Indexierung des öffentlichen Profils durch Suchmaschinen",
858859
"user-created-successfully": "Benutzer erfolgreich erstellt.",
859-
"only-15-reminder-allowed": "Sie können bis zu 15 automatische Erinnerungen festlegen. Wenn zum Beispiel 'TimeToComplete' auf 15 Tage und 'RemindOnceInEvery' auf 1 Tag eingestellt ist, erreichen Sie das maximale Limit von 15 Erinnerungen. Passen Sie Ihre Einstellungen entsprechend an."
860+
"only-15-reminder-allowed": "Sie können bis zu 15 automatische Erinnerungen festlegen. Wenn zum Beispiel 'TimeToComplete' auf 15 Tage und 'RemindOnceInEvery' auf 1 Tag eingestellt ist, erreichen Sie das maximale Limit von 15 Erinnerungen. Passen Sie Ihre Einstellungen entsprechend an.",
861+
"rate-your-experience": "👋 Bitte bewerten Sie Ihre Erfahrung mit Opensign",
862+
"thanks-for-feedback": "Danke für Ihr Feedback 🙏",
863+
"share-your-feedback": "Teilen Sie Ihr Feedback",
864+
"share-your-review": "Teilen Sie Ihre Bewertung",
865+
"date-format": "Datumsformat",
866+
"document-deleted": "Das Dokument wurde gelöscht oder Sie haben keinen Zugriff. Bitte kontaktieren Sie den Absender."
860867
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"placeholder-alert-3": " Are you sure you want to send out this document for signatures?",
459459
"placeholder-alert-4": "You have successfully sent mails to all recipients!",
460460
"placeholder-mail-alert": "You have successfully sent email to {{name}}. Subsequent signers will get email(s) once {{name}} signs the document",
461+
"placeholder-mail-alert-you": "Subsequent signers will get email(s) once you signs the document.",
461462
"placeholder-alert-5": "Do you want to sign the document right now?",
462463
"placeholder-alert-6": "Please setup mail adapter to send mail!",
463464
"placeholder-alert-7": "Please select signer for add placeholder!",
@@ -856,5 +857,11 @@
856857
"enabled-signature-type-help": "The 'Enabled Signature Types' setting determines which signature options are available across your organization. For example, if you disable the 'Draw' option, members of your organization will not see it in the signature widget, while the other three options will remain accessible.",
857858
"indexing-public-profile": "Allow indexing of public profile by search engines",
858859
"user-created-successfully": "user created successfully.",
859-
"only-15-reminder-allowed": "You can set up to 15 automatic reminders. For example, if 'TimeToComplete' is 15 days and 'RemindOnceInEvery' is 1 day, you'll reach the maximum limit of 15 reminders. Adjust your settings accordingly."
860+
"only-15-reminder-allowed": "You can set up to 15 automatic reminders. For example, if 'TimeToComplete' is 15 days and 'RemindOnceInEvery' is 1 day, you'll reach the maximum limit of 15 reminders. Adjust your settings accordingly.",
861+
"rate-your-experience": "👋 Please rate your experience with Opensign",
862+
"thanks-for-feedback": "Thanks for your feedback 🙏",
863+
"share-your-feedback": "Share your feedback",
864+
"share-your-review": "Share your review",
865+
"date-format": "Date format",
866+
"document-deleted": "The document has been deleted or you don't have access. Please contact the sender."
860867
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"placeholder-alert-3": " ¿En definitiva quieres enviar este documento para ser firmado?",
459459
"placeholder-alert-4": "¡Has enviado exitosamente correos a todos los destinatarios!",
460460
"placeholder-mail-alert": "Has enviado un correo electrónico con éxito a {{name}}. Los siguientes firmantes recibirán un correo electrónico una vez que {{name}} firme el documento.",
461+
"placeholder-mail-alert-you": "Los firmantes posteriores recibirán correos electrónicos una vez que firme el documento.",
461462
"placeholder-alert-5": "¿Quieres firmar documentos ahora mismo?",
462463
"placeholder-alert-6": "¡Por favor, configura el adaptador de correo para enviar correos!",
463464
"placeholder-alert-7": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
@@ -856,5 +857,11 @@
856857
"enabled-signature-type-help": "La configuración de 'Tipos de firma habilitados' determina qué opciones de firma están disponibles en su organización. Por ejemplo, si desactiva la opción 'Dibujar', los miembros de su organización no la verán en el widget de firma, mientras que las otras tres opciones seguirán siendo accesibles.",
857858
"indexing-public-profile": "Permitir la indexación del perfil público por los motores de búsqueda",
858859
"user-created-successfully": "Usuario creado con éxito.",
859-
"only-15-reminder-allowed": "Puede configurar hasta 15 recordatorios automáticos. Por ejemplo, si 'TimeToComplete' es de 15 días y 'RemindOnceInEvery' es de 1 día, alcanzará el límite máximo de 15 recordatorios. Ajuste su configuración en consecuencia."
860+
"only-15-reminder-allowed": "Puede configurar hasta 15 recordatorios automáticos. Por ejemplo, si 'TimeToComplete' es de 15 días y 'RemindOnceInEvery' es de 1 día, alcanzará el límite máximo de 15 recordatorios. Ajuste su configuración en consecuencia.",
861+
"rate-your-experience": "👋 Por favor, califique su experiencia con Opensign",
862+
"thanks-for-feedback": "Gracias por su comentario 🙏",
863+
"share-your-feedback": "Comparta sus comentarios",
864+
"share-your-review": "Comparta su reseña",
865+
"date-format": "Formato de fecha",
866+
"document-deleted": "El documento ha sido eliminado o no tiene acceso. Por favor, contacte al remitente."
860867
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"placeholder-alert-3": "Etes-vous sûr de vouloir envoyer ce document pour signature ? ",
459459
"placeholder-alert-4": "Vous avez envoyé avec succès des mails à tous les",
460460
"placeholder-mail-alert": "Vous avez envoyé un e-mail avec succès à {{name}}. Les signataires suivants recevront un e-mail une fois que {{name}} aura signé le document.",
461+
"placeholder-mail-alert-you": "Les signataires suivants recevront un e-mail dès que vous signez le document.",
461462
"placeholder-alert-5": "Voulez-vous signer des documents maintenant ?",
462463
"placeholder-alert-6": "Veuillez configurer l'adaptateur de messagerie pour envoyer du courrier !",
463464
"placeholder-alert-7": "Veuillez sélectionner le signataire pour ajouter un espace réservé !",
@@ -856,5 +857,11 @@
856857
"enabled-signature-type-help": "Le paramètre 'Types de signature activés' détermine quelles options de signature sont disponibles dans votre organisation. Par exemple, si vous désactivez l'option 'Dessiner', les membres de votre organisation ne la verront pas dans le widget de signature, tandis que les trois autres options resteront accessibles.",
857858
"indexing-public-profile": "Autoriser l'indexation du profil public par les moteurs de recherche",
858859
"user-created-successfully": "Utilisateur créé avec succès.",
859-
"only-15-reminder-allowed": "Vous pouvez définir jusqu'à 15 rappels automatiques. Par exemple, si 'TimeToComplete' est de 15 jours et 'RemindOnceInEvery' est de 1 jour, vous atteindrez la limite maximale de 15 rappels. Ajustez vos paramètres en conséquence."
860+
"only-15-reminder-allowed": "Vous pouvez définir jusqu'à 15 rappels automatiques. Par exemple, si 'TimeToComplete' est de 15 jours et 'RemindOnceInEvery' est de 1 jour, vous atteindrez la limite maximale de 15 rappels. Ajustez vos paramètres en conséquence.",
861+
"rate-your-experience": "👋 Veuillez évaluer votre expérience avec Opensign",
862+
"thanks-for-feedback": "Merci pour votre retour 🙏",
863+
"share-your-feedback": "Partagez votre avis",
864+
"share-your-review": "Partagez votre avis",
865+
"date-format": "Format de date",
866+
"document-deleted": "Le document a été supprimé ou vous n'y avez pas accès. Veuillez contacter l'expéditeur."
860867
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"placeholder-alert-3": "Sei sicuro di voler inviare questo documento per le firme?",
459459
"placeholder-alert-4": "Hai inviato con successo le mail a tutti i destinatari!",
460460
"placeholder-mail-alert": "Hai inviato con successo un'e-mail a {{name}}. I firmatari successivi riceveranno un'e-mail una volta che {{name}} avrà firmato il documento.",
461+
"placeholder-mail-alert-you": "I firmatari successivi riceveranno un'email non appena firmi il documento.",
461462
"placeholder-alert-5": "Vuoi firmare i documenti ora?",
462463
"placeholder-alert-6": "Configura l'adattatore email per inviare mail!",
463464
"placeholder-alert-7": "Seleziona il firmatario per aggiungere un segnaposto!",
@@ -856,5 +857,11 @@
856857
"enabled-signature-type-help": "L'impostazione 'Tipi di firma abilitati' determina quali opzioni di firma sono disponibili nella tua organizzazione. Ad esempio, se disabiliti l'opzione 'Disegna', i membri della tua organizzazione non la vedranno nel widget della firma, mentre le altre tre opzioni resteranno accessibili.",
857858
"indexing-public-profile": "Consenti l'indicizzazione del profilo pubblico dai motori di ricerca",
858859
"user-created-successfully": "Utente creato con successo.",
859-
"only-15-reminder-allowed": "Puoi impostare fino a 15 promemoria automatici. Ad esempio, se 'TimeToComplete' è di 15 giorni e 'RemindOnceInEvery' è di 1 giorno, raggiungerai il limite massimo di 15 promemoria. Regola le tue impostazioni di conseguenza."
860+
"only-15-reminder-allowed": "Puoi impostare fino a 15 promemoria automatici. Ad esempio, se 'TimeToComplete' è di 15 giorni e 'RemindOnceInEvery' è di 1 giorno, raggiungerai il limite massimo di 15 promemoria. Regola le tue impostazioni di conseguenza.",
861+
"rate-your-experience": "👋 Valuta la tua esperienza con Opensign",
862+
"thanks-for-feedback": "Grazie per il tuo feedback 🙏",
863+
"share-your-feedback": "Condividi il tuo feedback",
864+
"share-your-review": "Condividi la tua recensione",
865+
"date-format": "Formato data",
866+
"document-deleted": "Il documento è stato eliminato o non hai accesso. Si prega di contattare il mittente."
860867
}

‎apps/OpenSign/src/components/pdf/DraftDocument.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,17 @@ function DraftDocument() {
3030
documentData === "Error: Something went wrong!" ||
3131
(documentData.result && documentData.result.error)
3232
) {
33-
setIsLoading({
34-
isLoader: false,
35-
message: t("something-went-wrong-mssg")
36-
});
33+
if (documentData?.result?.error?.includes("deleted")) {
34+
setIsLoading({
35+
isLoader: false,
36+
message: t("document-deleted")
37+
});
38+
} else {
39+
setIsLoading({
40+
isLoader: false,
41+
message: t("something-went-wrong-mssg")
42+
});
43+
}
3744
} else {
3845
setIsLoading({ isLoader: false, message: t("no-data") });
3946
}

‎apps/OpenSign/src/components/pdf/EmailComponent.js

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Loader from "../../primitives/Loader";
55
import ModalUi from "../../primitives/ModalUi";
66
import { useTranslation } from "react-i18next";
77
import Parse from "parse";
8+
89
function EmailComponent({
910
isEmail,
1011
setIsEmail,
@@ -20,6 +21,7 @@ function EmailComponent({
2021
const [emailErr, setEmailErr] = useState(false);
2122
const [isDownloading, setIsDownloading] = useState("");
2223
const isAndroid = /Android/i.test(navigator.userAgent);
24+
2325
//function for send email
2426
const sendEmail = async () => {
2527
setIsLoading(true);
@@ -105,7 +107,7 @@ function EmailComponent({
105107
</div>
106108
)}
107109
<div className="flex justify-between items-center py-[10px] px-[20px] border-b-[1px] border-base-content">
108-
<span className="text-base-content font-semibold">
110+
<span className="text-base-content font-bold text-sm md:text-lg">
109111
{t("successfully-signed")}
110112
</span>
111113
<div className="flex flex-row">
@@ -114,14 +116,14 @@ function EmailComponent({
114116
onClick={(e) =>
115117
handleToPrint(e, setIsDownloading, pdfDetails)
116118
}
117-
className="op-btn op-btn-neutral op-btn-sm text-[15px]"
119+
className="op-btn op-btn-neutral op-btn-sm text-xs md:text-[15px]"
118120
>
119121
<i className="fa-light fa-print" aria-hidden="true"></i>
120122
{t("print")}
121123
</button>
122124
)}
123125
<button
124-
className="op-btn op-btn-primary op-btn-sm text-[15px] ml-2"
126+
className="op-btn op-btn-primary op-btn-sm text-xs md:text-[15px] ml-2"
125127
onClick={() => {
126128
handleClose();
127129
setIsDownloadModal(true);
@@ -137,12 +139,12 @@ function EmailComponent({
137139
{t("email-mssg")}
138140
</p>
139141
{emailList.length > 0 ? (
140-
<div className="p-0 border-[1.5px] op-border-primary rounded w-full text-[15px]">
142+
<div className="p-0 border-[1px] op-border-primary w-full rounded-md text-[15px] overflow-hidden">
141143
<div className="flex flex-row flex-wrap">
142144
{emailList.map((data, ind) => {
143145
return (
144146
<div
145-
className="flex flex-row items-center op-bg-primary m-[4px] rounded-md py-[5px] px-[10px]"
147+
className="flex flex-row items-center op-bg-primary mx-[2px] mt-[2px] rounded-md py-[5px] px-[10px]"
146148
key={ind}
147149
>
148150
<span className="text-base-100 text-[13px]">
@@ -162,7 +164,7 @@ function EmailComponent({
162164
<input
163165
type="email"
164166
value={emailValue}
165-
className="p-[10px] pb-[20px] rounded w-full text-[15px] bg-transparent outline-none"
167+
className="p-[10px] rounded-md w-full text-[15px] bg-transparent outline-none"
166168
onChange={handleEmailValue}
167169
onKeyDown={handleEnterPress}
168170
onBlur={() => emailValue && handleEnterPress("add")}
@@ -179,7 +181,7 @@ function EmailComponent({
179181
<input
180182
type="email"
181183
value={emailValue}
182-
className="p-[10px] pb-[20px] rounded w-full text-[15px] outline-none bg-transparent border-[1.5px] op-border-primary"
184+
className="p-[10px] pb-[20px] rounded-md w-full text-[15px] outline-none bg-transparent border-[1px] op-border-primary"
183185
onChange={handleEmailValue}
184186
onKeyDown={handleEnterPress}
185187
placeholder={t("enter-email-plaholder")}
@@ -197,34 +199,35 @@ function EmailComponent({
197199
{t("email-error-1")}
198200
</p>
199201
)}
200-
<button
202+
{/* <button
201203
className={`${
202204
emailValue ? "cursor-pointer" : "cursor-default"
203205
} op-btn op-btn-primary op-btn-sm m-2 shadow-md`}
204206
onClick={() => emailValue && handleEnterPress("add")}
205207
>
206208
<i className="fa-light fa-plus" aria-hidden="true"></i>
207209
</button>
208-
209210
<div className="bg-[#e3e2e1] mt-[10px] p-[5px] rounded">
210211
<span className="font-bold">{t("report-heading.Note")}: </span>
211212
<span className="text-[15px]">{t("email-error-2")}</span>
212213
</div>
213-
<hr className="w-full my-[15px] bg-base-content" />
214-
<button
215-
type="button"
216-
className="op-btn op-btn-secondary"
217-
onClick={() => emailList.length > 0 && sendEmail()}
218-
>
219-
{t("send")}
220-
</button>
221-
<button
222-
type="button"
223-
className="op-btn op-btn-ghost ml-2"
224-
onClick={() => handleClose()}
225-
>
226-
{t("close")}
227-
</button>
214+
<hr className="w-full my-[15px] bg-base-content" /> */}
215+
<div className="mt-2">
216+
<button
217+
type="button"
218+
className="op-btn op-btn-secondary"
219+
onClick={() => emailList.length > 0 && sendEmail()}
220+
>
221+
{t("send")}
222+
</button>
223+
<button
224+
type="button"
225+
className="op-btn op-btn-ghost ml-2"
226+
onClick={() => handleClose()}
227+
>
228+
{t("close")}
229+
</button>
230+
</div>
228231
</div>
229232
</ModalUi>
230233
)}

0 commit comments

Comments
 (0)