Commit Graph
4278 Commits
Author SHA1 Message Date
John Chilton 9957c02737 Fix file type error in RuleCollectionBuilder. 2018-06-08 13:24:40 -04:00
John Chilton 7eb927b631 Fix delete "Collection Only" option in history menu.
Broken with https://github.com/galaxyproject/galaxy/commit/7cc01380afd017c5cac2af2b2d735b2265774a68.
2018-06-08 13:24:24 -04:00
Martin Cech a56c4e9cf6 Merge pull request #6260 from dannon/history-view-fixes
[18.05] History view 'import' button display based on ownership.
2018-06-08 12:20:38 -05:00
Martin Cech 85265ebd79 Merge pull request #6237 from dannon/history_contents_multiview
[18.05] Fix history contents w/ proxy prefix (multiview error)
2018-06-08 12:19:36 -05:00
Martin Cech 54ec854c13 remove outdated comment 2018-06-08 13:19:13 -04:00
Martin Cech 20cf8b5bf0 Merge pull request #6226 from dannon/minor_style_fixes
[18.05] Two minor aliases for (exterior) backwards compatibility, minor badge tweaks
2018-06-08 12:16:33 -05:00
Martin Cech 75c9610fda Merge pull request #6243 from dannon/workflow_submit_text_backport
[18.05] Backport of Workflow Execution Text Fixup
2018-06-08 12:15:05 -05:00
Dannon Baker 87dc52cd8f Only show 'switch to this history' when the person in question is the history owner. 2018-05-31 19:47:03 -04:00
Dannon Baker f35c1d6630 Overhaul workflow execution response, including appropriate text for new histories, and multiple executions. With links. 2018-05-30 09:47:46 -04:00
Dannon Baker 18ae4457a1 Formatting for styles and a couple misc files 2018-05-29 10:44:21 -04:00
Dannon Baker 0e39cf1924 This is correct now 2018-05-29 10:23:21 -04:00
Dannon Baker 9fe40db5b3 Fix list panel control message margins. 2018-05-29 10:23:21 -04:00
Dannon Baker 361b48a4d2 Drop submit-image custom styling, use standard fa; left it as inline style to keep it clean and remove all at once when this grid goes. 2018-05-29 10:23:21 -04:00
Dannon Baker 77dff21bcc Fix (ancient, should replace this, but might as well make it work until we do) tool-shed-only grid search button 2018-05-29 10:23:21 -04:00
Dannon Baker 6cf4c8e5f4 Fix one more busted fade 2018-05-29 10:23:21 -04:00
Dannon Baker cf3ed04d74 Fix dataset messagesmall display, was a TODO left from migration 2018-05-29 10:23:21 -04:00
Dannon Baker 7e220205f3 A more accurate version of what was set before, with the same outcome (though, it could change if we toggle the grey) 2018-05-29 10:23:21 -04:00
Dannon Baker 4629093909 Fix history list bottom border 2018-05-29 10:23:21 -04:00
Dannon Baker 2ad4dde072 Convert history-contents urlroot to instance var 2018-05-29 10:00:28 -04:00
Dannon Baker 69c74d52d4 Drop sm-badge-pad completely (standard styles handle this now) 2018-05-25 11:57:05 -04:00
Dannon Baker 074ec18490 Missed label->badge translations. 2018-05-25 11:55:23 -04:00
Dannon Baker db444455b2 Alias btn-default to btn-secondary for backwards compatibility. 2018-05-25 11:45:18 -04:00
Dannon Baker f7ffde9db4 Alias btn-xs to btn-sm for thinks (like welcome) which may have been customized and rely on the previous styles. 2018-05-25 11:07:13 -04:00
Martin Cech 2fe24e470d Merge pull request #6188 from guerler/fix_popup_right
[18.05] Right align button menu popup
2018-05-21 16:24:09 -05:00
guerler 4d38c25c9f Right align button menu popup 2018-05-21 16:16:38 -04:00
guerler fcde0d669f Avoid overlapping change handlers 2018-05-21 12:42:54 -04:00
John Chilton c253436b4a Fix append() for ANY_COLLECTION_TYPE type description in WF editor.
Append means take a collection type and extend it by the current type - so appending to list to paired -> list:paired for instance. ANY_COLLECTION_TYPE is a representation of incomplete information - it means this type description might be any kind of collection type (the way we use "input" to mean any kind of datatype in the editor).

This is really a second order approximation of what a correct solution would be - a first order approximation would somehow represent the result of append being at least of "depth" specified (list:* or *:list instead of * for instance). A not approximation would be to do that but use ANY_COLLECTION_TYPE much less frequently by capturing type_source information and propagating it throughout the workflow properly. But these are harder things to do, this incorrect fix will allow many valid workflows to be editted that currently cannot be so I think it is good.

"Fixes" #5205.
2018-05-18 15:14:06 -04:00
John Chilton 3208a685aa Fix fetching collection state for static histories.
See comment in code.
2018-05-17 14:08:01 -04:00
Martin Cech 47950b1707 Merge pull request #6155 from dannon/no-more-green
[18.05] Dropdown active color tweaks
2018-05-17 10:14:45 -05:00
Dannon Baker 680948b1a5 Previous changes overstepped; this should be enough to fix the prefix
serving at least in the multiview, and I'm not seeing errors elsewhere
(yet).  We should look at other urlRoot usage though; it likely has
issues.

