fix(Dashboard): fixed correlation navigation to their outcome

JBBianchi · JBBianchi · commit a988330a27f2 · 2024-08-30T14:21:28.000+02:00
Signed-off-by: Jean-Baptiste Bianchi &lt;jb.bianchi@neuroglia.io&gt;
diff --git a/src/api/Synapse.Api.Server/Program.cs b/src/api/Synapse.Api.Server/Program.cs
@@ -144,6 +144,7 @@
 {
     app.MapFallbackToFile("index.html");
     app.MapFallbackToFile("/workflows/details/{namespace}/{name}/{version?}/{instanceName?}", "index.html");
+    app.MapFallbackToFile("/workflow-intances/{instanceName?}", "index.html");
 }
     
 await app.RunAsync();
diff --git a/src/dashboard/Synapse.Dashboard/App.razor b/src/dashboard/Synapse.Dashboard/App.razor
@@ -1,4 +1,20 @@
-﻿@implements IDisposable
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@implements IDisposable
 @inject IApplicationLayout Layout
 
 <CascadingAuthenticationState>
diff --git a/src/dashboard/Synapse.Dashboard/Components/ResourceEditor/ResourceEditor.razor b/src/dashboard/Synapse.Dashboard/Components/ResourceEditor/ResourceEditor.razor
@@ -1,4 +1,20 @@
-﻿@namespace Synapse.Dashboard.Components
+﻿﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@namespace Synapse.Dashboard.Components
 @using Synapse.Dashboard.Components.ResourceEditorStateManagement
 @typeparam TResource where TResource : Resource, new()
 @inherits StatefulComponent<ResourceEditor<TResource>, ResourceEditorStore<TResource>, ResourceEditorState<TResource>>
diff --git a/src/dashboard/Synapse.Dashboard/Components/ResourceManagement/NamespacedResourceManagementComponentStore.cs b/src/dashboard/Synapse.Dashboard/Components/ResourceManagement/NamespacedResourceManagementComponentStore.cs
@@ -69,15 +69,10 @@ public void SetNamespace(string? @namespace)
     /// <returns>A new awaitable <see cref="Task"/></returns>
     public virtual async Task ListNamespaceAsync()
     {
-        this.Reduce(state => state with
-        {
-            Loading = true
-        });
-        var namespaceList = new EquatableList<Namespace>(await (await this.ApiClient.Namespaces.ListAsync().ConfigureAwait(false)).ToListAsync().ConfigureAwait(false));
+        var namespaceList = new EquatableList<Namespace>(await (await this.ApiClient.Namespaces.ListAsync().ConfigureAwait(false)).OrderBy(ns => ns.GetQualifiedName()).ToListAsync().ConfigureAwait(false));
         this.Reduce(s => s with
         {
-            Namespaces = namespaceList,
-            Loading = false
+            Namespaces = namespaceList
         });
     }
 
diff --git a/src/dashboard/Synapse.Dashboard/Components/ResourceManagement/ResourceManagementComponentStoreBase.cs b/src/dashboard/Synapse.Dashboard/Components/ResourceManagement/ResourceManagementComponentStoreBase.cs
@@ -133,7 +133,7 @@ public override async Task InitializeAsync()
             onCompletedAsync: () => Task.CompletedTask, 
             cancellationToken: this.CancellationTokenSource.Token
         );
