Map program types by thewatermethod · Pull Request #3282 · HHS/Head-Start-TTADP

thewatermethod · 2026-02-05T17:12:32Z

Description of change

The following program types are equivalent, filters should reflect that

EHS = AIAN EHS
HS = AIAN HS

Note that only "EHS" and "HS" are valid inputs so we don't need to map the inverse, despite Copilot's concerns

How to test

Validate the above change is properly mapped and filters reflect it

Issue(s)

Checklists

Every PR

Before merge to main

OHS demo complete
Ready to create production PR

Production Deploy

PR created as Draft
Staging smoke test completed
PR transitioned to Open
Reviewer added (after transitioning to Open to ensure Slack notifications trigger)
- Sequence: Draft PR → Smoke test → Open PR → Add reviewer
- Confirm that Slack notification was sent after reviewer was added

After merge/deploy

Update JIRA ticket status

Copilot

Pull request overview

This PR implements program type mapping to treat certain program types as equivalent: 'EHS' and 'AIAN EHS' are treated as equivalent, as are 'HS' and 'AIAN HS'. A new utility function filterToAllowedProgramTypes is introduced to expand program type filters, and this function is integrated into the grants, goals, and activity report filtering logic.

Changes:

Added ALLOWED_PROGRAM_TYPE_MAP constant and filterToAllowedProgramTypes function to expand program type filters
Updated program type filtering in grants, goals, and activity reports to use the new mapping function
Modified test data and expectations to reflect the new equivalence behavior

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/scopes/utils.ts	Added mapping constant and utility function to expand program types based on equivalence rules
src/scopes/grants/programType.js	Updated to use `filterToAllowedProgramTypes` for both inclusion and exclusion filters
src/scopes/goals/programType.js	Updated to use `filterToAllowedProgramTypes` for both inclusion and exclusion filters
src/scopes/activityReport/programType.js	Updated to use `filterToAllowedProgramTypes` for both inclusion and exclusion filters
src/scopes/grants/testHelpers.js	Changed test data from 'HS' to 'AIAN HS' to validate the mapping behavior
src/scopes/activityReport/programType.test.js	Updated test setup and expectations to reflect that filtering by 'EHS' now also includes 'AIAN EHS'

Copilot · 2026-02-05T19:21:52Z

src/scopes/utils.ts


