Skip to content

Commit

Permalink
Revert "Provide tag support for workflows (#2990)" (#2991)
Browse files Browse the repository at this point in the history
This reverts commit 34a979f.
  • Loading branch information
sfmskywalker committed May 3, 2022
1 parent 34a979f commit 00c8845
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 23 deletions.
9 changes: 1 addition & 8 deletions src/core/Elsa.Core/Builders/WorkflowDefinitionBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class WorkflowDefinitionBuilder : IWorkflowDefinitionBuilder
public int Version { get; private set; } = 1;
public IActivity? Root { get; private set; }
public ICollection<Variable> Variables { get; set; } = new List<Variable>();
public ICollection<string> Tags { get; set; } = new List<string>();
public IDictionary<string, object> Metadata { get; set; } = new Dictionary<string, object>();
public IDictionary<string, object> ApplicationProperties { get; set; } = new Dictionary<string, object>();

Expand Down Expand Up @@ -50,12 +49,6 @@ public IWorkflowDefinitionBuilder WithVariables(params Variable[] variables)
foreach (var variable in variables) Variables.Add(variable);
return this;
}

public IWorkflowDefinitionBuilder WithTags(params string[] tags)
{
foreach (var tag in tags) Tags.Add(tag);
return this;
}

public IWorkflowDefinitionBuilder WithMetadata(string name, object value)
{
Expand All @@ -77,7 +70,7 @@ public Workflow BuildWorkflow()
var identity = new WorkflowIdentity(definitionId, Version, id);
var publication = WorkflowPublication.LatestAndPublished;
var metadata = new WorkflowMetadata();
return new Workflow(identity, publication, metadata, root, Variables, Tags, Metadata, ApplicationProperties);
return new Workflow(identity, publication, metadata, root, Variables, Metadata, ApplicationProperties);
}

public async Task<Workflow> BuildWorkflowAsync(IWorkflow workflowDefinition, CancellationToken cancellationToken = default)
Expand Down
4 changes: 0 additions & 4 deletions src/core/Elsa.Core/Models/Workflow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ public class Workflow : Composite, ICloneable
WorkflowMetadata workflowMetadata,
IActivity root,
ICollection<Variable> variables,
ICollection<string> tags,
IDictionary<string, object> metadata,
IDictionary<string, object> applicationProperties)
{
Identity = identity;
Publication = publication;
WorkflowMetadata = workflowMetadata;
Variables = variables;
Tags = tags;
Metadata = metadata;
ApplicationProperties = applicationProperties;
Root = root;
Expand All @@ -31,7 +29,6 @@ public class Workflow : Composite, ICloneable
new WorkflowMetadata(),
root,
new List<Variable>(),
new List<string>(),
new Dictionary<string, object>(),
new Dictionary<string, object>());

Expand All @@ -49,7 +46,6 @@ public Register CreateRegister()
public WorkflowPublication Publication { get; set; }
public WorkflowMetadata WorkflowMetadata { get; set; }
public ICollection<Variable> Variables { get; init; }
public ICollection<string> Tags { get; init; }
public Workflow Clone() => (Workflow)((ICloneable)this).Clone();
object ICloneable.Clone() => MemberwiseClone();
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class WorkflowDefinition : Entity
public DateTimeOffset CreatedAt { get; set; }
public int Version { get; set; } = 1;
public ICollection<Variable> Variables { get; set; } = new List<Variable>();
public ICollection<string> Tags { get; set; } = new List<string>();
public IDictionary<string, object> Metadata { get; set; } = new Dictionary<string, object>();
public IDictionary<string, object> ApplicationProperties { get; set; } = new Dictionary<string, object>();
public bool IsLatest { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public static Workflow ToWorkflow(this WorkflowDefinition definition, IActivity
new WorkflowMetadata(definition.Name, definition.Description, definition.CreatedAt),
root,
definition.Variables,
definition.Tags,
definition.Metadata,
definition.ApplicationProperties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ private async Task AddOrUpdateAsync(WorkflowDefinition definition, CancellationT
existingDefinition.Name = definition.Name;
existingDefinition.Metadata = definition.Metadata;
existingDefinition.Variables = definition.Variables;
existingDefinition.Tags = definition.Tags;
existingDefinition.ApplicationProperties = definition.ApplicationProperties;
existingDefinition.BinaryData = definition.BinaryData;
existingDefinition.StringData = definition.StringData;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ private async Task<WorkflowDefinitionResult> BuildWorkflowDefinition(Func<IServi
Description = workflow.WorkflowMetadata.Description,
Metadata = workflow.Metadata,
Variables = workflow.Variables,
Tags = workflow.Tags,
ApplicationProperties = workflow.ApplicationProperties,
IsLatest = workflow.Publication.IsLatest,
IsPublished = workflow.Publication.IsPublished,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ public class WorkflowDefinitionConfiguration : IEntityTypeConfiguration<Workflow
public void Configure(EntityTypeBuilder<WorkflowDefinition> builder)
{
builder.Ignore(x => x.Variables);
builder.Ignore(x => x.Tags);
builder.Ignore(x => x.Metadata);
builder.Ignore(x => x.ApplicationProperties);
builder.Property<string>("Data");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public void Serialize(ElsaDbContext dbContext, WorkflowDefinition entity)
var data = new
{
entity.Variables,
entity.Tags,
entity.Metadata,
entity.ApplicationProperties
};
Expand All @@ -33,7 +32,7 @@ public void Serialize(ElsaDbContext dbContext, WorkflowDefinition entity)

public void Deserialize(ElsaDbContext dbContext, WorkflowDefinition entity)
{
var data = new WorkflowDefinitionState(entity.Variables, entity.Tags, entity.Metadata, entity.ApplicationProperties);
var data = new WorkflowDefinitionState(entity.Variables, entity.Metadata, entity.ApplicationProperties);
var json = (string?) dbContext.Entry(entity).Property("Data").CurrentValue;

if (!string.IsNullOrWhiteSpace(json))
Expand All @@ -43,7 +42,6 @@ public void Deserialize(ElsaDbContext dbContext, WorkflowDefinition entity)
}

entity.Variables = data.Variables;
entity.Tags = data.Tags;
entity.Metadata = data.Metadata;
entity.ApplicationProperties = data.ApplicationProperties;
}
Expand All @@ -55,16 +53,14 @@ public WorkflowDefinitionState()
{
}

public WorkflowDefinitionState(ICollection<Variable> variables, ICollection<string> tags, IDictionary<string, object> metadata, IDictionary<string, object> applicationProperties)
public WorkflowDefinitionState(ICollection<Variable> variables, IDictionary<string, object> metadata, IDictionary<string, object> applicationProperties)
{
Variables = variables;
Tags = tags;
Metadata = metadata;
ApplicationProperties = applicationProperties;
}

public ICollection<Variable> Variables { get; set; } = new List<Variable>();
public ICollection<string> Tags { get; set; } = new List<string>();
public IDictionary<string, object> Metadata { get; set; } = new Dictionary<string, object>();
public IDictionary<string, object> ApplicationProperties { get; set; } = new Dictionary<string, object>();
}
Expand Down

0 comments on commit 00c8845

Please sign in to comment.