Time range picker: more presets, calendar periods and typed ranges

.github/workflows/build.yml

@@ -693,6 +693,8 @@ jobs:
               - 'Lite/**/*.csproj'
               # #4966: Darling.Tests' CommentFilterAdoptionTests reads this Lite.Tests file, so an edit to it has to reach the Darling suite.
               - 'Lite.Tests/DataStartBannerQueriesTabTests.cs'
+              # #5562: same, for the Lite.Tests file CommentFilterAdoptionTests lists as a stated bound.
+              - 'Lite.Tests/LiteTimeRangeGapTests.cs'
               # #5596: Darling.Tests' WpfExitSwitchPinTests reads this project file for the WPF exit switch, so an edit to it has to reach the Darling suite.
               - 'Lite.Tests/Lite.Tests.csproj'
             # #5459 cut 3a: the part of `darling` that is NOT a Lite file. A diff that reaches `darling` through

Darling/Darling.Tests/AlertHistoryRangePageTests.cs

@@ -32,8 +32,13 @@ public void ThePageReadsGetAlertHistoryWithTheFourChoicesAndNeverAFixedWindow()
         var page = Page();
         Assert.DoesNotContain("hours_back: 24", page);
         Assert.DoesNotContain("limit: 200 }", page);
-        Assert.Contains("readTool(\"get_alert_history\", readParams())", page);
-        Assert.Contains("hours_back: choices.hours", page);
+        Assert.Contains("readTool(\"get_alert_history\", req.params)", page);
+        // #5562: the range is the shared picker's spec, read as of each read; a finished range also sends its end.
+        Assert.Contains("windowResultOfSpec(choices.spec);", page);
+        Assert.Contains("hours_back: w.hours", page);
+        Assert.Contains("as_of: w.asOf", page);
+        // Review r1 H2: the reply is trimmed to the range start, since the read takes whole hours.
+        Assert.Contains("trimAlertsToStart(res.data.alerts || [], req.startMs)", page);
         Assert.Contains("limit: choices.limit", page);
         Assert.Contains("server_name: choices.server || null", page);
         Assert.Contains("include_dismissed: choices.dismissed ? \"true\" : null", page);
@@ -45,9 +50,14 @@ public void ThePageReadsGetAlertHistoryWithTheFourChoicesAndNeverAFixedWindow()
     public void NoWindowOrLimitIsOfferedThatTheToolOrTheDispatchLayerRefuses()
     {
         var page = Page();
-        var hours = System.Text.RegularExpressions.Regex.Matches(page, "\\{ hours: (\\d+), label").Select(m => int.Parse(m.Groups[1].Value)).ToList();
-        Assert.Equal(new[] { 1, 4, 24, 168 }, hours);
-        Assert.True(hours.Max() <= PerformanceMonitor.Common.McpHelpers.MaxHoursBack);
+        // #5562 R8: no hand-listed windows and no "All". The picker takes its reach from the catalog's max_hours for the read, which is
+        // the 2160 hours (90 days) the read's validator accepts, so a longer range is greyed out with the reason and never clamped. That
+        // is the alert table's retention (AlertHistoryRetentionDays, DarlingRetention.cs), the longest choice the Viewer offers (R8, L4b).
+        Assert.DoesNotContain("WINDOW_CHOICES", page);
+        Assert.Contains("read: \"get_alert_history\"", page);
+        Assert.Contains("pageRangePicker({", page);
+        Assert.Equal(24 * PerformanceMonitor.Darling.Storage.DarlingRetentionHorizons.AlertHistoryRetentionDays, PerformanceMonitor.Darling.Service.WebReadReach.All["get_alert_history"].MaxHours);
+        Assert.Equal(90, PerformanceMonitor.Darling.Storage.DarlingRetentionHorizons.AlertHistoryRetentionDays);
 
         var limits = System.Text.RegularExpressions.Regex.Match(page, "const LIMIT_CHOICES = \\[([0-9, ]+)\\]").Groups[1].Value
             .Split(',').Select(s => int.Parse(s.Trim())).ToList();
@@ -63,12 +73,17 @@ public void TheChoicesLiveAtModuleScopeAndTheDismissRouteIsNotTheDesktopOne()
         Assert.DoesNotContain("/api/alerts/dismiss", page);
     }
 
-    private static JsonElement Run(string scenario)
+    private static JsonElement Run(string scenario, string? timeZone = null)
     {
         var psi = new ProcessStartInfo("node") { RedirectStandardOutput = true, RedirectStandardError = true, UseShellExecute = false };
         psi.ArgumentList.Add(PathTo("Darling", "Darling.Tests", "alert-history-range-harness.mjs"));
         psi.ArgumentList.Add(PathTo("Darling", "PerformanceMonitor.Darling.Service", "wwwroot", "js"));
         psi.ArgumentList.Add(scenario);
+        if (timeZone is not null)
+        {
+            psi.ArgumentList.Add(timeZone);
+        }
+
         Process proc;
         try
         {
@@ -118,7 +133,15 @@ public void EachChoiceReachesTheRead()
         Assert.Equal("1000", Get(dismissed, "limit"));
         Assert.Equal("srv-b", Get(dismissed, "server_name"));
 
-        Assert.Equal("1,4,24,168", string.Join(",", r.GetProperty("windowOptions").EnumerateArray().Select(e => e.GetString())));
+        // The popup offers every preset and calendar period within the catalog's 90 days; the longer ones are greyed out, never clamped.
+        Assert.Equal("Past 5 minutes,Past 15 minutes,Past 30 minutes,Past hour,Past 4 hours,Past day,Past 2 days,Past week,Past 30 days,Past 90 days,Today,Yesterday,Week to Date,Previous Week,Month to Date,Previous Month",
+            string.Join(",", r.GetProperty("windowOptions").EnumerateArray().Select(e => e.GetString())));
+        Assert.Equal("Year to Date,Previous Year",
+            string.Join(",", r.GetProperty("windowGreyed").EnumerateArray().Select(e => e.GetString())));
+        Assert.Equal("This page's reads reach at most 90 days back.", r.GetProperty("refused").GetString());
+        // A finished range sends its end as as_of; a shorter-than-an-hour range reads the whole hour.
+        Assert.EndsWith("Z", Get(r.GetProperty("finished"), "as_of"));
+        Assert.Equal("1", Get(r.GetProperty("thirtyMinutes"), "hours_back"));
         Assert.Equal("200,500,1000", string.Join(",", r.GetProperty("limitOptions").EnumerateArray().Select(e => e.GetString())));
         Assert.Equal(",srv-a,srv-b", string.Join(",", r.GetProperty("serverOptions").EnumerateArray().Select(e => e.GetString())));
     }
@@ -138,7 +161,7 @@ public void TheChoicesSurviveThePollAndAVisitElsewhere()
         }
 
         var shown = r.GetProperty("shown");
-        Assert.Equal("4", shown.GetProperty("window").GetString());
+        Assert.Equal("Past 4 hours", shown.GetProperty("window").GetString());
         Assert.Equal("500", shown.GetProperty("limit").GetString());
         Assert.Equal("srv-a", shown.GetProperty("server").GetString());
         Assert.True(shown.GetProperty("dismissed").GetBoolean());
@@ -182,9 +205,13 @@ public void TwoServersThatShareADisplayNameKeepBothRows()
     }
 
     [Fact]
-    public void TheRangePickerSaysTheWebReadsAtMostSevenDays()
+    public void TheRangePickerTakesItsReachFromTheCatalog_NinetyDays()
     {
-        Assert.Contains("The web reads at most 7 days", Page());
+        // #5562: the picker greys out what the read cannot reach and says why (the catalog's max_hours), so the page needs no hand-written
+        // tooltip; the reach is the read's own 2160 hours, the alert table's retention (L4b).
+        Assert.DoesNotContain("The web reads at most 7 days of alert history, so there is no All choice.", Page());
+        Assert.DoesNotContain("the web read stops at the common 7 day reach", Page());
+        Assert.Contains("get_alert_history reaches 2160 hours, 90 days", Page());
     }
 
     [Fact]
@@ -197,6 +224,25 @@ public void ANewWindowReconcilesInPlace_RowsLeaveAndNewOnesLandInOrder()
         Assert.Equal("High CPU 3", string.Join(",", r.GetProperty("shrunk").EnumerateArray().Select(e => e.GetString())));
     }
 