This reverts commit 62811d0a40aafe5db8c5121ff857788c59880b56.
2018-05-16 21:12:55 -04:00
Dannon Baker a6df95508d Backbone model url fixes (urlRoot isn't necessary in many of these situations, and only complicates (and breaks) some things 2018-05-16 21:12:55 -04:00
Dannon Baker bfa69401ec Gold for active text click. Readable. Contrasts. Still indicates a click. 2018-05-16 18:02:18 -04:00
Dannon Baker 4ed11c16b8 Use defined -dark instead of a flat black 2018-05-16 15:48:38 -04:00
Dannon Baker df6842a405 Remove the success green on dropdown click; the text already toggles to let you know you clicked, and this is much, much less jarring 2018-05-16 15:29:49 -04:00
Dannon 8f5fc79db6 Merge pull request #6141 from jmchilton/rules_fix_10
[18.05] "Fix" rule builder to auto decompress uploaded files.
2018-05-15 16:53:12 -04:00
John Chilton 242d5459e1 "Fix" RuleBuilder to auto decompress compressed files.
Work arounds just aren't there yet.
2018-05-15 07:39:14 -04:00
Dannon Baker 48de2ecf21 client-format 2018-05-15 07:32:35 -04:00
Dannon Baker a310b0a121 Fix minor typo in rule builder. 2018-05-15 07:32:02 -04:00
Dannon 3d6443b58b Merge pull request #6134 from jmchilton/rule_fixes_8
Improve data initialization of rule builder for long term support.
2018-05-15 07:30:56 -04:00
Dannon 076e1ddaec Merge pull request #6136 from jmchilton/rule_fixes_9
[18.05] More validation for rule builder.
2018-05-15 07:20:58 -04:00
Dannon 5c036bc264 Merge pull request #6133 from jmchilton/rule_fixes_7
[18.05] Improve dialog message while waiting for rule builder job.
2018-05-14 17:14:30 -04:00
John Chilton e5ea32465a More validation for rule builder.
- Require a URL or FTP column for raw pasted data.
- Require list identifiers if creating collections.
- Require name in more scenerios that require a name.
2018-05-14 14:45:38 -04:00
Dannon b0d730fa76 Merge pull request #6130 from guerler/max_select2_length
[18.05] Limit select2 text label length to 100 characters
2018-05-14 13:21:50 -04:00
Dannon Baker c5ab87ee59 Fix repeated additions of the separator, define vars. 2018-05-14 13:07:13 -04:00
John Chilton 788ed8aa43 Improve data initialization of rule builder for long term support.
A mistake was made in the rush to rule-builder-all-the-stuffs - libraries, hdas, and FTP all initialized a different set of columns from the data (which is probably fine) but with no indication this was happening in the underlying rules (which is definitely not fine).

To understand why this was a mistake and see why in the long term this hurts reproducibility, take loading rules for HDAs from the history panel as an example. In the initial implementation it would pre-initialize two columns - one for "hid" and one for "name" - any rules that were generated from there would start with an implicit assumption of two columns. This is a problem because if someone saves some rules and we (Galaxy developers) decide later on that name tag should be in the initial list but HID doesn't make sense and make that change - we basically are breaking all existing rules to support a very logical change in behavior. Likewise, Galaxy produces a hash with last modified date and size for each FTP entry - this is data we have and could stick in the rule builder by default - but if we change that over time existing FTP rules will break.

It would be much more sustainable to instead include the initial column generation information in the initial rules generated - so that each of these modalities start in reality with an empty table and the initial set of rules describe what metadata to pull initial columns from. This way if you save a set of rules it will include the initial column choices, and if they are pasted in at some later point where columns are picked differently - the rules will still work because you are replacing the initial column definitions.

The initial rules implementation didn't have this concept of loading columns from metadata - but this was added to support loading existing identifiers as part of the "Apply Rules to Existing Collection" tool. This commit extends that idea to do the same thing (but with different columns) when loading data from HDAs, FTP, and data libraries.
2018-05-14 12:15:04 -04:00
John Chilton 8be2da03b5 Improve dialog message while waiting for rule builder job. 2018-05-14 12:05:40 -04:00
Dannon 19c5c7395e Merge pull request #6124 from martenson/fix-upload-colorstate
[18.05] fix upload status colors to work with bs4
2018-05-14 06:47:45 -04:00
guerler 616c1b971a Add a text label length limit for select2's used in the upload dialog
Reduce limit to a 100 characters

Match encapsulated values in title string
2018-05-12 08:54:41 -04:00
Martin Cech 3a4cc360a4 fix upload status colors to work with bs4 2018-05-11 12:37:39 -04:00
John Chilton 7b4b2a0f77 Fix for lack of feedback on rule builder job failures.
Present users with the job standard error and also check for binary sniffing problems and report them with a pretty message suggesting specifying a file type.
2018-05-11 12:17:35 -04:00