Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Small fixes for Server-side filter button (#4571) (#4580)

Browse source 
* Small fixes for Server-side filter button (#4571)

* fixes: show/hide server side filter toggle button when with resp to show filter button toggle

Co-authored-by: arpitnath <arpitnath42@gmail.com>
Co-authored-by: Sherfin Shamsudeen <sherfin94@gmail.com>
This commit is contained in:
Dmitriy Danilov 2022-11-03 14:08:21 +02:00 committed by GitHub
parent 25836743a7
commit e848316137
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/Editor/Inspector/Components/Table.jsx
View file

@ -783,6 +783,9 @@ class TableComponent extends React.Component {
if (!component.component.definition.properties.displaySearchBox)
paramUpdated({ name: 'displaySearchBox' }, 'value', true, 'properties');
const displaySearchBox = component.component.definition.properties.displaySearchBox.value;
const displayServerSideFilter = component.component.definition.properties.showFilterButton?.value
? resolveReferences(component.component.definition.properties.showFilterButton?.value, currentState)
: false;
const serverSidePagination = component.component.definition.properties.serverSidePagination?.value
? resolveReferences(component.component.definition.properties.serverSidePagination?.value, currentState)
: false;
@ -931,15 +934,15 @@ class TableComponent extends React.Component {
...(serverSidePagination ? ['enableNextButton'] : []),
...(serverSidePagination ? ['totalRecords'] : []),
...(clientSidePagination && !serverSidePagination ? ['rowsPerPage'] : []),
'enabledSort',
...(enabledSort ? ['serverSideSort'] : []),
'serverSideSearch',
'showDownloadButton',
'showFilterButton',
...(displayServerSideFilter ? ['serverSideFilter'] : []),
'showBulkUpdateActions',
'showBulkSelector',
'highlightSelectedRow',
'enabledSort',
'serverSideFilter',
];
let renderOptions = [];

1
frontend/src/Editor/WidgetManager/widgetConfig.js
View file

@ -384,6 +384,7 @@ export const widgets = [
totalRecords: { value: '' },
clientSidePagination: { value: '{{true}}' },
serverSideSort: { value: '{{false}}' },
serverSideFilter: { value: '{{false}}' },
displaySearchBox: { value: '{{true}}' },
showDownloadButton: { value: '{{true}}' },
showFilterButton: { value: '{{true}}' },