Merge branch 'main' into 503-implement-carousel-ui-block

hlxsites · Dec 15, 2023 · c7cc8b9 · c7cc8b9
2 parents 9cfd439 + 73388b6
commit c7cc8b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/tools/actions/convert/test/fixtures/product1-converted.html b/tools/actions/convert/test/fixtures/product1-converted.html
@@ -172,7 +172,7 @@ <h3>Sciex</h3>
             <h2>Intabio ZT System</h2>
             <p>Comprehensive charge variant analysis made simple. The Intabio ZT system couples icIEF separation and UV detection with high resolution mass spectrometry on the ZenoTOF 7600 system</p>
             <p><a href=""></a></p>
-            <p><a href="/us/en/blog.html">Learn More</a></p>
+            <p><a href="/us/en/blog.html" title="link">Learn More</a></p>
           </div>
           <div>
             <img src="https://author-dummy.adobeaemcloud.com/content/dam/danaher/products/sciex/zenotof-7600/sciex-zenotof-7600-external-product-hero.jpg" alt="hero">

diff --git a/tools/actions/convert/test/fixtures/product1.html b/tools/actions/convert/test/fixtures/product1.html
@@ -820,7 +820,7 @@ <h2 class="text-gray-900 my-2 font-extrabold text-4xl pt-0 pb-0">Discover produc
 </fulllayout></div>
 <div class="carousel aem-GridColumn aem-GridColumn--default--12">
 
-    <home-carousel slidedata="[{&#34;title&#34;:&#34;&lt;p>Intabio ZT System&lt;/p>\r\n&#34;,&#34;description&#34;:&#34;&lt;p>Comprehensive charge variant analysis made simple. The Intabio ZT system couples icIEF separation and UV detection with high resolution mass spectrometry on the ZenoTOF 7600 system&lt;/p>\r\n&lt;p>&lt;a> &lt;/a>&lt;/p>\r\n&#34;,&#34;image&#34;:&#34;/content/dam/danaher/products/sciex/zenotof-7600/sciex-zenotof-7600-external-product-hero.jpg&#34;,&#34;imgalt&#34;:&#34;hero&#34;,&#34;btntitle1&#34;:&#34;Learn More&#34;,&#34;btn1path&#34;:&#34;https://stage.lifesciences.danaher.com/content/danaher/ls/us/en/blog.html&#34;,&#34;btntitle2&#34;:null,&#34;btn2path&#34;:null,&#34;buttonRFQOne&#34;:null,&#34;buttonRFQTwo&#34;:null,&#34;buttonColorOne&#34;:null,&#34;buttonColorTwo&#34;:null,&#34;newTabOne&#34;:&#34;_self&#34;,&#34;newTabTwo&#34;:&#34;_self&#34;,&#34;brandText&#34;:&#34;Leica Microsystems&#34;}]" bgcolor="purple-dark" autoplay="true" duration="3000" speed="3000" pauseonhover="true"></home-carousel>
+    <home-carousel slidedata="[{&#34;title&#34;:&#34;&lt;p>Intabio ZT System&lt;/p>\r\n&#34;,&#34;description&#34;:&#34;&lt;p>Comprehensive charge variant analysis made simple. The Intabio ZT system couples icIEF separation and UV detection with high resolution mass spectrometry on the ZenoTOF 7600 system&lt;/p>\r\n&lt;p>&lt;a> &lt;/a>&lt;/p>\r\n&#34;,&#34;image&#34;:&#34;/content/dam/danaher/products/sciex/zenotof-7600/sciex-zenotof-7600-external-product-hero.jpg&#34;,&#34;imgalt&#34;:&#34;hero&#34;,&#34;appearLink1&#34;:&#34;true&#34;,&#34;btntitle1&#34;:&#34;Learn More&#34;,&#34;btn1path&#34;:&#34;https://stage.lifesciences.danaher.com/content/danaher/ls/us/en/blog.html&#34;,&#34;btntitle2&#34;:null,&#34;btn2path&#34;:null,&#34;buttonRFQOne&#34;:null,&#34;buttonRFQTwo&#34;:null,&#34;buttonColorOne&#34;:null,&#34;buttonColorTwo&#34;:null,&#34;newTabOne&#34;:&#34;_self&#34;,&#34;newTabTwo&#34;:&#34;_self&#34;,&#34;brandText&#34;:&#34;Leica Microsystems&#34;}]" bgcolor="purple-dark" autoplay="true" duration="3000" speed="3000" pauseonhover="true"></home-carousel>
 </div>
 
 

diff --git a/tools/importer/transformers/carousel.js b/tools/importer/transformers/carousel.js
@@ -17,9 +17,11 @@ const getCarousel = (carousel, cells, document) => {
     const btnText1 = slide.btntitle1;
     const btnhref1 = slide.btn1path;
     const rfqBtn1 = slide.buttonRFQOne;
+    const asLink1 = slide.appearLink1;
     if (btnText1) {
       const p1 = document.createElement('p');
       const a1 = document.createElement('a');
+      if (asLink1) a1.title = 'link';
       a1.setAttribute('href', rfqBtn1 ? '#request-quote' : btnhref1);
       a1.textContent = btnText1;
       p1.append(a1);
@@ -28,9 +30,11 @@ const getCarousel = (carousel, cells, document) => {
     const btnText2 = slide.btntitle2;
     const btnhref2 = slide.btn2path;
     const rfqBtn2 = slide.buttonRFQTwo;
+    const asLink2 = slide.appearLink2;
     if (btnText2) {
       const p2 = document.createElement('p');
       const a2 = document.createElement('a');
+      if (asLink2) a2.title = 'link';
       a2.setAttribute('href', rfqBtn2 ? '#request-quote' : btnhref2);
       a2.textContent = btnText2;
       p2.append(a2);