Merge branch 'fix-timeline-grouping'

auxoncorp · May 13, 2024 · 0a0f8df · 0a0f8df
2 parents c9458fc + 7a60797
commit 0a0f8df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/vscode/package.json b/vscode/package.json
@@ -220,7 +220,7 @@
                 },
                 {
                     "command": "auxon.timelines.deleteMany",
-                    "when": "view == auxon.timelines && ((viewItem == timeline && listMultiSelection) || viewItem == timelineGroup)",
+                    "when": "view == auxon.timelines && ((viewItem == timeline && listMultiSelection) || viewItem == timelineGroup || viewItem == timelineGroupByName)",
                     "group": "2_context@2"
                 },
                 {

diff --git a/vscode/src/terminalLinkProvider.ts b/vscode/src/terminalLinkProvider.ts
@@ -42,7 +42,9 @@ const EVENT_COORDS_TERMINAL_LINK_PROVIDER: vscode.TerminalLinkProvider<EventCoor
                 startIndex: match.index,
                 length: match[0].length,
                 tooltip: "View log around this event",
-                data: { around: coord, radius: "5" },
+                // NOTE: restore the around behavor
+                // data: { around: coord, radius: "5" },
+                data: { from: coord },
             };
             links.push(link);
         }

diff --git a/vscode/src/timelines.ts b/vscode/src/timelines.ts
@@ -405,7 +405,7 @@ abstract class TimelineTreeItemData {
 }
 
 export class TimelineGroupByNameTreeItemData extends TimelineTreeItemData {
-    contextValue = "timelineGroup";
+    contextValue = "timelineGroupByName";
 
     constructor(public name: string) {
         super();
@@ -478,7 +478,7 @@ export class TimelineGroupTreeItemData extends TimelineTreeItemData {
     }
 
     override canHaveChildren(): boolean {
-        return this.childItems.length !== 0;
+        return this.timeline_group.timelines.length !== 0;
     }
 
     override async children(_apiClient: api.Client): Promise<TimelineTreeItemData[]> {
@@ -491,7 +491,6 @@ export class TimelineGroupTreeItemData extends TimelineTreeItemData {
             }
             return a.name.localeCompare(b.name);
         });
-
         this.childItems = timelines.map((timeline_overview) => new TimelineLeafTreeItemData(timeline_overview));
         return this.childItems;
     }