${this.blockData.localizedText['{{no-results-description}}']}
@@ -558,6 +512,7 @@ export default class PartnerCards extends LitElement { } // eslint-disable-next-line consistent-return return selectedFiltersKeys.every((key) => cardArbitraryArr.some((arbitraryTag) => { + if (!arbitraryTag.value || !arbitraryTag.key) return false; const arbitraryTagKeyStr = arbitraryTag.key.trim().toLowerCase().replaceAll(' ', '-'); const arbitraryTagValueStr = arbitraryTag.value.trim().toLowerCase().replaceAll(' ', '-'); if (key === arbitraryTagKeyStr) { @@ -719,6 +674,8 @@ export default class PartnerCards extends LitElement { /* eslint-disable indent */ render() { return html` + ${this.fetchedData + ? html`${this.data.contentArea?.title !== 'card-metadata' ? this.data.contentArea?.title : ''}
@@ -63,4 +69,4 @@ class NewsCard extends LitElement { `; } } -customElements.define('news-card', NewsCard); +customElements.define('single-partner-card', SinglePartnerCard); diff --git a/eds/scripts/scripts.js b/eds/scripts/scripts.js index 873d207..390ef7f 100644 --- a/eds/scripts/scripts.js +++ b/eds/scripts/scripts.js @@ -10,7 +10,8 @@ * governing permissions and limitations under the License. */ -import {prodHosts, setLibs} from './utils.js'; +import { prodHosts, setLibs, preloadResources } from './utils.js'; +// import PartnerNews from '../blocks/partner-news/PartnerNews.js'; // Add project-wide style path here. const STYLES = ''; @@ -18,8 +19,6 @@ const STYLES = ''; // Use 'https://milo.adobe.com/libs' if you cannot map '/libs' to milo's origin. const LIBS = '/libs'; - - const imsClientId = prodHosts.includes(window.location.host) ? 'MILO_PARTNERS_PROD' : 'MILO_PARTNERS_STAGE'; // Add any config options. @@ -68,6 +67,8 @@ const miloLibs = setLibs(LIBS); }()); (async function loadPage() { + await preloadResources(CONFIG.locales, miloLibs); + const { loadArea, setConfig } = await import(`${miloLibs}/utils/utils.js`); setConfig({ ...CONFIG, miloLibs }); diff --git a/eds/scripts/utils.js b/eds/scripts/utils.js index 29a4f77..941e232 100644 --- a/eds/scripts/utils.js +++ b/eds/scripts/utils.js @@ -44,18 +44,6 @@ export const prodHosts = [ * ------------------------------------------------------------ */ -export async function useMiloSample() { - const { createTag } = await import(`${getLibs()}/utils/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) => { @@ -82,6 +70,75 @@ export function formatDate(cardDate) { return formattedDate; } +export function getLocale(locales, pathname = window.location.pathname) { + if (!locales) { + return { ietf: 'en-US', tk: 'hah7vzn.css', prefix: '' }; + } + const LANGSTORE = 'langstore'; + const split = pathname.split('/'); + const localeString = split[1]; + const locale = locales[localeString] || locales['']; + if (localeString === LANGSTORE) { + locale.prefix = `/${localeString}/${split[2]}`; + if ( + Object.values(locales) + .find((loc) => loc.ietf?.startsWith(split[2]))?.dir === 'rtl' + ) locale.dir = 'rtl'; + return locale; + } + const isUS = locale.ietf === 'en-US'; + locale.prefix = isUS ? '' : `/${localeString}`; + locale.region = isUS ? 'us' : localeString.split('_')[0]; + return locale; +} + +function preload(url) { + const preloadLink = document.createElement('link'); + preloadLink.rel = 'preload'; + preloadLink.as = 'fetch'; + preloadLink.crossOrigin = true; + preloadLink.href = url; + document.head.appendChild(preloadLink); +} + +function preloadPlaceholders(locale) { + const placeholderUrl = `${locale.prefix}/eds/partners-shared/placeholders.json`; + preload(placeholderUrl); +} + +function preloadLit(miloLibs) { + const preloadLink = document.createElement('link'); + preloadLink.rel = 'modulepreload'; + preloadLink.crossOrigin = true; + preloadLink.href = `${miloLibs}/deps/lit-all.min.js`; + document.head.appendChild(preloadLink); +} + +export async function preloadResources(locales, miloLibs) { + const locale = getLocale(locales); + const cardBlocks = { + 'partner-news': '"caas:adobe-partners/collections/news"', + 'knowledge-base-overview': '"caas:adobe-partners/collections/knowledge-base"', + }; + + Object.entries(cardBlocks).forEach(async ([key, value]) => { + const el = document.querySelector(`.${key}`); + if (!el) return; + + preloadPlaceholders(locale); + preloadLit(miloLibs); + + const block = { + el, + name: key, + collectionTag: value, + ietf: locale.ietf, + }; + const caasUrl = getCaasUrl(block); + preload(caasUrl); + }); +} + export function getProgramType(path) { switch (true) { case /solutionpartners/.test(path): return 'spp'; @@ -113,3 +170,65 @@ export function getPartnerDataCookieValue(programType, key) { return ''; } } + +export function getCaasUrl(block) { + const useStageCaasEndpoint = block.name === 'knowledge-base-overview'; + const domain = `${(useStageCaasEndpoint && !prodHosts.includes(window.location.host)) ? 'https://14257-chimera-stage.adobeioruntime.net/api/v1/web/chimera-0.0.1' : 'https://www.adobe.com/chimera-api'}`; + const api = new URL(`${domain}/collection?originSelection=dx-partners&draft=false&debug=true&flatFile=false&expanded=true`); + return setApiParams(api, block); +} + +function setApiParams(api, block) { + const { el, collectionTag } = block; + const complexQueryParams = getComplexQueryParams(el, collectionTag); + if (complexQueryParams) api.searchParams.set('complexQuery', complexQueryParams); + + const [language, country] = block.ietf.split('-'); + if (language && country) { + api.searchParams.set('language', language); + api.searchParams.set('country', country); + } + + return api.toString(); +} + +function extractTableCollectionTags(el) { + let tableCollectionTags = []; + Array.from(el.children).forEach((row) => { + const cols = Array.from(row.children); + const rowTitle = cols[0].innerText.trim().toLowerCase().replace(/ /g, '-'); + const colsContent = cols.slice(1); + if (rowTitle === 'collection-tags') { + const [collectionTagsEl] = colsContent; + const collectionTags = Array.from(collectionTagsEl.querySelectorAll('li'), (li) => `"${li.innerText.trim().toLowerCase()}"`); + tableCollectionTags = [...tableCollectionTags, ...collectionTags]; + } + }); + + return tableCollectionTags; +} + +function getComplexQueryParams(el, collectionTag) { + const portal = getCurrentProgramType(); + if (!portal) return; + + const portalCollectionTag = `"caas:adobe-partners/${portal}"`; + const tableTags = extractTableCollectionTags(el); + const collectionTags = [collectionTag, portalCollectionTag, ...tableTags]; + + const partnerLevelParams = getPartnerLevelParams(portal); + + if (!collectionTags.length) return; + + const collectionTagsStr = collectionTags.filter((e) => e.length).join('+AND+'); + let resulStr = `(${collectionTagsStr})`; + if (partnerLevelParams) resulStr += `+AND+${partnerLevelParams}`; + // eslint-disable-next-line consistent-return + return resulStr; +} + +function getPartnerLevelParams(portal) { + const partnerLevel = getPartnerDataCookieValue(portal, 'level'); + const partnerTagBase = `"caas:adobe-partners/${portal}/partner-level/`; + return partnerLevel ? `(${partnerTagBase}${partnerLevel}"+OR+${partnerTagBase}public")` : `(${partnerTagBase}public")`; +} diff --git a/test/blocks/knowledge-base-overview/knowledge-base-overview.test.js b/test/blocks/knowledge-base-overview/knowledge-base-overview.test.js index d1d8055..008195c 100644 --- a/test/blocks/knowledge-base-overview/knowledge-base-overview.test.js +++ b/test/blocks/knowledge-base-overview/knowledge-base-overview.test.js @@ -16,6 +16,7 @@ describe('knowledge-base-overview block', () => { this.cards = cards; this.paginatedCards = this.cards.slice(0, 3); this.hasResponseData = true; + this.fetchedData = true; }); await import('../../../eds/scripts/scripts.js'); @@ -40,7 +41,7 @@ describe('knowledge-base-overview block', () => { expect(knowledgeBaseWrapper.shadowRoot).to.exist; const partnerCardsCollection = knowledgeBaseWrapper.shadowRoot.querySelector('.partner-cards-collection'); expect(partnerCardsCollection).to.exist; - expect(partnerCardsCollection.innerHTML).to.include('news-card'); + expect(partnerCardsCollection.innerHTML).to.include('single-partner-card'); const firstCard = partnerCardsCollection.querySelector('.card-wrapper'); expect(firstCard.shadowRoot).to.exist; const searchBarWrapper = knowledgeBaseWrapper.shadowRoot.querySelector('.partner-cards-sidebar .search-wrapper'); diff --git a/test/blocks/partner-news/partner-news.test.js b/test/blocks/partner-news/partner-news.test.js index 875484b..820ab61 100644 --- a/test/blocks/partner-news/partner-news.test.js +++ b/test/blocks/partner-news/partner-news.test.js @@ -16,6 +16,7 @@ describe('partner-news block', () => { this.cards = cards; this.paginatedCards = this.cards.slice(0, 3); this.hasResponseData = true; + this.fetchedData = true; }); await import('../../../eds/scripts/scripts.js'); @@ -40,7 +41,7 @@ describe('partner-news block', () => { expect(partnerNewsWrapper.shadowRoot).to.exist; const partnerCardsCollection = partnerNewsWrapper.shadowRoot.querySelector('.partner-cards-collection'); expect(partnerCardsCollection).to.exist; - expect(partnerCardsCollection.innerHTML).to.include('news-card'); + expect(partnerCardsCollection.innerHTML).to.include('single-partner-card'); const firstCard = partnerCardsCollection.querySelector('.card-wrapper'); expect(firstCard.shadowRoot).to.exist; const searchBarWrapper = partnerNewsWrapper.shadowRoot.querySelector('.partner-cards-sidebar .search-wrapper');