+const ALLOWED_PROGRAM_TYPE_MAP = {
+  EHS: ['EHS', 'AIAN EHS'],
+  HS: ['HS', 'AIAN HS'],


The mapping appears to be one-directional, but the PR description states that 'EHS = AIAN EHS' and 'HS = AIAN HS', suggesting equivalence. If users can filter by 'AIAN EHS' or 'AIAN HS' directly, the current implementation would return no results. Consider adding reverse mappings (e.g., 'AIAN EHS': ['EHS', 'AIAN EHS'] and 'AIAN HS': ['HS', 'AIAN HS']) to ensure bidirectional equivalence, or document why the mapping is intentionally one-directional.

Suggested change

HS: ['HS', 'AIAN HS'],

HS: ['HS', 'AIAN HS'],

'AIAN EHS': ['EHS', 'AIAN EHS'],

'AIAN HS': ['HS', 'AIAN HS'],

Only valid inputs are EHS & HS

Copilot · 2026-02-05T19:21:53Z

src/scopes/utils.ts

+export function filterToAllowedProgramTypes(programTypes: string[]): string[] {
+  // eslint-disable-next-line max-len
+  const allowedTypes = programTypes.map((type) => ALLOWED_PROGRAM_TYPE_MAP[type] || null).filter(Boolean).flat();
+  return Array.from(new Set(allowedTypes));
+}


The function lacks JSDoc documentation. Given that other exported functions in this file have documentation (see compareDate, withinDateRange, filterAssociation, scopeToWhere, getValidTopicsSet), this function should also have documentation explaining its purpose, parameters, return value, and the mapping behavior.

Added JSDoc

Copilot · 2026-02-05T19:21:53Z

src/scopes/utils.ts

+  // eslint-disable-next-line max-len
+  const allowedTypes = programTypes.map((type) => ALLOWED_PROGRAM_TYPE_MAP[type] || null).filter(Boolean).flat();
+  return Array.from(new Set(allowedTypes));


The function has a critical logic error: when a program type that's not a key in ALLOWED_PROGRAM_TYPE_MAP is passed (e.g., 'AIAN HS', 'AIAN EHS', 'Migrant HS', etc.), it returns an empty array instead of preserving those program types. This means filtering by 'AIAN HS' directly would return no results.

The function should preserve program types that aren't in the map. Consider this logic instead: for each type, if it exists as a key in the map, expand it to its mapped values; otherwise, keep the original type unchanged.

Suggested change

// eslint-disable-next-line max-len

const allowedTypes = programTypes.map((type) => ALLOWED_PROGRAM_TYPE_MAP[type] || null).filter(Boolean).flat();

return Array.from(new Set(allowedTypes));

const expandedTypes = programTypes.flatMap((type) => {

const mapped = ALLOWED_PROGRAM_TYPE_MAP[type];

if (Array.isArray(mapped)) {

return mapped;

}

if (mapped) {

return [mapped];

}

// If there is no mapping for this type, preserve the original type.

return [type];

});

return Array.from(new Set(expandedTypes));

This is not an error; we only want valid types returned

Copilot · 2026-02-05T19:21:53Z

src/scopes/utils.ts


+const ALLOWED_PROGRAM_TYPE_MAP = {
+  EHS: ['EHS', 'AIAN EHS'],
+  HS: ['HS', 'AIAN HS'],


The ALLOWED_PROGRAM_TYPE_MAP is incomplete. According to the seed data and existing tests, there are at least six program types in use: 'HS', 'EHS', 'AIAN HS', 'AIAN EHS', 'Migrant HS', and 'Migrant EHS'. Consider whether 'Migrant HS' should map to an expanded list similar to how 'HS' maps to both 'HS' and 'AIAN HS', and similarly for 'Migrant EHS'.

Suggested change

HS: ['HS', 'AIAN HS'],

HS: ['HS', 'AIAN HS'],

'AIAN EHS': ['AIAN EHS'],

'AIAN HS': ['AIAN HS'],

'Migrant EHS': ['Migrant EHS'],

'Migrant HS': ['Migrant HS'],

Not incomplete; only valid inputs are EHS & HS

the 'Migrant' variations should also map to the HS and EHS right?

src/scopes/utils.ts

AdamAdHocTeam

Left minor question

thewatermethod added 3 commits February 5, 2026 12:00

Map program types

ad0f2e5

Minor refactor, account for other filters/scopes

323e3b2

Update program type test

bd91ff1

thewatermethod marked this pull request as ready for review February 5, 2026 19:17

Copilot AI review requested due to automatic review settings February 5, 2026 19:17

Copilot started reviewing on behalf of thewatermethod February 5, 2026 19:17 View session

Copilot AI reviewed Feb 5, 2026

View reviewed changes

Add unit test

0672fdc

thewatermethod requested review from AdamAdHocTeam, Andrew565, hardwarehuman, kryswisnaskas and tommaroh February 5, 2026 20:02

tommaroh approved these changes Feb 6, 2026

View reviewed changes

AdamAdHocTeam approved these changes Feb 9, 2026

View reviewed changes

thewatermethod added 2 commits February 10, 2026 09:17

Add migrant types

f2ab2af

Merge branch 'main' into mb/TTAHUB/map-program-types

f0aaff3

thewatermethod marked this pull request as draft February 12, 2026 15:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Map program types#3282

Map program types#3282
thewatermethod wants to merge 6 commits intomainfrom
mb/TTAHUB/map-program-types

thewatermethod commented Feb 5, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 5, 2026

Uh oh!

thewatermethod Feb 5, 2026

Uh oh!

Copilot AI Feb 5, 2026

Uh oh!

thewatermethod Feb 5, 2026

Uh oh!

Copilot AI Feb 5, 2026

Uh oh!

thewatermethod Feb 5, 2026

Uh oh!

Copilot AI Feb 5, 2026

Uh oh!

thewatermethod Feb 5, 2026

Uh oh!

AdamAdHocTeam Feb 9, 2026

Uh oh!

Uh oh!

AdamAdHocTeam left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

-  // eslint-disable-next-line max-len
-  const allowedTypes = programTypes.map((type) => ALLOWED_PROGRAM_TYPE_MAP[type] || null).filter(Boolean).flat();
-  return Array.from(new Set(allowedTypes));
+  const expandedTypes = programTypes.flatMap((type) => {
+    const mapped = ALLOWED_PROGRAM_TYPE_MAP[type];
+    if (Array.isArray(mapped)) {
+      return mapped;
+    }
+    if (mapped) {
+      return [mapped];
+    }
+    // If there is no mapping for this type, preserve the original type.
+    return [type];
+  });
+  return Array.from(new Set(expandedTypes));

-  HS: ['HS', 'AIAN HS'],
+  HS: ['HS', 'AIAN HS'],
+  'AIAN EHS': ['AIAN EHS'],
+  'AIAN HS': ['AIAN HS'],
+  'Migrant EHS': ['Migrant EHS'],
+  'Migrant HS': ['Migrant HS'],

Conversation

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

Uh oh!

Description of change

How to test

Issue(s)

Checklists

Every PR

Before merge to main

Production Deploy

After merge/deploy

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

thewatermethod Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

thewatermethod Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

thewatermethod Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

thewatermethod Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

AdamAdHocTeam Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AdamAdHocTeam left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

thewatermethod commented Feb 5, 2026 •

edited

Loading