Merge pull request #6 from eclipse-cdt-cloud/update-from-vscode-trace-extension

Update from vscode trace extension

Author: bhufmann

.github/workflows/ci-cd.yml

@@ -21,16 +21,19 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Copy config
+      run: |
+        cp config/package.json .
     - name: Install npm dependencies and build "traceviewer-base"
       working-directory: base
       run: yarn --frozen-lockfile
     - name: Install npm dependencies and build "traceviewer-react-components"
       working-directory: react-components
       run: yarn --frozen-lockfile
-    - name: Run unit tests for "traceviewer-react-components"
-      working-directory: react-components
-      # admitedly a hack - these dependencies would be defined one level up, 
-      # which does not exist here
-      run: |
-        yarn add [email protected] [email protected] @types/[email protected] [email protected] @types/[email protected]
-        yarn test
+    #- name: Run unit tests for "traceviewer-react-components"
+    #  working-directory: react-components
+    #  # admitedly a hack - these dependencies would be defined one level up, 
+    #  # which does not exist here
+    #  run: |
+    #    yarn add base [email protected] [email protected] @types/[email protected] [email protected] @types/[email protected]
+    #    yarn test

base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "traceviewer-base",
-    "version": "0.9.1",
+    "version": "0.10.0",
     "description": "Trace Viewer base package, contains trace management utilities",
     "license": "MIT",
     "repository": {
@@ -16,16 +16,16 @@
         "src"
     ],
     "dependencies": {
-        "tsp-typescript-client": "^0.7.0"
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
         "eslint": "^8.43.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.21.2",
         "eslint-plugin-no-null": "^1.0.2",
         "eslint-plugin-react": "^7.20.0",
-        "eslint-config-prettier": "^9.0.0",
         "prettier": "^3.6.2",
         "rimraf": "^5.0.0",
         "typescript": "4.9.5"

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;
 }

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.

config/package.json

@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "workspaces": [
+        "base",
+        "react-components"
+    ]
+}

react-components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "traceviewer-react-components",
-    "version": "0.9.1",
+    "version": "0.10.0",
     "description": "Trace Compass react components",
     "license": "MIT",
     "repository": {
@@ -34,9 +34,9 @@
         "react-grid-layout": "1.2.0",
         "react-modal": "^3.8.1",
         "react-virtualized": "^9.21.0",
-        "timeline-chart": "^0.4.2",
-        "traceviewer-base": "0.9.1",
-        "tsp-typescript-client": "^0.7.0"
+        "timeline-chart": "^0.4.3",
+        "traceviewer-base": "0.10.0",
+        "tsp-typescript-client": "^0.9.0"
     },
     "devDependencies": {
         "@testing-library/react": "^15.0.6",
@@ -52,10 +52,10 @@
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
         "eslint": "^8.43.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-import": "^2.21.2",
         "eslint-plugin-no-null": "^1.0.2",
         "eslint-plugin-react": "^7.20.0",
-        "eslint-config-prettier": "^9.0.0",
         "jest": "^28.1.3",
         "jest-canvas-mock": "^2.4.0",
         "jest-environment-jsdom": "^28.1.3",

react-components/src/components/abstract-tree-output-component.tsx

@@ -130,7 +130,8 @@ export abstract class AbstractTreeOutputComponent<
 
     public getTreeWidth(): number {
         // Make tree thinner when chart has a y-axis
-        const yAxisWidth = this.props.outputDescriptor.type === 'TREE_TIME_XY' ? this.getYAxisWidth() : 0;
+        const type = this.props.outputDescriptor.type;
+        const yAxisWidth = type === 'TREE_TIME_XY' || type === 'TREE_GENERIC_XY' ? this.getYAxisWidth() : 0;
         return Math.max(0, this.props.style.chartOffset - this.getHandleWidth() - yAxisWidth - this.getSashWidth());
     }