@colijnit/ioneconnector 1.0.125 → 1.0.126

package/build/connector-auth.d.ts

@@ -29,7 +29,6 @@ import { ArticleExtendedDto } from "./model/article-extended-dto";
 import { InternalParam } from "./enum/internal-param.enum";
 export declare class ConnectorAuth implements IoneApiConnection {
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     private readonly useWebsocket;
     private readonly url;

package/build/connector-auth.js

@@ -14,7 +14,6 @@ const rxjs_1 = require("rxjs");
 class ConnectorAuth {
     constructor(options, externalStorage = undefined) {
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this.useWebsocket = false;
         this.useGroups = false;
@@ -33,7 +32,6 @@ class ConnectorAuth {
         this.dataRepository = new data_repository_service_1.DataRepositoryService(this.url, this.branch, this.currencyId, this.useGroups, options, this.session, externalStorage);
         this.session = this.dataRepository.connection.session;
         this.dataRepository.showLoader.subscribe(value => this.showLoader.next(value));
-        this.dataRepository.connectionAborted.subscribe(() => this.connectionAborted.next());
         this.dataRepository.connectionResetInactivity.subscribe(() => this.connectionResetInactivity.next());
     }
     saveConfigurations() {

package/build/connector-public.d.ts

@@ -27,7 +27,6 @@ import { ArticleExtendedDto } from "./model/article-extended-dto";
 import { InternalParam } from "./enum/internal-param.enum";
 export declare class ConnectorPublic implements IoneApiConnection {
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     private readonly dataService;
     private _schema;

package/build/connector-public.js

@@ -6,7 +6,6 @@ const validation_result_1 = require("./model/validation-result");
 class ConnectorPublic {
     constructor(dataService) {
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this.dataService = dataService;
     }
@@ -168,8 +167,7 @@ class ConnectorPublic {
         return this.dataService.closeSession();
     }
     getInternalParameter(parameter) {
-        console.warn("getInternalParameter is not implemented in public api");
-        return null;
+        return this.dataService.getInternalParameter(parameter);
     }
 }
 exports.ConnectorPublic = ConnectorPublic;

package/build/connector.d.ts

@@ -36,9 +36,9 @@ import { Concept } from "./model/concept";
 import { ArticleGroup } from "./model/article-group";
 import { ArticleExtendedDto } from "./model/article-extended-dto";
 import { InternalParam } from "./enum/internal-param.enum";
+import { QuestionAndAnswer } from "./model/question-and-answer";
 export declare class Connector {
     goodId: number;
-    sku: string;
     useWebsocket: boolean;
     url: string;
     version: string;
@@ -71,7 +71,6 @@ export declare class Connector {
     private boFactory;
     private connection;
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     constructor(options?: Options, externalStorage?: ExternalStorage);
     saveConfigurations(): Promise<boolean>;
@@ -83,6 +82,7 @@ export declare class Connector {
     getSuperArticle(id: string): Promise<SuperArticle>;
     getFullArticle(skuOrId: string): Promise<ArticleFullObject>;
     getQuestionAndAnswers(): void;
+    getQuestionAndAnswersAsync(): Promise<QuestionAndAnswer>;
     getSkipButtonImageAndText(goodId?: number): Promise<SkipButtonInfo>;
     getDeliveryPrognosisForArticle(goodId: number): Promise<{}>;
     getAnswersPrices(): Promise<AnswerPrice[]>;
@@ -92,11 +92,13 @@ export declare class Connector {
     getImageForAnswerOrSelection(answerOrSelection: Answer | Selection, publication?: number, thumbNail?: boolean, showLoader?: boolean): Promise<string>;
     getMoodImageForAnswerSelection(answerOrSelection: Answer | Selection, thumbNail?: boolean, showLoader?: boolean): void;
     getSelections(): void;
-    selectAnswer(answer: Answer, userInput?: string): Promise<void>;
-    deleteSelection(selection: Selection): Promise<void>;
-    replaceSelection(selection: Selection): Promise<void>;
-    selectSelection(selection: Selection, forceBackToNode?: boolean, after?: boolean, connector?: string): Promise<void>;
-    cancelAnswer(getQuestionAndAnswers?: boolean): Promise<void>;
+    getSelectionsAsync(): Promise<Selection[]>;
+    getDecosAsync(): Promise<DecoNode[]>;
+    selectAnswer(answer: Answer, userInput?: string): Promise<DataServiceResponseRoot>;
+    deleteSelection(selection: Selection): Promise<DataServiceResponseRoot>;
+    replaceSelection(selection: Selection): Promise<DataServiceResponseRoot>;
+    selectSelection(selection: Selection, forceBackToNode?: boolean, after?: boolean, connector?: string): Promise<DataServiceResponseRoot>;
+    cancelAnswer(): Promise<DataServiceResponseRoot>;
     getAnswerStock(answer: Answer): Promise<StockStatus>;
     getJsonConfiguredArticles(): Promise<any>;
     getJsonArticleFlatTree(goodId: number): Promise<any>;
@@ -120,12 +122,12 @@ export declare class Connector {
     getArticleGroups(): Promise<ArticleGroup[]>;
     handleSelectionsReceived(data: any): void;
     handleDecoNodesReceived(data: any): void;
-    nextCombNode(params: any): void;
-    nextNode(params: any): void;
-    cancelBack2node(getQuestionAndAnswers?: boolean): Promise<void>;
-    navigateTo(params: any): void;
+    private _nextCombNode;
+    private _nextNode;
+    private _cancelBack2node;
+    private _navigateTo;
     getDeliveryDateDescription(date: Date): string;
-    checkSkuOrId(skuOrId: string): Promise<any>;
+    checkSkuOrId(skuOrId: string): Promise<number>;
     getSelectionsToDisplay(allSelections: Selection[]): Selection[];
     getMappedMatchTable(data: any): MatchArticle[];
     getMappedFrozenArticle(data: any): FrozenArticle;

package/build/connector.js

@@ -33,6 +33,7 @@ const frozen_article_simple_1 = require("./model/frozen-article-simple");
 const db_boolean_value_type_enum_1 = require("./enum/db-boolean-value-type.enum");
 const not_nill_function_1 = require("./utils/function/not-nill.function");
 const is_nill_function_1 = require("./utils/function/is-nill.function");
+const question_and_answer_1 = require("./model/question-and-answer");
 class Connector {
     constructor(options, externalStorage = undefined) {
         this.useWebsocket = false;
@@ -49,7 +50,6 @@ class Connector {
         this.subs = [];
         this.boFactory = new business_object_factory_1.BusinessObjectFactory();
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this._applicationClose = () => {
             this.connection.close();
@@ -87,7 +87,7 @@ class Connector {
         if (!this.session && this.connection.hasOwnProperty('session')) {
             this.session = this.connection['session'];
         }
-        this.subs.push(this.connection.showLoader.subscribe(value => this.showLoader.next(value)), this.connection.connectionAborted.subscribe(() => this.connectionAborted.next()), this.connection.connectionResetInactivity.subscribe(() => this._handleConnectionReset()));
+        this.subs.push(this.connection.showLoader.subscribe(value => this.showLoader.next(value)), this.connection.connectionResetInactivity.subscribe(() => this._handleConnectionReset()));
         window.addEventListener('beforeunload', this._applicationClose);
     }
     saveConfigurations() {
@@ -100,30 +100,24 @@ class Connector {
         return this.connection.copyInstance(instanceId, shouldSaveCurrentInstanceId);
     }
     getArticle(skuOrId) {
-        return this.checkSkuOrId(skuOrId).then(() => {
-            return new Promise((resolve) => {
-                this.connection.initNodeInstance(this.goodId).then((response) => {
-                    this.connection.getArticleQuickSel(this.goodId).then((article) => __awaiter(this, void 0, void 0, function* () {
-                        if (response && response.data && response.data.resultObject) {
-                            yield this.setInstanceToConfigure(response.data.resultObject);
-                            article.sku = this.sku;
-                            article.instanceId = response.data.resultObject;
-                        }
-                        else {
-                            console.error("Error retrieving instance id");
-                        }
-                        if (this.handleArticle !== void 0) {
-                            this.handleArticle(article);
-                        }
-                        resolve(article);
-                    }));
-                });
+        return __awaiter(this, void 0, void 0, function* () {
+            const goodId = yield this.checkSkuOrId(skuOrId)
+                .catch((e) => {
+                return Promise.reject(e);
             });
+            const article = yield this.connection.getArticleQuickSel(goodId)
+                .catch((e) => {
+                return Promise.reject(e);
+            });
+            article.sku = skuOrId;
+            return article;
         });
     }
     initNodeInstance(skuOrId) {
-        return this.checkSkuOrId(skuOrId).then(() => {
-            return this.connection.initNodeInstance(this.goodId);
+        return __awaiter(this, void 0, void 0, function* () {
+            const goodId = yield this.checkSkuOrId(skuOrId)
+                .catch((e) => Promise.reject(e));
+            return this.connection.initNodeInstance(goodId);
         });
     }
     getArticleQuickSel(id) {
@@ -133,12 +127,10 @@ class Connector {
         return this.connection.getSuperArticleQuickSel(id);
     }
     getFullArticle(skuOrId) {
-        return this.checkSkuOrId(skuOrId).then(() => {
-            return new Promise((resolve) => {
-                this.connection.getArticleFullObject(this.goodId).then((article) => __awaiter(this, void 0, void 0, function* () {
-                    resolve(article);
-                }));
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const goodId = yield this.checkSkuOrId(skuOrId)
+                .catch((e) => Promise.reject(e));
+            return this.connection.getArticleFullObject(goodId);
         });
     }
     getQuestionAndAnswers() {
@@ -192,6 +184,36 @@ class Connector {
             }
         });
     }
+    getQuestionAndAnswersAsync() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rawDatas = yield this.connection.getQuestionAndAnswers();
+            const result = new question_and_answer_1.QuestionAndAnswer();
+            if (rawDatas && (rawDatas && rawDatas.data && rawDatas.data.length > 0)) {
+                this.match = rawDatas.match;
+                const rawAnswers = rawDatas.data && rawDatas.data.length > 0 ? rawDatas.data.slice(1, rawDatas.data.length) : null;
+                const nodeHierarchyLevelOffset = rawAnswers && rawAnswers[0] ? rawAnswers[0].treeLevel - 1 : 0;
+                const answers = [];
+                const len = rawAnswers ? rawAnswers.length : 0;
+                for (let i = 0; i < len; i++) {
+                    const answer = this.boFactory.makeWithRawBackendData(answer_1.Answer, rawAnswers[i]);
+                    answer.isGroupHeader = rawAnswers[i].hasChildren === db_boolean_value_type_enum_1.DbBooleanValueType.True;
+                    answer.treeLevel = answer.treeLevel - nodeHierarchyLevelOffset;
+                    answer.instanceId = this.connection.currentInstanceId;
+                    const shouldHide = (not_nill_function_1.notNill(answer.hierarchicalPublicationCode) && (answer.hierarchicalPublicationCode & 2) === 0) ||
+                        (answer.type === node_type_enum_1.NodeType.Question && (answer.questionPublicationCode & 2) === 0 && not_nill_function_1.notNill(answer.questionPublicationCode)) ||
+                        (answer.type === node_type_enum_1.NodeType.Answer && (answer.publicationCode & 2) === 0 && not_nill_function_1.notNill(answer.publicationCode));
+                    if (!shouldHide) {
+                        answers.push(answer);
+                    }
+                }
+                const rawQuestion = rawDatas.data && rawDatas.data.length > 0 ? rawDatas.data[0] : null;
+                const question = rawQuestion ? this.boFactory.makeWithRawBackendData(question_1.Question, rawQuestion) : null;
+                result.question = question;
+                result.answers = answers;
+            }
+            return result;
+        });
+    }
     getSkipButtonImageAndText(goodId) {
         return this.connection.getSkipButtonImageAndText(goodId);
     }
@@ -275,6 +297,32 @@ class Connector {
             });
         }
     }
+    getSelectionsAsync() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rawData = yield this.connection.getSelections();
+            const selections = [];
+            const len = rawData ? rawData.length : 0;
+            for (let i = 0; i < len; i++) {
+                const selection = new selection_1.Selection(rawData[i]);
+                selection.instanceId = this.connection.currentInstanceId;
+                selections.push(selection);
+            }
+            return selections;
+        });
+    }
+    getDecosAsync() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const rawData = yield this.connection.getDecos();
+            const decoNodes = [];
+            const len = rawData ? rawData.length : 0;
+            for (let i = 0; i < len; i++) {
+                const deco = new deco_node_1.DecoNode(rawData[i]);
+                deco.instanceId = this.connection.currentInstanceId;
+                decoNodes.push(deco);
+            }
+            return decoNodes;
+        });
+    }
     selectAnswer(answer, userInput) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!answer) {
@@ -286,7 +334,7 @@ class Connector {
             const params = {};
             if (answer.treeHierarchy !== null && answer.treeHierarchy !== undefined) {
                 params.treeHierarchie = answer.treeHierarchy;
-                this.navigateTo(params);
+                return this._navigateTo(params);
             }
             else {
                 this.stepBackNode = this.use3D ? -1 : answer.node.node;
@@ -298,11 +346,11 @@ class Connector {
                 }
                 if (this.combNode || answer.useNextCombNode) {
                     params.nodeId = answer.node.node ? answer.node.node : answer.node;
-                    this.nextCombNode(params);
+                    return this._nextCombNode(params);
                 }
                 else {
                     params.opvId = answer.id;
-                    this.nextNode(params);
+                    return this._nextNode(params);
                 }
             }
         });
@@ -315,11 +363,8 @@ class Connector {
             const params = {
                 nodeId: selection.node
             };
-            this.connection.back2Node(params).then(() => {
-                this.connection.nextNode({ opvId: 0 }).then(() => {
-                    this.getQuestionAndAnswers();
-                });
-            });
+            yield this.connection.back2Node(params);
+            return this.connection.nextNode({ opvId: 0 });
         });
     }
     replaceSelection(selection) {
@@ -330,9 +375,7 @@ class Connector {
             const params = {
                 nodeId: selection.node
             };
-            this.connection.back2Node(params).then(() => {
-                this.getQuestionAndAnswers();
-            });
+            return this.connection.back2Node(params);
         });
     }
     selectSelection(selection, forceBackToNode, after, connector) {
@@ -358,20 +401,16 @@ class Connector {
             if (!selection.optCycle || forceBackToNode) {
                 params.nodeId = selection.node;
                 params.useCombinationNodes = this.combNode ? 'T' : 'F';
-                this.connection.back2Node(params).then(() => {
-                    this.getQuestionAndAnswers();
-                });
+                return this.connection.back2Node(params);
             }
             else {
                 params.optCycle = selection.optCycle;
-                this.connection.repeatOption(params).then(() => {
-                    this.getQuestionAndAnswers();
-                });
+                return this.connection.repeatOption(params);
             }
         });
     }
-    cancelAnswer(getQuestionAndAnswers = true) {
-        return this.cancelBack2node(getQuestionAndAnswers);
+    cancelAnswer() {
+        return this._cancelBack2node();
     }
     getAnswerStock(answer) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -499,27 +538,17 @@ class Connector {
             this.handleDecoNodes(decoNodes);
         }
     }
-    nextCombNode(params) {
-        this.connection.nextCombNode(params).then(() => {
-            this.getQuestionAndAnswers();
-        });
+    _nextCombNode(params) {
+        return this.connection.nextCombNode(params);
     }
-    nextNode(params) {
-        this.connection.nextNode(params).then(() => {
-            this.getQuestionAndAnswers();
-        });
+    _nextNode(params) {
+        return this.connection.nextNode(params);
     }
-    cancelBack2node(getQuestionAndAnswers = true) {
-        return this.connection.cancelBack2Node({}).then(() => {
-            if (getQuestionAndAnswers) {
-                this.getQuestionAndAnswers();
-            }
-        });
+    _cancelBack2node() {
+        return this.connection.cancelBack2Node({});
     }
-    navigateTo(params) {
-        this.connection.navigateTo(params).then(() => {
-            this.getQuestionAndAnswers();
-        });
+    _navigateTo(params) {
+        return this.connection.navigateTo(params);
     }
     getDeliveryDateDescription(date) {
         if (date) {
@@ -549,21 +578,19 @@ class Connector {
         }
     }
     checkSkuOrId(skuOrId) {
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             if (!this.useArticleIds) {
                 this.connection.getGoodIdFromArticleNr(skuOrId)
                     .then((goodId) => {
                     this.goodId = goodId;
-                    this.sku = skuOrId;
-                    resolve();
+                    resolve(goodId);
                 })
                     .catch((error) => {
-                    console.error(error);
+                    reject(error);
                 });
             }
             else {
-                this.goodId = parseInt(skuOrId);
-                resolve();
+                resolve(parseInt(skuOrId));
             }
         });
     }
@@ -624,7 +651,6 @@ class Connector {
             connector.branch = options.branch;
             connector.currency = options.currencyId;
             ajaxService.showLoader.subscribe(value => connector.showLoader.next(value));
-            ajaxService.connectionAborted.subscribe(value => connector.connectionAborted.next());
             ajaxService.connectionResetInactivity.subscribe(value => connector.connectionResetInactivity.next());
             return connector;
         }

package/build/enum/hd-service-method.d.ts

@@ -39,5 +39,6 @@ export declare enum HdServiceMethod {
     GetConcepts = "getConcepts",
     GetMaterials = "getMaterials",
     GetAtmospheres = "getAtmospheres",
-    GetArticleGroups = "getArticleGroups"
+    GetArticleGroups = "getArticleGroups",
+    GetPublicParamValue = "getPublicParamValue"
 }

package/build/enum/hd-service-method.js

@@ -43,4 +43,5 @@ var HdServiceMethod;
     HdServiceMethod["GetMaterials"] = "getMaterials";
     HdServiceMethod["GetAtmospheres"] = "getAtmospheres";
     HdServiceMethod["GetArticleGroups"] = "getArticleGroups";
+    HdServiceMethod["GetPublicParamValue"] = "getPublicParamValue";
 })(HdServiceMethod = exports.HdServiceMethod || (exports.HdServiceMethod = {}));

package/build/enum/internal-param.enum.d.ts

@@ -1,4 +1,4 @@
 export declare enum InternalParam {
-    GeneralAssetUrl = "3D_GENERAL_ASSET_URL ",
+    GeneralAssetUrl = "3D_GENERAL_ASSET_URL",
     AssetUrl = "3D_ASSET_URL"
 }

package/build/enum/internal-param.enum.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var InternalParam;
 (function (InternalParam) {
-    InternalParam["GeneralAssetUrl"] = "3D_GENERAL_ASSET_URL ";
+    InternalParam["GeneralAssetUrl"] = "3D_GENERAL_ASSET_URL";
     InternalParam["AssetUrl"] = "3D_ASSET_URL";
 })(InternalParam = exports.InternalParam || (exports.InternalParam = {}));

package/build/ione-api-connection.d.ts

@@ -25,7 +25,6 @@ import { ArticleExtendedDto } from "./model/article-extended-dto";
 import { InternalParam } from "./enum/internal-param.enum";
 export interface IoneApiConnection {
     showLoader: Subject<boolean>;
-    connectionAborted: Subject<void>;
     connectionResetInactivity: Subject<void>;
     currentInstanceId: string;
     saveConfigurations(): Promise<boolean>;

package/build/model/question-and-answer.d.ts

@@ -0,0 +1,6 @@
+import { Question } from "./question";
+import { Answer } from "./answer";
+export declare class QuestionAndAnswer {
+    question: Question;
+    answers: Answer[];
+}

package/build/model/question-and-answer.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class QuestionAndAnswer {
+    constructor() {
+        this.answers = [];
+    }
+}
+exports.QuestionAndAnswer = QuestionAndAnswer;

package/build/model/selection.d.ts

@@ -61,6 +61,7 @@ export declare class Selection extends BusinessObject {
     parentArtNodeIdDeco: string;
     optCycle: number;
     optCycleDeco: number;
+    schema: string;
     userInput: boolean;
     userInputValue: string;
     inqHandleLikePar: boolean;

package/build/model/selection.js

@@ -49,6 +49,7 @@ class Selection extends business_object_1.BusinessObject {
         this.parentArtNodeIdDeco = null;
         this.optCycle = null;
         this.optCycleDeco = null;
+        this.schema = null;
         this.userInput = false;
         this.userInputValue = null;
         this.selection = null;

package/build/provider/ajax.service.js

@@ -73,7 +73,7 @@ class AjaxService extends base_backend_connection_service_1.BaseBackendConnectio
                     this.setShowLoaderRequests(0);
                 }
                 if (error.code === "ECONNABORTED") {
-                    this.connectionAborted.next();
+                    reject("ECONNABORTED");
                 }
                 else if (error.response && error.response.status === 500) {
                     this.resetConnection();

package/build/provider/base-backend-connection.service.d.ts

@@ -7,7 +7,6 @@ import { Subject } from "rxjs";
 import { ConnectionEndpoint } from "./connection-endpoint";
 export declare abstract class BaseBackendConnectionService implements ConnectionEndpoint {
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     session: Session;
     options: Options;

package/build/provider/base-backend-connection.service.js

@@ -18,7 +18,6 @@ const connection_endpoint_enum_1 = require("../enum/connection-endpoint-enum");
 class BaseBackendConnectionService {
     constructor(url, options, session = undefined, externalStorage = undefined, secure = false) {
         this.showLoader = new rxjs_1.Subject();
-        this.connectionAborted = new rxjs_1.Subject();
         this.connectionResetInactivity = new rxjs_1.Subject();
         this.callId = "1";
         this.url = this.addEndpointToUrl(url);

package/build/provider/data-repository.service.d.ts

@@ -29,7 +29,6 @@ import { ArticleExtendedDto } from "../model/article-extended-dto";
 import { InternalParam } from "../enum/internal-param.enum";
 export declare class DataRepositoryService {
     readonly showLoader: Subject<boolean>;
-    readonly connectionAborted: Subject<void>;
     readonly connectionResetInactivity: Subject<void>;
     branchNr: string;
     currencyId: number;