From 06b0d59d5f5a6c696e798d65bfe437ebe30583f8 Mon Sep 17 00:00:00 2001
From: Nick Playfair <nick@playfair.dev>
Date: Sun, 7 Mar 2021 19:23:35 +0000
Subject: [PATCH] Refactor table code

Use array map instead of nest loops to generate table
---
 src/bom2table.js | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/bom2table.js b/src/bom2table.js
index a7f426b..1a97e3c 100644
--- a/src/bom2table.js
+++ b/src/bom2table.js
@@ -52,13 +52,21 @@ function getJSONParts(allParts) {
     }
   });
 
-  jsonParts['C'] = C;
-  jsonParts['R'] = R;
-  jsonParts['Q'] = Q;
+  jsonParts.C = C;
+  jsonParts.R = R;
+  jsonParts.Q = Q;
 
   return jsonParts;
 }
 
+// Format the HTML nicely and output to a pre code block
+function displayMarkup() {
+  const tableCode = document.querySelector('table').outerHTML;
+  const markup = document.getElementById('markup');
+  markup.innerText = beautify(tableCode);
+}
+
+// Table functions
 function clearTable() {
   document.querySelector('table').innerHTML = '';
 }
@@ -67,30 +75,26 @@ function generateTableHead(table, data) {
   const thead = table.createTHead();
   const row = thead.insertRow();
   // Populate Header row
-  for (const key of data) {
+  data.map((key) => {
     const th = document.createElement('th');
     const text = document.createTextNode(key);
     th.appendChild(text);
     row.appendChild(th);
-  }
+  });
 }
 
 function generateTableBody(table, data) {
-  for (const element of data) {
+  data.map((component) => {
     const row = table.insertRow();
-    for (const key in element) {
-      const cell = row.insertCell();
-      const text = document.createTextNode(element[key]);
-      cell.appendChild(text);
-    }
-  }
-}
-
-// Format the HTML nicely and output to a pre code block
-function displayMarkup() {
-  const tableCode = document.querySelector('table').outerHTML;
-  const markup = document.getElementById('markup');
-  markup.innerText = beautify(tableCode);
+    // Insert Part Name
+    const partName = row.insertCell();
+    const partNameText = document.createTextNode(component.Part);
+    partName.appendChild(partNameText);
+    // Insert Part Value
+    const partVal = row.insertCell();
+    const partValText = document.createTextNode(component.Value);
+    partVal.appendChild(partValText);
+  });
 }
 
 function makeTable(csvString) {
@@ -103,6 +107,7 @@ function makeTable(csvString) {
     .then((jsonObj) => {
       // Create array containing only relevant parts
       const parts = jsonObj.filter(isJunk);
+      console.log(parts);
       const table = document.querySelector('table');
       const headerData = Object.keys(parts[0]);
       generateTableBody(table, parts);
@@ -114,6 +119,7 @@ function makeTable(csvString) {
     });
 }
 
+// Create a JSON object for Contentful
 function makeJSON(csvString) {
   csv({
     delimiter: ';',
@@ -124,7 +130,7 @@ function makeJSON(csvString) {
     .then((res) => {
       const object = res.filter(isJunk);
 
-      const parts = getJSONParts(object)
+      const parts = getJSONParts(object);
 
       document.getElementById('jsonObject').innerText = JSON.stringify(
         parts,