Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve subscription page UX #4395

Merged
merged 5 commits into from
Jan 31, 2025
Merged

Improve subscription page UX #4395

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35a93ba
Improve subscription page UX
premun Jan 29, 2025
17bd516
Fix the build
premun Jan 30, 2025
e918325
Update src/ProductConstructionService/ProductConstructionService.BarV…
premun Jan 30, 2025
d89e4a1
Update src/ProductConstructionService/ProductConstructionService.BarV…
premun Jan 30, 2025
15910e3
Update src/ProductConstructionService/ProductConstructionService.BarV…
premun Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 45 additions & 21 deletions src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,43 @@

<PageTitle>Subscriptions – Maestro++</PageTitle>

<GridViewTemplate Title="@($"Subscriptions ({AllSubscriptions?.Count().ToString() ?? "0"})")" ShowSkeleton="AllSubscriptions == null">
<GridViewTemplate Title="Subscriptions" ShowSkeleton="AllSubscriptions == null">
<Header>
<div style="float: right">
<FluentSearch @bind-Value="@SearchFilter"
@bind-Value:after=HandleSearchInput
Immediate="true"
Placeholder="Filter subscriptions"
title="Space-separated search terms that appear in any field. You can also use keywords such as `disabled` or `codeflow`." />

<FluentSwitch CheckedMessage="Show disabled"
UncheckedMessage="Hide disabled"
Id="subscription-search-filter" />

<FluentTooltip Anchor="subscription-search-filter"
HideTooltipOnCursorLeave="true"
Position=TooltipPosition.Bottom
Delay=100>
<p>Enter space deliminated search terms that appear in any field.</p>
You can also use special keywords:
<ul>
<li><code>:codeflow</code> – must be source-enabled (VMR codeflow)</li>
<li><code>:disabled</code> – must be disabled</li>
<li><code>:haspr</code> – with an active PR</li>
<li>Prefix the search terms to specify which field they match:
<ul>
<li><code>source:</code> – Source repository</li>
<li><code>target:</code> – Target repository</li>
<li><code>branch:</code> – Target branch</li>
<li><code>channel:</code> – Channel name</li>
</ul>
</li>
</ul>
Example: <code>target:dotnet/sdk channel:10 :haspr</code><br />
<i>All subscriptions to dotnet/sdk from channel containg 10 that have an ongoing PR.</i>
</FluentTooltip>

<FluentSpacer Width="30" />

<FluentSwitch Label="Show disabled"
Value="@ShowDisabled"
ValueChanged="@SetDisabled"
Style="position: relative; top: -9px" />
ValueChanged="@SetDisabled" />
</div>
</Header>
<Content>
Expand Down Expand Up @@ -94,7 +117,7 @@
<span>—</span>
}
</TemplateColumn>
<TemplateColumn Title="Last flown build" Sortable="true" SortBy="SortBy(sub => sub.LastAppliedBuild != null ? sub.LastAppliedBuild.DateProduced.ToString() : string.Empty)" Align="Align.Center">
<TemplateColumn Title="Last flown build" Sortable="true" SortBy="@SortBy(sub => sub.LastAppliedBuild != null ? sub.LastAppliedBuild.DateProduced.ToString("o") : "1900")" Align="Align.Center">
<FluentLabel Title="@(context.LastAppliedBuild == null ? "N/A" : context.LastAppliedBuild.DateProduced.ToString("f"))">
@(context.LastAppliedBuild == null ? "N/A" : (DateTime.UtcNow - context.LastAppliedBuild.DateProduced).ToTimeAgo())
</FluentLabel>
Expand Down Expand Up @@ -174,20 +197,21 @@

bool IsMatch(Subscription subscription, string filter)
{
if (filter.ToLowerInvariant() == "codeflow" && subscription.SourceEnabled)
{
return true;
}

if (filter.ToLowerInvariant() == "disabled" && !subscription.Enabled)
return filter.Trim().ToLowerInvariant() switch
{
return true;
}

return subscription.SourceRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.TargetRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.TargetBranch.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.Channel.Name.Contains(filter, StringComparison.OrdinalIgnoreCase);
":codeflow" => subscription.SourceEnabled,
":disabled" => !subscription.Enabled,
":haspr" => PullRequests.ContainsKey(subscription.Id),
['s', 'o', 'u', 'r', 'c', 'e', ':', .. var f] => subscription.SourceRepository.Contains(f, StringComparison.OrdinalIgnoreCase),
['t', 'a', 'r', 'g', 'e', 't', ':', .. var f] => subscription.TargetRepository.Contains(f, StringComparison.OrdinalIgnoreCase),
['b', 'r', 'a', 'n', 'c', 'h', ':', .. var f] => subscription.TargetBranch.Contains(f, StringComparison.OrdinalIgnoreCase),
['c', 'h', 'a', 'n', 'n', 'e', 'l', ':', .. var f] => subscription.Channel.Name.Contains(f, StringComparison.OrdinalIgnoreCase),
_ => subscription.Id.ToString().Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.SourceRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.TargetRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.TargetBranch.Contains(filter, StringComparison.OrdinalIgnoreCase)
|| subscription.Channel.Name.Contains(filter, StringComparison.OrdinalIgnoreCase)
};
}

async Task ShowDetails(Subscription subscription)
Expand Down