-
Notifications
You must be signed in to change notification settings - Fork 31
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
Sample details refactor/ default assembly #1327
Merged
joshsadam
merged 21 commits into
phac-nml:sample-details-refactor
from
deepsidhu85:sample_details_refactor/_default_assembly
Jul 4, 2022
Merged
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
558c30c
Updated to allow setting of a default genome assembly object for a sa…
deepsidhu85 0caca20
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 8104244
Updated api calls to invalidate tags
deepsidhu85 c86f27d
Merged sample details refactor file qc branch and fixed merge conflicts
deepsidhu85 e477707
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 1b26fa5
Merged sample details refactor file qc and fixed merge conflicts
deepsidhu85 fba144d
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 c7697ea
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 b8501c7
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 8bbd463
Merge branch 'sample_details_refactor/_file_qc' into sample_details_r…
deepsidhu85 f3a3054
Merged sample_details_refactor file qc branch and fixed merge conflicts.
deepsidhu85 e4a0b7e
Merge branch 'sample-details-refactor' into sample_details_refactor/_…
deepsidhu85 ab4aaa4
Moved changeset into correct directory
deepsidhu85 fc9e4cb
Removed duplicate const
deepsidhu85 bf35943
Updated translations and updated test
deepsidhu85 47c8693
Merge branch 'sample-details-refactor' into sample_details_refactor/_…
deepsidhu85 243401a
Added assertions for set as default / default tag
deepsidhu85 3dc4951
Uncommented assertions
deepsidhu85 164b657
Added translations
deepsidhu85 05bc71d
Merge branch 'sample-details-refactor' into sample_details_refactor/_…
deepsidhu85 aabc9d4
Added blue to css root and updated Default tags to use one of the blu…
deepsidhu85 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
197 changes: 92 additions & 105 deletions
197
src/main/java/ca/corefacility/bioinformatics/irida/ria/web/services/UISampleService.java
Large diffs are not rendered by default.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
...orefacility/bioinformatics/irida/database/changesets/RENAME_ME_WHEN_READY/all-changes.xml
This file was deleted.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
...nformatics/irida/database/changesets/unreleased/add-default-genome-assembly-to-sample.xml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog | ||
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> | ||
|
||
<changeSet id="add-default-genome-assembly-to-sample" author="deep"> | ||
<addColumn tableName="sample"> | ||
<column name="default_genome_assembly" type="bigint(20)"> | ||
<constraints foreignKeyName="FK_SAMPLE_GENOME_ASSEMBLY" | ||
referencedColumnNames="id" referencedTableName="genome_assembly" /> | ||
</column> | ||
</addColumn> | ||
|
||
<addColumn tableName="sample_AUD"> | ||
<column name="default_genome_assembly" type="bigint(20)" /> | ||
</addColumn> | ||
|
||
</changeSet> | ||
</databaseChangeLog> |
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
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
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
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
2 changes: 1 addition & 1 deletion
2
src/main/webapp/resources/js/components/samples/components/SampleFileList.jsx
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need to store this as state? The point to using redux toolkit is that it handles the state and you just need to invalidate to update. It has it's own cache to handle this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default tag doesn't update in the UI without it. If you look in samples.js we invalidateTags: ["SampleDetails"]. However even with this it doesn't update the UI side even when a different assembly is updated. Same thing applies to the setting of a default sequencing object
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is because the
tag
here is set up wrong. If you look at the docs for invalidating tags, we do not actually set the tag type on the object itself. I think where we dropped the ball was, instead of:I have not played with it, but it seems more like what they are looking for and probably why we are not getting invalidation and refetching.