Merge seek main #26
Merged
Merge seek main #26
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
now set allow_cv_free_text on the attribute based on attribute['ontology'], rather than when creating the controlled vocab. The current code seems to assume that this will always be the case
appears to be an old artifact that was never used
This reverts commit 754854fb8cfe1b6fd2ca3c53b41cc05626b22456.
appears to be an old artifact that was never used
* Add Seed file with metadata for ena * Add "ENA collection date" to template attribute validation schema * Add custom metadata functionality to Isa Assays * Add custom metadata functionality to Isa Studies * Only make custom metadatafields appear on the first assay * Fix failing tests * Make metadata show in edit form as well * Transfer custom metadata to the assay comments section of the ISA JSON * Split assays into streams of assays * Change assay position logic * Showing custom metadata if assay position is 0 * Correction `show_custom_metadata` logic * fix failing tests * Prevent position to increment when editing * Add Assay stream name as custom metadata * Filter stream name out of the comments and set as filename * fix merge errors * Change Custom Metadata to Extended Metadata * Fix failing tests * Add Study title * Updated ISA exporter: - Add assay publications - Add linked assays as comment * Fix failing test * Implement ENA custom metadata for ISA Study * Export Study extended metadata * Fixed the stream name in the isa_exporter * Fix isa_exporter. output is othermaterial if corresponding isatag is found. * Add ENA specific sample attribute type to the sample attributes seed file * Fix failing tests. * Add test for adding custom metadata to an isa study * Add test for creating an isa assay with custom metadata * Add seed task to seek upgrade_version * ENA custom date type: - Change data type title to something more generic. - Also changed placeholder text to something more informative.
Add rake upgrade task for recognising ISA JSON compliant investigations
…ed extended metadata types
…sa_json_compliance Fix rake task
Bumps [RedCloth](https://github.com/jgarber/redcloth) from 4.3.2 to 4.3.3. - [Changelog](https://github.com/jgarber/redcloth/blob/master/CHANGELOG) - [Commits](jgarber/redcloth@v4.3.2...v4.3.3) --- updated-dependencies: - dependency-name: RedCloth dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
…ui-improveement UI improvement for displaying the extended metadata
…own #1710 do lightweight checks first, and only do the heavy check for matching sample type last. This final step will be turned into an ajax call
... and therefore whether the button is shown or not
…he #1710 either there are no matches, so it will go through all anyway, or there is a match and it will just to at the next step. Best to do now and build the cache
…d_vocabs_template_attributes Issue 1701 fix controlled vocabs in template attributes
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.
No description provided.