diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json index d5494f4a0..2249deb0c 100644 --- a/apps/OpenSign/public/locales/en/translation.json +++ b/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", @@ -670,6 +671,7 @@ "pdf-certificate":"Download Pdf + Certificate", "document-logs":"Document logs", "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." + "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" } diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json index c7ed9c310..95a3c3f6f 100644 --- a/apps/OpenSign/public/locales/fr/translation.json +++ b/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.", @@ -669,7 +670,8 @@ "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." + "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" } diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js index 1324210cb..b198f6c4b 100644 --- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js +++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js @@ -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); diff --git a/apps/OpenSign/src/components/pdf/EmbedTab.js b/apps/OpenSign/src/components/pdf/EmbedTab.js index f2381ebef..ca3991b9b 100644 --- a/apps/OpenSign/src/components/pdf/EmbedTab.js +++ b/apps/OpenSign/src/components/pdf/EmbedTab.js @@ -129,9 +129,11 @@ export class AppComponent{

{t(`${data.title}`)}

-

- {t("public-template-mssg-1")} -

+ {ind === 0 && ( +

+ {t("public-template-mssg-1")} +

+ )}
handleCopy(data.codeString, ind)} @@ -210,11 +212,11 @@ export class AppComponent{

{t(`${data.title}`)}

- -

- {t("angular-npm-mssg-1")} -

- + {ind === 0 && ( +

+ {t("angular-npm-mssg-1")} +

+ )}
handleCopy(data.codeString, ind)} diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js index c2da51950..859a2e4fd 100644 --- a/apps/OpenSign/src/json/ReportJson.js +++ b/apps/OpenSign/src/json/ReportJson.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; diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 8e3d305dd..920246cde 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -76,6 +76,7 @@ const ReportTable = (props) => { const [reason, setReason] = useState(""); const [isDownloadModal, setIsDownloadModal] = useState(false); const [isEmbed, setIsEmbed] = useState(false); + const [isPublicTour, setIsPublicTour] = useState(); const Extand_Class = localStorage.getItem("Extand_Class"); const extClass = Extand_Class && JSON.parse(Extand_Class); const startIndex = (currentPage - 1) * props.docPerPage; @@ -373,6 +374,19 @@ const ReportTable = (props) => { handleEmbedFunction(item); } else if (act.action === "CopyTemplateId") { copyTemplateId(item.objectId); + } else if (act.action === "CopyPublicURL") { + const isPublic = item?.IsPublic; + if (isPublic) { + let publicUrl = ""; + if (isStaging) { + publicUrl = `https://staging.opensign.me/publicsign?templateid=${item.objectId}`; + } else { + publicUrl = `https://opensign.me/publicsign?templateid=${item.objectId}`; + } + copyTemplateId(publicUrl); + } else { + setIsPublicTour({ [item.objectId]: true }); + } } }; // Get current list @@ -1133,6 +1147,17 @@ const ReportTable = (props) => { setIsPublicUserName(extendUser[0]?.UserName || ""); }; + const publicTourConfig = [ + { + selector: '[data-tut="IsPublic"]', + content: t("public-tour-message"), + position: "top", + style: { fontSize: "13px" } + } + ]; + const closePublicTour = () => { + setIsPublicTour(); + }; return (
{Object.keys(actLoader)?.length > 0 && ( @@ -1153,13 +1178,27 @@ const ReportTable = (props) => { )} {isAlert && {alertMsg.message}} {props.tourData && props.ReportName === "Templates" && ( - + <> + + {isPublicTour && ( + + )} + )}
@@ -1375,13 +1414,17 @@ const ReportTable = (props) => { isEnableSubscription && ( {props.ReportName === "Templates" && ( -
+