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

Fixed status drop down initial display #1002

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Fixed status drop down initial display #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47cd777
Fixed status drop down initial display
JawHawk Feb 28, 2024
7a674dd
Update pre-built JS package
PhilippWendler Feb 28, 2024
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
2 changes: 1 addition & 1 deletion benchexec/tablegenerator/react-table/build/main.min.js
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 17 additions & 3 deletions benchexec/tablegenerator/react-table/src/components/ReactTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ const createRelevantFilterLabel = ({

const Table = (props) => {
const [isFixed, setIsFixed] = useState(true);
const [filteredColumnValues, setFilteredColumnValues] = useState({});
const [filteredColumnValues, setFilteredColumnValues] = useState(
getNewFilteredColumnValues(),
);
const [columnsResizeValues, setColumnsResizeValues] = useState({});
const [disableTaskText, setDisableTaskText] = useState(false);
const history = useHistory();
Expand Down Expand Up @@ -619,8 +621,8 @@ const Table = (props) => {
}
}, [columnResizing, columnsResizeValues]);

// get selected status and category values
useEffect(() => {
// Convert the props.filters array into Filtered Column Values object
function getNewFilteredColumnValues() {
const newFilteredColumnValues = {};
for (const filter of props.filters) {
const { value, values, id } = filter;
Expand All @@ -645,13 +647,25 @@ const Table = (props) => {

newFilteredColumnValues[runset] = currentRunsetFilters;
}
return newFilteredColumnValues;
}

// get selected status and category values
useEffect(() => {
let newFilteredColumnValues = getNewFilteredColumnValues();
if (!deepEqual(newFilteredColumnValues, filteredColumnValues)) {
setFilteredColumnValues(newFilteredColumnValues);
}
// Set current page to new last page if current page is not legit any more after filtering
if (pageIndex >= pageCount) {
gotoPage(pageCount - 1);
}

// react-hooks/exhaustive-deps shows that getNewFilteredColumnValues to be included in the dependency array.
// But useEffect functionality is not dependent on getNewFilteredColumnValues as it never changes.
// So react-hooks/exhaustive-deps can be ignored here.

// eslint-disable-next-line react-hooks/exhaustive-deps
PhilippWendler marked this conversation as resolved.
Show resolved Hide resolved
}, [props.filters, filteredColumnValues, gotoPage, pageIndex, pageCount]);

// Update table relevant parameters after URL change
Expand Down
Loading