fix(Dashboard): improved filtering "racing"

Signed-off-by: Jean-Baptiste Bianchi <[email protected]>

Author: JBBianchi

src/dashboard/Synapse.Dashboard/Components/ResourceManagement/NamespacedResourceManagementComponent.cs

@@ -45,13 +45,13 @@ public abstract class NamespacedResourceManagementComponent<TComponent, TStore,
     /// <inheritdoc/>
     protected override async Task OnInitializedAsync()
     {
-        await base.OnInitializedAsync();
         this.Store.Namespace.Subscribe(value => this.OnStateChanged(_ =>
         {
             this.@namespace = value;
-            if (Namespace != value) this.Namespace = value;
+            //if (Namespace != value) this.Namespace = value;
         }), token: this.CancellationTokenSource.Token);
         this.Store.Namespaces.Subscribe(value => this.OnStateChanged(_ => Namespaces = value), token: this.CancellationTokenSource.Token);
+        await base.OnInitializedAsync();
     }
 
     /// <inheritdoc/>

src/dashboard/Synapse.Dashboard/Components/ResourceManagement/NamespacedResourceManagementComponentStore.cs

@@ -12,8 +12,6 @@
 // limitations under the License.
 
 using Synapse.Api.Client.Services;
-using Synapse.Dashboard.Components.DocumentDetailsStateManagement;
-using System.Reactive.Linq;
 
 namespace Synapse.Dashboard.Components.ResourceManagement;
 
@@ -87,8 +85,8 @@ public override async Task DeleteResourceAsync(TResource resource)
     /// <inheritdoc/>
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync();
         await this.ListNamespaceAsync().ConfigureAwait(false);
+        await base.InitializeAsync();
     }
 
 }

src/dashboard/Synapse.Dashboard/Components/ResourceManagement/ResourceManagementComponent.cs

@@ -93,7 +93,7 @@ public abstract class ResourceManagementComponent<TComponent, TStore, TState, TR
     /// </summary>
     protected ElementReference? CheckboxAll { get; set; } = null;
 
-    string activeResourcesName = null!;
+    string activeResourceName = null!;
     /// <summary>
     /// Gets/sets the name of the active resource
     /// </summary>
@@ -102,7 +102,6 @@ public abstract class ResourceManagementComponent<TComponent, TStore, TState, TR
     /// <inheritdoc/>
     protected override async Task OnInitializedAsync()
     {
-        await base.OnInitializedAsync().ConfigureAwait(false);
         Observable.CombineLatest(
             this.Store.Resources,
             this.Store.SelectedResourceNames,
@@ -131,7 +130,7 @@ protected override async Task OnInitializedAsync()
                 }
             }
         }, cancellationToken: this.CancellationTokenSource.Token);
-        this.Store.ActiveResourceName.Subscribe(value => this.OnStateChanged(_ => this.activeResourcesName = value), token: this.CancellationTokenSource.Token);
+        this.Store.ActiveResourceName.Subscribe(value => this.OnStateChanged(_ => this.activeResourceName = value), token: this.CancellationTokenSource.Token);
         this.Store.SearchTerm.Subscribe(value => this.OnStateChanged(_ => this.SearchTerm = value), token: this.CancellationTokenSource.Token);
         this.Store.Loading.Subscribe(value => this.OnStateChanged(_ => this.Loading = value), token: this.CancellationTokenSource.Token);
         this.Store.Definition.SubscribeAsync(async definition =>
@@ -152,13 +151,14 @@ protected override async Task OnInitializedAsync()
                 await this.OnShowResourceDetailsAsync(resource);
             }
         }, cancellationToken: CancellationTokenSource.Token);
