Merge branch 'develop' into Display-the-image-in-case-of-Reference-fi…

…elds-on-admin-UI
SenseNet · Sep 27, 2023 · 6e09fe4 · 6e09fe4
2 parents 3b7a822 + 29a5851
commit 6e09fe4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts b/apps/sensenet/cypress/e2e/ui/batchOperations.cy.ts
@@ -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({
@@ -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()

diff --git a/apps/sensenet/src/components/ContentBreadcrumbs.tsx b/apps/sensenet/src/components/ContentBreadcrumbs.tsx
@@ -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"

diff --git a/packages/sn-list-controls-react/src/ContentList/virtualized-table.tsx b/packages/sn-list-controls-react/src/ContentList/virtualized-table.tsx
@@ -275,9 +275,11 @@ export const VirtualizedTable = <T extends GenericContent = GenericContent>(prop
             alignItems: 'center',
           }}
           component="div">
-          <Button data-test="column-settings" onClick={props.handleColumnSettingsClick}>
-            <Build />
-          </Button>
+          <Tooltip title="Column Settings" placement="bottom">
+            <Button data-test="column-settings" onClick={props.handleColumnSettingsClick}>
+              <Build />
+            </Button>
+          </Tooltip>
         </TableCell>
       )
     }