Merge branch 'master' into fix/pause_rotation_thread_migration

Graylog2 · Aug 20, 2024 · ec832a4 · ec832a4
2 parents e4ffe3c + 87ca9b8
commit ec832a4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/graylog2-web-interface/src/components/bootstrap/Table.jsx b/graylog2-web-interface/src/components/bootstrap/Table.jsx
@@ -85,13 +85,15 @@ const tableCss = css(({ theme }) => css`
       > th,
       > td {
         border-top-color: ${theme.colors.table.row.divider};
+        border-width: 1px;
       }
     }
 
     > thead > tr > th {
       background: ${theme.colors.table.head.background};
       white-space: nowrap;
       border-bottom-color: ${theme.colors.table.row.divider};
+      border-width: 1px;
     }
 
     > tbody > tr {
@@ -101,6 +103,7 @@ const tableCss = css(({ theme }) => css`
 
     > tbody + tbody {
       border-top-color: ${theme.colors.table.row.divider};
+      border-width: 1px;
     }
 
     .table {

diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/EntityDataTable.tsx
@@ -147,7 +147,7 @@ type Props<Entity extends EntityBase> = {
   /**
    * Needs to be defined when not all action cells in every row have the same width.
    * When they have the same width, the column width will be calculated automatically.
-   * Should not include the actions col padding. Should be teh max width an action cell can have.
+   * Should not include the actions col padding. Should be the max width an action cell can have.
    */
   actionsCellWidth?: number
   /** Currently active sort */

diff --git a/graylog2-web-interface/src/components/common/EntityDataTable/TableRow.tsx b/graylog2-web-interface/src/components/common/EntityDataTable/TableRow.tsx
@@ -26,7 +26,6 @@ import type { ColumnRenderersByAttribute, Column, EntityBase } from './types';
 import RowCheckbox from './RowCheckbox';
 
 const ActionsCell = styled.td`
-  float: right;
   text-align: right;
 
   .btn-toolbar {
@@ -93,7 +92,7 @@ const TableRow = <Entity extends EntityBase>({
       })}
       {displayActions ? (
         <ActionsCell>
-          {index === 0 ? <ActionsRef ref={actionsRef}>{actionButtons}</ActionsRef> : actionButtons}
+          <ActionsRef ref={index === 0 ? actionsRef : undefined}>{actionButtons}</ActionsRef>
         </ActionsCell>
       ) : null}
     </tr>

diff --git a/graylog2-web-interface/src/components/common/IconButton.tsx b/graylog2-web-interface/src/components/common/IconButton.tsx
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import styled, { css } from 'styled-components';
 
 import Icon from 'components/common/Icon';
-import type { IconName, RotateProp, IconType } from 'components/common/Icon';
+import type { IconName, RotateProp, IconType, SizeProp } from 'components/common/Icon';
 
 const Wrapper = styled.button<{ disabled: boolean }>(({ theme, disabled }) => css`
   display: inline-flex;
@@ -51,7 +51,8 @@ type Props = {
   iconType?: IconType,
   disabled?: boolean,
   rotation?: RotateProp,
-  'data-testid'?: string
+  'data-testid'?: string,
+  size?: SizeProp,
 };
 
 const handleClick = (onClick: () => void | undefined) => {
@@ -98,6 +99,7 @@ IconButton.defaultProps = {
   rotation: undefined,
   iconType: undefined,
   'data-testid': undefined,
+  size: undefined,
 };
 
 export default IconButton;