Skip to content

Commit b8c7110

Browse files
resolve issue of receipent in not selected by default and dropbox upload
1 parent 7a12f54 commit b8c7110

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

apps/OpenSign/src/components/fields/DropboxChoose.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ export default function DropboxChooser({ children, onSuccess, onCancel }) {
4141
[onSuccess, onCancel]
4242
);
4343

44-
const handleChoose = useCallback(() => {
44+
const handleChoose = useCallback((e) => {
45+
e.preventDefault()
4546
if (window.Dropbox) {
4647
window.Dropbox.choose(options);
4748
}

apps/OpenSign/src/components/fields/FileUpload.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ const FileUpload = (props) => {
271271
<i className="fa-solid fa-xmark"></i>
272272
</div>
273273
</div>
274-
{process.env.DROPBOX_APP_KEY && (
274+
{process.env.REACT_APP_DROPBOX_API_KEY && (
275275
<DropboxChooser
276276
onSuccess={dropboxSuccess}
277277
onCancel={dropboxCancel}
@@ -296,7 +296,7 @@ const FileUpload = (props) => {
296296
accept="application/pdf,application/vnd.ms-excel"
297297
onChange={onChange}
298298
/>
299-
{process.env.DROPBOX_APP_KEY && (
299+
{process.env.REACT_APP_DROPBOX_API_KEY && (
300300
<DropboxChooser
301301
onSuccess={dropboxSuccess}
302302
onCancel={dropboxCancel}

apps/OpenSign/src/json/ReportJson.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export default function reportJson(id) {
162162
btnIcon: "fa-solid fa-trash"
163163
}
164164
],
165-
form:"ContactBook"
165+
form: "ContactBook"
166166
};
167167
// template report
168168
case "6TeaPr321t":

apps/OpenSign/src/primitives/TemplateForm.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ const TemplateForm = () => {
240240
<i className="fa-solid fa-xmark"></i>
241241
</div>
242242
</div>
243-
{process.env.DROPBOX_APP_KEY && (
243+
{process.env.REACT_APP_DROPBOX_API_KEY && (
244244
<DropboxChooser
245245
onSuccess={dropboxSuccess}
246246
onCancel={dropboxCancel}
@@ -256,7 +256,7 @@ const TemplateForm = () => {
256256
accept="application/pdf,application/vnd.ms-excel"
257257
required
258258
/>
259-
{process.env.DROPBOX_APP_KEY && (
259+
{process.env.REACT_APP_DROPBOX_API_KEY && (
260260
<DropboxChooser
261261
onSuccess={dropboxSuccess}
262262
onCancel={dropboxCancel}

microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ const TemplatePlaceholder = () => {
102102
});
103103
const [{ isDragSign }, dragSignature] = useDrag({
104104
type: "BOX",
105-
106105
item: {
107106
type: "BOX",
108107
id: 1,
@@ -127,7 +126,6 @@ const TemplatePlaceholder = () => {
127126

128127
const [{ isDragSignatureSS }, dragSignatureSS] = useDrag({
129128
type: "BOX",
130-
131129
item: {
132130
type: "BOX",
133131
id: 3,
@@ -140,7 +138,6 @@ const TemplatePlaceholder = () => {
140138

141139
const [{ isDragStampSS }, dragStampSS] = useDrag({
142140
type: "BOX",
143-
144141
item: {
145142
type: "BOX",
146143
id: 4,
@@ -405,15 +402,14 @@ const TemplatePlaceholder = () => {
405402

406403
xyPosArr.push(xyPos);
407404
}
408-
409-
//add signers objId first inseretion
405+
const { blockColor, Role } = signersdata.find((x) => x.Id === uniqueId);
406+
//adding placholder in existing signer pos array (placaholder)
410407
if (filterSignerPos.length > 0) {
411408
// const colorIndex = signerPos
412409
// .map((e) => e.signerObjId)
413410
// .indexOf(signerObjId);
414411

415412
const colorIndex = signerPos.map((e) => e.Id).indexOf(uniqueId);
416-
const blockColor = signersdata.find((x) => x.Id === uniqueId)?.blockColor;
417413
const getPlaceHolder = filterSignerPos[0].placeHolder;
418414
const updatePlace = getPlaceHolder.filter(
419415
(data) => data.pageNumber !== pageNumber
@@ -442,7 +438,7 @@ const TemplatePlaceholder = () => {
442438
className: `${contractName}`,
443439
objectId: signerObjId
444440
},
445-
Role: roleName,
441+
Role: Role ? Role : roleName,
446442
Id: uniqueId
447443
};
448444
} else {
@@ -451,7 +447,7 @@ const TemplatePlaceholder = () => {
451447
signerObjId: "",
452448
placeHolder: updatePlace,
453449
signerPtr: {},
454-
Role: roleName,
450+
Role: Role ? Role : roleName,
455451
Id: uniqueId
456452
};
457453
}
@@ -476,7 +472,7 @@ const TemplatePlaceholder = () => {
476472
className: `${contractName}`,
477473
objectId: signerObjId
478474
},
479-
Role: roleName,
475+
Role: Role ? Role : roleName,
480476
Id: uniqueId
481477
};
482478
} else {
@@ -485,12 +481,11 @@ const TemplatePlaceholder = () => {
485481
signerObjId: "",
486482
placeHolder: newSignPoss,
487483
signerPtr: {},
488-
Role: roleName,
484+
Role: Role ? Role : roleName,
489485
Id: uniqueId
490486
};
491487
}
492488

493-
// signerPos.splice(colorIndex, 1, placeHolderPos);
494489
const newArry = [placeHolderPos];
495490
const newArray = [
496491
...signerPos.slice(0, colorIndex),
@@ -501,7 +496,7 @@ const TemplatePlaceholder = () => {
501496
setSignerPos(newArray);
502497
}
503498
} else {
504-
const blockColor = signersdata.find((x) => x.Id === uniqueId)?.blockColor;
499+
//adding new placeholder for selected signer in pos array (placeholder)
505500
let placeHolderPos;
506501
if (contractName) {
507502
placeHolderPos = {
@@ -513,7 +508,7 @@ const TemplatePlaceholder = () => {
513508
signerObjId: signerObjId,
514509
blockColor: blockColor ? blockColor : color[isSelectListId],
515510
placeHolder: xyPosArr,
516-
Role: roleName,
511+
Role: Role ? Role : roleName,
517512
Id: uniqueId
518513
};
519514
} else {
@@ -522,7 +517,7 @@ const TemplatePlaceholder = () => {
522517
signerObjId: "",
523518
blockColor: blockColor ? blockColor : color[isSelectListId],
524519
placeHolder: xyPosArr,
525-
Role: roleName,
520+
Role: Role ? Role : roleName,
526521
Id: uniqueId
527522
};
528523
}
@@ -871,14 +866,17 @@ const TemplatePlaceholder = () => {
871866
e.preventDefault();
872867
const count = signersdata.length > 0 ? signersdata.length + 1 : 1;
873868
const Id = randomId();
869+
const index = signersdata?.length || 0;
874870
const obj = {
875871
Role: roleName || "User " + count,
876-
Id: Id
872+
Id: Id,
873+
blockColor: color[index]
877874
};
878875
setSignersData((prevArr) => [...prevArr, obj]);
879876
setIsModalRole(false);
880877
setRoleName("");
881878
setUniqueId(Id);
879+
setIsSelectId(index);
882880
setIsMailSend(false);
883881
};
884882
// `handleDeleteUser` function is used to delete record and placeholder when user click on delete which is place next user name in recipients list

0 commit comments

Comments
 (0)