Add data type DataType enum and usage in EntryHeader data structure

Added also unit test for that.

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

Author: bhufmann

tsp-typescript-client/fixtures/tsp-client/fetch-data-tree-0.json

@@ -7,13 +7,15 @@
 		  "style": null,
 		  "labels": [
 			"kernel",
-			"221 ns",
-			"13.583 s",
-			"117.405 ms",
-			"743.411 ms",
-			"4364",
-			"512.353 s"
-		  ],
+			"266 ns",
+			"1.022 s",
+			"18.768 ms",
+			"85.527 ms",
+			"2607",
+			"48.929 s",
+			"[1571171542725521079,1571171542725521345]",
+			"[1571171542231247219,1571171543252848866]"
+			],
 		  "hasData": true
 		},
 		{
@@ -22,13 +24,15 @@
 		  "style": null,
 		  "labels": [
 			"Total",
-			"221 ns",
-			"13.583 s",
-			"117.405 ms",
-			"743.411 ms",
-			"4364",
-			"512.353 s"
-		  ],
+			"266 ns",
+			"1.022 s",
+			"18.768 ms",
+			"85.527 ms",
+			"2607",
+			"48.929 s",
+			"[1571171542725521079,1571171542725521345]",
+			"[1571171542231247219,1571171543252848866]"
+			],
 		  "hasData": true
 		},
 		{
@@ -37,13 +41,15 @@
 		  "style": null,
 		  "labels": [
 			"WAKE",
-			"221 ns",
-			"55.137 µs",
-			"3.707 µs",
-			"5.214 µs",
-			"3010",
-			"11.158 ms"
-		  ],
+			"266 ns",
+			"65.302 µs",
+			"3.087 µs",
+			"3.961 µs",
+			"1756",
+			"5.421 ms",
+			"[1571171542725521079,1571171542725521345]",
+			"[1571171542574454113,1571171542574519415]"
+			],
 		  "hasData": true
 		},
 		{
@@ -52,13 +58,15 @@
 		  "style": null,
 		  "labels": [
 			"WAIT",
-			"319 ns",
-			"13.583 s",
-			"378.392 ms",
-			"1.297 s",
-			"1354",
-			"512.342 s"
-		  ],
+			"622 ns",
+			"1.022 s",
+			"57.489 ms",
+			"142.119 ms",
+			"851",
+			"48.923 s",
+			"[1571171542693294749,1571171542693295371]",
+			"[1571171542231247219,1571171543252848866]"
+			],
 		  "hasData": true
 		}
 	  ],
@@ -90,6 +98,16 @@
 		{
 		  "name": "Total",
 		  "tooltip": ""
+		},
+		{
+		  "name": "Min Time Range",
+		  "tooltip": "",
+		  "dataType": "TIME_RANGE"
+		},
+		{
+			"name": "Max Time Range",
+			"tooltip": "",
+			"dataType": "TIME_RANGE"
 		}
 	  ]
 	},

tsp-typescript-client/src/models/data-type.ts

@@ -0,0 +1,17 @@
+export enum DataType {
+    /** Data represent a decimal number */
+    NUMBER = 'NUMBER',
+    /** Binary data, where the size orders are powers of 2 */
+    BINARY_NUMBER = 'NUMBER',
+    /** Data represent a timestamp in nanoseconds, can be negative */
+    TIMESTAMP = "TIMESTAMP",
+    /** Data represents a duration in nanoseconds */
+    DURATION = "DURATION",
+    /** Data is textual data */
+    STRING = "STRING",
+    /** 
+     * Data representing a time range of string: [start,end],
+     * where `start` and `end` are timestamps in nanoseconds
+     */
+    TIME_RANGE = "TIME_RANGE"
+}

tsp-typescript-client/src/models/entry.ts

@@ -58,6 +58,11 @@ export interface EntryHeader {
      * The description of this header field
      */
     tooltip: string
+
+    /**
+     * The data type of the column. If undefined, default is DATA_TYPE.STRING.
+     */
+    dataType?: string
 }
 
 export function EntryModel<T extends Entry>(normalizer: Normalizer<T>): Normalizer<EntryModel<T>> {

tsp-typescript-client/src/protocol/tsp-client.test.ts

@@ -1,10 +1,11 @@
 // tslint:disable: no-unused-expression
 
+import { Headers } from 'node-fetch';
 import { Query } from '../models/query/query';
 import { HttpRequest, HttpResponse, RestClient } from './rest-client';
-import { Headers } from 'node-fetch';
 import { FixtureSet } from './test-utils';
 import { TspClient } from './tsp-client';
+import { DataType } from '../models/data-type';
 
 describe('TspClient Deserialization', () => {
 
@@ -333,11 +334,34 @@ describe('TspClient Deserialization', () => {
     const genericResponse = response.getModel()!;
     const model = genericResponse.model;
 
+    const EXPECTED_TRACE_MAX_RANGE = "[1571171542231247219,1571171543252848866]";
+    const EXPECTED_HEADERS = [ { name: 'Label', tooltip: '' }, 
+                               { name: 'Minimum', tooltip: '' }, 
+                               { name: 'Maximum', tooltip: '' },
+                               { name: 'Average', tooltip: '' },
+                               { name: 'Std Dev', tooltip: '' },
+                               { name: 'Count', tooltip: '', },
+                               { name: 'Total', tooltip: '', },
+                               { name: 'Min Time Range', tooltip: '', dataType: DataType.TIME_RANGE },
+                               { name: 'Max Time Range', tooltip: '', dataType: DataType.TIME_RANGE }];
+
     expect(model.entries).toHaveLength(4);
-    expect(model.headers).toHaveLength(7);
+    expect(model.headers).toHaveLength(9);
+
+    let i = 0;
+    for (const header of model.headers) {
+        expect(header.name).toEqual(EXPECTED_HEADERS[i].name);
+        expect(header.tooltip).toEqual(EXPECTED_HEADERS[i].tooltip);
+        if (EXPECTED_HEADERS[i].dataType) {
+          expect(header.dataType).toEqual(EXPECTED_HEADERS[i].dataType);
+        }
+        i++;
+    }
     for (const entry of model.entries) {
       expect(typeof entry.id).toEqual('number');
     }
+    const len = model.entries[0].labels.length;
+    expect(model.entries[0].labels[len - 1]).toEqual(EXPECTED_TRACE_MAX_RANGE);
   });
 
   it('fetchXYTree', async () => {