+    // Review r2 H1: alert_time is naive UTC with no zone suffix, which the browser reads as LOCAL time unless the page parses it as UTC. The
+    // harness rows carry the server's real shape, and the same scenario runs in zones that are not UTC (and in UTC) because a UTC-only run
+    // passes the old Date.parse code. The offset check proves Node honoured the zone, so the test cannot pass by running in UTC every time.
+    [Theory]
+    [InlineData("UTC", 0)]
+    [InlineData("Europe/Berlin", -1)]
+    [InlineData("America/New_York", 1)]
+    [InlineData("Asia/Tokyo", -1)]
+    public void ARangeShorterThanTheWholeHoursItFetches_ListsOnlyTheAlertsInsideIt(string zone, int offsetSign)
+    {
+        var r = Run("trim", zone);
+        Assert.Equal(offsetSign, Math.Sign(r.GetProperty("tzOffsetMinutes").GetInt32()));
+        string[] Names(string key) => r.GetProperty(key).EnumerateArray().Select(e => e.GetString()!).ToArray();
+        Assert.Equal(new[] { "High CPU 0", "High CPU 19", "High CPU 89" }, Names("day"));
+        Assert.Equal(new[] { "High CPU 0" }, Names("fiveMinutes"));
+        Assert.Equal(new[] { "High CPU 0", "High CPU 19" }, Names("thirtyMinutes"));
+        Assert.Equal(new[] { "High CPU 0", "High CPU 19", "High CPU 89" }, Names("fourHours"));
+    }
+
     [Fact]
     public void TheMuteLinksStillRenderOnEveryRow()
     {

Darling/Darling.Tests/CapabilityPins/viewerservertab-eventwires.baseline.txt

@@ -8,7 +8,6 @@ MouseDoubleClick=>QueryStoreRegressionsGrid_MouseDoubleClick
 SelectionChanged=>AutoRefreshInterval_Changed
 SelectionChanged=>BlockingSubTabs_SelectionChanged
 SelectionChanged=>CompareToCombo_SelectionChanged
-SelectionChanged=>CustomTimeCombo_Changed
 SelectionChanged=>FileIoSubTabs_SelectionChanged
 SelectionChanged=>HeatmapMetric_SelectionChanged
 SelectionChanged=>InnerTabs_SelectionChanged
@@ -19,5 +18,4 @@ SelectionChanged=>QueryStatsGrid_SelectionChanged
 SelectionChanged=>QueryStoreGrid_SelectionChanged
 SelectionChanged=>SystemEventsSubTabs_SelectionChanged
 SelectionChanged=>TimeDisplayMode_SelectionChanged
-SelectionChanged=>TimeRangeCombo_SelectionChanged
 SelectionChanged=>WaitStatsMetric_SelectionChanged

Darling/Darling.Tests/CommentFilterAdoptionTests.cs

@@ -85,7 +85,7 @@ public sealed class CommentFilterAdoptionTests
     /// name a new entry.
     ///
     /// <para>Four kinds live here and they are not the same kind. Eight <b>collect</b> a doc-comment run,
-    /// where the prefix is what defines the run. Two read a <b>stated, measured</b> bound off a named file each.
+    /// where the prefix is what defines the run. Three read a <b>stated, measured</b> bound off a named file each.
     /// One filters <b>SQL</b>, which the C# walk cannot help with. One <b>demonstrates</b> the shape on an
     /// arranged fixture, which is this file.</para>
     /// </summary>
@@ -168,6 +168,15 @@ public sealed class CommentFilterAdoptionTests
             + "which is a pass for the wrong reason. Measurement-dependent, not permanent: a second block "
             + "comment in that file makes the bound wrong.",
 
+        ["Lite.Tests/LiteTimeRangeGapTests.cs"] =
+            "STATED BOUND, measured. It COUNTS call sites of ApplyWindowFloorToBanner( across Lite's tab sources (#5562 R7: every banner site feeds the "
+            + "picker's data start). IsDocOrDefinition drops a match whose line, trimmed, starts with //, ///, * or /*, so a "
+            + "doc or comment mention is not a site, and drops the method's own definition line. Stated bound: it reads one "
+            + "line, so a call written inside a block comment on a line that does not begin with * or /* is miscounted as a "
+            + "site (a spurious extra site, the loud direction: the per-file count then disagrees with the sites pinned). "
+            + "The walker would drop the call as comment text correctly, but the same test also needs the definition line "
+            + "kept apart, which the line check does in one step; the sources it reads carry no such block comment today.",
+
         ["Darling.Tests/Pg18IoBytesTests.cs"] =
             "NOT C#. The filter runs over DarlingPgIoReader.PgIoSql - SQL text already extracted from a raw "
             + "string literal - and drops SQL block-comment lines from the outer SELECT list before counting "

Darling/Darling.Tests/Darling.Tests.csproj

@@ -62,6 +62,8 @@
   <ItemGroup>
     <!-- system_health event samples for SystemHealthParser (one per feeder event; shapes per sp_HealthParser xpath). -->
     <None Include="Fixtures\FinOpsIndexAnalysis\golden.json" CopyToOutputDirectory="PreserveNewest" />
+    <!-- The shared time range grammar cases (#5562); the web harness reads the same file. -->
+    <None Include="Fixtures\time-range-cases.json" CopyToOutputDirectory="PreserveNewest" />
     <None Include="Fixtures\SystemHealth\*.xml" CopyToOutputDirectory="PreserveNewest" />
     <!-- real, scrubbed system_health event captures for SystemHealthParserRealEventTests -->
     <None Include="Fixtures\SystemHealth\real\*.xml" CopyToOutputDirectory="PreserveNewest" />

Darling/Darling.Tests/DarlingMcpJobHistoryToolTests.cs

@@ -299,7 +299,7 @@ public async Task ViewerRows_EqualTheStorageReaderRows_MappedThroughFrom()
             var since = AsOf.AddHours(-24);
 
             await using var viewer = new ViewerDataService(Cs!);
-            var viewerRows = await viewer.GetJobHistoryAsync(since, null, 2000, ct);
+            var viewerRows = await viewer.GetJobHistoryAsync(since, null, 2000, cancellationToken: ct);
             var storage = await DarlingJobHistoryReader.GetAsync(postgres, since, null, 2000, 60, cancellationToken: ct);
 
             /* D5: the viewer stamps each row with its own server's clock, which the storage reader's row does not carry, and

Darling/Darling.Tests/DarlingWebAssetsTests.cs

@@ -40,6 +40,7 @@ public void Wwwroot_IndexHtml_IsCopiedToTheBuildOutput()
     [InlineData("css/theme.css")]
     [InlineData("css/app.css")]
     [InlineData("css/editor.css")]
+    [InlineData("css/time-range.css")]
     [InlineData("js/app.js")]
     [InlineData("js/util.js")]
     [InlineData("js/panels.js")]

Darling/Darling.Tests/FinOpsPageShellTests.cs

@@ -168,7 +168,8 @@ public void EveryTabFile_ExportsTabWithIdLabelBuild_AndTheIdIsTheFileName()
             .Select(Path.GetFileNameWithoutExtension)
             // database-box.js is the shared Database box the Index Analysis and Locking tabs import (#5231), not a tab.
             // gate.js is the helper the tabs share for their empty and not-collected states on a PostgreSQL target, also not a tab.
-            .Where(name => name != "database-box" && name != "gate")
+            // window.js is the rolling-only time range picker the windowed tabs share (#5562), also not a tab.
+            .Where(name => name != "database-box" && name != "gate" && name != "window")
             .OrderBy(x => x, StringComparer.Ordinal).ToArray();
         Assert.Equal(TabIds.OrderBy(x => x, StringComparer.Ordinal).ToArray(), onDisk);
 

Darling/Darling.Tests/FinOpsStorageGrowthWindowBehaviourTests.cs

@@ -84,13 +84,21 @@ public void TheObjectsLevelDefaultsToThirtyDays_AndEachPickSendsDaysTimes24()
         var run = Run();
         var objects = run.GetProperty("objects");
         Assert.Equal(new[] { "720" }, Hours(objects));
-        Assert.Equal("7,30,90", string.Join(",", objects.GetProperty("options").EnumerateArray().Select(e => e.GetString())));
-        Assert.Equal("30", objects.GetProperty("value").GetString());
+        // #5562 R5: the Compact rolling-only picker, whole days, reach 2160 hours for this view (not the catalog entry's 168).
+        Assert.Equal("Past week,Past 30 days,Past 90 days", string.Join(",", objects.GetProperty("options").EnumerateArray().Select(e => e.GetString())));
+        var refused = objects.GetProperty("refused");
+        Assert.Equal("This page reads whole days back from now, such as 7d or 30d.", refused.GetProperty("hours").GetString());
+        Assert.Equal("This page reads a length back from now, so pick a rolling length such as 24h or 7d.", refused.GetProperty("calendar").GetString());
+        Assert.Equal("This page's reads reach at most 90 days back.", refused.GetProperty("tooLong").GetString());
+        /* Review r1 H1: 1 day would read the server's 30-day default and 2 to 6 days are refused by the read, so neither is offered. */
+        Assert.Equal("This page reads at least 7d back from now.", refused.GetProperty("tooShort").GetString());
+        Assert.Equal("This page reads at least 7d back from now.", refused.GetProperty("oneDay").GetString());
+        Assert.Equal("Past 30 days", objects.GetProperty("value").GetString());
 
         Assert.Equal(new[] { "2160" }, Hours(run.GetProperty("picked90")));
-        Assert.Equal("90", run.GetProperty("picked90").GetProperty("value").GetString());
+        Assert.Equal("Past 90 days", run.GetProperty("picked90").GetProperty("value").GetString());
         Assert.Equal(new[] { "168" }, Hours(run.GetProperty("picked7")));
-        Assert.Equal("7", run.GetProperty("picked7").GetProperty("value").GetString());
+        Assert.Equal("Past week", run.GetProperty("picked7").GetProperty("value").GetString());
     }
 
     [Fact]
@@ -99,11 +107,11 @@ public void ThePickSurvivesARebuildForTheSameServer_AndAnotherServerStartsAtThir
         var run = Run();
         var rebuilt = run.GetProperty("rebuilt");
         Assert.Equal(new[] { "168" }, Hours(rebuilt));
-        Assert.Equal("7", rebuilt.GetProperty("value").GetString());
+        Assert.Equal("Past week", rebuilt.GetProperty("value").GetString());
 
         Assert.Equal(new[] { "24" }, Hours(run.GetProperty("other")));
         var otherObjects = run.GetProperty("otherObjects");
         Assert.Equal(new[] { "720" }, Hours(otherObjects));
-        Assert.Equal("30", otherObjects.GetProperty("value").GetString());
+        Assert.Equal("Past 30 days", otherObjects.GetProperty("value").GetString());
     }
 }

Darling/Darling.Tests/FinOpsTabDatabaseResourcesPageTests.cs

@@ -36,18 +36,16 @@ public void TheTabReadsGetFinOpsWithTheDatabaseResourcesViewWindow()
     [Fact]
     public void ThePickerOffersTheDesktopWindowsInOrder()
     {
-        // Source: FinOpsTab.xaml ~:497-499, FinOpsResourceUsageTimeRangeCombo.
+        // #5562 R5: the shared picker in its Compact, rolling-only form (finops/window.js), not a hand-listed select.
         var tab = Tab();
-        var pairs = Regex.Matches(tab, "\\{ value: (\\d+), label: \"([^\"]+)\" \\}").Select(m => m.Groups[1].Value + "=" + m.Groups[2].Value);
-        Assert.Equal("1=Last 1 hour,4=Last 4 hours,12=Last 12 hours,24=Last 24 hours,168=Last 7 days", string.Join(",", pairs));
-        Assert.Contains("pickerControl(\"Window\", WINDOWS, HOURS,", tab);
+        Assert.DoesNotContain("WINDOWS", tab);
+        Assert.Contains("finopsWindowControl({ hours: HOURS, onChange: (hours) => load(hours) })", tab);
     }
 
     [Fact]
     public void TheChangeHandlerRereadsWithTheChosenHoursAndTheFirstReadUsesTheDefault()
     {
         var tab = Tab();
-        Assert.Contains("sel.addEventListener(\"change\", () => onPick(Number(sel.value)));", tab);
         Assert.Contains("(hours) => load(hours)", tab);
         Assert.Contains("load(HOURS);", tab);
     }
@@ -127,7 +125,7 @@ public void TheTabImportsOnlyTheSharedHelpers()
     {
         var imports = Regex.Matches(Tab(), "from \"([^\"]+)\";").Select(m => m.Groups[1].Value).ToList();
         Assert.NotEmpty(imports);
-        Assert.All(imports, i => Assert.Contains(i, new[] { "../../panels.js", "../../charts.js", "../../util.js", "./gate.js" }));
+        Assert.All(imports, i => Assert.Contains(i, new[] { "../../panels.js", "../../charts.js", "../../util.js", "./gate.js", "./window.js" }));
         Assert.Contains("./gate.js", imports);
     }