Skip to content

Commit 0ecb824

Browse files
committed
makes submit button not disabled, but shows error message instead if clicked and there are missing signatures
1 parent 72319c6 commit 0ecb824

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

src/language/texts/en.ts

+2
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ export function en() {
376376
awaiting_other_signatures_panel_description_not_signing: 'You can submit the form when all parties have signed.',
377377
awaiting_other_signatures_panel_description_signed:
378378
'Thank you for signing! You can submit the form when all parties have signed.',
379+
awaiting_other_signatures_panel_error_message:
380+
'There are missing signatures. You can submit the form when all parties have signed.',
379381

380382
no_action_required_panel_title_has_signed: 'You have signed the form',
381383
no_action_required_panel_title_not_signed: 'Nothing to sign',

src/language/texts/nb.ts

+2
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@ export function nb(): FixedLanguageList {
376376
awaiting_other_signatures_panel_description_not_signing: 'Du kan sende inn skjemaet når alle parter har signert.',
377377
awaiting_other_signatures_panel_description_signed:
378378
'Takk for at du signerte! Du kan sende inn skjemaet når alle parter har signert.',
379+
awaiting_other_signatures_panel_error_message:
380+
'Det mangler signaturer. Du kan sende inn skjemaet når alle parter har signert.',
379381

380382
no_action_required_panel_title_has_signed: 'Du har signert skjemaet',
381383
no_action_required_panel_title_not_signed: 'Ingenting å signere',

src/language/texts/nn.ts

+2
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,8 @@ export function nn(): FixedLanguageList {
377377
awaiting_other_signatures_panel_description_not_signing: 'Du kan sende inn skjemaet når alle partar har signert.',
378378
awaiting_other_signatures_panel_description_signed:
379379
'Takk for at du signerte! Du kan sende inn skjemaet når alle partar har signert.',
380+
awaiting_other_signatures_panel_error_message:
381+
'Det manglar signaturar. Du kan sende inn skjemaet når alle partar har signert.',
380382

381383
no_action_required_panel_title_has_signed: 'Du har signert skjemaet',
382384
no_action_required_panel_title_not_signed: 'Ingenting å signere',

src/layout/SigningStatusPanel/PanelAwaitingCurrentUserSignature.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ export function AwaitingCurrentUserSignaturePanel({
5050
const signingButtonText = textResourceBindings?.signingButton ?? 'signing.sign_button';
5151

5252
const [confirmReadDocuments, setConfirmReadDocuments] = useState(false);
53-
// Set the org number automatically when there's only unsigned party and it is an org
5453
const [onBehalfOf, setOnBehalfOf] = useState<string | null>(null);
5554

5655
const { data: authorizedOrganizationDetails, isLoading: isApiLoading } = useAuthorizedOrganizationDetails(
@@ -89,7 +88,7 @@ export function AwaitingCurrentUserSignaturePanel({
8988
},
9089
});
9190

92-
// if last party is an org, set the org number automatically
91+
// Set the org number automatically when there's only unsigned party and it is an org
9392
useEffect(() => {
9493
if (
9594
unsignedUserSigneeParties.length === 1 &&

src/layout/SigningStatusPanel/PanelAwaitingOtherSignatures.tsx

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import React, { useEffect, useState } from 'react';
22

33
import { Button } from 'src/app-components/Button/Button';
44
import { Lang } from 'src/features/language/Lang';
@@ -13,6 +13,18 @@ type AwaitingOtherSignaturesPanelProps = {
1313

1414
export function AwaitingOtherSignaturesPanel({ node, hasSigned }: AwaitingOtherSignaturesPanelProps) {
1515
const textResourceBindings = useNodeItem(node, (i) => i.textResourceBindings);
16+
const [userTriedToSubmit, setUserTriedToSubmit] = useState<boolean>(false);
17+
18+
useEffect(() => {
19+
if (userTriedToSubmit) {
20+
// remove error message after 10 seconds
21+
const timer = setTimeout(() => {
22+
setUserTriedToSubmit(false);
23+
}, 10000);
24+
25+
return () => clearTimeout(timer);
26+
}
27+
}, [userTriedToSubmit]);
1628

1729
const heading =
1830
textResourceBindings?.awaitingOtherSignaturesPanelTitle ?? 'signing.awaiting_other_signatures_panel_title';
@@ -22,18 +34,20 @@ export function AwaitingOtherSignaturesPanel({ node, hasSigned }: AwaitingOtherS
2234
const descriptionSigned =
2335
textResourceBindings?.awaitingOtherSignaturesPanelDescriptionSigned ??
2436
'signing.awaiting_other_signatures_panel_description_signed';
37+
const errorMessage = 'signing.awaiting_other_signatures_panel_error_message';
2538

2639
return (
2740
<SigningPanel
2841
node={node}
2942
variant={hasSigned ? 'success' : 'info'}
3043
heading={<Lang id={heading} />}
3144
description={<Lang id={hasSigned ? descriptionSigned : descriptionNotSigning} />}
45+
errorMessage={userTriedToSubmit ? <Lang id={errorMessage} /> : undefined}
3246
actionButton={
3347
<Button
3448
size='md'
3549
color='success'
36-
disabled
50+
onClick={() => setUserTriedToSubmit(true)}
3751
>
3852
<Lang id='signing.submit_button' />
3953
</Button>

0 commit comments

Comments
 (0)