@colijnit/articleapi 256.1.1 → 256.1.3

package/build/articles-auth.d.ts

@@ -47,7 +47,7 @@ export declare class ArticlesAuth extends IoneApiArticles {
     getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
-    getArticleFullObject(id: number): Promise<DataServiceResponseData>;
+    getArticleFullObject(id: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     getWarehouses(goodId: number): Promise<DataServiceResponseData>;
     getFrozenArticle(configuratorStatistics: ConfiguratorStatisticsEnvironment, showLoader: boolean, instanceId: number): Promise<DataServiceResponseData>;

package/build/articles-auth.js

@@ -282,14 +282,14 @@ export class ArticlesAuth extends IoneApiArticles {
             return this._call(DataServiceMethod.SelectSingleObject, data, BackendServiceName.DataService, showLoader);
         });
     }
-    getArticleFullObject(id) {
+    getArticleFullObject(id, showLoader = true) {
         const data = {
             moduleName: ModuleName.Articles,
             objectName: ArticleObjectName.ArticleFullObject,
             refCursorAsArray: true,
             objectId: id
         };
-        return this._call(DataServiceMethod.SelectSingleObject, data);
+        return this._call(DataServiceMethod.SelectSingleObject, data, BackendServiceName.DataService, showLoader);
     }
     getArticleFlat(sku) {
         const data = {

package/build/articles-public.d.ts

@@ -48,7 +48,7 @@ export declare class ArticlesPublic extends IoneApiArticles {
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getGoodIdFromArticleNr(sku: string): Promise<DataServiceResponseData>;
-    getArticleFullObject(goodId: number): Promise<DataServiceResponseData>;
+    getArticleFullObject(goodId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     getWarehouses(goodId: number): Promise<DataServiceResponseData>;
     getFrozenArticle(configuratorStatistics: ConfiguratorStatisticsEnvironment, showLoader: boolean, instanceId: number): Promise<DataServiceResponseData>;

package/build/articles-public.js

@@ -139,10 +139,10 @@ export class ArticlesPublic extends IoneApiArticles {
             return this._call(PublicServiceMethod.GetGoodIdFromArticleNr, data);
         });
     }
-    getArticleFullObject(goodId) {
+    getArticleFullObject(goodId, showLoader = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const data = Object.assign(Object.assign({}, this.createServiceRequestData()), { objectId: goodId });
-            return this._call(PublicServiceMethod.GetArticleFullObject, data);
+            return this._call(PublicServiceMethod.GetArticleFullObject, data, showLoader);
         });
     }
     getArticleFlat(sku) {

package/build/articles.d.ts

@@ -16,12 +16,12 @@ import { GetArticlePriceRequest } from './model/get-article-price-request';
 import { DataServiceResponseData } from '@colijnit/ioneconnector/build/model/data-service-response-data';
 import { PagingParameters } from '@colijnit/ioneconnector/build/model/paging-parameters';
 import { PrintPriceStickersRequest } from './model/print-price-stickers-request';
-import { ExternalCatalogStartupInfoRequest } from "./model/external-catalog-startup-info-request";
-import { ArticleFlatTreeDTO } from "./model/article-flat-tree.bo";
-import { LoginResponse } from "@colijnit/ioneconnector/build/model/login-response";
-import { ArticleStockSearchRequest } from "./model/article-stock-search-request";
-import { ArticleStockComparisonSearchRequest } from "./model/article-stock-comparison-search-request";
-import { ArticleStockTransferSearchRequest } from "./model/article-stock-transfer-search-request";
+import { ExternalCatalogStartupInfoRequest } from './model/external-catalog-startup-info-request';
+import { ArticleFlatTreeDTO } from './model/article-flat-tree.bo';
+import { LoginResponse } from '@colijnit/ioneconnector/build/model/login-response';
+import { ArticleStockSearchRequest } from './model/article-stock-search-request';
+import { ArticleStockComparisonSearchRequest } from './model/article-stock-comparison-search-request';
+import { ArticleStockTransferSearchRequest } from './model/article-stock-transfer-search-request';
 export declare class Articles {
     readonly showLoader: Subject<boolean>;
     readonly connectionAborted: Subject<void>;
@@ -67,7 +67,7 @@ export declare class Articles {
     getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
-    getArticleFullObject(id: number): Promise<DataServiceResponseData>;
+    getArticleFullObject(id: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     getWarehouses(goodId: number): Promise<DataServiceResponseData>;
     getTurnoverGroups(category?: string, showLoader?: boolean): Promise<DataServiceResponseData>;

package/build/articles.js

@@ -13,7 +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";
+import { ArticleFlatTreeDTO } from './model/article-flat-tree.bo';
 export class Articles {
     constructor(options) {
         this.showLoader = new Subject();
@@ -122,8 +122,8 @@ export class Articles {
     getExternalSource(externalSourceId, showLoader = true) {
         return this.articles.getExternalSource(externalSourceId, showLoader);
     }
-    getArticleFullObject(id) {
-        return this.articles.getArticleFullObject(id);
+    getArticleFullObject(id, showLoader = true) {
+        return this.articles.getArticleFullObject(id, showLoader);
     }
     getArticleFlat(sku) {
         return this.articles.getArticleFlat(sku);
@@ -264,22 +264,31 @@ export class Articles {
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             const returnObject = { goodId: goodId, baseGoodId: goodId, selectorData: {}, quantity: quantity, articleTree: {} };
             if (goodType === 'B') {
-                const frozenArt = yield this._getFrozenArticle(instanceId, configuratorStatistics, showLoader);
+                const frozenArt = yield this._getFrozenArticle(instanceId, configuratorStatistics, showLoader)
+                    .catch((e) => {
+                    return reject(e);
+                });
                 if (!frozenArt) {
-                    reject("");
+                    reject('');
                 }
                 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);
+                    returnObject.articleTree = yield this._getArticleFlatTree(returnObject.goodId, showLoader)
+                        .catch((e) => {
+                        return reject(e);
+                    });
                 }
             }
             else {
                 returnObject.goodId = goodId;
                 if (externalSource) {
-                    returnObject.articleTree = yield this._getArticleFlatTree(returnObject.goodId, showLoader);
+                    returnObject.articleTree = yield this._getArticleFlatTree(returnObject.goodId, showLoader)
+                        .catch((e) => {
+                        return reject(e);
+                    });
                 }
             }
             resolve(JSON.stringify(returnObject));
@@ -305,8 +314,11 @@ export class Articles {
                 }
                 return frozenart;
             }
+            else if (frozenArticleResponse) {
+                return Promise.reject(frozenArticleResponse.validationResult.messages);
+            }
             else {
-                return null;
+                return Promise.reject(null);
             }
         });
     }
@@ -318,7 +330,12 @@ export class Articles {
                     return this.boFactory.makeWithRawBackendData(ArticleFlatTreeDTO, articleFlatTreeResponse.resultObject);
                 }
             }
-            return null;
+            else if (articleFlatTreeResponse) {
+                return Promise.reject(articleFlatTreeResponse.validationResult.messages);
+            }
+            else {
+                return Promise.reject(null);
+            }
         });
     }
     _handleConnectionReset() {

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

@@ -53,7 +53,7 @@ export declare abstract class IoneApiArticles {
     abstract getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     abstract getCatalogDefinitions(showLoader: boolean): Promise<DataServiceResponseData>;
     abstract getExternalSource(externalSourceId: number, showLoader: boolean): Promise<DataServiceResponseData>;
-    abstract getArticleFullObject(id: number): Promise<DataServiceResponseData>;
+    abstract getArticleFullObject(id: number, showLoader: boolean): Promise<DataServiceResponseData>;
     abstract getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     abstract getWarehouses(goodId: number): Promise<DataServiceResponseData>;
     abstract getFrozenArticle(configuratorStatistics: ConfiguratorStatisticsEnvironment, showLoader: boolean, instanceId: number): Promise<DataServiceResponseData>;

package/package.json

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