WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into multi_user

Browse Source
This commit is contained in:
prafull-opensignlabs
2024-07-03 15:58:30 +05:30
parent 8a2960511c 89c687ed06
commit a246f74e11
7 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/components/pdf/Placeholder.js
+39
View File
@@ -262,6 +262,10 @@ function Placeholder(props) {
if (props.pos.key === props.selectWidgetId) {
props.handleLinkUser(props.data.Id);
props.setUniqueId(props.data.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}
} else if (!props.pos.type) {
if (
@@ -321,9 +325,19 @@ function Placeholder(props) {
if (props.data && props?.pos?.type !== textWidget) {
props.setSignerObjId(props?.data?.signerObjId);
props.setUniqueId(props?.data?.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
} else if (props.data && props.pos.type === textWidget) {
props.setTempSignerId(props.uniqueId);
props.setUniqueId(props?.data?.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}
props.setSignKey(props.pos.key);
props.setWidgetType(props.pos.type);
@@ -340,10 +354,19 @@ function Placeholder(props) {
if (props.data && props?.pos?.type !== textWidget) {
props.setSignerObjId(props?.data?.signerObjId);
props.setUniqueId(props?.data?.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
} else if (props.data && props.pos.type === textWidget) {
props.setTempSignerId(props.uniqueId);
props.setSignerObjId(props?.data?.signerObjId);
props.setUniqueId(props?.data?.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}
//checking widget's type and open widget copy modal for required widgets
@@ -457,11 +480,19 @@ function Placeholder(props) {
e.stopPropagation();
props.handleLinkUser(props.data.Id);
props.setUniqueId(props.data.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}}
onTouchEnd={(e) => {
e.stopPropagation();
props.handleLinkUser(props.data.Id);
props.setUniqueId(props.data.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}}
style={{ color: "#188ae2", right: "32px", top: "-18px" }}
></i>
@@ -483,6 +514,10 @@ function Placeholder(props) {
if (props.data) {
props.setSignKey(props.pos.key);
props.setUniqueId(props.data.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}
}}
onTouchEnd={(e) => {
@@ -491,6 +526,10 @@ function Placeholder(props) {
if (props.data) {
props.setSignKey(props.pos.key);
props.setUniqueId(props.data.Id);
const checkIndex = props.xyPostion.findIndex(
(data) => data.Id === props.data.Id
);
props.setIsSelectId(checkIndex || 0);
}
}}
>
apps/OpenSign/src/components/pdf/RecipientList.js
+1 -1
View File
@@ -113,7 +113,7 @@ const RecipientList = (props) => {
} flex flex-row rounded-xl px-2 py-[10px] mt-1 mx-1 items-center last:mb-0.5`}
style={{
background:
(!isMobile && isHover === ind) || props.isSelectListId === ind
(!isMobile && isHover === ind) || props.uniqueId === obj.Id
? obj?.blockColor
? obj?.blockColor
: color[ind % color.length]
apps/OpenSign/src/components/pdf/RenderPdf.js
+5 -2
View File
@@ -57,7 +57,8 @@ function RenderPdf({
setTempSignerId,
uniqueId,
pdfOriginalWH,
scale
scale,
setIsSelectId
}) {
const isMobile = window.innerWidth < 767;
//check isGuestSigner is present in local if yes than handle login flow header in mobile view
@@ -319,6 +320,7 @@ function RenderPdf({
containerWH={containerWH}
pdfOriginalWH={pdfOriginalWH}
pageNumber={pageNumber}
setIsSelectId={setIsSelectId}
/>
</React.Fragment>
);
@@ -428,7 +430,7 @@ function RenderPdf({
>
<div
style={{
width: containerWH.width * scale
width: containerWH.width && containerWH.width * scale
}}
ref={drop}
id="container"
@@ -501,6 +503,7 @@ function RenderPdf({
containerWH={containerWH}
pdfOriginalWH={pdfOriginalWH}
pageNumber={pageNumber}
setIsSelectId={setIsSelectId}
/>
</React.Fragment>
);
apps/OpenSign/src/components/pdf/WidgetComponent.js
+6 -7
View File
@@ -38,7 +38,7 @@ function WidgetComponent({
isTemplateFlow,
setBlockColor,
setIsAddSigner,
blockColor
uniqueId
}) {
const [isSignersModal, setIsSignersModal] = useState(false);
const [, dropdown] = useDrag({
@@ -255,7 +255,6 @@ function WidgetComponent({
return name;
}
};
return (
<>
{isMobile ? (
@@ -265,14 +264,13 @@ function WidgetComponent({
<div className="w-full mb-[5px] flex justify-center items-center gap-1">
<div className="w-full ml-[5px]" onClick={() => handleModal()}>
<select
data-tut="recipientArea"
className="w-full op-select op-select-bordered pointer-events-none"
value={handleSelectRecipient()}
style={{
backgroundColor: blockColor
? blockColor
: isSelectListId
? color[isSelectListId % color.length]
: color[0]
backgroundColor: isSelectListId
? color[isSelectListId % color.length]
: color[0]
}}
>
<option value={handleSelectRecipient()}>
@@ -372,6 +370,7 @@ function WidgetComponent({
sendInOrder={sendInOrder}
setSignersData={setSignersData}
setBlockColor={setBlockColor}
uniqueId={uniqueId}
/>
</div>
) : (
apps/OpenSign/src/pages/ChangePassword.js
+2 -1
View File
@@ -21,9 +21,10 @@ function ChangePassword() {
user.set("password", newpassword);
user
.save()
.then(() => {
.then(async () => {
let _user = user.toJSON();
if (_user) {
await Parse.User.become(_user.sessionToken);
localStorage.setItem("accesstoken", _user.sessionToken);
}
alert("Password updated successfully.");
apps/OpenSign/src/pages/PlaceHolderSign.js
+3
View File
@@ -2101,6 +2101,7 @@ function PlaceHolderSign() {
pdfOriginalWH={pdfOriginalWH}
setScale={setScale}
scale={scale}
setIsSelectId={setIsSelectId}
/>
)}
</div>
@@ -2144,6 +2145,7 @@ function PlaceHolderSign() {
setBlockColor={setBlockColor}
setIsAddSigner={setIsAddSigner}
handleDeleteUser={handleDeleteUser}
uniqueId={uniqueId}
/>
</div>
) : (
@@ -2170,6 +2172,7 @@ function PlaceHolderSign() {
setIsAddSigner={setIsAddSigner}
handleDeleteUser={handleDeleteUser}
roleName={roleName}
uniqueId={uniqueId}
// handleAddSigner={handleAddSigner}
/>
<div data-tut="addWidgets">
apps/OpenSign/src/pages/TemplatePlaceholder.js
+2 -1
View File
@@ -616,7 +616,6 @@ const TemplatePlaceholder = () => {
setIsDragging(false);
}, 200);
};
//function for delete signature block
const handleDeleteSign = (key, Id) => {
const updateData = [];
@@ -1538,6 +1537,7 @@ const TemplatePlaceholder = () => {
pdfOriginalWH={pdfOriginalWH}
setScale={setScale}
scale={scale}
setIsSelectId={setIsSelectId}
/>
)}
</div>
@@ -1610,6 +1610,7 @@ const TemplatePlaceholder = () => {
setSignersData={setSignersData}
blockColor={blockColor}
setBlockColor={setBlockColor}
uniqueId={uniqueId}
/>
<div data-tut="addWidgets">
<WidgetComponent