Error handling on productswitcher columns calculation (SAP#2666)

y-kkamil · Apr 25, 2022 · 77ce87a · 77ce87a
1 parent 442d58c
commit 77ce87a
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 1 deletion.
diff --git a/core/src/utilities/helpers/navigation-helpers.js b/core/src/utilities/helpers/navigation-helpers.js
@@ -19,8 +19,14 @@ class NavigationHelpersClass {
 
   getProductSwitcherColumnsNumber() {
     const productSwitcherConfig = this.getProductSwitcherConfig();
+    if (!productSwitcherConfig.items) return;
     let productSwitcherColumns = productSwitcherConfig.columns;
-    let productSwitcherItemsAmount = productSwitcherConfig.items().length;
+    let productSwitcherItemsAmount;
+    if (GenericHelpers.isFunction(productSwitcherConfig.items)) {
+      productSwitcherItemsAmount = productSwitcherConfig.items().length;
+    } else {
+      productSwitcherItemsAmount = productSwitcherConfig.items.length;
+    }
     if (productSwitcherColumns === 'auto') {
       if (productSwitcherItemsAmount <= 6) {
         return (productSwitcherConfig.columns = 3);

diff --git a/core/test/utilities/helpers/navigation-helpers.spec.js b/core/test/utilities/helpers/navigation-helpers.spec.js
@@ -147,6 +147,38 @@ describe('Navigation-helpers', () => {
       assert.equal(columns, 4);
     });
 
+    it('should return number from config file even if columns are not defined and items proberty is an array', () => {
+      LuigiConfig.getConfigValue.returns({
+        icon: 'grid',
+        label: 'Products',
+        columns: 'auto',
+        items: [{}, {}, {}, {}, {}, {}, {}]
+      });
+      const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
+      assert.equal(columns, 4);
+    });
+
+    it('should return undefined if no items in config defined', () => {
+      LuigiConfig.getConfigValue.returns({
+        icon: 'grid',
+        label: 'Products',
+        columns: 'auto'
+      });
+      const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
+      assert.equal(columns, undefined);
+    });
+
+    it('should return undefined if empty array items in config defined', () => {
+      LuigiConfig.getConfigValue.returns({
+        icon: 'grid',
+        label: 'Products',
+        columns: 'auto',
+        item: []
+      });
+      const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
+      assert.equal(columns, undefined);
+    });
+
     it('should return number from config file if columns are defined', () => {
       LuigiConfig.getConfigValue.returns({
         icon: 'grid',
@@ -160,6 +192,17 @@ describe('Navigation-helpers', () => {
       assert.equal(columns, 3);
     });
 
+    it('should return number from config file if columns are defined and items proberty is an array', () => {
+      LuigiConfig.getConfigValue.returns({
+        icon: 'grid',
+        label: 'Products',
+        items: [],
+        columns: 3
+      });
+      const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
+      assert.equal(columns, 3);
+    });
+
     it('should return number from config file if columns are defined', () => {
       LuigiConfig.getConfigValue.returns({
         icon: 'grid',
@@ -172,6 +215,17 @@ describe('Navigation-helpers', () => {
       const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
       assert.equal(columns, 4);
     });
+
+    it('should return number from config file if columns are defined and items proberty is an array', () => {
+      LuigiConfig.getConfigValue.returns({
+        icon: 'grid',
+        label: 'Products',
+        items: [],
+        columns: '110'
+      });
+      const columns = NavigationHelpers.getProductSwitcherColumnsNumber();
+      assert.equal(columns, 4);
+    });
   });
 
   it('getNodePath', () => {