Sample details refactor/ metadata and details fixes #1227
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…to the metadata template field not being saved before adding an entry. Fixed edit metadata bug which was caused by a null metadata restriction for a project. Updated create new project and share samples views to pass the project id to the sample detail viewer
…e hyperlink to a button which launches the sample detail viewer from the linelist page. Fixed issue with paragraph editable display in sample detail viewer by adding padding to fields
…etails_refactor/_metadata_and_details_fixes
…etails_refactor/_metadata_and_details_fixes
… clicking on link to sample
…etails_refactor/_metadata_and_details_fixes
…etails_refactor/_metadata_and_details_fixes
… and linelist UI tests to fail.
…ed test for getting analysis outputfile info for user
…metadata_and_details_fixes
deepsidhu85
changed the title
joshsadam
requested changes
Apr 5, 2022
| @@ -170,13 +170,13 @@ public AnalysisSubmissionRepositoryImpl(DataSource dataSource, | |||
| + " INNER JOIN analysis_submission_sequencing_object o ON asub.id = o.analysis_submission_id\n" | |||
| + " INNER JOIN sample_sequencingobject sso ON sso.sequencingobject_id = o.sequencing_object_id\n" | |||
| + " INNER JOIN sample s ON sso.sample_id = s.id\n" | |||
| + " LEFT JOIN project_sample psample ON s.id = psample.sample_id\n" | |||
| + " INNER JOIN project_sample psample ON s.id = psample.sample_id\n" | |||
There was a problem hiding this comment.
Don't know anything about sql, but this looks like an expensive query. Perhaps Eric should have a look at it?
There was a problem hiding this comment.
I think so too and probably something that should be updated in dev.
src/main/java/ca/corefacility/bioinformatics/irida/ria/web/samples/SamplesAjaxController.java
Outdated
Show resolved
Hide resolved
|
|
||
| return new SampleDetails(sample, isModifiable, cartService.isSampleInCart(id)); | ||
| Project project = null; | ||
| if (cartService.isSampleInCart(id) != null) { |
There was a problem hiding this comment.
Well I named that function poorly, sorry.
src/main/java/ca/corefacility/bioinformatics/irida/ria/web/services/UISampleService.java
Outdated
Show resolved
Hide resolved
...ity/bioinformatics/irida/service/impl/analysis/submission/AnalysisSubmissionServiceImpl.java
Show resolved
Hide resolved
src/main/webapp/resources/js/components/activities/ActivityListItem.jsx
Outdated
Show resolved
Hide resolved
| @@ -40,7 +40,10 @@ export default function ShareAssociated() { | |||
| </Button> | |||
| } | |||
| > | |||
| <SampleDetailViewer sampleId={sample.id}> | |||
| <SampleDetailViewer | |||
There was a problem hiding this comment.
This will have to be updated into the metadata security branch
…splitting of logic for getting a list of SampleMetadataFieldEntry
deepsidhu85
deleted the
sample_details_refactor/_metadata_and_details_fixes
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
What did you change in this pull request? Provide a description of files changed, user interactions changed, etc. Include how to test your changes.
Updated remaining locations where sample name link pointed to the samples page and replaced with launching the
SampleDetailViewer. Fixed issue with sample metadata tab which wouldn't set aprojectmetadatarolefor a field if a previous role did not exist. Added logging statements. Updated tests. Refactored UI components to useRow/Colfrom ant design instead ofSpaceRelated issue
Link to the GitHub issue this pull request addresses using the
#issuenumformat. If it completes an issue, useFixes #issuenumto automatically close the issue.Checklist
Things for the developer to confirm they've done before the PR should be accepted:
* [ ] CHANGELOG.md (and UPGRADING.md if necessary) updated with information for new change.* [ ] Tests added (or description of how to test) for any new features.* [ ] User documentation updated for UI or technical changes.