opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix link assignment

Browse Source
This commit is contained in:
Laila Los
2024-12-19 14:29:27 +01:00
parent 4fac7daae3
commit 09fb715a66
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Workflow/Editor/modules/model.ts
+37 -10
View File
@@ -2,7 +2,12 @@ import reportDefault from "@/components/Workflow/Editor/reportDefault";
import { useWorkflowCommentStore, type WorkflowComment } from "@/stores/workflowEditorCommentStore";
import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
import { useWorkflowEditorToolbarStore } from "@/stores/workflowEditorToolbarStore";
import { type ConnectionOutputLink, type Steps, useWorkflowStepStore } from "@/stores/workflowStepStore";
import {
type ConnectionOutputLink,
type StepInputConnection,
type Steps,
useWorkflowStepStore,
} from "@/stores/workflowStepStore";
export interface Workflow {
name: string;
@@ -48,13 +53,19 @@ export async function fromSimple(
// If workflow being copied into another, wipe UUID and let
// Galaxy assign new ones.
if (options?.reassignIds ?? appendData) {
const highestStepId = stepStore.getStepIndex;
const stepIdOffset = stepStore.getStepIndex + 1;
const stepArray = Object.values(data.steps);
const stepIds = Object.keys(data.steps).map((id) => parseInt(id));
const lowestStepId = Math.min(...stepIds);
const stepIdOffset = highestStepId - lowestStepId + 1;
// Since we are resigning IDs based on index, ensure correct ordering
stepArray.sort((a, b) => a.id - b.id);
const stepIdMapOldToNew = new Map<number, number>();
stepArray.forEach((step, index) => {
const oldId = step.id;
step.id = index + stepIdOffset;
stepIdMapOldToNew.set(oldId, step.id);
});
stepArray.forEach((step) => {
delete step.uuid;
@@ -63,10 +74,12 @@ export async function fromSimple(
// good enough for a first pass IMO.
step.position = { top: step.id * 100, left: step.id * 100 };
}
step.id += stepIdOffset;
step.position.left += defaultPosition.left;
step.position.top += defaultPosition.top;
Object.values(step.input_connections).forEach((link) => {
const newInputConnections: StepInputConnection = {};
Object.entries(step.input_connections).forEach(([key, link]) => {
if (link === undefined) {
console.error("input connections invalid", step.input_connections);
} else {
@@ -76,11 +89,25 @@ export async function fromSimple(
} else {
linkArray = link;
}
linkArray.forEach((link) => {
link.id += stepIdOffset;
const remappedLinkArray = linkArray.map((link) => {
const newId = stepIdMapOldToNew.get(link.id);
return {
...link,
id: newId,
};
});
// id may be undefined, if the partial Workflow does not contain the step
// in that case, remove the link
const newLinkArray = remappedLinkArray.filter((link) => link.id) as ConnectionOutputLink[];
newInputConnections[key] = newLinkArray;
}
});
step.input_connections = newInputConnections;
});
data.comments.forEach((comment, index) => {