testing pr

.github/workflows/run-nala.yml

@@ -24,3 +24,4 @@ jobs:
           prRepo: ${{ github.event.pull_request.head.repo.name }}
           prBranch: ${{ github.event.pull_request.head.ref }}
           prBaseBranch: ${{ github.event.pull_request.base.ref }}
+          HLX_API_KEY: ${{ secrets.HLX_API_KEY }}

eds/blocks/knowledge-base-overview/KnowledgeBaseOverview.js

@@ -1,93 +1,3 @@
-import { getLibs } from '../../scripts/utils.js';
-import { numericPaginationStyles } from '../../components/PartnerCardsStyles.js';
 import PartnerCardsWithDateFilter from '../../components/PartnerCardsWithDateFilter.js';
 
-const miloLibs = getLibs();
-const { html, css, repeat } = await import(`${miloLibs}/deps/lit-all.min.js`);
-
-export default class KnowledgeBaseOverview extends PartnerCardsWithDateFilter {
-  static properties = {
-    ...PartnerCardsWithDateFilter.properties,
-    totalPages: { type: Number },
-  };
-
-  constructor() {
-    super();
-    this.totalPages = 0;
-    this.useStageCaasEndpoint = true;
-  }
-
-  static styles = [
-    PartnerCardsWithDateFilter.styles,
-    css`${numericPaginationStyles}`,
-  ];
-
-  get paginationList() {
-    if (!this.cards.length) return;
-
-    const min = 1;
-    this.totalPages = Math.ceil(this.cards.length / this.cardsPerPage);
-
-    const pagesNumArray = Array.from({ length: this.totalPages }, (_, i) => i + min);
-    return html`${repeat(
-      pagesNumArray,
-      (pageNum) => pageNum,
-      (pageNum) => html`<button
-        class="page-btn ${this.paginationCounter === pageNum ? 'selected' : ''}"
-        @click="${() => this.handlePageNum(pageNum)}"
-        aria-label="${this.blockData.localizedText['{{page}}']} ${pageNum}">
-        ${pageNum}
-      </button>`,
-    )}`;
-  }
-
-  get pagination() {
-    return html`
-      <div class="pagination-pages-list">
-        <button class="pagination-prev-btn ${this.paginationCounter === 1 || !this.paginatedCards?.length ? 'disabled' : ''}" @click="${this.handlePrevPage}" aria-label="${this.blockData.localizedText['{{previous-page}}']}">
-          ${this.blockData.localizedText['{{prev}}']}</button>
-        ${this.paginationList}
-        <button class="pagination-next-btn ${this.paginationCounter === this.totalPages || !this.paginatedCards?.length ? 'disabled' : ''}" @click="${this.handleNextPage}" aria-label="${this.blockData.localizedText['{{next-page}}']}">
-          ${this.blockData.localizedText['{{next}}']}</button>
-      </div>
-    `;
-  }
-
-  get cardsCounter() {
-    const lastElOrderNum = super.cardsCounter;
-    const { orderNum: firstElOrderNum } = this.paginatedCards[0];
-    return `${firstElOrderNum} - ${lastElOrderNum}`;
-  }
-
-  handleActions() {
-    super.handleActions();
-    this.updatePaginatedCards();
-  }
-
-  updatePaginatedCards() {
-    const startIndex = (this.paginationCounter - 1) * this.cardsPerPage;
-    const endIndex = this.paginationCounter * this.cardsPerPage;
-    this.paginatedCards = this.cards.slice(startIndex, endIndex);
-  }
-
-  handlePageNum(pageNum) {
-    if (this.paginationCounter !== pageNum) {
-      this.paginationCounter = pageNum;
-      this.handleActions();
-    }
-  }
-
-  handlePrevPage() {
-    if (this.paginationCounter > 1) {
-      this.paginationCounter -= 1;
-      this.handleActions();
-    }
-  }
-
-  handleNextPage() {
-    if (this.paginationCounter < this.totalPages) {
-      this.paginationCounter += 1;
-      this.handleActions();
-    }
-  }
-}
+export default class KnowledgeBaseOverview extends PartnerCardsWithDateFilter {}

eds/blocks/knowledge-base-overview/knowledge-base-overview.js

