allow signing and show PdfView without any marks (never created) #287

Merged
b merged 4 commits from 286-missing-pdf-and-sign into staging 2025-01-02 09:43:46 +00:00
Showing only changes of commit cb0d2dd7bc - Show all commits

View File

@ -101,21 +101,22 @@ const PdfMarking = (props: PdfMarkingProps) => {
*/ */
const handleSubmit = (event: React.MouseEvent<HTMLButtonElement>) => { const handleSubmit = (event: React.MouseEvent<HTMLButtonElement>) => {
event.preventDefault() event.preventDefault()
if (!selectedMarkValue || !selectedMark) return if (selectedMarkValue && selectedMark) {
const updatedMark: CurrentUserMark = getUpdatedMark(
selectedMark,
selectedMarkValue
)
const updatedMark: CurrentUserMark = getUpdatedMark( setSelectedMarkValue(EMPTY)
selectedMark, const updatedCurrentUserMarks = updateCurrentUserMarks(
selectedMarkValue currentUserMarks,
) updatedMark
)
setCurrentUserMarks(updatedCurrentUserMarks)
setSelectedMark(null)
setUpdatedMarks(updatedMark.mark)
}
setSelectedMarkValue(EMPTY)
const updatedCurrentUserMarks = updateCurrentUserMarks(
currentUserMarks,
updatedMark
)
setCurrentUserMarks(updatedCurrentUserMarks)
setSelectedMark(null)
setUpdatedMarks(updatedMark.mark)
handleSign() handleSign()
} }
@ -162,16 +163,14 @@ const PdfMarking = (props: PdfMarkingProps) => {
otherUserMarks={otherUserMarks} otherUserMarks={otherUserMarks}
/> />
</StickySideColumns> </StickySideColumns>
{selectedMark !== null && ( <MarkFormField
<MarkFormField handleSubmit={handleSubmit}
handleSubmit={handleSubmit} handleSelectedMarkValueChange={handleChange}
handleSelectedMarkValueChange={handleChange} selectedMark={selectedMark}
selectedMark={selectedMark} selectedMarkValue={selectedMarkValue}
selectedMarkValue={selectedMarkValue} currentUserMarks={currentUserMarks}
currentUserMarks={currentUserMarks} handleCurrentUserMarkChange={handleCurrentUserMarkChange}
handleCurrentUserMarkChange={handleCurrentUserMarkChange} />
/>
)}
</Container> </Container>
</> </>
) )