Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[Core] Download CSV issues #7242

Merged
merged 1 commit into from
Dec 21, 2020
Merged

[Core] Download CSV issues #7242

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
6 changes: 4 additions & 2 deletions jsx/StaticDataTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ class StaticDataTable extends Component {

if (this.hasFilterKeyword(this.props.Headers[j], data)) {
filterMatchCount++;
filteredData.push(this.props.Data[index[i].RowIdx]);
}

if (useKeyword === true) {
Expand Down Expand Up @@ -464,7 +463,8 @@ class StaticDataTable extends Component {
}
}

// Only display a row if all filter values have been matched
// Only display a row in the table or csv
// if all filter values have been matched
if ((filterLength === filterMatchCount) &&
((useKeyword === true && keywordMatch > 0) ||
(useKeyword === false && keywordMatch === 0))) {
Expand All @@ -478,6 +478,8 @@ class StaticDataTable extends Component {
</tr>
);
}

filteredData.push(this.props.Data[index[i].RowIdx]);
}
}

Expand Down