From 35a93ba976147f934a5cb429a832b59db9289aad Mon Sep 17 00:00:00 2001
From: Premek Vysoky <premek.vysoky@microsoft.com>
Date: Thu, 30 Jan 2025 00:20:51 +0100
Subject: [PATCH 1/5] Improve subscription page UX - Added more filters + a
 pop-up legend - Fixed sorting by last updated - Fixed the disabled toggle
 semantics

---
 .../Pages/Subscriptions.razor                 | 66 +++++++++++++------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
index fbd684338..9eb081dc3 100644
--- a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
+++ b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
@@ -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>Prefixes 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>
@@ -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>
@@ -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.SourceRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
+                || subscription.Id.ToStrong().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)

From 17bd51645815c4a83650a6bf955b158a78074b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= <premek.vysoky@microsoft.com>
Date: Thu, 30 Jan 2025 13:15:20 +0100
Subject: [PATCH 2/5] Fix the build

---
 .../ProductConstructionService.BarViz/Pages/Subscriptions.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
index 9eb081dc3..b167ea8c4 100644
--- a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
+++ b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
@@ -207,7 +207,7 @@
             ['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.SourceRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
-                || subscription.Id.ToStrong().Contains(filter, StringComparison.OrdinalIgnoreCase)
+                || subscription.Id.ToString().Contains(filter, StringComparison.OrdinalIgnoreCase)
                 || subscription.TargetRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
                 || subscription.TargetBranch.Contains(filter, StringComparison.OrdinalIgnoreCase)
                 || subscription.Channel.Name.Contains(filter, StringComparison.OrdinalIgnoreCase)

From e918325d130a98c412bc6cbcb1dca8dffd010927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= <premek.vysoky@microsoft.com>
Date: Thu, 30 Jan 2025 17:11:37 +0100
Subject: [PATCH 3/5] Update
 src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor

---
 .../Pages/Subscriptions.razor                          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
index b167ea8c4..1890df8e0 100644
--- a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
+++ b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
@@ -206,11 +206,11 @@
             ['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.SourceRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
-                || subscription.Id.ToString().Contains(filter, StringComparison.OrdinalIgnoreCase)
-                || subscription.TargetRepository.Contains(filter, StringComparison.OrdinalIgnoreCase)
-                || subscription.TargetBranch.Contains(filter, StringComparison.OrdinalIgnoreCase)
-                || subscription.Channel.Name.Contains(filter, StringComparison.OrdinalIgnoreCase)
+            _ => subscription.Id.ToString().Contains(f, StringComparison.OrdinalIgnoreCase)
+                || subscription.SourceRepository.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || subscription.TargetRepository.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || subscription.TargetBranch.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || subscription.Channel.Name.Contains(f, StringComparison.OrdinalIgnoreCase)
         };
     }
 

From d89e4a15e562b012414a3eb6ec75029fce079662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= <premek.vysoky@microsoft.com>
Date: Thu, 30 Jan 2025 17:12:11 +0100
Subject: [PATCH 4/5] Update
 src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor

---
 .../Pages/Subscriptions.razor                          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
index 1890df8e0..d63cf1867 100644
--- a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
+++ b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
@@ -206,11 +206,11 @@
             ['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(f, StringComparison.OrdinalIgnoreCase)
-                || subscription.SourceRepository.Contains(f, StringComparison.OrdinalIgnoreCase)
-                || subscription.TargetRepository.Contains(f, StringComparison.OrdinalIgnoreCase)
-                || subscription.TargetBranch.Contains(f, StringComparison.OrdinalIgnoreCase)
-                || 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)
         };
     }
 

From 15910e3beaab0e08541a098d65e349afe0a77fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= <premek.vysoky@microsoft.com>
Date: Thu, 30 Jan 2025 18:11:41 +0100
Subject: [PATCH 5/5] Update
 src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor

---
 .../ProductConstructionService.BarViz/Pages/Subscriptions.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
index d63cf1867..b93fbbeac 100644
--- a/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
+++ b/src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor
@@ -52,7 +52,7 @@
                     <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>Prefixes the search terms to specify which field they match:
+                    <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>