Skip to content

Support refactoring #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
97 changes: 94 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ x86/
bld/
[Bb]in/
[Oo]bj/
[Oo]ut/
[Ll]og/
[Ll]ogs/

Expand Down Expand Up @@ -58,11 +57,14 @@ dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/

# .NET Core
# .NET
project.lock.json
project.fragment.lock.json
artifacts/

# Tye
.tye/

# ASP.NET Scaffolding
ScaffoldingReadMe.txt

Expand Down Expand Up @@ -360,4 +362,93 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd

##
## Visual studio for Mac
##


# globs
Makefile.in
*.userprefs
*.usertasks
config.make
config.status
aclocal.m4
install-sh
autom4te.cache/
*.tar.gz
tarballs/
test-results/

# Mac bundle stuff
*.dmg
*.app

# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# JetBrains Rider
.idea/
*.sln.iml

##
## Visual Studio Code
##
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
95 changes: 71 additions & 24 deletions MergeWorkflow/CommandGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,58 @@ namespace MergeWorkflow
public class CommandGenerator : IWorkflowGenerator<XElement>
{
private static void CreateAndAddTransitions(ProcessDefinition pd, ActivityDefinition firstActivity,
ActivityDefinition finalActivity, bool isSubprocess, bool isMerge = false, bool isSubProcessFinal = false)
ActivityDefinition finalActivity, bool isSubprocess = false, bool isMerge = false, bool isSubProcessFinal = false,
List<ConditionDefinition> conditions = null)
{
string TransistionName = firstActivity.Name + "To" + finalActivity.Name;
TransitionDefinition Transition = TransitionDefinition.Create(TransistionName,
TransitionClassifier.NotSpecified,
ConcatenationType.And,
ConcatenationType.And,
ConcatenationType.And,
firstActivity,
finalActivity,
TriggerDefinition.Auto,
null);

TransitionDefinition Transition = TransitionDefinition.Create(
TransistionName,
TransitionClassifier.NotSpecified,
ConcatenationType.And,
ConcatenationType.And,
ConcatenationType.And,
firstActivity,
finalActivity,
TriggerDefinition.Auto,
null);

if (conditions != null)
{
Transition.Conditions = conditions;
}

if (isSubprocess)
{
Transition = Transition.SetSubprocessSettings(
TransistionName,
Guid.NewGuid().ToString(),
false,
false,
SubprocessInOutDefinition.Start,
SubprocessStartupType.AnotherThread,
SubprocessStartupParameterCopyStrategy.CopyAll,
SubprocessFinalizeParameterMergeStrategy.OverwriteSpecified,
null);

Transition.IsFork = true;
}

if (isSubProcessFinal)
{
Transition = Transition.SetSubprocessSettings(TransistionName,
Guid.NewGuid().ToString(),
false,
false,
SubprocessInOutDefinition.Finalize,
SubprocessStartupType.AnotherThread,
SubprocessStartupParameterCopyStrategy.CopyAll,
SubprocessFinalizeParameterMergeStrategy.OverwriteAllNulls,
null);

Transition.IsFork = true;
}

pd.Transitions.Add(Transition);
}

Expand All @@ -32,10 +72,7 @@ private static void CreateCommandTransitions(ProcessDefinition pd, ActivityDefin
{
string TransistionName = firstActivity.Name + "To" + finalActivity.Name;
var conditionList = new List<ConditionDefinition>();
//ConditionDefinition Condition = ConditionDefinition.CreateActionCondition(ActionDefinitionReference.Create("CheckAllSubprocessesCompleted", "0",
// ""), false, null);
//Condition.Type = ConditionType.Action;
//conditionList.Add(Condition);

TransitionDefinition Transition = TransitionDefinition.Create(TransistionName,
TransitionClassifier.NotSpecified,
ConcatenationType.And,
Expand Down Expand Up @@ -77,12 +114,9 @@ private static void CreateAndAddActivities(ProcessDefinition pd, String stageNam
public XElement Generate(string schemeCode, Guid schemeId, IDictionary<string, object> parameters)
{
var pd = ProcessDefinition.Create(schemeCode + "SimpleProcess", false, new List<ActorDefinition>(),
new List<ParameterDefinition>(), new List<CommandDefinition>() { CommandDefinition.Create("CheckAllSubprocessesCompleted") }, new List<TimerDefinition>(),
new List<ParameterDefinition>(), new List<CommandDefinition>(), new List<TimerDefinition>(),
new List<ActivityDefinition>(), new List<TransitionDefinition>(), new List<LocalizeDefinition>(),
new List<CodeActionDefinition>()
{

}, DesignerSettings.Empty, new List<string>());
new List<CodeActionDefinition>(), DesignerSettings.Empty, new List<string>());

object stageInfoList;
parameters.TryGetValue("StagesInfo", out stageInfoList);
Expand All @@ -97,11 +131,24 @@ public XElement Generate(string schemeCode, Guid schemeId, IDictionary<string, o
}
int NoOfActivities = pd.Activities.Count;
List<ActivityDefinition> ActivitiesList = pd.Activities;

CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "Start"), pd.Activities.First(x => x.Name == "ResourceCheck"), false);
CreateCommandTransitions(pd, pd.Activities.First(x => x.Name == "ResourceCheck"), pd.Activities.First(x => x.Name == "BuildMDU"), true);
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "BuildMDU"), pd.Activities.First(x => x.Name == "BuildSeriesStructure"), false);
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "BuildSeriesStructure"), pd.Activities.First(x => x.Name == "MergeBuild"), false);

var conditions = new List<ConditionDefinition>
{
ConditionDefinition.CreateActionCondition(
ActionDefinitionReference.Create(
"CheckAllSubprocessesCompleted",
"0",
"{\"Mode\":\"AllSubprocessesAndParent\"}"),
false,
null)
};

CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "Start"), pd.Activities.First(x => x.Name == "ResourceCheck"));
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "ResourceCheck"), pd.Activities.First(x => x.Name == "BuildMDU"), true);
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "ResourceCheck"), pd.Activities.First(x => x.Name == "BuildSeriesStructure"));
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "BuildMDU"), pd.Activities.First(x => x.Name == "MergeBuild"), isSubProcessFinal: true);
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "BuildSeriesStructure"), pd.Activities.First(x => x.Name == "MergeBuild"));
CreateAndAddTransitions(pd, pd.Activities.First(x => x.Name == "MergeBuild"), pd.Activities.First(x => x.Name == "GetReadyStatus"), conditions: conditions);


(bool success, List<string> errors, string failedstep) = WorkflowInit.Runtime.Builder
Expand Down
Loading