From 8a00dbe89646439abfa69970f432c934133776fc Mon Sep 17 00:00:00 2001
From: Sonja Popovic <cod55010@adobe.com>
Date: Fri, 8 Nov 2024 16:59:56 +0100
Subject: [PATCH 1/4] MWPW-161560-fixes according to design, fixes file type
 icons based on opensearch values

---
 edsdme/blocks/search/SearchCards.js          | 4 ++--
 edsdme/components/PartnerCardsStyles.js      | 5 +++++
 edsdme/components/SearchCard.js              | 2 +-
 edsdme/img/icons/{xlsx.svg => excel.svg}     | 0
 edsdme/img/icons/{img.svg => image.svg}      | 0
 edsdme/img/icons/{ppt.svg => powerpoint.svg} | 0
 edsdme/img/icons/{m4v.svg => video.svg}      | 0
 7 files changed, 8 insertions(+), 3 deletions(-)
 rename edsdme/img/icons/{xlsx.svg => excel.svg} (100%)
 rename edsdme/img/icons/{img.svg => image.svg} (100%)
 rename edsdme/img/icons/{ppt.svg => powerpoint.svg} (100%)
 rename edsdme/img/icons/{m4v.svg => video.svg} (100%)

diff --git a/edsdme/blocks/search/SearchCards.js b/edsdme/blocks/search/SearchCards.js
index 0f5b639..bf5225a 100644
--- a/edsdme/blocks/search/SearchCards.js
+++ b/edsdme/blocks/search/SearchCards.js
@@ -333,7 +333,7 @@ export default class Search extends PartnerCards {
             ${!this.mobileView
               ? html`
                 <div class="sidebar-header">
-                  <h3 class="sidebar-title">${this.blockData.localizedText['{{filter}}']}</h3>
+                  <h3 class="sidebar-title">${this.blockData.localizedText['{{filters}}']}</h3>
                   <button class="sidebar-clear-btn" @click="${this.handleResetActions}" aria-label="${this.blockData.localizedText['{{clear-all}}']}">${this.blockData.localizedText['{{clear-all}}']}</button>
                 </div>
                 <div class="sidebar-chosen-filters-wrapper">
@@ -405,7 +405,7 @@ export default class Search extends PartnerCards {
             ? html`
               <div class="pagination-wrapper ${this.blockData?.pagination === 'load-more' ? 'pagination-wrapper-load-more' : 'pagination-wrapper-default'}">
                 ${this.pagination}
-                <span class="pagination-total-results">${this.cardsCounter} ${this.blockData.localizedText['{{of}}']} ${this.selectedTypeCount()} ${this.blockData.localizedText['{{results}}']}</span>
+                <span class="pagination-total-results">${this.cardsCounter} <span>${this.blockData.localizedText['{{of}}']} ${this.selectedTypeCount()} ${this.blockData.localizedText['{{results}}']}</span></span>
               </div>
             `
             : ''
diff --git a/edsdme/components/PartnerCardsStyles.js b/edsdme/components/PartnerCardsStyles.js
index 09e4832..fd477e7 100644
--- a/edsdme/components/PartnerCardsStyles.js
+++ b/edsdme/components/PartnerCardsStyles.js
@@ -542,6 +542,11 @@ export const partnerCardsStyles = css`
     font-weight: 700;
     text-transform: lowercase;
   }
+
+  .pagination-wrapper .pagination-total-results span {
+    font-weight: 500;
+    text-transform: lowercase;
+  }
   
   @media screen and (max-width: 1200px) {
     .pagination-wrapper .pagination-total-results {
diff --git a/edsdme/components/SearchCard.js b/edsdme/components/SearchCard.js
index bdc58c5..a1fdfad 100644
--- a/edsdme/components/SearchCard.js
+++ b/edsdme/components/SearchCard.js
@@ -57,7 +57,7 @@ class SearchCard extends LitElement {
           <div class="card-icons">
             <sp-theme theme="spectrum" color="light" scale="medium">
               <sp-action-button ?disabled=${this.isDownloadDisabled(this.data.contentArea?.type)} href="${this.setDownloadParam(this.data.contentArea?.url)}" download="${this.data.contentArea?.title}" aria-label="${this.localizedText['{{download}}']}"><sp-icon-download /></sp-action-button>
-              ${this.data.contentArea?.type === 'pdf'
+              ${this.data.contentArea?.type !== 'zip'
                 ? html`<sp-action-button href="${this.data.contentArea?.url}" target="_blank" aria-label="${this.localizedText['{{open-in}}']}"><sp-icon-open-in /></sp-action-button>`
                 : html`<sp-action-button disabled selected aria-label="${this.localizedText['{{open-in-disabled}}']}"><sp-icon-open-in /></sp-action-button>`
               }
diff --git a/edsdme/img/icons/xlsx.svg b/edsdme/img/icons/excel.svg
similarity index 100%
rename from edsdme/img/icons/xlsx.svg
rename to edsdme/img/icons/excel.svg
diff --git a/edsdme/img/icons/img.svg b/edsdme/img/icons/image.svg
similarity index 100%
rename from edsdme/img/icons/img.svg
rename to edsdme/img/icons/image.svg
diff --git a/edsdme/img/icons/ppt.svg b/edsdme/img/icons/powerpoint.svg
similarity index 100%
rename from edsdme/img/icons/ppt.svg
rename to edsdme/img/icons/powerpoint.svg
diff --git a/edsdme/img/icons/m4v.svg b/edsdme/img/icons/video.svg
similarity index 100%
rename from edsdme/img/icons/m4v.svg
rename to edsdme/img/icons/video.svg

From b33ce69cce9a055e7c52ad48d3ec7ec4d282d910 Mon Sep 17 00:00:00 2001
From: Sonja Popovic <cod55010@adobe.com>
Date: Fri, 8 Nov 2024 17:07:25 +0100
Subject: [PATCH 2/4] MWPW-161560-remove duplicted rule

---
 edsdme/components/PartnerCardsStyles.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/edsdme/components/PartnerCardsStyles.js b/edsdme/components/PartnerCardsStyles.js
index fd477e7..7bf81c8 100644
--- a/edsdme/components/PartnerCardsStyles.js
+++ b/edsdme/components/PartnerCardsStyles.js
@@ -545,7 +545,6 @@ export const partnerCardsStyles = css`
 
   .pagination-wrapper .pagination-total-results span {
     font-weight: 500;
-    text-transform: lowercase;
   }
   
   @media screen and (max-width: 1200px) {

From 7c4db9699e761544d9c8d1f6e05a6cc986817ef5 Mon Sep 17 00:00:00 2001
From: Sonja Popovic <cod55010@adobe.com>
Date: Fri, 8 Nov 2024 17:46:20 +0100
Subject: [PATCH 3/4] MWPW-161905-use correct counter for mobile view(total
 count)

---
 edsdme/blocks/search/SearchCards.js | 8 ++++----
 edsdme/components/PartnerCards.js   | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/edsdme/blocks/search/SearchCards.js b/edsdme/blocks/search/SearchCards.js
index bf5225a..fdf9713 100644
--- a/edsdme/blocks/search/SearchCards.js
+++ b/edsdme/blocks/search/SearchCards.js
@@ -238,7 +238,7 @@ export default class Search extends PartnerCards {
   }
 
   getPageNumArray() {
-    const countAll = this.selectedTypeCount();
+    const countAll = this.getTotalResults();
     const numberOfPages = Math.ceil(countAll / this.cardsPerPage);
     this.totalPages = numberOfPages;
     // eslint-disable-next-line consistent-return
@@ -247,7 +247,7 @@ export default class Search extends PartnerCards {
 
   get cardsCounter() {
     const startIndex = (this.paginationCounter - 1) * this.cardsPerPage;
-    const countAll = this.selectedTypeCount();
+    const countAll = this.getTotalResults();
     const endIndex = startIndex + this.cardsPerPage;
     const lastCardIndex = countAll < endIndex
       ? countAll : endIndex;
@@ -256,7 +256,7 @@ export default class Search extends PartnerCards {
     return `${startIndex + 1} - ${lastCardIndex}`;
   }
 
-  selectedTypeCount() {
+  getTotalResults() {
     let countAll;
     switch (this.contentType) {
       case 'page':
@@ -405,7 +405,7 @@ export default class Search extends PartnerCards {
             ? html`
               <div class="pagination-wrapper ${this.blockData?.pagination === 'load-more' ? 'pagination-wrapper-load-more' : 'pagination-wrapper-default'}">
                 ${this.pagination}
-                <span class="pagination-total-results">${this.cardsCounter} <span>${this.blockData.localizedText['{{of}}']} ${this.selectedTypeCount()} ${this.blockData.localizedText['{{results}}']}</span></span>
+                <span class="pagination-total-results">${this.cardsCounter} <span>${this.blockData.localizedText['{{of}}']} ${this.getTotalResults()} ${this.blockData.localizedText['{{results}}']}</span></span>
               </div>
             `
             : ''
diff --git a/edsdme/components/PartnerCards.js b/edsdme/components/PartnerCards.js
index 0251f7e..d5943dd 100644
--- a/edsdme/components/PartnerCards.js
+++ b/edsdme/components/PartnerCards.js
@@ -343,6 +343,10 @@ export default class PartnerCards extends LitElement {
     )}`;
   }
 
+  getTotalResults() {
+    return this.cards?.length;
+  }
+
   get filtersMobile() {
     if (!this.blockData.filters.length) return;
 
@@ -381,7 +385,7 @@ export default class PartnerCards extends LitElement {
               </ul>
               <div class="filter-footer-mobile-wrapper">
                 <div class="filter-footer-mobile">
-                  <span class="filter-footer-results-mobile">${this.cards?.length} ${this.blockData.localizedText['{{results}}']}</span>
+                  <span class="filter-footer-results-mobile">${this.getTotalResults()} ${this.blockData.localizedText['{{results}}']}</span>
                   <div class="filter-footer-buttons-mobile">
                     <button class="filter-footer-clear-btn-mobile" @click="${() => this.handleResetTags(filter.key)}" aria-label="${this.blockData.localizedText['{{clear-all}}']}">${this.blockData.localizedText['{{clear-all}}']}</button>
                     <sp-theme theme="spectrum" color="light" scale="medium">

From 720addae174b06fa81bb97371b6fe79cc85be6db Mon Sep 17 00:00:00 2001
From: Sonja Popovic <cod55010@adobe.com>
Date: Fri, 8 Nov 2024 17:48:16 +0100
Subject: [PATCH 4/4] MWPW-161905-use correct counter for mobile view(total
 count)

---
 edsdme/blocks/search/SearchCards.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edsdme/blocks/search/SearchCards.js b/edsdme/blocks/search/SearchCards.js
index fdf9713..45aec6f 100644
--- a/edsdme/blocks/search/SearchCards.js
+++ b/edsdme/blocks/search/SearchCards.js
@@ -425,7 +425,7 @@ export default class Search extends PartnerCards {
               ${this.filtersMobile}
             </div>
             <div class="all-filters-footer-mobile">
-              <span class="all-filters-footer-results-mobile">${this.cards?.length} ${this.blockData.localizedText['{{results}}']}</span>
+              <span class="all-filters-footer-results-mobile">${this.getTotalResults()} ${this.blockData.localizedText['{{results}}']}</span>
               <div class="all-filters-footer-buttons-mobile">
                 <button class="all-filters-footer-clear-btn-mobile" @click="${this.handleResetActions}" aria-label="${this.blockData.localizedText['{{clear-all}}']}">${this.blockData.localizedText['{{clear-all}}']}</button>
                 <sp-theme theme="spectrum" color="light" scale="medium">