@@ -47,7 +38,6 @@ export default {
},
data() {
return {
- errorMessage: null,
formData: {},
inputTypes: {},
};
@@ -80,23 +70,12 @@ export default {
});
return inputs;
},
- runButtonDisabled() {
- return this.errorMessage !== null;
- },
},
methods: {
- onValidation(validationError) {
- this.errorMessage = validationError
- ? "Please address the issues highlighted below before proceeding."
- : null;
- },
onChange(data) {
this.formData = data;
},
onExecute() {
- if (this.errorMessage) {
- return;
- }
const replacementParams = {};
const inputs = {};
for (const inputName in this.formData) {
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index 928e69e9dd4..dc28a0bc158 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -133,7 +133,7 @@ export default {
return stepStates;
},
invocationAndJobTerminal: function () {
- return this.invocationSchedulingTerminal && this.jobStatesTerminal;
+ return !!(this.invocationSchedulingTerminal && this.jobStatesTerminal);
},
invocationLink: function () {
return getUrl(`workflows/invocations/report?id=${this.invocationId}`);
diff --git a/client/src/components/providers/InvocationStepProvider.js b/client/src/components/providers/InvocationStepProvider.js
index eca511c3e4e..b2352e4e888 100644
--- a/client/src/components/providers/InvocationStepProvider.js
+++ b/client/src/components/providers/InvocationStepProvider.js
@@ -3,6 +3,8 @@ import { getAppRoot } from "onload/loadConfig";
import { SingleQueryProvider } from "components/providers/SingleQueryProvider";
import { rethrowSimple } from "utils/simple-error";
+const TERMINAL_JOB_STATES = ["ok", "error", "deleted", "paused"];
+
async function getInvocation({ id }) {
try {
const { data } = await axios.get(`${getAppRoot()}api/invocations/any/steps/${id}`);
@@ -12,4 +14,11 @@ async function getInvocation({ id }) {
}
}
-export default SingleQueryProvider(getInvocation);
+const stepIsTerminal = (step) => {
+ const isTerminal =
+ ["scheduled", "cancelled", "failed"].includes(step.state) &&
+ step.jobs.every((job) => TERMINAL_JOB_STATES.includes(job.state));
+ return isTerminal;
+};
+
+export default SingleQueryProvider(getInvocation, stepIsTerminal);
diff --git a/client/src/mvc/ui/ui-misc.js b/client/src/mvc/ui/ui-misc.js
index d32c0cdc7da..f6a755145ab 100644
--- a/client/src/mvc/ui/ui-misc.js
+++ b/client/src/mvc/ui/ui-misc.js
@@ -86,8 +86,7 @@ export var Input = Backbone.View.extend({
input: "_onchange",
},
value: function (new_val) {
- new_val !== undefined &&
- this.model.set("value", new_val === null || typeof new_val === "string" ? new_val : "");
+ new_val !== undefined && this.model.set("value", typeof new_val === "string" ? new_val : "");
return this.model.get("value");
},
render: function () {
diff --git a/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js b/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js
index 99dbe854806..bec0b8b510a 100644
--- a/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js
+++ b/config/plugins/visualizations/jqplot/jqplot_bar/src/script.js
@@ -3,7 +3,7 @@ import _ from "underscore";
import jqplot from 'jqplot-exported/jqplot';
import { LineRenderer } from 'jqplot-exported/LineRenderer';
import { BarRenderer } from 'jqplot-exported/plugins/BarRenderer';
-import { OHLCRenderer } from 'jqplot-exported/plugins/OHLCRenderer';
+import { OHLCRenderer } from 'jqplot-exported/plugins/OhlcRenderer';
import { EnhancedLegendRenderer } from 'jqplot-exported/plugins/EnhancedLegendRenderer';
import { getDomains, makeCategories, makeTickFormat, makeSeries, mapCategories } from "@galaxyproject/charts/lib/utilities/series";
diff --git a/doc/source/_static/22.01-colour.mp4 b/doc/source/_static/22.01-colour.mp4
new file mode 120000
index 00000000000..ac9575e09d3
--- /dev/null
+++ b/doc/source/_static/22.01-colour.mp4
@@ -0,0 +1 @@
+../releases/images/22.01-colour.mp4
\ No newline at end of file
diff --git a/doc/source/_static/22.01-export.mp4 b/doc/source/_static/22.01-export.mp4
new file mode 120000
index 00000000000..dc52335e958
--- /dev/null
+++ b/doc/source/_static/22.01-export.mp4
@@ -0,0 +1 @@
+../releases/images/22.01-export.mp4
\ No newline at end of file
diff --git a/doc/source/releases/22.01.rst b/doc/source/releases/22.01.rst
new file mode 100644
index 00000000000..f24918cdde9
--- /dev/null
+++ b/doc/source/releases/22.01.rst
@@ -0,0 +1,957 @@
+
+.. to_doc
+
+22.01
+===============================
+
+Enhancements
+-------------------------------
+
+* Swap to Webpack5
+ `Pull Request 11710`_
+* Remote / Late evaluation of tools
+ `Pull Request 12459`_
+* File sources for gdrive, gcs, onedata, basespace
+ (thanks to `@nuwang