attlaz-client 1.9.14 → 1.9.15

package/dist/Model/Trigger/Trigger.js

@@ -20,6 +20,7 @@ class Trigger extends MetaDataAware_1.MetaDataAware {
         this.arguments = {};
     }
     static parse(rawTrigger) {
+        console.log(rawTrigger);
         const type = TriggerType_1.TriggerType.fromString(rawTrigger.type);
         const data = rawTrigger.data;
         const flowId = rawTrigger.flow;

package/dist/Service/Endpoint.d.ts

@@ -1,12 +1,12 @@
 import { OAuthClient } from '../Http/OAuthClient';
-import { DataResult } from '../Model/Result/DataResult';
 import { CollectionResult } from '../Model/Result/CollectionResult';
 import { ObjectResult } from '../Model/Result/ObjectResult';
 export declare abstract class Endpoint {
     protected httpClient: OAuthClient;
     constructor(httpClient: OAuthClient);
+    private formatParameters;
+    private formatKey;
     requestCollection<T>(action: string, parameters: any, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
     requestObject<T>(action: string, parameters: any, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<ObjectResult<T>>;
-    request<T>(action: string, parameters?: any, method?: string, signWithOauthToken?: boolean): Promise<DataResult<T>>;
     parseCollection<T>(rawData: object[], parser: (input: any) => T): T[];
 }

package/dist/Service/Endpoint.js

@@ -1,17 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Endpoint = void 0;
-const DataResult_1 = require("../Model/Result/DataResult");
 const CollectionResult_1 = require("../Model/Result/CollectionResult");
 const ObjectResult_1 = require("../Model/Result/ObjectResult");
 const HttpClient_1 = require("../Http/HttpClient");
 const Utils_1 = require("../Utils");
 const ObjectWrapper_1 = require("../Model/Result/ObjectWrapper");
+const DataValueCollection_1 = require("../Model/DataValueCollection");
+const JsonSerializable_1 = require("../Model/JsonSerializable");
 class Endpoint {
     constructor(httpClient) {
         this.httpClient = httpClient;
     }
+    formatParameters(data = null) {
+        if (data === null || data === undefined) {
+            return null;
+        }
+        if (Array.isArray(data)) {
+            const result = [];
+            for (const value of data) {
+                result.push(this.formatParameters(value));
+            }
+            return result;
+        }
+        // if (DateHelper.isDate(data)) {
+        //     return DateHelper.toString(data);
+        // }
+        // tODo: this does not seem to work correclty
+        if (data instanceof JsonSerializable_1.JsonSerializable && 'jsonSerialize' in data) {
+            return data.jsonSerialize();
+        }
+        if (typeof data === 'object') {
+            if (
+            // data instanceof WorkspaceId ||
+            // data instanceof ProjectEnvironmentId ||
+            // data instanceof ProjectId ||
+            // data instanceof OrganisationId ||
+            // data instanceof FlowId ||
+            // data instanceof FlowRunId ||
+            // data instanceof UserId ||
+            // data instanceof DataCollectionResult ||
+            // data instanceof SuccessResult ||
+            data instanceof DataValueCollection_1.DataValueCollection) {
+                return this.formatParameters(data.jsonSerialize());
+            }
+            const result = {};
+            for (const [key, value] of Object.entries(data)) {
+                const formattedKey = this.formatKey(key);
+                result[formattedKey] = this.formatParameters(value);
+            }
+            return result;
+        }
+        return data;
+    }
+    formatKey(key) {
+        let formattedKey = key.replace(/([A-Z])/g, ' $1');
+        formattedKey = formattedKey.split(' ').join('_').toLowerCase();
+        if (formattedKey.endsWith('_id')) {
+            formattedKey = formattedKey.substring(0, formattedKey.length - '_id'.length);
+        }
+        return formattedKey;
+    }
     async requestCollection(action, parameters = null, parser, method = 'GET', signWithOauthToken = true) {
+        parameters = this.formatParameters(parameters);
         const requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
         const result = new CollectionResult_1.CollectionResult();
         /**
@@ -32,6 +83,7 @@ class Endpoint {
         return result;
     }
     async requestObject(action, parameters = null, parser, method = 'GET', signWithOauthToken = true) {
+        parameters = this.formatParameters(parameters);
         const result = new ObjectResult_1.ObjectResult();
         try {
             let requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
@@ -39,8 +91,8 @@ class Endpoint {
             /**
              * Parse errors
              */
-            // TODO: temporary check untill we know the API is fully upgraded
-            if (requestResponse.hasOwnProperty('data') && requestResponse.data !== undefined) {
+            // TODO: temporary check until we know the API is fully upgraded
+            if ((requestResponse.hasOwnProperty('data') && !requestResponse.hasOwnProperty('id')) && requestResponse.data !== undefined) {
                 console.error('Response for object "' + action + '" seem to still use old "data" property', { requestResponse });
                 requestResponse = requestResponse.data;
             }
@@ -57,10 +109,11 @@ class Endpoint {
         return result;
     }
     ;
-    async request(action, parameters = null, method = 'GET', signWithOauthToken = true) {
-        const result = await this.httpClient.request(action, parameters, method, signWithOauthToken);
-        return DataResult_1.DataResult.parse(result);
-    }
+    // public async request<T>(action: string, parameters: any | null = null, method: string = 'GET', signWithOauthToken: boolean = true): Promise<DataResult<T>> {
+    //     const result: any = await this.httpClient.request(action, parameters, method, signWithOauthToken);
+    //
+    //     return DataResult.parse<T>(result);
+    // }
     parseCollection(rawData, parser) {
         const data = [];
         if (!Array.isArray(rawData)) {

package/dist/Service/FlowRunEndpoint.js

@@ -50,7 +50,7 @@ class FlowRunEndpoint extends Endpoint_1.Endpoint {
     }
     async getFlowRunSummary(flowRunId) {
         try {
-            const result = await this.requestObject('/taskexecutions/' + flowRunId + '/summaries', null, FlowRunSummary_1.FlowRunSummary.parse);
+            const result = await this.requestObject('/flowruns/' + flowRunId + '/summaries', null, FlowRunSummary_1.FlowRunSummary.parse);
             return result;
         }
         catch (error) {

package/dist/Service/StorageEndpoint.js

@@ -25,7 +25,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
         let cmd = '/projectenvironments/' + projectEnvironmentId + '/storage/' + storageType + '/' + poolKey;
         try {
             const parser = (raw) => {
-                return raw.cleared;
+                return raw.deleted;
             };
             const result = await this.requestObject(cmd, null, parser, 'DELETE');
             const re = result.getData();
@@ -33,7 +33,7 @@ class StorageEndpoint extends Endpoint_1.Endpoint {
                 console.log('clearpool wrong data', { result, parsed: re });
                 throw new Error('Something went wrong');
             }
-            return re.cleared;
+            return re.deleted;
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/WorkspaceMemberEndpoint.js

@@ -90,7 +90,7 @@ class WorkspaceMemberEndpoint extends Endpoint_1.Endpoint {
         userAction.userId = rawUserEvent.user;
         userAction.workspaceId = rawUserEvent.workspace;
         userAction.action = rawUserEvent.action;
-        userAction.resourceId = rawUserEvent.resource_id;
+        userAction.resourceId = rawUserEvent.resource;
         userAction.resourceType = rawUserEvent.resource_type;
         userAction.description = rawUserEvent.description;
         userAction.ip = rawUserEvent.ip;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.9.14",
+  "version": "1.9.15",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",