Fix submitting new selection ranges from the Time Range Data View

Since commit d857eae where the vscode-messenger was introduced this
feature has been broken. The request to update the selection range
after submitting the new range from the Time Range Data view was not
propagated to the trace viewer webview where the time axis and selection
is updated. This PR fixes this.

Note that this fix sends the selection range to the correct widget and
handles the bigint values in the signal payload correctly.

fixes #357

Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

Author: bhufmann

local-libs/traceviewer-libs/base/src/signals/time-range-data-signal-payloads.tsx

@@ -1,6 +1,12 @@
-import { TimeRange } from '../utils/time-range';
+import { ITimeRange, TimeRange } from '../utils/time-range';
+
+import { createNormalizer } from 'tsp-typescript-client/lib/protocol/serialization';
+
+export const TimeRangeUpdatePayload = createNormalizer<TimeRangeUpdatePayload>({
+    timeRange: ITimeRange
+});
 
 export interface TimeRangeUpdatePayload {
     experimentUUID: string;
-    timeRange?: TimeRange;
+    timeRange?: ITimeRange;
 }

local-libs/traceviewer-libs/base/src/utils/time-range.ts

@@ -1,13 +1,28 @@
+import { createNormalizer } from 'tsp-typescript-client/lib/protocol/serialization';
+
 export interface TimeRangeString {
     start: string;
     end: string;
     offset?: string;
 }
 
-export class TimeRange {
-    private start: bigint;
-    private end: bigint;
-    private offset: bigint | undefined;
+export const ITimeRange = createNormalizer<ITimeRange>({
+    start: BigInt,
+    end: BigInt,
+    offset: BigInt
+});
+
+export interface ITimeRange {
+    start: bigint;
+    end: bigint;
+    offset: bigint | undefined;
+    toString(): TimeRangeString;
+}
+
+export class TimeRange implements ITimeRange {
+    start: bigint;
+    end: bigint;
+    offset: bigint | undefined;
 
     /**
      * Constructor.

local-libs/traceviewer-libs/react-components/src/components/trace-context-component.tsx

@@ -935,8 +935,8 @@ export class TraceContextComponent extends React.Component<TraceContextProps, Tr
         const { timeRange, experimentUUID } = payload;
         if (experimentUUID === this.props.experiment.UUID && timeRange) {
             this.unitController.selectionRange = {
-                start: timeRange.getStart(),
-                end: timeRange.getEnd()
+                start: timeRange.start,
+                end: timeRange.end
             };
         }
     };

vscode-trace-extension/src/trace-viewer-panel/trace-viewer-webview-panel.ts

@@ -36,7 +36,8 @@ import {
     getMarkerCategories,
     getMarkerSets,
     updateMarkerCategoryState,
-    updateMarkerSetState
+    updateMarkerSetState,
+    requestSelectionRangeChange
 } from 'vscode-trace-common/lib/messages/vscode-messages';
 import { Experiment } from 'tsp-typescript-client/lib/models/experiment';
 import { MarkerSet } from 'tsp-typescript-client/lib/models/markerset';
@@ -421,7 +422,11 @@ export class TraceViewerPanel {
     }
 
     protected doHandleRequestSelectionRangeChange(payload: TimeRangeUpdatePayload): void {
-        this._messenger.sendNotification(experimentSelected, this._webviewParticipant, JSONBigUtils.stringify(payload));
+        this._messenger.sendNotification(
+            requestSelectionRangeChange,
+            this._webviewParticipant,
+            JSONBigUtils.stringify(payload)
+        );
     }
     setExperiment(experiment: Experiment): void {
         this._experiment = experiment;

vscode-trace-webviews/src/trace-viewer/vscode-trace-viewer-container.tsx

@@ -17,35 +17,36 @@ import { signalManager } from 'traceviewer-base/lib/signals/signal-manager';
 import { TimeRangeUpdatePayload } from 'traceviewer-base/lib/signals/time-range-data-signal-payloads';
 import { TraceContextComponent } from 'traceviewer-react-components/lib/components/trace-context-component';
 import 'traceviewer-react-components/style/trace-context-style.css';
+import { Experiment } from 'tsp-typescript-client/lib/models/experiment';
+import { MarkerSet } from 'tsp-typescript-client/lib/models/markerset';
+import { OutputDescriptor } from 'tsp-typescript-client/lib/models/output-descriptor';
+import { array } from 'tsp-typescript-client/lib/protocol/serialization';
+import { JSONBigUtils } from 'tsp-typescript-client/lib/utils/jsonbig-utils';
+import { TspClientProvider } from 'vscode-trace-common/lib/client/tsp-client-provider-impl';
 import {
-    setTspClient,
-    traceServerUrlChanged,
-    experimentSelected,
-    setExperiment,
     addOutput,
-    outputDataChanged,
-    setTheme,
+    connectionStatus,
+    contributeContextMenu,
+    experimentSelected,
+    getMarkerCategories,
+    getMarkerSets,
     openOverview,
+    outputDataChanged,
+    redo,
+    requestSelectionChange,
     resetZoom,
+    setExperiment,
+    setTheme,
+    setTspClient,
+    traceServerUrlChanged,
     undo,
-    redo,
-    updateZoom,
-    getMarkerCategories,
-    getMarkerSets,
     updateMarkerCategoryState,
     updateMarkerSetState,
-    contributeContextMenu,
-    connectionStatus
+    updateZoom
 } from 'vscode-trace-common/lib/messages/vscode-messages';
-import { VsCodeMessageManager } from '../common/vscode-message-manager';
 import { messenger } from '.';
-import { Experiment } from 'tsp-typescript-client/lib/models/experiment';
-import { MarkerSet } from 'tsp-typescript-client/lib/models/markerset';
-import { OutputDescriptor } from 'tsp-typescript-client/lib/models/output-descriptor';
-import { JSONBigUtils } from 'tsp-typescript-client/lib/utils/jsonbig-utils';
-import { TspClientProvider } from 'vscode-trace-common/lib/client/tsp-client-provider-impl';
+import { VsCodeMessageManager } from '../common/vscode-message-manager';
 import '../style/trace-viewer.css';
-import { array } from 'tsp-typescript-client/lib/protocol/serialization';
 interface VscodeAppState {
     experiment: Experiment | undefined;
     tspClientProvider: TspClientProvider | undefined;
@@ -213,6 +214,13 @@ class TraceViewerContainer extends React.Component<{}, VscodeAppState> {
         }
     };
 
+    private _onRequestSelectionChanged = (data: any): void => {
+        if (data) {
+            const payload = JSONBigUtils.parse(data, TimeRangeUpdatePayload);
+            signalManager().emit('REQUEST_SELECTION_RANGE_CHANGE', payload);
+        }
+    };
+
     private markerCategoriesMap = new Map<string, string[]>();
     private toolbarMarkerCategoriesMap = new Map<string, { categoryCount: number; toggleInd: boolean }>();
     private selectedMarkerCategoriesMap = new Map<string, string[]>();
@@ -248,6 +256,7 @@ class TraceViewerContainer extends React.Component<{}, VscodeAppState> {
         messenger.onNotification(updateMarkerSetState, this._onVscodeUpdateMarkerSetState);
         messenger.onNotification(contributeContextMenu, this._onVscodeUpdateContributeContextMenu);
         messenger.onNotification(connectionStatus, this._onVscodeConnectionStatus);
+        messenger.onNotification(requestSelectionChange, this._onRequestSelectionChanged);
 
         window.addEventListener('resize', this.onResize);
         this.onOutputRemoved = this.onOutputRemoved.bind(this);