add links on summary-grid count cells

Author: ankurjuneja

resources/queries/targetedms/InstrumentUtilizationByDay.query.xml

@@ -10,9 +10,11 @@
                     </column>
                     <column columnName="RunCount">
                         <columnTitle>Skyline Document Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dateeq=${AcquisitionDate:date('yyyy-MM-dd')}</url>
                     </column>
                     <column columnName="FileCount">
                         <columnTitle>Replicate Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dateeq=${AcquisitionDate:date('yyyy-MM-dd')}</url>
                     </column>
                     <column columnName="InstrumentNickname">
                         <columnTitle>Instrument</columnTitle>

resources/queries/targetedms/InstrumentUtilizationByMonth.query.xml

@@ -10,9 +10,11 @@
                     </column>
                     <column columnName="RunCount">
                         <columnTitle>Skyline Document Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dategte=${MonthStart:date('yyyy-MM-dd')}&amp;SampleFile.AcquiredTime~datelt=${MonthEnd:date('yyyy-MM-dd')}</url>
                     </column>
                     <column columnName="FileCount">
                         <columnTitle>Replicate Count</columnTitle>
+                        <url>/targetedms-showInstrument.view?name=${InstrumentNickname}&amp;utilizationTab=samples&amp;SampleFile.AcquiredTime~dategte=${MonthStart:date('yyyy-MM-dd')}&amp;SampleFile.AcquiredTime~datelt=${MonthEnd:date('yyyy-MM-dd')}</url>
                     </column>
                     <column columnName="InstrumentNickname">
                         <columnTitle>Instrument</columnTitle>

resources/queries/targetedms/InstrumentUtilizationByMonth.sql

@@ -8,6 +8,7 @@
 -- Consumed by the "Runs by Month" grid on the Show Instrument page.
 SELECT
     CAST(MonthStart || '-01' AS TIMESTAMP) AS MonthStart,
+    TIMESTAMPADD('SQL_TSI_MONTH', 1, CAST(MonthStart || '-01' AS TIMESTAMP)) AS MonthEnd,
     COUNT(*) AS FileCount,
     COUNT(DISTINCT RunId) AS RunCount,
     InstrumentNickname

src/org/labkey/targetedms/view/instrumentUtilization.jsp

@@ -48,6 +48,10 @@
     .content-left form[id^="lk-region-"] {
         overflow-x: auto;
     }
+    /* Days with acquired samples drill into the Samples tab, so signal that they're clickable */
+    #instrumentUtilizationCalendar .heatmap-shaded {
+        cursor: pointer;
+    }
 </style>
 
 <ul class="nav nav-tabs" id="utilizationTabs" role="tablist">
@@ -140,6 +144,13 @@
             activate(link.getAttribute('data-utilization-tab'));
         });
     }
+
+    // Shared with the calendar script: activate the Samples tab. The summary-grid count cells and the
+    // calendar days are ordinary links to this page with utilizationTab=samples plus an AcquiredTime
+    // filter, so following one reloads the page filtered; this reveals the Samples tab once we're back.
+    window.showInstrumentSamplesTab = function() {
+        activate('samples');
+    };
 })();
 </script>
 
@@ -151,11 +162,25 @@
 
     const instrumentName = LABKEY.ActionURL.getParameter('name');
 
+    // Following a drill-in link (a summary-grid count cell or a calendar day) reloads this page with
+    // utilizationTab=samples and an AcquiredTime filter. Let the calendar render first (it needs to be
+    // visible to size itself), then reveal the pre-filtered Samples tab the link was targeting.
+    function honorRequestedTab() {
+        if (LABKEY.ActionURL.getParameter('utilizationTab') === 'samples' && window.showInstrumentSamplesTab) {
+            window.showInstrumentSamplesTab();
+        }
+    }
+
     let dateOnly = function (d) {
         let dateTime = new Date(d);
         return new Date(dateTime.getFullYear(), dateTime.getMonth(), dateTime.getDate());
     };
 
+    let formatDate = function (d) {
+        let pad = function (n) { return (n < 10 ? '0' : '') + n; };
+        return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate());
+    };
+
     function addEvent(data, date) {
         data.push({
             startDate: new Date(date.getTime()),
@@ -253,6 +278,7 @@
     loadData(function (data) {
         if (!data.length) {
             $('#instrumentUtilizationCalendar').text('No samples acquired by this instrument.');
+            honorRequestedTab();
             return;
         }
 
@@ -297,6 +323,19 @@
             mouseOutDay: function (e) {
                 $(e.element).popover('hide');
             },
+            clickDay: function (e) {
+                // Drill into the samples acquired on the clicked day, matching the summary-grid links:
+                // navigate to this page on the Samples tab with a single-day AcquiredTime filter applied.
+                let event = e.events && e.events.length > 0 ? e.events[0] : null;
+                if (!event || !event.fileCount) {
+                    return;
+                }
+                window.location = LABKEY.ActionURL.buildURL('targetedms', 'showInstrument', null, {
+                    name: instrumentName,
+                    utilizationTab: 'samples',
+                    'SampleFile.AcquiredTime~dateeq': formatDate(dateOnly(e.date))
+                });
+            },
             dataSource: data
         });
 
@@ -311,6 +350,8 @@
                 }
             }
         });
+
+        honorRequestedTab();
     });
 })();
 </script>

test/src/org/labkey/test/components/targetedms/InstrumentUtilizationWebPart.java

@@ -116,6 +116,20 @@ public DataRegionTable getSamplesTable()
         return new DataRegionTable(SAMPLE_FILE_REGION, getDriver());
     }
 
+    /**
+     * Clicks the "Replicate Count" drill-in link in the given summary-grid row. The link reloads the page
+     * on the Samples tab with the row's date-range filter applied, so this waits for the reload and returns
+     * a fresh web part handle positioned on the (filtered) Samples tab.
+     */
+    public InstrumentUtilizationWebPart drillIntoSamples(DataRegionTable summaryTable, int row)
+    {
+        getWrapper().clickAndWait(summaryTable.link(row, "Replicate Count"));
+        InstrumentUtilizationWebPart reloaded = new InstrumentUtilizationWebPart(getDriver());
+        WebDriverWrapper.waitFor(reloaded::isSamplesVisible,
+                "Samples tab did not open after the drill-in navigation", reloaded.getWrapper().defaultWaitForPage);
+        return reloaded;
+    }
+
     /** Sum of the (integer) "Files" column, i.e. the total number of sample files represented by the grid. */
     public int getTotalFiles(DataRegionTable table)
     {

test/src/org/labkey/test/tests/targetedms/TargetedMSInstrumentUtilizationTest.java

@@ -93,6 +93,36 @@ public void testCrossFolderInstrumentUtilization() throws IOException, CommandEx
         InstrumentUtilizationWebPart utilization = new InstrumentUtilizationWebPart(getDriver());
         verifyCalendarTab(utilization);
         verifyRunsGrids(utilization, expectedCrossFolderFileCount);
+        verifyDrillIntoSamples(utilization);
+    }
+
+    /**
+     * The Skyline Document Count / Replicate Count cells in the summary grids drill into the Samples tab
+     * with a matching date filter applied. Verify the by-day and by-month links land on the Samples tab
+     * and narrow the sample-file grid to exactly the replicates that row represents.
+     */
+    private void verifyDrillIntoSamples(InstrumentUtilizationWebPart utilization)
+    {
+        log("Drilling into the Samples tab from a Summary by Day count link");
+        DataRegionTable byDay = utilization.getByDayTable();
+        int dayReplicates = Integer.parseInt(byDay.getDataAsText(0, "Replicate Count").trim());
+        utilization = utilization.drillIntoSamples(byDay, 0);
+        assertTrue("Samples tab should open when a day's count is clicked", utilization.isSamplesVisible());
+        waitForSamplesRowCount(dayReplicates);
+
+        log("Drilling into the Samples tab from a Summary by Month count link");
+        DataRegionTable byMonth = utilization.getByMonthTable();
+        int monthReplicates = Integer.parseInt(byMonth.getDataAsText(0, "Replicate Count").trim());
+        utilization = utilization.drillIntoSamples(byMonth, 0);
+        assertTrue("Samples tab should open when a month's count is clicked", utilization.isSamplesVisible());
+        waitForSamplesRowCount(monthReplicates);
+    }
+
+    /** Waits for the sample-file grid to refresh to the expected filtered row count (rebuilt each poll to dodge staleness). */
+    private void waitForSamplesRowCount(int expected)
+    {
+        waitFor(() -> new DataRegionTable(InstrumentUtilizationWebPart.SAMPLE_FILE_REGION, getDriver()).getDataRowCount() == expected,
+                "Samples grid did not filter to the expected " + expected + " row(s)", 10_000);
     }
 
     private void verifyCalendarTab(InstrumentUtilizationWebPart utilization)