@opentap/runner-client 2.12.0-alpha.1.1 → 2.12.0-alpha.1.3

package/lib/DTOs.d.ts

@@ -63,27 +63,19 @@ export interface IImageResolveErrorResponse extends IErrorResponse {
 }
 export declare class Session implements ISession {
     subject?: string | undefined;
-    id?: string;
-    constructor(data?: ISession);
-    init(_data?: any): void;
-    static fromJS(data: any): Session;
-    toJSON(data?: any): any;
-}
-export interface ISession {
-    subject?: string | undefined;
-    id?: string;
-}
-export declare class SessionDetails extends Session implements ISessionDetails {
+    id?: string | undefined;
     imageId?: string | undefined;
     executionState?: ExecutionState;
     testPlanRunId?: string | undefined;
     startedBy?: string | undefined;
-    constructor(data?: ISessionDetails);
+    constructor(data?: ISession);
     init(_data?: any): void;
-    static fromJS(data: any): SessionDetails;
+    static fromJS(data: any): Session;
     toJSON(data?: any): any;
 }
-export interface ISessionDetails extends ISession {
+export interface ISession {
+    subject?: string | undefined;
+    id?: string | undefined;
     imageId?: string | undefined;
     executionState?: ExecutionState;
     testPlanRunId?: string | undefined;

package/lib/DTOs.js

@@ -182,6 +182,10 @@ var Session = /** @class */ (function () {
         if (_data) {
             this.subject = _data['Subject'];
             this.id = _data['Id'];
+            this.imageId = _data['ImageId'];
+            this.executionState = _data['ExecutionState'];
+            this.testPlanRunId = _data['TestPlanRunId'];
+            this.startedBy = _data['StartedBy'];
         }
     };
     Session.fromJS = function (data) {
@@ -194,43 +198,15 @@ var Session = /** @class */ (function () {
         data = typeof data === 'object' ? data : {};
         data['Subject'] = this.subject;
         data['Id'] = this.id;
-        return data;
-    };
-    return Session;
-}());
-export { Session };
-var SessionDetails = /** @class */ (function (_super) {
-    __extends(SessionDetails, _super);
-    function SessionDetails(data) {
-        return _super.call(this, data) || this;
-    }
-    SessionDetails.prototype.init = function (_data) {
-        _super.prototype.init.call(this, _data);
-        if (_data) {
-            this.imageId = _data['ImageId'] ? RunStatus.fromJS(_data['ImageId']) : undefined;
-            this.executionState = _data['ExecutionState'] ? RunStatus.fromJS(_data['ExecutionState']) : undefined;
-            this.testPlanRunId = _data['TestPlanRunId'] ? RunStatus.fromJS(_data['TestPlanRunId']) : undefined;
-            this.startedBy = _data['StartedBy'] ? RunStatus.fromJS(_data['StartedBy']) : undefined;
-        }
-    };
-    SessionDetails.fromJS = function (data) {
-        data = typeof data === 'object' ? data : {};
-        var result = new SessionDetails();
-        result.init(data);
-        return result;
-    };
-    SessionDetails.prototype.toJSON = function (data) {
-        data = typeof data === 'object' ? data : {};
         data['ImageId'] = this.imageId;
         data['ExecutionState'] = this.executionState;
         data['TestPlanRunId'] = this.testPlanRunId;
         data['StartedBy'] = this.startedBy;
-        _super.prototype.toJSON.call(this, data);
         return data;
     };
-    return SessionDetails;
-}(Session));
-export { SessionDetails };
+    return Session;
+}());
+export { Session };
 var Links = /** @class */ (function () {
     function Links(data) {
         if (data) {

package/lib/RunnerClient.d.ts

@@ -1,4 +1,4 @@
-import { Image, Session, SessionDetails } from './DTOs';
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
 import { ConnectionOptions } from 'nats.ws';
 export declare class RunnerClient extends BaseClient {
@@ -16,9 +16,9 @@ export declare class RunnerClient extends BaseClient {
     getImages(): Promise<Image[]>;
     /**
      * Get all sessions
-     * @returns {{Promise<SessionDetails[]>}}
+     * @returns {{Promise<Session[]>}}
      */
-    getSessions(): Promise<SessionDetails[]>;
+    getSessions(): Promise<Session[]>;
     /**
      * Create a OpenTAP package configuration image from a list image inputs consisting of user specified packages and repositories.
      * @param {Image[]} images List of images

package/lib/RunnerClient.js

@@ -13,7 +13,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { Image, Session, SessionDetails } from './DTOs';
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
@@ -45,11 +45,11 @@ var RunnerClient = /** @class */ (function (_super) {
     };
     /**
      * Get all sessions
-     * @returns {{Promise<SessionDetails[]>}}
+     * @returns {{Promise<Session[]>}}
      */
     RunnerClient.prototype.getSessions = function () {
         return this.request('GetSessions')
-            .then(function (sessionDetailsArrayJs) { return sessionDetailsArrayJs.map(function (sessionDetailsJs) { return SessionDetails.fromJS(sessionDetailsJs); }); })
+            .then(function (sessionArrayJs) { return sessionArrayJs.map(function (sessionJs) { return Session.fromJS(sessionJs); }); })
             .then(this.success())
             .catch(this.error());
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "2.12.0-alpha.1.1",
+  "version": "2.12.0-alpha.1.3",
   "description": "This is the web client for the OpenTAP Runner.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",