Fix which codeflow subscriptions are shown in BarViz (#4850)

- Wrong forward flow subscriptions where looked up
- Resolves #4747

#4732

Author: premun

src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Codeflows.razor

@@ -25,6 +25,23 @@
         color: var(--neutral-foreground-hint) !important;
         font-style: italic;
     }
+
+    .commitSha {
+        border: none;
+        color: #888;
+        font-family: monospace;
+        font-size: 0.8em;
+        top: -4px;
+        position: relative;
+        margin-left: 5px;
+        margin-right: 7px;
+    }
+
+    .commitSha a {
+        height: 23px;
+        padding: 2px 6px 0px 6px;
+    }
+
 </style>
 
 <PageTitle>Codeflows – Maestro++</PageTitle>
@@ -66,30 +83,50 @@
                 <TemplateColumn Title="Backflow"
                                 Sortable="true"
                                 SortBy="@SortBy(sub => sub.BackflowSubscription != null && sub.BackflowSubscription.LastAppliedBuild != null ? sub.BackflowSubscription.LastAppliedBuild.DateProduced.ToString("o") : "1900")"
-                                Align="Align.Center">
+                                Align="Align.Start">
                     <FluentLabel Title="@(context.BackflowSubscription?.LastAppliedBuild?.DateProduced.ToString("f"))">
-                        @(GetLastAppliedBuildTimeAgo(context.BackflowSubscription))
+                        @if (context.BackflowSubscription?.LastAppliedBuild != null)
+                        {
+                            @(GetLastAppliedBuildTimeAgo(context.BackflowSubscription))
+                            <FluentAnchor Href="@context.BackflowSubscription.LastAppliedBuild.GetCommitLink()" Target="_blank" class="commitSha" title="@context.BackflowSubscription.LastAppliedBuild.Commit">
+                                &commat;@GetShortSha(context.BackflowSubscription.LastAppliedBuild.Commit)
+                            </FluentAnchor>
+                        }
+                        else
+                        {
+                            <span>—</span>
+                        }
+
                         @if (context.BackflowPr != null)
                         {
-                            <span> / </span>
                             <FluentAnchor Href="@context.BackflowPr" Target="_blank" Appearance="Appearance.Hypertext">Active PR</FluentAnchor>
                         }
                     </FluentLabel>
                 </TemplateColumn>
                 <TemplateColumn Title="Forward flow"
                                 Sortable="true"
                                 SortBy="@SortBy(sub => sub.ForwardflowSubscription != null && sub.ForwardflowSubscription.LastAppliedBuild != null ? sub.ForwardflowSubscription.LastAppliedBuild.DateProduced.ToString("o") : "1900")"
-                                Align="Align.Center">
+                                Align="Align.Start">
                     <FluentLabel Title="@(context.ForwardflowSubscription?.LastAppliedBuild?.DateProduced.ToString("f"))">
-                        @(GetLastAppliedBuildTimeAgo(context.ForwardflowSubscription))
+                        @if (context.ForwardflowSubscription?.LastAppliedBuild != null)
+                        {
+                            @(GetLastAppliedBuildTimeAgo(context.ForwardflowSubscription))
+                            <FluentAnchor Href="@context.ForwardflowSubscription.LastAppliedBuild.GetCommitLink()" Target="_blank" class="commitSha" title="@context.ForwardflowSubscription.LastAppliedBuild.Commit">
+                                &commat;@GetShortSha(context.ForwardflowSubscription.LastAppliedBuild.Commit)
+                            </FluentAnchor>
+                        }
+                        else
+                        {
+                            <span>—</span>
+                        }
+
                         @if (context.ForwardflowPr != null)
                         {
-                            <span> / </span>
                             <FluentAnchor Href="@context.ForwardflowPr" Target="_blank" Appearance="Appearance.Hypertext">Active PR</FluentAnchor>
                         }
                     </FluentLabel>
                 </TemplateColumn>
-                <TemplateColumn Style="width:60px">
+                <TemplateColumn Width="60px">
                     <CodeflowContextMenu Codeflow="@context" ShowDetails="@ShowDetails" />
                 </TemplateColumn>
             </ChildContent>
