Skip to content

🐞 Admin portal: stop click propagation missing when removing a candidate image #2679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuvalkom-M wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
Open

🐞 Admin portal: stop click propagation missing when removing a candidate image #2679

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions packages/admin-portal/src/resources/Candidate/CandidateDataForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export const CandidateDataForm: React.FC<{
const notify = useNotify()
const refresh = useRefresh()
const {globalSettings} = useContext(SettingsContext)
const [enabledDeleteImage, setEnabledDeleteImage] = useState<boolean>(true)
const getImageUrl = useGetDocumentUrl()

const [value, setValue] = useState(0)
Expand Down Expand Up @@ -136,7 +135,7 @@ export const CandidateDataForm: React.FC<{
}
}, [electionEvent?.presentation?.language_conf, election?.presentation?.language_conf])

const [updateImage] = useUpdate<Sequent_Backend_Candidate>()
const [updateImage, {isPending: isDeletingImage}] = useUpdate<Sequent_Backend_Candidate>()

const parseValues = useCallback(
(incoming: Sequent_Backend_Candidate_Extended): Sequent_Backend_Candidate_Extended => {
Expand Down Expand Up @@ -294,24 +293,25 @@ export const CandidateDataForm: React.FC<{
}
}

const removeImage = () => {
const removeImage = async (e: React.MouseEvent<HTMLButtonElement>) => {
e.stopPropagation()
try {
setEnabledDeleteImage(false)
let presentation = removeUrlFromPresentation(record)
updateImage("sequent_backend_candidate", {
id: record.id,
data: {
image_document_id: null,
presentation: presentation,
const presentation = removeUrlFromPresentation(record)
await updateImage(
"sequent_backend_candidate",
{
id: record.id,
data: {
image_document_id: null,
presentation: presentation,
},
},
})

setEnabledDeleteImage(true)
{returnPromise: true}
)
refresh()
} catch (e) {
console.log("error :>> ", e)
} catch (err) {
console.log("error :>> ", err)
notify(t("electionScreen.error.fileError"), {type: "error"})
setEnabledDeleteImage(true)
}
}

Expand Down Expand Up @@ -347,11 +347,12 @@ export const CandidateDataForm: React.FC<{
}

const DeleteImage: React.FC = () => (
<StyledIconButton onClick={removeImage} disabled={!enabledDeleteImage}>
{!enabledDeleteImage ? (
<CircularProgress size="18px" style={{marginRight: "6px"}} />
) : null}
<Icon variant="info" icon={faTrash as any} fontSize="18px" />
<StyledIconButton onClick={(e) => void removeImage(e)} disabled={isDeletingImage}>
{isDeletingImage ? (
<CircularProgress size={18} />
) : (
<Icon variant="info" icon={faTrash as any} fontSize="18px" />
)}
</StyledIconButton>
)

Expand Down
Loading