LYNX-759: Refactoring; bugfixing;

hlxsites · Feb 13, 2025 · e0bb70e · e0bb70e
1 parent 52775cc
commit e0bb70e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/blocks/targeted-block/condition-matcher.js b/blocks/targeted-block/condition-matcher.js
@@ -16,7 +16,7 @@ export default function conditionsMatched(activeRules, blockConfig) {
     (segment) => segment.name,
   );
   const activeGroup = activeRules.customerGroup?.name;
-  const activeCartRules = activeRules.cart?.rules?.map(
+  const activeCartRules = activeRules.cart?.map(
     (rule) => rule.name,
   );
   const activePriceRules = activeRules.catalogPriceRules?.rules?.map(

diff --git a/blocks/targeted-block/graphql.js b/blocks/targeted-block/graphql.js
@@ -15,7 +15,7 @@ const getCustomerGroups = async () => {
         method: 'GET',
       },
     );
-    return response.data;
+    return response.data?.customerGroup;
   } catch (error) {
     console.error('Could not retrieve customer groups', error);
   }
@@ -38,7 +38,7 @@ const getCustomerSegments = async () => {
         method: 'GET',
       },
     );
-    return response.data;
+    return response.data?.customer?.segments || [];
   } catch (error) {
     console.error('Could not retrieve customer segments', error);
   }
@@ -62,9 +62,9 @@ const getCartRules = async (cartId) => {
         variables: { cartId },
       },
     );
-    return response.data;
+    return response.data?.cart?.rules || [];
   } catch (error) {
-    console.error('Could not retrieve customer segments', error);
+    console.error('Could not retrieve customer cart rules', error);
   }
   return [];
 };
@@ -96,7 +96,7 @@ const getCatalogPriceRules = async (sku) => {
     );
     return response.data?.products?.items[0];
   } catch (error) {
-    console.error(`Could not retrieve catalog rules for ${sku}`, error);
+    console.error(`Could not retrieve catalog price rules for ${sku}`, error);
   }
   return [];
 };

diff --git a/blocks/targeted-block/targeted-block.js b/blocks/targeted-block/targeted-block.js
@@ -17,9 +17,7 @@ const updateTargetedBlocksVisibility = async () => {
   const activeRules = {
     customerSegments: await getCustomerSegments(),
     customerGroup: await getCustomerGroups(),
-    cart: {
-      rules: [],
-    },
+    cart: [],
     catalogPriceRules: [],
   };