Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/components/componentProperty.vue
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ export default {
retryByJS() {
this.copySelectedComponent.retryCondition = null;
},
"copySelectedComponent.host"(newValue, oldValue) {
if (newValue === "localhost" && !this.isBulkjobTask && !this.isStepjobTask && this.isStepjob) {
"copySelectedComponent.host"(newValue) {
if (newValue === "localhost" && this.isTask) {
this.copySelectedComponent.useJobScheduler = false;
}
//Close remote file setting panel if changing to localhost
Expand Down
3 changes: 2 additions & 1 deletion client/src/components/fileBrowser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ export default {
return !["for", "foreach", "workflow", "storage", "viewer"].includes(this.selectedComponent.type);
},
dialogButtons() {
const isInvalid = this.dialog.inputField === "" || !this.noDuplicate(this.dialog.inputField);
const requiresInput = ["createNewDir", "createNewFile", "rename"].includes(this.dialog.submitEvent);
const isInvalid = requiresInput && (this.dialog.inputField === "" || !this.noDuplicate(this.dialog.inputField));
return [
{ icon: "mdi-check", label: "ok", disabled: isInvalid },
{ icon: "mdi-close", label: "cancel" }
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/rapid/targetFiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</div>
<lower-component-tree @selected="targetNodeSelected" />
<div class="mt-4">
<v-autocomplete
<v-combobox
v-model.trim="newTargetFilename"
label="filename"
:items="fileCandidates"
Expand Down
3 changes: 2 additions & 1 deletion server/app/db/jsonSchemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ class StepjobSchema extends GeneralWorkflowComponentSchema {
this.properties.type = { enum: ["stepjob"] };
this.required.push("host", "useJobScheduler", "queue");
this.properties.host = { type: "string", default: "localhost" };
this.properties.useJobScheduler = { type: "boolean", default: false };
//see comment in StepjobTaskSchema
this.properties.useJobScheduler = { type: "boolean", default: true };
this.properties.queue = { type: ["string", "null"], default: null };
this.properties.submitOption = { type: ["string", "null"], default: null };
}
Expand Down
2 changes: 1 addition & 1 deletion server/app/db/version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version": "2026-0305-200622" }
{"version": "2026-0313-001926" }
Loading