Skip to content

POLIO-2061: integrate non polio to polio #2633

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

Jump to bottom
Merged
quang-le merged 45 commits into from
Jan 6, 2026
Merged

POLIO-2061: integrate non polio to polio #2633

quang-le merged 45 commits into from
Jan 6, 2026

Conversation

@quang-le
Copy link
Member

@quang-le quang-le commented Dec 30, 2025 •
edited
Loading

What problem is this PR solving? Explain here in one sentence.

Related JIRA tickets : POLIO-2061

Self proofreading checklist

  • Did I use eslint and ruff formatters?
  • Is my code clear enough and well documented?
  • Are my typescript files well typed?
  • New translations have been added or updated if new strings have been introduced in the frontend
  • My migrations file are included
  • Are there enough tests?
  • Documentation has been included (for new feature)

Doc

jsdoc comments in new hooks/components

Changes

Add functionality to existing components:

  • LinkTo: enable using underlying overrideIcon prop
  • CampaignAsyncSelect: enable more parametrization (campaign type, category, on hold etc)

Add/move:

  • useSkipEffectUntilValue: move to core iaso codebase and update imports

  • useAsyncInitialState: convenience hook for useState when initial value is async (fetched)

  • IntegratedCampaignsFields: CampaignAsyncSelect + link to campaign wrapped in a component to keep JSX readable

  • reorganize folder structure a bit

  • Add IntegratedCampaignsFields to BaseInfoForm

How to test

  • Create new non-polio campaign and add a campaign to integrate to
  • Go to "parent" campaign: the integrated campaign should be visible in the list/widget
  • repeat with editing a campaign

Print screen / video

Screen.Recording.2025-12-30.at.14.15.07.mov

Notes

merges BLSQ/bluesquare-components#196

@quang-le
POLIO-2013: setup API tests
ac5840b
@quang-le
Merge remote-tracking branch 'origin/develop' into POLIO-2013_integra…
ec85e30 
…ted_campaign_api
@quang-le
POLIO-2013: update Campaigns admin
19fcddc
@quang-le
POLIO-2013: add integrated_to API
0380f6c
@quang-le
POLIO-2013: add integrated_campaigns to API
531b2e3
@quang-le
WIP fix tests, improve validation
78bb00e 
- TODO: replace obr name with ID to simplify validation
@quang-le
POLIO-2013: use id i.o obr_name
1a363ce 
- replace serializerFields
- update tests
@quang-le
POLIO-2013: add RetrieveCampaignSerializer
75f427b
@quang-le
POLIO-2013: add RetrieveCampaignSerializer
7491f8d
@quang-le
Merge branch 'POLIO-2013_integrated_campaign_api' into POLIO-2055_int…
2a639e3 
…egrated_campaigns_UI
@quang-le
POLIO-2013: update campaign retrieve serializer
0f187b4
@quang-le
POLIO-2055: update WidgetPaper
1b3f6f4 
- extract WidgetPaperRow for reuse
@quang-le
POLIO-2055: show integrate campaigns in UI
d8723b6 
- no edition
@quang-le
POLIO-2013: update campaign retrieve serializer
48b672c
@quang-le
Merge branch 'POLIO-2013_integrated_campaign_api' into POLIO-2055_int…
358dcaf 
…egrated_campaigns_UI
@quang-le
POLIO-2013: update tests
8c9ad92
@quang-le
Merge branch 'POLIO-2013_integrated_campaign_api' into POLIO-2055_int…
8b45dc1 
…egrated_campaigns_UI
@quang-le
POLIO-2013: add custom serializer for integr. camp dropdown
717cf6e
@quang-le
POLIO-2013: add custom serializer for integr. camp dropdown
1b5045b
@quang-le
POLIO-2055: add/remove integrated campaign
57db083
@quang-le
POLIO-2055: enable integr. camp save
93a1edd
@quang-le
POLIO-2055: remove TS errors
f406198
@quang-le
POLIO-2055: UI polish
f26beed 
- outline add integrated component
- align delete icons
- use better translations
- update blsq-comp
@quang-le
POLIO-2055: hide paper if no integr camp
4a90f7e
@quang-le
POLIO-2055: add margin top in modal
6d1b663
@quang-le
POLIO-2055: fix form clear bug
1ffda6f
@quang-le
POLIO-2055: fix save bug on creation
1170dc6
@quang-le
POLIO-2062: add utils hooks
849057d
@quang-le
POLIO-20662: add campaign inetgration fioeld for non polio
62288c1
@quang-le
chore: delete dead code
9125834
@quang-le quang-le changed the title POLIO-2062: integrate non polio to polio POLIO-2061: integrate non polio to polio Dec 30, 2025
@quang-le quang-le mentioned this pull request Dec 30, 2025
Merged
7 tasks
@quang-le quang-le added the release Should be released in production at next deploy label Dec 30, 2025
@beygorghor beygorghor self-requested a review January 5, 2026 10:04
beygorghor
beygorghor approved these changes Jan 5, 2026
View reviewed changes
Copy link
Collaborator

@beygorghor beygorghor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is working but why don't add one more tab for integrated campaigns instead of having it on base infos ?

Base automatically changed from POLIO-2055_integrated_campaigns_UI to develop January 6, 2026 14:07
@quang-le quang-le merged commit ad70956 into develop Jan 6, 2026
7 checks passed
@quang-le quang-le deleted the POLIO-2062_integrate_non_polio_to_polio branch January 6, 2026 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@beygorghor beygorghor beygorghor approved these changes

Assignees

No one assigned

Labels

release Should be released in production at next deploy

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@quang-le @beygorghor