-        this.Filter.Throttle(TimeSpan.FromMilliseconds(100)).SubscribeAsync(
+        this.Filter.Throttle(TimeSpan.FromMilliseconds(10)).SubscribeAsync(
             onNextAsync: this.ListResourcesAsync,
             onErrorAsync: ex => Task.Run(() => Console.WriteLine(ex)),
             onCompletedAsync: () => Task.CompletedTask,
diff --git a/src/dashboard/Synapse.Dashboard/Components/WorkflowDetails/WorkflowDetails.razor b/src/dashboard/Synapse.Dashboard/Components/WorkflowDetails/WorkflowDetails.razor
@@ -1,4 +1,20 @@
-﻿@namespace Synapse.Dashboard.Components
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@namespace Synapse.Dashboard.Components
 
 <WorkflowDiagram WorkflowDefinition="Workflow.Spec.Versions.GetLatest()" Orientation="WorkflowDiagramOrientation.TopToBottom"  />
 
diff --git a/src/dashboard/Synapse.Dashboard/Components/WorkflowInstancesList/WorkflowInstancesList.razor b/src/dashboard/Synapse.Dashboard/Components/WorkflowInstancesList/WorkflowInstancesList.razor
@@ -25,7 +25,7 @@
         @Title
         <span>@(WorkflowInstances?.Count() ?? 0) items</span>
         <div class="d-flex">
-            @if (Workflows != null && Workflows.Count() > 1) {
+            @if (Workflows != null && Workflows.Count() > 0) {
                 <select class="form-select m-2" @onchange="OnSelectWorkflowChangedAsync">
                     <option value="">All workflows</option>
                     @foreach (var workflowResource in Workflows)
@@ -150,7 +150,7 @@
                                             </div>
                                             break;
                                         case "Delete":
-                                            <a class="dropdown-item text-danger" href="#" @onclick="async _ => await OnDeleteClickedAsync(instance)" @onclick:preventDefault="true" @onclick:stopPropagation="true"><Icon Name="IconName.Trash" /></a>
+                                            <a class="dropdown-item text-danger" href="#" @onclick="async _ => await OnDeleteClickedAsync(instance)" @onclick:stopPropagation="true"><Icon Name="IconName.Trash" /></a>
                                             break;
                                         default:
                                             break;
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Authentication/Bearer/Login.razor b/src/dashboard/Synapse.Dashboard/Pages/Authentication/Bearer/Login.razor
@@ -1,4 +1,20 @@
-﻿@page "/authentication/bearer/login"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/authentication/bearer/login"
 @layout EmptyLayout
 @inject ISecurityTokenManager SecurityTokenManager
 @inject IJSRuntime JsRuntime
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Authentication/Oidc/Oidc.razor b/src/dashboard/Synapse.Dashboard/Pages/Authentication/Oidc/Oidc.razor
@@ -1,4 +1,20 @@
-﻿@page "/authentication/oidc/{action}"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/authentication/oidc/{action}"
 @layout EmptyLayout
 
 <RemoteAuthenticatorView Action="@Action" />
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Authentication/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Authentication/View.razor
@@ -1,4 +1,20 @@
-﻿@page "/authentication"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/authentication"
 @inject IOptions<ApplicationOptions> Options
 
 <ApplicationTitle>Authentication</ApplicationTitle>
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Correlations/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Correlations/List/View.razor
@@ -68,7 +68,7 @@
                         <td class="text-center" title="@GetEventConsumptionStrategyTitle(correlation)"><span class="badge rounded-pill border border-secondary text-secondary">@GetEventConsumptionStrategy(correlation)</span></td>
                         <td class="text-center" title="The number of event filters defined by the correlation">@GetFilterCount(correlation)</td>
                         <td class="text-center" title="@GetOutcomeTypeTitle(correlation)"><span class="badge rounded-pill border border-secondary text-secondary">@GetOutcomeType(correlation)</span></td>
-                        <td class="text-center" title="@GetOutcomeTargetTitle(correlation)"><a @onclick:preventDefault="true" @onclick:stopPropagation="true" href="@GetOutcomeTargetRef(correlation)">@GetOutcomeTarget(correlation)</a></td>
+                        <td class="text-center" title="@GetOutcomeTargetTitle(correlation)"><a @onclick:stopPropagation="true" href="@GetOutcomeTargetRef(correlation)">@GetOutcomeTarget(correlation)</a></td>
                         <td class="text-center" title="The amount of active correlation contexts">@correlation.Status?.Contexts.Count</td>
                         <td class="text-end">
                             <button class="btn btn-sm btn-dark" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false" title="" @onclick:stopPropagation="true"><i class="bi bi-three-dots-vertical"></i></button>
@@ -177,7 +177,16 @@
 
     string GetOutcomeTargetRef(Correlation correlation)
     {
-        if (correlation.Spec.Outcome.Start != null) return $"/workflows/{correlation.Spec.Outcome.Start.Workflow.ToString()}";
+        if (correlation.Spec.Outcome.Start != null)
+        {
+            var definitionSegments = correlation.Spec.Outcome.Start.Workflow.ToString().Split(':');
+            var version = definitionSegments.Last();
+            var nameNs = definitionSegments.First();
+            var segments = nameNs.Split('.');
+            var ns = segments.Last();
+            var name = segments.Take(segments.Count() - 1).Join('.');
+            return $"/workflows/details/{ns}/{name}/{version}";
+        }
         else return $"/workflow-instances/{correlation.Spec.Outcome.Correlate!.Instance}";
     }
 
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Correlators/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Correlators/List/View.razor
@@ -1,4 +1,20 @@
-﻿@page "/correlators"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/correlators"
 @attribute [Authorize]
 @namespace Synapse.Dashboard.Pages.Correlators.List
 @inherits NamespacedResourceManagementComponent<Correlator>
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Namespaces/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Namespaces/List/View.razor
@@ -1,4 +1,20 @@
-﻿@page "/namespaces/{name?}"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/namespaces/{name?}"
 @attribute [Authorize]
 @namespace Synapse.Dashboard.Pages.Namespaces.List
 @inherits ClusterResourceManagementComponent<Namespace>
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Operators/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Operators/List/View.razor
@@ -1,4 +1,20 @@
-﻿@page "/operators/{namespace?}/{name?}"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/operators/{namespace?}/{name?}"
 @attribute [Authorize]
 @namespace Synapse.Dashboard.Pages.Operators.List
 @inherits NamespacedResourceManagementComponent<Operator>
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Users/Profile.razor b/src/dashboard/Synapse.Dashboard/Pages/Users/Profile.razor
@@ -1,4 +1,20 @@
-﻿@page "/users/profile"
+﻿@*
+    Copyright © 2024-Present The Synapse Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*@
+
+@page "/users/profile"
 @attribute [Authorize]
 @inject ApplicationAuthenticationStateProvider AuthenticationStateProvider
 @inject IBreadcrumbManager BreadcrumbManager
diff --git a/src/dashboard/Synapse.Dashboard/Pages/WorkflowInstances/List/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/WorkflowInstances/List/Store.cs
@@ -47,15 +47,10 @@ public class WorkflowInstanceListComponentStore(ISynapseApiClient apiClient, Res
     /// <returns>A new awaitable <see cref="Task"/></returns>
     public virtual async Task ListWorkflowsAsync()
     {
-        this.Reduce(state => state with
-        {
-            Loading = true
-        });
-        var workflowList = new EquatableList<Workflow>(await (await this.ApiClient.Workflows.ListAsync(null!).ConfigureAwait(false)).ToListAsync().ConfigureAwait(false));
+        var workflowList = new EquatableList<Workflow>(await (await this.ApiClient.Workflows.ListAsync(null!).ConfigureAwait(false)).OrderBy(ns => ns.GetQualifiedName()).ToListAsync().ConfigureAwait(false));
         this.Reduce(s => s with
         {
-            Workflows = workflowList,
-            Loading = false
+            Workflows = workflowList
         });
     }
 
@@ -65,15 +60,10 @@ public virtual async Task ListWorkflowsAsync()
     /// <returns>A new awaitable <see cref="Task"/></returns>
     public async Task ListOperatorsAsync()
     {
-        this.Reduce(state => state with
-        {
-            Loading = true
-        });
-        var operatorList = new EquatableList<Operator>(await (await this.ApiClient.Operators.ListAsync().ConfigureAwait(false)).ToListAsync().ConfigureAwait(false));
+        var operatorList = new EquatableList<Operator>(await (await this.ApiClient.Operators.ListAsync().ConfigureAwait(false)).OrderBy(ns => ns.GetQualifiedName()).ToListAsync().ConfigureAwait(false));
         this.Reduce(s => s with
         {
-            Operators = operatorList,
-            Loading = false
+            Operators = operatorList
         });
     }
 
@@ -89,12 +79,10 @@ public void SetOperator(string? operatorName)
         });
     }
 
-
-
     /// <inheritdoc/>
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync(); 
+        await base.InitializeAsync();
         await this.ListWorkflowsAsync().ConfigureAwait(false);
         await this.ListOperatorsAsync().ConfigureAwait(false);
         this.Operator.Subscribe(operatorName => {
diff --git a/src/dashboard/Synapse.Dashboard/Pages/WorkflowInstances/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/WorkflowInstances/List/View.razor
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/List/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/Workflows/List/Store.cs
diff --git a/src/dashboard/Synapse.Dashboard/Pages/Workflows/List/View.razor b/src/dashboard/Synapse.Dashboard/Pages/Workflows/List/View.razor
diff --git a/src/dashboard/Synapse.Dashboard/wwwroot/js/js-interop.js b/src/dashboard/Synapse.Dashboard/wwwroot/js/js-interop.js

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@`
`144`	`144`	`{`
`145`	`145`	`app.MapFallbackToFile("index.html");`
`146`	`146`	`app.MapFallbackToFile("/workflows/details/{namespace}/{name}/{version?}/{instanceName?}", "index.html");`
	`147`	`+ app.MapFallbackToFile("/workflow-intances/{instanceName?}", "index.html");`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`await app.RunAsync();`
Original file line number	Diff line number	Diff line change
`@@ -69,15 +69,10 @@ public void SetNamespace(string? @namespace)`
`69`	`69`	`/// <returns>A new awaitable <see cref="Task"/></returns>`
`70`	`70`	`public virtual async Task ListNamespaceAsync()`
`71`	`71`	`{`
`72`		`- this.Reduce(state => state with`
`73`		`- {`
`74`		`- Loading = true`
`75`		`- });`
`76`		`- var namespaceList = new EquatableList<Namespace>(await (await this.ApiClient.Namespaces.ListAsync().ConfigureAwait(false)).ToListAsync().ConfigureAwait(false));`
	`72`	`+ var namespaceList = new EquatableList<Namespace>(await (await this.ApiClient.Namespaces.ListAsync().ConfigureAwait(false)).OrderBy(ns => ns.GetQualifiedName()).ToListAsync().ConfigureAwait(false));`
`77`	`73`	`this.Reduce(s => s with`
`78`	`74`	`{`
`79`		`- Namespaces = namespaceList,`
`80`		`- Loading = false`
	`75`	`+ Namespaces = namespaceList`
`81`	`76`	`});`
`82`	`77`	`}`
`83`	`78`