attlaz-client 1.9.13 → 1.9.15

package/dist/Core/MetaDataAware.d.ts

@@ -0,0 +1,4 @@
+import { DataValueCollection } from '../Model/DataValueCollection';
+export declare abstract class MetaDataAware {
+    metadata: DataValueCollection;
+}

package/dist/Core/MetaDataAware.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetaDataAware = void 0;
+class MetaDataAware {
+}
+exports.MetaDataAware = MetaDataAware;

package/dist/Model/Flow/Flow.d.ts

@@ -1,6 +1,7 @@
 import { State } from '../State';
 import { StateAware } from '../StateAware';
-export declare class Flow implements StateAware {
+import { MetaDataAware } from '../../Core/MetaDataAware';
+export declare class Flow extends MetaDataAware implements StateAware {
     id: string;
     key: string;
     name: string;
@@ -10,5 +11,5 @@ export declare class Flow implements StateAware {
     state: State;
     /** The maximum number of tasks to run at any time (0 = no limit) **/
     parallelLimit: number;
-    static parse(rawTask: any): Flow;
+    static parse(rawFlow: any): Flow;
 }

package/dist/Model/Flow/Flow.js

@@ -3,23 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Flow = void 0;
 const State_1 = require("../State");
 const Utils_1 = require("../../Utils");
-class Flow {
+const MetaDataAware_1 = require("../../Core/MetaDataAware");
+const DataValueCollection_1 = require("../DataValueCollection");
+class Flow extends MetaDataAware_1.MetaDataAware {
     constructor() {
+        super(...arguments);
         this.isDirect = false;
         this.state = State_1.State.Active;
         /** The maximum number of tasks to run at any time (0 = no limit) **/
         this.parallelLimit = 0;
     }
-    static parse(rawTask) {
+    static parse(rawFlow) {
         const task = new Flow();
-        task.id = rawTask.id;
-        task.key = rawTask.key;
-        task.projectId = rawTask.project;
-        task.name = rawTask.name;
-        task.description = rawTask.description;
-        task.isDirect = Utils_1.Utils.isTrue(rawTask.is_direct);
-        task.state = State_1.State.fromString(rawTask.state);
-        task.parallelLimit = Utils_1.Utils.parseInt(rawTask.parallel_limit);
+        task.id = rawFlow.id;
+        task.key = rawFlow.key;
+        task.projectId = rawFlow.project;
+        task.name = rawFlow.name;
+        task.description = rawFlow.description;
+        task.isDirect = Utils_1.Utils.isTrue(rawFlow.is_direct);
+        task.state = State_1.State.fromString(rawFlow.state);
+        task.parallelLimit = Utils_1.Utils.parseInt(rawFlow.parallel_limit);
+        task.metadata = DataValueCollection_1.DataValueCollection.fromObject(rawFlow.metadata);
         return task;
     }
 }

package/dist/Model/Flow/FlowRun.d.ts

@@ -1,6 +1,7 @@
 import { LogLevel } from '../Log/LogLevel';
 import { FlowRunPriority } from './FlowRunPriority';
-export declare class FlowRun {
+import { MetaDataAware } from '../../Core/MetaDataAware';
+export declare class FlowRun extends MetaDataAware {
     id: string;
     flowId: string;
     name: string;
@@ -11,5 +12,5 @@ export declare class FlowRun {
     deployId: string;
     logLevelCount: Map<LogLevel, number>;
     logsPurged: boolean;
-    static parse(rawTaskExecution: any): FlowRun;
+    static parse(rawFlowRun: any): FlowRun;
 }

package/dist/Model/Flow/FlowRun.js

@@ -3,26 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowRun = void 0;
 const Utils_1 = require("../../Utils");
 const FlowRunPriority_1 = require("./FlowRunPriority");
-class FlowRun {
+const MetaDataAware_1 = require("../../Core/MetaDataAware");
+const DataValueCollection_1 = require("../DataValueCollection");
+class FlowRun extends MetaDataAware_1.MetaDataAware {
     constructor() {
+        super(...arguments);
         // TODO: implement priority object
         this.priority = FlowRunPriority_1.FlowRunPriority.None;
         this.logsPurged = false;
     }
-    static parse(rawTaskExecution) {
-        let taskExecution = new FlowRun();
-        taskExecution.id = rawTaskExecution.id;
-        // taskExecution.code = rawTaskExecution.code;
-        taskExecution.name = rawTaskExecution.name;
-        taskExecution.flowId = rawTaskExecution.flow;
-        taskExecution.arguments = rawTaskExecution.arguments;
-        taskExecution.projectEnvironmentId = rawTaskExecution.project_environment;
-        taskExecution.priority = FlowRunPriority_1.FlowRunPriority.fromString(rawTaskExecution.priority);
-        taskExecution.triggerId = rawTaskExecution.trigger;
-        taskExecution.deployId = rawTaskExecution.deploy;
-        taskExecution.logLevelCount = rawTaskExecution.log_level_count;
-        taskExecution.logsPurged = Utils_1.Utils.isTrue(rawTaskExecution.logs_purged);
-        return taskExecution;
+    static parse(rawFlowRun) {
+        let flowRun = new FlowRun();
+        flowRun.id = rawFlowRun.id;
+        flowRun.flowId = rawFlowRun.flow;
+        flowRun.arguments = rawFlowRun.arguments;
+        flowRun.projectEnvironmentId = rawFlowRun.project_environment;
+        flowRun.priority = FlowRunPriority_1.FlowRunPriority.fromString(rawFlowRun.priority);
+        flowRun.triggerId = rawFlowRun.trigger;
+        flowRun.deployId = rawFlowRun.deploy;
+        flowRun.logLevelCount = rawFlowRun.log_level_count;
+        flowRun.logsPurged = Utils_1.Utils.isTrue(rawFlowRun.logs_purged);
+        flowRun.metadata = DataValueCollection_1.DataValueCollection.fromObject(rawFlowRun.metadata);
+        return flowRun;
     }
 }
 exports.FlowRun = FlowRun;

package/dist/Model/Messaging/Channel/Channel.d.ts

@@ -1,7 +1,8 @@
 import { ChannelType } from './ChannelType';
 import { State } from '../../State';
 import { StateAware } from '../../StateAware';
-export declare class Channel implements StateAware {
+import { MetaDataAware } from '../../../Core/MetaDataAware';
+export declare class Channel extends MetaDataAware implements StateAware {
     id: string;
     owner: string;
     label: string;

package/dist/Model/Messaging/Channel/Channel.js

@@ -4,8 +4,11 @@ exports.Channel = void 0;
 const ChannelType_1 = require("./ChannelType");
 const State_1 = require("../../State");
 const Utils_1 = require("../../../Utils");
-class Channel {
+const MetaDataAware_1 = require("../../../Core/MetaDataAware");
+const DataValueCollection_1 = require("../../DataValueCollection");
+class Channel extends MetaDataAware_1.MetaDataAware {
     constructor(id, owner, label, type, data) {
+        super();
         this.state = State_1.State.Active;
         this.private = false;
         this.id = id;
@@ -19,6 +22,7 @@ class Channel {
         const channel = new Channel(rawChannel.id, rawChannel.owner, rawChannel.label, type, rawChannel.data);
         channel.state = State_1.State.fromString(rawChannel.state);
         channel.private = Utils_1.Utils.isTrue(rawChannel.private);
+        channel.metadata = DataValueCollection_1.DataValueCollection.fromObject(rawChannel.metadata);
         return channel;
     }
 }

package/dist/Model/Messaging/Subscriber.d.ts

@@ -2,7 +2,8 @@ import { State } from '../State';
 import { EventType } from '../Event/EventType';
 import { LogLevel } from '../Log/LogLevel';
 import { StateAware } from '../StateAware';
-export declare class Subscriber implements StateAware {
+import { MetaDataAware } from '../../Core/MetaDataAware';
+export declare class Subscriber extends MetaDataAware implements StateAware {
     id: string;
     eventTypes: EventType[];
     projectEnvironment: string;

package/dist/Model/Messaging/Subscriber.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscriber = void 0;
 const State_1 = require("../State");
 const LogLevel_1 = require("../Log/LogLevel");
-class Subscriber {
+const MetaDataAware_1 = require("../../Core/MetaDataAware");
+const DataValueCollection_1 = require("../DataValueCollection");
+class Subscriber extends MetaDataAware_1.MetaDataAware {
     constructor(id, eventTypes, projectEnvironment, task, taskExecution, channels, logLevelThreshold = LogLevel_1.LogLevel.Debug) {
+        super();
         this.state = State_1.State.Active;
         this.id = id;
         this.eventTypes = eventTypes;
@@ -17,6 +20,7 @@ class Subscriber {
     static parseRaw(rawSubscriber) {
         let subscriber = new Subscriber(rawSubscriber.id, rawSubscriber.eventTypes, rawSubscriber.projectEnvironment, rawSubscriber.task, rawSubscriber.task_execution, rawSubscriber.channels, rawSubscriber.logLevelThreshold);
         subscriber.state = State_1.State.fromString(rawSubscriber.state);
+        subscriber.metadata = DataValueCollection_1.DataValueCollection.fromObject(rawSubscriber.metadata);
         return subscriber;
     }
     getLogLevelThreshold() {

package/dist/Model/Trigger/Trigger.d.ts

@@ -2,7 +2,8 @@ import { TriggerData } from "./TriggerData";
 import { State } from '../State';
 import { TriggerType } from './TriggerType';
 import { StateAware } from '../StateAware';
-export declare class Trigger implements StateAware {
+import { MetaDataAware } from '../../Core/MetaDataAware';
+export declare class Trigger extends MetaDataAware implements StateAware {
     id: string;
     type: TriggerType;
     projectEnvironmentId: string;

package/dist/Model/Trigger/Trigger.js

@@ -6,8 +6,11 @@ const TriggerType_1 = require("./TriggerType");
 const ScheduleTriggerData_1 = require("./ScheduleTriggerData");
 const WebhookTriggerData_1 = require("./WebhookTriggerData");
 const ApiTriggerData_1 = require("./ApiTriggerData");
-class Trigger {
+const MetaDataAware_1 = require("../../Core/MetaDataAware");
+const DataValueCollection_1 = require("../DataValueCollection");
+class Trigger extends MetaDataAware_1.MetaDataAware {
     constructor(id, type, projectEnvironmentId, flowId, data) {
+        super();
         this.state = State_1.State.Active;
         this.id = id;
         this.type = type;
@@ -17,6 +20,7 @@ class Trigger {
         this.arguments = {};
     }
     static parse(rawTrigger) {
+        console.log(rawTrigger);
         const type = TriggerType_1.TriggerType.fromString(rawTrigger.type);
         const data = rawTrigger.data;
         const flowId = rawTrigger.flow;
@@ -37,6 +41,7 @@ class Trigger {
         let trigger = new Trigger(rawTrigger.id, type, rawTrigger.project_environment, flowId, triggerData);
         trigger.arguments = rawTrigger.arguments;
         trigger.state = State_1.State.fromString(rawTrigger.state);
+        trigger.metadata = DataValueCollection_1.DataValueCollection.fromObject(rawTrigger.metadata);
         return trigger;
     }
     getData() {

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.13",
+  "version": "1.9.15",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",