Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
87f21d7
feat: wip - advanced filter setup
mcmcgrath13 May 4, 2026
cda3f62
Merge branch 'main' of https://github.com/CDCgov/NEDSS-Modernization …
mcmcgrath13 May 4, 2026
bdc35d3
style: formatting
mcmcgrath13 May 4, 2026
4ae1afb
feat: wip - validation
mcmcgrath13 May 4, 2026
4bc62e9
fix: validation and icon labels
mcmcgrath13 May 5, 2026
abac9bd
feat: add drag and drop
mcmcgrath13 May 5, 2026
d952a7c
fix: current state context, tests, card overflow
mcmcgrath13 May 5, 2026
b5bd229
fix: testing, make report column match ui requiredness
mcmcgrath13 May 5, 2026
6283649
fix: validation, add tests
mcmcgrath13 May 6, 2026
df60a4d
fix: cleanup
mcmcgrath13 May 6, 2026
384f915
Merge branch 'main' into mcm/adv-filt-ui
mcmcgrath13 May 6, 2026
36c362e
test: fixing
mcmcgrath13 May 6, 2026
a267793
Merge branch 'mcm/adv-filt-ui' of https://github.com/CDCgov/NEDSS-Mod…
mcmcgrath13 May 6, 2026
7a5af1d
fix: linting
mcmcgrath13 May 6, 2026
b5d82b7
feat: add keyboard nav to advanced filter drag and drop
mcmcgrath13 May 7, 2026
52143de
fix: pr feedback, test coverage
mcmcgrath13 May 7, 2026
51db907
Merge branch 'main' of https://github.com/CDCgov/NEDSS-Modernization …
mcmcgrath13 May 7, 2026
e9f5bea
Merge branch 'mcm/adv-filt-ui' into mcm/adv-filt-dnd-key
mcmcgrath13 May 7, 2026
0eaa025
fix: prevent default browser key handling
mcmcgrath13 May 11, 2026
7949224
fix: keyboard dnd flow, rearranging
mcmcgrath13 May 11, 2026
6cd980e
fix: get alert working (most of the time?)
mcmcgrath13 May 11, 2026
adaa11b
fix: tests, cleanup
mcmcgrath13 May 11, 2026
9e087dc
fix: linting
mcmcgrath13 May 11, 2026
d449fb3
fix: reset rogue change
mcmcgrath13 May 11, 2026
dcb1569
fix: design feedback
mcmcgrath13 May 12, 2026
471c9d7
Merge branch 'main' of https://github.com/CDCgov/NEDSS-Modernization …
mcmcgrath13 May 13, 2026
09c04ea
fix: imports
mcmcgrath13 May 13, 2026
80746ba
fix: more merge cruft
mcmcgrath13 May 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 30 additions & 52 deletions apps/modernization-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/modernization-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"dependencies": {
"@apollo/client": "^3.11.8",
"@dnd-kit/core": "^6.3.1",
"@atlaskit/pragmatic-drag-and-drop": "^1.8.1",
"@hello-pangea/dnd": "^18.0.1",
"@react-querybuilder/dnd": "^8.16.0",
"@trussworks/react-uswds": "^11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { Button } from 'design-system/button';
import { permissions, Permitted } from 'libs/permission';
import { ReportRunLayout } from './layout/ReportRunLayout';
import { ReportConfiguration } from 'generated';
import { BasicFilter } from './filters/BasicFilter';
import { BasicFilter } from './filters/basic/BasicFilter';
import { Card } from 'design-system/card';
import { STATE_FILTER_CODE } from './filters/OptionSelectFilter';
import { CurrentStateProvider } from './filters/useCurrentState';
import { AdvancedFilter } from './filters/AdvancedFilter';
import { STATE_FILTER_CODE } from './filters/basic/OptionSelectFilter';
import { CurrentStateProvider } from './filters/basic/useCurrentState';
import { AdvancedFilter } from './filters/advanced/AdvancedFilter';

const ReportConfigurationPage = ({
config,
Expand Down
Loading
Loading