@@ -1,4 +1,5 @@
-import { getLibs, replaceText, getConfig, populateLocalizedTextFromListItems } from '../../scripts/utils.js';
+import { getCaasUrl, getLibs } from '../../scripts/utils.js';
+import { replaceText, getConfig, populateLocalizedTextFromListItems } from '../utils/utils.js';
 import KnowledgeBaseOverview from './KnowledgeBaseOverview.js';
 
 function declareKnowledgeBaseOverview() {
@@ -33,6 +34,7 @@ export default async function init(el) {
     '{{last-6-months}}': 'Last 6 months',
     '{{next}}': 'Next',
     '{{next-page}}': 'Next Page',
+    '{{load-more}}': 'Load more',
     '{{no-results-description}}': 'Try checking your spelling or broadening your search.',
     '{{no-results-title}}': 'No Results Found',
     '{{of}}': 'Of',
@@ -69,13 +71,20 @@ export default async function init(el) {
     ],
   };
 
+  const block = {
+    el,
+    name: 'knowledge-base-overview',
+    collectionTag: '"caas:adobe-partners/collections/knowledge-base"',
+    ietf: config.locale.ietf
+  }
+
   const blockData = {
     localizedText,
     tableData: el.children,
     dateFilter,
     cardsPerPage: 12,
-    ietf: config.locale.ietf,
-    collectionTags: '"caas:adobe-partners/collections/knowledge-base"',
+    pagination: 'default',
+    caasUrl: getCaasUrl(block)
   };
 
   const app = document.createElement('knowledge-base-overview');

eds/blocks/partner-news/PartnerNews.js

@@ -1,35 +1,3 @@
-import { getLibs } from '../../scripts/utils.js';
-import { loadMorePaginationStyles } from '../../components/PartnerCardsStyles.js';
 import PartnerCardsWithDateFilter from '../../components/PartnerCardsWithDateFilter.js';
 
-const miloLibs = getLibs();
-const { html, css } = await import(`${miloLibs}/deps/lit-all.min.js`);
-
-export default class PartnerNews extends PartnerCardsWithDateFilter {
-  static styles = [
-    PartnerCardsWithDateFilter.styles,
-    css`${loadMorePaginationStyles}`,
-  ];
-
-  get pagination() {
-    if (this.cards.length === this.paginatedCards.length) {
-      return '';
-    }
-    return html`<button class="load-more-btn" @click="${this.handleLoadMore}" aria-label="${this.blockData.localizedText['{{load-more}}']}">${this.blockData.localizedText['{{load-more}}']}</button>`;
-  }
-
-  handleActions() {
-    super.handleActions();
-    this.updatePaginatedCards();
-  }
-
-  updatePaginatedCards() {
-    const countPages = this.paginationCounter * this.cardsPerPage;
-    this.paginatedCards = this.cards.slice(0, countPages);
-  }
-
-  handleLoadMore() {
-    this.paginationCounter += 1;
-    this.handleActions();
-  }
-}
+export default class PartnerNews extends PartnerCardsWithDateFilter {}

eds/blocks/partner-news/partner-news.js

@@ -1,4 +1,5 @@
-import { getLibs, replaceText, getConfig, populateLocalizedTextFromListItems } from '../../scripts/utils.js';
+import { getCaasUrl, getLibs } from '../../scripts/utils.js';
+import { replaceText, getConfig, populateLocalizedTextFromListItems } from '../utils/utils.js';
 import PartnerNews from './PartnerNews.js';
 
 function declarePartnerNews() {
@@ -32,10 +33,15 @@ export default async function init(el) {
     '{{filters}}': 'Filters',
     '{{last-90-days}}': 'Last 90 days',
     '{{load-more}}': 'Load more',
+    '{{next}}': 'Next',
+    '{{next-page}}': 'Next Page',
     '{{no-results-description}}': 'Try checking your spelling or broadening your search.',
     '{{no-results-title}}': 'No Results Found',
     '{{of}}': 'Of',
+    '{{page}}': 'Page',
+    '{{prev}}': 'Prev',
     '{{previous-month}}': 'Previous month',
+    '{{previous-page}}': 'Previous Page',
     '{{results}}': 'Results',
     '{{search}}': 'Search',
     '{{show-all}}': 'Show all',
@@ -65,13 +71,20 @@ export default async function init(el) {
     ],
   };
 
+  const block = {
+    el,
+    name: 'partner-news',
+    collectionTag: '"caas:adobe-partners/collections/news"',
+    ietf: config.locale.ietf
+  }
+
   const blockData = {
     localizedText,
     tableData: el.children,
     dateFilter,
     cardsPerPage: 12,
-    ietf: config.locale.ietf,
-    collectionTags: '"caas:adobe-partners/collections/news"',
+    pagination: 'load-more',
+    caasUrl: getCaasUrl(block)
   };
 
   const app = document.createElement('partner-news');

eds/blocks/utils/utils.js

@@ -0,0 +1,20 @@
+import { setLibs } from '../../scripts/utils.js';
+
+const miloLibs = setLibs('/libs');
+
+const { createTag, localizeLink, getConfig } = await import(`${miloLibs}/utils/utils.js`);
+
+export { createTag, localizeLink, getConfig };
+const { replaceText } = await import(`${miloLibs}/features/placeholders.js`);
+export { replaceText };
+
+export function populateLocalizedTextFromListItems(el, localizedText) {
+  const liList = Array.from(el.querySelectorAll('li'));
+  liList.forEach((liEl) => {
+    const liInnerText = liEl.innerText;
+    if (!liInnerText) return;
+    let liContent = liInnerText.trim().toLowerCase().replace(/ /g, '-');
+    if (liContent.endsWith('_default')) liContent = liContent.slice(0, -8);
+    localizedText[`{{${liContent}}}`] = liContent;
+  });
+}