@colijnit/articleapi 254.1.2 → 254.1.3

package/build/articles.d.ts

@@ -101,7 +101,9 @@ export declare class Articles {
     storeCatFarmCompositionArticle(catalogId: number, articleFlatTree: ArticleFlatTreeDTO): Promise<DataServiceResponseData>;
     getArticleListWithBarcodeArticleNrEanCode(searchString: string, showLoader?: boolean): Promise<DataServiceResponseData>;
     getJsonConfiguredArticles(configuratorStatistics?: ConfiguratorStatisticsEnvironment, showLoader?: boolean, instanceId?: number): Promise<DataServiceResponseData>;
-    getJsonArticleFlatTree(goodId: number, goodType: string, quantity: number, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
+    getJsonArticleFlatTree(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: number, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
     static createConnector(isPublicSession: boolean, sessionExists: boolean): IoneApiArticles;
+    private _getFrozenArticle;
+    private _getArticleFlatTree;
     private _handleConnectionReset;
 }

package/build/articles.js

@@ -13,6 +13,7 @@ import { ArticlesPublic } from './articles-public';
 import { Connector } from '@colijnit/ioneconnector/build/connector';
 import { SelectorArticle } from './model/selector-article';
 import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/business-object-factory';
+import { ArticleFlatTreeDTO } from "./model/article-flat-tree.bo";
 export class Articles {
     constructor(options) {
         this.showLoader = new Subject();
@@ -232,54 +233,24 @@ export class Articles {
     getJsonConfiguredArticles(configuratorStatistics, showLoader = true, instanceId = undefined) {
         return this.articles.getFrozenArticle(configuratorStatistics, showLoader, instanceId);
     }
-    getJsonArticleFlatTree(goodId, goodType, quantity, showLoader = true, instanceId = undefined, configuratorStatistics) {
+    getJsonArticleFlatTree(goodId, goodType, quantity, externalSource = false, showLoader = true, instanceId = undefined, configuratorStatistics) {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            const returnObject = { goodId: 0, baseGoodId: 0, selectorData: {}, quantity: 0, articleTree: {} };
-            returnObject.baseGoodId = goodId;
-            returnObject.selectorData = {};
-            returnObject.quantity = quantity;
+            const returnObject = { goodId: goodId, baseGoodId: goodId, selectorData: {}, quantity: quantity, articleTree: {} };
             if (goodType === 'B') {
-                const frozenArticleResponse = yield this.articles.getFrozenArticle(configuratorStatistics, showLoader, instanceId);
-                if (frozenArticleResponse && frozenArticleResponse.validationResult && frozenArticleResponse.validationResult.success) {
-                    const rawArray = frozenArticleResponse.resultObject;
-                    const articles = this.boFactory.makeBOArrayFromRawBackendDataArray(SelectorArticle, rawArray);
-                    const composedArticle = !!articles[0].compositionArticleNo;
-                    let frozenart;
-                    frozenart = this.boFactory.makeWithRawBackendData(SelectorArticle, articles[0]);
-                    if (composedArticle) {
-                        frozenart.compositions = [];
-                        frozenart.compositions.push(articles);
-                    }
-                    const selectorDataObject = frozenart;
-                    returnObject.goodId = (selectorDataObject.hasOwnProperty('compositionGoodId') &&
-                        selectorDataObject['compositionGoodId'] !== undefined &&
-                        selectorDataObject['compositionGoodId'] !== null) ? selectorDataObject['compositionGoodId'] : selectorDataObject.goodId;
-                    returnObject.selectorData = selectorDataObject;
-                    const articleFlatTreeResponse = yield this.articles.getJsonArticleFlatTree(returnObject.goodId, showLoader);
-                    if (articleFlatTreeResponse && articleFlatTreeResponse.validationResult && articleFlatTreeResponse.validationResult.success) {
-                        if (articleFlatTreeResponse.resultObject) {
-                            returnObject.articleTree = articleFlatTreeResponse.resultObject;
-                        }
-                    }
-                    else {
-                        reject(articleFlatTreeResponse);
-                    }
+                const frozenArt = yield this._getFrozenArticle(instanceId, configuratorStatistics, showLoader);
+                if (!frozenArt) {
+                    reject("");
                 }
-                else {
-                    reject(frozenArticleResponse);
+                returnObject.goodId = (frozenArt.hasOwnProperty('compositionGoodId') &&
+                    frozenArt['compositionGoodId'] !== undefined &&
+                    frozenArt['compositionGoodId'] !== null) ? frozenArt['compositionGoodId'] : frozenArt.goodId;
+                returnObject.selectorData = frozenArt;
+                if (externalSource) {
+                    returnObject.articleTree = yield this._getArticleFlatTree(returnObject.goodId, showLoader);
                 }
             }
             else {
                 returnObject.goodId = goodId;
-                const articleFlatTreeResponse = yield this.articles.getJsonArticleFlatTree(returnObject.goodId, showLoader);
-                if (articleFlatTreeResponse && articleFlatTreeResponse.validationResult && articleFlatTreeResponse.validationResult.success) {
-                    if (articleFlatTreeResponse.resultObject) {
-                        returnObject.articleTree = articleFlatTreeResponse.resultObject;
-                    }
-                }
-                else {
-                    reject(articleFlatTreeResponse);
-                }
             }
             resolve(JSON.stringify(returnObject));
         }));
@@ -290,6 +261,37 @@ export class Articles {
         }
         return new ArticlesPublic();
     }
+    _getFrozenArticle(instanceId, configuratorStatistics, showLoader) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const frozenArticleResponse = yield this.articles.getFrozenArticle(configuratorStatistics, showLoader, instanceId);
+            if (frozenArticleResponse && frozenArticleResponse.validationResult && frozenArticleResponse.validationResult.success) {
+                const rawArray = frozenArticleResponse.resultObject;
+                const articles = this.boFactory.makeBOArrayFromRawBackendDataArray(SelectorArticle, rawArray);
+                const composedArticle = !!articles[0].compositionArticleNo;
+                let frozenart;
+                frozenart = this.boFactory.makeWithRawBackendData(SelectorArticle, articles[0]);
+                if (composedArticle) {
+                    frozenart.compositions = [];
+                    frozenart.compositions.push(articles);
+                }
+                return frozenart;
+            }
+            else {
+                return null;
+            }
+        });
+    }
+    _getArticleFlatTree(goodId, showLoader) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const articleFlatTreeResponse = yield this.articles.getJsonArticleFlatTree(goodId, showLoader);
+            if (articleFlatTreeResponse && articleFlatTreeResponse.validationResult && articleFlatTreeResponse.validationResult.success) {
+                if (articleFlatTreeResponse.resultObject) {
+                    return this.boFactory.makeWithRawBackendData(ArticleFlatTreeDTO, articleFlatTreeResponse.resultObject);
+                }
+            }
+            return null;
+        });
+    }
     _handleConnectionReset() {
         this.connectionResetInactivity.next();
     }

