SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Improve add activity experience

Browse source 
This changes the behavior when picking an activity in a way that does not add it to the workflow until after Save is clicked
This commit is contained in:
Sipke Schoorstra 2021-05-11 21:07:24 +02:00
parent 22c7d3ae35
commit 094e41257b
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/designer/elsa-workflows-studio/src/components/designers/tree/elsa-designer-tree/elsa-designer-tree.tsx
View file

@ -46,6 +46,7 @@ export class ElsaWorkflowDesigner {
zoom: d3.ZoomBehavior<Element, unknown>;
parentActivityId?: string;
parentActivityOutcome?: string;
addingActivity: boolean = false;
activityDisplayContexts: Map<ActivityDesignDisplayContext> = {};
selectedActivities: Map<ActivityModel> = {};
@ -134,26 +135,30 @@ export class ElsaWorkflowDesigner {
eventBus.off(EventTypes.UpdateActivity, this.onUpdateActivity);
d3.selectAll('.node').on('click', null);
d3.selectAll('.edgePath').on('contextmenu', null);
}
onActivityPicked = async args => {
const activityDescriptor = args as ActivityDescriptor;
const connectFromRoot = !this.parentActivityOutcome || this.parentActivityOutcome == '';
const sourceId = connectFromRoot ? null : this.parentActivityId;
const targetId = connectFromRoot ? this.parentActivityId : null;
const activityModel = this.addActivity(activityDescriptor, sourceId, targetId, this.parentActivityOutcome);
//const activityModel = this.addActivity(activityDescriptor, sourceId, targetId, this.parentActivityOutcome);
const activityModel = this.newActivity(activityDescriptor);
this.addingActivity = true;
this.showActivityEditorInternal(activityModel, false);
};
onUpdateActivity = args => {
const activityModel = args as ActivityModel;
this.updateActivity(activityModel);
if (this.addingActivity) {
const connectFromRoot = !this.parentActivityOutcome || this.parentActivityOutcome == '';
const sourceId = connectFromRoot ? null : this.parentActivityId;
const targetId = connectFromRoot ? this.parentActivityId : null;
this.addActivity(activityModel, sourceId, targetId, this.parentActivityOutcome);
} else {
this.updateActivity(activityModel);
}
};
addActivity(activityDescriptor: ActivityDescriptor, sourceActivityId?: string, targetActivityId?: string, outcome?: string): ActivityModel {
outcome = outcome || 'Done';
newActivity(activityDescriptor: ActivityDescriptor): ActivityModel {
const activity: ActivityModel = {
activityId: uuid(),
type: activityDescriptor.type,
@ -169,6 +174,20 @@ export class ElsaWorkflowDesigner {
};
}
return activity;
}
createAndAddActivity(activityDescriptor: ActivityDescriptor, sourceActivityId?: string, targetActivityId?: string, outcome?: string): ActivityModel {
outcome = outcome || 'Done';
const activity = this.newActivity(activityDescriptor);
this.addActivity(activity, sourceActivityId, targetActivityId, outcome);
return activity;
}
addActivity(activity: ActivityModel, sourceActivityId?: string, targetActivityId?: string, outcome?: string) {
outcome = outcome || 'Done';
const workflowModel = {...this.workflowModel, activities: [...this.workflowModel.activities, activity]};
if (targetActivityId) {
@ -211,7 +230,6 @@ export class ElsaWorkflowDesigner {
this.updateWorkflowModel(workflowModel);
this.parentActivityId = null;
this.parentActivityOutcome = null;
return activity;
}
getRootActivities(): Array<ActivityModel> {