Skip to content

Commit 19a61fa

Browse files
authored
Merge pull request #491 from serverlessworkflow/fix-455-dashboard-panels-auto-collapse
Workflow details panels auto collapse in the Dashboard
2 parents b451093 + f6c8fe1 commit 19a61fa

File tree

2 files changed

+39
-7
lines changed

2 files changed

+39
-7
lines changed

src/dashboard/Synapse.Dashboard/Components/HorizontalCollapsible/HorizontalCollapsible.razor

+19-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{
2727
<Icon Name="IconName.CaretDown"></Icon>
2828
}
29-
</span>
29+
</span>
3030
<span class="label">@Label</span>
3131
@if (OnClose.HasDelegate)
3232
{
@@ -57,6 +57,24 @@
5757
await base.OnParametersSetAsync();
5858
}
5959

60+
public async Task HideAsync()
61+
{
62+
isCollapsed = true;
63+
if (OnHidden.HasDelegate)
64+
{
65+
await OnHidden.InvokeAsync();
66+
}
67+
}
68+
69+
public async Task ShowAsync()
70+
{
71+
isCollapsed = false;
72+
if (OnShown.HasDelegate)
73+
{
74+
await OnShown.InvokeAsync();
75+
}
76+
}
77+
6078
async Task OnToggleAsync()
6179
{
6280
isCollapsed = !isCollapsed;

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

+20-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ApplicationTitle>Workflow @($"{Name}.{@namespace}:{version}")</ApplicationTitle>
2626

2727
<div class="d-flex flex-grow mh-100">
28-
<HorizontalCollapsible class="collapsible-instances">
28+
<HorizontalCollapsible @ref="instancesListPanel" class="collapsible-instances">
2929
<Label>Instances</Label>
3030
<Content>
3131
<WorkflowInstancesList class="h-100"
@@ -51,7 +51,7 @@
5151
</Button>
5252
</Content>
5353
</HorizontalCollapsible>
54-
<HorizontalCollapsible class="user-select-none position-relative">
54+
<HorizontalCollapsible @ref="graphPanel" class="user-select-none position-relative">
5555
<Label>Graph</Label>
5656
<Content>
5757
@if (workflowDefinition == null)
@@ -70,7 +70,7 @@
7070
}
7171
</Content>
7272
</HorizontalCollapsible>
73-
<HorizontalCollapsible>
73+
<HorizontalCollapsible @ref="definitionPanel">
7474
<Label>Definition</Label>
7575
<Content>
7676
@if (workflowDefinition == null)
@@ -106,7 +106,7 @@
106106
</HorizontalCollapsible>
107107
@if (workflowInstance != null)
108108
{
109-
<HorizontalCollapsible OnClose="OnCloseWorkflowInstance">
109+
<HorizontalCollapsible OnClose="async() => await OnCloseWorkflowInstanceAsync()">
110110
<Label>Instance</Label>
111111
<Content>
112112
<div class="d-flex flex-column h-100 mh-100">
@@ -152,6 +152,9 @@
152152
WorkflowDefinition workflowDefinition = null!;
153153
WorkflowInstance? workflowInstance;
154154
ProblemDetails? problemDetails;
155+
HorizontalCollapsible instancesListPanel = null!;
156+
HorizontalCollapsible graphPanel = null!;
157+
HorizontalCollapsible definitionPanel = null!;
155158
readonly IEnumerable<string> columns =
156159
[
157160
"Name",
@@ -189,8 +192,9 @@
189192
await base.OnInitializedAsync().ConfigureAwait(false);
190193
}
191194

195+
192196
/// <inheritdoc/>
193-
protected override void OnParametersSet()
197+
protected override async Task OnParametersSetAsync()
194198
{
195199
if (Version != version)
196200
{
@@ -199,7 +203,14 @@
199203
if (InstanceName != instanceName)
200204
{
201205
Store.SetWorkflowInstanceName(InstanceName);
206+
if (!string.IsNullOrWhiteSpace(InstanceName))
207+
{
208+
await instancesListPanel.HideAsync();
209+
await graphPanel.HideAsync();
210+
await definitionPanel.HideAsync();
211+
}
202212
}
213+
await base.OnParametersSetAsync();
203214
}
204215

205216
/// <summary>
@@ -263,8 +274,11 @@
263274

264275
void OnShowInstanceDetails(WorkflowInstance instance) => NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}/{instance.GetName()}");
265276

266-
void OnCloseWorkflowInstance()
277+
async Task OnCloseWorkflowInstanceAsync()
267278
{
279+
await instancesListPanel.ShowAsync();
280+
await graphPanel.ShowAsync();
281+
await definitionPanel.ShowAsync();
268282
NavigationManager.NavigateTo($"/workflows/details/{@namespace}/{Name}/{version}");
269283
StateHasChanged();
270284
}

0 commit comments

Comments
 (0)