style(es6): eslint prefer-template

haraka · Dec 13, 2023 · c1c47cf · c1c47cf
1 parent dd9055e
commit c1c47cf
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/index.js b/index.js
@@ -70,7 +70,7 @@ exports.get_logs = function (req, res) {
   // spawning a grep process is quite a lot faster than fs.read
   // (yes, I benchmarked it)
   exports.grepWithShell(log, uuid, function (err, matched) {
-    if (err) return res.send('<p>' + err + '</p>');
+    if (err) return res.send(`<p>${err}</p>`);
 
     exports.asHtml(uuid, matched, function (html) {
       res.send(html);
@@ -127,7 +127,7 @@ exports.asHtml = function (uuid, matched, done) {
     if (uuidMatch && uuidMatch[1]) {
       transId = uuidMatch[1].match(/\.([0-9]{1,2})$/);
     }
-    if (transId && transId[1]) replaceString = '[' + transId[1] + '] ';
+    if (transId && transId[1]) replaceString = `[${transId[1]}] `;
 
     let trimmed = line
       .replace(/\[[A-F0-9\-.]{12,40}\] /, replaceString)  // UUID
@@ -141,7 +141,7 @@ exports.asHtml = function (uuid, matched, done) {
       trimmed = trimmed.replace(/(?: [a-z.-]+)? haraka: /, ' ');
     }
 
-    rawLogs += trimmed + '<br>';
+    rawLogs += `${trimmed}<br>`;
     if (/\[karma/.test(line) && /awards/.test(line)) {
       lastKarmaLine = line;
     }
@@ -154,13 +154,13 @@ exports.asHtml = function (uuid, matched, done) {
   }
 
   done(
-    htmlHead() +
+    `${htmlHead() +
     htmlBody(
       `for connection ${uuid} on ${monthDay}`,
       getAwards(awardNums).join(''),
       getResolutions(awardNums).join('')
     ) +
-    rawLogs + '</pre></div></body></html>'
+    rawLogs}</pre></div></body></html>`
   );
 }
 
@@ -190,13 +190,12 @@ function getAwards (awardNums) {
 
   const listItems = [];
   awards.sort(sortByAward).forEach(function (a) {
-    const start = '<li> ' + a.award + ',  ';
+    const start = `<li> ${a.award},  `;
     if (a.reason) {
-      listItems.push(start + a.reason + ' (' + a.value + ')</li>');
+      listItems.push(`${start + a.reason} (${a.value})</li>`);
       return;
     }
-    listItems.push(start + a.pi_name + ' ' + a.property +
-                ' ' + a.value + '</li>');
+    listItems.push(`${start + a.pi_name} ${a.property} ${a.value}</li>`);
   });
   return listItems;
 }
@@ -216,7 +215,7 @@ function getResolutions (awardNums) {
     if (!a.resolution) return;
     if (resolutionSeen[a.resolution]) return;
     resolutionSeen[a.resolution] = true;
-    listItems.push('<li>' + a.resolution + '</li>');
+    listItems.push(`<li>${a.resolution}</li>`);
   });
   return listItems;
 }
@@ -248,19 +247,19 @@ function htmlBody (uuid, awards, resolve) {
         your IT helpdesk or Systems Administrator and ask them for help.</p>';
 
   if (awards) {
-    str += '<hr><h3>Policy Rules Matched</h3> \
-        <ul>' + awards + '</ul>';
+    str += `<hr><h3>Policy Rules Matched</h3> \
+        <ul>${awards}</ul>`;
   }
 
   if (resolve) {
-    str += '<hr><h3>Steps to Resolve</h3> \
-        <ul>' + resolve + '</ul>';
+    str += `<hr><h3>Steps to Resolve</h3> \
+        <ul>${resolve}</ul>`;
   }
 
-  str += '<hr> \
+  str += `<hr> \
         <h3>Raw Logs</h3> \
-        <p>' + uuid + '</p> \
+        <p>${uuid}</p> \
         <pre> \
-        \n';
+        \n`;
   return str;
 }