Skip to content

Commit

Permalink
Merge branch 'develop' into column-settings-tooltip
Browse files Browse the repository at this point in the history
  • Loading branch information
kavics authored Sep 14, 2023
2 parents 25ec1c7 + 6ecc5ee commit 8a0280d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
15 changes: 12 additions & 3 deletions apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ describe('Batch operations: ', () => {
cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } }))
})

it('batch actions should appear when at least a single item is selected', () => {
cy.visit(
pathWithQueryParams({
path: resolvePathParams({ path: PATHS.content.appPath, params: { browseType: 'explorer' } }),
newParams: { repoUrl: Cypress.env('repoUrl'), path: '/SampleWorkspace/Document_Library' },
}),
)
cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true })
cy.get('[data-test="batch-actions"]').should('exist')
})

it('multiple content copy works as it is intended', () => {
cy.visit(
pathWithQueryParams({
Expand Down Expand Up @@ -74,9 +85,7 @@ describe('Batch operations: ', () => {
//put it back

cy.get('[data-test="table-row-selection-control-dinnerscookbook.pdf"]').click({ force: true })
cy.get('[data-test="table-row-selection-control-hello_world.docx"]')
.find('input[type="checkbox"]')
.check({ force: true })
cy.get('[data-test="table-row-selection-control-hello_world.docx"]').click({ force: true })
cy.get('[data-test="batch-move"]').click()
cy.get('[data-test="picker-up"]').dblclick()
cy.get('[data-test="picker-submit"]').click()
Expand Down
4 changes: 2 additions & 2 deletions apps/sensenet/src/components/ContentBreadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ export const ContentBreadcrumbs = <T extends GenericContent = GenericContent>(pr
: history.push(getPrimaryActionUrl({ content: item.content, repository, uiSettings, location }))
}}
/>
{props.batchActions && selected.length > 1 ? (
<div className={classes.batchActionWrapper}>
{props.batchActions && selected.length > 0 ? (
<div className={classes.batchActionWrapper} data-test="batch-actions">
<Tooltip title={localization.batchActions.delete} placement="bottom">
<IconButton
data-test="batch-delete"
Expand Down

0 comments on commit 8a0280d

Please sign in to comment.