Implement activity picker filtering

.editorconfig

@@ -9,6 +9,7 @@ indent_size=4
 # ReSharper properties
 resharper_csharp_max_line_length=240
 resharper_keep_user_linebreaks=true
+resharper_space_within_single_line_array_initializer_braces=true
 
 # Microsoft .NET properties
 csharp_new_line_before_members_in_object_initializers=false

src/activities/Elsa.Activities.Console/Activities/ReadLine/ReadLine.cs

@@ -12,10 +12,9 @@ namespace Elsa.Activities.Console
     /// <summary>
     /// Reads input from the console.
     /// </summary>
-    [ActivityDefinition(
+    [Action(
         Category = "Console",
         Description = "Read text from standard in.",
-        Icon = "fas fa-terminal",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class ReadLine : Activity
@@ -44,7 +43,7 @@ namespace Elsa.Activities.Console
 
         protected override IActivityExecutionResult OnResume(ActivityExecutionContext context)
         {
-            var receivedInput = (string)context.Input!;
+            var receivedInput = (string) context.Input!;
             return Execute(receivedInput);
         }
 

src/activities/Elsa.Activities.Console/Activities/WriteLine/WriteLine.cs

@@ -12,10 +12,9 @@ namespace Elsa.Activities.Console
     /// <summary>
     /// Writes a text string to the console.
     /// </summary>
-    [ActivityDefinition(
+    [Action(
         Category = "Console",
         Description = "Write text to standard out.",
-        Icon = "fas fa-terminal",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class WriteLine : Activity

src/activities/Elsa.Activities.Dropbox/Activities/SaveToDropbox.cs

@@ -9,10 +9,11 @@ using Elsa.Services.Models;
 
 namespace Elsa.Activities.Dropbox.Activities
 {
-    [ActivityDefinition(
+    [Action(
         Category = "Dropbox",
         Description = "Saves a given file or byte array to a folder in Dropbox",
-        Icon = "fab fa-dropbox")]
+        Outcomes = new[] { OutcomeNames.Done }
+    )]
     public class SaveToDropbox : Activity
     {
         private readonly IFilesApi _filesApi;

src/activities/Elsa.Activities.Email/Activities/SendEmail/SendEmail.cs

@@ -11,7 +11,7 @@ using MimeKit.Text;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Email
 {
-    [ActivityDefinition(Category = "Email", Description = "Send an email message.")]
+    [Action(Category = "Email", Description = "Send an email message.")]
     public class SendEmail : Activity
     {
         private readonly ISmtpService _smtpService;

src/activities/Elsa.Activities.Http/Activities/ReceiveHttpRequest/ReceiveHttpRequest.cs

@@ -15,11 +15,10 @@ using Microsoft.AspNetCore.Http;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Http
 {
-    [ActivityDefinition(
+    [Trigger(
         Category = "HTTP",
         DisplayName = "Receive HTTP Request",
         Description = "Receive an incoming HTTP request.",
-        RuntimeDescription = "x => !!x.state.path ? `Handle <strong>${ x.state.method } ${ x.state.path }</strong>.` : x.definition.description",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class ReceiveHttpRequest : Activity

src/activities/Elsa.Activities.Http/Activities/Redirect/Redirect.cs

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Localization;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Http
 {
-    [ActivityDefinition(
+    [Action(
         Category = "HTTP",
         DisplayName = "Redirect",
         Description = "Write an HTTP redirect response.",

src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs

@@ -19,15 +19,11 @@ using HttpRequestHeaders = Elsa.Activities.Http.Models.HttpRequestHeaders;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Http
 {
-    [ActivityDefinition(
+    [Action(
         Category = "HTTP",
         DisplayName = "Send HTTP Request",
         Description = "Send an HTTP request.",
-        Outcomes = new[]
+        Outcomes = new[] { OutcomeNames.Done }
-        {
-            OutcomeNames.Done,
-            "x => !!x.state.supportedStatusCodes ? ['UnSupportedStatusCode', ...x.state.supportedStatusCodes] : ['UnSupportedStatusCode']"
-        }
     )]
     public class SendHttpRequest : Activity
     {

src/activities/Elsa.Activities.Http/Activities/WriteHttpResponse/WriteHttpResponse.cs

@@ -13,7 +13,7 @@ using Microsoft.Extensions.Localization;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Http
 {
-    [ActivityDefinition(
+    [Action(
         Category = "HTTP",
         DisplayName = "Write HTTP Response",
         Description = "Write an HTTP response.",

src/activities/Elsa.Activities.MassTransit/Activities/CancelScheduledMassTransitMessage/CancelScheduledMassTransitMessage.cs

@@ -10,7 +10,7 @@ using Microsoft.Extensions.Options;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.MassTransit
 {
-    [ActivityDefinition(
+    [Action(
         Category = "MassTransit",
         DisplayName = "Cancel scheduled MassTransit Message",
         Description = "Cancel a scheduled message via MassTransit."

src/activities/Elsa.Activities.MassTransit/Activities/PublishMassTransitMessage/PublishMassTransitMessage.cs

@@ -8,7 +8,7 @@ using MassTransit;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.MassTransit
 {
-    [ActivityDefinition(
+    [Action(
         Category = "MassTransit",
         DisplayName = "Publish MassTransit Message",
         Description = "Publish an event via MassTransit."

src/activities/Elsa.Activities.MassTransit/Activities/ReceiveMassTransitMessage/ReceiveMassTransitMessage.cs

@@ -7,7 +7,7 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.MassTransit
 {
-    [ActivityDefinition(
+    [Trigger(
         Category = "MassTransit",
         DisplayName = "Receive MassTransit Message",
         Description = "Receive a message via MassTransit."

src/activities/Elsa.Activities.MassTransit/Activities/ScheduleSendMassTransitMessage/ScheduleSendMassTransitMessage.cs

@@ -13,7 +13,7 @@ using NodaTime;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.MassTransit
 {
-    [ActivityDefinition(
+    [Action(
         Category = "MassTransit",
         DisplayName = "Schedule MassTransit Message",
         Description = "Schedule a message via MassTransit."

src/activities/Elsa.Activities.MassTransit/Activities/SendMassTransitMessage/SendMassTransitMessage.cs

@@ -9,7 +9,7 @@ using MassTransit;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.MassTransit
 {
-    [ActivityDefinition(
+    [Action(
         Category = "MassTransit",
         DisplayName = "Send MassTransit Message",
         Description = "Send a message via MassTransit."

src/activities/Elsa.Activities.Timers/Activities/CronEvent/CronEvent.cs

@@ -6,18 +6,17 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Timers
 {
-    [ActivityDefinition(
+    [Trigger(
         Category = "Timers",
         Description = "Triggers periodically based on a specified CRON expression.",
-        RuntimeDescription = "x => !!x.state.cronExpression ? `<strong>${ x.state.cronExpression.expression }</strong>.` : x.definition.description",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class CronEvent : Activity
     {
         [ActivityProperty(Hint = "Specify a CRON expression. See https://crontab.guru/ for help.")]
         public string CronExpression { get; set; } = "* * * * *";
-        
+
-        protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context) => context.WorkflowExecutionContext.IsFirstPass ? (IActivityExecutionResult)Done() : Suspend();
+        protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context) => context.WorkflowExecutionContext.IsFirstPass ? (IActivityExecutionResult) Done() : Suspend();
         protected override IActivityExecutionResult OnResume() => Done();
     }
 }

src/activities/Elsa.Activities.Timers/Activities/InstantEvent/InstantEvent.cs

@@ -10,7 +10,7 @@ namespace Elsa.Activities.Timers
     /// <summary>
     /// Triggers at a specific instant in the future.
     /// </summary>
-    [ActivityDefinition(
+    [Trigger(
         Category = "Timers",
         Description = "Triggers at a specified moment in time."
     )]

src/activities/Elsa.Activities.Timers/Activities/TimerEvent/TimerEvent.cs

@@ -7,7 +7,7 @@ using NodaTime;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Timers
 {
-    [ActivityDefinition(Category = "Timers", Description = "Triggers at a specified interval.")]
+    [Trigger(Category = "Timers", Description = "Triggers at a specified interval.")]
     public class TimerEvent : Activity
     {
         [ActivityProperty(Hint = "An expression that evaluates to a Duration value.")]

src/activities/Elsa.Activities.UserTask/Activities/UserTask.cs

@@ -13,7 +13,7 @@ namespace Elsa.Activities.UserTask.Activities
     /// <summary>
     /// Stores a set of possible user actions and halts the workflow until one of the actions has been performed.
     /// </summary>
-    [ActivityDefinition(
+    [Trigger(
         Category = "User Tasks",
         Description = "Triggers when a user action is received.",
         Outcomes = new[] { OutcomeNames.Done, "x => x.state.actions" }

src/clients/Elsa.Client/Models/ActivityDescriptor.cs

@@ -8,10 +8,9 @@ namespace Elsa.Client.Models
         [DataMember(Order = 1)] public string Type { get; set; } = default!;
         [DataMember(Order = 2)] public string DisplayName { get; set; } = default!;
         [DataMember(Order = 3)] public string? Description { get; set; }
-        [DataMember(Order = 4)] public string? RuntimeDescription { get; set; }
+        [DataMember(Order = 4)] public string Category { get; set; } = default!;
-        [DataMember(Order = 5)] public string Category { get; set; } = default!;
+        [DataMember(Order = 5)] public ActivityTraits Traits { get; set; }
-        [DataMember(Order = 6)] public string? Icon { get; set; }
+        [DataMember(Order = 6)] public string[] Outcomes { get; set; } = new string[0];
-        [DataMember(Order = 7)] public string[] Outcomes { get; set; } = new string[0];
+        [DataMember(Order = 7)] public ActivityPropertyDescriptor[] Properties { get; set; } = new ActivityPropertyDescriptor[0];
-        [DataMember(Order = 8)] public ActivityPropertyDescriptor[] Properties { get; set; } = new ActivityPropertyDescriptor[0];
     }
 }

src/clients/Elsa.Client/Models/ActivityTraits.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Elsa.Client.Models
+{
+    [Flags]
+    public enum ActivityTraits
+    {
+        Action = 1,
+        Trigger = 2,
+        Job = 4
+    }
+}

src/core/Elsa.Abstractions/Attributes/ActionAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using Elsa.Metadata;
+
+namespace Elsa.Attributes
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public sealed class ActionAttribute : ActivityAttribute
+    {
+        public ActionAttribute()
+        {
+            Traits = ActivityTraits.Action;
+        }
+    }
+}

src/core/Elsa.Abstractions/Attributes/ActivityAttribute.cs

@@ -1,16 +1,16 @@
 using System;
+using Elsa.Metadata;
 
 namespace Elsa.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
-    public class ActivityDefinitionAttribute : Attribute
+    public class ActivityAttribute : Attribute
     {
         public string? Type { get; set; }
         public string? DisplayName { get; set; }
         public string? Description { get; set; }
-        public string? RuntimeDescription { get; set; }
         public string? Category { get; set; }
-        public string? Icon { get; set; }
+        public ActivityTraits Traits { get; set; } = ActivityTraits.Action;
         public string[]? Outcomes { get; set; }
     }
 }

src/core/Elsa.Abstractions/Attributes/TriggerAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+using Elsa.Metadata;
+
+namespace Elsa.Attributes
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public sealed class TriggerAttribute : ActivityAttribute
+    {
+        public TriggerAttribute()
+        {
+            Traits = ActivityTraits.Trigger;
+        }
+    }
+}

src/core/Elsa.Abstractions/Metadata/ActivityDescriptor.cs

@@ -7,6 +7,7 @@ namespace Elsa.Metadata
             Type = "Activity";
             Properties = new ActivityPropertyDescriptor[0];
             Category = "Miscellaneous";
+            Traits = ActivityTraits.Action;
             DisplayName = "Activity";
             Properties = new ActivityPropertyDescriptor[0];
             Outcomes = new string[0];
@@ -15,9 +16,8 @@ namespace Elsa.Metadata
         public string Type { get; set; }
         public string DisplayName { get; set; }
         public string? Description { get; set; }
-        public string? RuntimeDescription { get; set; }
         public string Category { get; set; }
-        public string? Icon { get; set; }
+        public ActivityTraits Traits { get; set; }
         public string[] Outcomes { get; set; }
         public ActivityPropertyDescriptor[] Properties { get; set; }
     }

src/core/Elsa.Abstractions/Metadata/ActivityTraits.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Elsa.Metadata
+{
+    [Flags]
+    public enum ActivityTraits
+    {
+        Action = 1,
+        Trigger = 2,
+        Job = 4
+    }
+}

src/core/Elsa.Core/Activities/ControlFlow/Finish/Finish.cs

@@ -6,10 +6,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Workflows",
-        Description = "Removes any blocking activities and sets the status of the workflow to Completed.",
+        Description = "Removes any blocking activities and sets the status of the workflow to Completed."
-        Icon = "fas fa-flag-checkered"
     )]
     public class Finish : Activity
     {

src/core/Elsa.Core/Activities/ControlFlow/For/For.cs

@@ -7,10 +7,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Iterate between two numbers.",
-        Icon = "far fa-circle",
         Outcomes = new[] { OutcomeNames.Iterate, OutcomeNames.Done }
     )]
     public class For : Activity

src/core/Elsa.Core/Activities/ControlFlow/ForEach/ForEach.cs

@@ -9,10 +9,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Iterate over a collection.",
-        Icon = "far fa-circle",
         Outcomes = new[] { OutcomeNames.Iterate, OutcomeNames.Done }
     )]
     public class ForEach : Activity

src/core/Elsa.Core/Activities/ControlFlow/Fork/Fork.cs

@@ -6,10 +6,9 @@ using Elsa.Services;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Fork workflow execution into multiple branches.",
-        Icon = "fas fa-code-branch fa-rotate-180",
         Outcomes = new[] { "x => x.state.branches" })]
     public class Fork : Activity
     {

src/core/Elsa.Core/Activities/ControlFlow/IfElse/IfElse.cs

@@ -6,11 +6,10 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         DisplayName = "If/Else",
         Category = "Control Flow",
         Description = "Evaluate a Boolean expression and continue execution depending on the result.",
-        RuntimeDescription = "x => !!x.state.expression ? `Evaluate <strong>${ x.state.expression.expression }</strong> and continue execution depending on the result.` : x.definition.description",
         Outcomes = new[] { True, False, OutcomeNames.Done }
     )]
     public class IfElse : Activity

src/core/Elsa.Core/Activities/ControlFlow/Join/Join.cs

@@ -13,11 +13,9 @@ using MediatR;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Merge workflow execution back into a single branch.",
-        Icon = "fas fa-code-branch",
-        RuntimeDescription = "x => !!x.state.joinMode ? `Merge workflow execution back into a single branch using mode <strong>${ x.state.joinMode }</strong>` : x.definition.description",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class Join : Activity, INotificationHandler<ActivityExecuted>

src/core/Elsa.Core/Activities/ControlFlow/ParallelForEach/ParallelForEach.cs

@@ -9,10 +9,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Iterate over a collection in parallel.",
-        Icon = "far fa-circle",
         Outcomes = new[] { OutcomeNames.Iterate, OutcomeNames.Done }
     )]
     public class ParallelForEach : Activity

src/core/Elsa.Core/Activities/ControlFlow/Switch/Switch.cs

@@ -8,12 +8,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
-        Description = "Switch execution based on a given expression.",
+        Description = "Switch execution based on a given expression."
-        Icon = "far fa-list-alt",
-        RuntimeDescription = "x => !!x.state.expression ? `Switch execution based on <strong>${ x.state.expression.expression }</strong>.` : x.definition.description",
-        Outcomes = new[] { "x => x.state.cases.map(c => c.toString())" }
     )]
     public class Switch : Activity
     {

src/core/Elsa.Core/Activities/ControlFlow/While/While.cs

@@ -6,10 +6,9 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.ControlFlow
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Control Flow",
         Description = "Execute while a given condition is true.",
-        Icon = "far fa-circle",
         Outcomes = new[] { OutcomeNames.Iterate, OutcomeNames.Done }
     )]
     public class While : Activity

src/core/Elsa.Core/Activities/Primitives/Correlate/Correlate.cs

@@ -8,10 +8,10 @@ namespace Elsa.Activities.Primitives
     /// <summary>
     /// Sets the CorrelationId of the workflow to a given value.
     /// </summary>
-    [ActivityDefinition(
+    [Activity(
         Category = "Workflows",
         Description = "Set the CorrelationId of the workflow to a given value.",
-        Icon = "fas fa-link"
+        Outcomes = new[] { OutcomeNames.Done }
     )]
     public class Correlate : Activity
     {

src/core/Elsa.Core/Activities/Primitives/SetVariable/SetVariable.cs

@@ -6,11 +6,10 @@ using Elsa.Services.Models;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Primitives
 {
-    [ActivityDefinition(
+    [Activity(
         DisplayName = "Set Variable",
         Description = "Set variable on the workflow.",
         Category = "Primitives",
-        RuntimeDescription = "x => !!x.state.variableName ? `<strong>${x.state.variableName}</strong> = <strong>${x.state.valueExpression.expression}</strong><br/>${x.state.valueExpression.syntax}` : x.definition.description",
         Outcomes = new[] { OutcomeNames.Done }
     )]
     public class SetVariable : Activity

src/core/Elsa.Core/Activities/Signaling/ReceiveSignal/ReceiveSignal.cs

@@ -11,10 +11,10 @@ namespace Elsa.Activities.Signaling
     /// <summary>
     /// Suspends workflow execution until the specified signal is received.
     /// </summary>
-    [ActivityDefinition(
+    [Trigger(
         Category = "Workflows",
-        Description = "Halt workflow execution until the specified signal is received.",
+        Description = "Suspend workflow execution until the specified signal is received.",
-        Icon = "fas fa-traffic-light"
+        Outcomes = new[] { OutcomeNames.Done }
     )]
     public class ReceiveSignal : Activity
     {
@@ -25,7 +25,7 @@ namespace Elsa.Activities.Signaling
         {
             if (context.Input is Signal triggeredSignal)
                 return string.Equals(triggeredSignal.SignalName, Signal, StringComparison.OrdinalIgnoreCase);
-            
+
             return false;
         }
 

src/core/Elsa.Core/Activities/Signaling/TriggerSignal/SendSignal.cs

@@ -12,10 +12,10 @@ namespace Elsa.Activities.Signaling
     /// <summary>
     /// Triggers the specified signal.
     /// </summary>
-    [ActivityDefinition(
+    [Action(
         Category = "Workflows",
         Description = "Sends the specified signal.",
-        Icon = "fas fa-broadcast-tower"
+        Outcomes = new[] { OutcomeNames.Done }
     )]
     public class SendSignal : Activity
     {

src/core/Elsa.Core/Activities/Workflows/RunWorkflow/RunWorkflow.cs

@@ -11,7 +11,7 @@ using Open.Linq.AsyncExtensions;
 // ReSharper disable once CheckNamespace
 namespace Elsa.Activities.Workflows
 {
-    [ActivityDefinition(
+    [Activity(
         Category = "Workflows",
         Description = "Runs a child workflow."
     )]

src/core/Elsa.Core/Metadata/ActivityDescriber.cs

@@ -21,18 +21,17 @@ namespace Elsa.Metadata
         
         public ActivityDescriptor Describe(Type activityType)
         {
-            var activityDefinitionAttribute = activityType.GetCustomAttribute<ActivityDefinitionAttribute>();
+            var activityAttribute = activityType.GetCustomAttribute<ActivityAttribute>();
-            var typeName = activityDefinitionAttribute?.Type ?? activityType.Name;
+            var typeName = activityAttribute?.Type ?? activityType.Name;
             
             var displayName =
-                activityDefinitionAttribute?.DisplayName ??
+                activityAttribute?.DisplayName ??
                 activityType.Name.Humanize(LetterCasing.Title);
             
-            var description = activityDefinitionAttribute?.Description;
+            var description = activityAttribute?.Description;
-            var runtimeDescription = activityDefinitionAttribute?.RuntimeDescription;
+            var category = activityAttribute?.Category ?? "Miscellaneous";
-            var category = activityDefinitionAttribute?.Category ?? "Miscellaneous";
+            var traits = activityAttribute?.Traits ?? ActivityTraits.Action;
-            var icon = activityDefinitionAttribute?.Icon;
+            var outcomes = activityAttribute?.Outcomes ?? new[] { OutcomeNames.Done };
-            var outcomes = activityDefinitionAttribute?.Outcomes ?? new[] { OutcomeNames.Done };
             var properties = DescribeProperties(activityType);
 
             return new ActivityDescriptor
@@ -40,9 +39,8 @@ namespace Elsa.Metadata
                 Type = typeName.Pascalize(),
                 DisplayName = displayName,
                 Description = description,
-                RuntimeDescription = runtimeDescription,
                 Category = category,
-                Icon = icon,
+                Traits = traits,
                 Properties = properties.ToArray(),
                 Outcomes = outcomes
             };

src/dashboards/blazor/ElsaDashboard.Application.Server/Program.cs

@@ -6,7 +6,7 @@ namespace ElsaDashboard.Application.Server
 {
     public class Program
     {
-        public static bool UseBlazorServer = false;
+        public static bool UseBlazorServer = true;
         public static bool UseBlazorWebAssembly => !UseBlazorServer;
         public static RenderMode RenderMode => UseBlazorServer ? RenderMode.ServerPrerendered: RenderMode.WebAssemblyPrerendered;
 

src/dashboards/blazor/ElsaDashboard.Application/Pages/Designer/ActivityPicker.razor

@@ -9,26 +9,20 @@
                 <line x1="21" y1="21" x2="15" y2="15"/>
             </svg>
         </div>
-        <input class="form-input block w-full pl-10 sm:text-sm sm:leading-5"placeholder="Search activities">
+        <input type="text" @bind="ActivitySearchText" @bind:event="oninput" class="form-input block w-full pl-10 sm:text-sm sm:leading-5" placeholder="Search activities">
     </div>
 </div>
 
 <div class="border-b border-gray-200">
     <div class="px-6">
         <nav class="-mb-px flex space-x-6" x-descriptions="Tab component">
-            <a href="#"
+            @foreach (var activityTypeFilter in ActivityTraitFilters)
-               class="whitespace-no-wrap pb-4 px-1 border-b-2 border-blue-500 font-medium text-sm leading-5 text-blue-600 focus:outline-none focus:text-blue-800 focus:border-blue-700"
+            {
-               aria-current="page">
+                var activeClass = activityTypeFilter == SelectedActivityTraitFilter ? "border-blue-500 text-blue-600 focus:text-blue-800 focus:border-blue-700" : "border-transparent text-gray-500 focus:text-gray-700 focus:border-gray-300";
-                All
+                <a href="#" @onclick:preventDefault @onclick="@(() => OnActivityTypeFilterClick(activityTypeFilter))" class="whitespace-no-wrap pb-4 px-1 border-b-2 font-medium text-sm leading-5 focus:outline-none @activeClass" aria-current="page">
-            </a>
+                    @activityTypeFilter.ToString()
-            <a href="#"
+                </a>
-               class="whitespace-no-wrap pb-4 px-1 border-b-2 border-transparent font-medium text-sm leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300">
+            }
-                Actions
-            </a>
-            <a href="#"
-               class="whitespace-no-wrap pb-4 px-1 border-b-2 border-transparent font-medium text-sm leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300">
-                Triggers
-            </a>
         </nav>
     </div>
 </div>

src/dashboards/blazor/ElsaDashboard.Application/Pages/Designer/ActivityPicker.razor.cs

@@ -1,21 +1,61 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Elsa.Client.Models;
 using ElsaDashboard.Shared.Rpc;
 using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
 
 namespace ElsaDashboard.Application.Pages.Designer
 {
     partial class ActivityPicker
     {
         [Inject] private IActivityService ActivityService { get; set; } = default!;
-        private ICollection<IGrouping<string, ActivityDescriptor>> ActivityGroupings { get; set; } = new System.Collections.Generic.List<IGrouping<string, ActivityDescriptor>>();
+        private ActivityTraitFilter SelectedActivityTraitFilter { get; set; }
+        private string? ActivitySearchText { get; set; }
+        private ICollection<ActivityTraitFilter> ActivityTraitFilters => new[] { ActivityTraitFilter.All, ActivityTraitFilter.Actions, ActivityTraitFilter.Triggers };
+        private ICollection<ActivityDescriptor> Activities { get; set; } = new System.Collections.Generic.List<ActivityDescriptor>();
+
+        private ICollection<IGrouping<string, ActivityDescriptor>> ActivityGroupings =>
+            FilterBySearchText(
+                    FilterByTrait(Activities, SelectedActivityTraitFilter),
+                    ActivitySearchText)
+                .GroupBy(x => x.Category)
+                .ToList();
 
         protected override async Task OnInitializedAsync()
         {
             var response = (await ActivityService.GetActivitiesAsync());
-            ActivityGroupings = response.Activities.GroupBy(x => x.Category).ToList();
+            Activities = response.Activities.ToList();
+        }
+
+        private void OnActivityTypeFilterClick(ActivityTraitFilter activityTraitFilter)
+        {
+            SelectedActivityTraitFilter = activityTraitFilter;
+        }
+
+        private static IEnumerable<ActivityDescriptor> FilterByTrait(IEnumerable<ActivityDescriptor> activities, ActivityTraitFilter filter) =>
+            filter switch
+            {
+                ActivityTraitFilter.Actions => activities.Where(x => (x.Traits & ActivityTraits.Action) == ActivityTraits.Action),
+                ActivityTraitFilter.Triggers => activities.Where(x => (x.Traits & ActivityTraits.Trigger) == ActivityTraits.Trigger),
+                ActivityTraitFilter.All => activities,
+                _ => activities
+            };
+
+        private static IEnumerable<ActivityDescriptor> FilterBySearchText(IEnumerable<ActivityDescriptor> activities, string? searchText)
+        {
+            if (string.IsNullOrWhiteSpace(searchText))
+                return activities;
+
+            return
+                from activity in activities
+                where
+                    (activity.Description ?? "").Contains(searchText, StringComparison.InvariantCultureIgnoreCase) ||
+                    (activity.DisplayName ?? "").Contains(searchText, StringComparison.InvariantCultureIgnoreCase) ||
+                    activity.Type.Contains(searchText, StringComparison.InvariantCultureIgnoreCase)
+                select activity;
         }
     }
 }

src/dashboards/blazor/ElsaDashboard.Application/Pages/Designer/ActivityTraitFilter.cs

@@ -0,0 +1,9 @@
+namespace ElsaDashboard.Application.Pages.Designer
+{
+    public enum ActivityTraitFilter
+    {
+        All,
+        Actions,
+        Triggers
+    }
+}