@@ -144,21 +181,22 @@
         // Get all unique mappings
         var allMappings = subscriptions
             .Select(s => s.SourceDirectory ?? s.TargetDirectory)
-            .Distinct();
+            .Where(s => !string.IsNullOrEmpty(s))
+            .Distinct()
+            .ToList();
 
-        List<CodeflowSubscription> codeflows = new List<CodeflowSubscription>(allMappings.Count());
+        List<CodeflowSubscription> codeflows = new List<CodeflowSubscription>(allMappings.Count);
         foreach (var mapping in allMappings)
         {
-            var backflowSubscription = Subscriptions!.FirstOrDefault(s => s.SourceDirectory == mapping);
-            var forwardflowSubscription = Subscriptions!.FirstOrDefault(s => s.TargetDirectory == mapping);
+            var backflowSubscription = subscriptions!.FirstOrDefault(s => s.SourceDirectory == mapping);
+            var forwardflowSubscription = subscriptions!.FirstOrDefault(s => s.TargetDirectory == mapping);
             PullRequests.TryGetValue(backflowSubscription?.Id ?? default, out var backflowPr);
             PullRequests.TryGetValue(forwardflowSubscription?.Id ?? default, out var forwardflowPr);
             codeflows.Add(new CodeflowSubscription(
-                RepositoryUrl: backflowSubscription?.TargetRepository ?? forwardflowSubscription?.SourceRepository
-                    ?? throw new InvalidOperationException(),
+                RepositoryUrl: backflowSubscription?.TargetRepository ?? forwardflowSubscription?.SourceRepository!,
                 RepositoryBranch: backflowSubscription?.TargetBranch,
                 MappingName: mapping,
-                Enabled: backflowSubscription?.Enabled ?? forwardflowSubscription?.Enabled ?? false, // TODO
+                Enabled: backflowSubscription?.Enabled ?? forwardflowSubscription?.Enabled ?? false,
                 BackflowSubscription: backflowSubscription,
                 ForwardflowSubscription: forwardflowSubscription,
                 BackflowPr: backflowPr,
@@ -235,4 +273,6 @@
             }
         ];
     }
+
+    static string GetShortSha(string sha) => sha.Substring(0, 7);
 }

src/ProductConstructionService/ProductConstructionService.BarViz/Pages/Subscriptions.razor

@@ -144,12 +144,20 @@
     [SupplyParameterFromQuery(Name = "search")]
     private string? searchFilterQuery { get; set; }
 
+    [SupplyParameterFromQuery(Name = "showDisabled")]
+    private string? showDisabledQuery { get; set; }
+
     Dictionary<Guid, string> PullRequests = [];
     List<Subscription>? AllSubscriptions = null;
     IQueryable<Subscription>? FilteredSubscriptions;
     PaginationState Pagination = new() { ItemsPerPage = 25 };
     string SearchFilter = string.Empty;
-    bool ShowDisabled = false;
+
+    bool ShowDisabled
+    {
+        get => !string.IsNullOrEmpty(showDisabledQuery) && bool.TryParse(showDisabledQuery, out var value) && value;
+        set => showDisabledQuery = value.ToString();
+    }
 
     GridSort<Subscription> SortBy(Expression<Func<Subscription, string>> sorter)
         => GridSort<Subscription>.ByAscending(sorter);
@@ -197,7 +205,7 @@
                 filteredSubscriptions = filteredSubscriptions?
                     .Where(sub => searchTerms.All(term => IsMatch(sub, term)));
 
-                UpdateQueryParams(SearchFilter);
+                UpdateQueryParams();
             }
         }
 
@@ -208,6 +216,7 @@
     void SetDisabled(bool value)
     {
         ShowDisabled = value;
+        UpdateQueryParams();
         FilterSubscriptions();
     }
 
@@ -248,11 +257,12 @@
         await DialogService.ShowDialogAsync<SubscriptionDetailDialog>(subscription, parameters);
     }
 
-    private void UpdateQueryParams(string searchFilter)
+    private void UpdateQueryParams()
     {
         var newUri = NavManager.GetUriWithQueryParameters(new Dictionary<string, object?>
         {
-            ["search"] = searchFilter,
+            ["search"] = SearchFilter,
+            ["showDisabled"] = ShowDisabled,
         });
 
         NavManager.NavigateTo(newUri);