package/build/interface/json-article-flat-tree.interface.d.ts

@@ -0,0 +1,7 @@
+export interface JsonArticleFlatTree {
+    goodId: number;
+    baseGoodId: number;
+    selectorData?: {};
+    quantity: number;
+    articleTree?: {};
+}

package/build/interface/json-article-flat-tree.interface.js

@@ -0,0 +1 @@
+export {};

package/build/model/article-flat-tree.bo.d.ts

@@ -5,6 +5,7 @@ import { CompositeGood } from "./composite-good";
 import { ArticlePriceList } from "./article-price-list";
 import { PriceListInfo } from "./price-list-info";
 import { CoDocument } from "./co-document.bo";
+import { CoText } from '@colijnit/mainapi/build/model/co-text';
 export declare class ArticleFlatTreeDTO extends BusinessObject {
     article: ArticleFlat;
     subArticles: ArticleFlat[];
@@ -14,4 +15,5 @@ export declare class ArticleFlatTreeDTO extends BusinessObject {
     priceLists: PriceListInfo[];
     supplierIdToNumber: Object;
     documents: CoDocument[];
+    articleTexts: CoText[];
 }

package/build/model/article-flat-tree.bo.js

@@ -13,6 +13,7 @@ import { PriceListInfo } from "./price-list-info";
 import { CoDocument } from "./co-document.bo";
 import { ComplexField } from "@colijnit/ioneconnector/build/factory/decorators/complex-field.decorator";
 import { ComplexArray } from "@colijnit/ioneconnector/build/factory/decorators/complex-array.decorator";
+import { CoText } from '@colijnit/mainapi/build/model/co-text';
 export class ArticleFlatTreeDTO extends BusinessObject {
     constructor() {
         super(...arguments);
@@ -23,6 +24,7 @@ export class ArticleFlatTreeDTO extends BusinessObject {
         this.priceLists = [];
         this.supplierIdToNumber = {};
         this.documents = [];
+        this.articleTexts = [];
     }
 }
 __decorate([
@@ -46,3 +48,6 @@ __decorate([
 __decorate([
     ComplexArray(CoDocument)
 ], ArticleFlatTreeDTO.prototype, "documents", void 0);
+__decorate([
+    ComplexArray(CoText)
+], ArticleFlatTreeDTO.prototype, "articleTexts", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/articleapi",
-  "version": "254.1.2",
+  "version": "254.1.3",
   "scripts": {
     "build": "grunt clean && tsc",
     "browserify": "browserify build/connector.js --s colijn -o dist/out-tsc/bundle.js",