+        await base.OnInitializedAsync().ConfigureAwait(false);
     }
 
 
     /// <inheritdoc/>
     protected override async Task OnParametersSetAsync()
     {
-        if (!string.IsNullOrEmpty(Name) && Name != activeResourcesName)
+        if (!string.IsNullOrEmpty(Name) && Name != activeResourceName)
         {
             Store.SetActiveResourceName(Name);
         }

src/dashboard/Synapse.Dashboard/Components/ResourceManagement/ResourceManagementComponentStoreBase.cs

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 using Synapse.Api.Client.Services;
-using Synapse.Dashboard.Components.DocumentDetailsStateManagement;
 
 namespace Synapse.Dashboard.Components.ResourceManagement;
 

src/dashboard/Synapse.Dashboard/Pages/Operators/List/View.razor

@@ -37,7 +37,7 @@
                 {
                     foreach (var namespaceResource in Namespaces)
                     {
-                        <option value="@namespaceResource.GetName()" selected="@(@namespaceResource.GetName() == Namespace)">@namespaceResource.GetName()</option>
+                        <option value="@namespaceResource.GetName()" selected="@(@namespaceResource.GetName() == @namespace)">@namespaceResource.GetName()</option>
                     }
                 }
             </select>

src/dashboard/Synapse.Dashboard/Pages/Workflows/Details/View.razor

@@ -22,7 +22,7 @@
 @inject IBreadcrumbManager BreadcrumbManager
 @inject NavigationManager NavigationManager
 
-<ApplicationTitle>Workflow @($"{Name}.{Namespace}:{version}")</ApplicationTitle>
+<ApplicationTitle>Workflow @($"{Name}.{@namespace}:{version}")</ApplicationTitle>
 
 <div class="d-flex flex-grow mh-100">
     <HorizontalCollapsible class="collapsible-instances">
@@ -135,7 +135,6 @@
     /// <inheritdoc/>
     protected override async Task OnInitializedAsync()
     {
-        await base.OnInitializedAsync().ConfigureAwait(false);
         UpdateBreadcrumb();
         Store.WorkflowInstanceName.Subscribe(value => OnStateChanged(_ => instanceName = value), token: CancellationTokenSource.Token);
         Store.WorkflowDefinition.Where(value => value != null).Subscribe(value => OnStateChanged(_ => workflowDefinition = value!), token: CancellationTokenSource.Token);
@@ -154,6 +153,7 @@
             OnStateChanged(_ => workflow = value!);
             UpdateBreadcrumb();
         }, token: CancellationTokenSource.Token);
+        await base.OnInitializedAsync().ConfigureAwait(false);
     }
 
     /// <inheritdoc/>
@@ -175,14 +175,14 @@
     void UpdateBreadcrumb()
     {
         BreadcrumbManager.Use(Breadcrumbs.Workflows);
-        BreadcrumbManager.Add(new($"{Name}.{Namespace}", $"/workflows/details/{Namespace}/{Name}/latest"));
+        BreadcrumbManager.Add(new($"{Name}.{@namespace}", $"/workflows/details/{@namespace}/{Name}/latest"));
         if (workflow != null)
         {
             BreadcrumbManager.Add(new(VersionSelector()));
         }
         if (workflowInstance != null)
         {
-            BreadcrumbManager.Add(new(workflowInstance.GetName(), $"/workflows/details/{Namespace}/{Name}/{Version}/{workflowInstance.GetName()}"));
+            BreadcrumbManager.Add(new(workflowInstance.GetName(), $"/workflows/details/{@namespace}/{Name}/{Version}/{workflowInstance.GetName()}"));
         }
         StateHasChanged();
     }
@@ -226,13 +226,13 @@
         await this.Store.DeleteWorkflowInstanceAsync(instance);
     }
 
-    void OnCreateWorkflowVersion() => this.NavigationManager.NavigateTo($"/workflows/new/{Namespace}/{Name}");
+    void OnCreateWorkflowVersion() => this.NavigationManager.NavigateTo($"/workflows/new/{@namespace}/{Name}");
 
-    void OnShowInstanceDetails(WorkflowInstance instance) => NavigationManager.NavigateTo($"/workflows/details/{Namespace}/{Name}/{version}/{instance.GetName()}");
+    void OnShowInstanceDetails(WorkflowInstance instance) => NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}/{instance.GetName()}");
 
     void OnCloseWorkflowInstance()
     {
-        NavigationManager.NavigateTo($"/workflows/details/{Namespace}/{Name}/{version}");
+        NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}");
         StateHasChanged();
     }
 }