EAP: Update schema for Save and submit functionality by shreeyash07 · Pull Request #2240 · IFRCGo/go-web-app

shreeyash07 · 2026-02-16T10:04:17Z

Changes

Add EapObsolete resolution modal for EAP Forms
Add getIsSubmission context in form schema for save and submit functionality
Add lastModifiedAtRef to send modified_at while updating

This PR Ensures:

No typos or grammatical errors
No conflict markers left in the code
No unwanted comments, temporary files, or auto-generated files
No inclusion of secret keys or sensitive data
No console.log statements meant for debugging
All CI checks have passed

Additional Notes

Optional: Add any other relevant context, screenshots, or details here.

changeset-bot · 2026-02-16T10:04:21Z

⚠️ No Changeset found

Latest commit: ec18450

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

- Add getIsSubmission context in form schema for save and submit functionality - Add lastModifiedAtRef to send modified_at while updating

AdityaKhatri · 2026-02-20T04:45:45Z

app/src/components/domain/EapObsoleteResolutionModal/index.tsx

+    const strings = useTranslation(i18n);
+
+    const { pending: fullEapPending, response: fullEapResponse } = useRequest({
+        skip: isNotDefined(fullEapId) || isDefined(simplifiedEapId),


Why skip fullEap if simplifiedEap is not defined?

Because we don't need full response in simplified form.

AdityaKhatri · 2026-02-20T04:45:56Z

app/src/components/domain/EapObsoleteResolutionModal/index.tsx

+    });
+
+    const { pending: simplifiedEapPending, response: simplifiedEapResponse } = useRequest({
+        skip: isNotDefined(simplifiedEapId) || isDefined(fullEapId),


Why skip simplifiedEap if fullEap is not defined?

Because we don't need simplified response in full form.

AdityaKhatri · 2026-02-20T04:46:11Z

app/src/components/domain/EapObsoleteResolutionModal/index.tsx

+    });
+
+    const response = fullEapResponse ?? simplifiedEapResponse;
+    const pending = fullEapPending ?? simplifiedEapPending;


Suggested change

const pending = fullEapPending ?? simplifiedEapPending;

const pending = fullEapPending || simplifiedEapPending;

AdityaKhatri · 2026-02-20T04:46:34Z

app/src/components/domain/EapObsoleteResolutionModal/index.tsx

+            )}
+        >
+            {pending && <BlockLoading />}
+            {!pending && (


is this necessary?

AdityaKhatri · 2026-02-20T04:46:51Z

app/src/views/AccountMyFormsEap/EapStatus/i18n.json

        "confirmStatusButtonLabel": "Confirm",
        "updateStatusDescription": "Are you sure you want to update the status?",
        "reviewChecklistDescription": "Upload the Review Checklist for the National Society to download and review. Make sure to keep a proper labeling of the file to avoid duplications.",
+        "editSimplifiedEapFormLinkLabel": "Edit sEAP",


Suggested change

"editSimplifiedEapFormLinkLabel": "Edit sEAP",

"editSimplifiedEapFormLinkLabel": "Edit simplified EAP",

No changes required in this. this is correct.

AdityaKhatri · 2026-02-20T04:50:19Z

app/src/views/AccountMyFormsEap/EapStatus/index.tsx

                                </Label>
                            </ListView>
                        )}
+                        {isDefined(hasFormErrors) && (


I think we've already alerted the users. Is this necessary again?

This alert is different it persist its state in the modal to show warning and error.

AdityaKhatri · 2026-02-20T04:59:02Z

app/src/views/EapSimplifiedForm/index.tsx

    const [fileIdToUrlMap, setFileIdToUrlMap] = useState<Record<number, string>>({});

    const updateFileUrlMapping = useCallback((response: GetSimplifiedResponse) => {
+        lastModifiedAtRef.current = response?.modified_at;


Move this setting right after we get data from the request as opposed to doing it during updateFileUrlMapping

AdityaKhatri · 2026-02-20T05:07:11Z

app/src/views/EapSimplifiedForm/index.tsx

+            // NOTE it is here to clear the state and
+            // replace is necessary for not pushing a new entry


Mention in the note in a bit more detail about why the state was used and what happens if we don't replace it.
Also, try this:
window.history.replaceState({}, '')

Navigating my trigger the request again that will lead to the onSuccess being triggered again.

AdityaKhatri · 2026-02-20T05:08:20Z

app/src/views/EapFullForm/index.tsx

    );

    const updateFileUrlMapping = useCallback((response: GetFullEapResponse) => {
+        lastModifiedAtRef.current = response?.modified_at;


Same as in the simplified form

AdityaKhatri · 2026-02-20T05:08:28Z

app/src/views/EapFullForm/index.tsx

+
+            // NOTE it is here to clear the state and
+            // replace is necessary for not pushing a new entry
+            navigate(


Same as in the simplified form

shreeyash07 force-pushed the feature/eap-schema branch from f663360 to 21c940f Compare February 16, 2026 10:12

shreeyash07 changed the title ~~EAP: changes in~~ EAP: Update schema for Save and submit functionality Feb 16, 2026

shreeyash07 requested review from AdityaKhatri, barshathakuri and frozenhelium February 16, 2026 10:39

shreeyash07 assigned frozenhelium Feb 16, 2026

shreeyash07 force-pushed the feature/eap-schema branch from c9aef37 to 97a5803 Compare February 18, 2026 06:13

shreeyash07 added 2 commits February 18, 2026 12:11

feat(eap): add obsolete resolution modal for both EAP forms

ff1e2bf

- Add getIsSubmission context in form schema for save and submit functionality - Add lastModifiedAtRef to send modified_at while updating

feat(eap): update schema for save, submit functionality

97a5803

AdityaKhatri requested changes Feb 20, 2026

View reviewed changes

shreeyash07 added 2 commits February 20, 2026 16:41

fixup! feat(eap): update schema for save, submit functionality

3f27d48

fixup! feat(eap): update schema for save, submit functionality

ec18450

shreeyash07 requested a review from AdityaKhatri February 23, 2026 11:07

	const pending = fullEapPending ?? simplifiedEapPending;
	const pending = fullEapPending \|\| simplifiedEapPending;

	"editSimplifiedEapFormLinkLabel": "Edit sEAP",
	"editSimplifiedEapFormLinkLabel": "Edit simplified EAP",

		// NOTE it is here to clear the state and
		// replace is necessary for not pushing a new entry

Comments

Conversation

shreeyash07 commented Feb 16, 2026

Changes

This PR Ensures:

Additional Notes

Uh oh!

changeset-bot bot commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

changeset-bot bot commented Feb 16, 2026 •

edited

Loading