diff --git a/apps/OpenSign/src/components/fields/CreateFolder.js b/apps/OpenSign/src/components/fields/CreateFolder.js index 9b6f4beec..2aa0c2432 100644 --- a/apps/OpenSign/src/components/fields/CreateFolder.js +++ b/apps/OpenSign/src/components/fields/CreateFolder.js @@ -1,6 +1,5 @@ import React, { useEffect, useState } from "react"; import Parse from "parse"; -import { templateCls } from "../../constant/const"; import Alert from "../../primitives/Alert"; const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => { @@ -45,7 +44,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => { event.preventDefault(); if (name) { const currentUser = Parse.User.current(); - const exsitQuery = new Parse.Query(templateCls); + const exsitQuery = new Parse.Query(folderCls); exsitQuery.equalTo("Name", name); exsitQuery.equalTo("Type", "Folder"); if (parentFolderId) { @@ -59,7 +58,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => { setIsAlert(false); }, 1000); } else { - const template = new Parse.Object(templateCls); + const template = new Parse.Object(folderCls); template.set("Name", name); template.set("Type", "Folder"); diff --git a/apps/OpenSign/src/components/fields/SelectFolder.js b/apps/OpenSign/src/components/fields/SelectFolder.js index 434bbed7d..878bb269b 100644 --- a/apps/OpenSign/src/components/fields/SelectFolder.js +++ b/apps/OpenSign/src/components/fields/SelectFolder.js @@ -1,9 +1,8 @@ import React, { useEffect, useState } from "react"; import Parse from "parse"; import CreateFolder from "./CreateFolder"; -import { templateCls } from "../../constant/const"; -const SelectFolder = ({ required, onSuccess }) => { +const SelectFolder = ({ required, onSuccess, folderCls }) => { const [isOpen, SetIsOpen] = useState(false); const [clickFolder, setClickFolder] = useState(""); const [selectFolder, setSelectedFolder] = useState({}); @@ -24,7 +23,7 @@ const SelectFolder = ({ required, onSuccess }) => { const fetchFolder = async (folderPtr) => { setIsLoader(true); try { - const fetchFolder = new Parse.Query(templateCls); + const fetchFolder = new Parse.Query(folderCls); if (folderPtr) { fetchFolder.equalTo("Folder", folderPtr); fetchFolder.equalTo("Type", "Folder"); @@ -55,7 +54,7 @@ const SelectFolder = ({ required, onSuccess }) => { setTabList((tabs) => [...tabs, item]); const folderPtr = { __type: "Pointer", - className: templateCls, + className: folderCls, objectId: item.objectId }; fetchFolder(folderPtr); @@ -64,7 +63,7 @@ const SelectFolder = ({ required, onSuccess }) => { setTabList((tabs) => [...tabs, item]); const folderPtr = { __type: "Pointer", - className: templateCls, + className: folderCls, objectId: item.objectId }; @@ -107,7 +106,7 @@ const SelectFolder = ({ required, onSuccess }) => { let _len = list.length - 1; folderPtr = { __type: "Pointer", - className: templateCls, + className: folderCls, objectId: list[_len].objectId }; setTabList(list); @@ -128,7 +127,7 @@ const SelectFolder = ({ required, onSuccess }) => { if (clickFolder && clickFolder.ObjectId) { fetchFolder({ __type: "Pointer", - className: templateCls, + className: folderCls, objectId: clickFolder.ObjectId }); } else { @@ -230,7 +229,7 @@ const SelectFolder = ({ required, onSuccess }) => { {isAdd && ( )} diff --git a/apps/OpenSign/src/constant/const.js b/apps/OpenSign/src/constant/const.js index 2e5e40948..4f2ea585b 100644 --- a/apps/OpenSign/src/constant/const.js +++ b/apps/OpenSign/src/constant/const.js @@ -1,2 +1,2 @@ -export const contactCls = "contracts_Contactbook" -export const templateCls = "contracts_Template" +export const contactCls = "contracts_Contactbook"; +export const templateCls = "contracts_Template"; diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js index b538cd34f..d3d6148ba 100644 --- a/apps/OpenSign/src/json/ReportJson.js +++ b/apps/OpenSign/src/json/ReportJson.js @@ -163,6 +163,20 @@ export default function reportJson(id) { } ] }; + // template report + case "23jk45slhj": + return { + reportName: "Templates", + heading: contactbook, + actions: [ + { + btnLabel: "", + btnColor: "#f55a42", + textColor: "white", + btnIcon: "fa-solid fa-trash" + } + ] + }; default: return null; } diff --git a/apps/OpenSign/src/primitives/TemplateForm.js b/apps/OpenSign/src/primitives/TemplateForm.js index 66c431bbb..fe433af24 100644 --- a/apps/OpenSign/src/primitives/TemplateForm.js +++ b/apps/OpenSign/src/primitives/TemplateForm.js @@ -6,7 +6,11 @@ import Alert from "./Alert"; import SelectFolder from "../components/fields/SelectFolder"; import SignersInput from "../components/fields/SignersInput"; import Title from "../components/Title"; +import { useNavigate } from "react-router-dom"; +import { templateCls } from '../constant/const' + const TemplateForm = () => { + const navigate = useNavigate() const [signers, setSigners] = useState([]); const [folder, setFolder] = useState({ ObjectId: "", Name: "" }); const [formData, setFormData] = useState({ @@ -126,7 +130,7 @@ const TemplateForm = () => { e.preventDefault(); try { const currentUser = Parse.User.current(); - const template = new Parse.Object("contracts_Template"); + const template = new Parse.Object(templateCls); Object.entries(formData).forEach((item) => template.set(item[0], item[1]) ); @@ -135,13 +139,20 @@ const TemplateForm = () => { if (folder && folder.ObjectId) { template.set("Folder", { __type: "Pointer", - className: "contracts_Template", + className: templateCls, objectId: folder.ObjectId }); } if (signers && signers.length > 0) { template.set("Signers", signers); } + const ExtCls = JSON.parse(localStorage.getItem("Extand_Class")); + template.set("ExtUserPtr", { + __type: "Pointer", + className: "contracts_Users", + objectId: ExtCls[0].objectId + }); + const res = await template.save(); if (res) { setIsAlert(true); @@ -157,6 +168,7 @@ const TemplateForm = () => { }); setFileUpload([]); setpercentage(0); + navigate('/asmf/remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/template/' +res.id) } } catch (err) { console.log("err ", err); @@ -281,7 +293,7 @@ const TemplateForm = () => { /> - +
+ + + {/* this modal is used show send mail message and after send mail success message */} + + {/* signature modal */} + +

Do you want to create document right now ?

+
+ + {currentEmail.length > 0 && ( + <> + + + + + )} + +
+ + {/* pdf header which contain funish back button */} +
+
+ {containerWH && ( + + )} +
+
+ + {/* signature button */} + {isMobile ? ( +
+ +
+ ) : ( +
+
+ +
+ +
+
+
+ )} + + )} + +
+ + + Add Role + + +
+ setRoleName(e.target.value)} + style={{ borderRadiu: 20 }} + placeholder={ + signersdata.length > 0 + ? "User " + (signersdata.length + 1) + : "User 1" + } + /> +
+
+ + +
+
+
+
+
+ + ); +}; + +export default TemplatePlaceholder; diff --git a/microfrontends/SignDocuments/src/Component/component/fieldsComponent.js b/microfrontends/SignDocuments/src/Component/component/fieldsComponent.js index 71280710f..916e29005 100644 --- a/microfrontends/SignDocuments/src/Component/component/fieldsComponent.js +++ b/microfrontends/SignDocuments/src/Component/component/fieldsComponent.js @@ -32,12 +32,12 @@ function FieldsComponent({ setIsShowEmail, isMailSend, selectedEmail, - setSelectedEmail, + setSelectedEmail }) { const signStyle = pdfUrl ? "disableSign" : "signatureBtn"; - const isMobile = window.innerWidth <767; - + const isMobile = window.innerWidth < 767; + const SelectItem = React.forwardRef( ({ children, className, ...props }, forwardedRef) => { return ( @@ -65,7 +65,7 @@ function FieldsComponent({ "#cc99ff", "#ffcc99", "#66ccff", - "#ffffcc", + "#ffffcc" ]; return ( @@ -88,7 +88,7 @@ function FieldsComponent({ padding: "10px 20px", display: "flex", alignItems: "center", - justifyContent: "center", + justifyContent: "center" }} > @@ -107,30 +107,29 @@ function FieldsComponent({ }} > - - {!selectedEmail && - - - } + + {!selectedEmail && ( + + + + )}