Skip to content

Commit 8c1be5b

Browse files
committed
fix(Dashboard): improved filtering "racing"
Signed-off-by: Jean-Baptiste Bianchi <jb.bianchi@neuroglia.io>
1 parent 223809e commit 8c1be5b

File tree

6 files changed

+15
-18
lines changed

6 files changed

+15
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ public abstract class NamespacedResourceManagementComponent<TComponent, TStore,
4545
/// <inheritdoc/>
4646
protected override async Task OnInitializedAsync()
4747
{
48-
await base.OnInitializedAsync();
4948
this.Store.Namespace.Subscribe(value => this.OnStateChanged(_ =>
5049
{
5150
this.@namespace = value;
52-
if (Namespace != value) this.Namespace = value;
51+
//if (Namespace != value) this.Namespace = value;
5352
}), token: this.CancellationTokenSource.Token);
5453
this.Store.Namespaces.Subscribe(value => this.OnStateChanged(_ => Namespaces = value), token: this.CancellationTokenSource.Token);
54+
await base.OnInitializedAsync();
5555
}
5656

5757
/// <inheritdoc/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// limitations under the License.
1313

1414
using Synapse.Api.Client.Services;
15-
using Synapse.Dashboard.Components.DocumentDetailsStateManagement;
16-
using System.Reactive.Linq;
1715

1816
namespace Synapse.Dashboard.Components.ResourceManagement;
1917

@@ -87,8 +85,8 @@ public override async Task DeleteResourceAsync(TResource resource)
8785
/// <inheritdoc/>
8886
public override async Task InitializeAsync()
8987
{
90-
await base.InitializeAsync();
9188
await this.ListNamespaceAsync().ConfigureAwait(false);
89+
await base.InitializeAsync();
9290
}
9391

9492
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public abstract class ResourceManagementComponent<TComponent, TStore, TState, TR
9393
/// </summary>
9494
protected ElementReference? CheckboxAll { get; set; } = null;
9595

96-
string activeResourcesName = null!;
96+
string activeResourceName = null!;
9797
/// <summary>
9898
/// Gets/sets the name of the active resource
9999
/// </summary>
@@ -102,7 +102,6 @@ public abstract class ResourceManagementComponent<TComponent, TStore, TState, TR
102102
/// <inheritdoc/>
103103
protected override async Task OnInitializedAsync()
104104
{
105-
await base.OnInitializedAsync().ConfigureAwait(false);
106105
Observable.CombineLatest(
107106
this.Store.Resources,
108107
this.Store.SelectedResourceNames,
@@ -131,7 +130,7 @@ protected override async Task OnInitializedAsync()
131130
}
132131
}
133132
}, cancellationToken: this.CancellationTokenSource.Token);
134-
this.Store.ActiveResourceName.Subscribe(value => this.OnStateChanged(_ => this.activeResourcesName = value), token: this.CancellationTokenSource.Token);
133+
this.Store.ActiveResourceName.Subscribe(value => this.OnStateChanged(_ => this.activeResourceName = value), token: this.CancellationTokenSource.Token);
135134
this.Store.SearchTerm.Subscribe(value => this.OnStateChanged(_ => this.SearchTerm = value), token: this.CancellationTokenSource.Token);
136135
this.Store.Loading.Subscribe(value => this.OnStateChanged(_ => this.Loading = value), token: this.CancellationTokenSource.Token);
137136
this.Store.Definition.SubscribeAsync(async definition =>
@@ -152,13 +151,14 @@ protected override async Task OnInitializedAsync()
152151
await this.OnShowResourceDetailsAsync(resource);
153152
}
154153
}, cancellationToken: CancellationTokenSource.Token);
154+
await base.OnInitializedAsync().ConfigureAwait(false);
155155
}
156156

157157

