npm - @infrab4a/connect - Versions diffs - 5.5.6-beta.1 → 5.5.6-beta.2 - Mend

@infrab4a/connect 5.5.6-beta.1 → 5.5.6-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/index.cjs.js CHANGED Viewed

@@ -2435,9 +2435,9 @@ class ShopSettings extends BaseModel {
             if (section.type === ShopPageSectionType.CAROUSEL && Array.isArray(section.banners)) {
                 const filteredBanners = section.banners.filter((banner) => {
                     // Filtra por displayRules
-                    const rulesMatch = banner.displayRules
-                        ? Object.keys(displayRules).some((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
-                        : false;
+                    const rulesMatch = banner.displayRules.length
+                        ? banner.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                        : true;
                     // Filtra por publishDate e expirationDate
                     const publishOk = !banner.publishDate || now >= new Date(banner.publishDate);
                     const expireOk = !banner.expirationDate || now <= new Date(banner.expirationDate);
@@ -2449,27 +2449,30 @@ class ShopSettings extends BaseModel {
             if (section.type === ShopPageSectionType.HIGHLIGHTS && Array.isArray(section.highlights)) {
                 const filteredHighlights = section.highlights.filter((highlight) => {
                     // Filtra por displayRules
-                    const rulesMatch = highlight.displayRules
-                        ? Object.keys(displayRules).some((key) => highlight.displayRules && highlight.displayRules[key] === displayRules[key])
-                        : false;
+                    const rulesMatch = highlight.displayRules.length
+                        ? highlight.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                        : true;
                     return rulesMatch;
                 });
                 return { ...section, highlights: filteredHighlights };
             }
             // Filtra collections
             if (section.type === ShopPageSectionType.COLLECTION) {
-                const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
-                    : false;
+                console.warn('SECTION', section.title, section.slug, displayRules);
+                const rulesMatch = section.displayRules.length
+                    ? section.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                    : true;
+                console.warn('RULES MATCH', rulesMatch);
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
+                console.warn('PUBLISH OK', publishOk, 'EXPIRE OK', expireOk);
                 return rulesMatch && publishOk && expireOk ? section : null;
             }
             // Filtra banners
             if (section.type === ShopPageSectionType.BANNER) {
-                const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
-                    : false;
+                const rulesMatch = section.displayRules.length
+                    ? section.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                    : true;
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
                 return rulesMatch && publishOk && expireOk ? section : null;

package/index.esm.js CHANGED Viewed

@@ -2411,9 +2411,9 @@ class ShopSettings extends BaseModel {
             if (section.type === ShopPageSectionType.CAROUSEL && Array.isArray(section.banners)) {
                 const filteredBanners = section.banners.filter((banner) => {
                     // Filtra por displayRules
-                    const rulesMatch = banner.displayRules
-                        ? Object.keys(displayRules).some((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
-                        : false;
+                    const rulesMatch = banner.displayRules.length
+                        ? banner.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                        : true;
                     // Filtra por publishDate e expirationDate
                     const publishOk = !banner.publishDate || now >= new Date(banner.publishDate);
                     const expireOk = !banner.expirationDate || now <= new Date(banner.expirationDate);
@@ -2425,27 +2425,30 @@ class ShopSettings extends BaseModel {
             if (section.type === ShopPageSectionType.HIGHLIGHTS && Array.isArray(section.highlights)) {
                 const filteredHighlights = section.highlights.filter((highlight) => {
                     // Filtra por displayRules
-                    const rulesMatch = highlight.displayRules
-                        ? Object.keys(displayRules).some((key) => highlight.displayRules && highlight.displayRules[key] === displayRules[key])
-                        : false;
+                    const rulesMatch = highlight.displayRules.length
+                        ? highlight.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                        : true;
                     return rulesMatch;
                 });
                 return { ...section, highlights: filteredHighlights };
             }
             // Filtra collections
             if (section.type === ShopPageSectionType.COLLECTION) {
-                const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
-                    : false;
+                console.warn('SECTION', section.title, section.slug, displayRules);
+                const rulesMatch = section.displayRules.length
+                    ? section.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                    : true;
+                console.warn('RULES MATCH', rulesMatch);
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
+                console.warn('PUBLISH OK', publishOk, 'EXPIRE OK', expireOk);
                 return rulesMatch && publishOk && expireOk ? section : null;
             }
             // Filtra banners
             if (section.type === ShopPageSectionType.BANNER) {
-                const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
-                    : false;
+                const rulesMatch = section.displayRules.length
+                    ? section.displayRules.some((rule) => Object.keys(rule).every((key) => rule[key] === displayRules[key]))
+                    : true;
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
                 return rulesMatch && publishOk && expireOk ? section : null;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "5.5.6-beta.1",
+  "version": "5.5.6-beta.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },