Skip to content

Commit 3efb981

Browse files
committed
fix empty value in rule and fix some styling
Signed-off-by: Markus Blaschke <[email protected]>
1 parent b6c1a7c commit 3efb981

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

templates/report.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,14 @@ h3 { font-size: 1.2rem; }
115115
}
116116

117117

118-
.ms-sel-item {
118+
body .ms-sel-item,
119+
body .ms-ctn .ms-sel-item {
119120
background: #f3f3f3;
120-
color: #999;
121+
color: var(--bs-body-color);
121122
float: left;
122-
font-size: 12px;
123-
padding: 0 5px;
124-
border-radius: 3px;
123+
font-size: 0.9rem;
124+
padding: 0.2rem 0.9rem;
125+
border-radius: var(--bs-border-radius);
125126
border: 1px solid #DDD;
126127
margin: 1px 5px 1px 0;
127128
}

templates/report.js

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,26 @@ let globalSettingsKey = "auditor-global-settings";
77
let globalSettings = {};
88
const resultListDelimiter = ";";
99

10-
function onlyUnique(value, index, array) {
11-
return array.indexOf(value) === index;
10+
let onlyUnique = (val, index, array) => {
11+
return array.indexOf(val) === index;
1212
}
1313

14+
let convertListToString = (val) => {
15+
return val.join(resultListDelimiter)
16+
}
17+
18+
let convertStringToList = (val) => {
19+
let ret = [];
20+
21+
val = val.trim();
22+
val.split(resultListDelimiter).forEach((item) => {
23+
item = item.trim();
24+
if (item) {
25+
ret.push(item);
26+
}
27+
})
28+
return ret
29+
}
1430

1531
// restore settings
1632
try {
@@ -241,7 +257,8 @@ let refreshTableFilter = () => {
241257
});
242258
break;
243259
case "rule":
244-
reportFilter.push({field:fieldName, type:"in", value:el.val().split(resultListDelimiter)});
260+
let valueList = convertStringToList(el.val());
261+
reportFilter.push({field:fieldName, type:"in", value:valueList});
245262
break;
246263
default:
247264
reportFilter.push({field:fieldName, type:"like", value:el.val()});
@@ -326,7 +343,7 @@ table.on("tableBuilt", () => {
326343

327344

328345
let ruleSelectorData = [];
329-
$("#reportFilterRule").val().split(resultListDelimiter).forEach((val) => {
346+
convertStringToList($("#reportFilterRule").val()).forEach((val) => {
330347
ruleSelectorData.push({
331348
id: val,
332349
name: val
@@ -341,7 +358,7 @@ table.on("tableBuilt", () => {
341358
resultAsStringDelimiter: resultListDelimiter,
342359
});
343360
$(ruleMs).on('selectionchange', function(e,m) {
344-
$("#reportFilterRule").val(this.getValue().join(resultListDelimiter));
361+
$("#reportFilterRule").val(convertListToString(this.getValue()));
345362
formSaveToHash();
346363
refreshTableFilter();
347364
});

0 commit comments

Comments
 (0)