Skip to content

[ENG-8626] Fix search in .xlsx files #406

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

Open
wants to merge 1 commit into
base: feature/buff-worms
Choose a base branch
from
Open

[ENG-8626] Fix search in .xlsx files #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions mfr/extensions/tabular/templates/viewer.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

grid = new Slick.Grid('#mfrGrid', rows, columns, options);
searchString = "";
$("#txtSearch").value = "";
$("#txtSearch").val("");
data = grid.getData();
grid.onSort.subscribe(sortData);
refreshNotice();
Expand Down Expand Up @@ -91,17 +91,21 @@

function filterData(data, search) {
var filteredData = [];
var re = new RegExp(search, 'i');
for (var i = 0; i<data.length; i++){
var safeSearch = String(search).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
var re = new RegExp(safeSearch, 'i');
for (var i = 0; i < data.length; i++) {
var filtered = false;
var item = data[i];
for (var title in item) {
if (search !== '' && item[title].toString().match(re)) {
filtered = filtered || true;
continue;
// Be null-safe: openpyxl may yield null/undefined for empty cells
var cell = item[title];
var str = (cell === null || cell === undefined) ? '' : String(cell);
if (safeSearch !== '' && re.test(str)) {
filtered = true;
break;
}
}
if (filtered){
if (filtered) {
filteredData.push(item);
}
}
Expand Down