Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions lib/static/modules/selectors/tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,20 @@ export const getSelectedBrowserIds = createSelector(
}
);

const getAcceptableOrRevertableImages = (browserIds, browsersById, resultsById, imagesById, isStaticImageAccepterEnabled, gui) => {
const getExpandedTreeNodesById = (state) => (state.ui.suitesPage.expandedTreeNodesById);
const getTreeEntityId = (result) => result.suitePath.join('/');

const getAcceptableOrRevertableImages = (
browserIds, browsersById, resultsById, imagesById, isStaticImageAccepterEnabled, gui, expandedTreeNodesById
) => {
const visibleResultIds = browserIds.map(browserId => last(browsersById[browserId].resultIds));

return visibleResultIds.flatMap(resultId => {
return visibleResultIds.flatMap((resultId) => {
const suitePath = getTreeEntityId(resultsById[resultId]);
if (expandedTreeNodesById && !expandedTreeNodesById[suitePath]) {
return [];
}

return resultsById[resultId].imageIds
.map(imageId => imagesById[imageId])
.filter(image => isAcceptable(image) || isScreenRevertable({
Expand All @@ -209,6 +219,7 @@ const getAcceptableOrRevertableImages = (browserIds, browsersById, resultsById,

export const getVisibleImages = createSelector(
getVisibleBrowserIds, getBrowsers, getResults, getImages, getIsStaticImageAccepterEnabled, getIsGui,
getExpandedTreeNodesById,
getAcceptableOrRevertableImages
);

Expand Down
Loading