diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/index.js index 26ebfc53b5..7393d5a9f5 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/index.js @@ -221,7 +221,12 @@ const BoldChunk = (chunks) => {chunks} { +const SelectedEntriesModalContent = ({ + toggleModal, + refetchModalData, + setEntriesToFetch, + setSelectedListViewEntries, +}) => { const { formatMessage } = useIntl(); const { selectedEntries, rows, onSelectRow, isLoading, isFetching } = useTableContext(); const [isDialogOpen, setIsDialogOpen] = React.useState(false); @@ -257,8 +262,11 @@ const SelectedEntriesModalContent = ({ toggleModal, refetchModalData, setEntries }); setRowsToDisplay(update); + const publishedIds = update.map(({ entity }) => entity.id); // Set the parent's entries to fetch when clicking refresh - setEntriesToFetch(update.map(({ entity }) => entity.id)); + setEntriesToFetch(publishedIds); + // Deselect the entries that were published in the list view + setSelectedListViewEntries(publishedIds); if (update.length === 0) { toggleModal(); @@ -386,6 +394,7 @@ SelectedEntriesModalContent.propTypes = { toggleModal: PropTypes.func.isRequired, refetchModalData: PropTypes.func.isRequired, setEntriesToFetch: PropTypes.func.isRequired, + setSelectedListViewEntries: PropTypes.func.isRequired, }; /* ------------------------------------------------------------------------------------------------- @@ -393,7 +402,10 @@ SelectedEntriesModalContent.propTypes = { * -----------------------------------------------------------------------------------------------*/ const SelectedEntriesModal = ({ onToggle }) => { - const { selectedEntries: selectedListViewEntries } = useTableContext(); + const { + selectedEntries: selectedListViewEntries, + setSelectedEntries: setSelectedListViewEntries, + } = useTableContext(); const { contentType, components } = useSelector(listViewDomain()); // The child table will update this value based on the entries that were published const [entriesToFetch, setEntriesToFetch] = React.useState(selectedListViewEntries); @@ -455,6 +467,7 @@ const SelectedEntriesModal = ({ onToggle }) => { isFetching={isFetching} >