569-new-section-carousel-first-full-layout

tools/actions/convert/test/fixtures/product-opco-home-converted.html

@@ -27,12 +27,14 @@ <h2>The world leader in microscopes and scientific instruments</h2>
           </div>
         </div>
       </div>
+      <hr>
       <h2>Product Categories</h2>
       <div class="product-category-list opco-home">
         <div>
           <div></div>
         </div>
       </div>
+      <hr>
       <div class="columns">
         <div>
           <div>

tools/actions/convert/test/fixtures/product1-converted.html

@@ -57,6 +57,7 @@ <h2>This is a tab with just the hero image</h2>
           </div>
         </div>
       </div>
+      <hr>
       <h2>Categories</h2>
       <div class="product-category-list">
         <div>
@@ -163,16 +164,24 @@ <h3>Sciex</h3>
           </div>
         </div>
       </div>
-      <div class="columns itemscenter">
+      <div class="section-metadata">
+        <div>
+          <div>style</div>
+          <div>bg-white</div>
+        </div>
+      </div>
+      <hr>
+      <div class="carousel">
         <div>
           <div>
-            <p><strong>PRODUCT SPOTLIGHT</strong></p>
+            <p>Leica Microsystems</p>
             <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="/us/en/products/family/intabio-zt-systems.html">Learn More</a></p>
+            <p><a href=""></a></p>
+            <p><a href="/us/en/blog.html">Learn More</a></p>
           </div>
           <div>
-            <img src="https://s7d9.scene7.com/is/image/danaherstage/inatbio-zt-circles" alt="Danaher Corporation">
+            <img src="https://author-dummy.adobeaemcloud.com/content/dam/danaher/products/sciex/zenotof-7600/sciex-zenotof-7600-external-product-hero.jpg" alt="hero">
           </div>
         </div>
       </div>

tools/actions/convert/test/fixtures/product1.html

@@ -667,7 +667,7 @@ <h2 class="text-gray-900 my-2 font-extrabold text-4xl pt-0 pb-0">Discover produc
 <div class="container-fullwidth aem-GridColumn aem-GridColumn--default--12">
 
 <fulllayout class="max-w-7xl mx-auto w-full">
-<div>
+<div class="bg-white">
     <div class="max-w-7xl mx-auto w-full px-2 sm:px-2 md:px-4 lg:px-4 xl:px-1 2xl:px-0">
         <div>
 
@@ -820,83 +820,16 @@ <h2 class="text-gray-900 my-2 font-extrabold text-4xl pt-0 pb-0">Discover produc
     </div>
   </div>
 </fulllayout></div>
-<div class="grid aem-GridColumn aem-GridColumn--default--12">
-
-<grid columns="2" itemscenter="true">
-    <template v-slot:col-one>
-
-
-
-
-
-
-    <div class="heading-aem">
-
-
-    <h1 class="text-gray-900 my-2 font-semibold text-xl pt-0 pb-0">PRODUCT SPOTLIGHT</h1>
-
-
+<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>
 </div>
 
-
 
-
-    <div class="featureimage">
-
-    <feature-image textwidth="_self" title="Intabio ZT System" titlesize="xxxl" titleheading="h2" description="&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>
-" descsize="txl" btntext="Learn More" btnhref="https://stage.lifesciences.danaher.com/us/en/products/family/intabio-zt-systems.html" btnnewtab="_self">
-    </feature-image>
-
 </div>
-
-
-</template>
-    <template v-slot:col-two>
-
-
-
-
-
-
-    <div class="imagetext">
-
-	<imagetext image="https://s7d9.scene7.com/is/image/danaherstage/inatbio-zt-circles">
-	</imagetext>
 </div>
 
 
-</template>
-    <template v-slot:col-three>
-
-
-
-
-</template>
-    <template v-slot:col-four>
-
-
-
-
-</template>
-    <template v-slot:col-five>
-
-
-
-
-</template>
-    <template v-slot:col-six>
-
-
-
-
-</template>
-</grid></div>
-
-
-</div>
-</div>
-
     <div class="footer experiencefragment">
 
 

tools/importer/transformers/callToAction.js

@@ -37,8 +37,6 @@ export const c2a = (cta, document) => {
       ['call-to-action'], [div],
     ];
     const block = WebImporter.DOMUtils.createTable(cells, document);
-    const fulllauoyt = ctaSection.closest('fulllayout');
-    if (fulllauoyt && fulllauoyt.querySelectorAll('*').length > 4 && fulllauoyt.querySelectorAll('*')[3].className === 'cta-section') ctaSection.append(document.createElement('hr'));
     cta.append(block);
   }
 };

tools/importer/transformers/cards.js

