Skip to content
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.

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

fix(portals-admin): locklist #16279

Merged
merged 6 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
19 changes: 17 additions & 2 deletions libs/portals/admin/signature-collection/src/lib/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ export const m = defineMessages({
},
confirmListReviewedToggleBack: {
id: 'admin-portal.signature-collection:confirmListReviewedToggleBack',
defaultMessage: 'Aflæsa úrvinnslu',
defaultMessage: 'Opna fyrir úrvinnslu',
description: '',
},
listReviewedModalDescription: {
Expand Down Expand Up @@ -423,9 +423,24 @@ export const m = defineMessages({
defaultMessage: 'Úrvinnslu lokið',
description: '',
},
lockList: {
id: 'admin-portal.signature-collection:lockList',
defaultMessage: 'Læsa söfnun',
description: '',
},
lockListSuccess: {
id: 'admin-portal.signature-collection:lockListSuccess',
defaultMessage: 'Tókst að læsa söfnun',
description: '',
},
lockListError: {
id: 'admin-portal.signature-collection:toggleReviewError',
defaultMessage: 'Ekki tókst að læsa söfnun',
description: '',
},
albinagu marked this conversation as resolved.
Show resolved Hide resolved
toggleReviewError: {
id: 'admin-portal.signature-collection:toggleReviewError',
defaultMessage: 'Ekki tókst loka úrvinnslu',
defaultMessage: 'Ekki tókst loka úrvinnslu',
description: '',
},
toggleCollectionProcessSuccess: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const PaperSignees = ({ listId }: { listId: string }) => {
listId,
},
},
skip: !nationalId.isValid(nationalIdInput) || !name,
})

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useToggleListReviewMutation } from './toggleListReview.generated'
import { useRevalidator } from 'react-router-dom'
import { m } from '../../lib/messages'
import { ListStatus } from '../../lib/utils'
import { useSignatureCollectionLockListMutation } from './lockList.generated'

const ActionReviewComplete = ({
listId,
Expand All @@ -15,43 +16,91 @@ const ActionReviewComplete = ({
listStatus: string
}) => {
const { formatMessage } = useLocale()
const [modalSubmitReviewIsOpen, setModalSubmitReviewIsOpen] = useState(false)
const [toggleListReviewMutation, { loading }] = useToggleListReviewMutation()
const { revalidate } = useRevalidator()

const [modalSubmitReviewIsOpen, setModalSubmitReviewIsOpen] = useState(false)
const [modalLockListIsOpen, setModalLockListIsOpen] = useState(false)

const [lockList, { loading: loadingLockList }] =
useSignatureCollectionLockListMutation({
variables: {
input: {
listId,
},
},
onCompleted: () => {
setModalLockListIsOpen(false)
revalidate()
toast.success(formatMessage(m.lockListSuccess))
},
onError: () => {
toast.error(formatMessage(m.lockListError))
},
})
albinagu marked this conversation as resolved.
Show resolved Hide resolved
const [toggleListReview, { loading }] = useToggleListReviewMutation({
variables: {
input: {
listId,
},
},
onCompleted: () => {
setModalSubmitReviewIsOpen(false)
revalidate()
toast.success(formatMessage(m.toggleReviewSuccess))
},
onError: () => {
toast.error(formatMessage(m.toggleReviewError))
},
})

const listReviewed = listStatus && listStatus === ListStatus.Reviewed
const modalText = listReviewed
? formatMessage(m.confirmListReviewedToggleBack)
: formatMessage(m.confirmListReviewed)

const toggleReview = async () => {
try {
const res = await toggleListReviewMutation({
variables: {
input: {
listId,
},
},
})
if (res.data?.signatureCollectionAdminToggleListReview.success) {
toast.success(formatMessage(m.toggleReviewSuccess))
setModalSubmitReviewIsOpen(false)
revalidate()
} else {
toast.error(formatMessage(m.toggleReviewError))
}
} catch (e) {
toast.error(e.message)
}
}

return (
<Box marginTop={20}>
<Box display="flex" justifyContent="flexEnd">
<Box display="flex" justifyContent="spaceBetween">
{/* Læsa söfnun */}
<Button
iconType="outline"
variant="ghost"
icon="lockClosed"
colorScheme="destructive"
onClick={() => setModalLockListIsOpen(true)}
>
{formatMessage(m.lockList)}
</Button>
<Modal
id="toggleLockList"
isVisible={modalLockListIsOpen}
title={formatMessage(m.lockList)}
onClose={() => setModalLockListIsOpen(false)}
label={''}
closeButtonLabel={''}
>
<Box marginTop={5}>
<Text>{formatMessage(m.lockList)}</Text>
<Box display="flex" justifyContent="flexEnd" marginTop={5}>
<Button
iconType="outline"
variant="ghost"
onClick={() => lockList()}
loading={loadingLockList}
icon="lockClosed"
colorScheme="destructive"
>
{formatMessage(m.lockList)}
</Button>
</Box>
</Box>
</Modal>

{/* Úrvinnslu lokið */}
<Button
iconType="outline"
variant="ghost"
icon={listReviewed ? 'lockOpened' : 'lockClosed'}
colorScheme={listReviewed ? 'default' : 'destructive'}
icon={listReviewed ? 'reload' : 'checkmark'}
onClick={() => setModalSubmitReviewIsOpen(true)}
>
{modalText}
Expand All @@ -75,10 +124,9 @@ const ActionReviewComplete = ({
<Button
iconType="outline"
variant="ghost"
onClick={() => toggleReview()}
onClick={() => toggleListReview()}
loading={loading}
icon={listReviewed ? 'lockOpened' : 'lockClosed'}
colorScheme={listReviewed ? 'default' : 'destructive'}
icon={listReviewed ? 'reload' : 'checkmark'}
>
{modalText}
</Button>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mutation SignatureCollectionLockList($input: SignatureCollectionListIdInput!) {
signatureCollectionLockList(input: $input) {
reasons
success
}
}
Loading