Merge pull request #161 from adobecom/announcments-filter-fix

moving announcments filter to announcements from partnerCards
adobecom · Dec 11, 2024 · b931b37 · b931b37
2 parents 1c52275 + cf9c116
commit b931b37
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/edsdme/blocks/announcements-preview/announcements-preview.js b/edsdme/blocks/announcements-preview/announcements-preview.js
@@ -1,6 +1,6 @@
 import { getCaasUrl } from '../../scripts/utils.js';
 import { getConfig } from '../utils/utils.js';
-import { filterRestrictedCardsByCurrentSite } from '../../components/PartnerCards.js';
+import { filterRestrictedCardsByCurrentSite } from '../announcements/AnnouncementsCards.js';
 
 function formatLinks(link) {
   const { hostname, pathname } = new URL(link);

diff --git a/edsdme/blocks/announcements/AnnouncementsCards.js b/edsdme/blocks/announcements/AnnouncementsCards.js
@@ -5,6 +5,22 @@ import PartnerCards from '../../components/PartnerCards.js';
 const miloLibs = getLibs();
 const { html, repeat } = await import(`${miloLibs}/deps/lit-all.min.js`);
 
+export function filterRestrictedCardsByCurrentSite(cards) {
+  const currentSite = window.location.pathname.split('/')[1];
+  return cards.filter((card) => {
+    const cardUrl = card?.contentArea?.url;
+    if (!cardUrl) return false;
+    try {
+      const cardSite = new URL(cardUrl).pathname.split('/')[1];
+      return currentSite === cardSite;
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(`Invalid URL: ${cardUrl}`, error);
+      return false;
+    }
+  });
+}
+
 export default class Announcements extends PartnerCards {
   static styles = [
     PartnerCards.styles,
@@ -233,4 +249,9 @@ export default class Announcements extends PartnerCards {
       });
     }
   }
+
+  onDataFetched(apiData) {
+    // Filter announcements by current site
+    this.cards = filterRestrictedCardsByCurrentSite(apiData.cards);
+  }
 }
diff --git a/edsdme/components/PartnerCards.js b/edsdme/components/PartnerCards.js
@@ -5,22 +5,6 @@ import './SinglePartnerCard.js';
 const miloLibs = getLibs();
 const { html, LitElement, css, repeat } = await import(`${miloLibs}/deps/lit-all.min.js`);
 
-export function filterRestrictedCardsByCurrentSite(cards) {
-  const currentSite = window.location.pathname.split('/')[1];
-  return cards.filter((card) => {
-    const cardUrl = card?.contentArea?.url;
-    if (!cardUrl) return false;
-    try {
-      const cardSite = new URL(cardUrl).pathname.split('/')[1];
-      return currentSite === cardSite;
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(`Invalid URL: ${cardUrl}`, error);
-      return false;
-    }
-  });
-}
-
 export default class PartnerCards extends LitElement {
   static styles = [
     partnerCardsStyles,
@@ -239,8 +223,6 @@ export default class PartnerCards extends LitElement {
         if (window.location.hostname === 'partners.adobe.com') {
           apiData.cards = apiData.cards.filter((card) => !card.contentArea.url?.includes('/drafts/'));
         }
-        // Filter announcements by current site
-        apiData.cards = filterRestrictedCardsByCurrentSite(apiData.cards);
         // eslint-disable-next-line no-return-assign
         apiData.cards.forEach((card, index) => card.orderNum = index + 1);
         this.allCards = apiData.cards;