diff --git a/.ci/jenkins/integration/run_tests.sh b/.ci/jenkins/integration/run_tests.sh index 511c1a695c0..91d4741503f 100755 --- a/.ci/jenkins/integration/run_tests.sh +++ b/.ci/jenkins/integration/run_tests.sh @@ -1,5 +1,3 @@ #!/bin/bash -./scripts/common_startup.sh --dev-wheels - -nosetests test/integration +./run_tests.sh --dockerize --db postgres --external_tmp --clean_pyc --integration "$@" diff --git a/Makefile b/Makefile index c7e6e5539c8..df165a0a520 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ IN_VENV=if [ -f $(VENV)/bin/activate ]; then . $(VENV)/bin/activate; fi; PROJECT_URL?=https://github.com/galaxyproject/galaxy GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01 GRUNT_EXEC?=node_modules/grunt-cli/bin/grunt +WEBPACK_EXEC?=node_modules/webpack/bin/webpack.js +GXY_NODE_MODULES=client/node_modules DOCS_DIR=doc DOC_SOURCE_DIR=$(DOCS_DIR)/source SLIDESHOW_DIR=$(DOC_SOURCE_DIR)/slideshow @@ -92,6 +94,9 @@ client-install-libs: npm-deps ## Fetch updated client dependencies using bower. client: grunt style ## Rebuild all client-side artifacts +charts: npm-deps ## Rebuild charts + NODE_PATH=$(GXY_NODE_MODULES) client/$(WEBPACK_EXEC) -p --config config/plugins/visualizations/charts/webpack.config.js + grunt-docker-image: ## Build docker image for running grunt docker build -t ${GRUNT_DOCKER_NAME} client diff --git a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js index c1dc69678eb..ea097fcfd9c 100644 --- a/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js +++ b/client/galaxy/scripts/mvc/dataset/dataset-li-edit.js @@ -122,30 +122,38 @@ var DatasetListItemEdit = _super.extend( return $details; }, - /************************************************************************** + /************************************************************************** * Render help button to show tool help text without rerunning the tool. * Issue #2100 */ _renderToolHelpButton : function() { var datasetID = this.model.attributes.dataset_id; var jobID = this.model.attributes.creating_job; + var self = this; var parseToolBuild = function(data) { - var toolName = data.name; - var toolHelp = (data.help) ? data.help : "No help is available for the tool."; - var helpString = '

Tool Help for ' + toolName + '

'; - helpString += toolHelp; + var helpString = '
' + if (data.name && data.help){ + helpString += 'Tool help for ' + data.name + '
'; + helpString += data.help; + } else { + helpString += 'Tool help is unavailable for this dataset.
'; + } helpString += '
'; - $('#dataset-' + datasetID).append($.parseHTML(helpString)); + self.$el.find( '.details' ).append($.parseHTML(helpString)); }; var parseToolID = function(data) { $.ajax({ - url: '/api/tools/' + data.tool_id + '/build' + url: Galaxy.root + 'api/tools/' + data.tool_id + '/build' }).done(function(data){ parseToolBuild(data); - }).fail(function(){console.log("Failed in api tools build call")}); + }).fail(function(){ + parseToolBuild({}) + }); }; - + if (Galaxy.user.id === null){ + return null + } return faIconButton({ title: 'Tool Help', classes: 'icon-btn', @@ -153,15 +161,16 @@ var DatasetListItemEdit = _super.extend( faIcon: 'fa-question', onclick: function() { var divString = 'thdiv-' + datasetID; - if ($("#" + divString).length > 0) - { - $("#" + divString).toggle(); + if (self.$el.find(".toolhelp").length > 0){ + self.$el.find(".toolhelp").toggle(); } else { $.ajax({ - url: '/api/jobs/' + jobID - }).done(function(data){ - parseToolID(data); - }).fail(function(){console.log('Failed on recovering /api/jobs/' + jobID + ' call.')}); + url: Galaxy.root + 'api/jobs/' + jobID + }).done(function(data){ + parseToolID(data); + }).fail(function(){ + console.log('Failed at recovering job information from the Galaxy API for job id "' + jobID + '".'); + }); } } }); @@ -386,15 +395,15 @@ DatasetListItemEdit.prototype.templates = (function(){ var visualizationsTemplate = BASE_MVC.wrapTemplate([ '<% if( visualizations.length === 1 ){ %>', - '', '', '', '<% } else { %>', - '