diff --git a/frontend/src/Editor/Components/Table/Filter.jsx b/frontend/src/Editor/Components/Table/Filter.jsx index 309f2fff42..accb464a83 100644 --- a/frontend/src/Editor/Components/Table/Filter.jsx +++ b/frontend/src/Editor/Components/Table/Filter.jsx @@ -113,10 +113,12 @@ export function Filter(props) {
-

Filters

+

+ Filters +

-
@@ -131,9 +133,9 @@ export function Filter(props) { {props.filters.map((filter, index) => (
- {index > 0 ? 'and' : 'column'} + {index > 0 ? 'and' : 'column'}
-
+
{['isEmpty', 'isNotEmpty'].includes(filter.value.condition) || (
- -
diff --git a/frontend/src/Editor/Components/Table/GlobalFilter.jsx b/frontend/src/Editor/Components/Table/GlobalFilter.jsx index 72f1d37818..2cc92aeca2 100644 --- a/frontend/src/Editor/Components/Table/GlobalFilter.jsx +++ b/frontend/src/Editor/Components/Table/GlobalFilter.jsx @@ -31,6 +31,7 @@ export const GlobalFilter = ({ defaultValue={value || ''} onChange={(e) => onChange(e.target.value)} placeholder="Search" + data-cy="search-input-field" style={{ border: '0', }} diff --git a/frontend/src/Editor/Components/Table/IndeterminateCheckbox.jsx b/frontend/src/Editor/Components/Table/IndeterminateCheckbox.jsx index 57360a3f49..16532d569c 100644 --- a/frontend/src/Editor/Components/Table/IndeterminateCheckbox.jsx +++ b/frontend/src/Editor/Components/Table/IndeterminateCheckbox.jsx @@ -11,6 +11,7 @@ const IndeterminateCheckbox = React.forwardRef(({ indeterminate, ...rest }, ref) return ( <> {!serverSide && ( )} {' '} - + {serverSide && {pageIndex}} {!serverSide && ( @@ -73,6 +75,7 @@ export const Pagination = function Pagination({ )} {' '} {!serverSide && ( - ) : ( - + {clientSidePagination && !serverSidePagination && `${globalFilteredRows.length} Records`} {serverSidePagination && totalRecords ? `${totalRecords} Records` : ''} diff --git a/frontend/src/Editor/Inspector/Components/Table.jsx b/frontend/src/Editor/Inspector/Components/Table.jsx index b8488f7cff..7975e638db 100644 --- a/frontend/src/Editor/Inspector/Components/Table.jsx +++ b/frontend/src/Editor/Inspector/Components/Table.jsx @@ -666,8 +666,11 @@ class TableComponent extends React.Component {
- + { @@ -677,8 +680,10 @@ class TableComponent extends React.Component { value={action.buttonText} />
-
- +
+ this.onActionButtonPropertyChanged(index, 'backgroundColor', color)} + cyLabel={`action-button-bg`} /> this.onActionButtonPropertyChanged(index, 'textColor', color)} + cyLabel={`action-button-text`} />
-
{action.buttonText}
+
+ {action.buttonText} +
@@ -959,6 +973,7 @@ class TableComponent extends React.Component {