Skip to content

Commit

Permalink
[Issue #3237] Remove bad Agencies from manual list (#3238)
Browse files Browse the repository at this point in the history
## Summary
Fixes #3237

### Time to review: __2 mins__

## Changes proposed
Remove some Agencies that shouldn't appear in the Search UI anyway.
  • Loading branch information
mdragon authored Dec 18, 2024
1 parent 9c35972 commit ea4d8b7
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 73 deletions.
4 changes: 2 additions & 2 deletions api/openapi.generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ paths:
agency:
one_of:
- USAID
- ARPAH
- DOC
applicant_type:
one_of:
- state_governments
Expand Down Expand Up @@ -1659,7 +1659,7 @@ components:
description: The counts of agency values in the full response
example:
USAID: 4
ARPAH: 3
DOC: 3
additionalProperties:
type: integer
OpportunitySearchResponseV1:
Expand Down
2 changes: 1 addition & 1 deletion api/src/api/opportunities_v1/opportunity_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"value": {
"query": "research",
"filters": {
"agency": {"one_of": ["USAID", "ARPAH"]},
"agency": {"one_of": ["USAID", "DOC"]},
"applicant_type": {
"one_of": ["state_governments", "county_governments", "individuals"]
},
Expand Down
2 changes: 1 addition & 1 deletion api/src/api/opportunities_v1/opportunity_schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ class OpportunityFacetV1Schema(Schema):
values=fields.Integer(),
metadata={
"description": "The counts of agency values in the full response",
"example": {"USAID": 4, "ARPAH": 3},
"example": {"USAID": 4, "DOC": 3},
},
)

Expand Down
5 changes: 0 additions & 5 deletions api/tests/lib/seed_agencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@
# Agencies we want to create locally - note that these are a subset of popular
# agencies from production
AGENCIES_TO_CREATE = [
{
"agency_id": 2,
"agency_code": "ARPAH",
"agency_name": "Advanced Research Projects Agency for Health",
},
{"agency_id": 3, "agency_code": "DOC", "agency_name": "Department of Commerce"},
{"agency_id": 53, "agency_code": "DOD", "agency_name": "Department of Defense"},
{"agency_id": 140, "agency_code": "DOE", "agency_name": "Department of Energy"},
Expand Down
1 change: 0 additions & 1 deletion api/tests/src/db/models/factories.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ class CustomProvider(BaseProvider):
"USAID",
"USAID-SAF",
"USAID-ETH",
"ARPAH",
"DOC",
"DOC-EDA",
"DOC-NIST",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,6 @@ export const categoryOptions: FilterOption[] = [
];

export const agencyOptions: FilterOption[] = [
{
id: "CNCS",
label: "Corporation for National and Community Service",
value: "CNCS",
},
{
id: "DHS",
label: "Department of Homeland Security",
Expand Down Expand Up @@ -313,11 +308,6 @@ export const agencyOptions: FilterOption[] = [
label: "AmeriCorps",
value: "AC",
},
{
id: "ARPAH",
label: "Advanced Research Projects Agency for Health",
value: "ARPAH",
},
{
id: "DOC",
label: "Department of Commerce",
Expand Down Expand Up @@ -2177,48 +2167,16 @@ export const agencyOptions: FilterOption[] = [
label: "Department of Education",
value: "ED",
},
{
id: "ECP",
label: "Energy Cluster Program",
value: "ECP",
},
{
id: "EPA",
label: "Environmental Protection Agency",
value: "EPA",
},
{
id: "FMCS",
label: "Federal Mediation and Conciliation Service",
value: "FMCS",
},
{
id: "FCC",
label: "Federal Communications Commission",
value: "FCC",
},
{
id: "GDIT",
label: "General Dynamics Information Technology",
value: "GDIT",
children: [
{
id: "GDIT-02072010",
label: "KVkv",
value: "GDIT-02072010",
},
{
id: "GDIT-08",
label: "08092011-kj-test",
value: "GDIT-08",
},
{
id: "GDIT-KV03262009",
label: "03162009-KV",
value: "GDIT-KV03262009",
},
],
},
{
id: "GSA",
label: "General Services Administration",
Expand Down Expand Up @@ -2526,21 +2484,11 @@ export const agencyOptions: FilterOption[] = [
label: "Institute of Museum and Library Services",
value: "IMLS",
},
{
id: "IVV",
label: "IV&V Test Agency",
value: "IVV",
},
{
id: "IAF",
label: "Inter-American Foundation",
value: "IAF",
},
{
id: "MCC",
label: "Millennium Challenge Corporation",
value: "MCC",
},
{
id: "LOC",
label: "Library of Congress",
Expand Down Expand Up @@ -3714,14 +3662,4 @@ export const agencyOptions: FilterOption[] = [
},
],
},
{
id: "USEAC",
label: "Election Assistance Commission",
value: "USEAC",
},
{
id: "WWC",
label: "Woodrow Wilson Center",
value: "WWC",
},
];
2 changes: 1 addition & 1 deletion frontend/tests/e2e/search/search.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ test.describe("Search page tests", () => {
"eligibility-county_governments": "county_governments",
};
const agencyCheckboxes = {
ARPAH: "ARPAH",
EPA: "EPA",
AC: "AC",
};
const categoryCheckboxes = {
Expand Down

0 comments on commit ea4d8b7

Please sign in to comment.