Merge pull request #790 from nxglabs/fix_readonly

fix: width should be 100% of text type widgets
This commit is contained in:
nxglabs
2025-06-11 17:51:34 +00:00
parent b0e0b38e8f
commit 7e87aa4c38
27 changed files with 1511 additions and 1059 deletions
@@ -361,6 +361,7 @@
"date": "Datum",
"text": "Text",
"text input": "Texteingabe",
"cells": "Zellen",
"checkbox": "Checkbox",
"dropdown": "Dropdown",
"radio button": "Radiobutton",
@@ -415,10 +416,12 @@
"options": "Optionen",
"minimun-check": "Minimale Anzahl",
"maximum-check": "Maximale Anzahl",
"cell-count": "Zellzahl",
"default-value": "Standardwert",
"select": "Auswählen",
"read-only": "Nur lesen",
"read-only": "Ist schreibgeschützt",
"hide-labels": "Labels ausblenden",
"layout": "Layout",
"checkbox": "Checkbox",
"alert": "Warnung",
"zoom-in": "Vergrößern",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "Nicht in Signatur gefunden",
"readonly-textinput-error": "Schreibgeschütztes Text-Widget muss einen Standardwert haben oder optional sein.",
"readonly-dropdown-error": "Schreibgeschütztes Dropdown-Widget muss einen Standardwert haben oder optional sein.",
"readonly-radiobtn-error": "Schreibgeschütztes Optionsfeld-Widget muss einen Standardwert haben oder optional sein."
"readonly-radiobtn-error": "Schreibgeschütztes Optionsfeld-Widget muss einen Standardwert haben oder optional sein.",
"choose-one":"Wählen Sie eine aus"
}
@@ -361,6 +361,7 @@
"date": "date",
"text": "text",
"text input": "text input",
"cells": "cells",
"checkbox": "checkbox",
"dropdown": "dropdown",
"radio button": "radio button",
@@ -415,10 +416,12 @@
"options": "Options",
"minimun-check": "Minimun check",
"maximum-check": "Maximum check",
"cell-count": "Cell count",
"default-value": "Default value",
"select": "Select",
"read-only": "Is read only",
"read-only": "read only",
"hide-labels": "Hide labels",
"layout": "Layout",
"checkbox": "Checkbox",
"alert": "Alert",
"zoom-in": "Zoom in",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "Not found in signature",
"readonly-textinput-error": "Read-only text widget must have a default value or you can make it optional.",
"readonly-dropdown-error": "Read-only dropdown widget must have a default value or you can make it optional.",
"readonly-radiobtn-error": "Read-only radio button widget must have a default value or you can make it optional."
"readonly-radiobtn-error": "Read-only radio button widget must have a default value or you can make it optional.",
"choose-one":"Choose One"
}
@@ -362,6 +362,7 @@
"date": "fecha",
"text": "texto",
"text input": "entrada de texto",
"cells": "células",
"checkbox": "casilla",
"dropdown": "desplegable",
"radio button": "botón de radio",
@@ -416,10 +417,12 @@
"options": "Opciones",
"minimun-check": "Chequeo mínimo",
"maximum-check": "Chequeo máximo",
"cell-count": "recuento de células",
"default-value": "Valor por defecto",
"select": "Seleccionar",
"read-only": "Es de solo lectura",
"hide-labels": "Esconder etiquetas",
"layout": "Diseño",
"checkbox": "Casilla",
"alert": "Alerta",
"zoom-in": "Acercar",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "No encontrado en la firma",
"readonly-textinput-error": "El widget de texto de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
"readonly-dropdown-error": "El widget desplegable de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
"readonly-radiobtn-error": "El widget de botón de opción de solo lectura debe tener un valor predeterminado o puede hacerse opcional."
"readonly-radiobtn-error": "El widget de botón de opción de solo lectura debe tener un valor predeterminado o puede hacerse opcional.",
"choose-one":"Elige uno"
}
@@ -361,6 +361,7 @@
"date": "date",
"text": "texte",
"text input": "saisie de texte",
"cells": "cellules",
"checkbox": "case à cocher",
"dropdown": "dérouler",
"radio button": "bouton radio",
@@ -415,10 +416,12 @@
"options": "Possibilités",
"minimun-check": "Vérification minimale",
"maximum-check": "Contrôle maximum",
"cell-count": "numération cellulaire",
"default-value": "Valeur par défaut",
"select": "Sélectionner",
"read-only": "Est en lecture seule",
"hide-labels": "Masquer les étiquettes",
"layout": "Disposition",
"checkbox": "Case à cocher",
"alert": "Alerte",
"zoom-in": "Agrandir",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "Introuvable dans la signature",
"readonly-textinput-error": "Le widget de texte en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
"readonly-dropdown-error": "Le widget déroulant en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
"readonly-radiobtn-error": "Le widget bouton radio en lecture seule doit avoir une valeur par défaut ou être rendu optionnel."
"readonly-radiobtn-error": "Le widget bouton radio en lecture seule doit avoir une valeur par défaut ou être rendu optionnel.",
"choose-one":"Choisissez-en un"
}
@@ -361,6 +361,7 @@
"date": "दिनांक",
"text": "पाठ",
"text input": "पाठ इनपुट",
"cells": "सेल्स",
"checkbox": "चेकबॉक्स",
"dropdown": "ड्रॉपडाउन",
"radio button": "रेडियो बटन",
@@ -415,10 +416,12 @@
"options": "विकल्प",
"minimun-check": "न्यूनतम जाँच",
"maximum-check": "अधिकतम जाँच",
"cell-count": "सेल्स संख्या",
"default-value": "डिफ़ॉल्ट मान",
"select": "चुनें",
"read-only": "केवल पढ़ने के लिए है",
"read-only": "सिर्फ पढ़ने के लिए है",
"hide-labels": "लेबल छिपाएँ",
"layout": "लेआउट",
"checkbox": "चेकबॉक्स",
"alert": "चेतावनी",
"zoom-in": "ज़ूम इन करें",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "हस्ताक्षर में नहीं मिला",
"readonly-textinput-error": "रीड-ओनली टेक्स्ट विजेट में एक डिफ़ॉल्ट मान होना चाहिए या आप इसे वैकल्पिक बना सकते हैं।",
"readonly-dropdown-error": "रीड-ओनली ड्रॉपडाउन विजेट में एक डिफ़ॉल्ट मान होना चाहिए या आप इसे वैकल्पिक बना सकते हैं।",
"readonly-radiobtn-error": "रीड-ओनली रेडियो बटन विजेट में एक डिफ़ॉल्ट मान होना चाहिए या आप इसे वैकल्पिक बना सकते हैं।"
"readonly-radiobtn-error": "रीड-ओनली रेडियो बटन विजेट में एक डिफ़ॉल्ट मान होना चाहिए या आप इसे वैकल्पिक बना सकते हैं।",
"choose-one":"एक का चयन"
}
@@ -361,6 +361,7 @@
"date": "data",
"text": "testo",
"text input": "campo di testo",
"cells": "cellule",
"checkbox": "casella di controllo",
"dropdown": "menu a tendina",
"radio button": "pulsante di opzione",
@@ -415,10 +416,12 @@
"options": "Opzioni",
"minimun-check": "Controllo minimo",
"maximum-check": "Controllo massimo",
"cell-count": "conteggio delle cellule",
"default-value": "Valore predefinita",
"select": "Seleziona",
"read-only": "È solo lettura",
"read-only": di sola lettura",
"hide-labels": "Nascondi etichette",
"layout": "Layout",
"checkbox": "Casella di controllo",
"alert": "Avviso",
"zoom-in": "Ingrandisci",
@@ -1025,5 +1028,6 @@
"not-found-in-signature": "Non trovato nella firma",
"readonly-textinput-error": "Il widget di testo di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
"readonly-dropdown-error": "Il widget a discesa di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
"readonly-radiobtn-error": "Il widget pulsante di opzione di sola lettura deve avere un valore predefinito oppure può essere reso opzionale."
"readonly-radiobtn-error": "Il widget pulsante di opzione di sola lettura deve avere un valore predefinito oppure può essere reso opzionale.",
"choose-one":"Scegline uno"
}
@@ -0,0 +1,123 @@
import { useState, useEffect, useRef } from "react";
const Cell = ({
count,
h,
value,
editable,
onChange,
onKeyDown,
inputRef,
index
}) => (
<div
className="flex items-center justify-center border border-gray-800 bg-white"
style={{ flex: `0 0 ${100 / count}%`, height: h }}
>
<input
maxLength={1}
value={value}
readOnly={!editable}
ref={inputRef}
onChange={editable ? (e) => onChange && onChange(e, index) : undefined}
onKeyDown={editable ? (e) => onKeyDown && onKeyDown(e, index) : undefined}
className="w-full text-center uppercase focus:outline-none bg-transparent text-[12px]"
style={{ fontFamily: "Arial, sans-serif" }}
/>
</div>
);
export default function CellsWidget({
count = 8,
height = 40,
value = "",
editable = false,
onChange,
onKeyDown,
onCellCountChange,
inputRefs,
resizable = false
}) {
const [cellCount, setCellCount] = useState(count);
// keep internal state in sync with prop updates
useEffect(() => setCellCount(count), [count]);
const startX = useRef(0);
const startCount = useRef(cellCount);
const capture = (downEv, onMove, onUp = () => {}) => {
const id = downEv.pointerId;
const move = (ev) => id === ev.pointerId && onMove(ev);
const up = (ev) => {
if (id !== ev.pointerId) return;
onUp(ev);
downEv.target.releasePointerCapture(id);
window.removeEventListener("pointermove", move);
window.removeEventListener("pointerup", up);
};
window.addEventListener("pointermove", move);
window.addEventListener("pointerup", up);
downEv.target.setPointerCapture(id);
};
const onTopHandlePointerDown = (ev) => {
// Prevent triggering the widget drag logic
ev.stopPropagation();
ev.preventDefault();
startX.current = ev.clientX;
startCount.current = cellCount;
capture(ev, (moveEv) => {
const dx = moveEv.clientX - startX.current;
const delta = Math.floor(-dx / 5);
let newCount = Math.max(1, startCount.current + delta);
if (newCount !== cellCount) {
setCellCount(newCount);
onCellCountChange?.(newCount);
}
});
};
const cells = Array.from({ length: cellCount }).map((_, i) => value[i] || "");
return (
<div
className="relative flex w-full h-full overflow-visible"
style={{ height }}
>
{resizable && (
<div
className="cell-size-handle absolute left-1/2 -translate-x-1/2 -top-3 cursor-ew-resize touch-none"
onPointerDown={onTopHandlePointerDown}
>
<svg
className="w-4 h-4 text-blue-600"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
aria-hidden="true"
>
<path
fillRule="evenodd"
d="m9.69 18.933.003.001C9.89 19.02 10 19 10 19s.11.02.308-.066l.002-.001.006-.003.018-.008a5.741 5.741 0 0 0 .281-.14c.186-.096.446-.24.757-.433.62-.384 1.445-.966 2.274-1.765C15.302 14.988 17 12.493 17 9A7 7 0 1 0 3 9c0 3.492 1.698 5.988 3.355 7.584a13.731 13.731 0 0 0 2.273 1.765 11.842 11.842 0 0 0 .976.544l.062.029.018.008.006.003ZM10 11.25a2.25 2.25 0 1 0 0-4.5 2.25 2.25 0 0 0 0 4.5Z"
clipRule="evenodd"
/>
</svg>
</div>
)}
{cells.map((val, i) => (
<Cell
key={i}
count={cellCount}
h={height}
value={val}
editable={editable}
onChange={onChange}
onKeyDown={onKeyDown}
inputRef={inputRefs ? (el) => (inputRefs.current[i] = el) : undefined}
index={i}
/>
))}
</div>
);
}
@@ -7,8 +7,8 @@ import { fontColorArr, fontsizeArr } from "../../constant/Utils";
function DropdownWidgetOption(props) {
const { t } = useTranslation();
const [dropdownOptionList, setDropdownOptionList] = useState([
"option-1",
"option-2"
"Option-1",
"Option-2"
]);
const [minCount, setMinCount] = useState(0);
const [maxCount, setMaxCount] = useState(0);
@@ -17,11 +17,13 @@ function DropdownWidgetOption(props) {
const [isHideLabel, setIsHideLabel] = useState(false);
const [status, setStatus] = useState("required");
const [defaultValue, setDefaultValue] = useState("");
const statusArr = ["required", "optional"];
const [defaultCheckbox, setDefaultCheckbox] = useState([]);
const [layout, setLayout] = useState("vertical");
const statusArr = ["required", "optional"];
const layoutArr = ["vertical", "horizontal"];
const resetState = () => {
setDropdownOptionList(["option-1", "option-2"]);
setDropdownOptionList(["Option-1", "Option-2"]);
setDropdownName(props.currWidgetsDetails?.options?.name || props.type);
setIsReadOnly(false);
setIsHideLabel(false);
@@ -29,6 +31,7 @@ function DropdownWidgetOption(props) {
setMaxCount(0);
setDefaultCheckbox([]);
setDefaultValue("");
setLayout("vertical");
};
useEffect(() => {
if (
@@ -48,6 +51,7 @@ function DropdownWidgetOption(props) {
setStatus(props.currWidgetsDetails?.options?.status || "required");
setDefaultValue(props.currWidgetsDetails?.options?.defaultValue || "");
setDefaultCheckbox(props.currWidgetsDetails?.options?.defaultValue || []);
setLayout(props.currWidgetsDetails?.options?.layout || "vertical");
} else {
setStatus("required");
resetState();
@@ -107,6 +111,9 @@ function DropdownWidgetOption(props) {
props?.type === "dropdown" || props?.type === radioButtonWidget;
const readOnlyWithoutValue =
isReadOnly && !defaultValue && status !== "optional";
const WidgetLayout = ["checkbox", radioButtonWidget].includes(props.type)
? layout
: null;
// If its a dropdown and its read-only without a value (nor marked optional), stop here.
if (isDropdownOrRadio && readOnlyWithoutValue) {
@@ -129,7 +136,8 @@ function DropdownWidgetOption(props) {
null,
status,
defaultData,
isHideLabel
isHideLabel,
WidgetLayout
);
resetState();
};
@@ -153,17 +161,18 @@ function DropdownWidgetOption(props) {
}}
>
<div>
<label className="text-[13px] font-semibold">
<label htmlFor="title" className="text-[13px] font-semibold">
{t("name")}
<span className="text-[red] text-[13px]"> *</span>
</label>
<input
id="title"
onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
onInput={(e) => e.target.setCustomValidity("")}
required
value={dropdownName}
onChange={(e) => setDropdownName(e.target.value)}
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
required
/>
<label className="text-[13px] font-semibold mt-[5px]">
@@ -245,27 +254,23 @@ function DropdownWidgetOption(props) {
</>
)}
{props.type !== "checkbox" && (
<>
<div className="flex flex-row gap-[10px] mt-[0.5rem]">
{statusArr.map((data, ind) => {
return (
<div
key={ind}
className="flex flex-row gap-[5px] items-center"
>
<input
className="op-radio op-radio-xs my-1"
type="radio"
name="status"
onChange={() => setStatus(data.toLowerCase())}
checked={status.toLowerCase() === data.toLowerCase()}
/>
<div className="text-[13px] font-500">{data}</div>
</div>
);
})}
</div>
</>
<div className="flex flex-row gap-[10px] mt-[0.5rem]">
{statusArr.map((data, ind) => (
<div
key={ind}
className="flex flex-row gap-[5px] items-center"
>
<input
className="op-radio op-radio-xs my-1"
type="radio"
name="status"
onChange={() => setStatus(data.toLowerCase())}
checked={status.toLowerCase() === data.toLowerCase()}
/>
<div className="text-[13px] font-500 capitalize">{data}</div>
</div>
))}
</div>
)}
<div className="flex items-center mt-3 mb-3">
<span>{t("font-size")} :</span>
@@ -286,8 +291,8 @@ function DropdownWidgetOption(props) {
);
})}
</select>
<div className="flex flex-row gap-1 items-center ml-4 ">
<span>{t("color")} : </span>
<div className="flex flex-row gap-1 items-center ml-4">
<span className="capitalize">{t("color")} : </span>
<select
value={
props.fontColor ||
@@ -329,7 +334,7 @@ function DropdownWidgetOption(props) {
className="op-checkbox op-checkbox-sm"
onChange={(e) => setIsReadOnly(e.target.checked)}
/>
<label className="ml-1 mb-0" htmlFor="isreadonly">
<label className="ml-2 mb-0 capitalize" htmlFor="isreadonly">
{t("read-only")}
</label>
</div>
@@ -344,15 +349,42 @@ function DropdownWidgetOption(props) {
onChange={(e) => setIsHideLabel(e.target.checked)}
/>
<label className="ml-1 mb-0" htmlFor="ishidelabel">
<label className="ml-2 mb-0 capitalize" htmlFor="ishidelabel">
{t("hide-labels")}
</label>
</div>
)}
</div>
)}
{["checkbox", radioButtonWidget].includes(props.type) && (
<>
<div className="text-[13px] font-semibold mt-[5px] capitalize">
{t("layout")}
</div>
<div
className={`${props.type === "checkbox" ? "mb-[10px]" : ""} flex flex-row gap-[10px] mt-[0.5rem]`}
>
{layoutArr.map((data, ind) => (
<div
key={ind}
className="flex flex-row gap-[5px] items-center"
>
<input
className="op-radio op-radio-xs my-1"
type="radio"
name="layout"
checked={layout.toLowerCase() === data.toLowerCase()}
onChange={() => setLayout(data.toLowerCase())}
/>
<label className="text-[13px] font-500 mb-0 capitalize">
{data}
</label>
</div>
))}
</div>
</>
)}
</div>
<div
className={`${
props.type === "checkbox" && props.isShowAdvanceFeature
@@ -13,6 +13,7 @@ import {
onChangeInput,
radioButtonWidget,
textInputWidget,
cellsWidget,
textWidget
} from "../../constant/Utils";
import PlaceholderType from "./PlaceholderType";
@@ -85,6 +86,9 @@ function Placeholder(props) {
const [selectDate, setSelectDate] = useState({});
const [dateFormat, setDateFormat] = useState([]);
const [clickonWidget, setClickonWidget] = useState({});
const [isDateReadOnly, setIsDateReadOnly] = useState(
props?.pos?.options?.isReadOnly || false
);
const startDate = props?.pos?.options?.response
? getDefaultDate(
props?.pos?.options?.response,
@@ -406,10 +410,47 @@ function Placeholder(props) {
false,
data?.format,
props.fontSize || props.pos?.options?.fontSize || 12,
props.fontColor || props.pos?.options?.fontColor || "black"
props.fontColor || props.pos?.options?.fontColor || "black",
isDateReadOnly || false
);
setSelectDate({ date: date, format: data?.format });
};
const setCellCount = (key, newCount) => {
const isSignerList = props.xyPosition.some((d) => d.signerPtr);
if (isSignerList) {
const signerId = props.data?.Id || props.uniqueId;
const filterSignerPos = props.xyPosition.filter((d) => d.Id === signerId);
if (filterSignerPos.length > 0) {
const getPlaceHolder = filterSignerPos[0].placeHolder;
const updatedPlaceHolder = getPlaceHolder.map((ph) => {
if (ph.pageNumber !== props.pageNumber) return ph;
const newPos = ph.pos.map((p) =>
p.key === key
? { ...p, options: { ...p.options, cellCount: newCount } }
: p
);
return { ...ph, pos: newPos };
});
const newSignerPos = props.xyPosition.map((obj) =>
obj.Id === signerId
? { ...obj, placeHolder: updatedPlaceHolder }
: obj
);
props.setXyPosition(newSignerPos);
}
} else {
const updatePos = props.xyPosition[props.index].pos.map((p) =>
p.key === key
? { ...p, options: { ...p.options, cellCount: newCount } }
: p
);
const updatePlaceholder = props.xyPosition.map((obj, ind) =>
ind === props.index ? { ...obj, pos: updatePos } : obj
);
props.setXyPosition(updatePlaceholder);
}
};
const PlaceholderIcon = () => {
// 1- If props.isShowBorder is true, display border's icon for all widgets. OR
// 2- Use the combination of props?.isAlllowModify and !props?.assignedWidgetId.includes(props.pos.key) to determine when to show border's icon:
@@ -751,16 +792,9 @@ function Placeholder(props) {
id={props.pos.key}
data-tut={props.pos.key === props.unSignedWidgetId ? "IsSigned" : ""}
key={props.pos.key}
cancel=".cell-size-handle"
lockAspectRatio={
!props.isFreeResize &&
![
textWidget,
"email",
"name",
"company",
"job title",
textInputWidget
].includes(props.pos.type) &&
(props.pos.Width
? props.pos.Width / props.pos.Height
: defaultWidthHeight(props.pos.type).width /
@@ -820,8 +854,10 @@ function Placeholder(props) {
: props.posHeight(props.pos, props.isSignYourself)
}}
minHeight={
props.pos.type !== "checkbox" &&
calculateFont(props.pos.options?.fontSize, true)
props.pos.type === cellsWidget
? calculateFont(props.pos.options?.fontSize, true)
: props.pos.type !== "checkbox" &&
calculateFont(props.pos.options?.fontSize, true)
}
maxHeight="auto"
onResizeStart={() => {
@@ -938,6 +974,7 @@ function Placeholder(props) {
handleSaveDate={handleSaveDate}
xPos={props.xPos}
calculateFont={calculateFont}
setCellCount={setCellCount}
/>
</div>
</Rnd>
@@ -945,11 +982,11 @@ function Placeholder(props) {
<ModalUi isOpen={isDateModal} title={t("widget-info")} showClose={false}>
<div className="h-[100%] p-[20px]">
<div className="flex flex-row items-center">
<span>{t("format")} : </span>
<div className="flex">
<div className="flex flex-col md:flex-row md:items-center gap-y-3">
<div className="flex flex-row items-center gap-x-1">
<span className="capitalize">{t("format")} :</span>
<select
className="ml-[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
defaultValue={""}
onChange={(e) => {
const selectedIndex = e.target.value;
@@ -973,23 +1010,23 @@ function Placeholder(props) {
{selectDate.format}
</span>
</div>
<div className="flex items-center mt-4 md:mt-2">
<span>{t("font-size")} :</span>
<select
className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
value={props.fontSize || clickonWidget.options?.fontSize || 12}
onChange={(e) => props.setFontSize(parseInt(e.target.value))}
>
{fontsizeArr.map((size, ind) => {
return (
<div className="flex flex-col md:flex-row gap-y-2 md:gap-y-0 gap-x-2 mt-3">
<div className="flex flex-row items-center">
<span className="capitalize">{t("font-size")} :</span>
<select
className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
value={props.fontSize || clickonWidget.options?.fontSize || 12}
onChange={(e) => props.setFontSize(parseInt(e.target.value))}
>
{fontsizeArr.map((size, ind) => (
<option className="text-[13px]" value={size} key={ind}>
{size}
</option>
);
})}
</select>
<div className="flex flex-row gap-1 items-center ml-2 md:ml-4 ">
<span>{t("color")}: </span>
))}
</select>
</div>
<div className="flex flex-row gap-1 items-center">
<span className="capitalize">{t("color")} :</span>
<select
value={
props.fontColor || clickonWidget.options?.fontColor || "black"
@@ -997,13 +1034,11 @@ function Placeholder(props) {
onChange={(e) => props.setFontColor(e.target.value)}
className="ml-[4px] md:ml[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
>
{fontColorArr.map((color, ind) => {
return (
<option value={color} key={ind}>
{t(`color-type.${color}`)}
</option>
);
})}
{fontColorArr.map((color, ind) => (
<option value={color} key={ind}>
{t(`color-type.${color}`)}
</option>
))}
</select>
<span
style={{
@@ -1014,7 +1049,26 @@ function Placeholder(props) {
></span>
</div>
</div>
{props?.isPlaceholder && (
<div className="flex items-center mt-3">
<input
id="isReadOnly"
name="isReadOnly"
type="checkbox"
checked={
isDateReadOnly || props.pos.options?.isReadOnly || false
}
className="op-checkbox op-checkbox-xs"
onChange={() => setIsDateReadOnly(!isDateReadOnly)}
/>
<label
className="ml-1.5 mb-0 capitalize text-[13px]"
htmlFor="isreadonly"
>
{t("read-only")}
</label>
</div>
)}
<div className="h-[1px] w-full my-[15px] bg-[#9f9f9f]"></div>
<button
type="button"
@@ -4,6 +4,7 @@ import {
getYear,
radioButtonWidget,
textInputWidget,
cellsWidget,
textWidget,
months,
years,
@@ -14,8 +15,9 @@ import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import "../../styles/signature.css";
import { useTranslation } from "react-i18next";
import CellsWidget from "./CellsWidget";
const textWidgetCls =
"w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap bg-white";
"w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap";
const selectWidgetCls =
"w-full h-full absolute left-0 top-0 border-[1px] border-[#007bff] rounded-[2px] focus:outline-none text-base-content";
const widgetCls =
@@ -27,8 +29,12 @@ function PlaceholderType(props) {
props.isSignYourself ||
((props.isSelfSign || props.isNeedSign) &&
props.data?.signerObjId === props.signerObjId);
const isReadOnly =
props.pos.options?.isReadOnly ||
props.data?.signerObjId !== props.signerObjId;
// prefer the latest response value over any default value
const widgetData =
props.pos?.options?.defaultValue || props.pos?.options?.response;
props.pos?.options?.response ?? props.pos?.options?.defaultValue ?? "";
const widgetTypeTranslation = t(`widgets-name.${props?.pos?.type}`);
const inputRef = useRef(null);
const [widgetValue, setwidgetValue] = useState();
@@ -56,16 +62,13 @@ function PlaceholderType(props) {
[]
);
} else {
if (widgetData) {
setwidgetValue(widgetData);
}
// keep displayed value in sync with the stored response
setwidgetValue(widgetData);
}
if (props.pos?.options?.hint) {
setHint(props.pos?.options.hint);
} else if (props.pos?.options?.validation?.type) {
checkRegularExpress(props.pos?.options?.validation?.type, setHint);
} else {
setHint(props.pos?.type);
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -77,7 +80,8 @@ function PlaceholderType(props) {
color: fontColor,
fontFamily: "Arial, sans-serif"
}}
className={`${selectWidgetCls} overflow-hidden`}
className={`${isReadOnly ? `select-none` : ``} ${selectWidgetCls} overflow-hidden`}
disabled={isReadOnly}
onClick={onClick}
ref={ref}
>
@@ -148,41 +152,42 @@ function PlaceholderType(props) {
</div>
);
case "checkbox":
const checkBoxLayout = props.pos.options?.layout || "vertical";
const isMultipleCheckbox =
props.pos.options?.values?.length > 0 ? true : false;
const checkBoxWrapperClass = `flex items-start ${
checkBoxLayout === "horizontal"
? `flex-row flex-wrap ${isMultipleCheckbox ? "gap-x-2" : ""}`
: `flex-col ${isMultipleCheckbox ? "gap-y-[5px]" : ""}`
}`; // Using gap-y-1 for consistency, adjust if needed
return (
<div style={{ zIndex: props.isSignYourself && "99" }}>
{props.pos.options?.values?.map((data, ind) => {
return (
<div key={ind} className="select-none-cls pointer-events-none">
<label
htmlFor={`checkbox-${props.pos.key + ind}`}
style={{ fontSize: fontSize, color: fontColor }}
className={`mb-0 flex items-center gap-1 ${
ind > 0 ? "mt-[3px]" : "mt-[0px]"
}`}
>
<input
id={`checkbox-${props.pos.key + ind}`}
style={{
width: fontSize,
height: fontSize
}}
className="op-checkbox rounded-[1px]"
disabled={
props.isNeedSign &&
(props.pos.options?.isReadOnly ||
props.data?.signerObjId !== props.signerObjId)
}
type="checkbox"
readOnly
checked={!!selectCheckbox(ind, selectedCheckbox)}
/>
{!props.pos.options?.isHideLabel && (
<span className="leading-none">{data}</span>
)}
</label>
</div>
);
})}
<div
className={checkBoxWrapperClass}
style={{ zIndex: props.isSignYourself && "99" }}
>
{props.pos.options?.values?.map((data, ind) => (
<div key={ind} className="select-none-cls pointer-events-none">
<label
htmlFor={`checkbox-${props.pos.key + ind}`}
style={{ fontSize: fontSize, color: fontColor }}
className={`mb-0 flex items-center gap-1`}
>
<input
id={`checkbox-${props.pos.key + ind}`}
style={{ width: fontSize, height: fontSize }}
className="op-checkbox rounded-[1px]"
disabled={props.isNeedSign && isReadOnly}
type="checkbox"
readOnly
checked={!!selectCheckbox(ind, selectedCheckbox)}
/>
{!props.pos.options?.isHideLabel && (
<span className="leading-none">{data}</span>
)}
</label>
</div>
))}
</div>
);
case textInputWidget:
@@ -192,24 +197,15 @@ function PlaceholderType(props) {
placeholder={hint || t("widgets-name.text")}
rows={1}
value={widgetValue}
className={`${
props.pos.options?.isReadOnly ||
props.data?.signerObjId !== props.signerObjId
? "select-none"
: textWidgetCls
}`}
className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
style={{
fontSize: fontSize,
color: fontColor,
background: props.data?.blockColor,
background: isReadOnly ? props.data?.blockColor : "white",
pointerEvents: "none"
}}
readOnly
disabled={
props.isNeedSign &&
(props.pos.options?.isReadOnly ||
props.data?.signerObjId !== props.signerObjId)
}
disabled={props.isNeedSign && isReadOnly}
cols="50"
/>
) : (
@@ -217,13 +213,31 @@ function PlaceholderType(props) {
<span>{hint || widgetTypeTranslation}</span>
</div>
);
case cellsWidget: {
const count = props.pos.options?.cellCount || 5;
const cells = (widgetValue || "").split("");
const height = "100%";
const handleCellResize = (newCount) => {
if (props.setCellCount) props.setCellCount(props.pos.key, newCount);
};
return (
<CellsWidget
count={count}
height={height}
value={cells.join("")}
editable={props.isPlaceholder}
resizable={props.isPlaceholder}
onCellCountChange={handleCellResize}
/>
);
}
case "dropdown":
return (
<div
style={textWidgetStyle}
className="select-none-cls flex justify-between items-center"
>
{widgetData || hint || widgetTypeTranslation}
{widgetData || t("choose-one")}
<i className="fa-light fa-circle-chevron-down mr-1 "></i>
</div>
);
@@ -259,13 +273,15 @@ function PlaceholderType(props) {
placeholder={hint || widgetTypeTranslation}
rows={1}
value={widgetValue}
className={textWidgetCls}
className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
style={{
fontSize: fontSize,
color: fontColor,
background: isReadOnly ? props.data?.blockColor : "white",
pointerEvents: "none"
}}
cols="50"
disabled={props.isNeedSign && isReadOnly}
/>
) : (
<div className="flex h-full select-none-cls" style={textWidgetStyle}>
@@ -280,13 +296,15 @@ function PlaceholderType(props) {
placeholder={hint || widgetTypeTranslation}
rows={1}
value={widgetValue}
className={textWidgetCls}
className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
style={{
fontSize: fontSize,
color: fontColor,
background: isReadOnly ? props.data?.blockColor : "white",
pointerEvents: "none"
}}
cols="50"
disabled={props.isNeedSign && isReadOnly}
/>
) : (
<div style={textWidgetStyle} className="select-none-cls">
@@ -301,13 +319,15 @@ function PlaceholderType(props) {
placeholder={hint || widgetTypeTranslation}
rows={1}
value={widgetValue}
className={textWidgetCls}
className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
style={{
fontSize: fontSize,
color: fontColor,
background: isReadOnly ? props.data?.blockColor : "white",
pointerEvents: "none"
}}
cols="50"
disabled={props.isNeedSign && isReadOnly}
/>
) : (
<div style={textWidgetStyle} className="select-none-cls">
@@ -405,15 +425,15 @@ function PlaceholderType(props) {
placeholder={hint || widgetTypeTranslation}
rows={1}
value={widgetValue}
className={textWidgetCls}
className={`${textWidgetCls} ${isReadOnly ? "select-none" : ""}`}
style={{
fontSize: fontSize,
color: fontColor,
fontFamily: "Arial, sans-serif",
background: isReadOnly ? props.data?.blockColor : "white",
pointerEvents: "none"
}}
disabled
cols="1"
disabled={props.isNeedSign && isReadOnly}
/>
) : (
<div style={textWidgetStyle} className="select-none-cls">
@@ -421,46 +441,39 @@ function PlaceholderType(props) {
</div>
);
case radioButtonWidget:
const radioLayout = props.pos.options?.layout || "vertical";
const isOnlyOneBtn = props.pos.options?.values?.length > 0 ? true : false;
const radioWrapperClass = `flex items-start ${
radioLayout === "horizontal"
? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-2" : ""}`
: `flex-col ${isOnlyOneBtn ? "gap-y-[5px]" : ""}`
}`; // Using gap-y-1 for consistency, adjust if needed
return (
<div>
{props.pos.options?.values.map((data, ind) => {
return (
<div key={ind} className="select-none-cls pointer-events-none">
<label
htmlFor={`radio-${props.pos.key + ind}`}
style={{
fontSize: fontSize,
color: fontColor,
marginTop: ind > 0 ? "5px" : "0px"
}}
className="text-xs mb-0 flex items-center gap-1 "
>
<input
readOnly
id={`radio-${props.pos.key + ind}`}
style={{
width: fontSize,
height: fontSize,
lineHeight: 2
}}
className={`op-radio rounded-full border- border-black appearance-none bg-white inline-block align-middle relative ${
handleRadioCheck(data) ? "checked-radio" : ""
}`}
type="radio"
disabled={
props.isNeedSign &&
(props.pos.options?.isReadOnly ||
props.data?.signerObjId !== props.signerObjId)
}
checked={handleRadioCheck(data)}
/>
{!props.pos.options?.isHideLabel && (
<span className="leading-none">{data}</span>
)}
</label>
</div>
);
})}
<div className={radioWrapperClass}>
{props.pos.options?.values.map((data, ind) => (
<div key={ind} className="select-none-cls pointer-events-none">
<label
htmlFor={`radio-${props.pos.key + ind}`}
style={{ fontSize: fontSize, color: fontColor }}
className="text-xs mb-0 flex items-center gap-1"
>
<input
readOnly
id={`radio-${props.pos.key + ind}`}
style={{ width: fontSize, height: fontSize, lineHeight: 2 }}
className={`op-radio rounded-full border-black appearance-none bg-white inline-block align-middle relative ${
handleRadioCheck(data) ? "checked-radio" : ""
}`}
type="radio"
disabled={props.isNeedSign && isReadOnly}
checked={handleRadioCheck(data)}
/>
{!props.pos.options?.isHideLabel && (
<span className="leading-none">{data}</span>
)}
</label>
</div>
))}
</div>
);
case textWidget:
@@ -474,7 +487,8 @@ function PlaceholderType(props) {
style={{
fontFamily: "Arial, sans-serif",
fontSize: fontSize,
color: fontColor
color: fontColor,
background: "white"
}}
cols="50"
/>
+214 -430
View File
@@ -79,7 +79,7 @@ function RenderPdf(props) {
}
};
//function for render placeholder block over pdf document
// function for render placeholder block over pdf document (all signing flow)
const checkSignedSigners = (data) => {
let checkSign = [];
//condition to handle quick send flow and using normal request sign flow
@@ -91,73 +91,71 @@ function RenderPdf(props) {
: [];
return (
checkSign.length === 0 &&
data?.placeHolder?.map((placeData, key) => {
return (
<React.Fragment key={key}>
{placeData.pageNumber === props.pageNumber &&
placeData.pos.map((pos, ind) => {
return (
pos && (
<React.Fragment key={ind}>
<Placeholder
pos={pos}
handleSignYourselfImageResize={handleImageResize}
index={props.pageNumber}
xyPosition={props.signerPos}
setXyPosition={props.setSignerPos}
data={data}
setIsResize={props.setIsResize}
isShowBorder={props.isSelfSign}
isAlllowModify={props.isAlllowModify}
signerObjId={props.signerObjectId}
isShowDropdown={true}
isNeedSign={props.pdfRequest}
isSelfSign={true}
isSignYourself={false}
posWidth={posWidth}
posHeight={posHeight}
isDragging={props.isDragging}
pdfDetails={props.pdfDetails}
unSignedWidgetId={props.unSignedWidgetId}
setCurrWidgetsDetails={props.setCurrWidgetsDetails}
uniqueId={props.uniqueId}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
ispublicTemplate={props.ispublicTemplate}
handleUserDetails={props.handleUserDetails}
isResize={props.isResize}
setIsAgreeTour={props.setIsAgreeTour}
isAgree={props.isAgree}
handleTabDrag={props.handleTabDrag}
handleStop={props.handleStop}
setUniqueId={props.setUniqueId}
setIsSelectId={props.setIsSelectId}
handleDeleteSign={props.handleDeleteSign}
setIsPageCopy={props.setIsPageCopy}
handleTextSettingModal={props.handleTextSettingModal}
setIsCheckbox={props.setIsCheckbox}
isFreeResize={false}
isOpenSignPad={true}
assignedWidgetId={props.assignedWidgetId}
isApplyAll={true}
setFontSize={props.setFontSize}
fontSize={props.fontSize}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
setRequestSignTour={props.setRequestSignTour}
calculateFontsize={calculateFontsize}
currWidgetsDetails={props?.currWidgetsDetails}
setTempSignerId={props.setTempSignerId}
/>
</React.Fragment>
)
);
})}
</React.Fragment>
);
})
data?.placeHolder?.map((placeData, key) => (
<React.Fragment key={key}>
{placeData.pageNumber === props.pageNumber &&
placeData.pos.map(
(pos, ind) =>
pos && (
<React.Fragment key={ind}>
<Placeholder
pos={pos}
handleSignYourselfImageResize={handleImageResize}
index={props.pageNumber}
xyPosition={props.signerPos}
setXyPosition={props.setSignerPos}
data={data}
setIsResize={props.setIsResize}
isShowBorder={props.isSelfSign}
isAlllowModify={props.isAlllowModify}
signerObjId={props.signerObjectId}
isShowDropdown={true}
isNeedSign={props.pdfRequest}
isSelfSign={true}
isSignYourself={false}
posWidth={posWidth}
posHeight={posHeight}
isDragging={props.isDragging}
pdfDetails={props.pdfDetails}
unSignedWidgetId={props.unSignedWidgetId}
setCurrWidgetsDetails={props.setCurrWidgetsDetails}
uniqueId={props.uniqueId}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
ispublicTemplate={props.ispublicTemplate}
handleUserDetails={props.handleUserDetails}
isResize={props.isResize}
setIsAgreeTour={props.setIsAgreeTour}
isAgree={props.isAgree}
handleTabDrag={props.handleTabDrag}
handleStop={props.handleStop}
setUniqueId={props.setUniqueId}
setIsSelectId={props.setIsSelectId}
handleDeleteSign={props.handleDeleteSign}
setIsPageCopy={props.setIsPageCopy}
handleTextSettingModal={props.handleTextSettingModal}
setIsCheckbox={props.setIsCheckbox}
isFreeResize={false}
isOpenSignPad={true}
assignedWidgetId={props.assignedWidgetId}
isApplyAll={true}
setCellCount={props.setCellCount}
setFontSize={props.setFontSize}
fontSize={props.fontSize}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
setRequestSignTour={props.setRequestSignTour}
calculateFontsize={calculateFontsize}
currWidgetsDetails={props?.currWidgetsDetails}
setTempSignerId={props.setTempSignerId}
/>
</React.Fragment>
)
)}
</React.Fragment>
))
);
};
@@ -172,148 +170,138 @@ function RenderPdf(props) {
}
};
const pdfDataBase64 = `data:application/pdf;base64,${props.pdfBase64Url}`;
//calculate render height of pdf in mobile view
// calculate render height of pdf in mobile view
const handlePageLoadSuccess = (page) => {
const containerWidth = props.divRef.current.offsetWidth; // Get container width
const viewport = page.getViewport({ scale: 1 });
const scale = containerWidth / viewport.width; // Scale to fit container width
const scaleHeight = viewport.height * scale;
setScaledHeight(scaleHeight);
if (isMobile) {
const containerWidth = props.divRef.current.offsetWidth; // Get container width
const viewport = page.getViewport({ scale: 1 });
const scale = containerWidth / viewport.width; // Scale to fit container width
const scaleHeight = viewport.height * scale;
setScaledHeight(scaleHeight);
}
};
return (
<>
{props.successEmail && (
<Alert type={"success"}>{t("success-email-alert")}</Alert>
)}
{isMobile ? (
<RSC
<RSC
style={{
position: "relative",
boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
height: isMobile
? isGuestSigner
? window.innerHeight - 49 // 49 is height of header
: scaledHeight
: `${window.innerHeight}px`,
zIndex: 0
}}
noScrollY={isMobile ? props.scale === 1 : false}
noScrollX={props.scale === 1}
>
<div
data-tut={isMobile ? "reactourForth" : undefined}
className={
isMobile
? `${isGuestSigner ? "30px" : ""} border-[0.1px] border-[#ebe8e8] overflow-x-auto`
: ""
}
style={{
position: "relative",
boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
//49 is height of header
height: isGuestSigner ? window.innerHeight - 49 : scaledHeight,
zIndex: 0
width:
props.containerWH?.width && props.containerWH?.width * props.scale
}}
noScrollY={props.scale === 1 ? true : false}
noScrollX={props.scale === 1 ? true : false}
ref={props.drop}
id="container"
>
<div
data-tut="reactourForth"
className={`${
isGuestSigner ? "30px" : ""
} border-[0.1px] border-[#ebe8e8] overflow-x-auto`}
style={{
width:
props.containerWH?.width &&
props.containerWH?.width * props.scale
}}
ref={props.drop}
id="container"
>
{props.containerWH?.width &&
props.pdfOriginalWH.length > 0 &&
(props.pdfRequest || props.isSelfSign
? props.signerPos?.map((data, key) => {
return (
{props.pdfLoad !== false &&
props.containerWH?.width &&
props.pdfOriginalWH.length > 0 && (
<>
{props.pdfRequest || props.isSelfSign
? // request sign, guest sign,
props.signerPos?.map((data, key) => (
<React.Fragment key={key}>
{checkSignedSigners(data)}
</React.Fragment>
);
})
: props.placeholder // placeholder mobile
? props.signerPos?.map((data, ind) => {
return (
))
: props.placeholder // placeholdersign document, draft document, create template, draft template
? props.signerPos?.map((data, ind) => (
<React.Fragment key={ind}>
{data?.placeHolder &&
data?.placeHolder.map((placeData, index) => {
return (
<React.Fragment key={index}>
{placeData.pageNumber === props.pageNumber &&
placeData.pos.map((pos) => {
return (
<React.Fragment key={pos.key}>
<Placeholder
pos={pos}
setIsPageCopy={props.setIsPageCopy}
handleDeleteSign={
props.handleDeleteSign
}
handleTabDrag={props.handleTabDrag}
handleStop={props.handleStop}
handleSignYourselfImageResize={
handleImageResize
}
index={props.pageNumber}
xyPosition={props.signerPos}
setXyPosition={props.setSignerPos}
data={data}
setIsResize={props.setIsResize}
setShowDropdown={
props.setShowDropdown
}
isShowBorder={true}
isPlaceholder={true}
setUniqueId={props.setUniqueId}
handleLinkUser={
props.handleLinkUser
}
isSignYourself={false}
posWidth={posWidth}
posHeight={posHeight}
isDragging={props.isDragging}
setIsValidate={props.setIsValidate}
setIsRadio={props.setIsRadio}
setIsCheckbox={props.setIsCheckbox}
setCurrWidgetsDetails={
props.setCurrWidgetsDetails
}
handleNameModal={
props.handleNameModal
}
setTempSignerId={
props.setTempSignerId
}
uniqueId={props.uniqueId}
handleTextSettingModal={
props.handleTextSettingModal
}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
setIsSelectId={props.setIsSelectId}
fontSize={props.fontSize}
setFontSize={props.setFontSize}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
isResize={props.isResize}
unSignedWidgetId={
props.unSignedWidgetId
}
isFreeResize={true}
calculateFontsize={
calculateFontsize
}
currWidgetsDetails={
props?.currWidgetsDetails
}
/>
</React.Fragment>
);
})}
</React.Fragment>
);
})}
data?.placeHolder.map((placeData, index) => (
<React.Fragment key={index}>
{placeData.pageNumber === props.pageNumber &&
placeData.pos.map((pos) => (
<React.Fragment key={pos.key}>
<Placeholder
pos={pos}
setIsPageCopy={props.setIsPageCopy}
handleDeleteSign={
props.handleDeleteSign
}
handleTabDrag={props.handleTabDrag}
handleStop={props.handleStop}
handleSignYourselfImageResize={
handleImageResize
}
index={props.pageNumber}
xyPosition={props.signerPos}
setXyPosition={props.setSignerPos}
data={data}
setIsResize={props.setIsResize}
setShowDropdown={props.setShowDropdown}
isShowBorder={true}
isPlaceholder={true}
setUniqueId={props.setUniqueId}
handleLinkUser={props.handleLinkUser}
isSignYourself={false}
posWidth={posWidth}
posHeight={posHeight}
isDragging={props.isDragging}
setIsValidate={props.setIsValidate}
setIsRadio={props.setIsRadio}
setIsCheckbox={props.setIsCheckbox}
setCurrWidgetsDetails={
props.setCurrWidgetsDetails
}
handleNameModal={props.handleNameModal}
setTempSignerId={props.setTempSignerId}
uniqueId={props.uniqueId}
handleTextSettingModal={
props.handleTextSettingModal
}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
setIsSelectId={props.setIsSelectId}
fontSize={props.fontSize}
setFontSize={props.setFontSize}
setCellCount={props.setCellCount}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
isResize={props.isResize}
unSignedWidgetId={
props.unSignedWidgetId
}
isFreeResize={true}
calculateFontsize={calculateFontsize}
currWidgetsDetails={
props?.currWidgetsDetails
}
/>
</React.Fragment>
))}
</React.Fragment>
))}
</React.Fragment>
);
})
: !props.pdfDetails?.[0]?.IsCompleted &&
props.xyPosition?.map((data, ind) => {
return (
))
: !props.pdfDetails?.[0]?.IsCompleted && // signyourself flow
props.xyPosition?.map((data, ind) => (
<React.Fragment key={ind}>
{data.pageNumber === props.pageNumber &&
data.pos.map((pos, id) => {
return (
data.pos.map(
(pos, id) =>
pos && (
<Placeholder
key={id}
@@ -359,247 +347,43 @@ function RenderPdf(props) {
}
/>
)
);
})}
)}
</React.Fragment>
);
}))}
{/* Mobile */}
<Document
error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
onLoadError={() => props.setPdfLoad(false)}
loading={t("loading-doc")}
onLoadSuccess={props.pageDetails}
onClick={() =>
props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
}
file={pdfDataBase64}
>
<Page
onLoadSuccess={handlePageLoadSuccess}
scale={props.scale || 1}
key={props.index}
pageNumber={props.pageNumber}
width={props.containerWH.width}
renderAnnotationLayer={false}
renderTextLayer={false}
onGetAnnotationsError={(error) => {
console.log("annotation error", error);
}}
className="select-none touch-callout-none"
/>
</Document>
</div>
</RSC>
) : (
<RSC
style={{
position: "relative",
boxShadow: "rgba(17, 12, 46, 0.15) 0px 48px 100px 0px",
height: window.innerHeight + "px",
zIndex: 0
}}
noScrollY={false}
noScrollX={props.scale === 1 ? true : false}
>
<div
style={{
width:
props.containerWH?.width &&
props.containerWH?.width * props.scale
))}
</>
)}
<Document
error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
onLoadError={(e) => {
console.log("PDF load error", e);
props.setPdfLoad(false);
}}
ref={props.drop}
id="container"
loading={t("loading-doc")}
onLoadSuccess={(pdf) => {
props.setPdfLoad(true);
props.pageDetails(pdf);
}}
onClick={() =>
props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
}
file={pdfDataBase64}
>
{props.pdfLoad &&
props.containerWH?.width &&
props.pdfOriginalWH.length > 0 &&
(props.pdfRequest || props.isSelfSign //pdf request sign flow
? props.signerPos?.map((data, key) => {
return (
<React.Fragment key={key}>
{checkSignedSigners(data)}
</React.Fragment>
);
})
: props.placeholder //placeholder and template flow
? props.signerPos.map((data, ind) => {
return (
<React.Fragment key={ind}>
{data?.placeHolder &&
data?.placeHolder.map((placeData, index) => {
return (
<React.Fragment key={index}>
{placeData.pageNumber === props.pageNumber &&
placeData.pos.map((pos) => {
return (
<React.Fragment key={pos.key}>
<Placeholder
pos={pos}
setIsPageCopy={props.setIsPageCopy}
handleDeleteSign={
props.handleDeleteSign
}
handleTabDrag={props.handleTabDrag}
handleStop={props.handleStop}
handleSignYourselfImageResize={
handleImageResize
}
index={props.pageNumber}
xyPosition={props.signerPos}
setXyPosition={props.setSignerPos}
data={data}
setIsResize={props.setIsResize}
setShowDropdown={
props.setShowDropdown
}
isShowBorder={true}
isPlaceholder={true}
setUniqueId={props.setUniqueId}
handleLinkUser={
props.handleLinkUser
}
isSignYourself={false}
posWidth={posWidth}
posHeight={posHeight}
isDragging={props.isDragging}
setIsValidate={props.setIsValidate}
setIsRadio={props.setIsRadio}
setIsCheckbox={props.setIsCheckbox}
setCurrWidgetsDetails={
props.setCurrWidgetsDetails
}
handleNameModal={
props.handleNameModal
}
setTempSignerId={
props.setTempSignerId
}
uniqueId={props.uniqueId}
handleTextSettingModal={
props.handleTextSettingModal
}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
setIsSelectId={props.setIsSelectId}
fontSize={props.fontSize}
setFontSize={props.setFontSize}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
isResize={props.isResize}
unSignedWidgetId={
props.unSignedWidgetId
}
isFreeResize={true}
calculateFontsize={
calculateFontsize
}
currWidgetsDetails={
props?.currWidgetsDetails
}
/>
</React.Fragment>
);
})}
</React.Fragment>
);
})}
</React.Fragment>
);
})
: !props.pdfDetails?.[0]?.IsCompleted &&
props.xyPosition?.map((data, ind) => {
// signyourself flow
return (
<React.Fragment key={ind}>
{data.pageNumber === props.pageNumber &&
data.pos.map((pos) => {
return (
<React.Fragment key={pos.key}>
<Placeholder
pos={pos}
setIsPageCopy={props.setIsPageCopy}
handleDeleteSign={props.handleDeleteSign}
handleTabDrag={props.handleTabDrag}
handleStop={(event, dragElement) =>
props.handleStop(
event,
dragElement,
pos.type
)
}
handleSignYourselfImageResize={
handleSignYourselfImageResize
}
index={props.index}
xyPosition={props.xyPosition}
setXyPosition={props.setXyPosition}
isShowBorder={true}
isSignYourself={true}
posWidth={posWidth}
posHeight={posHeight}
pdfDetails={props.pdfDetails[0]}
isDragging={props.isDragging}
setIsCheckbox={props.setIsCheckbox}
setCurrWidgetsDetails={
props.setCurrWidgetsDetails
}
handleTextSettingModal={
props.handleTextSettingModal
}
scale={props.scale}
containerWH={props.containerWH}
pdfOriginalWH={props.pdfOriginalWH}
pageNumber={props.pageNumber}
fontSize={props.fontSize}
setFontSize={props.setFontSize}
fontColor={props.fontColor}
setFontColor={props.setFontColor}
isResize={props.isResize}
setIsResize={props.setIsResize}
isFreeResize={false}
isOpenSignPad={true}
calculateFontsize={calculateFontsize}
currWidgetsDetails={
props?.currWidgetsDetails
}
/>
</React.Fragment>
);
})}
</React.Fragment>
);
}))}
{/* large device */}
{/* this component for render pdf document is in middle of the component */}
<Document
error={<p className="mx-2">{t("failed-to-load-refresh-page")}</p>}
onLoadError={() => props.setPdfLoad(false)}
loading={t("loading-doc")}
onLoadSuccess={props.pageDetails}
onClick={() =>
props.setCurrWidgetsDetails && props.setCurrWidgetsDetails({})
}
file={pdfDataBase64}
>
<Page
key={props.index}
width={props.containerWH.width}
scale={props.scale || 1}
className={"-z-[1]"} // when user zoom-in in tablet widgets move backward that's why pass -z-[1]
pageNumber={props.pageNumber}
renderAnnotationLayer={false}
renderTextLayer={false}
onGetAnnotationsError={(error) => {
console.log("annotation error", error);
}}
/>
</Document>
</div>
</RSC>
)}
<Page
key={props.index}
onLoadSuccess={handlePageLoadSuccess}
width={props.containerWH.width}
scale={props.scale || 1}
className={isMobile ? "select-none touch-callout-none" : "-z-[1]"}
pageNumber={props.pageNumber}
renderAnnotationLayer={false}
renderTextLayer={false}
onGetAnnotationsError={(error) => {
console.log("annotation error", error);
}}
/>
</Document>
</div>
</RSC>
</>
);
}
@@ -8,6 +8,7 @@ import {
isMobile,
radioButtonWidget,
textInputWidget,
cellsWidget,
textWidget,
widgets
} from "../../constant/Utils";
@@ -37,6 +38,10 @@ function WidgetComponent(props) {
type: "BOX",
item: { type: "BOX", id: 7, text: textInputWidget }
});
const [, cells] = useDrag({
type: "BOX",
item: { type: "BOX", id: 17, text: cellsWidget }
});
const [, initials] = useDrag({
type: "BOX",
item: { type: "BOX", id: 8, text: "initials" }
@@ -89,6 +94,7 @@ function WidgetComponent(props) {
date,
text,
textInput,
cells,
checkbox,
dropdown,
radioButton,
@@ -132,7 +138,9 @@ function WidgetComponent(props) {
);
const filterWidgets = widget.filter(
(data) =>
!["dropdown", radioButtonWidget, textInputWidget].includes(data.type)
!["dropdown", radioButtonWidget, textInputWidget].includes(
data.type
)
);
const textWidgetData = widget.filter((data) => data.type !== textWidget);
const updateWidgets = props.isSignYourself
@@ -5,6 +5,7 @@ import RegexParser from "regex-parser";
import {
signatureTypes,
textInputWidget,
cellsWidget,
textWidget
} from "../../constant/Utils";
import { fontColorArr, fontsizeArr } from "../../constant/Utils";
@@ -19,7 +20,8 @@ const WidgetNameModal = (props) => {
status: "required",
hint: "",
textvalidate: "",
isReadOnly: false
isReadOnly: false,
cellCount: 5
});
const [isValid, setIsValid] = useState(true);
const statusArr = ["Required", "Optional"];
@@ -51,12 +53,14 @@ const WidgetNameModal = (props) => {
props.defaultdata?.options?.validation?.type === "regex"
? props.defaultdata?.options?.validation?.pattern
: props.defaultdata?.options?.validation?.type || "",
isReadOnly: props.defaultdata?.options?.isReadOnly || false
isReadOnly: props.defaultdata?.options?.isReadOnly || false,
cellCount: props.defaultdata?.options?.cellCount || 5
});
} else {
setFormdata({
...formdata,
name: props.defaultdata?.options?.name || ""
name: props.defaultdata?.options?.name || "",
cellCount: props.defaultdata?.options?.cellCount || 5
});
}
@@ -83,7 +87,9 @@ const WidgetNameModal = (props) => {
props.handleData(data, props.defaultdata?.type);
}
} else {
const isTextInput = props.defaultdata?.type === textInputWidget;
const isTextInput = [textInputWidget, cellsWidget].includes(
props.defaultdata?.type
);
const { isReadOnly, defaultValue, status } = formdata;
// If its a textinput widget, enforce that read-only fields have
// either a defaultValue or an "optional" status.
@@ -104,7 +110,8 @@ const WidgetNameModal = (props) => {
defaultValue: "",
status: "required",
hint: "",
textvalidate: ""
textvalidate: "",
cellCount: 5
});
setSignatureType(signTypes);
}
@@ -125,7 +132,11 @@ const WidgetNameModal = (props) => {
} else {
setIsValid(true);
}
setFormdata({ ...formdata, [e.target.name]: e.target.value });
const val =
props.defaultdata?.type === cellsWidget
? e.target.value.slice(0, formdata.cellCount)
: e.target.value;
setFormdata({ ...formdata, [e.target.name]: val });
};
function handleValidation(type) {
@@ -136,6 +147,8 @@ const WidgetNameModal = (props) => {
return "/^\\d+$/";
case "text":
return "/^[a-zA-Zs]+$/";
case "ssn":
return "^\\d{3}-\\d{2}-\\d{4}$";
default:
return type;
}
@@ -163,7 +176,7 @@ const WidgetNameModal = (props) => {
<form
onSubmit={handleSubmit}
className={`${
props.defaultdata?.type === textInputWidget
[textInputWidget, cellsWidget].includes(props.defaultdata?.type)
? "pt-0"
: ["signature", "initials"].includes(props.defaultdata?.type)
? "pt-2"
@@ -187,7 +200,21 @@ const WidgetNameModal = (props) => {
/>
</div>
)}
{props.defaultdata?.type === textInputWidget && (
{props.defaultdata?.type === cellsWidget && (
<div className="mb-[0.75rem] text-[13px]">
<label htmlFor="cellCount">{t("cell-count")}</label>
<input
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
type="number"
min="1"
name="cellCount"
value={formdata.cellCount}
onChange={(e) => handleChange(e)}
required
/>
</div>
)}
{[textInputWidget, cellsWidget].includes(props.defaultdata?.type) && (
<>
<div className="mb-[0.75rem]">
<label htmlFor="name" className="text-[13px]">
@@ -199,6 +226,11 @@ const WidgetNameModal = (props) => {
value={formdata.defaultValue}
onChange={(e) => handledefaultChange(e)}
autoComplete="off"
maxLength={
props.defaultdata?.type === cellsWidget
? formdata.cellCount
: undefined
}
onBlur={() => {
if (isValid === false) {
setFormdata({ ...formdata, defaultValue: "" });
@@ -250,7 +282,9 @@ const WidgetNameModal = (props) => {
);
})}
</div>
{[textInputWidget].includes(props.defaultdata?.type) && (
{[textInputWidget, cellsWidget].includes(
props.defaultdata?.type
) && (
<div className="flex items-center">
<input
id="isReadOnly"
@@ -265,7 +299,7 @@ const WidgetNameModal = (props) => {
}))
}
/>
<label className="ml-1 mb-0" htmlFor="isreadonly">
<label className="ml-1.5 mb-0 capitalize text-[13px]" htmlFor="isreadonly">
{t("read-only")}
</label>
</div>
@@ -317,6 +351,7 @@ const WidgetNameModal = (props) => {
{[
textInputWidget,
textWidget,
cellsWidget,
"name",
"company",
"job title",
@@ -15,9 +15,11 @@ import {
radioButtonWidget,
selectCheckbox,
textInputWidget,
cellsWidget,
textWidget,
years
} from "../../constant/Utils";
import CellsWidget from "./CellsWidget";
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import SignatureCanvas from "react-signature-canvas";
@@ -93,7 +95,6 @@ function WidgetsValueModal(props) {
const [isTab, setIsTab] = useState("");
const [textWidth, setTextWidth] = useState(0);
const [textHeight, setTextHeight] = useState(0);
const [signatureType, setSignatureType] = useState("");
const [isSignTypes, setIsSignTypes] = useState(true);
const [typedSignature, setTypedSignature] = useState("");
const [selectDate, setSelectDate] = useState({});
@@ -119,13 +120,33 @@ function WidgetsValueModal(props) {
const currentUserName = jsonSender && jsonSender?.name;
const widgetTypeTranslation = t(`widgets-name.${currWidgetsDetails?.type}`);
const [widgetValue, setWidgetValue] = useState(
currWidgetsDetails?.options?.response ||
currWidgetsDetails?.options?.defaultValue
currWidgetsDetails.type !== "checkbox" &&
(currWidgetsDetails?.options?.response ||
currWidgetsDetails?.options?.defaultValue)
);
const [selectedCheckbox, setSelectedCheckbox] = useState(
currWidgetsDetails?.options?.response ||
const [cellsValue, setCellsValue] = useState(() => {
const count = currWidgetsDetails?.options?.cellCount || 5;
const val =
currWidgetsDetails?.options?.response ||
currWidgetsDetails?.options?.defaultValue ||
[]
"";
return Array.from({ length: count }, (_, i) => val[i] || "");
});
const cellRefs = useRef([]);
useEffect(() => {
const count = currWidgetsDetails?.options?.cellCount || 5;
const val =
currWidgetsDetails?.options?.response ||
currWidgetsDetails?.options?.defaultValue ||
"";
setCellsValue(Array.from({ length: count }, (_, i) => val[i] || ""));
}, [currWidgetsDetails?.key]);
const [selectedCheckbox, setSelectedCheckbox] = useState(
currWidgetsDetails.type === "checkbox" &&
(currWidgetsDetails?.options?.response ||
currWidgetsDetails?.options?.defaultValue ||
[])
);
const [startDate, setStartDate] = useState(
currWidgetsDetails?.options?.response
@@ -156,34 +177,6 @@ function WidgetsValueModal(props) {
setHint(currWidgetsDetails?.type);
}
}
//set already draw or save signature url/text url of signature text type and draw type for initial type and signature type widgets
if (currWidgetsDetails && canvasRef.current) {
const isWidgetType = currWidgetsDetails?.type;
const signatureType = currWidgetsDetails?.signatureType;
const url = currWidgetsDetails?.SignUrl;
//checking widget type and draw type signature url
if (currWidgetsDetails?.type === "initials") {
if (isWidgetType === "initials" && signatureType === "draw" && url) {
canvasRef.current.fromDataURL(url);
}
} else if (
isWidgetType === "signature" &&
signatureType === "draw" &&
url
) {
canvasRef.current.fromDataURL(url);
}
const trimmedName = currentUserName && currentUserName?.trim();
const firstCharacter = trimmedName?.charAt(0);
const userName =
currWidgetsDetails?.type === "initials"
? firstCharacter
: currentUserName;
const signatureValue = currWidgetsDetails?.typeSignature;
setTypedSignature(signatureValue || userName || "");
setFontSelect("Fasthand");
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currWidgetsDetails]); // Added currWidgetsDetails to dependency array for reset logic
@@ -403,7 +396,6 @@ function WidgetsValueModal(props) {
const tab = signatureTypes?.[getIndex].name;
if (tab === "draw") {
setIsTab("draw");
setSignatureType("draw");
} else if (tab === "upload") {
setIsImageSelect(true);
setIsTab("uploadImage");
@@ -449,7 +441,32 @@ function WidgetsValueModal(props) {
setTypedSignature("");
}
} else {
setWidgetValue("");
if (currWidgetsDetails?.type === cellsWidget) {
const count =
currWidgetsDetails?.options?.cellCount || cellsValue.length || 1;
const cleared = Array.from({ length: count }, () => "");
setCellsValue(cleared);
const combined = cleared.join("");
setWidgetValue(combined);
onChangeInput(
combined,
currWidgetsDetails?.key,
xyPosition,
props.index,
setXyPosition,
uniqueId
);
} else {
setWidgetValue("");
onChangeInput(
"",
currWidgetsDetails?.key,
xyPosition,
props.index,
setXyPosition,
uniqueId
);
}
}
};
//function for set signature url
@@ -583,7 +600,7 @@ function WidgetsValueModal(props) {
if (isTab === "mysignature") {
setSignature("");
if (currWidgetsDetails?.type === "initials") {
handleSaveSignature(signatureType, "initials");
handleSaveSignature(isTab, "initials");
} else {
handleSaveSignature(null, "default");
}
@@ -604,13 +621,13 @@ function WidgetsValueModal(props) {
} else {
setSignature("");
canvasRef?.current?.clear();
handleSaveSignature(signatureType);
handleSaveSignature(isTab);
}
}
setPenColor("blue");
} else {
setSignature("");
handleSaveImage(signatureType);
handleSaveImage();
}
setIsImageSelect(false);
setIsDefaultSign(false);
@@ -649,24 +666,21 @@ function WidgetsValueModal(props) {
}, [fontSelect]);
useEffect(() => {
if (
["signature", "initials"].includes(currWidgetsDetails?.type) &&
widgetValue
) {
if (isTab === "draw" && currWidgetsDetails?.signatureType === "draw") {
setSignature(widgetValue);
} else if (isTab === "uploadImage" && currWidgetsDetails?.ImageType) {
setImage({ imgType: currWidgetsDetails?.ImageType, src: widgetValue });
if (currWidgetsDetails?.options?.response) {
const url = currWidgetsDetails?.options?.response;
if (["signature", "initials"].includes(currWidgetsDetails?.type)) {
if (isTab === "draw" && currWidgetsDetails?.signatureType === "draw") {
setSignature(url);
// Load the default signature after the component mounts
if (canvasRef.current) {
canvasRef.current.fromDataURL(url);
}
} else if (isTab === "uploadImage" && currWidgetsDetails?.ImageType) {
setImage({ imgType: currWidgetsDetails?.ImageType, src: url });
}
} else if (["image", "stamp"].includes(currWidgetsDetails?.type)) {
setImage({ imgType: currWidgetsDetails?.ImageType, src: url });
}
} else if (
["image", "stamp"].includes(currWidgetsDetails?.type) &&
widgetValue
) {
setImage({ imgType: currWidgetsDetails?.ImageType, src: widgetValue });
}
// Load the default signature after the component mounts
if (canvasRef.current) {
canvasRef.current.fromDataURL(signature);
}
if (isTab === "type") {
const trimmedName = typedSignature
@@ -953,6 +967,65 @@ function WidgetsValueModal(props) {
uniqueId
);
};
const handleCellsInput = (e, idx) => {
const val = e.target.value.slice(0, 1);
const updated = [...cellsValue];
updated[idx] = val;
setCellsValue(updated);
const combined = updated.join("");
setWidgetValue(combined);
onChangeInput(
combined,
currWidgetsDetails?.key,
xyPosition,
props.index,
setXyPosition,
uniqueId
);
if (val) {
if (idx < cellRefs.current.length - 1) {
cellRefs.current[idx + 1]?.focus();
}
} else if (idx > 0) {
// move focus back when a cell becomes empty
cellRefs.current[idx - 1]?.focus();
}
};
const handleCellsKeyDown = (e, idx) => {
if (e.key === "Backspace" && !cellsValue[idx] && idx > 0) {
e.preventDefault();
const updated = [...cellsValue];
updated[idx - 1] = "";
const combined = updated.join("");
setCellsValue(updated);
setWidgetValue(combined);
onChangeInput(
combined,
currWidgetsDetails?.key,
xyPosition,
props.index,
setXyPosition,
uniqueId
);
cellRefs.current[idx - 1]?.focus();
}
if (e.key === "Delete") {
e.preventDefault();
const updated = [...cellsValue];
updated[idx] = "";
const combined = updated.join("");
setCellsValue(updated);
setWidgetValue(combined);
onChangeInput(
combined,
currWidgetsDetails?.key,
xyPosition,
props.index,
setXyPosition,
uniqueId
);
}
};
//function is used to show widgets on modal according to selected widget type checkbox/date/radio/drodown/textbox/signature/image
const getWidgetType = (type) => {
switch (type) {
@@ -983,7 +1056,6 @@ function WidgetsValueModal(props) {
setIsDefaultSign(true);
setIsImageSelect(true);
setIsTab("mysignature");
setSignatureType("");
setImage();
}}
className={`${
@@ -1003,7 +1075,6 @@ function WidgetsValueModal(props) {
setIsDefaultSign(true);
setIsImageSelect(true);
setIsTab("mysignature");
setSignatureType("");
setImage();
}}
className={`${
@@ -1040,7 +1111,6 @@ function WidgetsValueModal(props) {
setIsDefaultSign(false);
setIsImageSelect(true);
setIsTab("uploadImage");
setSignatureType("");
}}
className={`${
isTab === "uploadImage" && `${isTabCls}`
@@ -1057,7 +1127,6 @@ function WidgetsValueModal(props) {
setIsDefaultSign(false);
setIsImageSelect(false);
setIsTab("type");
setSignatureType("");
setImage();
}}
className={`${
@@ -1326,69 +1395,66 @@ function WidgetsValueModal(props) {
</div>
</>
) : (
<div>
<div className="relative flex flex-row items-center justify-between">
<div className="text-base-content font-bold text-lg">
{t("signature")}
</div>
<div
className="text-[1.5rem] cursor-pointer"
onClick={handleCancelBtn}
>
&times;
</div>
</div>
<div className="mx-3 mb-6 mt-3">
<p>{t("at-least-one-signature-type")}</p>
</div>
<div className="mx-3 mb-6 mt-3">
<p>{t("at-least-one-signature-type")}</p>
</div>
)}
</div>
);
case "checkbox":
const checkBoxLayout =
currWidgetsDetails?.options?.layout || "vertical";
const isMultipleCheckbox =
currWidgetsDetails?.options?.values?.length > 0 ? true : false;
const checkBoxWrapperClass = `flex items-start ${
checkBoxLayout === "horizontal"
? `flex-row flex-wrap ${isMultipleCheckbox ? "gap-x-2" : ""}`
: `flex-col ${isMultipleCheckbox ? "gap-y-[5px]" : ""}`
}`; // Using gap-y-1 for consistency, adjust if needed
return (
<div className="border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5">
{currWidgetsDetails?.options?.values?.map((data, ind) => {
return (
<div key={ind} className=" select-none-cls">
<label
htmlFor={`checkbox-${currWidgetsDetails?.key + ind}`}
className="text-xs flex items-center gap-1"
>
<input
id={`checkbox-${currWidgetsDetails?.key + ind}`}
className={`${
ind === 0 ? "mt-0" : "mt-[5px]"
} op-checkbox op-checkbox-xs rounded-[1px] mt-1`}
type="checkbox"
checked={!!selectCheckbox(ind, selectedCheckbox)}
onChange={(e) => {
if (e.target.checked) {
const maxRequired =
currWidgetsDetails?.options?.validation
?.maxRequiredCount;
const maxCountInt =
maxRequired && parseInt(maxRequired);
if (maxCountInt > 0) {
if (
selectedCheckbox &&
selectedCheckbox?.length <= maxCountInt - 1
) {
handleCheckboxValue(e.target.checked, ind);
}
} else {
<div
className={`border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5 ${checkBoxWrapperClass}`}
>
{currWidgetsDetails?.options?.values?.map((data, ind) => (
<div key={ind} className=" select-none-cls">
<label
htmlFor={`checkbox-${currWidgetsDetails?.key + ind}`}
className="text-xs flex items-center gap-1"
>
<input
id={`checkbox-${currWidgetsDetails?.key + ind}`}
className={`${
ind === 0 ? "mt-0" : "mt-[5px]"
} op-checkbox op-checkbox-xs rounded-[1px] mt-1`}
type="checkbox"
checked={!!selectCheckbox(ind, selectedCheckbox)}
onChange={(e) => {
if (e.target.checked) {
const maxRequired =
currWidgetsDetails?.options?.validation
?.maxRequiredCount;
const maxCountInt =
maxRequired && parseInt(maxRequired);
if (maxCountInt > 0) {
if (
selectedCheckbox &&
selectedCheckbox?.length <= maxCountInt - 1
) {
handleCheckboxValue(e.target.checked, ind);
}
} else {
handleCheckboxValue(e.target.checked, ind);
}
}}
/>
{data}
</label>
</div>
);
})}
} else {
handleCheckboxValue(e.target.checked, ind);
}
}}
/>
{data}
</label>
</div>
))}
</div>
);
case textInputWidget:
@@ -1401,6 +1467,19 @@ function WidgetsValueModal(props) {
className={textInputcls}
/>
);
case cellsWidget:
return (
<CellsWidget
count={cellsValue.length}
height="100%"
value={cellsValue.join("")}
editable={true}
resizable={false}
onChange={handleCellsInput}
onKeyDown={handleCellsKeyDown}
inputRefs={cellRefs}
/>
);
case "dropdown":
return (
<select
@@ -1418,18 +1497,11 @@ function WidgetsValueModal(props) {
>
{currWidgetsDetails?.options?.name}
</option>
{currWidgetsDetails?.options?.values?.map((data, ind) => {
return (
<option
// style={{ fontSize: fontSize, color: fontColor }}
key={ind}
value={data}
>
{data}
</option>
);
})}
{currWidgetsDetails?.options?.values?.map((data, ind) => (
<option key={ind} value={data}>
{data}
</option>
))}
</select>
);
case "name":
@@ -1529,30 +1601,38 @@ function WidgetsValueModal(props) {
</>
);
case radioButtonWidget:
const radioLayout = currWidgetsDetails.options?.layout || "vertical";
const isOnlyOneBtn =
currWidgetsDetails.options?.values?.length > 0 ? true : false;
const radioWrapperClass = `flex items-start ${
radioLayout === "horizontal"
? `flex-row flex-wrap ${isOnlyOneBtn ? "gap-x-2" : ""}`
: `flex-col ${isOnlyOneBtn ? "gap-y-[5px]" : ""}`
}`; // Using gap-y-1 for consistency, adjust if needed
return (
<div className="border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5">
{currWidgetsDetails?.options?.values.map((data, ind) => {
return (
<div key={ind} className="select-none-cls">
<label
htmlFor={`radio-${currWidgetsDetails?.key + ind}`}
className="cursor-pointer flex items-center text-sm gap-1"
>
<input
id={`radio-${currWidgetsDetails?.key + ind}`}
className={`op-radio op-radio-xs mt-1`}
type="radio"
value={data}
checked={handleRadioCheck(data)}
onChange={(e) => {
handleCheckRadio(e.target.value);
}}
/>
<span>{data}</span>
</label>
</div>
);
})}
<div
className={`border-[1px] border-gray-300 rounded-[2px] pt-1 px-2.5 ${radioWrapperClass}`}
>
{currWidgetsDetails?.options?.values.map((data, ind) => (
<div key={ind} className="select-none-cls">
<label
htmlFor={`radio-${currWidgetsDetails?.key + ind}`}
className="cursor-pointer flex items-center text-sm gap-1"
>
<input
id={`radio-${currWidgetsDetails?.key + ind}`}
className={`op-radio op-radio-xs mt-1`}
type="radio"
value={data}
checked={handleRadioCheck(data)}
onChange={(e) => {
handleCheckRadio(e.target.value);
}}
/>
<span>{data}</span>
</label>
</div>
))}
</div>
);
case textWidget:
@@ -1590,15 +1670,9 @@ function WidgetsValueModal(props) {
const minCount =
currWidgetsDetails?.options?.validation?.minRequiredCount;
const parseMin = minCount && parseInt(minCount);
//get maximum required count if exist
const maxCount =
currWidgetsDetails?.options?.validation?.maxRequiredCount;
const parseMax = maxCount && parseInt(maxCount);
if (parseMin > 0 && parseMax > 0) {
if (parseMin > 0) {
isRequired = true;
}
} else if (isRadio) {
isRequired = true;
} else {
isRequired = currWidgetsDetails.options?.status === "required";
}
@@ -1799,11 +1873,60 @@ function WidgetsValueModal(props) {
setUniqueId(tempSignerId);
}
};
//function is used to excecute on click finish button functionality
const handleFinish = () => {
props?.finishDocument();
dispatch(setIsShowModal({}));
};
useEffect(() => {
if (!isSave) {
handleFinishButton();
}
}, [isSave]);
//'handleFinishButton' function is used to show finish button click on any widge if all required widgtes have response
const handleFinishButton = () => {
const widgetsPosition = xyPosition?.find((data) => data.Id === uniqueId);
//using 'flatMap' create all nested array in one level
const editableWidgets = widgetsPosition?.placeHolder?.flatMap((page) =>
page.pos
.filter((widget) => !widget.options?.isReadOnly)
.map((widget) => widget)
);
const getcurrentwidget = editableWidgets?.find(
(data) => data?.key === currWidgetsDetails?.key
);
if (getcurrentwidget?.options?.response) {
props?.setCurrWidgetsDetails(getcurrentwidget);
}
let isResponse = true;
//condition to check all required widgets have response or not then show finish buutton
for (const data of editableWidgets) {
if (data?.type === "checkbox") {
const minCount = data.options?.validation?.minRequiredCount;
const parseMin = minCount && parseInt(minCount);
const hasNoResponse =
(!Array.isArray(data?.options?.response) ||
data.options.response.length === 0) &&
(!Array.isArray(data?.options?.defaultValue) ||
data.options.defaultValue.length === 0);
if (parseMin > 0 && hasNoResponse) {
isResponse = false;
break;
}
} else if (
!data.options.response &&
!data?.options?.defaultValue &&
data.options?.status === "required"
) {
isResponse = false;
break;
}
}
if (isResponse) {
setIsLastWidget(true);
}
};
return (
<>
<ModalUi
+223 -165
View File
@@ -20,6 +20,7 @@ export const isTabAndMobile = window.innerWidth < 1023;
export const textInputWidget = "text input";
export const textWidget = "text";
export const radioButtonWidget = "radio button";
export const cellsWidget = "cells";
export function getEnv() {
return window?.RUNTIME_ENV || {};
}
@@ -257,6 +258,7 @@ export const widgets = [
{ type: "date", icon: "fa-light fa-calendar-days", iconSize: "20px" },
{ type: textWidget, icon: "fa-light fa-text-width", iconSize: "20px" },
{ type: textInputWidget, icon: "fa-light fa-font", iconSize: "21px" },
{ type: cellsWidget, icon: "fa-light fa-table-cells", iconSize: "20px" },
{ type: "checkbox", icon: "fa-light fa-square-check", iconSize: "22px" },
{
type: "dropdown",
@@ -349,6 +351,15 @@ export const addWidgetOptions = (type, signer, widgetValue) => {
};
case textInputWidget:
return { ...status, name: "Text", isReadOnly: false };
case cellsWidget:
return {
...status,
name: "Cells",
cellCount: 5,
defaultValue: "",
validation: { type: "", pattern: "" },
isReadOnly: false
};
case "initials":
return { ...status, name: "Initials" };
case "name":
@@ -416,6 +427,14 @@ export const addWidgetSelfsignOptions = (type, getWidgetValue, owner) => {
return { name: "Checkbox" };
case textWidget:
return { name: "Text" };
case cellsWidget:
return {
name: "Cells",
cellCount: 5,
defaultValue: "",
validation: { type: "", pattern: "" },
isReadOnly: false
};
case "initials":
return { name: "Initials" };
case "name":
@@ -486,6 +505,8 @@ export const defaultWidthHeight = (type) => {
return { width: 15, height: 19 };
case textInputWidget:
return { width: 150, height: 19 };
case cellsWidget:
return { width: 112, height: 22 };
case "dropdown":
return { width: 120, height: 22 };
case "initials":
@@ -685,7 +706,7 @@ export const signPdfFun = async (
export const randomId = () => {
// 1. Grab a cryptographically-secure 32-bit random value
const randomBytes = crypto.getRandomValues(new Uint32Array(1));
const raw = randomBytes[0]; // 0 … 4 294 967 295
const raw = randomBytes[0]; // 0 … 4 294 967 295
// 2. Collapse into a 90 000 000-wide band (0…89 999 999), then shift to 10 000 000…99 999 999
const eightDigit = 10_000_000 + (raw % 90_000_000);
@@ -863,7 +884,8 @@ export const onChangeInput = (
initial,
dateFormat,
fontSize,
fontColor
fontColor,
isDateReadOnly
) => {
const isSigners = xyPosition.some((data) => data.signerPtr);
let filterSignerPos;
@@ -892,6 +914,7 @@ export const onChangeInput = (
response: value,
fontSize: fontSize,
fontColor: fontColor,
isReadOnly: isDateReadOnly || false,
validation: {
type: "date-format",
format: dateFormat // This indicates the required date format explicitly.
@@ -969,7 +992,6 @@ export const onChangeInput = (
setXyPosition(updatePlaceholder);
}
};
//function to increase height of text area on press enter
export const onChangeHeightOfTextArea = (
height,
@@ -1213,8 +1235,8 @@ export function onSaveSign(
}
return obj;
});
//condition when user click on apply(signature,image,typed signature or defaullt signature) all widgets on signature pad for same widgets
if (isAutoSign) {
//condition when draw/upload signature/initials then apply it all related to widgets (signature,image,typed signature or default signature)
if (isApplyAll || isAutoSign) {
const updatedArray = updateXYposition.map((page) => ({
...page,
pos: page.pos.map(
@@ -1233,26 +1255,6 @@ export function onSaveSign(
)
}));
return updatedArray;
} //condition when user edit signature/initial then updated signature apply all existing drawn signatures
else if (isApplyAll) {
const updatedArray = updateXYposition.map((page) => ({
...page,
pos: page.pos.map(
(item) =>
item.SignUrl && item.type === widgetsType
? {
...item,
Width: posWidth,
Height: posHeight,
SignUrl: signatureImg,
...(type && { signatureType: type }),
options: { ...item.options, response: signatureImg },
...(typedSignature && { typeSignature: typedSignature })
}
: item // Otherwise, keep it unchanged
)
}));
return updatedArray;
} else {
return updateXYposition;
}
@@ -1361,35 +1363,13 @@ export function onSaveImage(
}
return obj;
});
//condition when user click on apply(stamp) all widgets on signature pad for same widgets
if (isAutoSign) {
//condition when user upload(stamp) then apply it all related to widgets
if (isApplyAll || isAutoSign) {
const updatedArray = updateXYposition.map((page) => ({
...page,
pos: page.pos.map(
(item) =>
item.type === widgetsType
? {
...item,
Width: getIMGWH.newWidth,
Height: getIMGWH.newHeight,
SignUrl: image.src,
ImageType: image.imgType,
options: {
...item.options,
response: image.src
}
}
: item // Otherwise, keep it unchanged
)
}));
return updatedArray;
} //condition when user edit stamp then updated signature apply all existing drawn signatures
else if (isApplyAll) {
const updatedArray = updateXYposition.map((page) => ({
...page,
pos: page.pos.map(
(item) =>
item.SignUrl && item.type === widgetsType && item.type !== "image"
item.type === widgetsType && item.type !== "image"
? {
...item,
Width: getIMGWH.newWidth,
@@ -1655,6 +1635,7 @@ export const multiSignEmbed = async (
const WidgetsTypeTextExist = [
textWidget,
textInputWidget,
cellsWidget,
"name",
"company",
"job title",
@@ -1668,9 +1649,10 @@ export const multiSignEmbed = async (
const color = position?.options?.fontColor;
const updateColorInRgb = getWidgetsFontColor(color);
const fontSize = parseInt(position?.options?.fontSize || 12);
const widgetTypeExist = [
const isTextTypeWidget = [
textWidget,
textInputWidget,
cellsWidget,
"name",
"company",
"job title",
@@ -1678,36 +1660,48 @@ export const multiSignEmbed = async (
"email"
].includes(position.type);
if (position.type === "checkbox") {
let checkboxGapFromTop, isCheck;
let y = yPos(position) + 2;
//calculate checkbox size to draw on pdf
const checkboxSize = fontSize - 1;
//calculate gap between checkbox and options
const checkboxTextGapFromLeft = fontSize + 5;
// Determine layout mode: 'vertical' (default) or 'horizontal'
// const isHorizontal = position.layout === "horizontal";
const isHorizontal =
position?.options?.layout === "horizontal" ? true : false;
// Initial “cursor” positions
let currentX = xPos(position);
let currentY = yPos(position) + 2;
// Size and spacing settings
const checkboxSize = fontSize - 1; // checkbox diameter
const checkboxTextGapFromLeft = fontSize + 5; // gap between box and its label
const verticalGap = fontSize + 3.2; // gap between two rows (vertical layout)
let horizontalGap = 0; // will compute after drawing each label
if (position?.options?.values.length > 0) {
position?.options?.values.forEach((item, ind) => {
const checkboxRandomId = "checkbox" + randomId();
if (
position?.options?.response &&
position?.options?.response?.length > 0
) {
isCheck = position?.options?.response?.includes(ind);
} else if (position?.options?.defaultValue) {
isCheck = position?.options?.defaultValue?.includes(ind);
}
const checkbox = form.createCheckBox(checkboxRandomId);
position.options.values.forEach((item, ind) => {
// 1. Advance the “cursor” on second+ iteration
if (ind > 0) {
y = y + checkboxGapFromTop;
} else {
checkboxGapFromTop = fontSize + 3.2;
if (isHorizontal) {
currentX += horizontalGap;
} else {
currentY += verticalGap;
}
}
// 2. Determine whether this checkbox should be checked
let isCheck = false;
if (
position.options.response &&
position.options.response.length > 0
) {
isCheck = position.options.response.includes(ind);
} else if (position.options.defaultValue) {
isCheck = position.options.defaultValue.includes(ind);
}
if (!position?.options?.isHideLabel) {
// below line of code is used to embed label with radio button in pdf
// 3. Draw the label (if labels are not hidden)
if (!position.options.isHideLabel) {
const labelX = currentX + checkboxTextGapFromLeft;
const labelY = currentY - 3;
const optionsPosition = compensateRotation(
page.getRotation().angle,
xPos(position) + checkboxTextGapFromLeft,
y - 3,
labelX,
labelY,
1,
getSize,
fontSize,
@@ -1717,98 +1711,134 @@ export const multiSignEmbed = async (
);
page.drawText(item, optionsPosition);
}
// 4. Create and place the actual checkbox
const checkboxRandomId = "checkbox" + randomId();
const checkbox = form.createCheckBox(checkboxRandomId);
let checkboxObj = {
x: xPos(position),
y: y,
x: currentX,
y: currentY,
width: checkboxSize,
height: checkboxSize
};
checkboxObj = getWidgetPosition(page, checkboxObj, 1, getSize);
checkbox.addToPage(page, checkboxObj);
//applied which checkbox should be checked
// 5. Check or uncheck as needed, then make readonly
if (isCheck) {
checkbox.check();
} else {
checkbox.uncheck();
}
checkbox.enableReadOnly();
// 6. If horizontal layout, compute how far to shift next checkboxcircle
if (isHorizontal) {
// Measure the width of this label text at `fontSize`
const textWidth = font.widthOfTextAtSize(item, fontSize);
// Next checkbox should come after: [box] + gap + [label text] + extra 10pt padding
horizontalGap =
checkboxSize + checkboxTextGapFromLeft + textWidth;
}
});
}
} else if (widgetTypeExist) {
let textContent;
} else if (isTextTypeWidget) {
let textContent = "";
if (position?.options?.response) {
textContent = position.options?.response;
} else if (position?.options?.defaultValue) {
textContent = position?.options?.defaultValue;
}
const fixedWidth = widgetWidth; // Set your fixed width
const isNewOnEnterLineExist = textContent.includes("\n");
// Function to break text into lines based on the fixed width
const NewbreakTextIntoLines = (textContent, width) => {
const lines = [];
let currentLine = "";
for (const word of textContent.split(" ")) {
//get text line width
const lineWidth = font.widthOfTextAtSize(
`${currentLine} ${word}`,
fontSize
if (position.type === cellsWidget) {
const cellCount =
position?.options?.cellCount || textContent.length || 1;
const charWidth = widgetWidth / cellCount;
const y = yPos(position) - 4;
for (let i = 0; i < cellCount; i++) {
const ch = textContent[i] || "";
const charX =
xPos(position) +
charWidth * i +
(charWidth - font.widthOfTextAtSize(ch, fontSize)) / 2;
const textPosition = compensateRotation(
page.getRotation().angle,
charX,
y,
1,
getSize,
fontSize,
updateColorInRgb,
font,
page
);
//check text content line width is less or equal to container width
if (lineWidth <= width) {
currentLine += ` ${word}`;
} else {
lines.push(currentLine.trim());
currentLine = `${word}`;
}
}
lines.push(currentLine.trim());
return lines;
};
// Function to break text into lines based on when user go next line on press enter button
const breakTextIntoLines = (textContent, width) => {
const lines = [];
for (const word of textContent.split("\n")) {
const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
//checking string length to container width
//if string length is less then container width it means user press enter button
if (lineWidth <= width) {
lines.push(word);
}
//else adjust text content according to width and send it in new line
else {
const newLine = NewbreakTextIntoLines(word, width);
lines.push(...newLine);
}
if (ch) page.drawText(ch, textPosition);
}
} else {
const fixedWidth = widgetWidth; // Set your fixed width
const isNewOnEnterLineExist = textContent.includes("\n");
return lines;
};
//check if text content have `\n` string it means user press enter to go next line and handle condition
//else auto adjust text content according to container width
const lines = isNewOnEnterLineExist
? breakTextIntoLines(textContent, fixedWidth)
: NewbreakTextIntoLines(textContent, fixedWidth);
// Set initial y-coordinate for the first line
let x = xPos(position);
let y = yPos(position) - 4;
// Embed each line on the page
for (const line of lines) {
const textPosition = compensateRotation(
page.getRotation().angle,
x,
y,
1,
getSize,
fontSize,
updateColorInRgb,
font,
page
);
page.drawText(line, textPosition);
y += 18; // Adjust the line height as needed
// Function to break text into lines based on the fixed width
const NewbreakTextIntoLines = (textContent, width) => {
const lines = [];
let currentLine = "";
for (const word of textContent.split(" ")) {
//get text line width
const lineWidth = font.widthOfTextAtSize(
`${currentLine} ${word}`,
fontSize
);
//check text content line width is less or equal to container width
if (lineWidth <= width) {
currentLine += ` ${word}`;
} else {
lines.push(currentLine.trim());
currentLine = `${word}`;
}
}
lines.push(currentLine.trim());
return lines;
};
// Function to break text into lines based on when user go next line on press enter button
const breakTextIntoLines = (textContent, width) => {
const lines = [];
for (const word of textContent.split("\n")) {
const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
//checking string length to container width
//if string length is less then container width it means user press enter button
if (lineWidth <= width) {
lines.push(word);
}
//else adjust text content according to width and send it in new line
else {
const newLine = NewbreakTextIntoLines(word, width);
lines.push(...newLine);
}
}
return lines;
};
//check if text content have `\n` string it means user press enter to go next line and handle condition
//else auto adjust text content according to container width
const lines = isNewOnEnterLineExist
? breakTextIntoLines(textContent, fixedWidth)
: NewbreakTextIntoLines(textContent, fixedWidth);
// Set initial y-coordinate for the first line
let x = xPos(position);
let y = yPos(position) - 4;
// Embed each line on the page
for (const line of lines) {
const textPosition = compensateRotation(
page.getRotation().angle,
x,
y,
1,
getSize,
fontSize,
updateColorInRgb,
font,
page
);
page.drawText(line, textPosition);
y += 18; // Adjust the line height as needed
}
}
} else if (position.type === "dropdown") {
const dropdownRandomId = "dropdown" + randomId();
@@ -1848,33 +1878,47 @@ export const multiSignEmbed = async (
} else if (position.type === radioButtonWidget) {
const radioRandomId = "radio" + randomId();
const radioGroup = form.createRadioGroup(radioRandomId);
//draw radio button on document and options if hide label is enable
let radioButtonFromTop;
//getting radio buttons options text font size
const optionsFontSize = fontSize;
//calculate value of gap between radio button and options
const radioTextGapFromLeft = fontSize + 6;
//getting radio button font size
const radioSize = fontSize;
//getting position of radio widget in y direction
let y = yPos(position);
//on the basic of option's length create radio button and message
const optionsFontSize = fontSize; // font size for option text
const radioTextGapFromLeft = fontSize + 6; // gap between circle and its label
const radioSize = fontSize; // circle diameter (square of width×height)
// Initial “cursor” positions (from your existing helpers)
let currentX = xPos(position) + 2;
let currentY = yPos(position);
// Vertical gap between two radiorows
const verticalGap = fontSize + 6;
// Well compute horizontalGap on the fly—after drawing each label
// Initialize to zero (will be set after first option is placed)
let horizontalGap = 0;
// Determine layout mode: 'vertical' or 'horizontal'.
// (You mentioned “add one variable called layout” here we read it from position.layout.)
const isHorizontal =
position?.options?.layout === "horizontal" ? true : false;
// Loop through each option in the group
if (position?.options?.values.length > 0) {
position?.options?.values.forEach((item, ind) => {
position.options.values.forEach((item, ind) => {
// 1. Advance cursor on second+ iteration
if (ind > 0) {
y = y + radioButtonFromTop;
} else {
radioButtonFromTop = fontSize + 6;
if (isHorizontal) {
// Move to the right by horizontalGap
currentX += horizontalGap;
} else {
// Move down by verticalGap (vertical stacking)
currentY += verticalGap;
}
}
// 2. Draw the label text (if not hidden)
if (!position?.options?.isHideLabel) {
// below line of code is used to embed label with radio button in pdf
// Compute where to draw the text (just to the right of the circle)
const labelX = currentX + radioTextGapFromLeft;
const labelY = currentY - 2;
const optionsPosition = compensateRotation(
page.getRotation().angle,
xPos(position) + radioTextGapFromLeft,
y - 2,
labelX,
labelY,
1,
getSize,
fontSize,
optionsFontSize,
updateColorInRgb,
font,
page
@@ -1882,22 +1926,33 @@ export const multiSignEmbed = async (
page.drawText(item, optionsPosition);
}
// 3. Place the radiocircle itself at (currentX, currentY)
let radioObj = {
x: xPos(position) + 2,
y: y,
x: currentX,
y: currentY,
width: radioSize,
height: radioSize
};
radioObj = getWidgetPosition(page, radioObj, 1, getSize);
radioGroup.addOptionToPage(item, page, radioObj);
// 4. If horizontal layout, re-compute horizontalGap for next iteration:
if (isHorizontal) {
// Measure how wide the label text is, so we know how far to shift next circle
const textWidth = font.widthOfTextAtSize(item, optionsFontSize);
// radioSize = the circle. radioTextGapFromLeft = gap between circle and label.
// Add a small extra padding (e.g. 10pt) before placing next circle.
horizontalGap = radioSize + radioTextGapFromLeft + textWidth;
}
});
}
// 5. Preselect a value if provided
if (position?.options?.response) {
radioGroup.select(position.options?.response);
} else if (position?.options?.defaultValue) {
radioGroup.select(position?.options?.defaultValue);
}
// 6. Set to readonly (if required)
radioGroup.enableReadOnly();
} else {
const signature = {
@@ -3180,6 +3235,9 @@ export const checkRegularExpress = (validateType, setValidatePlaceholder) => {
case "text":
setValidatePlaceholder("please enter text");
break;
case "ssn":
setValidatePlaceholder("123-45-6789");
break;
default:
setValidatePlaceholder("please enter value");
}
+8
View File
@@ -186,6 +186,14 @@ export default function reportJson(id) {
btnIcon: "fa-light fa-envelope",
redirectUrl: "",
action: "saveastemplate"
},
{
btnId: "8440",
btnLabel: "Fix & resend",
hoverLabel: "Fix & resend",
btnIcon: "fa-light fa-paper-plane",
redirectUrl: "",
action: "recreatedocument"
}
]
}
+28 -63
View File
@@ -47,7 +47,7 @@ import {
mailTemplate,
updateDateWidgetsRes,
widgetDataValue,
getOriginalWH
getOriginalWH,
} from "../constant/Utils";
import Header from "../components/pdf/PdfHeader";
import RenderPdf from "../components/pdf/RenderPdf";
@@ -159,6 +159,9 @@ function PdfRequestFiles(
const [assignedWidgetId, setAssignedWidgetId] = useState([]);
const [showSignPagenumber, setShowSignPagenumber] = useState([]);
const [owner, setOwner] = useState({});
const [currentIndex, setCurrentIndex] = useState(0);
const [formData, setFormData] = useState([]);
const [vacantRole, setVacantRole] = useState();
const [, drop] = useDrop({
accept: "BOX",
drop: (item, monitor) => addPositionOfSignature(item, monitor),
@@ -624,6 +627,7 @@ function PdfRequestFiles(
} catch (err) {
console.log("err in get email verification ", err);
setHandleError(t("something-went-wrong-mssg"));
setIsUiLoading(false);
}
}
//check if isEmailVerified then go on next step
@@ -634,7 +638,6 @@ function PdfRequestFiles(
);
if (checkUser && checkUser.length > 0) {
let checkboxExist,
requiredRadio,
showAlert = false,
widgetKey,
radioExist,
@@ -705,39 +708,12 @@ function PdfRequestFiles(
}
}
}
//condition to check radio widget exist or not
else if (radioExist) {
//get all required type radio button
requiredRadio = checkUser[0].placeHolder[i].pos.filter(
(position) =>
!position.options?.isReadOnly &&
position.type === radioButtonWidget
);
//if required type radio data exit then check user checked all radio button or some radio remain to check
if (requiredRadio && requiredRadio?.length > 0) {
let checkSigned;
for (let i = 0; i < requiredRadio?.length; i++) {
checkSigned = requiredRadio[i]?.options?.response;
if (!checkSigned) {
let checkDefaultSigned =
requiredRadio[i]?.options?.defaultValue;
if (!checkDefaultSigned && !showAlert) {
showAlert = true;
widgetKey = requiredRadio[i].key;
TourPageNumber = updatePage;
setminRequiredCount(null);
}
}
}
}
}
//else condition to check all type widget data fill or not except checkbox and radio button
//else condition to check all type widget data fill or not except checkbox
else {
//get all required type widgets except checkbox and radio
const requiredWidgets = checkUser[0].placeHolder[i].pos.filter(
(position) =>
position.options?.status === "required" &&
position.type !== radioButtonWidget &&
position.type !== "checkbox"
);
if (requiredWidgets && requiredWidgets?.length > 0) {
@@ -745,16 +721,13 @@ function PdfRequestFiles(
for (let i = 0; i < requiredWidgets?.length; i++) {
checkSigned = requiredWidgets[i]?.options?.response;
if (!checkSigned) {
const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
if (!checkSignUrl) {
let checkDefaultSigned =
requiredWidgets[i]?.options?.defaultValue;
if (!checkDefaultSigned && !showAlert) {
showAlert = true;
widgetKey = requiredWidgets[i].key;
TourPageNumber = updatePage;
setminRequiredCount(null);
}
let checkDefaultSigned =
requiredWidgets[i]?.options?.defaultValue;
if (!checkDefaultSigned && !showAlert) {
showAlert = true;
widgetKey = requiredWidgets[i].key;
TourPageNumber = updatePage;
setminRequiredCount(null);
}
}
}
@@ -766,20 +739,12 @@ function PdfRequestFiles(
break;
}
}
if (checkboxExist && requiredCheckbox && showAlert) {
setUnSignedWidgetId(widgetKey);
setPageNumber(TourPageNumber);
setWidgetsTour(true);
} else if (radioExist && showAlert) {
setUnSignedWidgetId(widgetKey);
setPageNumber(TourPageNumber);
setWidgetsTour(true);
} else if (showAlert) {
if (showAlert) {
setUnSignedWidgetId(widgetKey);
setPageNumber(TourPageNumber);
setWidgetsTour(true);
setIsUiLoading(false);
} else {
setIsUiLoading(true);
// `widgets` is Used to return widgets details with page number of current user
const widgets = checkUser?.[0]?.placeHolder;
let pdfArrBuffer;
@@ -855,16 +820,19 @@ function PdfRequestFiles(
isSuccessRoute,
contactId
);
const index = pdfDetails?.[0]?.Signers.findIndex(
(x) => x.objectId === signerObjectId
);
const index =
updatedDoc.updatedPdfDetails?.[0]?.Signers.findIndex(
(x) => x.objectId === contactId
);
const newIndex = index + 1;
const usermail = {
Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
Email:
updatedDoc.updatedPdfDetails?.[0]?.Placeholders[newIndex]
?.email || ""
};
const user = usermail?.Email
? usermail
: pdfDetails?.[0]?.Signers[newIndex];
: updatedDoc.updatedPdfDetails?.[0]?.Signers[newIndex];
if (
sendmail !== "false" &&
sendInOrder
@@ -1023,6 +991,7 @@ function PdfRequestFiles(
isShow: true,
alertMessage: t("something-went-wrong-mssg")
});
setIsUiLoading(false);
}
} catch (err) {
console.log("err in embedsign", err);
@@ -1036,6 +1005,7 @@ function PdfRequestFiles(
}
const handleSignPdf = async () => {
setIsUiLoading(true);
await embedWidgetsData();
};
@@ -1254,7 +1224,8 @@ function PdfRequestFiles(
setRequestSignTour(true);
if (isDontShow) {
const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;
if (!isEnableOTP) {
const sessionToken = localStorage.getItem("accesstoken");
if (!isEnableOTP && !sessionToken) {
try {
await axios.post(
`${localStorage.getItem("baseUrl")}functions/updatecontacttour`,
@@ -1651,12 +1622,6 @@ function PdfRequestFiles(
);
setSignerPos(updatesignerPos);
}
// if (dragTypeValue === "dropdown") {
// setShowDropdown(true);
// } else if (dragTypeValue === "checkbox") {
// setIsCheckbox(true);
// } else
if (
[textWidget, "name", "company", "job title", "email"].includes(
dragTypeValue
@@ -1756,7 +1721,6 @@ function PdfRequestFiles(
setShowSignPagenumber(sortedPagenumber);
}
};
return (
<DndProvider backend={HTML5Backend}>
<Title
@@ -1828,6 +1792,7 @@ function PdfRequestFiles(
{!requestSignTour &&
isAgree &&
signerObjectId &&
!alreadySign &&
requestSignTourFunction()}
<Tour
showNumber={false}
+35 -1
View File
@@ -27,6 +27,7 @@ import {
multiSignEmbed,
addWidgetOptions,
textInputWidget,
cellsWidget,
textWidget,
radioButtonWidget,
color,
@@ -1417,7 +1418,8 @@ function PlaceHolderSign() {
deleteOption,
status,
defaultValue,
isHideLabel
isHideLabel,
layout
) => {
const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
if (filterSignerPos.length > 0) {
@@ -1453,6 +1455,7 @@ function PlaceHolderSign() {
name: dropdownName,
values: dropdownOptions,
status: status,
layout: layout,
isReadOnly: isReadOnly || false,
isHideLabel: isHideLabel || false,
defaultValue: defaultValue,
@@ -1492,6 +1495,7 @@ function PlaceHolderSign() {
maxRequiredCount: maxCount
},
defaultValue: defaultValue,
layout: layout,
isReadOnly: isReadOnly || false,
isHideLabel: isHideLabel || false,
fontSize:
@@ -1590,6 +1594,36 @@ function PlaceHolderSign() {
isReadOnly: defaultdata?.isReadOnly || false
}
};
} else if (position.type === cellsWidget) {
return {
...position,
options: {
...position.options,
name: defaultdata?.name || "Cells",
status: defaultdata?.status || "required",
hint: defaultdata?.hint || "",
cellCount: parseInt(defaultdata?.cellCount || 5),
defaultValue: (defaultdata?.defaultValue || "").slice(
0,
parseInt(defaultdata?.cellCount || 5)
),
validation:
isSubscribe && inputype
? {
type: inputype,
pattern:
inputype === "regex" ? defaultdata.textvalidate : ""
}
: {},
fontSize:
fontSize || currWidgetsDetails?.options?.fontSize || 12,
fontColor:
fontColor ||
currWidgetsDetails?.options?.fontColor ||
"black",
isReadOnly: defaultdata?.isReadOnly || false
}
};
} else if (["signature"].includes(position.type)) {
return {
...position,
+55 -4
View File
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react";
import React, { useEffect, useState, useRef } from "react";
import ReportTable from "../primitives/GetReportDisplay";
import Parse from "parse";
import axios from "axios";
@@ -27,12 +27,17 @@ const Report = () => {
const [isImport, setIsImport] = useState(false);
const abortController = new AbortController();
const docPerPage = 10;
const [searchTerm, setSearchTerm] = useState("");
const [mobileSearchOpen, setMobileSearchOpen] = useState(false);
const debounceTimer = useRef(null);
// below useEffect is call when id param change
useEffect(() => {
setReportName("");
setList([]);
getReportData();
setSearchTerm("");
setMobileSearchOpen(false);
getReportData(0, docPerPage, "");
// Function returned from useEffect is called on unmount
return () => {
@@ -48,7 +53,7 @@ const Report = () => {
// below useEffect call when isNextRecord state is true and fetch next record
useEffect(() => {
if (isNextRecord) {
getReportData(List.length, 20);
getReportData(List.length, 20, searchTerm);
}
// eslint-disable-next-line
}, [isNextRecord]);
@@ -56,7 +61,46 @@ const Report = () => {
const handleDontShow = (isChecked) => {
setIsDontShow(isChecked);
};
const getReportData = async (skipUserRecord = 0, limit = 20) => {
const handleSearchChange = async (e) => {
const term = e.target.value.toLowerCase();
setSearchTerm(term);
if (debounceTimer.current) {
clearTimeout(debounceTimer.current);
}
debounceTimer.current = setTimeout(async () => {
try {
const headers = {
"Content-Type": "application/json",
"X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessiontoken: localStorage.getItem("accesstoken"),
};
const url = `${localStorage.getItem("baseUrl")}functions/getReport`;
const res = await axios.post(
url,
{ reportId: id, searchTerm: term, skip: 0, limit: docPerPage },
{ headers }
);
const data = res.data?.result || [];
if (!data.error) {
setList(data);
setIsMoreDocs(data.length >= docPerPage);
setIsNextRecord(false);
}
} catch (err) {
console.error("Search error:", err);
}
}, 300);
};
useEffect(() => {
return () => {
if (debounceTimer.current) {
clearTimeout(debounceTimer.current);
}
};
}, []);
const getReportData = async (skipUserRecord = 0, limit = 20, term = searchTerm) => {
// setIsLoader(true);
const json = reportJson(id);
if (json) {
@@ -77,6 +121,9 @@ const Report = () => {
const skipRecord = id === "4Hhwbp482K" ? 0 : skipUserRecord;
const limitRecord = id === "4Hhwbp482K" ? 200 : limit;
const params = { reportId: id, skip: skipRecord, limit: limitRecord };
if (term) {
params.searchTerm = term;
}
const url = `${localStorage.getItem("baseUrl")}functions/getReport`;
const res = await axios.post(url, params, {
headers: headers,
@@ -197,6 +244,10 @@ const Report = () => {
report_help={reporthelp}
tourData={tourData}
isDontShow={isDontShow}
mobileSearchOpen={mobileSearchOpen}
setMobileSearchOpen={setMobileSearchOpen}
searchTerm={searchTerm}
handleSearchChange={handleSearchChange}
isImport={isImport}
/>
) : (
+28 -4
View File
@@ -22,6 +22,7 @@ import {
randomId,
getDate,
textWidget,
cellsWidget,
convertPdfArrayBuffer,
textInputWidget,
fetchImageBase64,
@@ -356,9 +357,13 @@ function SignYourSelf() {
);
const dragTypeValue = item?.text ? item.text : monitor.type;
const widgetValue = getWidgetValue(dragTypeValue);
const widgetTypeExist = ["name", "company", "job title", "email"].includes(
dragTypeValue
);
const widgetTypeExist = [
"name",
"company",
"job title",
"email",
cellsWidget
].includes(dragTypeValue);
const containerScale = getContainerScale(
pdfOriginalWH,
pageNumber,
@@ -439,6 +444,7 @@ function SignYourSelf() {
[
textInputWidget,
textWidget,
cellsWidget,
"name",
"company",
"job title",
@@ -931,7 +937,8 @@ function SignYourSelf() {
deleteOption,
status,
defaultValue,
isHideLabel
isHideLabel,
layout
) => {
const getPageNumer = xyPosition.filter(
(data) => data.pageNumber === pageNumber
@@ -939,6 +946,8 @@ function SignYourSelf() {
if (getPageNumer.length > 0) {
const getXYdata = getPageNumer[0].pos;
const getPosData = getXYdata;
const widgetLayout =
currWidgetsDetails?.type === "checkbox" ? { layout: layout } : {};
const addSignPos = getPosData.map((position) => {
if (position.key === currWidgetsDetails?.key) {
if (addOption) {
@@ -962,6 +971,7 @@ function SignYourSelf() {
...position.options,
name: dropdownName,
values: dropdownOptions,
...widgetLayout,
isReadOnly: isReadOnly,
isHideLabel: isHideLabel || false,
fontSize:
@@ -1028,6 +1038,19 @@ function SignYourSelf() {
handleTextSettingModal(false);
}
};
const setCellCount = (key, newCount) => {
const getPageNumer = xyPosition.filter((data) => data.pageNumber === pageNumber);
if (getPageNumer.length > 0) {
const updatePos = getPageNumer[0].pos.map((p) =>
p.key === key ? { ...p, options: { ...p.options, cellCount: newCount } } : p
);
const updateXYposition = xyPosition.map((obj, ind) =>
ind === index ? { ...obj, pos: updatePos } : obj
);
setXyPosition(updateXYposition);
}
};
const clickOnZoomIn = () => {
onClickZoomIn(scale, zoomPercent, setScale, setZoomPercent);
};
@@ -1289,6 +1312,7 @@ function SignYourSelf() {
pdfBase64Url={pdfBase64Url}
fontSize={fontSize}
setFontSize={setFontSize}
setCellCount={setCellCount}
fontColor={fontColor}
setFontColor={setFontColor}
isResize={isResize}
@@ -1,4 +1,4 @@
import React, { useEffect, useState, useRef } from "react";
import { useEffect, useState, useRef } from "react";
import RenderAllPdfPage from "../components/pdf/RenderAllPdfPage";
import { useParams, useNavigate } from "react-router";
import axios from "axios";
@@ -22,6 +22,7 @@ import {
defaultWidthHeight,
addWidgetOptions,
textInputWidget,
cellsWidget,
radioButtonWidget,
getContainerScale,
convertBase64ToFile,
@@ -1274,7 +1275,8 @@ const TemplatePlaceholder = () => {
deleteOption,
status,
defaultValue,
isHideLabel
isHideLabel,
layout
) => {
const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
if (filterSignerPos.length > 0) {
@@ -1313,6 +1315,7 @@ const TemplatePlaceholder = () => {
name: dropdownName,
values: dropdownOptions,
status: status,
layout: layout,
defaultValue: defaultValue,
isReadOnly: isReadOnly || false,
isHideLabel: isHideLabel || false,
@@ -1351,6 +1354,7 @@ const TemplatePlaceholder = () => {
minRequiredCount: minCount,
maxRequiredCount: maxCount
},
layout: layout,
isReadOnly: isReadOnly || false,
defaultValue: defaultValue,
isHideLabel: isHideLabel || false,
@@ -1451,6 +1455,36 @@ const TemplatePlaceholder = () => {
"black"
}
};
} else if (position.type === cellsWidget) {
return {
...position,
options: {
...position.options,
name: defaultdata?.name || "Cells",
status: defaultdata?.status || "required",
hint: defaultdata?.hint || "",
cellCount: parseInt(defaultdata?.cellCount || 5),
defaultValue: (defaultdata?.defaultValue || "").slice(
0,
parseInt(defaultdata?.cellCount || 5)
),
validation:
isSubscribe && inputype
? {
type: inputype,
pattern:
inputype === "regex" ? defaultdata.textvalidate : ""
}
: {},
isReadOnly: defaultdata?.isReadOnly || false,
fontSize:
fontSize || currWidgetsDetails?.options?.fontSize || 12,
fontColor:
fontColor ||
currWidgetsDetails?.options?.fontColor ||
"black"
}
};
} else if (["signature"].includes(position.type)) {
return {
...position,
@@ -1510,6 +1544,22 @@ const TemplatePlaceholder = () => {
setIsRadio(false);
setIsCheckbox(false);
};
const setCellCount = (key, newCount) => {
const updated = signerPos.map((signer) => {
if (signer.Id !== uniqueId) return signer;
const placeHolder = signer.placeHolder.map((ph) => {
if (ph.pageNumber !== pageNumber) return ph;
const pos = ph.pos.map((p) =>
p.key === key
? { ...p, options: { ...p.options, cellCount: newCount } }
: p
);
return { ...ph, pos };
});
return { ...signer, placeHolder };
});
setSignerPos(updated);
};
const clickOnZoomIn = () => {
onClickZoomIn(scale, zoomPercent, setScale, setZoomPercent);
@@ -1828,6 +1878,7 @@ const TemplatePlaceholder = () => {
pdfBase64Url={pdfBase64Url}
fontSize={fontSize}
setFontSize={setFontSize}
setCellCount={setCellCount}
fontColor={fontColor}
setFontColor={setFontColor}
isResize={isResize}
@@ -7,6 +7,7 @@ import ModalUi from "./ModalUi";
import AddSigner from "../components/AddSigner";
import {
emailRegex,
iconColor,
} from "../constant/const";
import Alert from "./Alert";
import Tooltip from "./Tooltip";
@@ -907,7 +908,6 @@ const ReportTable = (props) => {
setActLoader({});
}
};
const handleUpdateExpiry = async (e, item) => {
e.preventDefault();
e.stopPropagation();
@@ -1314,7 +1314,6 @@ const ReportTable = (props) => {
try {
const params = { docId: doc?.objectId };
const templateRes = await Parse.Cloud.run("saveastemplate", params);
// console.log("templateRes ", templateRes);
setTemplateId(templateRes?.id);
setIsSuccess({ [doc.objectId]: true });
} catch (err) {
@@ -1394,6 +1393,12 @@ const ReportTable = (props) => {
setActLoader({});
}
};
const restrictBtn = (item, act) => {
return item.IsSignyourself && act.action === "recreatedocument"
? true
: false;
};
return (
<div className="relative">
{Object.keys(actLoader)?.length > 0 && (
@@ -1449,6 +1454,23 @@ const ReportTable = (props) => {
className="cursor-pointer fa-light fa-square-plus text-accent text-[30px] md:text-[35px]"
></i>
)}
{/* Search input */}
<div className="hidden md:block p-2">
<input
type="search"
value={props.searchTerm}
onChange={props.handleSearchChange}
placeholder={t('search.documents')}
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-64 text-xs"
/>
</div>
<button
className="md:hidden p-2 flex justify-center items-center focus:outline-none rounded-md hover:bg-gray-200 text-[18px]"
aria-label="Search"
onClick={() => props.setMobileSearchOpen(!props.mobileSearchOpen)}
>
<i style={{ color: `${iconColor}` }} className="fa-solid fa-magnifying-glass"></i>
</button>
<ModalUi
isOpen={isModal?.export}
title={t("bulk-import")}
@@ -1536,6 +1558,17 @@ const ReportTable = (props) => {
</ModalUi>
</div>
</div>
{props.mobileSearchOpen && (
<div className="top-full left-0 w-full bg-white px-4 py-2 shadow-md md:hidden">
<input
type="search"
value={props.searchTerm}
onChange={props.handleSearchChange}
placeholder="Search documents…"
className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
/>
</div>
)}
<div
className={`overflow-auto w-full border-b ${
props.List?.length > 0
@@ -1837,33 +1870,39 @@ const ReportTable = (props) => {
{isOption[item.objectId] &&
act.action === "option" && (
<ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
{act.subaction?.map((subact) => (
<li
key={subact.btnId}
onClick={() =>
handleActionBtn(
subact,
item
)
}
title={t(
`btnLabel.${subact.hoverLabel}`
)}
>
<span>
<i
className={`${subact.btnIcon} mr-1.5`}
></i>
{subact.btnLabel && (
<span className="text-[13px] capitalize font-medium">
{t(
`btnLabel.${subact.btnLabel}`
{act.subaction?.map(
(subact) =>
!restrictBtn(
item,
subact
) && (
<li
key={subact.btnId}
onClick={() =>
handleActionBtn(
subact,
item
)
}
title={t(
`btnLabel.${subact.hoverLabel}`
)}
>
<span>
<i
className={`${subact.btnIcon} mr-1.5`}
></i>
{subact.btnLabel && (
<span className="text-[13px] capitalize font-medium">
{t(
`btnLabel.${subact.btnLabel}`
)}
</span>
)}
</span>
)}
</span>
</li>
))}
</li>
)
)}
</ul>
)}
</div>
@@ -15,8 +15,6 @@ async function deductcount(docsCount, extUserId) {
async function sendMail(document, publicUrl) {
//sessionToken
const baseUrl = new URL(publicUrl);
// console.log("pdfDetails", pdfDetails);
const timeToCompleteDays = document?.TimeToCompleteDays || 15;
const ExpireDate = new Date(document.createdAt);
ExpireDate.setDate(ExpireDate.getDate() + timeToCompleteDays);
@@ -168,9 +166,9 @@ async function batchQuery(userId, Documents, Ip, parseConfig, type, publicUrl) {
})),
ACL: Acl,
SentToOthers: true,
RemindOnceInEvery: x.RemindOnceInEvery || 5,
RemindOnceInEvery: x.RemindOnceInEvery ? parseInt(x.RemindOnceInEvery) : 5,
AutomaticReminders: x.AutomaticReminders || false,
TimeToCompleteDays: x.TimeToCompleteDays || 15,
TimeToCompleteDays: x.TimeToCompleteDays ? parseInt(x.TimeToCompleteDays) : 15,
OriginIp: Ip,
DocSentAt: { __type: 'Date', iso: isoDate },
IsEnableOTP: x?.IsEnableOTP || false,
@@ -231,6 +229,7 @@ export default async function createBatchDocs(request) {
const sessionToken = request.headers?.sessiontoken;
const type = request.headers?.type || 'quicksend';
const Documents = JSON.parse(strDocuments);
const Ip = request?.headers?.['x-real-ip'] || '';
// Access the host from the headers
const publicUrl = request.headers.public_url;
@@ -2,19 +2,26 @@ import { cloudServerUrl } from '../../Utils.js';
import reportJson from './reportsJson.js';
import axios from 'axios';
// Escape regex special characters. Copied from filterDocs.js
function escapeRegExp(str) {
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
}
export default async function getReport(request) {
const reportId = request.params.reportId;
const limit = request.params.limit;
const skip = request.params.skip;
const searchTerm = request.params.searchTerm || '';
const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
const appId = process.env.APP_ID;
const masterKey = process.env.MASTER_KEY;
const sessionToken = request.headers['sessiontoken'] || request.headers['x-parse-session-token'];
try {
const userRes = await axios.get(serverUrl + '/users/me', {
headers: {
'X-Parse-Application-Id': appId,
'X-Parse-Session-Token': request.headers['sessiontoken'],
'X-Parse-Session-Token': sessionToken,
},
});
const userId = userRes.data && userRes.data.objectId;
@@ -25,7 +32,7 @@ export default async function getReport(request) {
const { params, keys } = json;
const orderBy = '-updatedAt';
const strKeys = keys.join();
let strParams = JSON.stringify(params);
let paramsObj = { ...params };
if (reportId == '6TeaPr321t') {
const extUserQuery = new Parse.Query('contracts_Users');
extUserQuery.equalTo('Email', userRes.data.email);
@@ -36,8 +43,8 @@ export default async function getReport(request) {
if (_extUser?.TeamIds && _extUser.TeamIds?.length > 0) {
let teamArr = [];
_extUser?.TeamIds?.forEach(x => (teamArr = [...teamArr, ...x.Ancestors]));
strParams = JSON.stringify({
...params,
paramsObj = {
...paramsObj,
$or: [
{ SharedWith: { $in: teamArr } },
{
@@ -55,15 +62,23 @@ export default async function getReport(request) {
},
},
],
});
};
} else {
strParams = JSON.stringify({
...params,
paramsObj = {
...paramsObj,
CreatedBy: { __type: 'Pointer', className: '_User', objectId: userId },
});
};
}
}
}
if (searchTerm) {
const escaped = escapeRegExp(searchTerm);
paramsObj = {
...paramsObj,
Name: { $regex: `.*${escaped}.*`, $options: 'i' },
};
}
const strParams = JSON.stringify(paramsObj);
const headers = {
'Content-Type': 'application/json',
'X-Parse-Application-Id': appId,
@@ -14,11 +14,14 @@ export default async function recreateDocument(request) {
if (!doc) {
throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found');
}
if (doc?.get('IsSignyourself')) {
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Signyourself Document not allowed');
}
const _docRes = doc?.toJSON();
const { objectId, SignedUrl, AuditTrail, ACL, DeclineBy, DeclineReason, ...docRes } = _docRes;
const createDoc = new Parse.Object('contracts_Document');
Object.entries(docRes).forEach(([key, value]) => {
if (key === 'IsDeclined') {
if (key === 'IsDeclined' || key === 'IsCompleted') {
createDoc.set(key, false);
} else {
createDoc.set(key, value);
@@ -123,6 +123,8 @@ export default function reportJson(id, userId) {
'TimeToCompleteDays',
'IsSignyourself',
'IsCompleted',
'ExpiryDate',
'IsSignyourself',
],
};
// declined documents report
@@ -53,10 +53,16 @@ const makeEmail = async (
const isSecure =
new URL(url)?.protocol === 'https:' && new URL(url)?.hostname !== 'localhost';
if (isSecure) {
https.get(url, async function (response) {
response.pipe(Pdf);
response.on('end', () => resolve('success'));
});
https
.get(url, async function (response) {
response.pipe(Pdf);
Pdf.on('finish', () => resolve('success'));
Pdf.on('error', () => resolve('error'));
})
.on('error', e => {
console.error(`error: ${e.message}`);
resolve('error');
});
} else {
const httpsAgent = new https.Agent({ rejectUnauthorized: false }); // Disable SSL validation
axios