158158
/// <inheritdoc/>
159159
protected override async Task OnParametersSetAsync()
160160
{
161-
if (!string.IsNullOrEmpty(Name) && Name != activeResourcesName)
161+
if (!string.IsNullOrEmpty(Name) && Name != activeResourceName)
162162
{
163163
Store.SetActiveResourceName(Name);
164164
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// limitations under the License.
1313

1414
using Synapse.Api.Client.Services;
15-
using Synapse.Dashboard.Components.DocumentDetailsStateManagement;
1615

1716
namespace Synapse.Dashboard.Components.ResourceManagement;
1817

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{
3838
foreach (var namespaceResource in Namespaces)
3939
{
40-
<option value="@namespaceResource.GetName()" selected="@(@namespaceResource.GetName() == Namespace)">@namespaceResource.GetName()</option>
40+
<option value="@namespaceResource.GetName()" selected="@(@namespaceResource.GetName() == @namespace)">@namespaceResource.GetName()</option>
4141
}
4242
}
4343
</select>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@inject IBreadcrumbManager BreadcrumbManager
2323
@inject NavigationManager NavigationManager
2424

25-
<ApplicationTitle>Workflow @($"{Name}.{Namespace}:{version}")</ApplicationTitle>
25+
<ApplicationTitle>Workflow @($"{Name}.{@namespace}:{version}")</ApplicationTitle>
2626

2727
<div class="d-flex flex-grow mh-100">
2828
<HorizontalCollapsible class="collapsible-instances">
@@ -135,7 +135,6 @@
135135
/// <inheritdoc/>
136136
protected override async Task OnInitializedAsync()
137137
{
138-
await base.OnInitializedAsync().ConfigureAwait(false);
139138
UpdateBreadcrumb();
140139
Store.WorkflowInstanceName.Subscribe(value => OnStateChanged(_ => instanceName = value), token: CancellationTokenSource.Token);
141140
Store.WorkflowDefinition.Where(value => value != null).Subscribe(value => OnStateChanged(_ => workflowDefinition = value!), token: CancellationTokenSource.Token);
@@ -154,6 +153,7 @@
154153
OnStateChanged(_ => workflow = value!);
155154
UpdateBreadcrumb();
156155
}, token: CancellationTokenSource.Token);
156+
await base.OnInitializedAsync().ConfigureAwait(false);
157157
}
158158

159159
/// <inheritdoc/>
@@ -175,14 +175,14 @@
175175
void UpdateBreadcrumb()
176176
{
177177
BreadcrumbManager.Use(Breadcrumbs.Workflows);
178-
BreadcrumbManager.Add(new($"{Name}.{Namespace}", $"/workflows/details/{Namespace}/{Name}/latest"));
178+
BreadcrumbManager.Add(new($"{Name}.{@namespace}", $"/workflows/details/{@namespace}/{Name}/latest"));
179179
if (workflow != null)
180180
{
181181
BreadcrumbManager.Add(new(VersionSelector()));
182182
}
183183
if (workflowInstance != null)
184184
{
185-
BreadcrumbManager.Add(new(workflowInstance.GetName(), $"/workflows/details/{Namespace}/{Name}/{Version}/{workflowInstance.GetName()}"));
185+
BreadcrumbManager.Add(new(workflowInstance.GetName(), $"/workflows/details/{@namespace}/{Name}/{Version}/{workflowInstance.GetName()}"));
186186
}
187187
StateHasChanged();
188188
}
@@ -226,13 +226,13 @@
226226
await this.Store.DeleteWorkflowInstanceAsync(instance);
227227
}
228228

229-
void OnCreateWorkflowVersion() => this.NavigationManager.NavigateTo($"/workflows/new/{Namespace}/{Name}");
229+
void OnCreateWorkflowVersion() => this.NavigationManager.NavigateTo($"/workflows/new/{@namespace}/{Name}");
230230

231-
void OnShowInstanceDetails(WorkflowInstance instance) => NavigationManager.NavigateTo($"/workflows/details/{Namespace}/{Name}/{version}/{instance.GetName()}");
231+
void OnShowInstanceDetails(WorkflowInstance instance) => NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}/{instance.GetName()}");
232232

233233
void OnCloseWorkflowInstance()
234234
{
235-
NavigationManager.NavigateTo($"/workflows/details/{Namespace}/{Name}/{version}");
235+
NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}");
236236
StateHasChanged();
237237
}
238238
}

0 commit comments

Comments
 (0)