Master Release v2.11.1 #269
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
view-controls.js : valueInInterval() : use subInterval() for value [start]; also handle value start, [] or not an array.
…rror to frontend GUI data-check.js : datasetParentContainsNamedFeatures() : return errorMsg parent not found if ! parent. upload.js : uploadParsedCb() : add space after error : uploadSpreadsheet.bash : re-enable qtlList; this reverts the change in 3bb4aa3
…e in the Metadata worksheet uploadSpreadsheet.bash : splitMetadata() : change cut -d, to perl parse_line(). setupMeta() : change split(/,/ ) to parse_line(fieldSeparator )
The added view history is not yet persisted in localStorage. manage-explorer.js : use service viewHistory. add historyView, historyViewChanged() (may not be required). add dataPreHistory(), and insert it between dataPre1 and dataPre2. entry-dataset.js : data() : if dataset.blocksFilterSortViewed, use that instead of .blocks. dataset.js : use services : blockService (maybe), view. add blocksViewed(), blocksRecent(), blocksFavourite(). view.js : viewRelatedBlocks() : record the viewed event in history, using setViewed() : block, parentBlock. add : viewed Map, setViewed(), blockViewed(), blocksFilterSortViewed() datasetsFilterSortViewed(), datasetMaxViewed(), maxViewed(), datasetHistory(), datasetViewed(), datasetBlocksViewed(). manage-explorer.hbs : add radio-button s : historyView : Normal / Recent / Favourites
…Storage view.js : use ember-local-storage add blockViewHistory: storageFor viewed : change from Map to alias(blockViewHistory.viewed ) add viewedClear(), likely to be used later. setViewed() : initialise this.viewed. setViewed() and blockViewed() : change from map.get(block) to map[block.id]; throughout : replace viewed.get(b) with blockViewed(b). block-view-history.js : added, via ember g storage blockViewHistory
…en controls change.
manage-explorer.js : add historyBlocks.
dataPreHistory() : drop blocksFilterSortViewed() - replaced by passing filters.{historyView,historyBlocks} to entry-dataset.
entry-dataset.js :
data() : depend on filters.{historyView,historyBlocks}, use those flags in place of dataset.blocksFilterSortViewed to enable use of dataset .blocksRecent, .blocksFavourite.
manage-explorer.hbs :
add checkbox historyBlocks.
pass history{View,Blocks} to entry-dataset in filters hash
manage-explorer.hbs : wrap the radio-button button label by using contextual form {{#radio-button
Wrap checkbox historyBlocks with span display: inline-block so that the label does not wrap away from the button.
manage-explorer : change searchFilterAny to searchFilterAll.
app.scss input#nameFilter : undo the override which is done by normalize.css (Bootstrap). manage-explorer.hbs : input#nameFilter : change type text to search, as the cancel button is shown for type search.
manage-explorer.js : bundle historyView, historyBlocks into (added) controlOptions to be passed to sub-components.
dataPreHistory() : use thenOrNow() to handle promise.
entry-dataset.js : data() : dependency changed filters -> controlOptions
entry-level.js : add valuesFiltered().
view.js : viewRelatedBlocks() : setViewed(referenceBlock).
manage-explorer.hbs : address history{View,Blocks} via this.controlOptions.
entry-level.hbs : use valuesFiltered.
pass controlOptions to sub-components in : manage-explorer.hbs, entry-{level,parent,tab,values}.hbs.
manage-explorer.js : dataPreHistory() : invert the historyView === Recent condition. entry-blocks-array.js : add dataFiltered(). entry-level.js : add comment. entry-values.js : keyValuesSorted() : add view history filter. entry-blocks-array.hbs : use dataFiltered. entry-blocks-array.hbs : entry-dataset-level.hbs : entry-dataset-level0.hbs : pass controlOptions from entry-dataset-level via entry-dataset-level0 to entry-blocks-array
block.js : add traitSet(), traits() trait.js : add traitsInView(), setsUnion() manage-view.hbs : pass traitsInView to trait-qtl
Don-Isdale
added a commit
that referenced
this pull request
Oct 1, 2021
…tics PR #269 : Master Release v2.11.1 branch feature/qtlUpload #233 : error message for unmatched parentName. comma in Metadata worksheet (e.g. citation). #197 : update Trait table when QTL block is unviewed #216 : explorer : Recent / Favourites #257 : axis brush single-value GM without overlap or contain
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.
branch feature/qtlUpload
#233 : error message for unmatched parentName. comma in Metadata worksheet (e.g. citation).
#197 : update Trait table when QTL block is unviewed
#216 : explorer : Recent / Favourites
#257 : axis brush single-value GM without overlap or contain