From 688d86afd35e475a86ce9fe2a372819c8918e37c Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 19 Jun 2024 16:35:39 -0500 Subject: [PATCH] Website: update automatic formatting of osquery schema table examples (#19881) Closes: #19750 Changes: - Updated osquery table schema pages to preserve whitespace and newlines in multi-line examples. --- .../assets/js/pages/osquery-table-details.page.js | 13 ++++++++----- .../assets/styles/pages/osquery-table-details.less | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/website/assets/js/pages/osquery-table-details.page.js b/website/assets/js/pages/osquery-table-details.page.js index e75762dfa8..4897b68ccc 100644 --- a/website/assets/js/pages/osquery-table-details.page.js +++ b/website/assets/js/pages/osquery-table-details.page.js @@ -90,11 +90,14 @@ parasails.registerPage('osquery-table-details', { $(block).html(replacementHMTL); // After we've highlighted our keywords, we'll highlight the rest of the codeblock window.hljs.highlightElement(block); - }); - // Adding [purpose="line-break"] to SQL keywords if they are one of: SELECT, WHERE, FROM, JOIN. (case-insensitive) - $('.hljs-keyword').each((i, el)=>{ - for(i in el.innerText.match(/select|where|from|join/gi)) { - $(el).attr({'purpose':'line-break'}); + // If this example is a single-line, we'll do some basic formatting to make it more human-readable. + if(!$(block)[0].innerText.match(/\n/gmi)){ + // Adding [purpose="line-break"] to SQL keywords if they are one of: SELECT, WHERE, FROM, JOIN. (case-insensitive) + $('.hljs-keyword').each((i, el)=>{ + for(i in el.innerText.match(/select|where|from|join/gi)) { + $(el).attr({'purpose':'line-break'}); + } + }); } }); })(); diff --git a/website/assets/styles/pages/osquery-table-details.less b/website/assets/styles/pages/osquery-table-details.less index 803c75a0d1..39befd5dc1 100644 --- a/website/assets/styles/pages/osquery-table-details.less +++ b/website/assets/styles/pages/osquery-table-details.less @@ -294,7 +294,6 @@ background-color: @ui-off-white; border: none; word-break: break-word; - white-space-collapse: collapse; text-wrap: wrap; padding: 0; font-size: 13px;