Merge pull request #1218 from hlxsites/1217-home-page-to-ue

[UE] 1217 Updated for carousel for UE
hlxsites · Jul 22, 2024 · 7065972 · 7065972
2 parents 3666871 + 5dd32cb
commit 7065972
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 2 deletions.
diff --git a/component-definition.json b/component-definition.json
@@ -166,6 +166,36 @@
             }
           }
         },
+        {
+          "title": "Carousel",
+          "id": "carousel",
+          "plugins": {
+            "xwalk": {
+              "page": {
+                "resourceType": "core/franklin/components/block/v1/block",
+                "template": {
+                  "name": "Carousel",
+                  "filter": "carousel"
+                }
+              }
+            }
+          }
+        },
+        {
+          "title": "Carousel Item",
+          "id": "carousel-item",
+          "plugins": {
+            "xwalk": {
+              "page": {
+                "resourceType": "core/franklin/components/block/v1/block/item",
+                "template": {
+                  "name": "Carousel Item",
+                  "model": "carousel-item"
+                }
+              }
+            }
+          }
+        },
         {
           "title": "Recent Articles",
           "id": "recent-articles",

diff --git a/component-filters.json b/component-filters.json
@@ -30,12 +30,20 @@
       "takeway",
       "call-to-action",
       "accordion",
-      "recent-articles"
+      "recent-articles",
+      "carousel"
     ]
   },
   {
     "id": "accordion",
     "components": [
       "accordion-item"
     ]
-  }]
+  },
+  {
+    "id": "carousel",
+    "components": [
+      "carousel-item"
+    ]
+  }
+]
diff --git a/component-models.json b/component-models.json
@@ -373,6 +373,100 @@
       }
     ]
   },
+  {
+    "id": "carousel-item",
+    "fields": [
+      {
+        "component": "text",
+        "valueType": "string",
+        "name": "content_brand",
+        "value": "",
+        "label": "Brand"
+      },
+      {
+        "component": "text",
+        "valueType": "string",
+        "name": "content_title",
+        "value": "",
+        "label": "Title"
+      },
+      {
+        "component": "select",
+        "name": "content_titleType",
+        "value": "h1",
+        "label": "Type",
+        "valueType": "string",
+        "options": [
+          {
+            "name": "h1",
+            "value": "h1"
+          },
+          {
+            "name": "h2",
+            "value": "h2"
+          },
+          {
+            "name": "h3",
+            "value": "h3"
+          },
+          {
+            "name": "h4",
+            "value": "h4"
+          },
+          {
+            "name": "h5",
+            "value": "h5"
+          },
+          {
+            "name": "h6",
+            "value": "h6"
+          }
+        ]
+      },
+      {
+        "component": "richtext",
+        "valueType": "string",
+        "name": "content_description",
+        "value": "",
+        "label": "Description"
+      },
+      {
+        "component": "aem-content",
+        "valueType": "string",
+        "name": "content_button1",
+        "value": "",
+        "label": "Button Link"
+      },
+      {
+        "component": "text",
+        "valueType": "string",
+        "name": "content_button1Text",
+        "value": "",
+        "label": "Button Text"
+      },
+      {
+        "component": "aem-content",
+        "valueType": "string",
+        "name": "content_button2",
+        "value": "",
+        "label": "Button Link"
+      },
+      {
+        "component": "text",
+        "valueType": "string",
+        "name": "content_button2Text",
+        "value": "",
+        "label": "Button Text"
+      },
+      {
+        "component": "reference",
+        "valueType": "string",
+        "name": "fileReference",
+        "label": "Image",
+        "multi": false
+      }
+    ]
+  },
   {
     "id": "recent-articles",
     "fields": []

diff --git a/tools/actions/convert/src/index.js b/tools/actions/convert/src/index.js
@@ -103,6 +103,7 @@ function skipConverter(path) {
   // TODO: remove the logic for test pages (with -jck1 in the path)
   if (!path) return false;
   if (path.includes('-jck1')) return true;
+  if (path.includes('/en-new')) return true;
   // skip the converter for pages like **/products/*/topics/**
   const regex = /\/[^/]+\/[^/]+\/products\/[^/]+\/topics-jck1\/[^/]+/;
   return regex.test(path);