Small fixes in various responses

Signed-off-by: Simon Delisle <delislesim@hotmail.com>

Author: Simon Delisle

src/models/tree.ts renamed to src/models/entry.ts

@@ -31,7 +31,7 @@ export interface BasicEntry {
     /**
      * Array of entry header
      */
-    name: EntryHeader[];
+    name: string[];
 }
 
 /**

src/models/response/entry-response.ts

@@ -15,6 +15,7 @@
  ********************************************************************************/
 
 import { OutputDescriptor } from '../output-descriptor';
+import { ResponseStatus } from './responses';
 
 /**
  * Generic entry/tree response
@@ -34,4 +35,14 @@ export interface GenericEntryResponse<T> {
      * Number of entries in the model
      */
     size: number;
+
+    /**
+     * Response status as described by ResponseStatus
+     */
+    status: ResponseStatus;
+
+    /**
+     * Message associated with the response
+     */
+    statusMessage: string;
 }

src/models/response/timegraph-response.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  ********************************************************************************/
 
-import { EntryHeader } from '../tree';
+import { EntryHeader } from '../entry';
 import { GenericEntryResponse } from './entry-response';
 import { TimeGraphEntry } from '../timegraph';
 

src/models/response/xy-response.ts

@@ -16,6 +16,17 @@
 
 import { XYModel, Axis } from '../xy';
 import { GenericResponse } from './responses';
+import { BasicEntry, EntryHeader } from '../entry';
+import { GenericEntryResponse } from './entry-response';
+
+
+/**
+ * XY specific entry response extends the GenericEntryResponse.
+ * Type T is a BasicEntry and Type U is an EntryHeader
+ */
+export interface XYEntryResponse<T extends BasicEntry, U extends EntryHeader> extends GenericEntryResponse<T> {
+    headers: U[];
+}
 
 /**
  * XY specific model response.

src/models/timegraph.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  ********************************************************************************/
 
-import { BasicEntry } from './tree';
+import { BasicEntry } from './entry';
 
 /**
  * Entry in a time graph

src/protocol/tsp-client.ts

@@ -16,9 +16,9 @@
 
 import { Query } from '../models/query';
 import { GenericEntryResponse } from '../models/response/entry-response';
-import { BasicEntry, EntryHeader } from '../models/tree';
+import { BasicEntry, EntryHeader } from '../models/entry';
 import { GenericResponse } from '../models/response/responses';
-import { XYModelResponse } from '../models/response/xy-response';
+import { XYModelResponse, XYEntryResponse } from '../models/response/xy-response';
 import { XYModel } from '../models/xy';
 import { TimeGraphEntryResponse } from '../models/response/timegraph-response';
 import { TimeGraphEntry, TimeGraphRow, TimeGraphArrow } from '../models/timegraph';
@@ -147,9 +147,9 @@ export class TspClient {
      * @param parameters Query object
      * @returns Generic entry response with entries of type T
      */
-    public async fetchXYTree<T extends BasicEntry>(expUUID: string, outputID: string, parameters: Query): Promise<GenericEntryResponse<T>> {
+    public async fetchXYTree<T extends BasicEntry, U extends EntryHeader>(expUUID: string, outputID: string, parameters: Query): Promise<XYEntryResponse<T, U>> {
         const url = '${this.baseUrl}/experiments/${expUUID}/outputs/XY/${outputID}/tree';
-        return await RestClient.post(url, parameters) as GenericEntryResponse<T>;
+        return await RestClient.post(url, parameters) as XYEntryResponse<T, U>;
     }
 
     /**