bugfixy highlight + batchid v dttbls

This commit is contained in:
David Brazda
2023-10-19 20:54:30 +02:00
parent 9bd4a84d2a
commit d5ebfee762
11 changed files with 14039 additions and 50 deletions

View File

@@ -969,14 +969,14 @@ function display_log(iterLogList, timestamp) {
hdr = logLine.time + " " + logLine.event + ' - '+ (logLine.message == undefined ? "" : logLine.message)
hdr = Prism.highlight(hdr, Prism.languages.log, 'log');
row = '<div data-bs-toggle="collapse" class="'+ highlighted + ' shj-lang-log" onclick="set_timestamp(' + logLine.time + ')" data-bs-target="#rec'+logcnt+'">'
row = '<div data-bs-toggle="collapse" class="'+ highlighted + '" onclick="set_timestamp(' + logLine.time + ')" data-bs-target="#rec'+logcnt+'">'
+hdr + '</div>'
str_row = JSON.stringify(logLine.details, null, 2)
//row_detail = '<div id="rec'+logcnt+'" data-toggle="collapse" data-target="#rec'+logcnt+'"class="collapse pidi"><pre>' + str_row + '</pre></div>'
const html = Prism.highlight(str_row, Prism.languages.json, 'json');
//console.log("tady", html)
row_detail = '<div id="rec'+logcnt+'" class="collapse pidi shj-lang-log"><pre><code class="language-log">' + html + '</code></pre></div>'
row_detail = '<div id="rec'+logcnt+'" class="collapse pidi"><pre><code class="language-log">' + html + '</code></pre></div>'
var lines = document.getElementById('lines')
var line = document.createElement('div')

View File

@@ -614,12 +614,14 @@ var archiveRecords =
{data: 'end_positions', visible: true},
{data: 'end_positions_avgp', visible: true},
{data: 'metrics', visible: true},
{data: 'batch_id', visible: true},
],
paging: false,
processing: false,
columnDefs: [{
targets: [0,1],
targets: [0,1,17],
render: function ( data, type, row ) {
if (!data) return data
return '<div class="tdnowrap" title="'+data+'">'+data+'</i>'
},
},
@@ -695,11 +697,12 @@ var archiveRecords =
{
targets: [16],
render: function ( data, type, row ) {
//console.log("metrics", data)
try {
data = JSON.parse(data)
}
catch (error) {
//console.log(error)
}
var res = JSON.stringify(data)
var unquoted = res.replace(/"([^"]+)":/g, '$1:')

File diff suppressed because one or more lines are too long

View File

@@ -24,7 +24,7 @@ Prism.languages.log = {
'level': [
{
pattern: /\b(?:ALERT|CRIT|CRITICAL|EMERG|EMERGENCY|ERR|ERROR|FAILURE|FATAL|SEVERE|-----)\b/,
pattern: /\b(?:ALERT|CRIT|CRITICAL|EMERG|EMERGENCY|ERR|ERROR|FAILURE|FATAL|SEVERE|CONF|-----)\b/,
alias: ['error', 'important']
},
{
@@ -36,7 +36,7 @@ Prism.languages.log = {
alias: ['info', 'keyword']
},
{
pattern: /\b(?:DBG|DEBUG|FINE|REVERSE|ADD|EXITADD|SIGNAL)\b/,
pattern: /\b(?:DBG|DEBUG|FINE|REVERSE|ADD|EXITADD|SIGNAL|PRECOND)\b/,
alias: ['debug', 'keyword']
},
{

View File

@@ -51,7 +51,7 @@ pre[class*=language-] {
}
.token.boolean {
color: #c39375;
color: #7c7630;
}
.token.function {
@@ -63,15 +63,21 @@ pre[class*=language-] {
}
.token.class-name,.token.constant,.token.property,.token.symbol {
color: #f29599;
color: #ae4b86;
}
.token.atrule,.token.builtin,.token.important,.token.selector {
.token.atrule,.token.builtin,.token.selector {
color: #cc99cd
}
.token.important{
color: #be6db7
/* color: #82b3b0 */
}
.token.keyword{
color: #9d8c98
color: #ca7474
/* color: #9d8c98 */
}
.token.attr-value,.token.char,.token.regex,.token.string,.token.variable {

View File

@@ -61,6 +61,7 @@ function initialize_statusheader() {
var rows = 2;
var columns = 4;
console.log("initialiting statusheader")
console.log(JSON.stringify(statusBarConfig))
// Create the grid table
@@ -262,7 +263,8 @@ function initialize_chart() {
layout: {
background: {
type: 'solid',
color: '#2a2e39',
// color: '#2a2e39',
color: '#151824'
},
textColor: '#d1d4dc',
},