@colijnit/ioneconnector 1.0.122 → 1.0.126

package/build/provider/data-repository.service.js

@@ -53,7 +53,6 @@ const article_extended_dto_1 = require("../model/article-extended-dto");
 class DataRepositoryService {
     constructor(url, branchNr, currencyId, useGroups, options, session = undefined, externalStorage = undefined) {
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this.useGroups = true;
         this.versionHigherThan249 = false;
@@ -64,7 +63,6 @@ class DataRepositoryService {
         this.versionHigherThan249 = Number(options.version) > 249;
         this.connection = new ajax_service_1.AjaxService(url, options, session, externalStorage, false);
         this.connection.showLoader.subscribe(value => this.showLoader.next(value));
-        this.connection.connectionAborted.subscribe(() => this.connectionAborted.next());
         this.connection.connectionResetInactivity.subscribe(() => this.connectionResetInactivity.next());
     }
     commit() {
@@ -84,13 +82,17 @@ class DataRepositoryService {
             parameterValues: params
         };
         return new Promise((resolve, reject) => {
-            return this.call(data).then((result) => {
+            return this.call(data)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     return resolve(result.data.resultObject);
                 }
                 else {
                     reject("Error retrieving article (" + result.message + ")");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -103,7 +105,8 @@ class DataRepositoryService {
             parameterValues: params
         };
         return new Promise((resolve, reject) => {
-            return this.call(data).then((result) => {
+            return this.call(data)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     const matchTable = result.data.resultObject ? result.data.resultObject["oMatchTable"] : null;
                     return resolve(matchTable);
@@ -111,12 +114,16 @@ class DataRepositoryService {
                 else {
                     reject("Error retrieving match table data");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     getFrozenArticle() {
         return new Promise((resolve, reject) => {
-            return this.callGenerateFrozenArticle().then((result) => {
+            return this.callGenerateFrozenArticle()
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success === true) {
                     return this.callGetFrozenArticleArray().then((result) => {
                         if (result.data.validationResult && result.data.validationResult.success === true) {
@@ -132,12 +139,34 @@ class DataRepositoryService {
                     console.error("Error creating article");
                     reject("Error creating article");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
-    getSkipButtonImageAndText() {
+    getJsonArticleFlatTree(goodId) {
+        return new Promise((resolve, reject) => {
+            return this.callArticleFlatTree(goodId)
+                .then((result) => {
+                if (result.data.validationResult && result.data.validationResult.success === true) {
+                    resolve(result.data.resultObject);
+                }
+                else {
+                    reject("Error getting article tree");
+                }
+            })
+                .catch((e) => {
+                return reject(e);
+            });
+        });
+    }
+    getSkipButtonImageAndText(goodId) {
         return __awaiter(this, void 0, void 0, function* () {
             const params = {};
+            if (goodId) {
+                params.goodId = goodId;
+            }
             const data = {
                 methodName: master_data_method_name_enum_1.MasterDataMethodName.GetSkipButtonImageAndText,
                 moduleName: module_name_enum_1.ModuleName.MasterData,
@@ -145,7 +174,8 @@ class DataRepositoryService {
                 parameterValues: params
             };
             return new Promise((resolve, reject) => {
-                return this.call(data).then((result) => {
+                return this.call(data)
+                    .then((result) => {
                     const data = result.data;
                     const validationResult = data.validationResult;
                     if (validationResult && validationResult.success) {
@@ -154,6 +184,9 @@ class DataRepositoryService {
                     else {
                         return reject("Error retrieving skip button image and text");
                     }
+                })
+                    .catch((e) => {
+                    return reject(e);
                 });
             });
         });
@@ -170,7 +203,8 @@ class DataRepositoryService {
             parameterValues: params
         };
         return new Promise((resolve, reject) => {
-            return this.call(data).then((result) => {
+            return this.call(data)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     if (!result.data.resultObject) {
                         return reject("Article not found!");
@@ -181,6 +215,9 @@ class DataRepositoryService {
                 else {
                     return reject("Error retrieving article data");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -196,7 +233,8 @@ class DataRepositoryService {
             parameterValues: params
         };
         return new Promise((resolve, reject) => {
-            return this.call(data).then((result) => {
+            return this.call(data)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     if (!result.data.resultObject) {
                         return reject("Super article not found!");
@@ -207,6 +245,9 @@ class DataRepositoryService {
                 else {
                     return reject("Error retrieving super article data");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -218,7 +259,8 @@ class DataRepositoryService {
             objectId: id
         };
         return new Promise((resolve, reject) => {
-            return this.call(data, data_service_method_enum_1.DataServiceMethod.SelectSingleObject).then((result) => {
+            return this.call(data, data_service_method_enum_1.DataServiceMethod.SelectSingleObject)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     if (!result.data.resultObject) {
                         return reject("Article not found!");
@@ -228,6 +270,9 @@ class DataRepositoryService {
                 else {
                     return reject("Error retrieving article data");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -243,7 +288,8 @@ class DataRepositoryService {
             parameterValues: inputParams
         };
         return new Promise((resolve, reject) => {
-            return this.call(data).then((result) => {
+            return this.call(data)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     if (!result.data.resultObject) {
                         return reject("Document not found!");
@@ -253,6 +299,9 @@ class DataRepositoryService {
                 else {
                     return reject("Error retrieving article data");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -267,7 +316,10 @@ class DataRepositoryService {
                 refCursorAsArray: true,
                 parameterValues: inputParams
             };
-            const response = yield this.call(data);
+            const response = yield this.call(data)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
             return response.data.resultObject;
         });
     }
@@ -275,7 +327,7 @@ class DataRepositoryService {
         return this.getSelectorActiveOptionValues();
     }
     initNode(id) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const params = { goodId: id, pubicationCode: 4 };
             if (this.branchNr !== undefined && this.branchNr !== "") {
                 params.branchNr = this.branchNr;
@@ -286,13 +338,17 @@ class DataRepositoryService {
                 refCursorAsArray: true,
                 parameterValues: params
             };
-            return this.call(data).then((data) => {
+            return this.call(data)
+                .then((data) => {
                 return resolve(data);
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     initNodeInstance(id) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const params = { goodId: id, pubicationCode: 4 };
             if (this.branchNr !== undefined && this.branchNr !== "") {
                 params.branchNr = this.branchNr;
@@ -303,8 +359,12 @@ class DataRepositoryService {
                 refCursorAsArray: true,
                 parameterValues: params
             };
-            return this.call(data).then((data) => {
+            return this.call(data)
+                .then((data) => {
                 return resolve(data);
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -325,25 +385,33 @@ class DataRepositoryService {
     }
     getSelectorActiveOptionValuesPrices() {
         return new Promise((resolve, reject) => {
-            return this.callSelectorActiveOptionValuesPrices().then((result) => {
+            return this.callSelectorActiveOptionValuesPrices()
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     return resolve(result.data.resultObjects);
                 }
                 else {
                     return reject("Error getting selector action prices");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     getAnswerTexts(params) {
         return new Promise((resolve, reject) => {
-            return this.callGetNodeData(params).then((result) => {
+            return this.callGetNodeData(params)
+                .then((result) => {
                 if (result.data.validationResult && result.data.validationResult.success) {
                     return resolve(result.data.resultObject);
                 }
                 else {
                     return reject("Error getting answer info");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -427,7 +495,8 @@ class DataRepositoryService {
     }
     getSelections() {
         return new Promise((resolve, reject) => {
-            return this.callSelectorSelections().then((result) => {
+            return this.callSelectorSelections()
+                .then((result) => {
                 if (result && result.data && result.data.validationResult && result.data.validationResult.success) {
                     return resolve(result.data.resultObjects);
                 }
@@ -439,12 +508,16 @@ class DataRepositoryService {
                         return reject("Error getting selections");
                     }
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     getDeliveryPrognosis(goodId) {
         return new Promise((resolve, reject) => {
-            return this.callGetSelectorDeliveryDate({}).then((response) => {
+            return this.callGetSelectorDeliveryDate({})
+                .then((response) => {
                 if (response && response.data && response.data.validationResult && response.data.validationResult.success) {
                     return resolve(response.data.resultObject);
                 }
@@ -463,12 +536,16 @@ class DataRepositoryService {
                         }
                     });
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     getDeliveryPrognosisForArticle(goodId) {
         return new Promise((resolve, reject) => {
-            this.callDeliveryDate2({ goodId: goodId }).then((response) => {
+            this.callDeliveryDate2({ goodId: goodId })
+                .then((response) => {
                 if (response && response.data && response.data.validationResult && response.data.validationResult.success) {
                     return resolve(response.data.resultObject);
                 }
@@ -480,12 +557,16 @@ class DataRepositoryService {
                         return reject("Error getting delivery prognosis");
                     }
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
     getDecos() {
         return new Promise((resolve, reject) => {
-            return this.callSelectorDecos({}).then((result) => {
+            return this.callSelectorDecos({})
+                .then((result) => {
                 if (result && result.data && result.data.validationResult && result.data.validationResult.success) {
                     return resolve(result.data.resultObjects);
                 }
@@ -497,6 +578,9 @@ class DataRepositoryService {
                         return reject("Error getting decoNodes");
                     }
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -512,7 +596,8 @@ class DataRepositoryService {
             params.includeBody = thumb === undefined || thumb === false;
             params.includeThumbnail = thumb === true;
             params.publication = publication;
-            return this.callGetSingleImage(params, showLoader).then((result) => {
+            return this.callGetSingleImage(params, showLoader)
+                .then((result) => {
                 if (result.data.resultObject) {
                     if (result.data.resultObject.filePath !== null && result.data.resultObject.filePath !== "") {
                         return resolve(image_utils_1.ImageUtils.getFixedImageFilepathUrl(result.data.resultObject.filePath));
@@ -529,6 +614,9 @@ class DataRepositoryService {
                 else {
                     return resolve();
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -543,7 +631,10 @@ class DataRepositoryService {
                     selectionId: selNodeId
                 }
             };
-            const response = yield this.call(data, data_service_method_enum_1.DataServiceMethod.ExecuteMethod);
+            const response = yield this.call(data, data_service_method_enum_1.DataServiceMethod.ExecuteMethod)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
             if (this.isSuccesfulResponseRoot(response)) {
                 return response.data.resultObject;
             }
@@ -559,7 +650,10 @@ class DataRepositoryService {
                 parameterValues: params,
                 pagingParameters: paging
             };
-            const rawResponse = yield this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects, showLoader);
+            const rawResponse = yield this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects, showLoader)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
             if (rawResponse && rawResponse.data) {
                 if (this.versionHigherThan249) {
                     stronglyTypedResults = this.boFactory.makeBOArrayFromRawBackendDataArray(article_extended_dto_1.ArticleExtendedDto, rawResponse.data.resultObjects);
@@ -585,7 +679,10 @@ class DataRepositoryService {
                 refCursorAsArray: true,
                 parameterValues: request
             };
-            const response = yield this.call(data, data_service_method_enum_1.DataServiceMethod.ExecuteMethod);
+            const response = yield this.call(data, data_service_method_enum_1.DataServiceMethod.ExecuteMethod)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
             if (response && response.data) {
                 return this.boFactory.makeWithRawBackendData(article_price_1.ArticlePrice, response.data.resultObject);
             }
@@ -722,6 +819,16 @@ class DataRepositoryService {
         };
         return this.call(data);
     }
+    callArticleFlatTree(goodId) {
+        const params = { goodId: goodId };
+        const data = {
+            methodName: article_method_enum_1.ArticleMethod.GetArticleTree,
+            moduleName: module_name_enum_1.ModuleName.Articles,
+            refCursorAsArray: true,
+            parameterValues: params
+        };
+        return this.call(data);
+    }
     callGetFrozenArticleArray() {
         const params = {};
         const data = {
@@ -767,7 +874,8 @@ class DataRepositoryService {
     }
     getSelectorActiveOptionValues() {
         return new Promise((resolve, reject) => {
-            return this.callSelectorActiveOptionValues().then((rootResponse) => {
+            return this.callSelectorActiveOptionValues()
+                .then((rootResponse) => {
                 if (rootResponse && rootResponse.data && rootResponse.data.validationResult && rootResponse.data.validationResult.success) {
                     const match = rootResponse.data.resultObject["matchTableActive"] === "T";
                     const question = rootResponse.data.resultObject['oActiveNodes'][0];
@@ -784,6 +892,9 @@ class DataRepositoryService {
                 else {
                     return reject("Error getting selector active options");
                 }
+            })
+                .catch((e) => {
+                return reject(e);
             });
         });
     }
@@ -803,7 +914,10 @@ class DataRepositoryService {
             if (parameterValues) {
                 data.parameterValues = parameterValues;
             }
-            const rawResponse = yield this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects);
+            const rawResponse = yield this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
             if (rawResponse && rawResponse.data) {
                 stronglyTypedResults = this.boFactory.makeBOArrayFromRawBackendDataArray(clazz, rawResponse.data.resultObjects);
             }

package/build/provider/hd-ajax.service.d.ts

@@ -4,7 +4,6 @@ import { Subject } from "rxjs";
 import { Options } from "../model/options";
 export declare class HdAjaxService implements ConnectionEndpoint {
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     private _timeout;
     private _url;

package/build/provider/hd-ajax.service.js

@@ -16,7 +16,6 @@ const rxjs_1 = require("rxjs");
 class HdAjaxService {
     constructor(options) {
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this._timeout = 180000;
         this._showLoaderRequests = 0;
@@ -55,13 +54,13 @@ class HdAjaxService {
                     if (showLoader) {
                         this._setShowLoaderRequests(0);
                     }
-                    this.connectionAborted.next();
+                    return Promise.reject("ECONNABORTED");
                 }
                 else {
                     if (showLoader) {
                         this._setShowLoaderRequests(this._showLoaderRequests - 1);
                     }
-                    throw e;
+                    return Promise.reject(e);
                 }
             }
         });

package/build/service/business-object-factory.js

@@ -9,6 +9,7 @@ const is_nill_function_1 = require("../utils/function/is-nill.function");
 const array_utils_1 = require("../utils/array-utils");
 const business_object_1 = require("../model/business-object");
 const map_property_decorator_1 = require("../factory/decorators/map-property.decorator");
+const json_decorator_1 = require("../factory/decorators/json.decorator");
 class BusinessObjectFactory {
     constructor() {
     }
@@ -46,18 +47,22 @@ class BusinessObjectFactory {
             if (!sourceData.hasOwnProperty(srcPropKey)) {
                 continue;
             }
-            const srcPropVal = sourceData[srcPropKey];
+            let srcPropVal = sourceData[srcPropKey];
             for (let prop in destinationModel) {
                 if (destinationModel.hasOwnProperty(prop)) {
                     if (map_property_decorator_1.MapPropertyDecorator.IsMapProperty(destinationModel, prop)) {
-                        const destPropKey = map_property_decorator_1.MapPropertyDecorator.GetMapProperty(destinationModel, prop);
-                        if (srcPropKey === destPropKey) {
+                        const destPropKeys = map_property_decorator_1.MapPropertyDecorator.GetMapProperty(destinationModel, prop).split(',');
+                        const keyFound = destPropKeys.find(k => k.trim() === srcPropKey);
+                        if (keyFound) {
                             srcPropKey = prop;
                             break;
                         }
                     }
                 }
             }
+            if (json_decorator_1.JsonFieldFieldDecorator.IsJsonField(destinationModel, srcPropKey)) {
+                srcPropVal = json_decorator_1.JsonFieldFieldDecorator.StringAsJson(srcPropVal);
+            }
             if (complex_field_decorator_1.ComplexFieldDecorator.IsComplexField(destinationModel, srcPropKey)) {
                 const classOfField = complex_field_decorator_1.ComplexFieldDecorator.GetComplexFieldType(destinationModel, srcPropKey);
                 destinationModel[srcPropKey] = this.makeWithRawBackendData(classOfField, srcPropVal);

package/build/service/encrypt.service.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsencrypt_1 = require("jsencrypt");
 class EncryptService {
     constructor() {
-        this.rsa = new jsencrypt_1.default({
+        this.rsa = new jsencrypt_1.JSEncrypt({
             default_key_size: "2048"
         });
     }

package/build/service/hd-data.service.d.ts

@@ -22,6 +22,7 @@ import { Atmosphere } from "../model/atmosphere";
 import { ArticleGroup } from "../model/article-group";
 import { ArticleExtendedDto } from "../model/article-extended-dto";
 import { Options } from "../model/options";
+import { InternalParam } from "../enum/internal-param.enum";
 export declare class HdDataService {
     private _sessionService;
     private _boFactory;
@@ -43,8 +44,9 @@ export declare class HdDataService {
     navigateTo(params: any): Promise<DataServiceResponseRoot>;
     getMatchTable(): Promise<any>;
     getFrozenArticle(): Promise<any>;
+    getJsonArticleFlatTree(goodId: number): Promise<any>;
     private getLastFrozenArticle;
-    getSkipButtonImageAndText(): Promise<SkipButtonInfo>;
+    getSkipButtonImageAndText(goodId?: number): Promise<SkipButtonInfo>;
     getArticleQuickSel(goodId: number, branch: string): Promise<Article>;
     getSuperArticleQuickSel(id: string, branch: string): Promise<SuperArticle>;
     getGoodIdFromArticleNr(sku: string): Promise<number>;
@@ -71,6 +73,7 @@ export declare class HdDataService {
     getMaterials(): Promise<Material[]>;
     getAtmospheres(): Promise<Atmosphere[]>;
     getArticleGroups(): Promise<ArticleGroup[]>;
+    getInternalParameter(parameter: InternalParam): Promise<string>;
     closeSession(): Promise<boolean>;
     private createServiceRequestData;
 }