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.

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

feat: support filtering for warnings only on the review page #3125

Merged
merged 79 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 63 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
eabde75
Add a little comment
fhennig Oct 28, 2024
bd0d824
initial refactoring of the view
fhennig Oct 30, 2024
a1250a8
Fixed all tests
fhennig Oct 30, 2024
7e9ea3a
linting
fhennig Oct 30, 2024
25a5abc
fix deprecation
fhennig Oct 30, 2024
eec5a20
fix imports
fhennig Oct 30, 2024
a1b6fb3
progress
fhennig Oct 30, 2024
e2f2898
rework filter
fhennig Oct 31, 2024
5593812
rework warnings and errors filters
fhennig Oct 31, 2024
d2000c0
test fixes
fhennig Oct 31, 2024
94f84ea
Add TODO
fhennig Oct 31, 2024
af26b43
format
fhennig Oct 31, 2024
2f7aa3f
Merge remote-tracking branch 'origin/main' into feat/3031-improve-rev…
fhennig Oct 31, 2024
2544de8
fix CI
fhennig Oct 31, 2024
7d9e04a
fix format
fhennig Oct 31, 2024
4e8e77b
remove dead code
fhennig Oct 31, 2024
9850019
default null values
fhennig Oct 31, 2024
589189a
Improve documentation
fhennig Oct 31, 2024
7608bb1
Update API docs
fhennig Oct 31, 2024
7603cc7
improve error message
fhennig Oct 31, 2024
d5d8e40
remove todo
fhennig Oct 31, 2024
02415e0
format
fhennig Oct 31, 2024
049b44f
remove log files
fhennig Oct 31, 2024
54c8e27
rename perfect -> no_issues
fhennig Oct 31, 2024
18fcbb2
Merge branch 'main' into feat/3031-improve-review-page
fhennig Oct 31, 2024
1269166
some test improvements
fhennig Oct 31, 2024
01a6a5d
remove outdated TODO
fhennig Nov 4, 2024
2a22284
Change wording
fhennig Nov 4, 2024
6f7c757
rename isError and isWarning
fhennig Nov 4, 2024
59f7328
improve processing result condition handling
fhennig Nov 4, 2024
a7f2068
address review
fhennig Nov 4, 2024
ab7c192
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 4, 2024
9a495d7
fix frontend
fhennig Nov 4, 2024
019176b
more fix stuff
fhennig Nov 4, 2024
302913a
Merge remote-tracking branch 'origin/main' into feat/3030-improve-rev…
fhennig Nov 4, 2024
00d2d07
more fix stuff
fhennig Nov 4, 2024
9cb6cb8
Update schema documentation based on migration changes
actions-user Nov 4, 2024
f2dd78a
more fix stuff
fhennig Nov 4, 2024
942774a
refactor query
fhennig Nov 5, 2024
1c3a9f7
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 5, 2024
25bae87
Update docs
fhennig Nov 5, 2024
4634988
Update docs
fhennig Nov 5, 2024
ead805c
Show configuration dialog on any sequence action
fhennig Nov 5, 2024
37a338c
Improve confirm dialog
fhennig Nov 5, 2024
49c98f5
test fix
fhennig Nov 5, 2024
00cc739
fix e2e tests
fhennig Nov 5, 2024
b2a7324
Add DB field for processing result
fhennig Nov 6, 2024
fbd5320
cleanup
fhennig Nov 6, 2024
241764e
Update schema documentation based on migration changes
actions-user Nov 6, 2024
f59b6d0
bump
fhennig Nov 6, 2024
6fface7
un-bump
fhennig Nov 6, 2024
690f9ed
frontend all fixed?
fhennig Nov 6, 2024
eed85ff
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 6, 2024
cb2296a
Update backend/src/main/resources/db/migration/V1.5__update_sequence_…
fhennig Nov 7, 2024
b7bc02c
cleanup formatting
fhennig Nov 7, 2024
487651e
simplify
fhennig Nov 7, 2024
6477e6d
remove TODO
fhennig Nov 7, 2024
63a6b6c
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 7, 2024
c205464
Update diagrams
fhennig Nov 7, 2024
9d62c28
Add enum migration sql step
fhennig Nov 11, 2024
d2600cd
fix migration script
fhennig Nov 11, 2024
bae6bde
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 11, 2024
5725b0b
change filter design
fhennig Nov 11, 2024
f213a23
Adress review
fhennig Nov 12, 2024
c24aaee
Update backend/docs/runtime_view.md
fhennig Nov 12, 2024
5d2fa05
Update backend/src/main/kotlin/org/loculus/backend/service/submission…
fhennig Nov 12, 2024
a72c158
remove 'WithStatus' from function name
fhennig Nov 12, 2024
e8e9177
change postProcess to postprocess
fhennig Nov 12, 2024
781edae
Add logging info back in
fhennig Nov 12, 2024
843905e
rename APPROVED_FOR_RELEASE to RELEASED
fhennig Nov 12, 2024
feb8f09
improve status change diagram
fhennig Nov 12, 2024
d5db67c
Add test for 'cannot approve sequences with errors
fhennig Nov 12, 2024
30238c2
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 12, 2024
be8d7a3
Merge branch 'main' into feat/3031-improve-review-page
fhennig Nov 12, 2024
cddfe83
fix pagination total count
fhennig Nov 12, 2024
c5a2204
Fix tooltip layering
fhennig Nov 12, 2024
979b7c0
Fix pagination issue with narrowed down filters
fhennig Nov 12, 2024
4cde248
format
fhennig Nov 12, 2024
ac6aa79
fix group dropdown z-index
fhennig Nov 12, 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
13 changes: 9 additions & 4 deletions backend/docs/db/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,17 @@ CREATE VIEW public.sequence_entries_view AS
sepd.warnings,
CASE
WHEN (se.released_at IS NOT NULL) THEN 'APPROVED_FOR_RELEASE'::text
WHEN se.is_revocation THEN 'AWAITING_APPROVAL'::text
WHEN se.is_revocation THEN 'PROCESSED'::text
WHEN (sepd.processing_status = 'IN_PROCESSING'::text) THEN 'IN_PROCESSING'::text
WHEN (sepd.processing_status = 'HAS_ERRORS'::text) THEN 'HAS_ERRORS'::text
WHEN (sepd.processing_status = 'FINISHED'::text) THEN 'AWAITING_APPROVAL'::text
WHEN (sepd.processing_status = 'PROCESSED'::text) THEN 'PROCESSED'::text
ELSE 'RECEIVED'::text
END AS status
END AS status,
CASE
WHEN (sepd.processing_status = 'IN_PROCESSING'::text) THEN NULL::text
WHEN ((sepd.errors IS NOT NULL) AND (jsonb_array_length(sepd.errors) > 0)) THEN 'HAS_ERRORS'::text
WHEN ((sepd.warnings IS NOT NULL) AND (jsonb_array_length(sepd.warnings) > 0)) THEN 'HAS_WARNINGS'::text
ELSE 'NO_ISSUES'::text
END AS processing_result
FROM ((public.sequence_entries se
LEFT JOIN public.sequence_entries_preprocessed_data sepd ON (((se.accession = sepd.accession) AND (se.version = sepd.version) AND (sepd.pipeline_version = ( SELECT current_processing_pipeline.version
FROM public.current_processing_pipeline)))))
Expand Down
16 changes: 6 additions & 10 deletions backend/docs/plantuml/sequenceInitialSubmission.puml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

processing -> backend: Query initial/edited sequence data
backend -> DB: Query initial/edited sequence data
backend -> DB: Set status from 'RECEIVED'/'HAS_ERRORS' to 'IN_PROCESSING'
backend -> DB: Set status from 'RECEIVED' to 'IN_PROCESSING'
DB --> backend: initial/edited sequence data
backend --> processing: initial/edited sequence data

Expand All @@ -34,14 +34,10 @@
end note
end loop

alt processed sequence data contain processing errors
backend -> DB: Store processed sequence data with errors
backend -> DB: set status to 'HAS_ERRORS'
else
backend -> DB: Store processed sequence data without errors
backend -> DB: set status to 'AWAITING_APPROVAL'
end
frontend -> backend: query processed sequence data with errors
backend -> DB: Store processed sequence data
backend -> DB: set status to 'PROCESSED'

frontend -> backend: query processed sequence data with errors
frontend -> frontend: address errors and edit sequence data

frontend -> backend: submit edited sequence data
Expand All @@ -56,7 +52,7 @@
backend -> frontend: processed sequence data

frontend -> backend: approve processed sequence data
backend -> DB: set status from 'AWAITING_APPROVAL' to 'APPROVED_FOR_RELEASE'
backend -> DB: set status from 'PROCESSED' to 'APPROVED_FOR_RELEASE'

@enduml

2 changes: 1 addition & 1 deletion backend/docs/plantuml/sequenceInitialSubmission.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions backend/docs/plantuml/sequenceRevocation.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
frontend -> backend: wants to revoke already processed sequence

alt accession exists and highest version is 'APPROVED_FOR_RELEASE'
backend -> DB: insert new version\nwith status 'AWAITING_APPROVAL' \nand ' is_revocation = true'
backend -> DB: insert new version\nwith status 'PROCESSED' \nand ' is_revocation = true'
backend -> frontend: response with accession + new version number
else
backend -> frontend: response with error message
Expand All @@ -17,6 +17,6 @@
backend -> DB: set status to 'APPROVED_FOR_RELEASE'
else
frontend -> backend: cancels revocation
backend -> DB: delete latest version \nof the sequence and Status \n'AWAITING_APPROVAL'
backend -> DB: delete latest version \nof the sequence and Status \n'PROCESSED'
end
@enduml
2 changes: 1 addition & 1 deletion backend/docs/plantuml/sequenceRevocation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 5 additions & 10 deletions backend/docs/plantuml/statusChange.puml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
' status states
state RECEIVED
state IN_PROCESSING
state HAS_ERRORS
state PROCESSED
state RECEIVED
state APPROVED_FOR_RELEASE
state AWAITING_APPROVAL

' actions
state CREATING_SUBMIT as "entry with new accession\n will be created" #lightgreen;line:green;line.dotted
state CREATING_REVISE as "entry with existing accession\n and incremented version number\n will be created" #lightgreen;line:green;line.dotted
state CREATING_REVOKE as "entry with existing accession,\n incremented version number, \n and is_revocation=true will be created" #lightgreen;line:green;line.dotted
state DELETION as "entry will be deleted" #IndianRed;line:red;line.dotted
state is_error <<choice>>
state is_approved <<choice>>

' transitions
Expand All @@ -38,15 +36,12 @@
CREATING_REVISE --> RECEIVED

REVOKED_DATA --> CREATING_REVOKE : user initiates revocation
CREATING_REVOKE --> AWAITING_APPROVAL
CREATING_REVOKE --> PROCESSED

RECEIVED --> IN_PROCESSING : preprocessing starts
IN_PROCESSING --> is_error
is_error --> HAS_ERRORS : data contain error(s)
HAS_ERRORS --> RECEIVED : user edits data
AWAITING_APPROVAL --> RECEIVED : user edits data
is_error --> AWAITING_APPROVAL : preprocessing successful
AWAITING_APPROVAL --> is_approved
IN_PROCESSING --> PROCESSED : preprocessing done, might contain errors that need editing.
PROCESSED --> RECEIVED : user edits data
PROCESSED --> is_approved
is_approved --> APPROVED_FOR_RELEASE : user approves \nor automatic approval\n via 'release_directly'
is_approved --> DELETION : user rejects

Expand Down
Loading
Loading