Cleaner dev structure

qld-gov-au · Sep 11, 2024 · 38084b9 · 38084b9
1 parent bf859b9
commit 38084b9
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 64 deletions.
diff --git a/src/breadcrumbs/main.cjs b/src/breadcrumbs/main.cjs
@@ -3,60 +3,31 @@
  * Common js module to support DXP Component Service.
  */
 module.exports = async function (input, info) {
-  const getBreadcrumbData = function () {
-    let breadcrumbHtml = "";
-    const navData = [
-      {
-        link: "#",
-        linktext: "Home",
-      },
-      {
-        link: "#",
-        linktext: "Topic 01",
-      },
-      {
-        link: "#",
-        linktext: "Topic 02",
-      },
-      {
-        link: "#",
-        linktext: "Topic 03",
-      },
-      {
-        link: "#",
-        linktext: "Current page",
-      },
-    ];
-    const breadcrumbLength = Number(navData.length);
-
-    for (const navItems in navData) {
-      if (Number(navItems) + 1 < breadcrumbLength) {
-        breadcrumbHtml += `<li class="breadcrumb-item">
-                            <a href="${navData[navItems].link}">
-                              ${navData[navItems].linktext}                      
-                            </a>
-                          </li>`;
-      } else {
-        breadcrumbHtml += `<li class="breadcrumb-item active" aria-current="page" data-href="${navData[navItems].link}">                  
-                            ${navData[navItems].linktext}
-                          </li>`;
-      }
-    }
-
-    return breadcrumbHtml;
-  };
+  const itemLength = input.breadcrumbs.length;
+  const items = input.breadcrumbs
+    .map(
+      (item, i) => `
+      <li class="breadcrumb-item">
+        ${i + 1 < itemLength ? `<a href="${item.link}">` : ""}
+          ${item.linktext}
+        ${i + 1 < itemLength ? `</a>` : ""}
+      </li>
+    `
+    )
+    .join("");
   return `
-          <div class="container-fluid ${input.colour}">
-            <div class="container">
-              <div class="row">
-                <div class="container-xl">
-                  <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb">
-                      ${getBreadcrumbData()}
-                    </ol>
-                  </nav>
-                </div>
-              </div>
+      <div class="container-fluid ${input.brandOverride ? input.brandOverride : ""}">
+        <div class="container">
+          <div class="row">
+            <div class="container-xl">
+              <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                  ${items}
+                </ol>
+              </nav>
             </div>
-          </div>`;
+          </div>
+        </div>
+      </div>
+    `;
 };
diff --git a/src/breadcrumbs/manifest.json b/src/breadcrumbs/manifest.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://localhost:3000/schemas/v1.json#",
-  "version": "1.0.1",
+  "version": "1.0.17",
   "name": "breadcrumbs",
   "displayName": "Breadcrumbs Component",
   "description": "QGDS Bootstrap 5 - Breadcrumbs Component",
@@ -16,11 +16,29 @@
       "input": {
         "type": "object",
         "properties": {
-          "colour": {
-            "type": "string"
+          "brandOverride": {
+            "title": "brand override",
+            "type": "string",
+            "enum": ["", "light", "dark", "alt", "dark-alt"]
+          },
+          "breadcrumbs": {
+            "title": "Breadchrumb items array",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "link": {
+                  "type": "string"
+                },
+                "linktext": {
+                  "type": "string"
+                }
+              },
+              "required": ["link", "linktext"]
+            }
           }
         },
-        "required": []
+        "required": ["breadcrumbs"]
       },
       "output": {
         "responseType": "html",

diff --git a/src/breadcrumbs/previews/example.data.json b/src/breadcrumbs/previews/example.data.json
@@ -1,3 +1,29 @@
 {
-  "colour": " alt"
+  "brandOverride": "alt",
+  "breadcrumbs": [
+    {
+      "link": "#",
+      "linktext": "For government"
+    },
+    {
+      "link": "#",
+      "linktext": "Information and communication technology"
+    },
+    {
+      "link": "#",
+      "linktext": "Communication and publishing"
+    },
+    {
+      "link": "#",
+      "linktext": "Website and digital publishing"
+    },
+    {
+      "link": "#",
+      "linktext": "Website standards, guidelines and templates"
+    },
+    {
+      "link": "#",
+      "linktext": "Single Website Experience"
+    }
+  ]
 }
diff --git a/src/breadcrumbs/previews/preview.html b/src/breadcrumbs/previews/preview.html
@@ -2,11 +2,6 @@
 
 <head>
   [component://static-header]
-  <!-- <link rel="stylesheet"
-    href="https://www.forgov.qld.gov.au/__data/assets/git_bridge/0030/498603/assets/css/qld.bootstrap.css">
-  <link rel="stylesheet"
-    href="https://www.forgov.qld.gov.au/__data/assets/css_file_folder/0029/499142/QGDS-forgov-shim.css"> -->
-
 </head>
 
 <body>