Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

and/or between filters #1733

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

and/or between filters #1733

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94266c3
and/or between filters
Prahitha Sep 1, 2021
e578874
fixed var b/w coverage
Prahitha Sep 1, 2021
21f4911
fixed some bugs; or filtering
Prahitha Sep 1, 2021
689f2c9
modified search function
Prahitha Oct 20, 2021
ab8abfc
optimizing search (eval)
Prahitha Oct 29, 2021
01dd11d
ui fix (onchange filter type)
Prahitha Oct 31, 2021
856b5ed
move filters to the right
Prahitha Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
297 changes: 59 additions & 238 deletions conf/report/report-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,187 +56,96 @@

var iter;
var global_relation;
var selected_tools = [];
var tools_relation;

const operator_from_string = {
'<': (a, b) => a < b,
'>': (a, b) => a > b,
'>=': (a, b) => a >= b,
'<=': (a, b) => a <= b,
'=': (a, b) => a === b
};
var filter_expression;

const relation_from_string = {
'and': (a, b) => a && b,
'or': (a, b) => a || b
'is': '==',
'is not': '!=='
}

const filter_types = {
coverage: {
name: "Coverage",
operators: ["<", "<=", ">", ">=", "="],
operators: ["<", "<=", ">", ">=", "=="],
value_field_factory: function(id) {
$(`li[data-uid=${id}] .filter-entry-operator`).remove();
$(`li[data-uid=${id}] .filter-entry-value`).remove();
$(`li[data-uid=${id}] .filter-entry-operator option:not(:first)`).remove();
$(`li[data-uid=${id}] .filter-entry-value option:not(:first)`).remove();
var filter_entry_operator = $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
var filter_entry_value = $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<this.operators.length; i++)
$(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<=100; i++)
$(`<option value="${i}">${i}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
},
apply: function(operator1, percentage1, operator2, percentage2) {
var values = new Set();
if (typeof operator2 == 'undefined') {
table.columns().every(function() {
var column = this;
if(column.index() !== 0 && column.index() !== 1) {
percentage = parseInt(percentage1);
column.data().each(function(d, j) {
output = d.split('/');
tests_passed = output[0];
total_tests = output[1];
coverage = parseInt((tests_passed/total_tests)*100);
if ((operator1 in operator_from_string) && operator_from_string[operator1](coverage, percentage))
values.add(d);
});
}
});
}
else {
table.columns().every(function() {
var column = this;
if(column.index() !== 0 && column.index() !== 1) {
percentage1 = parseInt(percentage1);
percentage2 = parseInt(percentage2);
column.data().each(function(d, j) {
output = d.split('/');
tests_passed = output[0];
total_tests = output[1];
coverage = parseInt((tests_passed/total_tests)*100);
const result_left = operator_from_string[operator1](coverage, percentage1);
const result_right = operator_from_string[operator2](coverage, percentage2);
const result = relation_from_string[global_relation](result_left, result_right);
if (result)
values.add(d);
});
}
});
}
values = [...values];
if (global_relation === 'or') {
return values;
}
else {
if (selected_tools.length === 0){
$.fn.dataTable.ext.search.push(
function(settings, searchData, index, rowData, counter) {
for(var i=0; i<col_array.length; i++){
if(values.includes(searchData[col_array[i]]))
return true;
}
});
}
else {
table.columns(selected_tools).every(function() {
regex = [];
for (var i=0; i<values.length; i++){
value = "^"+values[i]+"$";
regex.push(value);
}
regex = regex.join("|");
table.columns(selected_tools).search(regex, true, false, true).draw();
});
}
}
table.draw();
}
},
type: {
name: "Type",
operators: ["is", "is not"],
types: ["parsing", "preprocessing", "simulation"],
value_field_factory: function(id) {
$(`li[data-uid=${id}] .filter-entry-operator`).remove();
$(`li[data-uid=${id}] .filter-entry-value`).remove();
$(`li[data-uid=${id}] .filter-entry-operator option:not(:first)`).remove();
$(`li[data-uid=${id}] .filter-entry-value option:not(:first)`).remove();
var filter_entry_operator = $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
var filter_entry_value = $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<this.operators.length; i++)
$(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
$(`<option value="${relation_from_string[this.operators[i]]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<this.types.length; i++)
$(`<option value="${this.types[i]}">${this.types[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
},
apply: function(operator1, type1, operator2, type2) {
if (typeof operator2 == 'undefined'){
$.fn.dataTable.ext.search.push(
function(settings, data, dataIndex){
if (operator1 === 'is')
return $(table.row(dataIndex).node()).hasClass(type1);
else if (operator1 === 'is not')
return !$(table.row(dataIndex).node()).hasClass(type1);
});
}
else {
$.fn.dataTable.ext.search.push(
function(settings, data, dataIndex){
if (global_relation === 'and'){
if (operator1 === 'is' && operator2 === 'is')
return (($(table.row(dataIndex).node()).hasClass(type1)) && ($(table.row(dataIndex).node()).hasClass(type2)));
else if (operator1 === 'is' && operator2 === 'is not')
return (($(table.row(dataIndex).node()).hasClass(type1)) && (!$(table.row(dataIndex).node()).hasClass(type2)));
else if (operator1 === 'is not' && operator2 === 'is')
return ((!$(table.row(dataIndex).node()).hasClass(type1)) && ($(table.row(dataIndex).node()).hasClass(type2)));
else if (operator1 === 'is not' && operator2 === 'is not')
return ((!$(table.row(dataIndex).node()).hasClass(type1)) && (!$(table.row(dataIndex).node()).hasClass(type2)));
}
}
);
}
table.draw();
}
},
tool: {
name: "Tool",
operators: ["is", "is not"],
tools: toolnames,
value_field_factory: function(id) {
$(`li[data-uid=${id}] .filter-entry-operator`).remove();
$(`li[data-uid=${id}] .filter-entry-value`).remove();
$(`li[data-uid=${id}] .filter-entry-operator option:not(:first)`).remove();
$(`li[data-uid=${id}] .filter-entry-value option:not(:first)`).remove();
var filter_entry_operator = $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
var filter_entry_value = $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<this.operators.length; i++)
$(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
$(`<option value="${relation_from_string[this.operators[i]]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
for (var i=0; i<this.tools.length; i++)
$(`<option value="${this.tools[i]}">${this.tools[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
},
apply: function(operator, tool) {
table.columns(col_array).visible(true);
table.columns(tool_array).every(function() {
var column = this;
if(column.index() !== 0 && column.index() !== 1){
var theadname = column.header().textContent.trim();
if(operator === 'is'){
if(theadname === tool){
var index = tool_array.indexOf(column.index());
tool_array.splice(index, 1);
selected_tools.push(column.index());
}
}
else if(operator === 'is not'){
if(theadname !== tool){
var index = tool_array.indexOf(column.index());
tool_array.splice(index, 1);
selected_tools.push(column.index());
}
}
}
});
table.columns(tool_array).visible(false);
}
}
}

const global_relation_string = {
'and': ' && ',
'or': ' || '
}

function string_builder(applied_filters) {
var query = [];
global_relation = $('.global-relation').val();
$('.filter-entries').find('li').each(function(){
var expression = $(this).find('.filter-entry-type').val() + $(this).find('.filter-entry-operator').val() + "\"" + $(this).find('.filter-entry-value').val() + "\"";
query.push(expression);
});
return query.join(global_relation_string[global_relation]);
}

function filter_cell(coverage, tool, types) {
var result = eval("(coverage, tool, types) => (" + eval(filter_expression) + ")");
return result;
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm missing something here. When I print result in the console it shows (coverage, tool, types) => (true/false). I believe this is supposed to only return a boolean though. So, I was wondering what I was doing wrong and wanted some help. Thank you!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's break it:

var filter_result = eval(filter_expression) // <- boolean value
var function_code = "(coverage, tool, types) => (" + filter_result + ")";
var result = eval(function_code);

the last line is effectively the same as:

var result = (coverage, tool, types) => (filter_result); // either `... => (true)` or `... => (false)`

So this returns a function and the console prints its code.

(Spoiler alert: hints/solutions for further steps ahead ;) )

As a side note:
I guess filter_expression is a string with javascript expression code that uses coverage, tool, types variables. If so, you actually only need this inner eval (filter_result) to get result of the expression.
However, the whole function code looks like you want to actually generate a filter_cell function - in this case:

  • You only need the outer eval.
  • Instead of filter_result value, you should use the expression string (filter_expression) itself in the string concatenation.
  • The function filter_result doesn't need any of its arguments (or, for readability purposes, could take filter_expression string as an argument). More suitable name for the function would be something like compile_filter_cell_function. It should be used this way: var filter_cell = compile_filter_cell_function(filter_expression).

The difference between two solutions (using the function that does eval of the expression vs compiling this function) is performance - filter_cell will be called on a few hundred (thousand?) cells in a loop, so it's better to run eval once instead of running it for every cell.


function search_function() {
$.fn.dataTable.ext.search.push(
function(settings, searchData, index, rowData, counter){
for(var i=2; i<col_array.length; i++){
var coverage, tool, types;
coverage = rowData[i]['@data-order'];
tool = rowData[i]['@data-search'].split(' ')[0];
types = rowData[i]['@data-search'].split(' ');
types.shift();
if(filter_cell(coverage, tool, types))
return true;
}
});
table.draw();
}

function entryChanged(mode, id) {
$(`li[data-uid=${id}] span`).remove();
filter_types[mode].value_field_factory(id);
Expand All @@ -253,91 +162,8 @@
$.fn.dataTable.ext.search.pop();
table.draw();
$('.filter-remove').show();
global_relation = $('.global-relation').val();
var applied_filters = {};
$('.filter-entries').find('li').each(function(){
filter = $(this).find('.filter-entry-type').val();
applied_filters[filter] = [];
});
$('.filter-entries').find('li').each(function(){
object = {};
filter = $(this).find('.filter-entry-type').val();
object['operator'] = $(this).find('.filter-entry-operator').val();
object['value'] = $(this).find('.filter-entry-value').val();
applied_filters[filter].push(object);
});
if (applied_filters['tool']){
if (applied_filters['tool'].length > 1)
alert('Tools are not supported by AND operation. OR is applied for tools');
for (var i=0; i<applied_filters['tool'].length; i++)
filter_types['tool'].apply(applied_filters['tool'][i]['operator'], applied_filters['tool'][i]['value']);
}

var operator1, operator2;
var value1, value2;
var result = [];

if (typeof global_relation == 'undefined'){
for (const key in applied_filters)
filter_types[key].apply(applied_filters[key][0]['operator'], applied_filters[key][0]['value']);
}
else{
for(const key in applied_filters){
if (key != 'tool' && global_relation === 'and') {
try{
filter_types[key].apply(applied_filters[key][0]['operator'], applied_filters[key][0]['value'], applied_filters[key][1]['operator'], applied_filters[key][1]['value']);
}
catch(err) {
filter_types[key].apply(applied_filters[key][0]['operator'], applied_filters[key][0]['value']);
}
}
else if (key != 'tool' && global_relation === 'or') {
for (var i=0; i<applied_filters[key].length; i++){
if (key == 'type' && applied_filters['type'].length == 1){
operator1 = applied_filters['type'][0]['operator'];
value1 = applied_filters['type'][0]['value'];
}
if (key == 'type' && applied_filters['type'].length > 1){
operator1, operator2 = applied_filters['type'][0]['operator'], applied_filters['type'][1]['operator'];
value1, value2 = applied_filters['type'][0]['value'], applied_filters['type'][1]['value'];
}
if (key == 'coverage')
result = result.concat(filter_types['coverage'].apply(applied_filters['coverage'][i]['operator'], applied_filters['coverage'][i]['value']));
}
}
}
if (global_relation === 'or') {
table.columns(col_array).visible(true);
table.columns(col_array).every(function(){
$.fn.dataTable.ext.search.push(
function(settings, searchData, dataIndex, rowData, counter){
if (result.length > 0){
for (var i=0; i<col_array.length; i++){
if(result.includes(searchData[col_array[i]]))
return true;
}
}
if (typeof operator2 == 'undefined'){
if (operator1 === 'is')
return $(table.row(dataIndex).node()).hasClass(value1);
else if (operator1 === 'is not')
return (!$(table.row(dataIndex).node()).hasClass(value1));
}
if (typeof operator2 != 'undefined'){
if (operator1 === 'is' && operator2 === 'is')
return (($(table.row(dataIndex).node()).hasClass(value1)) || ($(table.row(dataIndex).node()).hasClass(value2)));
else if (operator1 === 'is' && operator2 === 'is not')
return (($(table.row(dataIndex).node()).hasClass(value1)) || (!$(table.row(dataIndex).node()).hasClass(value2)));
else if (operator1 === 'is not' && operator2 === 'is')
return ((!$(table.row(dataIndex).node()).hasClass(value1)) || ($(table.row(dataIndex).node()).hasClass(value2)));
else if (operator1 === 'is not' && operator2 === 'is not')
return ((!$(table.row(dataIndex).node()).hasClass(value1)) || (!$(table.row(dataIndex).node()).hasClass(value2)));
}
});
});
}
table.draw();
}
filter_expression = string_builder();
search_function();
}

function removeAll() {
Expand Down Expand Up @@ -404,15 +230,7 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
</tr>
</thead>
{% for tag, info in database.items() %}
{% set list = [] %}
{% for tool, tooldata in report|dictsort %}
{% for type in tooldata["tags"][tag]["type"] %}
{% if type not in list %}
{% set list = list.append(type) %}
{% endif %}
{% endfor %}
{% endfor %}
<tr class="{{list|join(" ")}}">
<tr>
<th class="report_table_info" title="{{info}}">
{% if tag in database_urls %}
<a class="tag_link" target=_blank href="{{database_urls[tag]}}"> {{ info }} </a>
Expand All @@ -422,15 +240,18 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
</th>
<th class="report_table_tag" title="{{info}}"> {{ tag }} </th>
{% for tool, tooldata in report|dictsort %}
<th class="report_table_result {{ tooldata["tags"][tag]["status"] }}
{% if "test-na" not in tooldata["tags"][tag]["status"] %} test-cell {% endif %}"
<th class="report_table_result {{ tooldata["tags"][tag]["status"] }}{% if "test-na" not in tooldata["tags"][tag]["status"] %} test-cell {% endif %}"
{% set celldata = tool.lower() ~ " " ~ tooldata["tags"][tag]["type"]|join(" ") %}
data-search='{{celldata}}'
{% if "test-varied" in tooldata["tags"][tag]["status"] %} style='background-size: {{'%0.0f' | format(100.0 * tooldata["tags"][tag]["passed-num"] / tooldata["tags"][tag]["logs"]|length) }}% 100%' {% endif %}
{% if "test-na" not in tooldata["tags"][tag]["status"] %}
id='{{tool}}-{{tag}}-cell'
onclick='toggleLog("{{tool}}", "{{tag}}",
"{{tooldata["tags"][tag]["logs"][tooldata["tags"][tag]["head_test"]]["name"]}}")'
data-order='{{ '%0.0f' | format(100.0 * tooldata["tags"][tag]["passed-num"] / tooldata["tags"][tag]["logs"]|length) }}'
onclick='toggleLog("{{tool}}", "{{tag}}", "{{tooldata["tags"][tag]["logs"][tooldata["tags"][tag]["head_test"]]["name"]}}")'
{% endif %}
>
{% if "test-na" in tooldata["tags"][tag]["status"] %}
data-order=" "
{% endif %}>
{% if "test-na" not in tooldata["tags"][tag]["status"] %}
{{ tooldata["tags"][tag]["passed-num"] }}/{{ tooldata["tags"][tag]["logs"]|length }}
{% endif %}
Expand Down