From 8f080080a74023f5b11e0c1d95a0bfb9e2f643cb Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Fri, 13 Sep 2024 12:57:23 +0530 Subject: [PATCH] refactor: changes in text of modal --- apps/OpenSign/public/locales/en/translation.json | 2 +- apps/OpenSign/public/locales/fr/translation.json | 2 +- apps/OpenSign/src/components/AddUser.js | 3 +-- apps/OpenSign/src/components/BulkSendUi.js | 9 ++------- apps/OpenSign/src/pages/GenerateToken.js | 5 +---- apps/OpenSign/src/script/locales/en/translation.json | 2 +- apps/OpenSign/src/script/locales/fr/translation.json | 2 +- .../OpenSignServer/cloud/parsefunction/getUserDetails.js | 1 + 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json index 72ff69023..886493d8d 100644 --- a/apps/OpenSign/public/locales/en/translation.json +++ b/apps/OpenSign/public/locales/en/translation.json @@ -635,7 +635,7 @@ "quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.", "quota-mail-tip":"Tip: You can still sign <1>unlimited documents by manually sharing the signing request links.", "quota-mail-head":"Quota Reached", - "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminName}}<{{adminEmail}}>.", + "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.", "sent-this-month":"Sent this month", "available-seats":"Available seats", "buy-users":"Buy more users" diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json index 4373ff1c2..7c8f77511 100644 --- a/apps/OpenSign/public/locales/fr/translation.json +++ b/apps/OpenSign/public/locales/fr/translation.json @@ -634,7 +634,7 @@ "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.", "quota-mail-tip-tip":"Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents en partageant manuellement les liens de demande de signature.", "quota-mail-head":"Quota atteint", - "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminName}}<{{adminEmail}}>.", + "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.", "sent-this-month":"envoyé ce mois-ci", "available-seats":"Disponible sièges", "buy-users":"Acheter plus d'utilisateurs" diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 8c4f1f3e7..c20e8fc4f 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -498,8 +498,7 @@ const AddUser = (props) => { {planInfo.adminId !== extUser?.objectId ? (
{t("unauthorized-modal", { - adminName: extUser?.CreatedBy?.name, - adminEmail: extUser?.CreatedBy?.email + adminEmail: extUser?.TenantId?.EmailAddress })}
) : ( diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js index 8f28ce4bd..4a4b872e7 100644 --- a/apps/OpenSign/src/components/BulkSendUi.js +++ b/apps/OpenSign/src/components/BulkSendUi.js @@ -31,7 +31,6 @@ const BulkSendUi = (props) => { const [isFreePlan, setIsFreePlan] = useState(false); const [admin, setAdmin] = useState({ objectId: "", - name: "", email: "", isAdmin: true }); @@ -63,8 +62,7 @@ const BulkSendUi = (props) => { setAdmin((obj) => ({ ...obj, isAdmin: false, - name: extUser?.CreatedBy?.name, - email: extUser?.CreatedBy?.email + email: extUser?.TenantId?.EmailAddress })); } setAdmin((obj) => ({ ...obj, objectId: subscription?.adminId })); @@ -491,10 +489,7 @@ const BulkSendUi = (props) => { ) : (
- {t("unauthorized-modal", { - adminName: admin?.name, - adminEmail: admin?.email - })} + {t("unauthorized-modal", { adminEmail: admin?.email })}
)} diff --git a/apps/OpenSign/src/pages/GenerateToken.js b/apps/OpenSign/src/pages/GenerateToken.js index a448729a6..0e8d48b82 100644 --- a/apps/OpenSign/src/pages/GenerateToken.js +++ b/apps/OpenSign/src/pages/GenerateToken.js @@ -28,7 +28,6 @@ function GenerateToken() { plan: "", isValid: false, adminId: "", - adminName: "", adminEmail: "" }); const [isAlert, setIsAlert] = useState({ type: "success", msg: "" }); @@ -154,8 +153,7 @@ function GenerateToken() { } else { setIsSubscribe((obj) => ({ ...obj, - adminName: extUser?.CreatedBy?.name, - adminEmail: extUser?.CreatedBy?.email + adminEmail: extUser?.TenantId?.EmailAddress })); setIsModal((obj) => ({ ...obj, unauthorized: !obj.unauthorized })); } @@ -447,7 +445,6 @@ function GenerateToken() { >
{t("unauthorized-modal", { - adminName: isSubscribe?.adminName, adminEmail: isSubscribe?.adminEmail })}
diff --git a/apps/OpenSign/src/script/locales/en/translation.json b/apps/OpenSign/src/script/locales/en/translation.json index c328f92da..b0ed88efb 100644 --- a/apps/OpenSign/src/script/locales/en/translation.json +++ b/apps/OpenSign/src/script/locales/en/translation.json @@ -632,7 +632,7 @@ "quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.", "quota-mail-tip":"Tip: You can still sign <1>unlimited documents by manually sharing the signing request links.", "quota-mail-head":"Quota Reached", - "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminName}}<{{adminEmail}}>.", + "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.", "sent-this-month":"Sent this month", "available-seats":"Available seats", "buy-users":"Buy more users" diff --git a/apps/OpenSign/src/script/locales/fr/translation.json b/apps/OpenSign/src/script/locales/fr/translation.json index 5bca0a5c5..9f95b1209 100644 --- a/apps/OpenSign/src/script/locales/fr/translation.json +++ b/apps/OpenSign/src/script/locales/fr/translation.json @@ -631,7 +631,7 @@ "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.", "quota-mail-tip":"Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents en partageant manuellement les liens de demande de signature.", "quota-mail-head":"Quota atteint", - "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminName}}<{{adminEmail}}>.", + "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.", "sent-this-month":"envoyé ce mois-ci", "available-seats":"Disponible sièges", "buy-users":"Acheter plus d'utilisateurs" diff --git a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js index f0a5f52da..bb07ca322 100644 --- a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js +++ b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js @@ -13,6 +13,7 @@ async function getUserDetails(request) { userQuery.include('TenantId'); userQuery.include('UserId'); userQuery.include('CreatedBy'); + userQuery.exclude('CreatedBy.authData'); userQuery.exclude('google_refresh_token'); if (userId) { userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });