Merge pull request #533 from lukecotter/feat-find-incorrect-totals

feat: ensure that the findwidget shows correct totals

Author: lcottercertinia

log-viewer/modules/components/calltree-view/CalltreeView.ts

@@ -554,7 +554,11 @@ export class CalltreeView extends LitElement {
               const cellElem = cell.getElement();
               const row = cell.getRow();
               // @ts-expect-error: _row is private. This is temporary and I will patch the text wrap behaviour in the library.
-              const treeLevel = row._row.modules.dataTree.index;
+              const dataTree = row._row.modules.dataTree;
+              if (!dataTree) {
+                return '';
+              }
+              const treeLevel = dataTree?.index;
               childIndent ??= row.getTable().options.dataTreeChildIndent || 0;
               const levelIndent = treeLevel * childIndent;
               cellElem.style.paddingLeft = `${levelIndent + 4}px`;
@@ -728,12 +732,17 @@ export class CalltreeView extends LitElement {
     const len = rows.length;
     for (let i = 0; i < len; i++) {
       const row = rows[i];
-      if (!row) {
+      //@ts-expect-error This is private to tabulator, but we have no other choice atm.
+      if (!row?._getSelf().modules?.dataTree) {
         continue;
       }
 
-      expand ? row.treeExpand() : row.treeCollapse();
-      this._expandCollapseAll(row.getTreeChildren(), expand);
+      if (expand) {
+        row.treeExpand();
+      } else {
+        row.treeCollapse();
+      }
+      this._expandCollapseAll(row.getTreeChildren() ?? [], expand);
     }
   }
 
@@ -793,7 +802,7 @@ export class CalltreeView extends LitElement {
       if (timeStamp === node.timestamp) {
         return row;
       } else if (isInRange) {
-        return this._findByTime(row.getTreeChildren(), timeStamp);
+        return this._findByTime(row.getTreeChildren() ?? [], timeStamp);
       }
       // Otherwise, look in the left or right half
       else if (timeStamp > endTime) {

log-viewer/modules/components/calltree-view/module/Find.ts

@@ -38,12 +38,9 @@ export class Find extends Module {
 
     const flatten = (row: RowComponent): RowComponent[] => {
       const mergedArray = [row];
-      row
-        .getTreeChildren()
-        .flatMap(flatten)
-        .forEach((child) => {
-          mergedArray.push(child);
-        });
+      (row.getTreeChildren() ?? []).flatMap(flatten).forEach((child) => {
+        mergedArray.push(child);
+      });
       return mergedArray;
     };
 
@@ -137,9 +134,14 @@ export function formatter(row: RowComponent, findArgs: FindArgs) {
   }
 
   const data = row.getData();
+  const highlights = {
+    indexes: data.highlightIndexes,
+    currentMatch: 0,
+  };
+
   row.getCells().forEach((cell) => {
     const cellElem = cell.getElement();
-    _highlightText(cellElem, findArgs, { indexes: data.highlightIndexes, currentMatch: 0 });
+    _highlightText(cellElem, findArgs, highlights);
   });
 
   //@ts-expect-error This is private to tabulator, but we have no other choice atm.

log-viewer/modules/components/calltree-view/module/MiddleRowFocus.ts

@@ -113,7 +113,7 @@ export class MiddleRowFocus extends Module {
 
         return this._findClosestActiveSibling(mid, rows, displayRows);
       } else if (timeStamp >= node.timestamp && timeStamp <= endTime) {
-        const childMatch = this._findClosestActive(row.getTreeChildren(), timeStamp);
+        const childMatch = this._findClosestActive(row.getTreeChildren() ?? [], timeStamp);
         if (childMatch) {
           return childMatch;
         }

log-viewer/modules/timeline/Timeline.ts

@@ -170,6 +170,7 @@ let findArgs: { text: string; count: number; options: { matchCase: boolean } } =
   count: 1,
   options: { matchCase: false },
 };
+let totalMatches = 0;
 
 function getMaxDepth(nodes: LogLine[]) {
   const result = new Map<number, LogLine[]>();
@@ -918,6 +919,9 @@ function handleScroll(evt: WheelEvent) {
 function _findOnTimeline(
   e: CustomEvent<{ text: string; count: number; options: { matchCase: boolean } }>,
 ) {
+  if (!isVisible && !totalMatches) {
+    return;
+  }
   _hideTooltip();
 
   const newFindArgs = JSON.parse(JSON.stringify(e.detail));
@@ -938,10 +942,13 @@ function _findOnTimeline(
     borderRenderQueue.clear();
     nodesToRectangles(timelineRoot.children as Method[]);
     const findResults = borderRenderQueue.get(findMatchColor) || [];
+    totalMatches = findResults.length;
 
-    document.dispatchEvent(
-      new CustomEvent('lv-find-results', { detail: { totalMatches: findResults.length } }),
-    );
+    if (!clearHighlights) {
+      document.dispatchEvent(
+        new CustomEvent('lv-find-results', { detail: { totalMatches: totalMatches } }),
+      );
+    }
   }
 
   const findResults = borderRenderQueue.get(findMatchColor) || [];