Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
screen,
userEvent,
waitForRiPopoverVisible,
waitFor,
} from 'uiSrc/utils/test-utils'
import { Instance } from 'uiSrc/slices/interfaces'
import {
Expand Down Expand Up @@ -118,4 +119,30 @@ describe('DatabasesListCellControls component', () => {
expect(mockHandleDeleteInstances).toHaveBeenCalledWith(instance)
expect(openDialogSpy).toHaveBeenLastCalledWith(null)
})

it('should close controls popover after confirming delete (closeControlsPopover)', async () => {
renderWithProvider()

// Open controls popover
await userEvent.click(screen.getByTestId(`controls-button-${instance.id}`))
await waitForRiPopoverVisible()
expect(await screen.findByTestId(`edit-instance-${instance.id}`)).toBeInTheDocument()

// Trigger delete flow
await userEvent.click(
await screen.findByTestId(`delete-instance-${instance.id}-icon`),
)
await waitForRiPopoverVisible() // wait for confirmation popover

// Confirm deletion -> this calls closeControlsPopover inside handleDeleteItem
await userEvent.click(
await screen.findByTestId(`delete-instance-${instance.id}`),
{ pointerEventsCheck: 0 },
)

// Assert the controls popover content is gone (popover closed)
await waitFor(() =>
expect(screen.queryByTestId(`edit-instance-${instance.id}`)).not.toBeInTheDocument(),
)
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@
const DatabasesListCellControls: IDatabaseListCell = ({ row }) => {
const instance = row.original
const { setOpenDialog } = useHomePageDataProvider()
const [isControlsPopoverOpen, setControlsPopoverOpen] = useState(false)
const [isDeletePopoverOpen, setIsDeletePopoverOpen] = useState(false)

const deletingId = isDeletePopoverOpen ? `${instance.id + suffix}` : ''
const closePopover = () => setIsDeletePopoverOpen(false)
const showPopover = () => setIsDeletePopoverOpen(true)
const closeControlsPopover = () => setControlsPopoverOpen(false)
const closeDeletePopover = () => setIsDeletePopoverOpen(false)

Check warning on line 42 in redisinsight/ui/src/pages/home/components/databases-list/components/DatabasesListCellControls/DatabasesListCellControls.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🧾 Statement is not covered

Warning! Not covered statement

Check warning on line 42 in redisinsight/ui/src/pages/home/components/databases-list/components/DatabasesListCellControls/DatabasesListCellControls.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🕹️ Function is not covered

Warning! Not covered function
const showDeletePopover = () => setIsDeletePopoverOpen(true)

return (
<Row
Expand Down Expand Up @@ -77,6 +79,9 @@
ownFocus
anchorPosition="leftUp"
panelPaddingSize="s"
isOpen={isControlsPopoverOpen}
closePopover={closeControlsPopover}
onOpenChange={setControlsPopoverOpen}
button={
<IconButton
icon={MoreactionsIcon}
Expand Down Expand Up @@ -106,12 +111,13 @@
item={instance.id}
suffix={suffix}
deleting={deletingId}
closePopover={closePopover}
closePopover={closeDeletePopover}
updateLoading={false}
showPopover={showPopover}
showPopover={showDeletePopover}
handleDeleteItem={() => {
handleDeleteInstances(instance)
setOpenDialog(null)
closeControlsPopover()
}}
handleButtonClick={() => handleClickDeleteInstance(instance)}
testid={`delete-instance-${instance.id}`}
Expand Down
Loading