Skip to content
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

423 add issues table component to issues details page part 2 #510

Closed
wants to merge 131 commits into from
Closed

423 add issues table component to issues details page part 2 #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
a9b2d3f
Merge branch '483-update-tests-to-use-mock-data-generated-from-valibo…
GeorgeGoodall Sep 30, 2024
fcfe924
Merge commit '006a39b47047f9e54d4287536164eab2d1c507ec' into 423-add-…
GeorgeGoodall Oct 1, 2024
a8609e4
setup routing and empty middleware chain for table
GeorgeGoodall Oct 1, 2024
c1523e3
Merge commit '43d573bda3137c8f6f203aa76513c8efede01bcd' into 423-add-…
GeorgeGoodall Oct 1, 2024
abb2c8f
get basic page rendering with table populated with mock data
GeorgeGoodall Oct 1, 2024
a10be1b
Merge commit '4f9b1a337cd206c5c352e3dceae67ee8b68c9010' into 423-add-…
GeorgeGoodall Oct 2, 2024
0491234
now get basic table
GeorgeGoodall Oct 2, 2024
1be5202
make table wider
GeorgeGoodall Oct 2, 2024
03929f0
fix bug in fetchEntityCount
GeorgeGoodall Oct 2, 2024
9029aea
have the table generate the correct heading
GeorgeGoodall Oct 2, 2024
f41e52e
standardise pagination link types to number instead of item
GeorgeGoodall Oct 2, 2024
04339f7
enable table to accept html for cell values
GeorgeGoodall Oct 2, 2024
0e54fc1
enable schema to accept html for cell values
GeorgeGoodall Oct 2, 2024
de4933f
have issue table reference values be links to entity issue details
GeorgeGoodall Oct 2, 2024
3e4a10f
Merge commit '42db60f81608e66c07e359816644ae74278f5a65' into 423-add-…
GeorgeGoodall Oct 2, 2024
99409da
move test over
GeorgeGoodall Oct 2, 2024
709b19e
add some new tests for issueTablePage (needs more work)
GeorgeGoodall Oct 2, 2024
bb2a16e
change issue entity view path
GeorgeGoodall Oct 3, 2024
a8d0079
make pageNumber param optional
GeorgeGoodall Oct 3, 2024
0a27f67
add validateIssueTableQueryParams middleware
GeorgeGoodall Oct 3, 2024
f91f2a7
Merge commit '5ffed4e4fde139cb26347a85060ed6d5427b315f' into 423-add-…
GeorgeGoodall Oct 3, 2024
2880a9d
Merge commit '4fea210d28a71fee5f81d4fc16b17f3c6cbb7406' into 423-add-…
GeorgeGoodall Oct 4, 2024
924610a
add pagination to table view
GeorgeGoodall Oct 7, 2024
802aa41
fix pagination and issues by entity for issue details
GeorgeGoodall Oct 7, 2024
68ec323
make sure to filter by issue type and field for issue table view
GeorgeGoodall Oct 7, 2024
558da86
fix issue details page tests
GeorgeGoodall Oct 7, 2024
7a315c6
fix issue table view test nunjucks import
GeorgeGoodall Oct 7, 2024
0c3413e
Merge commit '51bed8493265e6a7e9a5002304d9bee94b47eb30' into 423-add-…
GeorgeGoodall Oct 7, 2024
5c76397
updated table component tests to test for html values
GeorgeGoodall Oct 7, 2024
3f824df
move shared tests to folder
GeorgeGoodall Oct 7, 2024
0685477
add tableTests shared test file, and also improved mocking around tab…
GeorgeGoodall Oct 7, 2024
a919818
Merge commit 'a462584ed39059db5a5773406be63d73ac30e2cb' into 423-add-…
GeorgeGoodall Oct 8, 2024
23aefbd
Merge commit '2fbc67987dcf82ce41eea60732ee3ef9a248babb' into 423-add-…
GeorgeGoodall Oct 8, 2024
9363873
add tests for issueTable.middleware
GeorgeGoodall Oct 8, 2024
7b34d13
Merge commit 'd619671dcf311fa2687efabda6efde2f73ec8bd3' into 423-add-…
GeorgeGoodall Oct 9, 2024
330ab00
test cleanup
GeorgeGoodall Oct 9, 2024
d9997a3
update resource in params to resource not in params
GeorgeGoodall Oct 9, 2024
330cc74
add tests for common middleware
GeorgeGoodall Oct 9, 2024
2fa1c4e
remove json5 import and use
GeorgeGoodall Oct 9, 2024
c068ae8
change default value to destructuring
GeorgeGoodall Oct 9, 2024
fb6f607
change issue details to query on pageNumber again and improve error h…
GeorgeGoodall Oct 9, 2024
102854d
fix tests
GeorgeGoodall Oct 9, 2024
d327ce9
Merge commit '12c62de2b77e00433261b59045f0eb7cb67da363' into 423-add-…
GeorgeGoodall Oct 9, 2024
32d3dd9
Merge commit 'dc1a8ca71885c752005896e49fddaa02260523fe' into 423-add-…
GeorgeGoodall Oct 10, 2024
c30f15f
addressing git comments
GeorgeGoodall Oct 10, 2024
791df3f
Merge commit '2425ec70dee428d08c2d26e302d38781fe80cf55' into 423-add-…
GeorgeGoodall Oct 11, 2024
f5c254f
query overhall after entity vs entry talk
GeorgeGoodall Oct 11, 2024
22e5cf4
Merge commit '7412c952c99f3a9926f5be211a8fa884aee6cd2b' into 423-add-…
GeorgeGoodall Oct 11, 2024
82044cb
fix test
GeorgeGoodall Oct 11, 2024
1efefb4
pagination options and refactor
GeorgeGoodall Oct 11, 2024
faf449d
calculate entities with issues instead of entries with issues
GeorgeGoodall Oct 11, 2024
b1c8240
now get data by getting all resources and working from there
GeorgeGoodall Oct 14, 2024
310e903
have issue details show rows based on spec, and error summary based o…
GeorgeGoodall Oct 14, 2024
8c7f2b9
make summary before pagination
GeorgeGoodall Oct 14, 2024
4a79ca8
change issue details to get data based on entity but also add in issu…
GeorgeGoodall Oct 14, 2024
041a4d4
have numbers on the dataset task list taken from all resources
GeorgeGoodall Oct 14, 2024
bbf92ae
datasetTaskList: look at all resources
GeorgeGoodall Oct 14, 2024
99c7dfa
remove unused functions from common.middleware
GeorgeGoodall Oct 14, 2024
ccb6ca8
add tests for common.middleware
GeorgeGoodall Oct 15, 2024
c25ee0b
fix pagination tests
GeorgeGoodall Oct 15, 2024
745e6fd
move createPaginationTemplateParamsMiddleware to common
GeorgeGoodall Oct 15, 2024
d8c1de6
move tests for paginationTemplateParams
GeorgeGoodall Oct 15, 2024
c47c95c
added new tests to issueDetails.middleware
GeorgeGoodall Oct 15, 2024
e8a9ab7
Merge commit '611cc56623c7b3f0cbea7b0c28780a95ccd6c19e' into 423-add-…
GeorgeGoodall Oct 15, 2024
15ff1a3
make sure to pass in array of resourceids
GeorgeGoodall Oct 15, 2024
3defdeb
fix dataset details page
GeorgeGoodall Oct 15, 2024
a868cab
make sure links are correct from table view
GeorgeGoodall Oct 15, 2024
36f5b76
fix geometries issue
GeorgeGoodall Oct 15, 2024
189a0df
have the table view sticky
GeorgeGoodall Oct 15, 2024
31842bd
fixed tests
GeorgeGoodall Oct 15, 2024
92b2ff1
add back button to issue details
GeorgeGoodall Oct 15, 2024
a04385e
Merge commit 'dbd776cb6537510caf7353761879e23d05a6eaf0' into 423-add-…
GeorgeGoodall Oct 15, 2024
15a2880
Merge commit '96395fa4702a7bea7a90986e451e28481b3a053c' into 423-add-…
GeorgeGoodall Oct 15, 2024
3dc46a7
pagination change
GeorgeGoodall Oct 15, 2024
fe6c627
use dataset-field where possible
GeorgeGoodall Oct 16, 2024
e23a767
add special cases for brownfield land
GeorgeGoodall Oct 17, 2024
0434788
pull out dataset_field in issues middleware to own middleware
GeorgeGoodall Oct 17, 2024
1be8653
catch no field mapping found
GeorgeGoodall Oct 17, 2024
565dc14
pass through entity value for issue if no issue value is present
GeorgeGoodall Oct 17, 2024
965b771
set default value to empty if none is provided
GeorgeGoodall Oct 17, 2024
4222fed
add some more tests
GeorgeGoodall Oct 17, 2024
0c0fc1a
improved page number valibot validation
GeorgeGoodall Oct 17, 2024
356de1f
change database-field to databaseField
GeorgeGoodall Oct 17, 2024
8d1d2c3
Merge commit '4ea328f866c4ea9fa398ceea359724c737ae6868' into 423-add-…
GeorgeGoodall Oct 17, 2024
8e9f85a
remove commented method
GeorgeGoodall Oct 17, 2024
fe7f7eb
remove unneeded test
GeorgeGoodall Oct 17, 2024
8424fad
fix test
GeorgeGoodall Oct 17, 2024
5453c8c
exclude built javascript code from coverage
GeorgeGoodall Oct 17, 2024
f2729b0
get entitiesWithIssueCount from all active resources and not just the…
GeorgeGoodall Oct 17, 2024
7401876
check for null end_dates too
GeorgeGoodall Oct 17, 2024
6f0776f
account for one to many field -> dataset field mappings
GeorgeGoodall Oct 17, 2024
cd6c29c
populate with regular fields if dataset field isn't present
GeorgeGoodall Oct 17, 2024
3ea9e1e
check resource end date too
GeorgeGoodall Oct 18, 2024
a9f96c5
make sure to get entity count early on so it can be used in the error…
GeorgeGoodall Oct 18, 2024
60acdd8
make sure to look at total issues and not pagination entities when cr…
GeorgeGoodall Oct 18, 2024
38b198a
Merge commit '7f4c5918dc45eae62cff11d124a51e96e666db19' into 423-add-…
GeorgeGoodall Oct 18, 2024
24edfae
make sure that we only show each field once
GeorgeGoodall Oct 18, 2024
8644d54
nested loop refactor
GeorgeGoodall Oct 21, 2024
1689468
improve and standardise test seed generation
GeorgeGoodall Oct 21, 2024
0c74150
make sure map on table page is showing
GeorgeGoodall Oct 21, 2024
9c997c8
make sure map is shown on issue table page
GeorgeGoodall Oct 21, 2024
a3e4b03
add default value for issuesWithCounts
GeorgeGoodall Oct 21, 2024
b3f2ce9
avoid false negatives on 0 or ''
GeorgeGoodall Oct 21, 2024
bbfd06b
encode url params
GeorgeGoodall Oct 21, 2024
9f8032f
Avoid mutating entity object in prepareIssueDetailsTemplateParams mid…
GeorgeGoodall Oct 21, 2024
c5b37db
fix tests
GeorgeGoodall Oct 21, 2024
24efac9
throw error if there's no entities
GeorgeGoodall Oct 21, 2024
9466042
spy on logger instead of reassign
GeorgeGoodall Oct 21, 2024
f3efe80
encode url
GeorgeGoodall Oct 21, 2024
14a6348
added test for multipage issue table
GeorgeGoodall Oct 21, 2024
82471cd
make sure mockTableParams isn't used before its defined
GeorgeGoodall Oct 21, 2024
d64873a
coderabbit suggestions on mocker.je
GeorgeGoodall Oct 21, 2024
9ffb0b9
escape html
GeorgeGoodall Oct 21, 2024
7a92376
add test for empty error message
GeorgeGoodall Oct 21, 2024
309750b
dont use delete for better performance
GeorgeGoodall Oct 21, 2024
c690786
ensure entity field exists
GeorgeGoodall Oct 21, 2024
aac6641
make sure getIssueField returns some default values
GeorgeGoodall Oct 21, 2024
0f440ea
add more tests for prepareIssueDetailsTempalteParams
GeorgeGoodall Oct 21, 2024
5aa5d72
add error handling to specification json parsing
GeorgeGoodall Oct 21, 2024
5153357
update jsdoc
GeorgeGoodall Oct 21, 2024
1f34a01
improve error handling around entities with invalid json
GeorgeGoodall Oct 21, 2024
f064a8b
improved error handling and testing around nest entity fields
GeorgeGoodall Oct 21, 2024
4bb49cc
improve error handling and testing around getPaginationOptions
GeorgeGoodall Oct 21, 2024
5114bbe
encode uri components
GeorgeGoodall Oct 21, 2024
1acd964
remove redundant line
GeorgeGoodall Oct 21, 2024
e3a27ea
use json.parse as ... is only a shallow copy
GeorgeGoodall Oct 21, 2024
d5b7a66
rename escape to escapeHtml
GeorgeGoodall Oct 21, 2024
9424b42
make copy of entity
GeorgeGoodall Oct 21, 2024
48f5630
make sure to delete key
GeorgeGoodall Oct 21, 2024
781d35f
Merge commit '124c853fbf2f79c92c373bc1fa046bbfc807ba7b' into 423-add-…
GeorgeGoodall Oct 29, 2024
39b32bd
Merge commit 'c8fc6cd1556df293f93983c653a70a585af385e1' into 423-add-…
GeorgeGoodall Oct 30, 2024
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
132 changes: 56 additions & 76 deletions package-lock.json
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@playwright/test": "^1.39.0",
"@testcontainers/localstack": "^10.7.2",
"@types/node": "^20.8.9",
"@vitest/coverage-v8": "^2.1.2",
"@vitest/coverage-v8": "^2.1.3",
"@wiremock/wiremock-testcontainers-node": "^0.0.1",
"concurrently": "^8.2.2",
"husky": "^9.0.11",
Expand Down Expand Up @@ -73,6 +73,7 @@
"cookie-parser": "^1.4.6",
"csv-parser": "^3.0.0",
"dotenv": "^16.4.5",
"escape-html": "^1.0.3",
"express": "^4.19.2",
"express-session": "^1.18.0",
"govuk-frontend": "^5.7.1",
Expand Down
Loading