@@ -66,7 +66,6 @@ const createCards = (main, document) => {
     cells.push(...cards);
 
     if (cards.length > 0) {
-      fl.before(document.createElement('hr'));
       const block = WebImporter.DOMUtils.createTable(cells, document);
       fl.append(block);
     }

tools/importer/transformers/carousel.js

@@ -1,60 +1,68 @@
 /* global WebImporter */
-const createCarousel = (main, document) => {
-  const carousel = main.querySelector('home-carousel');
-  if (carousel) {
-    const cells = [];
-    // eslint-disable-next-line no-undef
-    const carouselLists = JSON.parse(decodeHtmlEntities(carousel.getAttribute('slidedata')));
-    cells.push(['carousel']);
-    const carousels = carouselLists.map((list) => {
-      const rightDiv = document.createElement('div');
-      const brandDiv = document.createElement('div');
-      brandDiv.textContent = list.brandText;
-      if (list.brandText) rightDiv.append(brandDiv);
-      const title = document.createElement('h2');
-      title.innerHTML = list.title;
-      if (list.title) rightDiv.append(title);
-      const description = document.createElement('p');
-      description.innerHTML = list.description;
-      if (list.description) rightDiv.append(description);
-      const btnText1 = list.btntitle1;
-      const btnhref1 = list.btn1path;
-      const rfqBtn1 = list.buttonRFQOne;
-      if (btnText1) {
-        const p1 = document.createElement('p');
-        const a1 = document.createElement('a');
-        a1.setAttribute('href', rfqBtn1 ? '#request-quote' : btnhref1);
-        a1.textContent = btnText1;
-        p1.append(a1);
-        rightDiv.append(p1);
-      }
-      const btnText2 = list.btntitle2;
-      const btnhref2 = list.btn2path;
-      const rfqBtn2 = list.buttonRFQTwo;
-      if (btnText2) {
-        const p2 = document.createElement('p');
-        const a2 = document.createElement('a');
-        a2.setAttribute('href', rfqBtn2 ? '#request-quote' : btnhref2);
-        a2.textContent = btnText2;
-        p2.append(a2);
-        rightDiv.append(p2);
-      }
+const getCarousel = (carousel, cells, document) => {
+  // eslint-disable-next-line no-undef
+  const carouselLists = JSON.parse(decodeHtmlEntities(carousel.getAttribute('slidedata')));
+  cells.push(['carousel']);
+  const slides = carouselLists.map((slide) => {
+    const rightDiv = document.createElement('div');
+    const brandDiv = document.createElement('div');
+    brandDiv.textContent = slide.brandText;
+    if (slide.brandText) rightDiv.append(brandDiv);
+    const title = document.createElement('h2');
+    title.innerHTML = slide.title;
+    if (slide.title) rightDiv.append(title);
+    const description = document.createElement('p');
+    description.innerHTML = slide.description;
+    if (slide.description) rightDiv.append(description);
+    const btnText1 = slide.btntitle1;
+    const btnhref1 = slide.btn1path;
+    const rfqBtn1 = slide.buttonRFQOne;
+    if (btnText1) {
+      const p1 = document.createElement('p');
+      const a1 = document.createElement('a');
+      a1.setAttribute('href', rfqBtn1 ? '#request-quote' : btnhref1);
+      a1.textContent = btnText1;
+      p1.append(a1);
+      rightDiv.append(p1);
+    }
+    const btnText2 = slide.btntitle2;
+    const btnhref2 = slide.btn2path;
+    const rfqBtn2 = slide.buttonRFQTwo;
+    if (btnText2) {
+      const p2 = document.createElement('p');
+      const a2 = document.createElement('a');
+      a2.setAttribute('href', rfqBtn2 ? '#request-quote' : btnhref2);
+      a2.textContent = btnText2;
+      p2.append(a2);
+      rightDiv.append(p2);
+    }
+
+    const leftDiv = document.createElement('div');
+    const img = document.createElement('img');
+    const altText = slide.imgalt;
+    img.setAttribute('src', slide.image);
+    if (altText) {
+      img.setAttribute('alt', altText);
+    } else {
+      img.setAttribute('alt', 'Danaher Corporation');
+    }
+    leftDiv.append(img);
+    return [rightDiv, leftDiv];
+  });
+  cells.push(...slides);
+};
 
-      const leftDiv = document.createElement('div');
-      const img = document.createElement('img');
-      const altText = list.imgalt;
-      img.setAttribute('src', list.image);
-      if (altText) {
-        img.setAttribute('alt', altText);
-      } else {
-        img.setAttribute('alt', 'Danaher Corporation');
-      }
-      leftDiv.append(img);
-      return [rightDiv, leftDiv];
+const createCarousel = (main, document) => {
+  const carousels = main.querySelectorAll('home-carousel');
+  if (carousels) {
+    carousels.forEach((carousel, i) => {
+      const cells = [];
+      getCarousel(carousel, cells, document);
+      const block = WebImporter.DOMUtils.createTable(cells, document);
+      carousel.append(block);
+      if (i === carousels.length - 1 && !carousel.parentNode.nextElementSibling) carousel.prepend(document.createElement('hr'));
+      else carousel.append(document.createElement('hr'));
     });
-    cells.push(...carousels);
-    const block = WebImporter.DOMUtils.createTable(cells, document);
-    carousel.append(block);
   }
 };
 

tools/importer/transformers/fullLayoutSection.js

@@ -1,15 +1,19 @@
 /* global WebImporter */
 const createFullLayoutSection = (main, document) => {
+  let styleIndex = 0;
   main.querySelectorAll('fulllayout').forEach((e, i, arr) => {
     const div = e.querySelector('div');
     const style = div.getAttribute('class');
     if (style) {
+      if (styleIndex === 0 && e.parentNode.previousElementSibling) e.prepend(document.createElement('hr'));
       const cells = [['Section Metadata'], ['style', style]];
       const table = WebImporter.DOMUtils.createTable(cells, document);
       e.after(table);
-      if ((arr.length === 1 || i < arr.length - 1) && !arr[arr.length - 1].querySelector('div.bg-danaherlightblue-50')?.querySelector('div.cta-section')) {
+      if ((arr.length === 1 || i < arr.length - 1)
+                  && !e.parentNode.nextElementSibling.className.includes('carousel')) {
         table.after(document.createElement('hr'));
       }
+      styleIndex += 1;
     }
   });
 };