oneentry 1.0.53 → 1.0.55

package/README.md

@@ -348,7 +348,6 @@ Example return:
 [
   {
     "id": 4,
-    "attributeSetId": 14,
     "localizeInfos": {
       "title": "Name"
     },
@@ -356,7 +355,6 @@ Example return:
     "position": 3,
     "identifier": "product",
     "type": "forProductBlock",
-    "productPageUrls": [],
     "templateIdentifier": null,
     "isVisible": true,
     "attributeValues": {
@@ -467,7 +465,6 @@ Example return:
 ```json
 {
   "id": 3,
-  "attributeSetId": null,
   "localizeInfos": {
     "title": "test"
   },
@@ -475,7 +472,6 @@ Example return:
   "position": 4,
   "identifier": "test",
   "type": "forSimilarProductBlock",
-  "productPageUrls": [],
   "templateIdentifier": null,
   "isVisible": true,
   "attributeValues": {},
@@ -564,7 +560,7 @@ example: null <br>
 </details>
 ---
 
-## Blocks.getSimilarProducts(marker, langCode, offset, limit)
+### Blocks.getSimilarProducts(marker, langCode, offset, limit)
 
 
 ```js
@@ -584,7 +580,6 @@ Example return:
     },
     "relatedIds": [1, 2],
     "statusId": null,
-    "attributeSetId": 11,
     "position": 3,
     "templateIdentifier": null,
     "shortDescTemplateIdentifier": null,
@@ -612,7 +607,7 @@ Example return:
 
 
 
-## Blocks.getSimilarProducts(marker, langCode, offset, limit)
+### Blocks.getSimilarProducts(marker, langCode, offset, limit)
 
 ```js
 const value = await Blocks.getProductsByBlockMarker('my-marker', 'en_US')
@@ -631,7 +626,6 @@ Example return:
     },
     "relatedIds": [1, 2],
     "statusId": null,
-    "attributeSetId": 11,
     "position": 3,
     "templateIdentifier": null,
     "shortDescTemplateIdentifier": null,

package/dist/blocks/blocksApi.d.ts

@@ -1,5 +1,5 @@
 import OneEntry from "../base/oneEntry";
-import { IBlocks, IBlocksEntity } from "./blocksInterfaces";
+import { IBlocks, IBlockEntity, IBlockProduct } from "./blocksInterfaces";
 import { IConfig } from "../base/utils";
 /**
  * Controllers for working with blocks
@@ -15,7 +15,7 @@ export default class BlocksApi extends OneEntry implements IBlocks {
      *
      * @returns Return array of BlocksEntity object.
      */
-    getBlocks(langCode?: string, offset?: number, limit?: number): Promise<Array<IBlocksEntity>>;
+    getBlocks(langCode?: string, offset?: number, limit?: number): Promise<Array<IBlockEntity>>;
     /**
      * Get block by marker.
      *
@@ -24,7 +24,7 @@ export default class BlocksApi extends OneEntry implements IBlocks {
      *
      * @returns Return BlocksEntity object.
      */
-    getBlockByMarker(marker: string, langCode?: string): Promise<IBlocksEntity>;
+    getBlockByMarker(marker: string, langCode?: string): Promise<IBlockEntity>;
     /**
      * Get similar products by block marker.
      *
@@ -35,7 +35,7 @@ export default class BlocksApi extends OneEntry implements IBlocks {
      *
      * @returns Return array of BlocksEntity object.
      */
-    getSimilarProducts(marker: string, langCode?: string, offset?: number, limit?: number): Promise<any>;
+    getSimilarProducts(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<IBlockProduct>>;
     /**
      * Get products by block marker.
      *
@@ -46,5 +46,5 @@ export default class BlocksApi extends OneEntry implements IBlocks {
      *
      * @returns Return array of BlocksEntity object.
      */
-    getProductsByBlockMarker(marker: string, langCode?: string, offset?: number, limit?: number): Promise<any>;
+    getProductsByBlockMarker(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<IBlockProduct>>;
 }

package/dist/blocks/blocksApi.js

@@ -23,19 +23,34 @@ class BlocksApi extends oneEntry_1.default {
         const normalizeResponse = this._normalizeData(response);
         await Promise.all(normalizeResponse.map(async (block) => {
             const customSettings = block.customSettings;
-            if (customSettings.hasOwnProperty('productConfig')) {
-                block.countElementsPerRow = Number(customSettings.productConfig.countElementsPerRow);
+            if (customSettings && customSettings.hasOwnProperty('productConfig')) {
+                block.countElementsPerRow = customSettings.productConfig.countElementsPerRow ? (+customSettings.productConfig.countElementsPerRow) : 0;
+            }
+            else {
+                block.countElementsPerRow = 0;
             }
             delete block.customSettings;
+            delete block.attributeSetId;
+            delete block.productPageUrls;
             if (block.type === 'forSimilarProductBlock') {
-                await this.getSimilarProducts(block.identifier, langCode, offset, limit).then((result) => {
-                    block.similarProducts = result;
-                });
+                try {
+                    await this.getSimilarProducts(block.identifier, langCode, offset, limit).then((result) => {
+                        block.similarProducts = result;
+                    });
+                }
+                catch {
+                    block.similarProducts = [];
+                }
             }
             else if (block.type === 'forProductBlock') {
-                await this.getProductsByBlockMarker(block.identifier, langCode, offset, limit).then((result) => {
-                    block.products = result;
-                });
+                try {
+                    await this.getProductsByBlockMarker(block.identifier, langCode, offset, limit).then((result) => {
+                        block.products = result;
+                    });
+                }
+                catch {
+                    block.products = [];
+                }
             }
         }));
         return normalizeResponse;
@@ -52,19 +67,34 @@ class BlocksApi extends oneEntry_1.default {
         const response = await this._fetchGet(`/marker/${marker}?langCode=${langCode}`);
         const normalizeResponse = this._normalizeData(response);
         const customSettings = normalizeResponse.customSettings;
-        if (customSettings.hasOwnProperty('productConfig')) {
-            normalizeResponse.countElementsPerRow = Number(customSettings.productConfig.countElementsPerRow);
+        if (customSettings && customSettings.hasOwnProperty('productConfig')) {
+            normalizeResponse.countElementsPerRow = customSettings.productConfig.countElementsPerRow ? (+customSettings.productConfig.countElementsPerRow) : 0;
+        }
+        else {
+            normalizeResponse.countElementsPerRow = 0;
         }
         delete normalizeResponse.customSettings;
+        delete normalizeResponse.attributeSetId;
+        delete normalizeResponse.productPageUrls;
         if (normalizeResponse.type === 'forSimilarProductBlock') {
-            await this.getSimilarProducts(normalizeResponse.identifier, langCode).then((result) => {
-                normalizeResponse.similarProducts = result;
-            });
+            try {
+                await this.getSimilarProducts(normalizeResponse.identifier, langCode).then((result) => {
+                    normalizeResponse.similarProducts = result;
+                });
+            }
+            catch {
+                normalizeResponse.similarProducts = [];
+            }
         }
         else if (normalizeResponse.type === 'forProductBlock') {
-            await this.getProductsByBlockMarker(normalizeResponse.identifier, langCode).then((result) => {
-                normalizeResponse.products = result;
-            });
+            try {
+                await this.getProductsByBlockMarker(normalizeResponse.identifier, langCode).then((result) => {
+                    normalizeResponse.products = result;
+                });
+            }
+            catch {
+                normalizeResponse.products = [];
+            }
         }
         return normalizeResponse;
     }

package/dist/blocks/blocksInterfaces.d.ts

@@ -7,12 +7,12 @@
  * @property {function} getProductsByBlockMarker - Get Array of products from product block.
  */
 interface IBlocks {
-    getBlocks(langCode: string, offset?: number, limit?: number): Promise<Array<IBlocksEntity>>;
-    getBlockByMarker(marker: string, langCode: string): Promise<IBlocksEntity>;
-    getSimilarProducts(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<ISimilarProduct>>;
-    getProductsByBlockMarker(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<ISimilarProduct>>;
+    getBlocks(langCode: string, offset?: number, limit?: number): Promise<Array<IBlockEntity>>;
+    getBlockByMarker(marker: string, langCode: string): Promise<IBlockEntity>;
+    getSimilarProducts(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<IBlockProduct>>;
+    getProductsByBlockMarker(marker: string, langCode?: string, offset?: number, limit?: number): Promise<Array<IBlockProduct>>;
 }
-interface ISimilarProduct {
+interface IBlockProduct {
     attributeSetId: number;
     attributeValues: Record<string, any>;
     id: number;
@@ -27,7 +27,7 @@ interface ISimilarProduct {
     statusId: number | null;
     templateIdentifier: string | null;
 }
-interface IBlocksEntity {
+interface IBlocksResponse {
     id: number;
     attributeSetId: number | null;
     localizeInfos: Record<string, any>;
@@ -40,8 +40,23 @@ interface IBlocksEntity {
     type: string;
     templateIdentifier: string | null;
     countElementsPerRow?: number;
-    similarProducts?: Array<ISimilarProduct>;
-    products?: Array<ISimilarProduct>;
+    productPageUrls: Array<any>;
+    similarProducts?: Array<IBlockProduct>;
+    products?: Array<IBlockProduct>;
+}
+interface IBlockEntity {
+    attributeValues: Record<string, any>;
+    id: number;
+    identifier: string;
+    isVisible: boolean;
+    localizeInfos: Record<string, any>;
+    position: number;
+    templateIdentifier: string | null;
+    type: string;
+    version: number;
+    similarProducts?: Array<IBlockProduct>;
+    products?: Array<IBlockProduct>;
+    countElementsPerRow: number;
 }
 interface ICustomSetting {
     sliderDelay: number;
@@ -58,4 +73,4 @@ interface ICustomSetting {
     }> | Record<string, any>;
     [key: string]: any;
 }
-export { IBlocks, IBlocksEntity };
+export { IBlocks, IBlockEntity, IBlocksResponse, IBlockProduct };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",