Filtering location options for Address & Location inputs, add user.jurisdiction() and user.scope().attribute() reference functions to toolkit by cibelius · Pull Request #11858 · opencrvs/opencrvs-core

cibelius · 2026-02-23T08:43:10Z

Description

Resolves: #11378

CC PR: opencrvs/opencrvs-countryconfig#1285
Farajaland PR: opencrvs/opencrvs-farajaland#1982

Location and administrative area filtering in frontend inputs

Affects:

FieldType.ADDRESS
FieldType.LOCATION
FieldType.OFFICE
FieldType.FACILITY

Changes:

Add allowedLocations to field config options
Add filtering of available locations to LocationSearch.tsx
Add filtering of available administrative areas to AdministrativeArea.tsx
Switch LocationSearch.tsx to use <SearchableSelect/> instead of <LocationSearchComponent/>

User jurisdiction and scope reference functions

Add support for user reference functions:
- user.jurisdiction()
- user.scope(<scopeName>).attribute(<attributeName>)
Add helpers for getting attributes out of scopes and resolving jurisdiction filter references

Misc.

Rename isOfficeUnderJurisdiction() -> isLocationUnderJurisdiction()
Remove unused functions from packages/client/src/utils/locationUtils.ts()

Performance test with 100k locations:

Minor lag noticeable (1-2sec)

Screen.Recording.2026-03-03.at.9.19.41.mov

Checklist

I have linked the correct Github issue under "Development"
I have tested the changes locally, and written appropriate tests
I have tested beyond the happy path (e.g. edge cases, failure paths)
I have updated the changelog with this change (if applicable)
I have updated the GitHub issue status accordingly

github-actions · 2026-02-23T08:43:24Z

Oops! Looks like you forgot to update the changelog. When updating CHANGELOG.md, please consider the following:

Changelog is read by country implementors who might not always be familiar with all technical details of OpenCRVS. Keep language high-level, user friendly and avoid technical references to internals.
Answer "What's new?", "Why was the change made?" and "Why should I care?" for each change.
If it's a breaking change, include a migration guide answering "What do I need to do to upgrade?".

github-actions · 2026-02-23T08:43:25Z

ℹ️ Coverage metrics explained:
• Statements — Executed code statements (basic logic lines)
• Branches — Tested decision paths (if/else, switch, ternaries)
• Functions — Functions invoked during tests
• Lines — Source lines executed

github-actions · 2026-02-23T08:45:09Z

📊 commons test coverage

Statements: 67.42%
Branches:   33.81%
Functions:  50.58%
Lines:      66.89%
Updated at: Thu, 05 Mar 2026 09:38:55 GMT

github-actions · 2026-02-23T09:36:32Z

📊 events test coverage

Statements: 86.79%
Branches:   84.97%
Functions:  93.18%
Lines:      86.79%
Updated at: Thu, 05 Mar 2026 09:43:53 GMT

ocrvs-bot · 2026-02-25T14:43:36Z

Your environment is deployed to https://ocrvs-11378.e2e-k8s.opencrvs.dev

makelicious

looks good, I'll give it a spin. Assuming a single scope is an issue we need to fix, unless told otherwise.

This reverts commit fc62224.

# Conflicts: # packages/commons/src/scopes-v2.ts # packages/commons/src/scopes.test.ts

cibelius · 2026-03-05T08:03:09Z

+ * @param acceptedScopes - An array of acceptable scope types to filter by.
+ * @returns An array of parsed RecordScopeV2 objects that are found in the token and match the accepted scope types.
+ */
+export function getAcceptedScopesFromToken(


Put this here to avoid cyclical dependency on v2-scopes.ts and authentication.ts. It was causing issues.

makelicious

Looks good, thanks for your hard work!

cibelius · 2026-03-05T09:45:35Z

E2e pass: https://github.com/opencrvs/e2e/actions/runs/22708516958

cibelius added 6 commits February 19, 2026 13:27

small progress

726e267

minor refactoring

caa1d26

progress

0bd3801

rename isOfficeUnderJurisdiction -> isLocationUnderJurisdiction

537576a

fix filtering

40bd2fc

pass config down to AdministrativeArea component

4ef434a

cibelius added 2 commits February 23, 2026 11:29

fix type

4fd99e8

expand comment

4133802

cibelius added 14 commits February 23, 2026 11:40

fix type and import

a9aebd0

fix import

d0b7db4

simplify AllowedLocations type

16d2ffb

Merge branch 'develop' into ocrvs-11378

2783a39

refactor

e49dbdb

refactor and fix config

daef59e

rename variable

1094a57

fix lint issues

b046526

progress

467b798

switch component to use SearchableSelect, minor cleanup

0829638

Merge branch 'develop' into ocrvs-11378

a061019

fix tests

53000a8

remove unused code

3ee1e5e

add filter

0a02f2f

cibelius changed the title ~~Ocrvs 11378~~ Implement location filtering option for ADDRESS / FACILITY inputs Feb 25, 2026

cibelius added 2 commits February 25, 2026 15:57

progress with scope reference logic

b540f41

progress

0387aa5

cibelius added 2 commits March 3, 2026 14:17

add tests

96c51dd

Merge branch 'develop' into ocrvs-11378

438da28

makelicious reviewed Mar 3, 2026

View reviewed changes

Comment thread packages/commons/src/scopes.test.ts Outdated

makelicious reviewed Mar 3, 2026

View reviewed changes

Comment thread packages/commons/src/scopes-v2.ts

cibelius added 11 commits March 4, 2026 09:27

rename attribute -> scope in core

b895bec

use key

fc62224

Revert "use key"

699841b

This reverts commit fc62224.

Merge remote-tracking branch 'origin/develop' into ocrvs-11378

24754a7

# Conflicts: # packages/commons/src/scopes-v2.ts # packages/commons/src/scopes.test.ts

rename

3937b5d

add comment

b4b1b02

fix type issue

b72a5af

fix

a667059

fix

5d68716

fix tests

e31c5b3

fix address field

a0d604b

cibelius requested a review from makelicious March 4, 2026 15:04

cibelius added 7 commits March 4, 2026 17:17

fix lint issue

0b09774

fix snapshot

b8f6d08

fix tests

9148fcb

fix

7edbc13

revert change

a9dd914

revert change

bba793d

fix issue

8b735d0

cibelius commented Mar 5, 2026

View reviewed changes

makelicious approved these changes Mar 5, 2026

View reviewed changes

Comment thread packages/commons/src/users/userReferences.ts Outdated

use enum .options

52e8afb

cibelius merged commit 66b2dcb into develop Mar 5, 2026
59 checks passed

cibelius deleted the ocrvs-11378 branch March 5, 2026 09:45

Conversation

cibelius commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Location and administrative area filtering in frontend inputs

User jurisdiction and scope reference functions

Misc.

Performance test with 100k locations:

Checklist

Uh oh!

github-actions Bot commented Feb 23, 2026

Uh oh!

github-actions Bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📊 commons test coverage

Uh oh!

github-actions Bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📊 events test coverage

Uh oh!

ocrvs-bot commented Feb 25, 2026

Uh oh!

makelicious left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cibelius Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

makelicious left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cibelius commented Mar 5, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cibelius commented Feb 23, 2026 •

edited

Loading

github-actions Bot commented Feb 23, 2026 •

edited

Loading

github-actions Bot commented Feb 23, 2026 •

edited

Loading

github-actions Bot commented Feb 23, 2026 •

edited

Loading